Added sort order

fixes #499
amitjoy · Dec 14, 2022 · f254400 · f254400
1 parent 6cc7def
commit f254400
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 14 deletions.
diff --git a/...x.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/BundlesFxController.java b/...x.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/BundlesFxController.java
@@ -16,6 +16,7 @@
 package com.osgifx.console.ui.bundles;
 
 import static com.osgifx.console.event.topics.TableFilterUpdateTopics.UPDATE_BUNDLE_FILTER_EVENT_TOPIC;
+import static javafx.scene.control.TableColumn.SortType.ASCENDING;
 
 import java.util.function.Predicate;
 
@@ -130,6 +131,7 @@ private void createControls() {
         table.setItems(filteredList);
 
         TableFilter.forTableView(table).lazy(true).apply();
+        Fx.initSortOrder(table, idColumn, ASCENDING);
     }
 
     @Inject

diff --git a/....ui.components/src/main/java/com/osgifx/console/ui/components/ComponentsFxController.java b/....ui.components/src/main/java/com/osgifx/console/ui/components/ComponentsFxController.java
@@ -16,6 +16,7 @@
 package com.osgifx.console.ui.components;
 
 import static com.osgifx.console.event.topics.TableFilterUpdateTopics.UPDATE_COMPONENT_FILTER_EVENT_TOPIC;
+import static javafx.scene.control.TableColumn.SortType.ASCENDING;
 
 import java.util.function.Predicate;
 
@@ -122,6 +123,7 @@ private void createControls() {
         table.setItems(filteredList);
 
         TableFilter.forTableView(table).lazy(true).apply();
+        Fx.initSortOrder(table, componentNameColumn, ASCENDING);
     }
 
     @Inject

diff --git a/...ations/src/main/java/com/osgifx/console/ui/configurations/ConfigurationsFxController.java b/...ations/src/main/java/com/osgifx/console/ui/configurations/ConfigurationsFxController.java
@@ -16,6 +16,7 @@
 package com.osgifx.console.ui.configurations;
 
 import static com.osgifx.console.event.topics.TableFilterUpdateTopics.UPDATE_CONFIGURATION_FILTER_EVENT_TOPIC;
+import static javafx.scene.control.TableColumn.SortType.ASCENDING;
 
 import java.util.function.Predicate;
 
@@ -130,6 +131,7 @@ private void createControls() {
         table.setItems(filteredList);
 
         TableFilter.forTableView(table).lazy(true).apply();
+        Fx.initSortOrder(table, pidColumn, ASCENDING);
     }
 
     @Inject

diff --git a/...gifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/EventsFxController.java b/...gifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/EventsFxController.java
@@ -15,6 +15,8 @@
  ******************************************************************************/
 package com.osgifx.console.ui.events;
 
+import static javafx.scene.control.TableColumn.SortType.DESCENDING;
+
 import java.util.Date;
 
 import javax.inject.Inject;
@@ -109,13 +111,7 @@ private void createControls() {
         table.setItems(events);
 
         TableFilter.forTableView(table).lazy(true).apply();
-        sortByReceivedAt(receivedAtColumn);
-    }
-
-    private void sortByReceivedAt(final TableColumn<XEventDTO, Date> column) {
-        column.setSortType(TableColumn.SortType.DESCENDING);
-        table.getSortOrder().add(column);
-        table.sort();
+        Fx.initSortOrder(table, receivedAtColumn, DESCENDING);
     }
 
 }
diff --git a/com.osgifx.console.ui.http/src/main/java/com/osgifx/console/ui/http/HttpFxController.java b/com.osgifx.console.ui.http/src/main/java/com/osgifx/console/ui/http/HttpFxController.java
@@ -15,6 +15,8 @@
  ******************************************************************************/
 package com.osgifx.console.ui.http;
 
+import static javafx.scene.control.TableColumn.SortType.ASCENDING;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 
@@ -126,6 +128,7 @@ private void createControls() {
 
         table.setItems(dataProvider.httpComponents());
         TableFilter.forTableView(table).lazy(true).apply();
+        Fx.initSortOrder(table, componentColumn, ASCENDING);
     }
 
 }
diff --git a/com.osgifx.console.ui.leaks/src/main/java/com/osgifx/console/ui/leaks/LeaksFxController.java b/com.osgifx.console.ui.leaks/src/main/java/com/osgifx/console/ui/leaks/LeaksFxController.java
@@ -15,6 +15,8 @@
  ******************************************************************************/
 package com.osgifx.console.ui.leaks;
 
+import static javafx.scene.control.TableColumn.SortType.ASCENDING;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 
@@ -75,6 +77,7 @@ private void initCells() {
 
         table.setItems(dataProvider.leaks());
         TableFilter.forTableView(table).lazy(true).apply();
+        Fx.initSortOrder(table, idColumn, ASCENDING);
     }
 
 }
diff --git a/...osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogsViewFxController.java b/...osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogsViewFxController.java
@@ -15,6 +15,8 @@
  ******************************************************************************/
 package com.osgifx.console.ui.logs;
 
