From: amwaterhouse <Andrew Waterhouse>
Date: Wed, 9 Aug 2006 15:56:32 +0000 (+0000)
Subject: Check if groups have already been added or not
X-Git-Tag: Release_2_1~128
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d5b157fc64cc6e5f633a2f7ae991a29b7c557b94;p=jalview.git

Check if groups have already been added or not
---

diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index b83a004..314c357 100755
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@ -74,7 +74,6 @@ public class FeatureSettings extends JPanel
     if (af.getViewport().featuresDisplayed == null || fr.renderOrder==null)
        fr.findAllFeatures();
 
-
     setTableData();
 
     frame = new JInternalFrame();
@@ -83,7 +82,7 @@ public class FeatureSettings extends JPanel
     frame.setLayer(JLayeredPane.PALETTE_LAYER);
   }
 
-  public void setTableData()
+  synchronized public void setTableData()
   {
     alignmentHasFeatures = false;
 
@@ -125,14 +124,28 @@ public class FeatureSettings extends JPanel
              {
                visible = ( (Boolean) fr.featureGroups.get(group)).booleanValue();
              }
-             else
-             {
-               fr.featureGroups.put(group, new Boolean(visible));
+
                if (groupPanel == null)
                {
                  groupPanel = new JPanel();
                }
 
+               boolean alreadyAdded = false;
+               for(int g=0; g<groupPanel.getComponentCount(); g++)
+               {
+                 if(((JCheckBox)groupPanel.getComponent(g))
+                    .getText().equals(group))
+                 {
+                   alreadyAdded = true;
+                   break;
+                 }
+               }
+
+               if(alreadyAdded)
+                 continue;
+
+               fr.featureGroups.put(group, new Boolean(visible));
+
                final JCheckBox check = new JCheckBox(group, visible);
                check.setFont(new Font("Serif", Font.BOLD, 12));
                check.addItemListener(new ItemListener()
@@ -150,8 +163,6 @@ public class FeatureSettings extends JPanel
                });
                groupPanel.add(check);
              }
-           }
-
        }
 
        if (!allFeatures.contains(tmpfeatures[index].getType()))