JAL-4367 Limit right and top adjustments

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

diff --git a/src/jalview/jbgui/GAlignmentPanel.java b/src/jalview/jbgui/GAlignmentPanel.java
index bf4f645..2d6f569 100755 (executable)
--- a/src/jalview/jbgui/GAlignmentPanel.java
+++ b/src/jalview/jbgui/GAlignmentPanel.java
@@ -31,51 +31,60 @@ import javax.swing.JScrollBar;
 import javax.swing.JScrollPane;
 import javax.swing.border.Border;
 
+@SuppressWarnings("serial")
 public class GAlignmentPanel extends JPanel
 {
-         protected JScrollBar vscroll = new JScrollBar();
+  protected JScrollBar vscroll = new JScrollBar();
 
-         protected JScrollBar hscroll = new JScrollBar();
+  protected JScrollBar hscroll = new JScrollBar();
 
-         BorderLayout borderLayout1 = new BorderLayout();
+  BorderLayout borderLayout1 = new BorderLayout();
 
-         BorderLayout borderLayout3 = new BorderLayout();
+  BorderLayout borderLayout3 = new BorderLayout();
 
-         BorderLayout borderLayout5 = new BorderLayout();
+  BorderLayout borderLayout5 = new BorderLayout();
 
-         BorderLayout borderLayout6 = new BorderLayout();
+  BorderLayout borderLayout6 = new BorderLayout();
 
-         ButtonGroup buttonGroup1 = new ButtonGroup();
+  ButtonGroup buttonGroup1 = new ButtonGroup();
 
-         BorderLayout borderLayout7 = new BorderLayout();
+  BorderLayout borderLayout7 = new BorderLayout();
 
-         BorderLayout borderLayout10 = new BorderLayout();
+  BorderLayout borderLayout10 = new BorderLayout();
 
-         BorderLayout borderLayout11 = new BorderLayout();
+  BorderLayout borderLayout11 = new BorderLayout();
 
-         public JScrollPane annotationScroller = new JScrollPane();
+  public JScrollPane annotationScroller = new JScrollPane();
 
-         Border border1;
+  Border border1;
 
-         BorderLayout borderLayout4 = new BorderLayout();
+  BorderLayout borderLayout4 = new BorderLayout();
 
-         
-         static JPanel newJPanel() {  // BH 2019
-                 JPanel p = new JPanel();
-                 p.setBackground(Color.white);
-                       return p;
-         }
+  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();
+
+  public JPanel idPanelHolder = newJPanel();
+
   protected JPanel idSpaceFillerPanel1 = newJPanel();
+
   public JPanel annotationSpaceFillerHolder = newJPanel();
-  protected JPanel hscrollFillerPanel = newJPanel();
-  JPanel hscrollHolder = newJPanel();
 
+  protected JPanel hscrollFillerPanel = newJPanel();
 
+  JPanel hscrollHolder = newJPanel();
 
   public GAlignmentPanel()
   {
@@ -90,8 +99,8 @@ public class GAlignmentPanel extends JPanel
 
   private void jbInit() throws Exception
   {
-         annotationScroller.setBackground(Color.white);  // BH 2019
-         
+    // annotationScroller.setBackground(Color.white); // BH 2019
+
     border1 = BorderFactory.createLineBorder(Color.gray, 1);
     idPanelHolder.setBorder(null);
     idPanelHolder.setPreferredSize(new Dimension(70, 10));
@@ -136,4 +145,9 @@ public class GAlignmentPanel extends JPanel
     hscrollHolder.add(hscrollFillerPanel, BorderLayout.WEST);
     this.add(sequenceHolderPanel, BorderLayout.CENTER);
   }
+
+  public JPanel getIdSpaceFillerPanel1()
+  {
+    return idSpaceFillerPanel1;
+  }
 }