From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Mon, 4 Feb 2019 14:46:42 +0000 (-0600)
Subject: re-transpiled MIGLayout; JS-adapted AnnotationColumnChooser
X-Git-Tag: Release_2_11_4_0~45^2~18^2~257
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f3cd6b03fcf98635c16365b2cf238db2c52c3456;p=jalview.git

re-transpiled MIGLayout; JS-adapted AnnotationColumnChooser
---

diff --git a/libjs/MiGLayout-site.zip b/libjs/MiGLayout-site.zip
index 85c19f3..10d6927 100644
Binary files a/libjs/MiGLayout-site.zip and b/libjs/MiGLayout-site.zip differ
diff --git a/src/jalview/gui/AnnotationColumnChooser.java b/src/jalview/gui/AnnotationColumnChooser.java
index 5e12d2b..d841177 100644
--- a/src/jalview/gui/AnnotationColumnChooser.java
+++ b/src/jalview/gui/AnnotationColumnChooser.java
@@ -88,9 +88,9 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
 
   private HiddenColumns oldHiddenColumns;
 
-  protected int MIN_WIDTH = 420;
+  protected static int MIN_WIDTH = (/** @j2sNative 370||*/420);
 
-  protected int MIN_HEIGHT = 430;
+  protected static int MIN_HEIGHT = (/** @j2sNative 370||*/430);
 
   public AnnotationColumnChooser(AlignViewport av, final AlignmentPanel ap)
   {
@@ -99,8 +99,10 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
     frame.setContentPane(this);
     frame.setLayer(JLayeredPane.PALETTE_LAYER);
     Desktop.addInternalFrame(frame,
-            MessageManager.getString("label.select_by_annotation"), 520,
-            215);
+            MessageManager.getString("label.select_by_annotation"), 0,
+            0);
+    // BH note: MIGLayout ignores this completely, 
+    // possibly creating a frame smaller than specified:
     frame.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT));
 
     addSliderChangeListener();
@@ -155,7 +157,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
             MessageManager.getString("label.threshold_filter")));
     thresholdPanel.setBackground(Color.white);
     thresholdPanel.setFont(JvSwingUtils.getLabelFont());
-    thresholdPanel.setLayout(new MigLayout("", "[left][right]", "[][]"));
+    thresholdPanel.setLayout(new MigLayout("", "[left][right]", "[][]") );
 
     percentThreshold.setBackground(Color.white);
     percentThreshold.setFont(JvSwingUtils.getLabelFont());
@@ -204,7 +206,6 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
             AnnotationColumnChooser.NO_GRAPH_VIEW);
     switchableViewsPanel.add(graphFilterView,
             AnnotationColumnChooser.GRAPH_VIEW);
-
     this.setLayout(new BorderLayout());
     this.add(annotationComboBoxPanel, java.awt.BorderLayout.PAGE_START);
     this.add(switchableViewsPanel, java.awt.BorderLayout.CENTER);
@@ -496,7 +497,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
 
     CardLayout switchableViewsLayout = (CardLayout) switchableViewsPanel
             .getLayout();
-    switchableViewsLayout.show(switchableViewsPanel, currentView);
+    	switchableViewsLayout.show(switchableViewsPanel, currentView);
     updateView();
   }