From 1a204eb6f91465df533751cd6e592ddd11dcce5d Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 7 Apr 2005 17:00:14 +0000
Subject: [PATCH] no more group editor

---
 src/jalview/gui/AlignFrame.java    |   24 +++++-------------------
 src/jalview/jbgui/GAlignFrame.java |   15 ---------------
 2 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 1324173..7b67e81 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -40,18 +40,19 @@ public class AlignFrame extends GAlignFrame
     if(fontName!=null && fontStyle!=null && fontSize!=null)
       viewport.setFont( new Font(fontName,Integer.parseInt(fontStyle),Integer.parseInt(fontSize)) );
 
-
-    alignPanel = new AlignmentPanel(this, viewport);
-    getContentPane().add(alignPanel, java.awt.BorderLayout.CENTER);
-
     // add conservation graph to alignment
     viewport.updateConservation();
     viewport.updateConsensus();
 
+
+    alignPanel = new AlignmentPanel(this, viewport);
+
     alignPanel.annotationPanel.adjustPanelHeight();
     alignPanel.annotationSpaceFillerHolder.setPreferredSize(alignPanel.annotationPanel.getPreferredSize());
     alignPanel.annotationScroller.setPreferredSize(alignPanel.annotationPanel.getPreferredSize());
 
+    getContentPane().add(alignPanel, java.awt.BorderLayout.CENTER);
+
 
     addInternalFrameListener(new InternalFrameAdapter()
    {
@@ -84,12 +85,6 @@ public class AlignFrame extends GAlignFrame
     else if(e.getActionCommand().equals("PFAM"))
       suffix = new String[]{"pfam"};
 
-    if(e.getActionCommand().equals("XML DUMP"))
-    {
-      XMLStore store = new XMLStore();
-      store.store(viewport);
-      return;
-    }
 
     JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY")
         , suffix, e.getActionCommand()+" file");
@@ -425,15 +420,6 @@ public class AlignFrame extends GAlignFrame
   }
 
 
-  public void groupsMenuItem_actionPerformed(ActionEvent e)
-  {
-    GroupEditor geditor = new GroupEditor(viewport, alignPanel);
-    JInternalFrame frame = new JInternalFrame();
-    frame.setContentPane(geditor);
-    Desktop.addInternalFrame(frame, "Group editor", 710, 410);
-    frame.setResizable(false);
-  }
-
   protected void deleteGroups_actionPerformed(ActionEvent e)
   {
     viewport.alignment.deleteAllGroups();
diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 8b68899..dfc664d 100755
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -22,7 +22,6 @@ public class GAlignFrame extends JInternalFrame
   protected JMenu colourMenu = new JMenu();
   protected JMenu calculateMenu = new JMenu();
   protected JMenu alignMenu = new JMenu();
-  protected JMenuItem groupsMenuItem = new JMenuItem();
   protected JMenuItem selectAllSequenceMenuItem = new JMenuItem();
   protected JMenuItem deselectAllSequenceMenuItem = new JMenuItem();
   protected JMenuItem invertSequenceMenuItem = new JMenuItem();
@@ -166,15 +165,6 @@ public class GAlignFrame extends JInternalFrame
     colourMenu.setText("Colour");
     calculateMenu.setText("Calculate");
     alignMenu.setText("Web Service");
-    groupsMenuItem.setVisible(false);
-    groupsMenuItem.setText("Groups");
-    groupsMenuItem.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        groupsMenuItem_actionPerformed(e);
-      }
-    });
     selectAllSequenceMenuItem.setText("Select all");
     selectAllSequenceMenuItem.addActionListener(new java.awt.event.ActionListener()
     {
@@ -727,7 +717,6 @@ public class GAlignFrame extends JInternalFrame
     editMenu.add(selectAllSequenceMenuItem);
     editMenu.add(invertSequenceMenuItem);
     editMenu.add(deleteGroups);
-    editMenu.add(groupsMenuItem);
     editMenu.addSeparator();
     editMenu.add(deselectAllColumnsMenuItem);
     editMenu.add(remove2LeftMenuItem);
@@ -819,10 +808,6 @@ public class GAlignFrame extends JInternalFrame
   }
 
 
-  protected void groupsMenuItem_actionPerformed(ActionEvent e)
-  {
-
-  }
 
 
   protected void selectAllSequenceMenuItem_actionPerformed(ActionEvent e)
-- 
1.7.10.2