+import static javafx.scene.control.TableColumn.SortType.DESCENDING;
+
 import java.util.Date;
 
 import javax.inject.Inject;
@@ -118,13 +120,7 @@ private void createControls() {
         table.setItems(logs);
 
         TableFilter.forTableView(table).lazy(true).apply();
-        sortByLoggedAt(loggedAtColumn);
-    }
-
-    private void sortByLoggedAt(final TableColumn<XLogEntryDTO, Date> column) {
-        column.setSortType(TableColumn.SortType.DESCENDING);
-        table.getSortOrder().add(column);
-        table.sort();
+        Fx.initSortOrder(table, loggedAtColumn, DESCENDING);
     }
 
 }
diff --git a/...onsole.ui.packages/src/main/java/com/osgifx/console/ui/packages/PackagesFxController.java b/...onsole.ui.packages/src/main/java/com/osgifx/console/ui/packages/PackagesFxController.java
@@ -16,6 +16,7 @@
 package com.osgifx.console.ui.packages;
 
 import static com.osgifx.console.event.topics.TableFilterUpdateTopics.UPDATE_PACKAGE_FILTER_EVENT_TOPIC;
+import static javafx.scene.control.TableColumn.SortType.ASCENDING;
 
 import java.util.function.Predicate;
 
@@ -122,6 +123,7 @@ private void createControls() {
         table.setItems(filteredList);
 
         TableFilter.forTableView(table).lazy(true).apply();
+        Fx.initSortOrder(table, nameColumn, ASCENDING);
     }
 
     @Inject

diff --git a/....ui.properties/src/main/java/com/osgifx/console/ui/properties/PropertiesFxController.java b/....ui.properties/src/main/java/com/osgifx/console/ui/properties/PropertiesFxController.java
@@ -15,6 +15,8 @@
  ******************************************************************************/
 package com.osgifx.console.ui.properties;
 
+import static javafx.scene.control.TableColumn.SortType.ASCENDING;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 
@@ -72,6 +74,7 @@ private void initCells() {
 
         propertyTable.setItems(dataProvider.properties());
         TableFilter.forTableView(propertyTable).lazy(true).apply();
+        Fx.initSortOrder(propertyTable, propertyName, ASCENDING);
     }
 
 }
diff --git a/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/RolesFxController.java b/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/RolesFxController.java
@@ -15,6 +15,8 @@
  ******************************************************************************/
 package com.osgifx.console.ui.roles;
 
+import static javafx.scene.control.TableColumn.SortType.ASCENDING;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 
@@ -103,6 +105,7 @@ private void createControls() {
 
         table.setItems(dataProvider.roles());
         TableFilter.forTableView(table).lazy(true).apply();
+        Fx.initSortOrder(table, roleNameColumn, ASCENDING);
     }
 
 }
diff --git a/...onsole.ui.services/src/main/java/com/osgifx/console/ui/services/ServicesFxController.java b/...onsole.ui.services/src/main/java/com/osgifx/console/ui/services/ServicesFxController.java
@@ -16,6 +16,7 @@
 package com.osgifx.console.ui.services;
 
 import static com.osgifx.console.event.topics.TableFilterUpdateTopics.UPDATE_SERVICE_FILTER_EVENT_TOPIC;
+import static javafx.scene.control.TableColumn.SortType.ASCENDING;
 import static org.osgi.service.component.ComponentConstants.COMPONENT_ID;
 
 import java.util.function.Predicate;
@@ -125,6 +126,7 @@ private void createControls() {
         table.setItems(filteredList);
 
         TableFilter.forTableView(table).lazy(true).apply();
+        Fx.initSortOrder(table, idColumn, ASCENDING);
     }
 
     @Inject

diff --git a/...x.console.ui.threads/src/main/java/com/osgifx/console/ui/threads/ThreadsFxController.java b/...x.console.ui.threads/src/main/java/com/osgifx/console/ui/threads/ThreadsFxController.java
@@ -15,6 +15,8 @@
  ******************************************************************************/
 package com.osgifx.console.ui.threads;
 
+import static javafx.scene.control.TableColumn.SortType.ASCENDING;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 
@@ -92,6 +94,7 @@ private void initCells() {
 
         table.setItems(dataProvider.threads());
         TableFilter.forTableView(table).lazy(true).apply();
+        Fx.initSortOrder(table, nameColumn, ASCENDING);
     }
 
 }
diff --git a/com.osgifx.console.util/src/main/java/com/osgifx/console/util/fx/Fx.java b/com.osgifx.console.util/src/main/java/com/osgifx/console/util/fx/Fx.java
@@ -37,6 +37,7 @@
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.TableCell;
 import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableColumn.SortType;
 import javafx.scene.control.TablePosition;
 import javafx.scene.control.TableView;
 import javafx.scene.control.Tooltip;
@@ -233,4 +234,12 @@ public static Node initStatusBarButton(final Runnable job,
         }
         return button;
     }
+
+    public static <C> void initSortOrder(final TableView<C> table,
+                                         final TableColumn<C, ?> column,
+                                         final SortType sortType) {
+        column.setSortType(sortType);
+        table.getSortOrder().add(column);
+        table.sort();
+    }
 }