Merge branch 'JAL-3048dialogRunner2' into Jalview-BH/JAL-3026-JAL-3063-JAXB
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 18 Dec 2018 17:58:39 +0000 (17:58 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 18 Dec 2018 17:58:39 +0000 (17:58 +0000)
1  2 
src/jalview/gui/FeatureSettings.java

@@@ -36,7 -36,6 +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 +341,7 @@@ public class FeatureSettings extends JP
              data[i + direction] = temp;
            }
            updateFeatureRenderer(data);
 -          repaintTable();
 +          table.repaint();
            selectedRow = newRow;
          }
        }
      chooser.setDialogTitle(
              MessageManager.getString("label.load_feature_colours"));
      chooser.setToolTipText(MessageManager.getString("action.load"));
-     chooser.addResponse(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);
    }
  
                  .getData();
          ensureOrder(data);
          updateFeatureRenderer(data, false);
 -        repaintTable();
 +        table.repaint();
        }
      } catch (Exception ex)
      {
        data[i][SHOW_COLUMN] = !(Boolean) data[i][SHOW_COLUMN];
      }
      updateFeatureRenderer(data, true);
 -    repaintTable();
 +    table.repaint();
    }
  
    public void orderByAvWidth()
      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