validate groupPanel

[jalview.git] / src / jalview / gui / FeatureSettings.java

diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index ad9ad1d..c19ae5b 100755 (executable)
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@ -31,8 +31,6 @@ import jalview.io.JalviewFileChooser;
 import java.awt.BorderLayout;\r
 import java.awt.Font;\r
 import java.awt.Color;\r
-import org.biojava.dasobert.dasregistry.DasSource;\r
-import org.biojava.dasobert.dasregistry.DasCoordinateSystem;\r
 \r
 public class FeatureSettings extends JPanel\r
 {\r
@@ -50,7 +48,6 @@ public class FeatureSettings extends JPanel
   JSlider transparency = new JSlider();\r
 \r
   JPanel transPanel = new JPanel(new FlowLayout());\r
-  boolean alignmentHasFeatures = false;\r
 \r
   public FeatureSettings(AlignFrame af)\r
   {\r
@@ -68,6 +65,54 @@ public class FeatureSettings extends JPanel
      ex.printStackTrace();\r
    }\r
 \r
+   table = new JTable();\r
+   table.getTableHeader().setFont(new Font("Verdana", Font.PLAIN, 12));\r
+   table.setFont(new Font("Verdana", Font.PLAIN, 12));\r
+   table.setDefaultRenderer(Color.class,\r
+                            new ColorRenderer());\r
+\r
+   table.setDefaultEditor(Color.class,\r
+                          new ColorEditor());\r
+\r
+   table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+\r
+   table.addMouseListener(new MouseAdapter()\r
+   {\r
+     public void mousePressed(MouseEvent evt)\r
+     {\r
+       selectedRow = table.rowAtPoint(evt.getPoint());\r
+     }\r
+   });\r
+\r
+   table.addMouseMotionListener(new MouseMotionAdapter()\r
+   {\r
+     public void mouseDragged(MouseEvent evt)\r
+     {\r
+       int newRow = table.rowAtPoint(evt.getPoint());\r
+       if (newRow != selectedRow\r
+           && selectedRow != -1\r
+           && newRow != -1)\r
+       {\r
+         Object[] temp = new Object[3];\r
+         temp[0] = table.getValueAt(selectedRow, 0);\r
+         temp[1] = table.getValueAt(selectedRow, 1);\r
+         temp[2] = table.getValueAt(selectedRow, 2);\r
+\r
+         table.setValueAt(table.getValueAt(newRow, 0), selectedRow, 0);\r
+         table.setValueAt(table.getValueAt(newRow, 1), selectedRow, 1);\r
+         table.setValueAt(table.getValueAt(newRow, 2), selectedRow, 2);\r
+\r
+         table.setValueAt(temp[0], newRow, 0);\r
+         table.setValueAt(temp[1], newRow, 1);\r
+         table.setValueAt(temp[2], newRow, 2);\r
+\r
+         selectedRow = newRow;\r
+       }\r
+     }\r
+   });\r
+\r
+   scrollPane.setViewportView(table);\r
+\r
     dassourceBrowser = new DasSourceBrowser();\r
     dasSettingsPane.add(dassourceBrowser, BorderLayout.CENTER);\r
 \r
@@ -76,7 +121,6 @@ public class FeatureSettings extends JPanel
     if (af.getViewport().featuresDisplayed == null || fr.renderOrder==null)\r
        fr.findAllFeatures();\r
 \r
-\r
     setTableData();\r
 \r
     frame = new JInternalFrame();\r
@@ -85,10 +129,8 @@ public class FeatureSettings extends JPanel
     frame.setLayer(JLayeredPane.PALETTE_LAYER);\r
   }\r
 \r
