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

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

diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index 76a32bc..27676d5 100644 (file)
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@ -36,7 +36,6 @@ import jalview.io.JalviewFileView;
 import jalview.schemes.FeatureColour;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
-import jalview.util.dialogrunner.RunResponse;
 import jalview.viewmodel.seqfeatures.FeatureRendererModel.FeatureSettingsBean;
 import jalview.xml.binding.jalview.JalviewUserColours;
 import jalview.xml.binding.jalview.JalviewUserColours.Colour;
@@ -342,7 +341,7 @@ public class FeatureSettings extends JPanel
             data[i + direction] = temp;
           }
           updateFeatureRenderer(data);
-          repaintTable();
+          table.repaint();
           selectedRow = newRow;
         }
       }
@@ -472,6 +471,8 @@ public class FeatureSettings extends JPanel
       {
         if (e.getSource() == variableColourCB)
         {
+          men.setVisible(true); // BH 2018 for JavaScript because this is a checkbox
+          men.setVisible(false); // BH 2018 for JavaScript because this is a checkbox
           if (featureColour.isSimpleColour())
           {
             /*
@@ -512,7 +513,9 @@ public class FeatureSettings extends JPanel
              */
             FeatureColourI fci = fr.getFeatureColours().get(type);
             table.setValueAt(fci, rowSelected, COLOUR_COLUMN);
-            table.validate();
+            // BH 2018 setting a table value does not invalidate it.
+            System.out.println("FeatureSettings is valied" + table.isValid());
+//            table.validate();
           }
         }
       }
@@ -898,13 +901,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.setResponseHandler(0, new Runnable()
+    {
+         @Override
+         public void run() 
+         {
+           File file = chooser.getSelectedFile();
+               load(file);
+         }
+       });
     chooser.showOpenDialog(this);
   }
 
@@ -969,7 +974,7 @@ public class FeatureSettings extends JPanel
                 .getData();
         ensureOrder(data);
         updateFeatureRenderer(data, false);
-        repaintTable();
+        table.repaint();
       }
     } catch (Exception ex)
     {
@@ -1083,7 +1088,7 @@ public class FeatureSettings extends JPanel
       data[i][SHOW_COLUMN] = !(Boolean) data[i][SHOW_COLUMN];
     }
     updateFeatureRenderer(data, true);
-    repaintTable();
+    table.repaint();
   }
 
   public void orderByAvWidth()
@@ -1149,29 +1154,6 @@ public class FeatureSettings extends JPanel
     table.repaint();
   }
 
-  /**
-   * Repaints the table using alternative code for Java and J2S
-   */
-  private void repaintTable() 
-  {
-         if (true)
-                 return;
-       // BH 2018
-       // Here is a needed intervention
-       // because generally we don't "repaint"
-       // the table. We re-create the HTML divs
-       // that is associated with it. A better
-       // way to do this would be to fire a property change.
-       @SuppressWarnings("unused")
-       TableUI ui = table.getUI();
-       /**
-        * @j2sNative ui.repaintTable$();
-        */
-       {
-         table.repaint();
-       }
-  }
-
   public void close()
   {
     try