JAL-3832 Gui working, with 3DBeacons parameters

[jalview.git] / src / jalview / fts / core / FTSDataColumnPreferences.java

diff --git a/src/jalview/fts/core/FTSDataColumnPreferences.java b/src/jalview/fts/core/FTSDataColumnPreferences.java
index cb6249e..f865ac3 100644 (file)
--- a/src/jalview/fts/core/FTSDataColumnPreferences.java
+++ b/src/jalview/fts/core/FTSDataColumnPreferences.java
@@ -96,11 +96,12 @@ public class FTSDataColumnPreferences extends JScrollPane
       break;
     }
 
-    Object[][] data = new Object[allFTSDataColumns.size() - 1][3];
+    Object[][] data = new Object[allFTSDataColumns.size()][3];
 
     int x = 0;
     for (FTSDataColumnI field : allFTSDataColumns)
-    {
+    {   
+      //System.out.println("allFTSDataColumns==" + allFTSDataColumns);
       if (field.getName().equalsIgnoreCase("all"))
       {
         continue;
@@ -112,6 +113,7 @@ public class FTSDataColumnPreferences extends JScrollPane
         data[x++] = new Object[] { ftsRestClient
                 .getAllDefaultDisplayedFTSDataColumns().contains(field),
             field.getName(), field.getGroup() };
+        //System.out.println(" PUIS " + field.getName() + " ET AUSSI " + field.getGroup() + "X = " + x);
         break;
       case STRUCTURE_CHOOSER:
         data[x++] = new Object[] { structSummaryColumns.contains(field),
@@ -155,7 +157,6 @@ public class FTSDataColumnPreferences extends JScrollPane
       int columnIndexToSort = 2;
       sortKeys.add(new RowSorter.SortKey(columnIndexToSort,
               SortOrder.ASCENDING));
-      sorter.setSortKeys(sortKeys);
       sorter.setComparator(columnIndexToSort,
               new Comparator<FTSDataColumnGroupI>()
               {
@@ -166,7 +167,8 @@ public class FTSDataColumnPreferences extends JScrollPane
                   return o1.getSortOrder() - o2.getSortOrder();
                 }
               });
-      sorter.sort();
+      sorter.setSortKeys(sortKeys);
+      // BH 2018 setSortKeys does a sort      sorter.sort();
 
       tbl_FTSDataColumnPrefs
               .setAutoResizeMode(JTable.AUTO_RESIZE_NEXT_COLUMN);