JAL-964 JAL-2510 update Feature Settings from Amend Features, warn if

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

diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java
index 50a8689..7be3e51 100644 (file)
--- a/src/jalview/gui/FeatureRenderer.java
+++ b/src/jalview/gui/FeatureRenderer.java
@@ -54,6 +54,8 @@ import javax.swing.JSpinner;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.SwingConstants;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
 
 /**
  * DOCUMENT ME!
@@ -131,8 +133,51 @@ public class FeatureRenderer extends
     featureIndex = 0;
 
     final JPanel mainPanel = new JPanel(new BorderLayout());
+
     final JTextField name = new JTextField(25);
-    final JTextField source = new JTextField(25);
+    name.getDocument().addDocumentListener(new DocumentListener()
+    {
+      @Override
+      public void insertUpdate(DocumentEvent e)
+      {
+        warnIfTypeHidden(mainPanel, name.getText());
+      }
+
+      @Override
+      public void removeUpdate(DocumentEvent e)
+      {
+        warnIfTypeHidden(mainPanel, name.getText());
+      }
+
+      @Override
+      public void changedUpdate(DocumentEvent e)
+      {
+        warnIfTypeHidden(mainPanel, name.getText());
+      }
+    });
+
+    final JTextField group = new JTextField(25);
+    group.getDocument().addDocumentListener(new DocumentListener()
+    {
+      @Override
+      public void insertUpdate(DocumentEvent e)
+      {
+        warnIfGroupHidden(mainPanel, group.getText());
+      }
+
+      @Override
+      public void removeUpdate(DocumentEvent e)
+      {
+        warnIfGroupHidden(mainPanel, group.getText());
+      }
+
+      @Override
+      public void changedUpdate(DocumentEvent e)
+      {
+        warnIfGroupHidden(mainPanel, group.getText());
+      }
+    });
+
     final JTextArea description = new JTextArea(3, 25);
     final JSpinner start = new JSpinner();
     final JSpinner end = new JSpinner();
@@ -222,7 +267,7 @@ public class FeatureRenderer extends
             SequenceFeature sf = features.get(index);
             name.setText(sf.getType());
             description.setText(sf.getDescription());
-            source.setText(sf.getFeatureGroup());
+            group.setText(sf.getFeatureGroup());
             start.setValue(new Integer(sf.getBegin()));
             end.setValue(new Integer(sf.getEnd()));
 
@@ -246,8 +291,6 @@ public class FeatureRenderer extends
 
       gridPanel.add(choosePanel);
     }
-    // ////////
-    // ////////////////////////////////////
 
     JPanel namePanel = new JPanel();
     gridPanel.add(namePanel);
@@ -259,7 +302,7 @@ public class FeatureRenderer extends
     gridPanel.add(groupPanel);
     groupPanel.add(new JLabel(MessageManager.getString("label.group:"),
             JLabel.RIGHT));
-    groupPanel.add(source);
+    groupPanel.add(group);
 
     JPanel colourPanel = new JPanel();
     gridPanel.add(colourPanel);
@@ -336,12 +379,12 @@ public class FeatureRenderer extends
     if (create)
     {
       name.setText(lastFeatureAdded);
-      source.setText(lastFeatureGroupAdded);
+      group.setText(lastFeatureGroupAdded);
     }
     else
     {
       name.setText(firstFeature.getType());
-      source.setText(firstFeature.getFeatureGroup());
+      group.setText(firstFeature.getFeatureGroup());
     }
 
     start.setValue(new Integer(firstFeature.getBegin()));
@@ -380,7 +423,7 @@ public class FeatureRenderer extends
     if (reply == JvOptionPane.OK_OPTION && name.getText().length() > 0)
     {
       lastFeatureAdded = name.getText().trim();
-      lastFeatureGroupAdded = source.getText().trim();
+      lastFeatureGroupAdded = group.getText().trim();
       lastDescriptionAdded = description.getText().replaceAll("\n", " ");
       // TODO: determine if the null feature group is valid
       if (lastFeatureGroupAdded.length() < 1)
@@ -399,19 +442,21 @@ public class FeatureRenderer extends
          * NO_OPTION corresponds to the Delete button
          */
         sequences.get(0).getDatasetSequence().deleteFeature(sf);
+        // update Feature Settings for removal of feature / group
+        featuresAdded();
       }
       else if (reply == JvOptionPane.YES_OPTION)
       {
         /*
          * YES_OPTION corresponds to the Amend button
          */
-        boolean typeChanged = !lastFeatureAdded.equals(sf.type);
+        boolean typeOrGroupChanged = (!lastFeatureAdded.equals(sf.type) || !lastFeatureGroupAdded
+                .equals(sf.featureGroup));
         sf.type = lastFeatureAdded;
         sf.featureGroup = lastFeatureGroupAdded;
         sf.description = lastDescriptionAdded;
 
         setColour(sf.type, fcol);
-        getFeaturesDisplayed().setVisible(sf.type);
 
         try
         {
@@ -422,9 +467,9 @@ public class FeatureRenderer extends
         }
 
         ffile.parseDescriptionHTML(sf, false);
-        if (typeChanged)
+        if (typeOrGroupChanged)
         {
-          findAllFeatures();
+          featuresAdded();
         }
       }
     }
@@ -444,14 +489,9 @@ public class FeatureRenderer extends
           ffile.parseDescriptionHTML(sf, false);
         }
 
-        if (lastFeatureGroupAdded != null)
-        {
-          setGroupVisibility(lastFeatureGroupAdded, true);
-        }
         setColour(lastFeatureAdded, fcol);
-        setVisible(lastFeatureAdded);
 
-        findAllFeatures(false);
+        featuresAdded();
 
         alignPanel.paintAlignment(true);
 
@@ -469,6 +509,42 @@ public class FeatureRenderer extends
   }
 
   /**
+   * Show a warning message if the entered type is one that is currently hidden
+   * 
+   * @param panel
+   * @param type
+   */
+  protected void warnIfTypeHidden(JPanel panel, String type)
+  {
+    if (getRenderOrder().contains(type))
+    {
+      if (!showFeatureOfType(type))
+      {
+        String msg = MessageManager.formatMessage("label.warning_hidden",
+                MessageManager.getString("label.feature_type"), type);
+        JvOptionPane.showMessageDialog(panel, msg, "",
+                JvOptionPane.OK_OPTION);
+      }
+    }
+  }
+
+  /**
+   * Show a warning message if the entered group is one that is currently hidden
+   * 
+   * @param panel
+   * @param group
+   */
+  protected void warnIfGroupHidden(JPanel panel, String group)
+  {
+    if (featureGroups.containsKey(group) && !featureGroups.get(group))
+    {
+      String msg = MessageManager.formatMessage("label.warning_hidden",
+              MessageManager.getString("label.group"), group);
+      JvOptionPane.showMessageDialog(panel, msg, "", JvOptionPane.OK_OPTION);
+    }
+  }
+
+  /**
    * update the amend feature button dependent on the given style
    * 
    * @param bigPanel