no more group editor

[jalview.git] / src / jalview / gui / AlignFrame.java

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 1324173..7b67e81 100755 (executable)
--- 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)\r
       viewport.setFont( new Font(fontName,Integer.parseInt(fontStyle),Integer.parseInt(fontSize)) );\r
 \r
-\r
-    alignPanel = new AlignmentPanel(this, viewport);\r
-    getContentPane().add(alignPanel, java.awt.BorderLayout.CENTER);\r
-\r
     // add conservation graph to alignment\r
     viewport.updateConservation();\r
     viewport.updateConsensus();\r
 \r
+\r
+    alignPanel = new AlignmentPanel(this, viewport);\r
+\r
     alignPanel.annotationPanel.adjustPanelHeight();\r
     alignPanel.annotationSpaceFillerHolder.setPreferredSize(alignPanel.annotationPanel.getPreferredSize());\r
     alignPanel.annotationScroller.setPreferredSize(alignPanel.annotationPanel.getPreferredSize());\r
 \r
+    getContentPane().add(alignPanel, java.awt.BorderLayout.CENTER);\r
+\r
 \r
     addInternalFrameListener(new InternalFrameAdapter()\r
    {\r
@@ -84,12 +85,6 @@ public class AlignFrame extends GAlignFrame
     else if(e.getActionCommand().equals("PFAM"))\r
       suffix = new String[]{"pfam"};\r
 \r
-    if(e.getActionCommand().equals("XML DUMP"))\r
-    {\r
-      XMLStore store = new XMLStore();\r
-      store.store(viewport);\r
-      return;\r
-    }\r
 \r
     JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY")\r
         , suffix, e.getActionCommand()+" file");\r
@@ -425,15 +420,6 @@ public class AlignFrame extends GAlignFrame
   }\r
 \r
 \r
-  public void groupsMenuItem_actionPerformed(ActionEvent e)\r
-  {\r
-    GroupEditor geditor = new GroupEditor(viewport, alignPanel);\r
-    JInternalFrame frame = new JInternalFrame();\r
-    frame.setContentPane(geditor);\r
-    Desktop.addInternalFrame(frame, "Group editor", 710, 410);\r
-    frame.setResizable(false);\r
-  }\r
-\r
   protected void deleteGroups_actionPerformed(ActionEvent e)\r
   {\r
     viewport.alignment.deleteAllGroups();\r