From: amwaterhouse <Andrew Waterhouse>
Date: Wed, 11 Apr 2007 13:02:43 +0000 (+0000)
Subject: Can add features with no group
X-Git-Tag: Release_2_3~256
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4f1f764c09427cd63c3e355fa729da86735a8194;p=jalview.git

Can add features with no group
---

diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java
index cd188d2..c59ec1d 100755
--- a/src/jalview/gui/FeatureRenderer.java
+++ b/src/jalview/gui/FeatureRenderer.java
@@ -777,16 +777,17 @@ public class FeatureRenderer
 
     jalview.io.FeaturesFile ffile = new jalview.io.FeaturesFile();
 
-    if (reply == JOptionPane.OK_OPTION
-        && name.getText() != null
-        && source.getText() != null)
+    if (reply == JOptionPane.OK_OPTION && name.getText().length()>0)
     {
       // This ensures that the last sequence
       // is refreshed and new features are rendered
       lastSeq = null;
-      lastFeatureAdded = name.getText();
-      lastFeatureGroupAdded = source.getText();
+      lastFeatureAdded = name.getText().trim();
+      lastFeatureGroupAdded = source.getText().trim();
       lastDescriptionAdded = description.getText().replaceAll("\n", " ");
+
+      if(lastFeatureGroupAdded.length()<1)
+        lastFeatureGroupAdded = null;
     }
 
     if (!newFeatures)
@@ -839,14 +840,16 @@ public class FeatureRenderer
           featureGroups = new Hashtable();
         }
 
-        featureGroups.put(lastFeatureGroupAdded, new Boolean(true));
 
         Color col = colour.getBackground();
         setColour(lastFeatureAdded, colour.getBackground());
 
-        av.featuresDisplayed.put(lastFeatureGroupAdded,
-                                 new Integer(col.getRGB()));
-
+        if(lastFeatureGroupAdded!=null)
+        {
+          featureGroups.put(lastFeatureGroupAdded, new Boolean(true));
+          av.featuresDisplayed.put(lastFeatureGroupAdded,
+                                   new Integer(col.getRGB()));
+        }
         findAllFeatures();
 
         return true;