Alignment Annotation added

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

diff --git a/src/jalview/jbgui/GAlignmentPanel.java b/src/jalview/jbgui/GAlignmentPanel.java
index bbbb1ab..d9e576a 100755 (executable)
--- a/src/jalview/jbgui/GAlignmentPanel.java
+++ b/src/jalview/jbgui/GAlignmentPanel.java
@@ -10,6 +10,7 @@ package jalview.jbgui;
 
 import java.awt.*;
 import javax.swing.*;
+import javax.swing.border.*;
 
 public class GAlignmentPanel extends JPanel
 {
@@ -19,26 +20,21 @@ public class GAlignmentPanel extends JPanel
   protected JPanel seqPanelHolder = new JPanel();
   BorderLayout borderLayout1 = new BorderLayout();
   BorderLayout borderLayout3 = new BorderLayout();
-  JPanel jPanel2 = new JPanel();
-  BorderLayout borderLayout2 = new BorderLayout();
-  protected JPanel scorePanelHolder = new JPanel();
   protected JPanel scalePanelHolder = new JPanel();
   protected JPanel idPanelHolder = new JPanel();
   BorderLayout borderLayout5 = new BorderLayout();
   protected JPanel idSpaceFillerPanel1 = new JPanel();
-  protected JPanel idSpaceFillerPanel = new JPanel();
-  BorderLayout borderLayout4 = new BorderLayout();
+  public JPanel annotationSpaceFillerHolder = new JPanel();
   BorderLayout borderLayout6 = new BorderLayout();
   ButtonGroup buttonGroup1 = new ButtonGroup();
   BorderLayout borderLayout7 = new BorderLayout();
-  JPanel jPanel3 = new JPanel();
-  protected JPanel secondaryPanelHolder = new JPanel();
-  BorderLayout borderLayout8 = new BorderLayout();
-  BorderLayout borderLayout9 = new BorderLayout();
-  JPanel jPanel1 = new JPanel();
+  JPanel hscrollHolder = new JPanel();
   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()
   {
@@ -53,6 +49,7 @@ public class GAlignmentPanel extends JPanel
   }
   private void jbInit() throws Exception
   {
+    border1 = BorderFactory.createLineBorder(Color.gray,1);
     idPanelHolder.setBorder(null);
     idPanelHolder.setPreferredSize(new Dimension(70, 10));
     this.setLayout(borderLayout7);
@@ -61,42 +58,38 @@ public class GAlignmentPanel extends JPanel
     sequenceHolderPanel.setPreferredSize(new Dimension(150, 150));
     sequenceHolderPanel.setLayout(borderLayout3);
     seqPanelHolder.setLayout(borderLayout1);
-    jPanel2.setBackground(new Color(212, 208, 230));
-    jPanel2.setBorder(null);
-    jPanel2.setLayout(borderLayout2);
     scalePanelHolder.setBackground(Color.white);
     scalePanelHolder.setMinimumSize(new Dimension(10, 80));
     scalePanelHolder.setPreferredSize(new Dimension(10, 30));
     scalePanelHolder.setLayout(borderLayout6);
-    scorePanelHolder.setBackground(Color.white);
-    scorePanelHolder.setPreferredSize(new Dimension(10, 80));
-    scorePanelHolder.setLayout(borderLayout4);
     idPanelHolder.setLayout(borderLayout5);
     idSpaceFillerPanel1.setBackground(Color.white);
     idSpaceFillerPanel1.setPreferredSize(new Dimension(10, 30));
     idSpaceFillerPanel1.setLayout(borderLayout11);
-    idSpaceFillerPanel.setBackground(Color.white);
-    idSpaceFillerPanel.setPreferredSize(new Dimension(10, 80));
+    annotationSpaceFillerHolder.setBackground(Color.white);
+    annotationSpaceFillerHolder.setPreferredSize(new Dimension(10, 80));
+    annotationSpaceFillerHolder.setLayout(borderLayout4);
     hscroll.setOrientation(JScrollBar.HORIZONTAL);
-    jPanel3.setLayout(borderLayout9);
-    secondaryPanelHolder.setLayout(borderLayout8);
-    jPanel1.setLayout(borderLayout10);
+    hscrollHolder.setLayout(borderLayout10);
     hscrollFillerPanel.setBackground(Color.white);
-    jPanel1.setBackground(Color.white);
+    hscrollFillerPanel.setPreferredSize(new Dimension(70, 10));
+    hscrollHolder.setBackground(Color.white);
+    annotationScroller.setBorder(null);
+    annotationScroller.setPreferredSize(new Dimension(10, 80));
+    this.setPreferredSize(new Dimension(220, 166));
+    this.setRequestFocusEnabled(true);
     sequenceHolderPanel.add(scalePanelHolder,  BorderLayout.NORTH);
     sequenceHolderPanel.add(seqPanelHolder,  BorderLayout.CENTER);
     seqPanelHolder.add(vscroll, BorderLayout.EAST);
-    this.add(jPanel2, BorderLayout.CENTER);
-    jPanel2.add(sequenceHolderPanel, BorderLayout.CENTER);
-    sequenceHolderPanel.add(jPanel3,  BorderLayout.SOUTH);
-    jPanel3.add(scorePanelHolder, BorderLayout.CENTER);
+    sequenceHolderPanel.add(annotationScroller, BorderLayout.SOUTH);
   //  jPanel3.add(secondaryPanelHolder,  BorderLayout.SOUTH);
     this.add(idPanelHolder, BorderLayout.WEST);
     idPanelHolder.add(idSpaceFillerPanel1,  BorderLayout.NORTH);
-    idPanelHolder.add(idSpaceFillerPanel,  BorderLayout.SOUTH);
-    this.add(jPanel1,  BorderLayout.SOUTH);
-    jPanel1.add(hscroll, BorderLayout.CENTER);
-    jPanel1.add(hscrollFillerPanel,  BorderLayout.WEST);
+    idPanelHolder.add(annotationSpaceFillerHolder, BorderLayout.SOUTH);
+    this.add(hscrollHolder,  BorderLayout.SOUTH);
+    hscrollHolder.add(hscroll, BorderLayout.CENTER);
+    hscrollHolder.add(hscrollFillerPanel,  BorderLayout.WEST);
+    this.add(sequenceHolderPanel,  BorderLayout.CENTER);
   }