X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fjbgui%2FGAlignmentPanel.java;h=b703b47efd49185128c30ae3da8c997a440493ca;hb=d85279450741df748b662ca0e7757a489b8c6d01;hp=d9e576ae647f2c667d3e7c19636ec1448dbdd47f;hpb=c59fb56cb143b05c5643a71f5b39996ac1cd2fef;p=jalview.git

diff --git a/src/jalview/jbgui/GAlignmentPanel.java b/src/jalview/jbgui/GAlignmentPanel.java
index d9e576a..b703b47 100755
--- a/src/jalview/jbgui/GAlignmentPanel.java
+++ b/src/jalview/jbgui/GAlignmentPanel.java
@@ -1,59 +1,107 @@
-/********************
- * 2004 Jalview Reengineered
- * Barton Group
- * Dundee University
- *
- * AM Waterhouse
- *******************/
-
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 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();
+	  protected JScrollBar vscroll = new JScrollBar();
+
+	  protected JScrollBar hscroll = new JScrollBar();
+
+	  BorderLayout borderLayout1 = new BorderLayout();
+
+	  BorderLayout borderLayout3 = new BorderLayout();
+
+	  BorderLayout borderLayout5 = new BorderLayout();
+
+	  BorderLayout borderLayout6 = new BorderLayout();
+
+	  ButtonGroup buttonGroup1 = new ButtonGroup();
+
+	  BorderLayout borderLayout7 = new BorderLayout();
+
+	  BorderLayout borderLayout10 = new BorderLayout();
+
+	  BorderLayout borderLayout11 = new BorderLayout();
+
   public JScrollPane annotationScroller = new JScrollPane();
-  Border border1;
-  BorderLayout borderLayout4 = new BorderLayout();
+
+	  Border border1;
+
+	  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
     {
       jbInit();
-    }
-    catch(Exception e)
+    } catch (Exception e)
     {
       e.printStackTrace();
     }
   }
+
   private void jbInit() throws Exception
   {
-    border1 = BorderFactory.createLineBorder(Color.gray,1);
+	//  annotationScroller.setBackground(Color.white);  // BH 2019
+	  
+    border1 = BorderFactory.createLineBorder(Color.gray, 1);
     idPanelHolder.setBorder(null);
     idPanelHolder.setPreferredSize(new Dimension(70, 10));
     this.setLayout(borderLayout7);
-    sequenceHolderPanel.setMaximumSize(new Dimension(2147483647, 2147483647));
+    sequenceHolderPanel
+            .setMaximumSize(new Dimension(2147483647, 2147483647));
     sequenceHolderPanel.setMinimumSize(new Dimension(150, 150));
     sequenceHolderPanel.setPreferredSize(new Dimension(150, 150));
     sequenceHolderPanel.setLayout(borderLayout3);
@@ -77,20 +125,19 @@ public class GAlignmentPanel extends JPanel
     annotationScroller.setBorder(null);
     annotationScroller.setPreferredSize(new Dimension(10, 80));
     this.setPreferredSize(new Dimension(220, 166));
-    this.setRequestFocusEnabled(true);
-    sequenceHolderPanel.add(scalePanelHolder,  BorderLayout.NORTH);
-    sequenceHolderPanel.add(seqPanelHolder,  BorderLayout.CENTER);
+
+    sequenceHolderPanel.add(scalePanelHolder, BorderLayout.NORTH);
+    sequenceHolderPanel.add(seqPanelHolder, BorderLayout.CENTER);
     seqPanelHolder.add(vscroll, BorderLayout.EAST);
     sequenceHolderPanel.add(annotationScroller, BorderLayout.SOUTH);
-  //  jPanel3.add(secondaryPanelHolder,  BorderLayout.SOUTH);
+
+    // jPanel3.add(secondaryPanelHolder, BorderLayout.SOUTH);
     this.add(idPanelHolder, BorderLayout.WEST);
-    idPanelHolder.add(idSpaceFillerPanel1,  BorderLayout.NORTH);
+    idPanelHolder.add(idSpaceFillerPanel1, BorderLayout.NORTH);
     idPanelHolder.add(annotationSpaceFillerHolder, BorderLayout.SOUTH);
-    this.add(hscrollHolder,  BorderLayout.SOUTH);
+    this.add(hscrollHolder, BorderLayout.SOUTH);
     hscrollHolder.add(hscroll, BorderLayout.CENTER);
-    hscrollHolder.add(hscrollFillerPanel,  BorderLayout.WEST);
-    this.add(sequenceHolderPanel,  BorderLayout.CENTER);
+    hscrollHolder.add(hscrollFillerPanel, BorderLayout.WEST);
+    this.add(sequenceHolderPanel, BorderLayout.CENTER);
   }
-
-
 }