removal of AlignmentFrame lines
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Tue, 15 Jan 2019 19:18:38 +0000 (13:18 -0600)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Tue, 15 Jan 2019 19:18:38 +0000 (13:18 -0600)
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/AnnotationLabels.java
src/jalview/gui/AnnotationPanel.java
src/jalview/gui/IdCanvas.java
src/jalview/gui/ScalePanel.java
src/jalview/gui/SeqCanvas.java
src/jalview/jbgui/GAlignmentPanel.java

index 340f9be..c1edeab 100644 (file)
@@ -337,6 +337,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
    */
   void init()
   {
+         setBackground(Color.white); // BH 2019
+                 
     if (!Jalview.isHeadlessMode())
     {
       progressBar = new ProgressBar(this.statusPanel, this.statusBar);
index a120403..9ae5b8b 100644 (file)
@@ -116,6 +116,7 @@ public class AlignmentPanel extends GAlignmentPanel implements
    */
   public AlignmentPanel(AlignFrame af, final AlignViewport av)
   {
+       setBackground(Color.white);  // BH 2019
     alignFrame = af;
     this.av = av;
     setSeqPanel(new SeqPanel(av, this));
index 6ea4c57..4062137 100755 (executable)
@@ -135,6 +135,7 @@ public class AnnotationLabels extends JPanel
    */
   public AnnotationLabels(AlignmentPanel ap)
   {
+         
     this.ap = ap;
     av = ap.av;
     ToolTipManager.sharedInstance().registerComponent(this);
index 1fc5734..71b7eac 100755 (executable)
@@ -149,7 +149,9 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
    */
   public AnnotationPanel(AlignmentPanel ap)
   {
-    ToolTipManager.sharedInstance().registerComponent(this);
+           setBackground(Color.white);  // BH 2019
+
+           ToolTipManager.sharedInstance().registerComponent(this);
     ToolTipManager.sharedInstance().setInitialDelay(0);
     ToolTipManager.sharedInstance().setDismissDelay(10000);
     this.ap = ap;
index 5540c72..12f3971 100755 (executable)
@@ -220,7 +220,7 @@ public class IdCanvas extends JPanel implements ViewportListenerI
   @Override
   public void paintComponent(Graphics g)
   {
-    super.paintComponent(g);
+    //super.paintComponent(g);  // BH 2019
 
     g.setColor(Color.white);
     g.fillRect(0, 0, getWidth(), getHeight());
index 8771119..5da14b3 100755 (executable)
@@ -415,7 +415,7 @@ public class ScalePanel extends JPanel
   @Override
   public void paintComponent(Graphics g)
   {
-    super.paintComponent(g);
+    //super.paintComponent(g);  // BH 2019
 
     /*
      * shouldn't get called in wrapped mode as the scale above is
index 6325e61..de136ae 100755 (executable)
@@ -355,7 +355,7 @@ public class SeqCanvas extends JPanel implements ViewportListenerI
   @Override
   public void paintComponent(Graphics g)
   {
-    super.paintComponent(g);
+    //super.paintComponent(g); // BH 2019
 
     int charHeight = av.getCharHeight();
     int charWidth = av.getCharWidth();
index 6e09799..bf4f645 100755 (executable)
@@ -33,47 +33,49 @@ import javax.swing.border.Border;
 
 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();
+         public JScrollPane annotationScroller = new JScrollPane();
 
-  BorderLayout borderLayout6 = new BorderLayout();
+         Border border1;
 
-  ButtonGroup buttonGroup1 = new ButtonGroup();
+         BorderLayout borderLayout4 = new BorderLayout();
 
-  BorderLayout borderLayout7 = new BorderLayout();
+         
+         static JPanel newJPanel() {  // BH 2019
+                 JPanel p = new JPanel();
+                 p.setBackground(Color.white);
+                       return p;
+         }
 
-  JPanel hscrollHolder = new JPanel();
+  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();
 
-  BorderLayout borderLayout10 = new BorderLayout();
 
-  protected JPanel hscrollFillerPanel = new JPanel();
-
-  BorderLayout borderLayout11 = new BorderLayout();
-
-  public JScrollPane annotationScroller = new JScrollPane();
-
-  Border border1;
-
-  BorderLayout borderLayout4 = new BorderLayout();
 
   public GAlignmentPanel()
   {
@@ -88,6 +90,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));