-  public void setTableData()\r
+  synchronized public void setTableData()\r
   {\r
-    alignmentHasFeatures = false;\r
-\r
     if (fr.featureGroups == null)\r
       fr.featureGroups = new Hashtable();\r
 \r
@@ -102,8 +144,6 @@ public class FeatureSettings extends JPanel
       if (af.getViewport().alignment.getSequenceAt(i).getDatasetSequence().getSequenceFeatures() == null)\r
         continue;\r
 \r
-      alignmentHasFeatures = true;\r
-\r
       tmpfeatures = af.getViewport().alignment.getSequenceAt(i).getDatasetSequence().getSequenceFeatures();\r
 \r
       int index = 0;\r
@@ -127,14 +167,28 @@ public class FeatureSettings extends JPanel
              {\r
                visible = ( (Boolean) fr.featureGroups.get(group)).booleanValue();\r
              }\r
-             else\r
-             {\r
-               fr.featureGroups.put(group, new Boolean(visible));\r
+\r
                if (groupPanel == null)\r
                {\r
                  groupPanel = new JPanel();\r
                }\r
 \r
+               boolean alreadyAdded = false;\r
+               for(int g=0; g<groupPanel.getComponentCount(); g++)\r
+               {\r
+                 if(((JCheckBox)groupPanel.getComponent(g))\r
+                    .getText().equals(group))\r
+                 {\r
+                   alreadyAdded = true;\r
+                   break;\r
+                 }\r
+               }\r
+\r
+               if(alreadyAdded)\r
+                 continue;\r
+\r
+               fr.featureGroups.put(group, new Boolean(visible));\r
+\r
                final JCheckBox check = new JCheckBox(group, visible);\r
                check.setFont(new Font("Serif", Font.BOLD, 12));\r
                check.addItemListener(new ItemListener()\r
@@ -152,8 +206,6 @@ public class FeatureSettings extends JPanel
                });\r
                groupPanel.add(check);\r
              }\r
-           }\r
-\r
        }\r
 \r
        if (!allFeatures.contains(tmpfeatures[index].getType()))\r
@@ -164,20 +216,9 @@ public class FeatureSettings extends JPanel
     }\r
   }\r
 \r
-\r
-    if(!alignmentHasFeatures)\r
-     {\r
-    //   try\r
-     //  { frame.setClosed(true);  }\r
-    //   catch (Exception ex){}\r
-\r
-    //   JOptionPane.showInternalMessageDialog(\r
-    ///       Desktop.desktop, "No features have been added to this alignment!",\r
-    //\r
-   //    return;\r
-     }\r
-\r
      resetTable(false);\r
+\r
+     validate();\r
   }\r
 \r
 \r
@@ -262,54 +303,9 @@ public class FeatureSettings extends JPanel
       System.arraycopy(data,0,originalData,0,data.length);\r
     }\r
 \r
-    table = new JTable(new FeatureTableModel(data));\r
-    scrollPane.setViewportView(table);\r
-    table.getTableHeader().setFont(new Font("Verdana", Font.PLAIN, 12));\r
-    table.setFont(new Font("Verdana", Font.PLAIN, 12));\r
-    table.setDefaultRenderer(Color.class,\r
-                         new ColorRenderer());\r
-\r
-    table.setDefaultEditor(Color.class,\r
-                      new ColorEditor());\r
-\r
+    table.setModel(new FeatureTableModel(data));\r
     table.getColumnModel().getColumn(0).setPreferredWidth(200);\r
 \r
-    table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
-\r
-    table.addMouseListener(new MouseAdapter()\r
-        {\r
-          public void mousePressed(MouseEvent evt)\r
-          {\r
-            selectedRow = table.rowAtPoint(evt.getPoint());\r
-          }\r
-        });\r
-\r
-    table.addMouseMotionListener(new MouseMotionAdapter()\r
-        {\r
-          public void mouseDragged(MouseEvent evt)\r
-          {\r
-            int newRow = table.rowAtPoint(evt.getPoint());\r
-            if(newRow!=selectedRow\r
-               && selectedRow!=-1\r
-               && newRow!=-1)\r
-            {\r
-              Object[] temp = new Object[3];\r
-              temp[0] = table.getValueAt(selectedRow, 0);\r
-              temp[1] = table.getValueAt(selectedRow, 1);\r
-              temp[2] = table.getValueAt(selectedRow, 2);\r
-\r
-              table.setValueAt(table.getValueAt(newRow, 0), selectedRow, 0);\r
-              table.setValueAt(table.getValueAt(newRow, 1), selectedRow, 1);\r
-              table.setValueAt(table.getValueAt(newRow, 2), selectedRow, 2);\r
-\r
-              table.setValueAt(temp[0], newRow, 0);\r
-              table.setValueAt(temp[1], newRow, 1);\r
-              table.setValueAt(temp[2], newRow, 2);\r
-\r
-              selectedRow = newRow;\r
-            }\r
-          }\r
-    });\r
 \r
     if (groupPanel != null)\r
     {\r