Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ java-приложение для работы с блокировками в С
* Обновлены action-ы в gitHubActions
* Прекращена поддержка PostgreSQL версий ниже 10, удалена настройка для отображения типа процесса
* Добавлены новые столбцы `Тип ожидаемого события` и `Имя ожидаемого события`
* Добавлена дефолтная сортировка по длительности и количеству заблокированных процессов

1.9.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import java.nio.file.Path;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.time.Duration;
import java.util.Date;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ public void setData(DataSource<T> dataSource, ColumnLayoutsXmlStore columnLayout
setLabelProvider(this.dataSource);
setContentProvider(this.dataSource);
addDoubleClickListener(new DoubleClickListener());
setDefaultSort();
refresh();
}

private void loadColumnsFromStore(List<ColumnLayout> layouts) {
Expand Down Expand Up @@ -130,7 +132,7 @@ public void refreshWithoutSelection() {
}

@Override
protected void setSelectionToWidget(List v, boolean reveal) {
protected void setSelectionToWidget(@SuppressWarnings("rawtypes") List v, boolean reveal) {
if (!inRefresh) {
super.setSelectionToWidget(v, reveal);
}
Expand Down Expand Up @@ -180,6 +182,19 @@ public void widgetDefaultSelected(SelectionEvent e) {
return swtColumn;
}

private void setDefaultSort() {
if (visibleColumns.contains(Columns.DURATION)) {
TreeColumn duration = columns.get(Columns.DURATION);
selectSortColumn(duration, false);
selectSortColumn(duration, false);
}
if (visibleColumns.contains(Columns.BLOCKED_COUNT)) {
TreeColumn duration = columns.get(Columns.BLOCKED_COUNT);
selectSortColumn(duration, false);
selectSortColumn(duration, false);
}
}

private void addListeners() {
AggregatingListener al = new AggregatingListener(new ControlAdapter() {

Expand Down