Fix issue #1604

gephi · Oct 23, 2016 · 8a08f89 · 8a08f89
1 parent 26039b4
commit 8a08f89
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.../DesktopAppearance/src/main/java/org/gephi/desktop/appearance/AppearanceTopComponent.java b/.../DesktopAppearance/src/main/java/org/gephi/desktop/appearance/AppearanceTopComponent.java
@@ -253,7 +253,12 @@ public void run() {
                         Collections.sort(rows, new Comparator<Function>() {
                             @Override
                             public int compare(Function o1, Function o2) {
-                                return o1.getUI().getDisplayName().compareTo(o2.getUI().getDisplayName());
+                                if(o1.isAttribute() && !o2.isAttribute()) {
+                                    return 1;
+                                } else if(!o1.isAttribute() && o2.isAttribute()) {
+                                    return -1;
+                                }
+                                return o1.toString().compareTo(o2.toString());
                             }
                         });
                         for (Function r : rows) {

diff --git a/modules/DesktopAppearance/src/main/nbm/manifest.mf b/modules/DesktopAppearance/src/main/nbm/manifest.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 AutoUpdate-Essential-Module: true
 OpenIDE-Module-Localizing-Bundle: org/gephi/desktop/appearance/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.9.1.1
+OpenIDE-Module-Specification-Version: 0.9.1.2
 OpenIDE-Module-Display-Category: Gephi UI
 OpenIDE-Module-Name: Desktop Appearance