Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into

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

diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index 6a59e19..9165a3d 100644 (file)
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@ -898,13 +898,15 @@ public class FeatureSettings extends JPanel
     chooser.setDialogTitle(
             MessageManager.getString("label.load_feature_colours"));
     chooser.setToolTipText(MessageManager.getString("action.load"));
-    chooser.response(new RunResponse(JalviewFileChooser.APPROVE_OPTION){
-
-               @Override
-               public void run() {
-                     File file = chooser.getSelectedFile();
-                     load(file);
-               }});
+    chooser.addResponse(0, new RunResponse(JalviewFileChooser.APPROVE_OPTION)
+    {
+         @Override
+         public void run() 
+         {
+           File file = chooser.getSelectedFile();
+               load(file);
+         }
+       });
     chooser.showOpenDialog(this);
   }
 
@@ -1146,7 +1148,7 @@ public class FeatureSettings extends JPanel
     }
 
     updateFeatureRenderer(data, false);
-    repaintTable();
+    table.repaint();
   }
 
   /**
@@ -1154,6 +1156,8 @@ public class FeatureSettings extends JPanel
    */
   private void repaintTable() 
   {
+         if (true)
+                 return;
        // BH 2018
        // Here is a needed intervention
        // because generally we don't "repaint"
@@ -2009,7 +2013,8 @@ class FeatureIcon implements Icon
         g.fillRect(s1, 0, e1 - s1, height);
       }
       g.setColor(gcol.getMaxColour());
-      g.fillRect(0, e1, width - e1, height);
+//      g.fillRect(0, e1, width - e1, height);  // BH 2018
+      g.fillRect(e1, 0, width - e1, height);
     }
   }
 }