JAL-2808 i18n, widget state settings

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

diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index 4e4d2cb..01c40d5 100644 (file)
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@ -53,6 +53,7 @@ import java.awt.FlowLayout;
 import java.awt.Font;
 import java.awt.Graphics;
 import java.awt.GridLayout;
+import java.awt.LayoutManager;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -199,6 +200,9 @@ public class FeatureSettings extends JPanel
 
   private JTextArea filtersAsText;
 
+  // set white normally, black to debug layout
+  private Color debugBorderColour = Color.white;
+
   /**
    * Constructor
    * 
@@ -1371,6 +1375,7 @@ public class FeatureSettings extends JPanel
      */
     JPanel andOrPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
     andOrPanel.setBackground(Color.white);
+    andOrPanel.setBorder(BorderFactory.createLineBorder(debugBorderColour));
     andFilters = new JRadioButton("And");
     orFilters = new JRadioButton("Or");
     ActionListener actionListener = new ActionListener()
@@ -1397,8 +1402,9 @@ public class FeatureSettings extends JPanel
      * panel with filters - populated by refreshFiltersDisplay
      */
     chooseFiltersPanel = new JPanel();
-    chooseFiltersPanel.setLayout(new BoxLayout(chooseFiltersPanel,
-            BoxLayout.Y_AXIS));
+    LayoutManager box = new BoxLayout(chooseFiltersPanel,
+            BoxLayout.Y_AXIS);
+    chooseFiltersPanel.setLayout(box);
     filtersPanel.add(chooseFiltersPanel);
 
     /*
@@ -1454,12 +1460,12 @@ public class FeatureSettings extends JPanel
     }
     if (!found)
     {
-      filteredFeatureChoice // todo i18n
-              .addItem("No filterable feature attributes known");
+      filteredFeatureChoice.addItem(MessageManager
+              .getString("label.no_feature_attributes"));
+      filteredFeatureChoice.setEnabled(false);
     }
 
     filteredFeatureChoice.addItemListener(listener);
-
   }
 
   /**
@@ -1515,9 +1521,11 @@ public class FeatureSettings extends JPanel
               .getCondition();
       String pattern = filter.getMatcher().getPattern();
       JPanel row = addFilter(key, attNames, condition, pattern, filterIndex);
+      row.setBorder(BorderFactory.createLineBorder(debugBorderColour));
       chooseFiltersPanel.add(row);
       filterIndex++;
     }
+    // chooseFiltersPanel.add(Box.createVerticalGlue());
 
     filtersPane.validate();
     filtersPane.repaint();
@@ -1549,9 +1557,6 @@ public class FeatureSettings extends JPanel
     filterRow.setBackground(Color.white);
 
     /*
-     * inputs for attribute, condition, pattern
-     */
-    /*
      * drop-down choice of attribute, with description as a tooltip 
      * if we can obtain it
      */
@@ -1634,7 +1639,7 @@ public class FeatureSettings extends JPanel
      */
     if (pattern != null && pattern.trim().length() > 0)
     {
-      // todo: gif for - button
+      // todo: gif for button drawing '-' or 'x'
       JButton removeCondition = new BasicArrowButton(SwingConstants.WEST);
       removeCondition.setToolTipText(MessageManager
               .getString("label.delete_row"));