JAL-1988 Hack to ensure Quit dialog box is moved to front

[jalview.git] / src / jalview / jbgui / GAlignmentPanel.java

diff --git a/src/jalview/jbgui/GAlignmentPanel.java b/src/jalview/jbgui/GAlignmentPanel.java
index 474a92d..6594e2d 100755 (executable)
--- a/src/jalview/jbgui/GAlignmentPanel.java
+++ b/src/jalview/jbgui/GAlignmentPanel.java
@@ -20,46 +20,38 @@
  */
 package jalview.jbgui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.border.*;
-
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.JPanel;
+import javax.swing.JScrollBar;
+import javax.swing.JScrollPane;
+import javax.swing.border.Border;
+
+@SuppressWarnings("serial")
 public class GAlignmentPanel extends JPanel
 {
-  protected JPanel sequenceHolderPanel = new JPanel();
-
   protected JScrollBar vscroll = new JScrollBar();
 
   protected JScrollBar hscroll = new JScrollBar();
 
-  protected JPanel seqPanelHolder = new JPanel();
-
   BorderLayout borderLayout1 = new BorderLayout();
 
   BorderLayout borderLayout3 = new BorderLayout();
 
-  protected JPanel scalePanelHolder = new JPanel();
-
-  protected JPanel idPanelHolder = new JPanel();
-
   BorderLayout borderLayout5 = new BorderLayout();
 
-  protected JPanel idSpaceFillerPanel1 = new JPanel();
-
-  public JPanel annotationSpaceFillerHolder = new JPanel();
-
   BorderLayout borderLayout6 = new BorderLayout();
 
   ButtonGroup buttonGroup1 = new ButtonGroup();
 
   BorderLayout borderLayout7 = new BorderLayout();
 
-  JPanel hscrollHolder = new JPanel();
-
   BorderLayout borderLayout10 = new BorderLayout();
 
-  protected JPanel hscrollFillerPanel = new JPanel();
-
   BorderLayout borderLayout11 = new BorderLayout();
 
   public JScrollPane annotationScroller = new JScrollPane();
@@ -68,6 +60,32 @@ public class GAlignmentPanel extends JPanel
 
   BorderLayout borderLayout4 = new BorderLayout();
 
+  static JPanel newJPanel()
+  { // BH 2019
+    JPanel p = new JPanel();
+    // leaving this in, as it prevents
+    // the checkerboard business, despite how
+    // funky that looks. Remove if you want to.
+    p.setBackground(Color.white);
+    return p;
+  }
+
+  protected JPanel sequenceHolderPanel = newJPanel();
+
+  protected JPanel seqPanelHolder = newJPanel();
+
+  protected JPanel scalePanelHolder = newJPanel();
+
+  protected JPanel idPanelHolder = newJPanel();
+
+  protected JPanel idSpaceFillerPanel1 = newJPanel();
+
+  public JPanel annotationSpaceFillerHolder = newJPanel();
+
+  protected JPanel hscrollFillerPanel = newJPanel();
+
+  JPanel hscrollHolder = newJPanel();
+
   public GAlignmentPanel()
   {
     try
@@ -81,6 +99,8 @@ public class GAlignmentPanel extends JPanel
 
   private void jbInit() throws Exception
   {
+    // annotationScroller.setBackground(Color.white); // BH 2019
+
     border1 = BorderFactory.createLineBorder(Color.gray, 1);
     idPanelHolder.setBorder(null);
     idPanelHolder.setPreferredSize(new Dimension(70, 10));