From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 30 Oct 2006 16:59:52 +0000 (+0000)
Subject: Fix for feature name amended
X-Git-Tag: Release_2_2~194
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b0530d7ac372a4b770d381f263970de9ecdb4212;p=jalview.git

Fix for feature name amended
---

diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java
index 14dd1a0..2ca3ca3 100755
--- a/src/jalview/gui/FeatureRenderer.java
+++ b/src/jalview/gui/FeatureRenderer.java
@@ -426,6 +426,7 @@ public class FeatureRenderer
       return amendFeatures(sequences, features, true);
     }
 
+    int featureIndex = 0;
     boolean amendFeatures(SequenceI[] sequences,
                            final SequenceFeature [] features,
                            boolean newFeatures)
@@ -526,6 +527,7 @@ public class FeatureRenderer
       }
       else if (!newFeatures)
       {
+        featureIndex = 0;
         for(int f=0; f<features.length; f++)
         {
           name.addItem(features[f].getType().toString());
@@ -542,12 +544,16 @@ public class FeatureRenderer
           public void itemStateChanged(ItemEvent e)
           {
             int index = name.getSelectedIndex();
-            description.setText(features[index].getDescription());
-            source.setSelectedItem(features[index].getFeatureGroup());
-            start.setText(features[index].getBegin() + "");
-            end.setText(features[index].getEnd() + "");
-            colour.setBackground(
-                getColour(name.getSelectedItem().toString()));
+            if(index!=-1)
+            {
+              featureIndex = index;
+              description.setText(features[index].getDescription());
+              source.setSelectedItem(features[index].getFeatureGroup());
+              start.setText(features[index].getBegin() + "");
+              end.setText(features[index].getEnd() + "");
+              colour.setBackground(
+                  getColour(name.getSelectedItem().toString()));
+            }
           }
         });
 
@@ -583,7 +589,8 @@ public class FeatureRenderer
 
       if(!newFeatures)
       {
-        SequenceFeature sf = features[name.getSelectedIndex()];
+        SequenceFeature sf = features[featureIndex];
+
         if(reply==JOptionPane.NO_OPTION)
           sequences[0].getDatasetSequence().deleteFeature(sf);
         else if(reply==JOptionPane.YES_OPTION)
@@ -638,6 +645,10 @@ public class FeatureRenderer
           return false;
       }
 
+      if(name.getSelectedIndex()==-1)
+        findAllFeatures();
+
+
       return true;
     }