Remove unneccessary separator

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

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 8aa5159..237cf4c 100755 (executable)
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -21,10 +21,14 @@ package jalview.jbgui;
 import java.awt.*;\r
 import java.awt.event.*;\r
 import javax.swing.*;\r
+import javax.swing.event.*;\r
 \r
 import jalview.schemes.*;\r
 import java.awt.BorderLayout;\r
 \r
+\r
+\r
+\r
 public class GAlignFrame\r
     extends JInternalFrame\r
 {\r
@@ -132,26 +136,24 @@ public class GAlignFrame
   JMenu jMenu3 = new JMenu();\r
   JMenuItem showAllSeqs = new JMenuItem();\r
   JMenuItem showAllColumns = new JMenuItem();\r
-  JMenu jMenu4 = new JMenu();\r
+  JMenu hideMenu = new JMenu();\r
   JMenuItem hideSelSequences = new JMenuItem();\r
   JMenuItem hideSelColumns = new JMenuItem();\r
   protected JCheckBoxMenuItem hiddenMarkers = new JCheckBoxMenuItem();\r
-\r
+  JMenuItem invertColSel = new JMenuItem();\r
+  protected JTabbedPane tabbedPane = new JTabbedPane();\r
   public GAlignFrame()\r
   {\r
-\r
-\r
     try\r
     {\r
       jbInit();\r
       setJMenuBar(alignFrameMenuBar);\r
 \r
       // dynamically fill save as menu with available formats\r
-      for (int i = 0; i < jalview.io.FormatAdapter.formats.size()-1; i++)\r
+      for (int i = 0; i < jalview.io.FormatAdapter.WRITEABLE_FORMATS.length; i++)\r
       {\r
-        JMenuItem item = new JMenuItem( (String) jalview.io.FormatAdapter.formats.\r
-                             elementAt(\r
-                                 i));\r
+        JMenuItem item = new JMenuItem( jalview.io.FormatAdapter.WRITEABLE_FORMATS[i] );\r
+\r
         item.addActionListener(new java.awt.event.ActionListener()\r
         {\r
           public void actionPerformed(ActionEvent e)\r
@@ -365,7 +367,7 @@ public class GAlignFrame
         deselectAllSequenceMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    invertSequenceMenuItem.setText("Invert Selection");\r
+    invertSequenceMenuItem.setText("Invert Sequence Selection");\r
     invertSequenceMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -1051,7 +1053,7 @@ public class GAlignFrame
         showAllColumns_actionPerformed(e);\r
       }\r
     });\r
-    jMenu4.setText("Hide");\r
+    hideMenu.setText("Hide");\r
     hideSelSequences.setText("Selected Sequences");\r
     hideSelSequences.addActionListener(new ActionListener()\r
     {\r
@@ -1077,6 +1079,30 @@ public class GAlignFrame
         hiddenMarkers_actionPerformed(e);\r
       }\r
     });\r
+    invertColSel.setText("Invert Column Selection");\r
+    invertColSel.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        invertColSel_actionPerformed(e);\r
+      }\r
+    });\r
+    tabbedPane.addChangeListener(new javax.swing.event.ChangeListener()\r
+    {\r
+        public void stateChanged(ChangeEvent evt)\r
+        {\r
+            JTabbedPane pane = (JTabbedPane)evt.getSource();\r
+            int sel = pane.getSelectedIndex();\r
+            tabSelectionChanged(sel);\r
+        }\r
+    });\r
+    tabbedPane.addMouseListener(new MouseAdapter()\r
+    {\r
+      public void mousePressed(MouseEvent e)\r
+      {\r
+        tabbedPane_mousePressed(e);\r
+      }\r
+    });\r
 \r
     alignFrameMenuBar.add(fileMenu);\r
     alignFrameMenuBar.add(editMenu);\r
@@ -1110,6 +1136,7 @@ public class GAlignFrame
     editMenu.add(selectAllSequenceMenuItem);\r
     editMenu.add(deselectAllSequenceMenuItem);\r
     editMenu.add(invertSequenceMenuItem);\r
+    editMenu.add(invertColSel);\r
     editMenu.add(deleteGroups);\r
     editMenu.addSeparator();\r
     editMenu.add(remove2LeftMenuItem);\r
@@ -1124,7 +1151,7 @@ public class GAlignFrame
     viewMenu.add(smoothFont);\r
     viewMenu.addSeparator();\r
     viewMenu.add(jMenu3);\r
-    viewMenu.add(jMenu4);\r
+    viewMenu.add(hideMenu);\r
     viewMenu.add(hiddenMarkers);\r
     viewMenu.addSeparator();\r
     viewMenu.add(wrapMenuItem);\r
@@ -1189,10 +1216,11 @@ public class GAlignFrame
     addSequenceMenu.add(addFromURL);\r
     this.getContentPane().add(statusPanel, java.awt.BorderLayout.SOUTH);\r
     statusPanel.add(statusBar, null);\r
+    this.getContentPane().add(tabbedPane, java.awt.BorderLayout.CENTER);\r
     jMenu3.add(showAllColumns);\r
     jMenu3.add(showAllSeqs);\r
-    jMenu4.add(hideSelColumns);\r
-    jMenu4.add(hideSelSequences);\r
+    hideMenu.add(hideSelColumns);\r
+    hideMenu.add(hideSelSequences);\r
   }\r
 \r
   protected void outputText_actionPerformed(ActionEvent e)\r
@@ -1582,4 +1610,19 @@ public class GAlignFrame
   {\r
 \r
   }\r
+\r
+  public void invertColSel_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  public void tabSelectionChanged(int sel)\r
+  {\r
+\r
+  }\r
+\r
+  public void tabbedPane_mousePressed(MouseEvent e)\r
+  {\r
+\r
+  }\r
 }\r