develop merge

[jalview.git] / src / jalview / jbgui / PDBDocFieldPreferences.java

diff --git a/src/jalview/jbgui/PDBDocFieldPreferences.java b/src/jalview/jbgui/PDBDocFieldPreferences.java
index 875eb2e..da67196 100644 (file)
--- a/src/jalview/jbgui/PDBDocFieldPreferences.java
+++ b/src/jalview/jbgui/PDBDocFieldPreferences.java
@@ -21,9 +21,11 @@
 package jalview.jbgui;
 
 import jalview.ws.dbsources.PDBRestClient.PDBDocField;
+import jalview.ws.dbsources.PDBRestClient.PDBDocField.Group;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -36,6 +38,7 @@ import javax.swing.table.AbstractTableModel;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
 
+
 @SuppressWarnings("serial")
 public class PDBDocFieldPreferences extends JScrollPane
 {
@@ -82,7 +85,7 @@ public class PDBDocFieldPreferences extends JScrollPane
       columnNames = new String[] { "", "Display", "Group" };
       break;
     case STRUCTURE_CHOOSER:
-      columnNames = new String[] { " ", "Display", "Group" };
+      columnNames = new String[] { "", "Display", "Group" };
       break;
     case PREFERENCES:
       columnNames = new String[] { "PDB Field", "Show in search summary",
@@ -148,6 +151,16 @@ public class PDBDocFieldPreferences extends JScrollPane
       sortKeys.add(new RowSorter.SortKey(columnIndexToSort,
               SortOrder.ASCENDING));
       sorter.setSortKeys(sortKeys);
+      sorter.setComparator(
+              columnIndexToSort,
+              new Comparator<jalview.ws.dbsources.PDBRestClient.PDBDocField.Group>()
+              {
+                @Override
+                public int compare(Group o1, Group o2)
+                {
+                  return o1.getSortOrder() - o2.getSortOrder();
+                }
+              });
       sorter.sort();
       break;
     case PREFERENCES: