Can set description for new features

diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java
index d20fa63..ec03b85 100755 (executable)
--- a/src/jalview/gui/FeatureRenderer.java
+++ b/src/jalview/gui/FeatureRenderer.java
@@ -25,9 +25,7 @@ import java.awt.*;
 import java.util.*;\r
 \r
 import java.awt.image.*;\r
-import javax.swing.JComboBox;\r
-import javax.swing.JPanel;\r
-import javax.swing.JLabel;\r
+import javax.swing.*;\r
 import javax.swing.JOptionPane;\r
 \r
 \r
@@ -417,25 +415,36 @@ public class FeatureRenderer
     }\r
 \r
 \r
-    static String lastFeatureAdded = "feature_1";\r
-    static String lastSourceAdded = "Jalview";\r
+    static String lastFeatureAdded;\r
+    static String lastFeatureGroupAdded;\r
+    static String lastDescriptionAdded;\r
 \r
     public boolean createNewFeatures(SequenceI[] sequences,\r
                                   SequenceFeature [] features)\r
     {\r
 \r
+      JPanel bigPanel = new JPanel(new BorderLayout());\r
       JComboBox name = new JComboBox();\r
       JComboBox source = new JComboBox();\r
+      JTextArea description = new JTextArea(3,25);\r
 \r
       JPanel panel = new JPanel(new GridLayout(2, 2));\r
-      panel.add(new JLabel("New Sequence Feature Name"));\r
+      panel.add(new JLabel("New Sequence Feature Name: ",JLabel.RIGHT));\r
       panel.add(name);\r
-      panel.add(new JLabel("Source:"));\r
+      panel.add(new JLabel("Feature Group: ", JLabel.RIGHT));\r
       panel.add(source);\r
-     // name.setPreferredSize(new Dimension(300, 20));\r
       name.setEditable(true);\r
       source.setEditable(true);\r
 \r
+      bigPanel.add(panel, BorderLayout.NORTH);\r
+      panel = new JPanel();\r
+      panel.add(new JLabel("Description: ", JLabel.RIGHT));\r
+      description.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+      description.setLineWrap(true);\r
+      panel.add(new JScrollPane(description));\r
+      bigPanel.add(panel, BorderLayout.CENTER);\r
+\r
+\r
       Enumeration en;\r
       if (av.featuresDisplayed != null)\r
       {\r
@@ -455,11 +464,28 @@ public class FeatureRenderer
         }\r
       }\r
 \r
+      if (lastFeatureAdded == null)\r
+        if (features[0].type != null)\r
+          lastFeatureAdded = features[0].type;\r
+        else\r
+          lastFeatureAdded = "feature_1";\r
+\r
+      if (lastFeatureGroupAdded == null)\r
+        if (features[0].featureGroup != null)\r
+          lastFeatureGroupAdded = features[0].featureGroup;\r
+        else\r
+          lastFeatureAdded = "Jalview";\r
+\r
+\r
       name.setSelectedItem(lastFeatureAdded);\r
-      source.setSelectedItem(lastSourceAdded);\r
+      source.setSelectedItem(lastFeatureGroupAdded);\r
+      description.setText(\r
+          lastDescriptionAdded == null ?\r
+          features[0].description : lastDescriptionAdded);\r
+\r
 \r
       int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop,\r
-          panel, "Create New Sequence Feature(s)",\r
+          bigPanel, "Create New Sequence Feature(s)",\r
           JOptionPane.OK_CANCEL_OPTION);\r
 \r
 \r
@@ -468,12 +494,19 @@ public class FeatureRenderer
          && source.getSelectedItem()!=null)\r
       {\r
         lastFeatureAdded = name.getSelectedItem().toString();\r
-        lastSourceAdded = source.getSelectedItem().toString();\r
+        lastFeatureGroupAdded = source.getSelectedItem().toString();\r
+        lastDescriptionAdded = description.getText().replaceAll("\n"," ");\r
+\r
+        jalview.io.FeaturesFile ffile = new jalview.io.FeaturesFile();\r
+\r
+\r
         for(int i=0; i<sequences.length; i++)\r
         {\r
           features[i].type = lastFeatureAdded;\r
-          features[i].featureGroup = lastSourceAdded;\r
+          features[i].featureGroup = lastFeatureGroupAdded;\r
+          features[i].description = lastDescriptionAdded;\r
           sequences[i].addSequenceFeature(features[i]);\r
+          ffile.parseDescriptionHTML(features[i], false);\r
         }\r
 \r
         if (av.featuresDisplayed == null)\r
@@ -482,7 +515,7 @@ public class FeatureRenderer
         if(featureGroups==null)\r
           featureGroups = new Hashtable();\r
 \r
-        featureGroups.put(lastSourceAdded, new Boolean(true));\r
+        featureGroups.put(lastFeatureGroupAdded, new Boolean(true));\r
 \r
         Color col = getColour(lastFeatureAdded);\r
         if(col==null)\r
@@ -491,7 +524,7 @@ public class FeatureRenderer
           setColour(lastFeatureAdded, col);\r
         }\r
 \r
-        av.featuresDisplayed.put(lastSourceAdded, new Integer(col.getRGB()));\r
+        av.featuresDisplayed.put(lastFeatureGroupAdded, new Integer(col.getRGB()));\r
         findAllFeatures();\r
         return true;\r
       }\r