X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignmentPanel.java;fp=src%2Fjalview%2Fjbgui%2FGAlignmentPanel.java;h=b703b47efd49185128c30ae3da8c997a440493ca;hb=ec8f3cedf60fb1feed6d34de6b49f6bfa78b9dd8;hp=6e09799015c4fd14cddb8b75bfe4c43258f97146;hpb=056dad85a910551cc95e44d451a61f6b8c4dd35d;p=jalview.git diff --git a/src/jalview/jbgui/GAlignmentPanel.java b/src/jalview/jbgui/GAlignmentPanel.java index 6e09799..b703b47 100755 --- a/src/jalview/jbgui/GAlignmentPanel.java +++ b/src/jalview/jbgui/GAlignmentPanel.java @@ -31,49 +31,55 @@ 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 vscroll = new JScrollBar(); + protected JScrollBar hscroll = new JScrollBar(); - protected JScrollBar hscroll = new JScrollBar(); + BorderLayout borderLayout1 = new BorderLayout(); - protected JPanel seqPanelHolder = new JPanel(); + BorderLayout borderLayout3 = new BorderLayout(); - BorderLayout borderLayout1 = new BorderLayout(); + BorderLayout borderLayout5 = new BorderLayout(); - BorderLayout borderLayout3 = new BorderLayout(); + BorderLayout borderLayout6 = new BorderLayout(); - protected JPanel scalePanelHolder = new JPanel(); + ButtonGroup buttonGroup1 = new ButtonGroup(); - protected JPanel idPanelHolder = new JPanel(); + BorderLayout borderLayout7 = new BorderLayout(); - BorderLayout borderLayout5 = new BorderLayout(); + BorderLayout borderLayout10 = new BorderLayout(); - protected JPanel idSpaceFillerPanel1 = new JPanel(); + BorderLayout borderLayout11 = new BorderLayout(); - public JPanel annotationSpaceFillerHolder = new JPanel(); - - BorderLayout borderLayout6 = new BorderLayout(); - - ButtonGroup buttonGroup1 = new ButtonGroup(); - - BorderLayout borderLayout7 = new BorderLayout(); - - JPanel hscrollHolder = new JPanel(); + public JScrollPane annotationScroller = new JScrollPane(); - BorderLayout borderLayout10 = new BorderLayout(); + Border border1; - protected JPanel hscrollFillerPanel = new JPanel(); + BorderLayout borderLayout4 = new BorderLayout(); - BorderLayout borderLayout11 = 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; + } - public JScrollPane annotationScroller = new JScrollPane(); + 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(); - Border border1; - BorderLayout borderLayout4 = new BorderLayout(); public GAlignmentPanel() { @@ -88,6 +94,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));