X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignmentPanel.java;h=2f0c75ece575d409a4a885c9423bbe5164c3c2c8;hb=refs%2Fheads%2Fspike%2FJAL-4047%2FJAL-4048_columns_in_sequenceID;hp=5cbdeb78eb15ab861fd986457935d04f53c48043;hpb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;p=jalview.git diff --git a/src/jalview/jbgui/GAlignmentPanel.java b/src/jalview/jbgui/GAlignmentPanel.java index 5cbdeb7..2f0c75e 100755 --- a/src/jalview/jbgui/GAlignmentPanel.java +++ b/src/jalview/jbgui/GAlignmentPanel.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -31,42 +31,27 @@ 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(); @@ -75,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(); + + public JPanel idPanelHolder = newJPanel(); + + protected JPanel idSpaceFillerPanel1 = newJPanel(); + + public JPanel annotationSpaceFillerHolder = newJPanel(); + + protected JPanel hscrollFillerPanel = newJPanel(); + + JPanel hscrollHolder = newJPanel(); + public GAlignmentPanel() { try @@ -88,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));