X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignmentPanel.java;h=b703b47efd49185128c30ae3da8c997a440493ca;hb=refs%2Fheads%2Ffeature%2FJAL-3117_overviewFocusAlignment;hp=c74ef68f9ba7ae719d722611b0752c5263a1c562;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git diff --git a/src/jalview/jbgui/GAlignmentPanel.java b/src/jalview/jbgui/GAlignmentPanel.java index c74ef68..b703b47 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.8.2b1) - * Copyright (C) 2014 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. * @@ -20,53 +20,66 @@ */ 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(); + protected JScrollBar vscroll = new JScrollBar(); - BorderLayout borderLayout1 = new BorderLayout(); + protected JScrollBar hscroll = new JScrollBar(); - BorderLayout borderLayout3 = new BorderLayout(); + BorderLayout borderLayout1 = new BorderLayout(); - protected JPanel scalePanelHolder = new JPanel(); + BorderLayout borderLayout3 = new BorderLayout(); - protected JPanel idPanelHolder = new JPanel(); + BorderLayout borderLayout5 = new BorderLayout(); - BorderLayout borderLayout5 = new BorderLayout(); + BorderLayout borderLayout6 = new BorderLayout(); - protected JPanel idSpaceFillerPanel1 = new JPanel(); + ButtonGroup buttonGroup1 = new ButtonGroup(); - public JPanel annotationSpaceFillerHolder = new JPanel(); + BorderLayout borderLayout7 = new BorderLayout(); - BorderLayout borderLayout6 = new BorderLayout(); + BorderLayout borderLayout10 = new BorderLayout(); - ButtonGroup buttonGroup1 = new ButtonGroup(); + BorderLayout borderLayout11 = new BorderLayout(); - 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() { @@ -81,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));