refactored do and undo() method to take array of alignments for operations that resul...
authorjprocter <Jim Procter>
Wed, 2 May 2007 12:24:41 +0000 (12:24 +0000)
committerjprocter <Jim Procter>
Wed, 2 May 2007 12:24:41 +0000 (12:24 +0000)
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/RedundancyPanel.java
src/jalview/commands/ChangeCaseCommand.java
src/jalview/commands/CommandI.java
src/jalview/commands/EditCommand.java
src/jalview/commands/OrderCommand.java
src/jalview/commands/RemoveGapColCommand.java
src/jalview/commands/RemoveGapsCommand.java
src/jalview/commands/SlideSequencesCommand.java
src/jalview/commands/TrimRegionCommand.java
src/jalview/gui/RedundancyPanel.java

index 12a2938..e17af38 100755 (executable)
-/*\r
- * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2007 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
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
- */\r
-\r
-package jalview.appletgui;\r
-\r
-import java.io.*;\r
-import java.net.*;\r
-import java.util.*;\r
-\r
-import java.awt.*;\r
-import java.awt.event.*;\r
-\r
-import jalview.analysis.*;\r
-import jalview.commands.*;\r
-import jalview.datamodel.*;\r
-import jalview.io.*;\r
-import jalview.schemes.*;\r
-\r
-public class AlignFrame\r
-    extends Frame implements ActionListener,\r
-    ItemListener, KeyListener, MouseListener\r
-{\r
-  public AlignmentPanel alignPanel;\r
-  public AlignViewport viewport;\r
-  int DEFAULT_WIDTH = 700;\r
-  int DEFAULT_HEIGHT = 500;\r
-\r
-  String jalviewServletURL;\r
-\r
-  public AlignFrame(AlignmentI al,\r
-                    jalview.bin.JalviewLite applet,\r
-                    String title,\r
-                    boolean embedded)\r
-  {\r
-\r
-    if (applet != null)\r
-    {\r
-      jalviewServletURL = applet.getParameter("APPLICATION_URL");\r
-    }\r
-\r
-    try\r
-    {\r
-      jbInit();\r
-    }\r
-    catch (Exception ex)\r
-    {\r
-      ex.printStackTrace();\r
-    }\r
-\r
-    viewport = new AlignViewport(al, applet);\r
-    alignPanel = new AlignmentPanel(this, viewport);\r
-\r
-    viewport.updateConservation(alignPanel);\r
-    viewport.updateConsensus(alignPanel);\r
-\r
-    annotationPanelMenuItem.setState(viewport.showAnnotation);\r
-\r
-    seqLimits.setState(viewport.showJVSuffix);\r
-\r
-    if (applet != null)\r
-    {\r
-      String param = applet.getParameter("sortBy");\r
-      if (param != null)\r
-      {\r
-        if (param.equalsIgnoreCase("Id"))\r
-        {\r
-          sortIDMenuItem_actionPerformed();\r
-        }\r
-        else if (param.equalsIgnoreCase("Pairwise Identity"))\r
-        {\r
-          sortPairwiseMenuItem_actionPerformed();\r
-        }\r
-      }\r
-\r
-      param = applet.getParameter("wrap");\r
-      if (param != null)\r
-      {\r
-        if (param.equalsIgnoreCase("true"))\r
-        {\r
-          wrapMenuItem.setState(true);\r
-          wrapMenuItem_actionPerformed();\r
-        }\r
-      }\r
-\r
-      try\r
-      {\r
-        param = applet.getParameter("windowWidth");\r
-        if (param != null)\r
-        {\r
-          int width = Integer.parseInt(param);\r
-          DEFAULT_WIDTH = width;\r
-        }\r
-        param = applet.getParameter("windowHeight");\r
-        if (param != null)\r
-        {\r
-          int height = Integer.parseInt(param);\r
-          DEFAULT_HEIGHT = height;\r
-        }\r
-      }\r
-      catch (Exception ex)\r
-      {}\r
-\r
-    }\r
-\r
-    //Some JVMS send keyevents to Top frame or lowest panel,\r
-    //Havent worked out why yet. So add to both this frame and seqCanvas for now\r
-    this.addKeyListener(this);\r
-    alignPanel.seqPanel.seqCanvas.addKeyListener(this);\r
-    alignPanel.idPanel.idCanvas.addKeyListener(this);\r
-    alignPanel.scalePanel.addKeyListener(this);\r
-    alignPanel.annotationPanel.addKeyListener(this);\r
-\r
-    if (embedded)\r
-    {\r
-      setEmbedded();\r
-    }\r
-    else\r
-    {\r
-      add(alignPanel, BorderLayout.CENTER);\r
-      jalview.bin.JalviewLite.addFrame(this, title, DEFAULT_WIDTH,\r
-                                       DEFAULT_HEIGHT);\r
-    }\r
-    alignPanel.validate();\r
-    alignPanel.paintAlignment(true);\r
-  }\r
-\r
-  public AlignViewport getAlignViewport()\r
-  {\r
-    return viewport;\r
-  }\r
-\r
-  public SeqCanvas getSeqcanvas()\r
-  {\r
-    return alignPanel.seqPanel.seqCanvas;\r
-  }\r
-\r
-  /**\r
-   * DOCUMENT ME!\r
-   *\r
-   * @param String DOCUMENT ME!\r
-   */\r
-\r
-  public void parseFeaturesFile(String file, String type)\r
-  {\r
-    Hashtable featureLinks = new Hashtable();\r
-    boolean featuresFile = false;\r
-    try\r
-    {\r
-      featuresFile = new jalview.io.FeaturesFile(file,\r
-          type).parse(viewport.alignment,\r
-                      alignPanel.seqPanel.seqCanvas.\r
-                      getFeatureRenderer().featureColours,\r
-                      featureLinks,\r
-                      true);\r
-    }\r
-    catch (Exception ex)\r
-    {\r
-      ex.printStackTrace();\r
-    }\r
-\r
-    if (featuresFile)\r
-    {\r
-      if (featureLinks.size() > 0)\r
-      {\r
-        alignPanel.seqPanel.seqCanvas\r
-            .getFeatureRenderer().featureLinks = featureLinks;\r
-      }\r
-      viewport.showSequenceFeatures = true;\r
-      sequenceFeatures.setState(true);\r
-      alignPanel.paintAlignment(true);\r
-    }\r
-\r
-  }\r
-\r
-  public void keyPressed(KeyEvent evt)\r
-  {\r
-    if (viewport.cursorMode &&\r
-        ( (evt.getKeyCode() >= KeyEvent.VK_0 &&\r
-           evt.getKeyCode() <= KeyEvent.VK_9)\r
-         ||\r
-         (evt.getKeyCode() >= KeyEvent.VK_NUMPAD0 &&\r
-          evt.getKeyCode() <= KeyEvent.VK_NUMPAD9)\r
-        )\r
-        && Character.isDigit(evt.getKeyChar()))\r
-            alignPanel.seqPanel.numberPressed(evt.getKeyChar());\r
-\r
-\r
-    switch (evt.getKeyCode())\r
-    {\r
-      case 27: // escape key\r
-        deselectAllSequenceMenuItem_actionPerformed();\r
-        break;\r
-      case KeyEvent.VK_X:\r
-        if (evt.isControlDown() || evt.isMetaDown())\r
-        {\r
-          cut_actionPerformed();\r
-        }\r
-        break;\r
-      case KeyEvent.VK_C:\r
-        if (viewport.cursorMode && !evt.isControlDown())\r
-        {\r
-          alignPanel.seqPanel.setCursorColumn();\r
-        }\r
-        if (evt.isControlDown() || evt.isMetaDown())\r
-        {\r
-          copy_actionPerformed();\r
-        }\r
-        break;\r
-      case KeyEvent.VK_V:\r
-        if (evt.isControlDown())\r
-        {\r
-          paste(evt.isShiftDown());\r
-        }\r
-        break;\r
-      case KeyEvent.VK_A:\r
-        if (evt.isControlDown() || evt.isMetaDown())\r
-        {\r
-          selectAllSequenceMenuItem_actionPerformed();\r
-        }\r
-        break;\r
-      case KeyEvent.VK_DOWN:\r
-        if (viewport.cursorMode)\r
-        {\r
-          alignPanel.seqPanel.moveCursor(0, 1);\r
-        }\r
-        else\r
-        {\r
-          moveSelectedSequences(false);\r
-        }\r
-        break;\r
-\r
-      case KeyEvent.VK_UP:\r
-        if (viewport.cursorMode)\r
-        {\r
-          alignPanel.seqPanel.moveCursor(0, -1);\r
-        }\r
-        else\r
-        {\r
-          moveSelectedSequences(true);\r
-        }\r
-        break;\r
-\r
-      case KeyEvent.VK_LEFT:\r
-        if (evt.isAltDown() || !viewport.cursorMode)\r
-          slideSequences(false,\r
-                         alignPanel.seqPanel.getKeyboardNo1());\r
-        else\r
-          alignPanel.seqPanel.moveCursor( -1, 0);\r
-        break;\r
-\r
-      case KeyEvent.VK_RIGHT:\r
-        if (evt.isAltDown() || !viewport.cursorMode)\r
-          slideSequences(true,\r
-                         alignPanel.seqPanel.getKeyboardNo1());\r
-        else\r
-          alignPanel.seqPanel.moveCursor( 1, 0);\r
-            break;\r
-\r
-      case KeyEvent.VK_SPACE:\r
-        if (viewport.cursorMode)\r
-        {\r
-          alignPanel.seqPanel.insertGapAtCursor(evt.isControlDown()\r
-                                                || evt.isShiftDown()\r
-                                                || evt.isAltDown()\r
-              );\r
-        }\r
-        break;\r
-\r
-      case KeyEvent.VK_DELETE:\r
-      case KeyEvent.VK_BACK_SPACE:\r
-        if (viewport.cursorMode)\r
-        {\r
-          alignPanel.seqPanel.deleteGapAtCursor(evt.isControlDown()\r
-                                                || evt.isShiftDown()\r
-                                                || evt.isAltDown());\r
-        }\r
-        else\r
-        {\r
-          cut_actionPerformed();\r
-          alignPanel.seqPanel.seqCanvas.repaint();\r
-        }\r
-        break;\r
-\r
-      case KeyEvent.VK_S:\r
-        if (viewport.cursorMode)\r
-        {\r
-          alignPanel.seqPanel.setCursorRow();\r
-        }\r
-        break;\r
-      case KeyEvent.VK_P:\r
-        if (viewport.cursorMode)\r
-        {\r
-          alignPanel.seqPanel.setCursorPosition();\r
-        }\r
-        break;\r
-\r
-      case KeyEvent.VK_ENTER:\r
-      case KeyEvent.VK_COMMA:\r
-        if (viewport.cursorMode)\r
-        {\r
-          alignPanel.seqPanel.setCursorRowAndColumn();\r
-        }\r
-        break;\r
-\r
-      case KeyEvent.VK_Q:\r
-        if (viewport.cursorMode)\r
-        {\r
-          alignPanel.seqPanel.setSelectionAreaAtCursor(true);\r
-        }\r
-        break;\r
-      case KeyEvent.VK_M:\r
-        if (viewport.cursorMode)\r
-        {\r
-          alignPanel.seqPanel.setSelectionAreaAtCursor(false);\r
-        }\r
-        break;\r
-\r
-      case KeyEvent.VK_F2:\r
-        viewport.cursorMode = !viewport.cursorMode;\r
-        statusBar.setText("Keyboard editing mode is " +\r
-                          (viewport.cursorMode ? "on" : "off"));\r
-        if (viewport.cursorMode)\r
-        {\r
-          alignPanel.seqPanel.seqCanvas.cursorX = viewport.startRes;\r
-          alignPanel.seqPanel.seqCanvas.cursorY = viewport.startSeq;\r
-        }\r
-        break;\r
-\r
-      case KeyEvent.VK_F:\r
-        if (evt.isControlDown())\r
-        {\r
-          findMenuItem_actionPerformed();\r
-        }\r
-        break;\r
-\r
-      case KeyEvent.VK_H:\r
-      {\r
-        boolean toggleSeqs = !evt.isControlDown();\r
-        boolean toggleCols = !evt.isShiftDown();\r
-        boolean hide = false;\r
-        SequenceGroup sg = viewport.getSelectionGroup();\r
-\r
-        if (toggleSeqs)\r
-        {\r
-          if (sg != null && sg.getSize() != viewport.alignment.getHeight())\r
-          {\r
-            hide = true;\r
-            viewport.hideAllSelectedSeqs();\r
-          }\r
-          else if (! (toggleCols && viewport.colSel.getSelected().size() > 0))\r
-          {\r
-            viewport.showAllHiddenSeqs();\r
-          }\r
-        }\r
-\r
-        if (toggleCols)\r
-        {\r
-          if (viewport.colSel.getSelected().size() > 0)\r
-          {\r
-            viewport.hideSelectedColumns();\r
-            if (!toggleSeqs)\r
-            {\r
-              viewport.selectionGroup = sg;\r
-            }\r
-          }\r
-          else if (!hide)\r
-          {\r
-            viewport.showAllHiddenColumns();\r
-          }\r
-        }\r
-        break;\r
-      }\r
-\r
-      case KeyEvent.VK_PAGE_UP:\r
-        if (viewport.wrapAlignment)\r
-        {\r
-          alignPanel.scrollUp(true);\r
-        }\r
-        else\r
-        {\r
-          alignPanel.setScrollValues(viewport.startRes,\r
-                                     viewport.startSeq\r
-                                     - viewport.endSeq + viewport.startSeq);\r
-        }\r
-        break;\r
-\r
-      case KeyEvent.VK_PAGE_DOWN:\r
-        if (viewport.wrapAlignment)\r
-        {\r
-          alignPanel.scrollUp(false);\r
-        }\r
-        else\r
-        {\r
-          alignPanel.setScrollValues(viewport.startRes,\r
-                                     viewport.startSeq\r
-                                     + viewport.endSeq - viewport.startSeq);\r
-        }\r
-        break;\r
-\r
-      case KeyEvent.VK_Z:\r
-        if (evt.isControlDown())\r
-        {\r
-          undoMenuItem_actionPerformed();\r
-        }\r
-        break;\r
-\r
-      case KeyEvent.VK_Y:\r
-        if (evt.isControlDown())\r
-        {\r
-          redoMenuItem_actionPerformed();\r
-        }\r
-        break;\r
-\r
-      case KeyEvent.VK_L:\r
-        if (evt.isControlDown())\r
-        {\r
-          trimAlignment(true);\r
-        }\r
-        break;\r
-\r
-      case KeyEvent.VK_R:\r
-        if (evt.isControlDown())\r
-        {\r
-          trimAlignment(false);\r
-        }\r
-        break;\r
-\r
-      case KeyEvent.VK_E:\r
-        if (evt.isControlDown())\r
-        {\r
-          if (evt.isShiftDown())\r
-          {\r
-            this.removeAllGapsMenuItem_actionPerformed();\r
-          }\r
-          else\r
-          {\r
-            removeGappedColumnMenuItem_actionPerformed();\r
-          }\r
-        }\r
-        break;\r
-      case KeyEvent.VK_I:\r
-        if (evt.isControlDown())\r
-        {\r
-          if (evt.isAltDown())\r
-          {\r
-            viewport.invertColumnSelection();\r
-          }\r
-          else\r
-          {\r
-            this.invertSequenceMenuItem_actionPerformed();\r
-          }\r
-        }\r
-        break;\r
-\r
-      case KeyEvent.VK_U:\r
-        if (evt.isControlDown())\r
-        {\r
-          this.deleteGroups_actionPerformed();\r
-        }\r
-        break;\r
-\r
-      case KeyEvent.VK_T:\r
-        if (evt.isControlDown())\r
-        {\r
-          newView();\r
-        }\r
-        break;\r
-\r
-    }\r
-    alignPanel.paintAlignment(true);\r
-  }\r
-\r
-  public void keyReleased(KeyEvent evt)\r
-  {}\r
-\r
-  public void keyTyped(KeyEvent evt)\r
-  {}\r
-\r
-  public void itemStateChanged(ItemEvent evt)\r
-  {\r
-    if (evt.getSource() == colourTextMenuItem)\r
-    {\r
-      colourTextMenuItem_actionPerformed();\r
-    }\r
-    else if (evt.getSource() == wrapMenuItem)\r
-    {\r
-      wrapMenuItem_actionPerformed();\r
-    }\r
-    else if (evt.getSource() == scaleAbove)\r
-    {\r
-      viewport.setScaleAboveWrapped(scaleAbove.getState());\r
-    }\r
-    else if (evt.getSource() == scaleLeft)\r
-    {\r
-      viewport.setScaleLeftWrapped(scaleLeft.getState());\r
-    }\r
-    else if (evt.getSource() == scaleRight)\r
-    {\r
-      viewport.setScaleRightWrapped(scaleRight.getState());\r
-    }\r
-    else if (evt.getSource() == seqLimits)\r
-    {\r
-      seqLimits_itemStateChanged();\r
-    }\r
-    else if (evt.getSource() == viewBoxesMenuItem)\r
-    {\r
-      viewport.setShowBoxes(viewBoxesMenuItem.getState());\r
-    }\r
-    else if (evt.getSource() == viewTextMenuItem)\r
-    {\r
-      viewport.setShowText(viewTextMenuItem.getState());\r
-    }\r
-    else if (evt.getSource() == renderGapsMenuItem)\r
-    {\r
-      viewport.setRenderGaps(renderGapsMenuItem.getState());\r
-    }\r
-    else if (evt.getSource() == annotationPanelMenuItem)\r
-    {\r
-      viewport.setShowAnnotation(annotationPanelMenuItem.getState());\r
-      alignPanel.setAnnotationVisible(annotationPanelMenuItem.getState());\r
-    }\r
-    else if (evt.getSource() == sequenceFeatures)\r
-    {\r
-      viewport.showSequenceFeatures(sequenceFeatures.getState());\r
-      alignPanel.seqPanel.seqCanvas.repaint();\r
-    }\r
-    else if (evt.getSource() == conservationMenuItem)\r
-    {\r
-      conservationMenuItem_actionPerformed();\r
-    }\r
-    else if (evt.getSource() == abovePIDThreshold)\r
-    {\r
-      abovePIDThreshold_actionPerformed();\r
-    }\r
-    else if (evt.getSource() == applyToAllGroups)\r
-    {\r
-      viewport.setColourAppliesToAllGroups(applyToAllGroups.getState());\r
-    }\r
-    else if (evt.getSource() == autoCalculate)\r
-    {\r
-      viewport.autocalculateConsensus = autoCalculate.getState();\r
-    }\r
-\r
-    alignPanel.paintAlignment(true);\r
-  }\r
-\r
-  public void actionPerformed(ActionEvent evt)\r
-  {\r
-    Object source = evt.getSource();\r
-\r
-    if (source == inputText)\r
-    {\r
-      inputText_actionPerformed();\r
-    }\r
-    else if (source == loadTree)\r
-    {\r
-      loadTree_actionPerformed();\r
-    }\r
-    else if (source == loadApplication)\r
-    {\r
-      launchFullApplication();\r
-    }\r
-    else if (source == loadAnnotations)\r
-    {\r
-      loadAnnotations();\r
-    }\r
-    else if (source == outputAnnotations)\r
-    {\r
-      outputAnnotations(true);\r
-    }\r
-    else if (source == outputFeatures)\r
-    {\r
-      outputFeatures(true, "Jalview");\r
-    }\r
-    else if (source == closeMenuItem)\r
-    {\r
-      closeMenuItem_actionPerformed();\r
-    }\r
-    else if (source == copy)\r
-    {\r
-      copy_actionPerformed();\r
-    }\r
-    else if (source == undoMenuItem)\r
-    {\r
-      undoMenuItem_actionPerformed();\r
-    }\r
-    else if (source == redoMenuItem)\r
-    {\r
-      redoMenuItem_actionPerformed();\r
-    }\r
-    else if (source == inputText)\r
-    {\r
-      inputText_actionPerformed();\r
-    }\r
-    else if (source == closeMenuItem)\r
-    {\r
-      closeMenuItem_actionPerformed();\r
-    }\r
-    else if (source == undoMenuItem)\r
-    {\r
-      undoMenuItem_actionPerformed();\r
-    }\r
-    else if (source == redoMenuItem)\r
-    {\r
-      redoMenuItem_actionPerformed();\r
-    }\r
-    else if (source == copy)\r
-    {\r
-      copy_actionPerformed();\r
-    }\r
-    else if (source == pasteNew)\r
-    {\r
-      pasteNew_actionPerformed();\r
-    }\r
-    else if (source == pasteThis)\r
-    {\r
-      pasteThis_actionPerformed();\r
-    }\r
-    else if (source == cut)\r
-    {\r
-      cut_actionPerformed();\r
-    }\r
-    else if (source == delete)\r
-    {\r
-      delete_actionPerformed();\r
-    }\r
-    else if (source == deleteGroups)\r
-    {\r
-      deleteGroups_actionPerformed();\r
-    }\r
-    else if (source == selectAllSequenceMenuItem)\r
-    {\r
-      selectAllSequenceMenuItem_actionPerformed();\r
-    }\r
-    else if (source == deselectAllSequenceMenuItem)\r
-    {\r
-      deselectAllSequenceMenuItem_actionPerformed();\r
-    }\r
-    else if (source == invertSequenceMenuItem)\r
-    {\r
-      invertSequenceMenuItem_actionPerformed();\r
-    }\r
-    else if (source == invertColSel)\r
-    {\r
-      viewport.invertColumnSelection();\r
-      alignPanel.paintAlignment(true);\r
-    }\r
-    else if (source == remove2LeftMenuItem)\r
-    {\r
-      trimAlignment(true);\r
-    }\r
-    else if (source == remove2RightMenuItem)\r
-    {\r
-      trimAlignment(false);\r
-    }\r
-    else if (source == removeGappedColumnMenuItem)\r
-    {\r
-      removeGappedColumnMenuItem_actionPerformed();\r
-    }\r
-    else if (source == removeAllGapsMenuItem)\r
-    {\r
-      removeAllGapsMenuItem_actionPerformed();\r
-    }\r
-    else if (source == findMenuItem)\r
-    {\r
-      findMenuItem_actionPerformed();\r
-    }\r
-    else if (source == font)\r
-    {\r
-      new FontChooser(alignPanel);\r
-    }\r
-    else if (source == newView)\r
-    {\r
-      newView();\r
-    }\r
-    else if (source == showColumns)\r
-    {\r
-      viewport.showAllHiddenColumns();\r
-      alignPanel.paintAlignment(true);\r
-    }\r
-    else if (source == showSeqs)\r
-    {\r
-      viewport.showAllHiddenSeqs();\r
-    }\r
-    else if (source == hideColumns)\r
-    {\r
-      viewport.hideSelectedColumns();\r
-      alignPanel.paintAlignment(true);\r
-    }\r
-    else if (source == hideSequences && viewport.getSelectionGroup() != null)\r
-    {\r
-      viewport.hideAllSelectedSeqs();\r
-    }\r
-    else if (source == featureSettings)\r
-    {\r
-      new FeatureSettings(alignPanel);\r
-    }\r
-    else if(source== alProperties)\r
-    {\r
-        StringBuffer contents = new StringBuffer();\r
-\r
-        float avg  = 0;\r
-        int min=Integer.MAX_VALUE, max=0;\r
-        for(int i=0; i<viewport.alignment.getHeight(); i++)\r
-        {\r
-          int size = viewport.alignment.getSequenceAt(i).getEnd()\r
-              -viewport.alignment.getSequenceAt(i).getStart();\r
-          avg += size;\r
-          if(size>max)\r
-            max = size;\r
-          if(size<min)\r
-            min = size;\r
-        }\r
-        avg = avg/(float)viewport.alignment.getHeight();\r
-\r
-        contents.append("\nSequences: "+ viewport.alignment.getHeight());\r
-        contents.append("\nMinimum Sequence Length: "+min);\r
-        contents.append("\nMaximum Sequence Length: "+max);\r
-        contents.append("\nAverage Length: "+(int)avg);\r
-\r
-        if (((Alignment)viewport.alignment).alignmentProperties != null)\r
-        {\r
-          Hashtable props = ((Alignment)viewport.alignment).alignmentProperties;\r
-          Enumeration en = props.keys();\r
-          while(en.hasMoreElements())\r
-          {\r
-            String key = en.nextElement().toString();\r
-            contents.append("\n"+key+"\t"+props.get(key));\r
-          }\r
-        }\r
-\r
-        CutAndPasteTransfer cap = new CutAndPasteTransfer(false, this);\r
-        cap.setText(contents.toString());\r
-        Frame frame = new Frame();\r
-        frame.add(cap);\r
-        jalview.bin.JalviewLite.addFrame(frame,\r
-                                         "Alignment Properties: "+getTitle()\r
-                                         , 400, 250);\r
-    }\r
-    else if (source == overviewMenuItem)\r
-    {\r
-      overviewMenuItem_actionPerformed();\r
-    }\r
-    else if (source == noColourmenuItem)\r
-    {\r
-      changeColour(null);\r
-    }\r
-    else if (source == clustalColour)\r
-    {\r
-      abovePIDThreshold.setState(false);\r
-      changeColour(new ClustalxColourScheme(viewport.alignment.getSequences(),\r
-                                            viewport.alignment.getWidth()));\r
-    }\r
-    else if (source == zappoColour)\r
-    {\r
-      changeColour(new ZappoColourScheme());\r
-    }\r
-    else if (source == taylorColour)\r
-    {\r
-      changeColour(new TaylorColourScheme());\r
-    }\r
-    else if (source == hydrophobicityColour)\r
-    {\r
-      changeColour(new HydrophobicColourScheme());\r
-    }\r
-    else if (source == helixColour)\r
-    {\r
-      changeColour(new HelixColourScheme());\r
-    }\r
-    else if (source == strandColour)\r
-    {\r
-      changeColour(new StrandColourScheme());\r
-    }\r
-    else if (source == turnColour)\r
-    {\r
-      changeColour(new TurnColourScheme());\r
-    }\r
-    else if (source == buriedColour)\r
-    {\r
-      changeColour(new BuriedColourScheme());\r
-    }\r
-    else if (source == nucleotideColour)\r
-    {\r
-      changeColour(new NucleotideColourScheme());\r
-    }\r
-    else if (source == modifyPID)\r
-    {\r
-      modifyPID_actionPerformed();\r
-    }\r
-    else if (source == modifyConservation)\r
-    {\r
-      modifyConservation_actionPerformed();\r
-    }\r
-    else if (source == userDefinedColour)\r
-    {\r
-      new UserDefinedColours(alignPanel, null);\r
-    }\r
-    else if (source == PIDColour)\r
-    {\r
-      changeColour(new PIDColourScheme());\r
-    }\r
-    else if (source == BLOSUM62Colour)\r
-    {\r
-      changeColour(new Blosum62ColourScheme());\r
-    }\r
-    else if (source == annotationColour)\r
-    {\r
-      new AnnotationColourChooser(viewport, alignPanel);\r
-    }\r
-    else if (source == sortPairwiseMenuItem)\r
-    {\r
-      sortPairwiseMenuItem_actionPerformed();\r
-    }\r
-    else if (source == sortIDMenuItem)\r
-    {\r
-      sortIDMenuItem_actionPerformed();\r
-    }\r
-    else if (source == sortGroupMenuItem)\r
-    {\r
-      sortGroupMenuItem_actionPerformed();\r
-    }\r
-    else if (source == removeRedundancyMenuItem)\r
-    {\r
-      removeRedundancyMenuItem_actionPerformed();\r
-    }\r
-    else if (source == pairwiseAlignmentMenuItem)\r
-    {\r
-      pairwiseAlignmentMenuItem_actionPerformed();\r
-    }\r
-    else if (source == PCAMenuItem)\r
-    {\r
-      PCAMenuItem_actionPerformed();\r
-    }\r
-    else if (source == averageDistanceTreeMenuItem)\r
-    {\r
-      averageDistanceTreeMenuItem_actionPerformed();\r
-    }\r
-    else if (source == neighbourTreeMenuItem)\r
-    {\r
-      neighbourTreeMenuItem_actionPerformed();\r
-    }\r
-    else if (source == njTreeBlosumMenuItem)\r
-    {\r
-      njTreeBlosumMenuItem_actionPerformed();\r
-    }\r
-    else if (source == avDistanceTreeBlosumMenuItem)\r
-    {\r
-      avTreeBlosumMenuItem_actionPerformed();\r
-    }\r
-    else if (source == documentation)\r
-    {\r
-      documentation_actionPerformed();\r
-    }\r
-    else if (source == about)\r
-    {\r
-      about_actionPerformed();\r
-    }\r
-\r
-  }\r
-\r
-  public void inputText_actionPerformed()\r
-  {\r
-    CutAndPasteTransfer cap = new CutAndPasteTransfer(true, this);\r
-    Frame frame = new Frame();\r
-    frame.add(cap);\r
-    jalview.bin.JalviewLite.addFrame(frame, "Cut & Paste Input", 500, 500);\r
-  }\r
-\r
-  protected void outputText_actionPerformed(ActionEvent e)\r
-  {\r
-    CutAndPasteTransfer cap = new CutAndPasteTransfer(true, this);\r
-    Frame frame = new Frame();\r
-    frame.add(cap);\r
-    jalview.bin.JalviewLite.addFrame(frame,\r
-                                     "Alignment output - " + e.getActionCommand(),\r
-                                     600, 500);\r
-    cap.setText(new AppletFormatAdapter().formatSequences(e.getActionCommand(),\r
-        viewport.getAlignment(),\r
-        viewport.showJVSuffix));\r
-  }\r
-\r
-  public void loadAnnotations()\r
-  {\r
-    CutAndPasteTransfer cap = new CutAndPasteTransfer(true, this);\r
-    cap.setText("Paste your features / annotations file here.");\r
-    cap.setAnnotationImport();\r
-    Frame frame = new Frame();\r
-    frame.add(cap);\r
-    jalview.bin.JalviewLite.addFrame(frame, "Paste Annotations ", 400, 300);\r
-\r
-  }\r
-\r
-  public String outputAnnotations(boolean displayTextbox)\r
-  {\r
-    String annotation = new AnnotationFile().printAnnotations(\r
-        viewport.showAnnotation ? viewport.alignment.getAlignmentAnnotation() : null,\r
-        viewport.alignment.getGroups(),\r
-         ((Alignment) viewport.alignment).alignmentProperties);\r
-\r
-    if (displayTextbox)\r
-    {\r
-      CutAndPasteTransfer cap = new CutAndPasteTransfer(false, this);\r
-      Frame frame = new Frame();\r
-      frame.add(cap);\r
-      jalview.bin.JalviewLite.addFrame(frame,\r
-                                       "Annotations",\r
-                                       600, 500);\r
-      cap.setText(annotation);\r
-    }\r
-\r
-    return annotation;\r
-  }\r
-\r
-  public String outputFeatures(boolean displayTextbox, String format)\r
-  {\r
-    String features;\r
-    if (format.equalsIgnoreCase("Jalview"))\r
-    {\r
-      features = new FeaturesFile().printJalviewFormat(\r
-          viewport.alignment.getSequencesArray(),\r
-          viewport.featuresDisplayed);\r
-    }\r
-    else\r
-    {\r
-      features = new FeaturesFile().printGFFFormat(\r
-          viewport.alignment.getSequencesArray(),\r
-          viewport.featuresDisplayed);\r
-    }\r
-\r
-    if (displayTextbox)\r
-    {\r
-      CutAndPasteTransfer cap = new CutAndPasteTransfer(false, this);\r
-      Frame frame = new Frame();\r
-      frame.add(cap);\r
-      jalview.bin.JalviewLite.addFrame(frame,\r
-                                       "Features",\r
-                                       600, 500);\r
-\r
-      cap.setText(features);\r
-    }\r
-\r
-    return features;\r
-  }\r
-\r
-  void launchFullApplication()\r
-  {\r
-    StringBuffer url = new StringBuffer(jalviewServletURL);\r
-\r
-    url.append("?open=" +\r
-               appendProtocol(viewport.applet.getParameter("file")));\r
-\r
-    if (viewport.applet.getParameter("features") != null)\r
-    {\r
-      url.append("&features=");\r
-      url.append(appendProtocol(viewport.applet.getParameter("features")));\r
-    }\r
-\r
-    if (viewport.applet.getParameter("annotations") != null)\r
-    {\r
-      url.append("&annotations=");\r
-      url.append(appendProtocol(viewport.applet.getParameter("annotations")));\r
-    }\r
-\r
-    if (viewport.applet.getParameter("jnetfile") != null)\r
-    {\r
-      url.append("&annotations=");\r
-      url.append(appendProtocol(viewport.applet.getParameter("jnetfile")));\r
-    }\r
-\r
-    if (viewport.applet.getParameter("defaultColour") != null)\r
-    {\r
-      url.append("&colour=" +\r
-                 removeWhiteSpace(viewport.applet.getParameter("defaultColour"))\r
-          );\r
-    }\r
-\r
-    if (viewport.applet.getParameter("userDefinedColour") != null)\r
-    {\r
-      url.append("&colour=" +\r
-                 removeWhiteSpace(viewport.applet.getParameter(\r
-          "userDefinedColour"))\r
-          );\r
-    }\r
-\r
-    showURL(url.toString(), "FULL_APP");\r
-  }\r
-\r
-  String removeWhiteSpace(String colour)\r
-  {\r
-    StringBuffer sb = new StringBuffer();\r
-    for (int i = 0; i < colour.length(); i++)\r
-    {\r
-      if (Character.isWhitespace(colour.charAt(i)))\r
-      {\r
-        sb.append("%20");\r
-      }\r
-      else\r
-      {\r
-        sb.append(colour.charAt(i));\r
-      }\r
-    }\r
-\r
-    return sb.toString();\r
-  }\r
-\r
-  String appendProtocol(String url)\r
-  {\r
-    try\r
-    {\r
-      new URL(url);\r
-    }\r
-    catch (java.net.MalformedURLException ex)\r
-    {\r
-      url = viewport.applet.getCodeBase() + url;\r
-    }\r
-    return url;\r
-  }\r
-\r
-  public void closeMenuItem_actionPerformed()\r
-  {\r
-    PaintRefresher.RemoveComponent(alignPanel);\r
-    PaintRefresher.RemoveComponent(alignPanel.seqPanel.seqCanvas);\r
-    PaintRefresher.RemoveComponent(alignPanel.idPanel.idCanvas);\r
-\r
-    if (PaintRefresher.components.size() == 0 && viewport.applet == null)\r
-    {\r
-      System.exit(0);\r
-    }\r
-\r
-    this.dispose();\r
-  }\r
-\r
-  /**\r
-   * DOCUMENT ME!\r
-   */\r
-  void updateEditMenuBar()\r
-  {\r
-\r
-    if (viewport.historyList.size() > 0)\r
-    {\r
-      undoMenuItem.setEnabled(true);\r
-      CommandI command = (CommandI) viewport.historyList.peek();\r
-      undoMenuItem.setLabel("Undo " + command.getDescription());\r
-    }\r
-    else\r
-    {\r
-      undoMenuItem.setEnabled(false);\r
-      undoMenuItem.setLabel("Undo");\r
-    }\r
-\r
-    if (viewport.redoList.size() > 0)\r
-    {\r
-      redoMenuItem.setEnabled(true);\r
-\r
-      CommandI command = (CommandI) viewport.redoList.peek();\r
-      redoMenuItem.setLabel("Redo " + command.getDescription());\r
-    }\r
-    else\r
-    {\r
-      redoMenuItem.setEnabled(false);\r
-      redoMenuItem.setLabel("Redo");\r
-    }\r
-  }\r
-\r
-  public void addHistoryItem(CommandI command)\r
-  {\r
-    if (command.getSize() > 0)\r
-    {\r
-      viewport.historyList.push(command);\r
-      viewport.redoList.removeAllElements();\r
-      updateEditMenuBar();\r
-      viewport.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null;\r
-    }\r
-  }\r
-\r
-  /**\r
-   * DOCUMENT ME!\r
-   *\r
-   * @param e DOCUMENT ME!\r
-   */\r
-  protected void undoMenuItem_actionPerformed()\r
-  {\r
-    if (viewport.historyList.size() < 1)\r
-    {\r
-      return;\r
-    }\r
-\r
-    CommandI command = (CommandI) viewport.historyList.pop();\r
-    viewport.redoList.push(command);\r
-    command.undoCommand();\r
-\r
-    AlignViewport originalSource = getOriginatingSource(command);\r
-\r
-    originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null;\r
-    updateEditMenuBar();\r
-    originalSource.firePropertyChange("alignment", null,\r
-                                      originalSource.alignment.getSequences());\r
-  }\r
-\r
-  /**\r
-   * DOCUMENT ME!\r
-   *\r
-   * @param e DOCUMENT ME!\r
-   */\r
-  protected void redoMenuItem_actionPerformed()\r
-  {\r
-    if (viewport.redoList.size() < 1)\r
-    {\r
-      return;\r
-    }\r
-\r
-    CommandI command = (CommandI) viewport.redoList.pop();\r
-    viewport.historyList.push(command);\r
-    command.doCommand();\r
-\r
-    AlignViewport originalSource = getOriginatingSource(command);\r
-    originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null;\r
-\r
-    updateEditMenuBar();\r
-    originalSource.firePropertyChange("alignment", null,\r
-                                      originalSource.alignment.getSequences());\r
-  }\r
-\r
-  AlignViewport getOriginatingSource(CommandI command)\r
-  {\r
-    AlignViewport originalSource = null;\r
-    //For sequence removal and addition, we need to fire\r
-    //the property change event FROM the viewport where the\r
-    //original alignment was altered\r
-    AlignmentI al = null;\r
-    if (command instanceof EditCommand)\r
-    {\r
-      EditCommand editCommand = (EditCommand) command;\r
-      al = editCommand.getAlignment();\r
-      Vector comps = (Vector) PaintRefresher.components\r
-          .get(viewport.getSequenceSetId());\r
-      for (int i = 0; i < comps.size(); i++)\r
-      {\r
-        if (comps.elementAt(i) instanceof AlignmentPanel)\r
-        {\r
-          if (al == ( (AlignmentPanel) comps.elementAt(i)).av.alignment)\r
-          {\r
-            originalSource = ( (AlignmentPanel) comps.elementAt(i)).av;\r
-            break;\r
-          }\r
-        }\r
-      }\r
-    }\r
-\r
-    if (originalSource == null)\r
-    {\r
-      //The original view is closed, we must validate\r
-      //the current view against the closed view first\r
-      if (al != null)\r
-      {\r
-        PaintRefresher.validateSequences(al, viewport.alignment);\r
-      }\r
-\r
-      originalSource = viewport;\r
-    }\r
-\r
-    return originalSource;\r
-  }\r
-\r
-  public void moveSelectedSequences(boolean up)\r
-  {\r
-    SequenceGroup sg = viewport.getSelectionGroup();\r
-    if (sg == null)\r
-    {\r
-      return;\r
-    }\r
-\r
-    if (up)\r
-    {\r
-      for (int i = 1; i < viewport.alignment.getHeight(); i++)\r
-      {\r
-        SequenceI seq = viewport.alignment.getSequenceAt(i);\r
-        if (!sg.getSequences(null).contains(seq))\r
-        {\r
-          continue;\r
-        }\r
-\r
-        SequenceI temp = viewport.alignment.getSequenceAt(i - 1);\r
-        if (sg.getSequences(null).contains(temp))\r
-        {\r
-          continue;\r
-        }\r
-\r
-        viewport.alignment.getSequences().setElementAt(temp, i);\r
-        viewport.alignment.getSequences().setElementAt(seq, i - 1);\r
-      }\r
-    }\r
-    else\r
-    {\r
-      for (int i = viewport.alignment.getHeight() - 2; i > -1; i--)\r
-      {\r
-        SequenceI seq = viewport.alignment.getSequenceAt(i);\r
-        if (!sg.getSequences(viewport.hiddenRepSequences).contains(seq))\r
-        {\r
-          continue;\r
-        }\r
-\r
-        SequenceI temp = viewport.alignment.getSequenceAt(i + 1);\r
-        if (sg.getSequences(viewport.hiddenRepSequences).contains(temp))\r
-        {\r
-          continue;\r
-        }\r
-\r
-        viewport.alignment.getSequences().setElementAt(temp, i);\r
-        viewport.alignment.getSequences().setElementAt(seq, i + 1);\r
-      }\r
-    }\r
-\r
-    alignPanel.paintAlignment(true);\r
-  }\r
-\r
-  synchronized void slideSequences(boolean right, int size)\r
-  {\r
-    Vector sg = new Vector();\r
-    if(viewport.cursorMode)\r
-    {\r
-      sg.addElement(viewport.alignment.getSequenceAt(\r
-          alignPanel.seqPanel.seqCanvas.cursorY));\r
-    }\r
-    else if(viewport.getSelectionGroup()!=null\r
-        && viewport.getSelectionGroup().getSize()!=viewport.alignment.getHeight())\r
-   {\r
-     sg = viewport.getSelectionGroup().getSequences(\r
-         viewport.hiddenRepSequences);\r
-   }\r
-\r
-    if(sg.size()<1)\r
-    {\r
-      return;\r
-    }\r
-\r
-    Vector invertGroup = new Vector();\r
-\r
-    for (int i = 0; i < viewport.alignment.getHeight(); i++)\r
-    {\r
-      if(!sg.contains(viewport.alignment.getSequenceAt(i)))\r
-         invertGroup.addElement(viewport.alignment.getSequenceAt(i));\r
-    }\r
-\r
-    SequenceI[] seqs1 = new SequenceI[sg.size()];\r
-    for (int i = 0; i < sg.size(); i++)\r
-      seqs1[i] = (SequenceI) sg.elementAt(i);\r
-\r
-    SequenceI[] seqs2 = new SequenceI[invertGroup.size()];\r
-    for (int i = 0; i < invertGroup.size(); i++)\r
-      seqs2[i] = (SequenceI) invertGroup.elementAt(i);\r
-\r
-    SlideSequencesCommand ssc;\r
-    if (right)\r
-      ssc = new SlideSequencesCommand("Slide Sequences",\r
-                                      seqs2, seqs1, size,\r
-                                      viewport.getGapCharacter()\r
-          );\r
-    else\r
-      ssc = new SlideSequencesCommand("Slide Sequences",\r
-                                      seqs1, seqs2, size,\r
-                                      viewport.getGapCharacter()\r
-          );\r
-\r
-    int groupAdjustment = 0;\r
-    if (ssc.getGapsInsertedBegin() && right)\r
-    {\r
-      if (viewport.cursorMode)\r
-        alignPanel.seqPanel.moveCursor(size, 0);\r
-      else\r
-        groupAdjustment = size;\r
-    }\r
-    else if (!ssc.getGapsInsertedBegin() && !right)\r
-    {\r
-      if (viewport.cursorMode)\r
-        alignPanel.seqPanel.moveCursor( -size, 0);\r
-      else\r
-        groupAdjustment = -size;\r
-    }\r
-\r
-    if (groupAdjustment != 0)\r
-    {\r
-      viewport.getSelectionGroup().setStartRes(\r
-          viewport.getSelectionGroup().getStartRes() + groupAdjustment);\r
-      viewport.getSelectionGroup().setEndRes(\r
-          viewport.getSelectionGroup().getEndRes() + groupAdjustment);\r
-    }\r
-\r
-\r
-    boolean appendHistoryItem = false;\r
-    if(viewport.historyList!=null\r
-       && viewport.historyList.size()>0\r
-      && viewport.historyList.peek() instanceof SlideSequencesCommand)\r
-    {\r
-      appendHistoryItem = ssc.appendSlideCommand(\r
-          (SlideSequencesCommand)viewport.historyList.peek())\r
-          ;\r
-    }\r
-\r
-    if(!appendHistoryItem)\r
-      addHistoryItem(ssc);\r
-\r
-    repaint();\r
-  }\r
-\r
-  static StringBuffer copiedSequences;\r
-  static Vector copiedHiddenColumns;\r
-  protected void copy_actionPerformed()\r
-  {\r
-    if (viewport.getSelectionGroup() == null)\r
-    {\r
-      return;\r
-    }\r
-\r
-    SequenceGroup sg = viewport.getSelectionGroup();\r
-    copiedSequences = new StringBuffer();\r
-    Hashtable orderedSeqs = new Hashtable();\r
-    for (int i = 0; i < sg.getSize(); i++)\r
-    {\r
-      SequenceI seq = sg.getSequenceAt(i);\r
-      int index = viewport.alignment.findIndex(seq);\r
-      orderedSeqs.put(index + "", seq);\r
-    }\r
-\r
-    int index = 0, startRes, endRes;\r
-    char ch;\r
-\r
-    if (viewport.hasHiddenColumns && viewport.getSelectionGroup() != null)\r
-    {\r
-      copiedHiddenColumns = new Vector();\r
-      int hiddenOffset = viewport.getSelectionGroup().getStartRes();\r
-      for (int i = 0; i < viewport.getColumnSelection().getHiddenColumns().size();\r
-           i++)\r
-      {\r
-        int[] region = (int[])\r
-            viewport.getColumnSelection().getHiddenColumns().elementAt(i);\r
-\r
-        copiedHiddenColumns.addElement(new int[]\r
-                                       {region[0] - hiddenOffset,\r
-                                       region[1] - hiddenOffset});\r
-      }\r
-    }\r
-    else\r
-    {\r
-      copiedHiddenColumns = null;\r
-    }\r
-\r
-    for (int i = 0; i < sg.getSize(); i++)\r
-    {\r
-      SequenceI seq = null;\r
-\r
-      while (seq == null)\r
-      {\r
-        if (orderedSeqs.containsKey(index + ""))\r
-        {\r
-          seq = (SequenceI) orderedSeqs.get(index + "");\r
-          index++;\r
-\r
-          break;\r
-        }\r
-        else\r
-        {\r
-          index++;\r
-        }\r
-      }\r
-\r
-      //FIND START RES\r
-      //Returns residue following index if gap\r
-      startRes = seq.findPosition(sg.getStartRes());\r
-\r
-      //FIND END RES\r
-      //Need to find the residue preceeding index if gap\r
-      endRes = 0;\r
-\r
-      for (int j = 0; j < sg.getEndRes() + 1 && j < seq.getLength(); j++)\r
-      {\r
-        ch = seq.getCharAt(j);\r
-        if (!jalview.util.Comparison.isGap( (ch)))\r
-        {\r
-          endRes++;\r
-        }\r
-      }\r
-\r
-      if (endRes > 0)\r
-      {\r
-        endRes += seq.getStart() - 1;\r
-      }\r
-\r
-      copiedSequences.append(seq.getName() + "\t" +\r
-                             startRes + "\t" +\r
-                             endRes + "\t" +\r
-                             seq.getSequenceAsString(sg.getStartRes(),\r
-          sg.getEndRes() + 1) + "\n");\r
-    }\r
-\r
-  }\r
-\r
-  protected void pasteNew_actionPerformed()\r
-  {\r
-    paste(true);\r
-  }\r
-\r
-  protected void pasteThis_actionPerformed()\r
-  {\r
-    paste(false);\r
-  }\r
-\r
-  void paste(boolean newAlignment)\r
-  {\r
-    try\r
-    {\r
-\r
-      if (copiedSequences == null)\r
-      {\r
-        return;\r
-      }\r
-\r
-      StringTokenizer st = new StringTokenizer(copiedSequences.toString());\r
-      Vector seqs = new Vector();\r
-      while (st.hasMoreElements())\r
-      {\r
-        String name = st.nextToken();\r
-        int start = Integer.parseInt(st.nextToken());\r
-        int end = Integer.parseInt(st.nextToken());\r
-        seqs.addElement(new Sequence(name, st.nextToken(), start, end));\r
-      }\r
-      SequenceI[] newSeqs = new SequenceI[seqs.size()];\r
-      for (int i = 0; i < seqs.size(); i++)\r
-      {\r
-        newSeqs[i] = (SequenceI) seqs.elementAt(i);\r
-      }\r
-\r
-      if (newAlignment)\r
-      {\r
-        String newtitle = new String("Copied sequences");\r
-        if (getTitle().startsWith("Copied sequences"))\r
-        {\r
-          newtitle = getTitle();\r
-        }\r
-        else\r
-        {\r
-          newtitle = newtitle.concat("- from " + getTitle());\r
-        }\r
-        AlignFrame af = new AlignFrame(new Alignment(newSeqs),\r
-                                       viewport.applet,\r
-                                       newtitle,\r
-                                       false);\r
-        if (copiedHiddenColumns != null)\r
-        {\r
-          for (int i = 0; i < copiedHiddenColumns.size(); i++)\r
-          {\r
-            int[] region = (int[]) copiedHiddenColumns.elementAt(i);\r
-            af.viewport.hideColumns(region[0], region[1]);\r
-          }\r
-        }\r
-\r
-        jalview.bin.JalviewLite.addFrame(af, newtitle, DEFAULT_WIDTH,\r
-                                         DEFAULT_HEIGHT);\r
-      }\r
-      else\r
-      {\r
-        addSequences(newSeqs);\r
-      }\r
-\r
-    }\r
-    catch (Exception ex)\r
-    {} // could be anything being pasted in here\r
-\r
-  }\r
-\r
-  void addSequences(SequenceI[] seqs)\r
-  {\r
-    for (int i = 0; i < seqs.length; i++)\r
-    {\r
-      viewport.alignment.addSequence(seqs[i]);\r
-    }\r
-\r
-    //!newAlignment\r
-    addHistoryItem(new EditCommand(\r
-        "Add sequences",\r
-        EditCommand.PASTE,\r
-        seqs,\r
-        0,\r
-        viewport.alignment.getWidth(),\r
-        viewport.alignment)\r
-        );\r
-\r
-    viewport.setEndSeq(viewport.alignment.getHeight());\r
-    viewport.alignment.getWidth();\r
-    viewport.firePropertyChange("alignment", null,\r
-                                viewport.alignment.getSequences());\r
-\r
-  }\r
-\r
-  protected void cut_actionPerformed()\r
-  {\r
-    copy_actionPerformed();\r
-    delete_actionPerformed();\r
-  }\r
-\r
-  protected void delete_actionPerformed()\r
-  {\r
-\r
-    SequenceGroup sg = viewport.getSelectionGroup();\r
-    if (sg == null)\r
-    {\r
-      return;\r
-    }\r
-\r
-    Vector seqs = new Vector();\r
-    SequenceI seq;\r
-    for (int i = 0; i < sg.getSize(); i++)\r
-    {\r
-      seq = sg.getSequenceAt(i);\r
-      seqs.addElement(seq);\r
-    }\r
-\r
-    // If the cut affects all sequences, remove highlighted columns\r
-    if (sg.getSize() == viewport.alignment.getHeight())\r
-    {\r
-      viewport.getColumnSelection().removeElements(sg.getStartRes(),\r
-          sg.getEndRes() + 1);\r
-    }\r
-\r
-    SequenceI[] cut = new SequenceI[seqs.size()];\r
-    for (int i = 0; i < seqs.size(); i++)\r
-    {\r
-      cut[i] = (SequenceI) seqs.elementAt(i);\r
-    }\r
-\r
-    /*\r
-         //ADD HISTORY ITEM\r
-     */\r
-    addHistoryItem(new EditCommand("Cut Sequences",\r
-                                   EditCommand.CUT,\r
-                                   cut,\r
-                                   sg.getStartRes(),\r
-                                   sg.getEndRes() - sg.getStartRes() + 1,\r
-                                   viewport.alignment));\r
-\r
-    viewport.setSelectionGroup(null);\r
-    viewport.alignment.deleteGroup(sg);\r
-\r
-    viewport.firePropertyChange("alignment", null,\r
-                                viewport.getAlignment().getSequences());\r
-\r
-    if (viewport.getAlignment().getHeight() < 1)\r
-    {\r
-      this.setVisible(false);\r
-    }\r
-  }\r
-\r
-  protected void deleteGroups_actionPerformed()\r
-  {\r
-    viewport.alignment.deleteAllGroups();\r
-    viewport.sequenceColours = null;\r
-    viewport.setSelectionGroup(null);\r
-\r
-    alignPanel.paintAlignment(true);\r
-  }\r
-\r
-  public void selectAllSequenceMenuItem_actionPerformed()\r
-  {\r
-    SequenceGroup sg = new SequenceGroup();\r
-    for (int i = 0; i < viewport.getAlignment().getSequences().size(); i++)\r
-    {\r
-      sg.addSequence(viewport.getAlignment().getSequenceAt(i), false);\r
-    }\r
-    sg.setEndRes(viewport.alignment.getWidth() - 1);\r
-    viewport.setSelectionGroup(sg);\r
-    alignPanel.paintAlignment(true);\r
-    PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());\r
-  }\r
-\r
-  public void deselectAllSequenceMenuItem_actionPerformed()\r
-  {\r
-    if (viewport.cursorMode)\r
-    {\r
-      alignPanel.seqPanel.keyboardNo1 = null;\r
-      alignPanel.seqPanel.keyboardNo2 = null;\r
-    }\r
-    viewport.setSelectionGroup(null);\r
-    viewport.getColumnSelection().clear();\r
-    viewport.setSelectionGroup(null);\r
-    alignPanel.idPanel.idCanvas.searchResults = null;\r
-    alignPanel.seqPanel.seqCanvas.highlightSearchResults(null);\r
-    alignPanel.paintAlignment(true);\r
-    PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());\r
-  }\r
-\r
-  public void invertSequenceMenuItem_actionPerformed()\r
-  {\r
-    SequenceGroup sg = viewport.getSelectionGroup();\r
-    for (int i = 0; i < viewport.getAlignment().getSequences().size(); i++)\r
-    {\r
-      sg.addOrRemove(viewport.getAlignment().getSequenceAt(i), false);\r
-    }\r
-\r
-    PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());\r
-  }\r
-\r
-  void trimAlignment(boolean trimLeft)\r
-  {\r
-    ColumnSelection colSel = viewport.getColumnSelection();\r
-    int column;\r
-\r
-    if (colSel.size() > 0)\r
-    {\r
-      if (trimLeft)\r
-      {\r
-        column = colSel.getMin();\r
-      }\r
-      else\r
-      {\r
-        column = colSel.getMax();\r
-      }\r
-\r
-      SequenceI[] seqs;\r
-      if (viewport.getSelectionGroup() != null)\r
-      {\r
-        seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.\r
-            hiddenRepSequences);\r
-      }\r
-      else\r
-      {\r
-        seqs = viewport.alignment.getSequencesArray();\r
-      }\r
-\r
-      TrimRegionCommand trimRegion;\r
-      if (trimLeft)\r
-      {\r
-        trimRegion = new TrimRegionCommand("Remove Left",\r
-                                           TrimRegionCommand.TRIM_LEFT,\r
-                                           seqs,\r
-                                           column,\r
-                                           viewport.alignment,\r
-                                           viewport.colSel,\r
-                                           viewport.selectionGroup);\r
-        viewport.setStartRes(0);\r
-      }\r
-      else\r
-      {\r
-        trimRegion = new TrimRegionCommand("Remove Right",\r
-                                           TrimRegionCommand.TRIM_RIGHT,\r
-                                           seqs,\r
-                                           column,\r
-                                           viewport.alignment,\r
-                                           viewport.colSel,\r
-                                           viewport.selectionGroup);\r
-      }\r
-\r
-      statusBar.setText("Removed " + trimRegion.getSize() + " columns.");\r
-\r
-      addHistoryItem(trimRegion);\r
-\r
-      Vector groups = viewport.alignment.getGroups();\r
-\r
-      for (int i = 0; i < groups.size(); i++)\r
-      {\r
-        SequenceGroup sg = (SequenceGroup) groups.elementAt(i);\r
-\r
-        if ( (trimLeft && !sg.adjustForRemoveLeft(column))\r
-            || (!trimLeft && !sg.adjustForRemoveRight(column)))\r
-        {\r
-          viewport.alignment.deleteGroup(sg);\r
-        }\r
-      }\r
-\r
-      viewport.firePropertyChange("alignment", null,\r
-                                  viewport.getAlignment().getSequences());\r
-    }\r
-  }\r
-\r
-  public void removeGappedColumnMenuItem_actionPerformed()\r
-  {\r
-    int start = 0, end = viewport.alignment.getWidth() - 1;\r
-\r
-    SequenceI[] seqs;\r
-    if (viewport.getSelectionGroup() != null)\r
-    {\r
-      seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.\r
-          hiddenRepSequences);\r
-      start = viewport.getSelectionGroup().getStartRes();\r
-      end = viewport.getSelectionGroup().getEndRes();\r
-    }\r
-    else\r
-    {\r
-      seqs = viewport.alignment.getSequencesArray();\r
-    }\r
-\r
-    RemoveGapColCommand removeGapCols =\r
-        new RemoveGapColCommand("Remove Gapped Columns",\r
-                                seqs,\r
-                                start, end,\r
-                                viewport.alignment);\r
-\r
-    addHistoryItem(removeGapCols);\r
-\r
-    statusBar.setText("Removed " + removeGapCols.getSize() + " empty columns.");\r
-\r
-    //This is to maintain viewport position on first residue\r
-    //of first sequence\r
-    SequenceI seq = viewport.alignment.getSequenceAt(0);\r
-    int startRes = seq.findPosition(viewport.startRes);\r
-    // ShiftList shifts;\r
-    // viewport.getAlignment().removeGaps(shifts=new ShiftList());\r
-    // edit.alColumnChanges=shifts.getInverse();\r
-    // if (viewport.hasHiddenColumns)\r
-    //   viewport.getColumnSelection().compensateForEdits(shifts);\r
-    viewport.setStartRes(seq.findIndex(startRes) - 1);\r
-    viewport.firePropertyChange("alignment", null,\r
-                                viewport.getAlignment().getSequences());\r
-\r
-  }\r
-\r
-  public void removeAllGapsMenuItem_actionPerformed()\r
-  {\r
-    int start = 0, end = viewport.alignment.getWidth() - 1;\r
-\r
-    SequenceI[] seqs;\r
-    if (viewport.getSelectionGroup() != null)\r
-    {\r
-      seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.\r
-          hiddenRepSequences);\r
-      start = viewport.getSelectionGroup().getStartRes();\r
-      end = viewport.getSelectionGroup().getEndRes();\r
-    }\r
-    else\r
-    {\r
-      seqs = viewport.alignment.getSequencesArray();\r
-    }\r
-\r
-    //This is to maintain viewport position on first residue\r
-    //of first sequence\r
-    SequenceI seq = viewport.alignment.getSequenceAt(0);\r
-    int startRes = seq.findPosition(viewport.startRes);\r
-\r
-    addHistoryItem(new RemoveGapsCommand("Remove Gaps",\r
-                                         seqs,\r
-                                         start, end,\r
-                                         viewport.alignment));\r
-\r
-    viewport.setStartRes(seq.findIndex(startRes) - 1);\r
-\r
-    viewport.firePropertyChange("alignment", null,\r
-                                viewport.getAlignment().getSequences());\r
-\r
-  }\r
-\r
-  public void findMenuItem_actionPerformed()\r
-  {\r
-    new Finder(alignPanel);\r
-  }\r
-\r
-  public void newView()\r
-  {\r
-    AlignmentI newal;\r
-    if (viewport.hasHiddenRows)\r
-    {\r
-      newal = new Alignment(viewport.getAlignment().\r
-                            getHiddenSequences()\r
-                            .getFullAlignment().\r
-                            getSequencesArray());\r
-    }\r
-    else\r
-    {\r
-      newal = new Alignment(viewport.alignment.getSequencesArray());\r
-    }\r
-\r
-    if (viewport.alignment.getAlignmentAnnotation() != null)\r
-    {\r
-      for (int i = 0; i < viewport.alignment.getAlignmentAnnotation().length; i++)\r
-      {\r
-        if (!viewport.alignment.getAlignmentAnnotation()[i].autoCalculated)\r
-        {\r
-          newal.addAnnotation(viewport.alignment.getAlignmentAnnotation()[i]);\r
-        }\r
-      }\r
-    }\r
-\r
-    AlignFrame newaf = new AlignFrame(newal,\r
-                                      viewport.applet,\r
-                                      "",\r
-                                      false);\r
-\r
-    newaf.viewport.sequenceSetID = alignPanel.av.getSequenceSetId();\r
-    PaintRefresher.Register(alignPanel, alignPanel.av.getSequenceSetId());\r
-    PaintRefresher.Register(newaf.alignPanel,\r
-                            newaf.alignPanel.av.getSequenceSetId());\r
-\r
-    PaintRefresher.Register(newaf.alignPanel.idPanel.idCanvas,\r
-                            newaf.alignPanel.av.getSequenceSetId());\r
-    PaintRefresher.Register(newaf.alignPanel.seqPanel.seqCanvas,\r
-                            newaf.alignPanel.av.getSequenceSetId());\r
-\r
-    Vector comps = (Vector) PaintRefresher.components.get(viewport.\r
-        getSequenceSetId());\r
-    int viewSize = -1;\r
-    for (int i = 0; i < comps.size(); i++)\r
-    {\r
-      if (comps.elementAt(i) instanceof AlignmentPanel)\r
-      {\r
-        viewSize++;\r
-      }\r
-    }\r
-\r
-    String title = new String(this.getTitle());\r
-    if (title.indexOf("(View") > -1)\r
-    {\r
-      title = title.substring(0, title.indexOf("(View"));\r
-    }\r
-\r
-    title += "(View " + viewSize + ")";\r
-\r
-    newaf.setTitle(title.toString());\r
-\r
-    newaf.viewport.historyList = viewport.historyList;\r
-    newaf.viewport.redoList = viewport.redoList;\r
-\r
-  }\r
-\r
-  public void seqLimits_itemStateChanged()\r
-  {\r
-    viewport.setShowJVSuffix(seqLimits.getState());\r
-    alignPanel.fontChanged();\r
-    alignPanel.paintAlignment(true);\r
-  }\r
-\r
-  protected void colourTextMenuItem_actionPerformed()\r
-  {\r
-    viewport.setColourText(colourTextMenuItem.getState());\r
-    alignPanel.paintAlignment(true);\r
-  }\r
-\r
-  protected void wrapMenuItem_actionPerformed()\r
-  {\r
-    viewport.setWrapAlignment(wrapMenuItem.getState());\r
-    alignPanel.setWrapAlignment(wrapMenuItem.getState());\r
-    scaleAbove.setEnabled(wrapMenuItem.getState());\r
-    scaleLeft.setEnabled(wrapMenuItem.getState());\r
-    scaleRight.setEnabled(wrapMenuItem.getState());\r
-    alignPanel.paintAlignment(true);\r
-  }\r
-\r
-  public void overviewMenuItem_actionPerformed()\r
-  {\r
-    if (alignPanel.overviewPanel != null)\r
-    {\r
-      return;\r
-    }\r
-\r
-    Frame frame = new Frame();\r
-    OverviewPanel overview = new OverviewPanel(alignPanel);\r
-    frame.add(overview);\r
-    // +50 must allow for applet frame window\r
-    jalview.bin.JalviewLite.addFrame(frame, "Overview " + this.getTitle(),\r
-                                     overview.getPreferredSize().width,\r
-                                     overview.getPreferredSize().height + 50);\r
-\r
-    frame.pack();\r
-    frame.addWindowListener(new WindowAdapter()\r
-    {\r
-      public void windowClosing(WindowEvent e)\r
-      {\r
-        alignPanel.setOverviewPanel(null);\r
-      };\r
-    });\r
-\r
-    alignPanel.setOverviewPanel(overview);\r
-\r
-  }\r
-\r
-  void changeColour(ColourSchemeI cs)\r
-  {\r
-    int threshold = 0;\r
-\r
-    if (cs != null)\r
-    {\r
-      if (viewport.getAbovePIDThreshold())\r
-      {\r
-        threshold = SliderPanel.setPIDSliderSource(alignPanel, cs, "Background");\r
-\r
-        cs.setThreshold(threshold, viewport.getIgnoreGapsConsensus());\r
-\r
-        viewport.setGlobalColourScheme(cs);\r
-      }\r
-      else\r
-      {\r
-        cs.setThreshold(0, viewport.getIgnoreGapsConsensus());\r
-      }\r
-\r
-      if (viewport.getConservationSelected())\r
-      {\r
-\r
-        Alignment al = (Alignment) viewport.alignment;\r
-        Conservation c = new Conservation("All",\r
-                                          ResidueProperties.propHash, 3,\r
-                                          al.getSequences(), 0,\r
-                                          al.getWidth() - 1);\r
-\r
-        c.calculate();\r
-        c.verdict(false, viewport.ConsPercGaps);\r
-\r
-        cs.setConservation(c);\r
-\r
-        cs.setConservationInc(SliderPanel.setConservationSlider(alignPanel, cs,\r
-            "Background"));\r
-\r
-      }\r
-      else\r
-      {\r
-        cs.setConservation(null);\r
-      }\r
-\r
-      cs.setConsensus(viewport.hconsensus);\r
-\r
-    }\r
-    viewport.setGlobalColourScheme(cs);\r
-\r
-    if (viewport.getColourAppliesToAllGroups())\r
-    {\r
-      Vector groups = viewport.alignment.getGroups();\r
-      for (int i = 0; i < groups.size(); i++)\r
-      {\r
-        SequenceGroup sg = (SequenceGroup) groups.elementAt(i);\r
-\r
-        if (cs == null)\r
-        {\r
-          sg.cs = null;\r
-          continue;\r
-        }\r
-        if (cs instanceof ClustalxColourScheme)\r
-        {\r
-          sg.cs = new ClustalxColourScheme(\r
-              sg.getSequences(viewport.hiddenRepSequences),\r
-              sg.getWidth());\r
-        }\r
-        else\r
-        {\r
-          try\r
-          {\r
-            sg.cs = (ColourSchemeI) cs.getClass().newInstance();\r
-          }\r
-          catch (Exception ex)\r
-          {\r
-            ex.printStackTrace();\r
-            sg.cs = cs;\r
-          }\r
-        }\r
-\r
-        if (viewport.getAbovePIDThreshold()\r
-            || cs instanceof PIDColourScheme\r
-            || cs instanceof Blosum62ColourScheme)\r
-        {\r
-          sg.cs.setThreshold(threshold, viewport.getIgnoreGapsConsensus());\r
-          sg.cs.setConsensus(AAFrequency.calculate(\r
-              sg.getSequences(viewport.hiddenRepSequences), 0, sg.getWidth()));\r
-        }\r
-        else\r
-        {\r
-          sg.cs.setThreshold(0, viewport.getIgnoreGapsConsensus());\r
-        }\r
-\r
-        if (viewport.getConservationSelected())\r
-        {\r
-          Conservation c = new Conservation("Group",\r
-                                            ResidueProperties.propHash, 3,\r
-                                            sg.getSequences(viewport.\r
-              hiddenRepSequences), 0,\r
-                                            viewport.alignment.getWidth() - 1);\r
-          c.calculate();\r
-          c.verdict(false, viewport.ConsPercGaps);\r
-          sg.cs.setConservation(c);\r
-        }\r
-        else\r
-        {\r
-          sg.cs.setConservation(null);\r
-          sg.cs.setThreshold(0, viewport.getIgnoreGapsConsensus());\r
-        }\r
-\r
-      }\r
-    }\r
-\r
-    if (alignPanel.getOverviewPanel() != null)\r
-    {\r
-      alignPanel.getOverviewPanel().updateOverviewImage();\r
-    }\r
-\r
-    jalview.structure.StructureSelectionManager.getStructureSelectionManager()\r
-        .sequenceColoursChanged(alignPanel);\r
-\r
-    alignPanel.paintAlignment(true);\r
-  }\r
-\r
-  protected void modifyPID_actionPerformed()\r
-  {\r
-    if (viewport.getAbovePIDThreshold() && viewport.globalColourScheme != null)\r
-    {\r
-      SliderPanel.setPIDSliderSource(alignPanel, viewport.getGlobalColourScheme(),\r
-                                     "Background");\r
-      SliderPanel.showPIDSlider();\r
-    }\r
-  }\r
-\r
-  protected void modifyConservation_actionPerformed()\r
-  {\r
-    if (viewport.getConservationSelected() && viewport.globalColourScheme != null)\r
-    {\r
-      SliderPanel.setConservationSlider(alignPanel, viewport.globalColourScheme,\r
-                                        "Background");\r
-      SliderPanel.showConservationSlider();\r
-    }\r
-  }\r
-\r
-  protected void conservationMenuItem_actionPerformed()\r
-  {\r
-    viewport.setConservationSelected(conservationMenuItem.getState());\r
-\r
-    viewport.setAbovePIDThreshold(false);\r
-    abovePIDThreshold.setState(false);\r
-\r
-    changeColour(viewport.getGlobalColourScheme());\r
-\r
-    modifyConservation_actionPerformed();\r
-  }\r
-\r
-  public void abovePIDThreshold_actionPerformed()\r
-  {\r
-    viewport.setAbovePIDThreshold(abovePIDThreshold.getState());\r
-\r
-    conservationMenuItem.setState(false);\r
-    viewport.setConservationSelected(false);\r
-\r
-    changeColour(viewport.getGlobalColourScheme());\r
-\r
-    modifyPID_actionPerformed();\r
-  }\r
-\r
-  public void sortPairwiseMenuItem_actionPerformed()\r
-  {\r
-    SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray();\r
-    AlignmentSorter.sortByPID(viewport.getAlignment(),\r
-                              viewport.getAlignment().getSequenceAt(0));\r
-    addHistoryItem(new OrderCommand("Pairwise Sort", oldOrder,\r
-                                    viewport.alignment));\r
-    alignPanel.paintAlignment(true);\r
-  }\r
-\r
-  public void sortIDMenuItem_actionPerformed()\r
-  {\r
-    //  addHistoryItem(new HistoryItem("ID Sort", viewport.alignment,\r
-    //                                HistoryItem.SORT));\r
-    AlignmentSorter.sortByID(viewport.getAlignment());\r
-    alignPanel.paintAlignment(true);\r
-  }\r
-\r
-  public void sortGroupMenuItem_actionPerformed()\r
-  {\r
-    //  addHistoryItem(new HistoryItem("Group Sort", viewport.alignment,\r
-    //                                 HistoryItem.SORT));\r
-    AlignmentSorter.sortByGroup(viewport.getAlignment());\r
-    alignPanel.paintAlignment(true);\r
-\r
-  }\r
-\r
-  public void removeRedundancyMenuItem_actionPerformed()\r
-  {\r
-    new RedundancyPanel(alignPanel);\r
-  }\r
-\r
-  public void pairwiseAlignmentMenuItem_actionPerformed()\r
-  {\r
-    if (viewport.getSelectionGroup() != null\r
-        && viewport.getSelectionGroup().getSize() > 1)\r
-    {\r
-      Frame frame = new Frame();\r
-      frame.add(new PairwiseAlignPanel(alignPanel));\r
-      jalview.bin.JalviewLite.addFrame(frame, "Pairwise Alignment", 600, 500);\r
-    }\r
-  }\r
-\r
-  public void PCAMenuItem_actionPerformed()\r
-  {\r
-    //are the sequences aligned?\r
-    if (!viewport.alignment.isAligned())\r
-    {\r
-      SequenceI current;\r
-      int Width = viewport.getAlignment().getWidth();\r
-\r
-      for (int i = 0; i < viewport.getAlignment().getSequences().size();\r
-           i++)\r
-      {\r
-        current = viewport.getAlignment().getSequenceAt(i);\r
-\r
-        if (current.getLength() < Width)\r
-        {\r
-          current.insertCharAt(Width - 1, viewport.getGapCharacter());\r
-        }\r
-      }\r
-      alignPanel.paintAlignment(true);\r
-    }\r
-\r
-    if ( (viewport.getSelectionGroup() != null &&\r
-          viewport.getSelectionGroup().getSize() < 4 &&\r
-          viewport.getSelectionGroup().getSize() > 0)\r
-        || viewport.getAlignment().getHeight() < 4)\r
-    {\r
-      return;\r
-    }\r
-\r
-    try\r
-    {\r
-      new PCAPanel(viewport);\r
-    }\r
-    catch (java.lang.OutOfMemoryError ex)\r
-    {\r
-    }\r
-\r
-  }\r
-\r
-  public void averageDistanceTreeMenuItem_actionPerformed()\r
-  {\r
-    NewTreePanel("AV", "PID", "Average distance tree using PID");\r
-  }\r
-\r
-  public void neighbourTreeMenuItem_actionPerformed()\r
-  {\r
-    NewTreePanel("NJ", "PID", "Neighbour joining tree using PID");\r
-  }\r
-\r
-  protected void njTreeBlosumMenuItem_actionPerformed()\r
-  {\r
-    NewTreePanel("NJ", "BL", "Neighbour joining tree using BLOSUM62");\r
-  }\r
-\r
-  protected void avTreeBlosumMenuItem_actionPerformed()\r
-  {\r
-    NewTreePanel("AV", "BL", "Average distance tree using BLOSUM62");\r
-  }\r
-\r
-  void NewTreePanel(String type, String pwType, String title)\r
-  {\r
-    //are the sequences aligned?\r
-    if (!viewport.alignment.isAligned())\r
-    {\r
-      SequenceI current;\r
-      int Width = viewport.getAlignment().getWidth();\r
-\r
-      for (int i = 0; i < viewport.getAlignment().getSequences().size();\r
-           i++)\r
-      {\r
-        current = viewport.getAlignment().getSequenceAt(i);\r
-\r
-        if (current.getLength() < Width)\r
-        {\r
-          current.insertCharAt(Width - 1, viewport.getGapCharacter());\r
-        }\r
-      }\r
-      alignPanel.paintAlignment(true);\r
-\r
-    }\r
-\r
-    if ( (viewport.getSelectionGroup() != null &&\r
-          viewport.getSelectionGroup().getSize() > 1)\r
-        || (viewport.getSelectionGroup() == null\r
-            && viewport.alignment.getHeight() > 1))\r
-    {\r
-      final TreePanel tp = new TreePanel(viewport,\r
-                                         type,\r
-                                         pwType);\r
-\r
-      addTreeMenuItem(tp, title);\r
-\r
-      jalview.bin.JalviewLite.addFrame(tp, title, 600, 500);\r
-    }\r
-  }\r
-\r
-  void loadTree_actionPerformed()\r
-  {\r
-    CutAndPasteTransfer cap = new CutAndPasteTransfer(true, this);\r
-    cap.setText("Paste your Newick tree file here.");\r
-    cap.setTreeImport();\r
-    Frame frame = new Frame();\r
-    frame.add(cap);\r
-    jalview.bin.JalviewLite.addFrame(frame, "Paste Newick file ", 400, 300);\r
-  }\r
-\r
-  public void loadTree(jalview.io.NewickFile tree, String treeFile)\r
-  {\r
-    TreePanel tp = new TreePanel(viewport,\r
-                                 treeFile,\r
-                                 "From File - ",\r
-                                 tree);\r
-    jalview.bin.JalviewLite.addFrame(tp, treeFile, 600, 500);\r
-    addTreeMenuItem(tp, treeFile);\r
-  }\r
-\r
-  void addTreeMenuItem(final TreePanel treePanel, String title)\r
-  {\r
-    final MenuItem item = new MenuItem(title);\r
-    sortByTreeMenu.add(item);\r
-    item.addActionListener(new java.awt.event.ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent evt)\r
-      {\r
-        //  addHistoryItem(new HistoryItem("Sort", viewport.alignment,\r
-        //                                 HistoryItem.SORT));\r
-        AlignmentSorter.sortByTree(viewport.getAlignment(), treePanel.getTree());\r
-        alignPanel.paintAlignment(true);\r
-      }\r
-    });\r
-\r
-    treePanel.addWindowListener(new WindowAdapter()\r
-    {\r
-      public void windowClosing(WindowEvent e)\r
-      {\r
-        sortByTreeMenu.remove(item);\r
-      };\r
-    });\r
-  }\r
-\r
-  protected void documentation_actionPerformed()\r
-  {\r
-    showURL("http://www.jalview.org/help.html", "HELP");\r
-  }\r
-\r
-  protected void about_actionPerformed()\r
-  {\r
-\r
-    class AboutPanel\r
-        extends Canvas\r
-    {\r
-      String version;\r
-      public AboutPanel(String version)\r
-      {\r
-        this.version = version;\r
-      }\r
-\r
-      public void paint(Graphics g)\r
-      {\r
-        g.setColor(Color.white);\r
-        g.fillRect(0, 0, getSize().width, getSize().height);\r
-        g.setFont(new Font("Helvetica", Font.PLAIN, 12));\r
-        FontMetrics fm = g.getFontMetrics();\r
-        int fh = fm.getHeight();\r
-        int y = 5, x = 7;\r
-        g.setColor(Color.black);\r
-        g.setFont(new Font("Helvetica", Font.BOLD, 14));\r
-        g.drawString("Jalview - Release " + version, 200, y += fh);\r
-        g.setFont(new Font("Helvetica", Font.PLAIN, 12));\r
-        g.drawString("Authors:  Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse, Jim Procter & Geoff Barton.",\r
-                     x, y += fh * 2);\r
-        g.drawString("Current development managed by Andrew Waterhouse; Barton Group, University of Dundee.",\r
-                     x, y += fh);\r
-        g.drawString(\r
-            "For any issues relating to Jalview, email help@jalview.org", x,\r
-            y += fh);\r
-        g.drawString("If  you use JalView, please cite:", x, y += fh + 8);\r
-        g.drawString("\"Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004), The Jalview Java Alignment Editor\"",\r
-                     x, y += fh);\r
-        g.drawString("Bioinformatics,  2004 20;426-7.", x, y += fh);\r
-      }\r
-    }\r
-\r
-    String version = "test";\r
-    java.net.URL url = getClass().getResource("/.build_properties");\r
-    if (url != null)\r
-    {\r
-      try\r
-      {\r
-        BufferedReader reader = new BufferedReader(new InputStreamReader(\r
-            url.openStream()));\r
-        String line;\r
-        while ( (line = reader.readLine()) != null)\r
-        {\r
-          if (line.indexOf("VERSION") > -1)\r
-          {\r
-            version = line.substring(line.indexOf("=") + 1);\r
-          }\r
-        }\r
-      }\r
-      catch (Exception ex)\r
-      {\r
-        ex.printStackTrace();\r
-      }\r
-    }\r
-\r
-    Frame frame = new Frame();\r
-    frame.add(new AboutPanel(version));\r
-    jalview.bin.JalviewLite.addFrame(frame, "Jalview", 580, 200);\r
-\r
-  }\r
-\r
-  public void showURL(String url, String target)\r
-  {\r
-    if (viewport.applet == null)\r
-    {\r
-      System.out.println("Not running as applet - no browser available.");\r
-    }\r
-    else\r
-    {\r
-      try\r
-      {\r
-        System.out.println("Show url: " + url);\r
-        viewport.applet.getAppletContext().showDocument(new java.net.URL(url),\r
-            target);\r
-      }\r
-      catch (Exception ex)\r
-      {\r
-        ex.printStackTrace();\r
-      }\r
-    }\r
-  }\r
-\r
-  //////////////////////////////////////////////////////////////////////////////////\r
-  //JBuilder Graphics here\r
-\r
-   MenuBar alignFrameMenuBar = new MenuBar();\r
-   Menu fileMenu = new Menu("File");\r
-   MenuItem loadApplication = new MenuItem("View in Full Application");\r
-   MenuItem loadTree = new MenuItem("Load Associated Tree ...");\r
-   MenuItem loadAnnotations = new MenuItem(\r
-      "Load Features/Annotations ...");\r
-   MenuItem outputFeatures = new MenuItem("Export Features ...");\r
-   MenuItem outputAnnotations = new MenuItem("Export Annotations ...");\r
-\r
-   MenuItem closeMenuItem = new MenuItem("Close");\r
-   Menu editMenu = new Menu("Edit");\r
-   Menu viewMenu = new Menu("View");\r
-   Menu colourMenu = new Menu("Colour");\r
-   Menu calculateMenu = new Menu("Calculate");\r
-   MenuItem selectAllSequenceMenuItem = new MenuItem("Select all");\r
-   MenuItem deselectAllSequenceMenuItem = new MenuItem("Deselect All");\r
-   MenuItem invertSequenceMenuItem = new MenuItem("Invert Selection");\r
-   MenuItem remove2LeftMenuItem = new MenuItem();\r
-   MenuItem remove2RightMenuItem = new MenuItem();\r
-   MenuItem removeGappedColumnMenuItem = new MenuItem();\r
-   MenuItem removeAllGapsMenuItem = new MenuItem();\r
-   CheckboxMenuItem viewBoxesMenuItem = new CheckboxMenuItem();\r
-   CheckboxMenuItem viewTextMenuItem = new CheckboxMenuItem();\r
-   MenuItem sortPairwiseMenuItem = new MenuItem();\r
-   MenuItem sortIDMenuItem = new MenuItem();\r
-   MenuItem sortGroupMenuItem = new MenuItem();\r
-   MenuItem removeRedundancyMenuItem = new MenuItem();\r
-   MenuItem pairwiseAlignmentMenuItem = new MenuItem();\r
-   MenuItem PCAMenuItem = new MenuItem();\r
-   MenuItem averageDistanceTreeMenuItem = new MenuItem();\r
-   MenuItem neighbourTreeMenuItem = new MenuItem();\r
-  BorderLayout borderLayout1 = new BorderLayout();\r
-  public Label statusBar = new Label();\r
-   Menu outputTextboxMenu = new Menu();\r
-   MenuItem clustalColour = new MenuItem();\r
-   MenuItem zappoColour = new MenuItem();\r
-   MenuItem taylorColour = new MenuItem();\r
-   MenuItem hydrophobicityColour = new MenuItem();\r
-   MenuItem helixColour = new MenuItem();\r
-   MenuItem strandColour = new MenuItem();\r
-   MenuItem turnColour = new MenuItem();\r
-   MenuItem buriedColour = new MenuItem();\r
-   MenuItem userDefinedColour = new MenuItem();\r
-   MenuItem PIDColour = new MenuItem();\r
-   MenuItem BLOSUM62Colour = new MenuItem();\r
-  MenuItem njTreeBlosumMenuItem = new MenuItem();\r
-  MenuItem avDistanceTreeBlosumMenuItem = new MenuItem();\r
-   CheckboxMenuItem annotationPanelMenuItem = new CheckboxMenuItem();\r
-   CheckboxMenuItem colourTextMenuItem = new CheckboxMenuItem();\r
-   MenuItem alProperties = new MenuItem("Alignment Properties...");\r
-  MenuItem overviewMenuItem = new MenuItem();\r
-   MenuItem undoMenuItem = new MenuItem();\r
-   MenuItem redoMenuItem = new MenuItem();\r
-   CheckboxMenuItem conservationMenuItem = new CheckboxMenuItem();\r
-  MenuItem noColourmenuItem = new MenuItem();\r
-   CheckboxMenuItem wrapMenuItem = new CheckboxMenuItem();\r
-   CheckboxMenuItem renderGapsMenuItem = new CheckboxMenuItem();\r
-  MenuItem findMenuItem = new MenuItem();\r
-   CheckboxMenuItem abovePIDThreshold = new CheckboxMenuItem();\r
-   MenuItem nucleotideColour = new MenuItem();\r
-  MenuItem deleteGroups = new MenuItem();\r
-  MenuItem delete = new MenuItem();\r
-  MenuItem copy = new MenuItem();\r
-  MenuItem cut = new MenuItem();\r
-  Menu pasteMenu = new Menu();\r
-  MenuItem pasteNew = new MenuItem();\r
-  MenuItem pasteThis = new MenuItem();\r
-   CheckboxMenuItem applyToAllGroups = new CheckboxMenuItem();\r
-   MenuItem font = new MenuItem();\r
-   CheckboxMenuItem scaleAbove = new CheckboxMenuItem();\r
-   CheckboxMenuItem scaleLeft = new CheckboxMenuItem();\r
-   CheckboxMenuItem scaleRight = new CheckboxMenuItem();\r
-  MenuItem modifyPID = new MenuItem();\r
-  MenuItem modifyConservation = new MenuItem();\r
-   CheckboxMenuItem autoCalculate\r
-      = new CheckboxMenuItem("Autocalculate Consensus", true);\r
-   Menu sortByTreeMenu = new Menu();\r
-  Menu sort = new Menu();\r
-  Menu calculate = new Menu();\r
-  MenuItem inputText = new MenuItem();\r
-  Menu helpMenu = new Menu();\r
-  MenuItem documentation = new MenuItem();\r
-  MenuItem about = new MenuItem();\r
-   CheckboxMenuItem seqLimits = new CheckboxMenuItem();\r
-  Panel embeddedMenu;\r
-  Label embeddedEdit;\r
-  Label embeddedSelect;\r
-  Label embeddedView;\r
-  Label embeddedFormat;\r
-  Label embeddedColour;\r
-  Label embeddedFile;\r
-  Label embeddedHelp;\r
-  Label embeddedCalculate;\r
-  FlowLayout flowLayout1;\r
-\r
-  private void jbInit()\r
-      throws Exception\r
-  {\r
-\r
-    setMenuBar(alignFrameMenuBar);\r
-\r
-    MenuItem item;\r
-\r
-    // dynamically fill save as menu with available formats\r
-    for (int i = 0; i < jalview.io.AppletFormatAdapter.WRITEABLE_FORMATS.length;\r
-         i++)\r
-    {\r
-\r
-      item = new MenuItem(jalview.io.AppletFormatAdapter.WRITEABLE_FORMATS[i]);\r
-\r
-      item.addActionListener(new java.awt.event.ActionListener()\r
-      {\r
-        public void actionPerformed(ActionEvent e)\r
-        {\r
-          outputText_actionPerformed(e);\r
-        }\r
-      });\r
-\r
-      outputTextboxMenu.add(item);\r
-    }\r
-    closeMenuItem.addActionListener(this);\r
-    loadApplication.addActionListener(this);\r
-\r
-    loadTree.addActionListener(this);\r
-    loadAnnotations.addActionListener(this);\r
-    outputFeatures.addActionListener(this);\r
-    outputAnnotations.addActionListener(this);\r
-    selectAllSequenceMenuItem.addActionListener(this);\r
-    deselectAllSequenceMenuItem.addActionListener(this);\r
-    invertSequenceMenuItem.addActionListener(this);\r
-    remove2LeftMenuItem.setLabel("Remove Left");\r
-    remove2LeftMenuItem.addActionListener(this);\r
-    remove2RightMenuItem.setLabel("Remove Right");\r
-    remove2RightMenuItem.addActionListener(this);\r
-    removeGappedColumnMenuItem.setLabel("Remove Empty Columns");\r
-    removeGappedColumnMenuItem.addActionListener(this);\r
-    removeAllGapsMenuItem.setLabel("Remove All Gaps");\r
-    removeAllGapsMenuItem.addActionListener(this);\r
-    viewBoxesMenuItem.setLabel("Boxes");\r
-    viewBoxesMenuItem.setState(true);\r
-    viewBoxesMenuItem.addItemListener(this);\r
-    viewTextMenuItem.setLabel("Text");\r
-    viewTextMenuItem.setState(true);\r
-    viewTextMenuItem.addItemListener(this);\r
-    sortPairwiseMenuItem.setLabel("by Pairwise Identity");\r
-    sortPairwiseMenuItem.addActionListener(this);\r
-    sortIDMenuItem.setLabel("by ID");\r
-    sortIDMenuItem.addActionListener(this);\r
-    sortGroupMenuItem.setLabel("by Group");\r
-    sortGroupMenuItem.addActionListener(this);\r
-    removeRedundancyMenuItem.setLabel("Remove Redundancy...");\r
-    removeRedundancyMenuItem.addActionListener(this);\r
-    pairwiseAlignmentMenuItem.setLabel("Pairwise Alignments...");\r
-    pairwiseAlignmentMenuItem.addActionListener(this);\r
-    PCAMenuItem.setLabel("Principal Component Analysis");\r
-    PCAMenuItem.addActionListener(this);\r
-    averageDistanceTreeMenuItem.setLabel(\r
-        "Average Distance Using % Identity");\r
-    averageDistanceTreeMenuItem.addActionListener(this);\r
-    neighbourTreeMenuItem.setLabel("Neighbour Joining Using % Identity");\r
-    neighbourTreeMenuItem.addActionListener(this);\r
-    statusBar.setBackground(Color.white);\r
-    statusBar.setFont(new java.awt.Font("Verdana", 0, 11));\r
-    statusBar.setText("Status bar");\r
-    outputTextboxMenu.setLabel("Output to Textbox");\r
-    clustalColour.setLabel("Clustalx");\r
-\r
-    clustalColour.addActionListener(this);\r
-    zappoColour.setLabel("Zappo");\r
-    zappoColour.addActionListener(this);\r
-    taylorColour.setLabel("Taylor");\r
-    taylorColour.addActionListener(this);\r
-    hydrophobicityColour.setLabel("Hydrophobicity");\r
-    hydrophobicityColour.addActionListener(this);\r
-    helixColour.setLabel("Helix Propensity");\r
-    helixColour.addActionListener(this);\r
-    strandColour.setLabel("Strand Propensity");\r
-    strandColour.addActionListener(this);\r
-    turnColour.setLabel("Turn Propensity");\r
-    turnColour.addActionListener(this);\r
-    buriedColour.setLabel("Buried Index");\r
-    buriedColour.addActionListener(this);\r
-    userDefinedColour.setLabel("User Defined...");\r
-    userDefinedColour.addActionListener(this);\r
-    PIDColour.setLabel("Percentage Identity");\r
-    PIDColour.addActionListener(this);\r
-    BLOSUM62Colour.setLabel("BLOSUM62 Score");\r
-    BLOSUM62Colour.addActionListener(this);\r
-    avDistanceTreeBlosumMenuItem.setLabel(\r
-        "Average Distance Using BLOSUM62");\r
-    avDistanceTreeBlosumMenuItem.addActionListener(this);\r
-    njTreeBlosumMenuItem.setLabel("Neighbour Joining Using BLOSUM62");\r
-    njTreeBlosumMenuItem.addActionListener(this);\r
-    annotationPanelMenuItem.setLabel("Show Annotations");\r
-    annotationPanelMenuItem.addItemListener(this);\r
-    colourTextMenuItem.setLabel("Colour Text");\r
-    colourTextMenuItem.addItemListener(this);\r
-    alProperties.addActionListener(this);\r
-    overviewMenuItem.setLabel("Overview Window");\r
-    overviewMenuItem.addActionListener(this);\r
-    undoMenuItem.setEnabled(false);\r
-    undoMenuItem.setLabel("Undo");\r
-    undoMenuItem.addActionListener(this);\r
-    redoMenuItem.setEnabled(false);\r
-    redoMenuItem.setLabel("Redo");\r
-    redoMenuItem.addActionListener(this);\r
-    conservationMenuItem.setLabel("by Conservation");\r
-    conservationMenuItem.addItemListener(this);\r
-    noColourmenuItem.setLabel("None");\r
-    noColourmenuItem.addActionListener(this);\r
-    wrapMenuItem.setLabel("Wrap");\r
-    wrapMenuItem.addItemListener(this);\r
-    renderGapsMenuItem.setLabel("Show Gaps");\r
-    renderGapsMenuItem.setState(true);\r
-    renderGapsMenuItem.addItemListener(this);\r
-    findMenuItem.setLabel("Find...");\r
-    findMenuItem.addActionListener(this);\r
-    abovePIDThreshold.setLabel("Above Identity Threshold");\r
-    abovePIDThreshold.addItemListener(this);\r
-    nucleotideColour.setLabel("Nucleotide");\r
-    nucleotideColour.addActionListener(this);\r
-    deleteGroups.setLabel("Undefine Groups");\r
-    deleteGroups.addActionListener(this);\r
-    copy.setLabel("Copy");\r
-    copy.addActionListener(this);\r
-    cut.setLabel("Cut");\r
-    cut.addActionListener(this);\r
-    delete.setLabel("Delete");\r
-    delete.addActionListener(this);\r
-    pasteMenu.setLabel("Paste");\r
-    pasteNew.setLabel("To New Alignment");\r
-    pasteNew.addActionListener(this);\r
-    pasteThis.setLabel("Add To This Alignment");\r
-    pasteThis.addActionListener(this);\r
-    applyToAllGroups.setLabel("Apply Colour To All Groups");\r
-    applyToAllGroups.setState(true);\r
-    applyToAllGroups.addItemListener(this);\r
-    font.setLabel("Font...");\r
-    font.addActionListener(this);\r
-    scaleAbove.setLabel("Scale Above");\r
-    scaleAbove.setState(true);\r
-    scaleAbove.setEnabled(false);\r
-    scaleAbove.addItemListener(this);\r
-    scaleLeft.setEnabled(false);\r
-    scaleLeft.setState(true);\r
-    scaleLeft.setLabel("Scale Left");\r
-    scaleLeft.addItemListener(this);\r
-    scaleRight.setEnabled(false);\r
-    scaleRight.setState(true);\r
-    scaleRight.setLabel("Scale Right");\r
-    scaleRight.addItemListener(this);\r
-    modifyPID.setLabel("Modify Identity Threshold...");\r
-    modifyPID.addActionListener(this);\r
-    modifyConservation.setLabel("Modify Conservation Threshold...");\r
-    modifyConservation.addActionListener(this);\r
-    sortByTreeMenu.setLabel("By Tree Order");\r
-    sort.setLabel("Sort");\r
-    calculate.setLabel("Calculate Tree");\r
-    autoCalculate.addItemListener(this);\r
-    inputText.setLabel("Input from textbox");\r
-    inputText.addActionListener(this);\r
-\r
-    helpMenu.setLabel("Help");\r
-    documentation.setLabel("Documentation");\r
-    documentation.addActionListener(this);\r
-\r
-    about.setLabel("About...");\r
-    about.addActionListener(this);\r
-    seqLimits.setState(true);\r
-    seqLimits.setLabel("Show Sequence Limits");\r
-    seqLimits.addItemListener(this);\r
-    featureSettings.setLabel("Feature Settings...");\r
-    featureSettings.addActionListener(this);\r
-    sequenceFeatures.setLabel("Sequence Features");\r
-    sequenceFeatures.addItemListener(this);\r
-    sequenceFeatures.setState(false);\r
-    annotationColour.setLabel("by Annotation...");\r
-    annotationColour.addActionListener(this);\r
-    invertSequenceMenuItem.setLabel("Invert Sequence Selection");\r
-    invertColSel.setLabel("Invert Column Selection");\r
-    menu1.setLabel("Show");\r
-    showColumns.setLabel("All Columns ");\r
-    showSeqs.setLabel("All Sequences");\r
-    menu2.setLabel("Hide");\r
-    hideColumns.setLabel("Selected Columns");\r
-    hideSequences.setLabel("Selected Sequences");\r
-    invertColSel.addActionListener(this);\r
-    showColumns.addActionListener(this);\r
-    showSeqs.addActionListener(this);\r
-    hideColumns.addActionListener(this);\r
-    hideSequences.addActionListener(this);\r
-    formatMenu.setLabel("Format");\r
-    selectMenu.setLabel("Select");\r
-    newView.setLabel("New View");\r
-    newView.addActionListener(this);\r
-    alignFrameMenuBar.add(fileMenu);\r
-    alignFrameMenuBar.add(editMenu);\r
-    alignFrameMenuBar.add(selectMenu);\r
-    alignFrameMenuBar.add(viewMenu);\r
-    alignFrameMenuBar.add(formatMenu);\r
-    alignFrameMenuBar.add(colourMenu);\r
-    alignFrameMenuBar.add(calculateMenu);\r
-    alignFrameMenuBar.add(helpMenu);\r
-\r
-    fileMenu.add(inputText);\r
-    fileMenu.add(loadTree);\r
-    fileMenu.add(loadAnnotations);\r
-\r
-    fileMenu.addSeparator();\r
-    fileMenu.add(outputTextboxMenu);\r
-    fileMenu.add(outputFeatures);\r
-    fileMenu.add(outputAnnotations);\r
-\r
-    if (jalviewServletURL != null)\r
-    {\r
-      fileMenu.add(loadApplication);\r
-    }\r
-\r
-    fileMenu.addSeparator();\r
-    fileMenu.add(closeMenuItem);\r
-\r
-    editMenu.add(undoMenuItem);\r
-    editMenu.add(redoMenuItem);\r
-    editMenu.add(cut);\r
-    editMenu.add(copy);\r
-    editMenu.add(pasteMenu);\r
-    editMenu.add(delete);\r
-    editMenu.addSeparator();\r
-    editMenu.add(remove2LeftMenuItem);\r
-    editMenu.add(remove2RightMenuItem);\r
-    editMenu.add(removeGappedColumnMenuItem);\r
-    editMenu.add(removeAllGapsMenuItem);\r
-    editMenu.add(removeRedundancyMenuItem);\r
-    viewMenu.add(newView);\r
-    viewMenu.addSeparator();\r
-    viewMenu.add(menu1);\r
-    viewMenu.add(menu2);\r
-    viewMenu.addSeparator();\r
-    viewMenu.add(annotationPanelMenuItem);\r
-    viewMenu.addSeparator();\r
-    viewMenu.add(sequenceFeatures);\r
-    viewMenu.add(featureSettings);\r
-    viewMenu.addSeparator();\r
-    viewMenu.add(alProperties);\r
-    viewMenu.addSeparator();\r
-    viewMenu.add(overviewMenuItem);\r
-    colourMenu.add(applyToAllGroups);\r
-    colourMenu.addSeparator();\r
-    colourMenu.add(noColourmenuItem);\r
-    colourMenu.add(clustalColour);\r
-    colourMenu.add(BLOSUM62Colour);\r
-    colourMenu.add(PIDColour);\r
-    colourMenu.add(zappoColour);\r
-    colourMenu.add(taylorColour);\r
-    colourMenu.add(hydrophobicityColour);\r
-    colourMenu.add(helixColour);\r
-    colourMenu.add(strandColour);\r
-    colourMenu.add(turnColour);\r
-    colourMenu.add(buriedColour);\r
-    colourMenu.add(nucleotideColour);\r
-    colourMenu.add(userDefinedColour);\r
-    colourMenu.addSeparator();\r
-    colourMenu.add(conservationMenuItem);\r
-    colourMenu.add(modifyConservation);\r
-    colourMenu.add(abovePIDThreshold);\r
-    colourMenu.add(modifyPID);\r
-    colourMenu.add(annotationColour);\r
-    calculateMenu.add(sort);\r
-    calculateMenu.add(calculate);\r
-    calculateMenu.addSeparator();\r
-    calculateMenu.add(pairwiseAlignmentMenuItem);\r
-    calculateMenu.add(PCAMenuItem);\r
-    calculateMenu.add(autoCalculate);\r
-    this.add(statusBar, BorderLayout.SOUTH);\r
-    pasteMenu.add(pasteNew);\r
-    pasteMenu.add(pasteThis);\r
-    sort.add(sortIDMenuItem);\r
-    sort.add(sortByTreeMenu);\r
-    sort.add(sortGroupMenuItem);\r
-    sort.add(sortPairwiseMenuItem);\r
-    calculate.add(averageDistanceTreeMenuItem);\r
-    calculate.add(neighbourTreeMenuItem);\r
-    calculate.add(avDistanceTreeBlosumMenuItem);\r
-    calculate.add(njTreeBlosumMenuItem);\r
-    helpMenu.add(documentation);\r
-    helpMenu.add(about);\r
-    menu1.add(showColumns);\r
-    menu1.add(showSeqs);\r
-    menu2.add(hideColumns);\r
-    menu2.add(hideSequences);\r
-    formatMenu.add(font);\r
-    formatMenu.add(seqLimits);\r
-    formatMenu.add(wrapMenuItem);\r
-    formatMenu.add(scaleAbove);\r
-    formatMenu.add(scaleLeft);\r
-    formatMenu.add(scaleRight);\r
-    formatMenu.add(viewBoxesMenuItem);\r
-    formatMenu.add(viewTextMenuItem);\r
-    formatMenu.add(colourTextMenuItem);\r
-    formatMenu.add(renderGapsMenuItem);\r
-    selectMenu.add(findMenuItem);\r
-    selectMenu.addSeparator();\r
-    selectMenu.add(selectAllSequenceMenuItem);\r
-    selectMenu.add(deselectAllSequenceMenuItem);\r
-    selectMenu.add(invertSequenceMenuItem);\r
-    selectMenu.add(invertColSel);\r
-    selectMenu.add(deleteGroups);\r
-  }\r
-\r
-  public void setEmbedded()\r
-  {\r
-\r
-    embeddedMenu = new Panel();\r
-    embeddedEdit = new Label("Edit");\r
-    embeddedSelect = new Label("Select");\r
-    embeddedView = new Label("View");\r
-    embeddedFormat = new Label("Format");\r
-    embeddedColour = new Label("Colour");\r
-    embeddedFile = new Label("File");\r
-    embeddedHelp = new Label("Help");\r
-    embeddedCalculate = new Label("Calculate");\r
-    flowLayout1 = new FlowLayout();\r
-    embeddedMenu.setBackground(Color.lightGray);\r
-    embeddedMenu.setLayout(flowLayout1);\r
-    embeddedEdit.setFont(new java.awt.Font("Arial", Font.PLAIN, 10));\r
-    embeddedSelect.setFont(new java.awt.Font("Arial", Font.PLAIN, 10));\r
-    embeddedView.setFont(new java.awt.Font("Arial", Font.PLAIN, 10));\r
-    embeddedFormat.setFont(new java.awt.Font("Arial", Font.PLAIN, 10));\r
-    embeddedColour.setFont(new java.awt.Font("Arial", Font.PLAIN, 10));\r
-    embeddedFile.setFont(new java.awt.Font("Arial", Font.PLAIN, 10));\r
-    embeddedHelp.setFont(new java.awt.Font("Arial", Font.PLAIN, 10));\r
-    embeddedCalculate.setFont(new java.awt.Font("Arial", Font.PLAIN, 10));\r
-    embeddedMenu.add(embeddedFile);\r
-    embeddedMenu.add(embeddedEdit);\r
-    embeddedMenu.add(embeddedSelect);\r
-    embeddedMenu.add(embeddedView);\r
-    embeddedMenu.add(embeddedFormat);\r
-    embeddedMenu.add(embeddedColour);\r
-    embeddedMenu.add(embeddedCalculate);\r
-    embeddedMenu.add(embeddedHelp);\r
-    flowLayout1.setAlignment(FlowLayout.LEFT);\r
-    flowLayout1.setHgap(2);\r
-    flowLayout1.setVgap(0);\r
-    embeddedFile.addMouseListener(this);\r
-    embeddedEdit.addMouseListener(this);\r
-    embeddedSelect.addMouseListener(this);\r
-    embeddedView.addMouseListener(this);\r
-    embeddedFormat.addMouseListener(this);\r
-    embeddedColour.addMouseListener(this);\r
-    embeddedCalculate.addMouseListener(this);\r
-    embeddedHelp.addMouseListener(this);\r
-\r
-    fileMenu.remove(closeMenuItem);\r
-    fileMenu.remove(3); // Seperator\r
-\r
-    viewport.applet.setLayout(new BorderLayout());\r
-    viewport.applet.add(embeddedMenu, BorderLayout.NORTH);\r
-    viewport.applet.add(statusBar, BorderLayout.SOUTH);\r
-\r
-    alignPanel.setSize(viewport.applet.getSize().width,\r
-                       viewport.applet.getSize().height\r
-                       - embeddedMenu.HEIGHT - statusBar.HEIGHT);\r
-\r
-    viewport.applet.add(alignPanel, BorderLayout.CENTER);\r
-    viewport.applet.validate();\r
-\r
-  }\r
-\r
-  PopupMenu filePopup, editPopup, searchPopup,\r
-  viewPopup, formatPopup, colourPopup, calculatePopup, helpPopup;\r
-  MenuItem featureSettings = new MenuItem();\r
-  CheckboxMenuItem sequenceFeatures = new CheckboxMenuItem();\r
-  MenuItem annotationColour = new MenuItem();\r
-  MenuItem invertColSel = new MenuItem();\r
-  Menu menu1 = new Menu();\r
-  MenuItem showColumns = new MenuItem();\r
-  MenuItem showSeqs = new MenuItem();\r
-  Menu menu2 = new Menu();\r
-  MenuItem hideColumns = new MenuItem();\r
-  MenuItem hideSequences = new MenuItem();\r
-  Menu formatMenu = new Menu();\r
-  Menu selectMenu = new Menu();\r
-  MenuItem newView = new MenuItem();\r
-\r
-  public void mousePressed(MouseEvent evt)\r
-  {\r
-    PopupMenu popup = null;\r
-    Label source = (Label) evt.getSource();\r
-    if (source == embeddedFile)\r
-    {\r
-      popup = filePopup = genPopupMenu(filePopup, fileMenu);\r
-    }\r
-    else if (source == embeddedEdit)\r
-    {\r
-      popup = editPopup = genPopupMenu(editPopup, editMenu);\r
-    }\r
-    else if (source == embeddedSelect)\r
-    {\r
-      popup = searchPopup = genPopupMenu(searchPopup, selectMenu);\r
-    }\r
-    else if (source == embeddedView)\r
-    {\r
-      popup = viewPopup = genPopupMenu(viewPopup, viewMenu);\r
-    }\r
-    else if (source == embeddedFormat)\r
-    {\r
-      popup = formatPopup = genPopupMenu(formatPopup, formatMenu);\r
-    }\r
-    else if (source == embeddedColour)\r
-    {\r
-      popup = colourPopup = genPopupMenu(colourPopup, colourMenu);\r
-    }\r
-    else if (source == embeddedCalculate)\r
-    {\r
-      popup = calculatePopup = genPopupMenu(calculatePopup, calculateMenu);\r
-    }\r
-    else if (source == embeddedHelp)\r
-    {\r
-      popup = helpPopup = genPopupMenu(helpPopup, helpMenu);\r
-    }\r
-\r
-    embeddedMenu.add(popup);\r
-    popup.show(embeddedMenu,\r
-               source.getBounds().x,\r
-               source.getBounds().y + source.getBounds().getSize().height);\r
-  }\r
-\r
-  PopupMenu genPopupMenu(PopupMenu popup, Menu original)\r
-  {\r
-    if (popup != null)\r
-    {\r
-      return popup;\r
-    }\r
-    popup = new PopupMenu();\r
-    int m, mSize = original.getItemCount();\r
-    for (m = 0; m < mSize; m++)\r
-    {\r
-      popup.add(original.getItem(m));\r
-      mSize--;\r
-      m--;\r
-    }\r
-\r
-    return popup;\r
-  }\r
-\r
-  public void mouseClicked(MouseEvent evt)\r
-  {}\r
-\r
-  public void mouseReleased(MouseEvent evt)\r
-  {}\r
-\r
-  public void mouseEntered(MouseEvent evt)\r
-  {}\r
-\r
-  public void mouseExited(MouseEvent evt)\r
-  {}\r
-\r
-}\r
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+package jalview.appletgui;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+import java.awt.*;
+import java.awt.event.*;
+
+import jalview.analysis.*;
+import jalview.commands.*;
+import jalview.datamodel.*;
+import jalview.io.*;
+import jalview.schemes.*;
+
+public class AlignFrame
+    extends Frame implements ActionListener,
+    ItemListener, KeyListener, MouseListener
+{
+  public AlignmentPanel alignPanel;
+  public AlignViewport viewport;
+  int DEFAULT_WIDTH = 700;
+  int DEFAULT_HEIGHT = 500;
+
+  String jalviewServletURL;
+
+  public AlignFrame(AlignmentI al,
+                    jalview.bin.JalviewLite applet,
+                    String title,
+                    boolean embedded)
+  {
+
+    if (applet != null)
+    {
+      jalviewServletURL = applet.getParameter("APPLICATION_URL");
+    }
+
+    try
+    {
+      jbInit();
+    }
+    catch (Exception ex)
+    {
+      ex.printStackTrace();
+    }
+
+    viewport = new AlignViewport(al, applet);
+    alignPanel = new AlignmentPanel(this, viewport);
+
+    viewport.updateConservation(alignPanel);
+    viewport.updateConsensus(alignPanel);
+
+    annotationPanelMenuItem.setState(viewport.showAnnotation);
+
+    seqLimits.setState(viewport.showJVSuffix);
+
+    if (applet != null)
+    {
+      String param = applet.getParameter("sortBy");
+      if (param != null)
+      {
+        if (param.equalsIgnoreCase("Id"))
+        {
+          sortIDMenuItem_actionPerformed();
+        }
+        else if (param.equalsIgnoreCase("Pairwise Identity"))
+        {
+          sortPairwiseMenuItem_actionPerformed();
+        }
+      }
+
+      param = applet.getParameter("wrap");
+      if (param != null)
+      {
+        if (param.equalsIgnoreCase("true"))
+        {
+          wrapMenuItem.setState(true);
+          wrapMenuItem_actionPerformed();
+        }
+      }
+
+      try
+      {
+        param = applet.getParameter("windowWidth");
+        if (param != null)
+        {
+          int width = Integer.parseInt(param);
+          DEFAULT_WIDTH = width;
+        }
+        param = applet.getParameter("windowHeight");
+        if (param != null)
+        {
+          int height = Integer.parseInt(param);
+          DEFAULT_HEIGHT = height;
+        }
+      }
+      catch (Exception ex)
+      {}
+
+    }
+
+    //Some JVMS send keyevents to Top frame or lowest panel,
+    //Havent worked out why yet. So add to both this frame and seqCanvas for now
+    this.addKeyListener(this);
+    alignPanel.seqPanel.seqCanvas.addKeyListener(this);
+    alignPanel.idPanel.idCanvas.addKeyListener(this);
+    alignPanel.scalePanel.addKeyListener(this);
+    alignPanel.annotationPanel.addKeyListener(this);
+
+    if (embedded)
+    {
+      setEmbedded();
+    }
+    else
+    {
+      add(alignPanel, BorderLayout.CENTER);
+      jalview.bin.JalviewLite.addFrame(this, title, DEFAULT_WIDTH,
+                                       DEFAULT_HEIGHT);
+    }
+    alignPanel.validate();
+    alignPanel.paintAlignment(true);
+  }
+
+  public AlignViewport getAlignViewport()
+  {
+    return viewport;
+  }
+
+  public SeqCanvas getSeqcanvas()
+  {
+    return alignPanel.seqPanel.seqCanvas;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param String DOCUMENT ME!
+   */
+
+  public void parseFeaturesFile(String file, String type)
+  {
+    Hashtable featureLinks = new Hashtable();
+    boolean featuresFile = false;
+    try
+    {
+      featuresFile = new jalview.io.FeaturesFile(file,
+          type).parse(viewport.alignment,
+                      alignPanel.seqPanel.seqCanvas.
+                      getFeatureRenderer().featureColours,
+                      featureLinks,
+                      true);
+    }
+    catch (Exception ex)
+    {
+      ex.printStackTrace();
+    }
+
+    if (featuresFile)
+    {
+      if (featureLinks.size() > 0)
+      {
+        alignPanel.seqPanel.seqCanvas
+            .getFeatureRenderer().featureLinks = featureLinks;
+      }
+      viewport.showSequenceFeatures = true;
+      sequenceFeatures.setState(true);
+      alignPanel.paintAlignment(true);
+    }
+
+  }
+
+  public void keyPressed(KeyEvent evt)
+  {
+    if (viewport.cursorMode &&
+        ( (evt.getKeyCode() >= KeyEvent.VK_0 &&
+           evt.getKeyCode() <= KeyEvent.VK_9)
+         ||
+         (evt.getKeyCode() >= KeyEvent.VK_NUMPAD0 &&
+          evt.getKeyCode() <= KeyEvent.VK_NUMPAD9)
+        )
+        && Character.isDigit(evt.getKeyChar()))
+            alignPanel.seqPanel.numberPressed(evt.getKeyChar());
+
+
+    switch (evt.getKeyCode())
+    {
+      case 27: // escape key
+        deselectAllSequenceMenuItem_actionPerformed();
+        break;
+      case KeyEvent.VK_X:
+        if (evt.isControlDown() || evt.isMetaDown())
+        {
+          cut_actionPerformed();
+        }
+        break;
+      case KeyEvent.VK_C:
+        if (viewport.cursorMode && !evt.isControlDown())
+        {
+          alignPanel.seqPanel.setCursorColumn();
+        }
+        if (evt.isControlDown() || evt.isMetaDown())
+        {
+          copy_actionPerformed();
+        }
+        break;
+      case KeyEvent.VK_V:
+        if (evt.isControlDown())
+        {
+          paste(evt.isShiftDown());
+        }
+        break;
+      case KeyEvent.VK_A:
+        if (evt.isControlDown() || evt.isMetaDown())
+        {
+          selectAllSequenceMenuItem_actionPerformed();
+        }
+        break;
+      case KeyEvent.VK_DOWN:
+        if (viewport.cursorMode)
+        {
+          alignPanel.seqPanel.moveCursor(0, 1);
+        }
+        else
+        {
+          moveSelectedSequences(false);
+        }
+        break;
+
+      case KeyEvent.VK_UP:
+        if (viewport.cursorMode)
+        {
+          alignPanel.seqPanel.moveCursor(0, -1);
+        }
+        else
+        {
+          moveSelectedSequences(true);
+        }
+        break;
+
+      case KeyEvent.VK_LEFT:
+        if (evt.isAltDown() || !viewport.cursorMode)
+          slideSequences(false,
+                         alignPanel.seqPanel.getKeyboardNo1());
+        else
+          alignPanel.seqPanel.moveCursor( -1, 0);
+        break;
+
+      case KeyEvent.VK_RIGHT:
+        if (evt.isAltDown() || !viewport.cursorMode)
+          slideSequences(true,
+                         alignPanel.seqPanel.getKeyboardNo1());
+        else
+          alignPanel.seqPanel.moveCursor( 1, 0);
+            break;
+
+      case KeyEvent.VK_SPACE:
+        if (viewport.cursorMode)
+        {
+          alignPanel.seqPanel.insertGapAtCursor(evt.isControlDown()
+                                                || evt.isShiftDown()
+                                                || evt.isAltDown()
+              );
+        }
+        break;
+
+      case KeyEvent.VK_DELETE:
+      case KeyEvent.VK_BACK_SPACE:
+        if (viewport.cursorMode)
+        {
+          alignPanel.seqPanel.deleteGapAtCursor(evt.isControlDown()
+                                                || evt.isShiftDown()
+                                                || evt.isAltDown());
+        }
+        else
+        {
+          cut_actionPerformed();
+          alignPanel.seqPanel.seqCanvas.repaint();
+        }
+        break;
+
+      case KeyEvent.VK_S:
+        if (viewport.cursorMode)
+        {
+          alignPanel.seqPanel.setCursorRow();
+        }
+        break;
+      case KeyEvent.VK_P:
+        if (viewport.cursorMode)
+        {
+          alignPanel.seqPanel.setCursorPosition();
+        }
+        break;
+
+      case KeyEvent.VK_ENTER:
+      case KeyEvent.VK_COMMA:
+        if (viewport.cursorMode)
+        {
+          alignPanel.seqPanel.setCursorRowAndColumn();
+        }
+        break;
+
+      case KeyEvent.VK_Q:
+        if (viewport.cursorMode)
+        {
+          alignPanel.seqPanel.setSelectionAreaAtCursor(true);
+        }
+        break;
+      case KeyEvent.VK_M:
+        if (viewport.cursorMode)
+        {
+          alignPanel.seqPanel.setSelectionAreaAtCursor(false);
+        }
+        break;
+
+      case KeyEvent.VK_F2:
+        viewport.cursorMode = !viewport.cursorMode;
+        statusBar.setText("Keyboard editing mode is " +
+                          (viewport.cursorMode ? "on" : "off"));
+        if (viewport.cursorMode)
+        {
+          alignPanel.seqPanel.seqCanvas.cursorX = viewport.startRes;
+          alignPanel.seqPanel.seqCanvas.cursorY = viewport.startSeq;
+        }
+        break;
+
+      case KeyEvent.VK_F:
+        if (evt.isControlDown())
+        {
+          findMenuItem_actionPerformed();
+        }
+        break;
+
+      case KeyEvent.VK_H:
+      {
+        boolean toggleSeqs = !evt.isControlDown();
+        boolean toggleCols = !evt.isShiftDown();
+        boolean hide = false;
+        SequenceGroup sg = viewport.getSelectionGroup();
+
+        if (toggleSeqs)
+        {
+          if (sg != null && sg.getSize() != viewport.alignment.getHeight())
+          {
+            hide = true;
+            viewport.hideAllSelectedSeqs();
+          }
+          else if (! (toggleCols && viewport.colSel.getSelected().size() > 0))
+          {
+            viewport.showAllHiddenSeqs();
+          }
+        }
+
+        if (toggleCols)
+        {
+          if (viewport.colSel.getSelected().size() > 0)
+          {
+            viewport.hideSelectedColumns();
+            if (!toggleSeqs)
+            {
+              viewport.selectionGroup = sg;
+            }
+          }
+          else if (!hide)
+          {
+            viewport.showAllHiddenColumns();
+          }
+        }
+        break;
+      }
+
+      case KeyEvent.VK_PAGE_UP:
+        if (viewport.wrapAlignment)
+        {
+          alignPanel.scrollUp(true);
+        }
+        else
+        {
+          alignPanel.setScrollValues(viewport.startRes,
+                                     viewport.startSeq
+                                     - viewport.endSeq + viewport.startSeq);
+        }
+        break;
+
+      case KeyEvent.VK_PAGE_DOWN:
+        if (viewport.wrapAlignment)
+        {
+          alignPanel.scrollUp(false);
+        }
+        else
+        {
+          alignPanel.setScrollValues(viewport.startRes,
+                                     viewport.startSeq
+                                     + viewport.endSeq - viewport.startSeq);
+        }
+        break;
+
+      case KeyEvent.VK_Z:
+        if (evt.isControlDown())
+        {
+          undoMenuItem_actionPerformed();
+        }
+        break;
+
+      case KeyEvent.VK_Y:
+        if (evt.isControlDown())
+        {
+          redoMenuItem_actionPerformed();
+        }
+        break;
+
+      case KeyEvent.VK_L:
+        if (evt.isControlDown())
+        {
+          trimAlignment(true);
+        }
+        break;
+
+      case KeyEvent.VK_R:
+        if (evt.isControlDown())
+        {
+          trimAlignment(false);
+        }
+        break;
+
+      case KeyEvent.VK_E:
+        if (evt.isControlDown())
+        {
+          if (evt.isShiftDown())
+          {
+            this.removeAllGapsMenuItem_actionPerformed();
+          }
+          else
+          {
+            removeGappedColumnMenuItem_actionPerformed();
+          }
+        }
+        break;
+      case KeyEvent.VK_I:
+        if (evt.isControlDown())
+        {
+          if (evt.isAltDown())
+          {
+            viewport.invertColumnSelection();
+          }
+          else
+          {
+            this.invertSequenceMenuItem_actionPerformed();
+          }
+        }
+        break;
+
+      case KeyEvent.VK_U:
+        if (evt.isControlDown())
+        {
+          this.deleteGroups_actionPerformed();
+        }
+        break;
+
+      case KeyEvent.VK_T:
+        if (evt.isControlDown())
+        {
+          newView();
+        }
+        break;
+
+    }
+    alignPanel.paintAlignment(true);
+  }
+
+  public void keyReleased(KeyEvent evt)
+  {}
+
+  public void keyTyped(KeyEvent evt)
+  {}
+
+  public void itemStateChanged(ItemEvent evt)
+  {
+    if (evt.getSource() == colourTextMenuItem)
+    {
+      colourTextMenuItem_actionPerformed();
+    }
+    else if (evt.getSource() == wrapMenuItem)
+    {
+      wrapMenuItem_actionPerformed();
+    }
+    else if (evt.getSource() == scaleAbove)
+    {
+      viewport.setScaleAboveWrapped(scaleAbove.getState());
+    }
+    else if (evt.getSource() == scaleLeft)
+    {
+      viewport.setScaleLeftWrapped(scaleLeft.getState());
+    }
+    else if (evt.getSource() == scaleRight)
+    {
+      viewport.setScaleRightWrapped(scaleRight.getState());
+    }
+    else if (evt.getSource() == seqLimits)
+    {
+      seqLimits_itemStateChanged();
+    }
+    else if (evt.getSource() == viewBoxesMenuItem)
+    {
+      viewport.setShowBoxes(viewBoxesMenuItem.getState());
+    }
+    else if (evt.getSource() == viewTextMenuItem)
+    {
+      viewport.setShowText(viewTextMenuItem.getState());
+    }
+    else if (evt.getSource() == renderGapsMenuItem)
+    {
+      viewport.setRenderGaps(renderGapsMenuItem.getState());
+    }
+    else if (evt.getSource() == annotationPanelMenuItem)
+    {
+      viewport.setShowAnnotation(annotationPanelMenuItem.getState());
+      alignPanel.setAnnotationVisible(annotationPanelMenuItem.getState());
+    }
+    else if (evt.getSource() == sequenceFeatures)
+    {
+      viewport.showSequenceFeatures(sequenceFeatures.getState());
+      alignPanel.seqPanel.seqCanvas.repaint();
+    }
+    else if (evt.getSource() == conservationMenuItem)
+    {
+      conservationMenuItem_actionPerformed();
+    }
+    else if (evt.getSource() == abovePIDThreshold)
+    {
+      abovePIDThreshold_actionPerformed();
+    }
+    else if (evt.getSource() == applyToAllGroups)
+    {
+      viewport.setColourAppliesToAllGroups(applyToAllGroups.getState());
+    }
+    else if (evt.getSource() == autoCalculate)
+    {
+      viewport.autocalculateConsensus = autoCalculate.getState();
+    }
+
+    alignPanel.paintAlignment(true);
+  }
+
+  public void actionPerformed(ActionEvent evt)
+  {
+    Object source = evt.getSource();
+
+    if (source == inputText)
+    {
+      inputText_actionPerformed();
+    }
+    else if (source == loadTree)
+    {
+      loadTree_actionPerformed();
+    }
+    else if (source == loadApplication)
+    {
+      launchFullApplication();
+    }
+    else if (source == loadAnnotations)
+    {
+      loadAnnotations();
+    }
+    else if (source == outputAnnotations)
+    {
+      outputAnnotations(true);
+    }
+    else if (source == outputFeatures)
+    {
+      outputFeatures(true, "Jalview");
+    }
+    else if (source == closeMenuItem)
+    {
+      closeMenuItem_actionPerformed();
+    }
+    else if (source == copy)
+    {
+      copy_actionPerformed();
+    }
+    else if (source == undoMenuItem)
+    {
+      undoMenuItem_actionPerformed();
+    }
+    else if (source == redoMenuItem)
+    {
+      redoMenuItem_actionPerformed();
+    }
+    else if (source == inputText)
+    {
+      inputText_actionPerformed();
+    }
+    else if (source == closeMenuItem)
+    {
+      closeMenuItem_actionPerformed();
+    }
+    else if (source == undoMenuItem)
+    {
+      undoMenuItem_actionPerformed();
+    }
+    else if (source == redoMenuItem)
+    {
+      redoMenuItem_actionPerformed();
+    }
+    else if (source == copy)
+    {
+      copy_actionPerformed();
+    }
+    else if (source == pasteNew)
+    {
+      pasteNew_actionPerformed();
+    }
+    else if (source == pasteThis)
+    {
+      pasteThis_actionPerformed();
+    }
+    else if (source == cut)
+    {
+      cut_actionPerformed();
+    }
+    else if (source == delete)
+    {
+      delete_actionPerformed();
+    }
+    else if (source == deleteGroups)
+    {
+      deleteGroups_actionPerformed();
+    }
+    else if (source == selectAllSequenceMenuItem)
+    {
+      selectAllSequenceMenuItem_actionPerformed();
+    }
+    else if (source == deselectAllSequenceMenuItem)
+    {
+      deselectAllSequenceMenuItem_actionPerformed();
+    }
+    else if (source == invertSequenceMenuItem)
+    {
+      invertSequenceMenuItem_actionPerformed();
+    }
+    else if (source == invertColSel)
+    {
+      viewport.invertColumnSelection();
+      alignPanel.paintAlignment(true);
+    }
+    else if (source == remove2LeftMenuItem)
+    {
+      trimAlignment(true);
+    }
+    else if (source == remove2RightMenuItem)
+    {
+      trimAlignment(false);
+    }
+    else if (source == removeGappedColumnMenuItem)
+    {
+      removeGappedColumnMenuItem_actionPerformed();
+    }
+    else if (source == removeAllGapsMenuItem)
+    {
+      removeAllGapsMenuItem_actionPerformed();
+    }
+    else if (source == findMenuItem)
+    {
+      findMenuItem_actionPerformed();
+    }
+    else if (source == font)
+    {
+      new FontChooser(alignPanel);
+    }
+    else if (source == newView)
+    {
+      newView();
+    }
+    else if (source == showColumns)
+    {
+      viewport.showAllHiddenColumns();
+      alignPanel.paintAlignment(true);
+    }
+    else if (source == showSeqs)
+    {
+      viewport.showAllHiddenSeqs();
+    }
+    else if (source == hideColumns)
+    {
+      viewport.hideSelectedColumns();
+      alignPanel.paintAlignment(true);
+    }
+    else if (source == hideSequences && viewport.getSelectionGroup() != null)
+    {
+      viewport.hideAllSelectedSeqs();
+    }
+    else if (source == featureSettings)
+    {
+      new FeatureSettings(alignPanel);
+    }
+    else if(source== alProperties)
+    {
+        StringBuffer contents = new StringBuffer();
+
+        float avg  = 0;
+        int min=Integer.MAX_VALUE, max=0;
+        for(int i=0; i<viewport.alignment.getHeight(); i++)
+        {
+          int size = viewport.alignment.getSequenceAt(i).getEnd()
+              -viewport.alignment.getSequenceAt(i).getStart();
+          avg += size;
+          if(size>max)
+            max = size;
+          if(size<min)
+            min = size;
+        }
+        avg = avg/(float)viewport.alignment.getHeight();
+
+        contents.append("\nSequences: "+ viewport.alignment.getHeight());
+        contents.append("\nMinimum Sequence Length: "+min);
+        contents.append("\nMaximum Sequence Length: "+max);
+        contents.append("\nAverage Length: "+(int)avg);
+
+        if (((Alignment)viewport.alignment).alignmentProperties != null)
+        {
+          Hashtable props = ((Alignment)viewport.alignment).alignmentProperties;
+          Enumeration en = props.keys();
+          while(en.hasMoreElements())
+          {
+            String key = en.nextElement().toString();
+            contents.append("\n"+key+"\t"+props.get(key));
+          }
+        }
+
+        CutAndPasteTransfer cap = new CutAndPasteTransfer(false, this);
+        cap.setText(contents.toString());
+        Frame frame = new Frame();
+        frame.add(cap);
+        jalview.bin.JalviewLite.addFrame(frame,
+                                         "Alignment Properties: "+getTitle()
+                                         , 400, 250);
+    }
+    else if (source == overviewMenuItem)
+    {
+      overviewMenuItem_actionPerformed();
+    }
+    else if (source == noColourmenuItem)
+    {
+      changeColour(null);
+    }
+    else if (source == clustalColour)
+    {
+      abovePIDThreshold.setState(false);
+      changeColour(new ClustalxColourScheme(viewport.alignment.getSequences(),
+                                            viewport.alignment.getWidth()));
+    }
+    else if (source == zappoColour)
+    {
+      changeColour(new ZappoColourScheme());
+    }
+    else if (source == taylorColour)
+    {
+      changeColour(new TaylorColourScheme());
+    }
+    else if (source == hydrophobicityColour)
+    {
+      changeColour(new HydrophobicColourScheme());
+    }
+    else if (source == helixColour)
+    {
+      changeColour(new HelixColourScheme());
+    }
+    else if (source == strandColour)
+    {
+      changeColour(new StrandColourScheme());
+    }
+    else if (source == turnColour)
+    {
+      changeColour(new TurnColourScheme());
+    }
+    else if (source == buriedColour)
+    {
+      changeColour(new BuriedColourScheme());
+    }
+    else if (source == nucleotideColour)
+    {
+      changeColour(new NucleotideColourScheme());
+    }
+    else if (source == modifyPID)
+    {
+      modifyPID_actionPerformed();
+    }
+    else if (source == modifyConservation)
+    {
+      modifyConservation_actionPerformed();
+    }
+    else if (source == userDefinedColour)
+    {
+      new UserDefinedColours(alignPanel, null);
+    }
+    else if (source == PIDColour)
+    {
+      changeColour(new PIDColourScheme());
+    }
+    else if (source == BLOSUM62Colour)
+    {
+      changeColour(new Blosum62ColourScheme());
+    }
+    else if (source == annotationColour)
+    {
+      new AnnotationColourChooser(viewport, alignPanel);
+    }
+    else if (source == sortPairwiseMenuItem)
+    {
+      sortPairwiseMenuItem_actionPerformed();
+    }
+    else if (source == sortIDMenuItem)
+    {
+      sortIDMenuItem_actionPerformed();
+    }
+    else if (source == sortGroupMenuItem)
+    {
+      sortGroupMenuItem_actionPerformed();
+    }
+    else if (source == removeRedundancyMenuItem)
+    {
+      removeRedundancyMenuItem_actionPerformed();
+    }
+    else if (source == pairwiseAlignmentMenuItem)
+    {
+      pairwiseAlignmentMenuItem_actionPerformed();
+    }
+    else if (source == PCAMenuItem)
+    {
+      PCAMenuItem_actionPerformed();
+    }
+    else if (source == averageDistanceTreeMenuItem)
+    {
+      averageDistanceTreeMenuItem_actionPerformed();
+    }
+    else if (source == neighbourTreeMenuItem)
+    {
+      neighbourTreeMenuItem_actionPerformed();
+    }
+    else if (source == njTreeBlosumMenuItem)
+    {
+      njTreeBlosumMenuItem_actionPerformed();
+    }
+    else if (source == avDistanceTreeBlosumMenuItem)
+    {
+      avTreeBlosumMenuItem_actionPerformed();
+    }
+    else if (source == documentation)
+    {
+      documentation_actionPerformed();
+    }
+    else if (source == about)
+    {
+      about_actionPerformed();
+    }
+
+  }
+
+  public void inputText_actionPerformed()
+  {
+    CutAndPasteTransfer cap = new CutAndPasteTransfer(true, this);
+    Frame frame = new Frame();
+    frame.add(cap);
+    jalview.bin.JalviewLite.addFrame(frame, "Cut & Paste Input", 500, 500);
+  }
+
+  protected void outputText_actionPerformed(ActionEvent e)
+  {
+    CutAndPasteTransfer cap = new CutAndPasteTransfer(true, this);
+    Frame frame = new Frame();
+    frame.add(cap);
+    jalview.bin.JalviewLite.addFrame(frame,
+                                     "Alignment output - " + e.getActionCommand(),
+                                     600, 500);
+    cap.setText(new AppletFormatAdapter().formatSequences(e.getActionCommand(),
+        viewport.getAlignment(),
+        viewport.showJVSuffix));
+  }
+
+  public void loadAnnotations()
+  {
+    CutAndPasteTransfer cap = new CutAndPasteTransfer(true, this);
+    cap.setText("Paste your features / annotations file here.");
+    cap.setAnnotationImport();
+    Frame frame = new Frame();
+    frame.add(cap);
+    jalview.bin.JalviewLite.addFrame(frame, "Paste Annotations ", 400, 300);
+
+  }
+
+  public String outputAnnotations(boolean displayTextbox)
+  {
+    String annotation = new AnnotationFile().printAnnotations(
+        viewport.showAnnotation ? viewport.alignment.getAlignmentAnnotation() : null,
+        viewport.alignment.getGroups(),
+         ((Alignment) viewport.alignment).alignmentProperties);
+
+    if (displayTextbox)
+    {
+      CutAndPasteTransfer cap = new CutAndPasteTransfer(false, this);
+      Frame frame = new Frame();
+      frame.add(cap);
+      jalview.bin.JalviewLite.addFrame(frame,
+                                       "Annotations",
+                                       600, 500);
+      cap.setText(annotation);
+    }
+
+    return annotation;
+  }
+
+  public String outputFeatures(boolean displayTextbox, String format)
+  {
+    String features;
+    if (format.equalsIgnoreCase("Jalview"))
+    {
+      features = new FeaturesFile().printJalviewFormat(
+          viewport.alignment.getSequencesArray(),
+          viewport.featuresDisplayed);
+    }
+    else
+    {
+      features = new FeaturesFile().printGFFFormat(
+          viewport.alignment.getSequencesArray(),
+          viewport.featuresDisplayed);
+    }
+
+    if (displayTextbox)
+    {
+      CutAndPasteTransfer cap = new CutAndPasteTransfer(false, this);
+      Frame frame = new Frame();
+      frame.add(cap);
+      jalview.bin.JalviewLite.addFrame(frame,
+                                       "Features",
+                                       600, 500);
+
+      cap.setText(features);
+    }
+
+    return features;
+  }
+
+  void launchFullApplication()
+  {
+    StringBuffer url = new StringBuffer(jalviewServletURL);
+
+    url.append("?open=" +
+               appendProtocol(viewport.applet.getParameter("file")));
+
+    if (viewport.applet.getParameter("features") != null)
+    {
+      url.append("&features=");
+      url.append(appendProtocol(viewport.applet.getParameter("features")));
+    }
+
+    if (viewport.applet.getParameter("annotations") != null)
+    {
+      url.append("&annotations=");
+      url.append(appendProtocol(viewport.applet.getParameter("annotations")));
+    }
+
+    if (viewport.applet.getParameter("jnetfile") != null)
+    {
+      url.append("&annotations=");
+      url.append(appendProtocol(viewport.applet.getParameter("jnetfile")));
+    }
+
+    if (viewport.applet.getParameter("defaultColour") != null)
+    {
+      url.append("&colour=" +
+                 removeWhiteSpace(viewport.applet.getParameter("defaultColour"))
+          );
+    }
+
+    if (viewport.applet.getParameter("userDefinedColour") != null)
+    {
+      url.append("&colour=" +
+                 removeWhiteSpace(viewport.applet.getParameter(
+          "userDefinedColour"))
+          );
+    }
+
+    showURL(url.toString(), "FULL_APP");
+  }
+
+  String removeWhiteSpace(String colour)
+  {
+    StringBuffer sb = new StringBuffer();
+    for (int i = 0; i < colour.length(); i++)
+    {
+      if (Character.isWhitespace(colour.charAt(i)))
+      {
+        sb.append("%20");
+      }
+      else
+      {
+        sb.append(colour.charAt(i));
+      }
+    }
+
+    return sb.toString();
+  }
+
+  String appendProtocol(String url)
+  {
+    try
+    {
+      new URL(url);
+    }
+    catch (java.net.MalformedURLException ex)
+    {
+      url = viewport.applet.getCodeBase() + url;
+    }
+    return url;
+  }
+
+  public void closeMenuItem_actionPerformed()
+  {
+    PaintRefresher.RemoveComponent(alignPanel);
+    PaintRefresher.RemoveComponent(alignPanel.seqPanel.seqCanvas);
+    PaintRefresher.RemoveComponent(alignPanel.idPanel.idCanvas);
+
+    if (PaintRefresher.components.size() == 0 && viewport.applet == null)
+    {
+      System.exit(0);
+    }
+
+    this.dispose();
+  }
+
+  /**
+   * DOCUMENT ME!
+   */
+  void updateEditMenuBar()
+  {
+
+    if (viewport.historyList.size() > 0)
+    {
+      undoMenuItem.setEnabled(true);
+      CommandI command = (CommandI) viewport.historyList.peek();
+      undoMenuItem.setLabel("Undo " + command.getDescription());
+    }
+    else
+    {
+      undoMenuItem.setEnabled(false);
+      undoMenuItem.setLabel("Undo");
+    }
+
+    if (viewport.redoList.size() > 0)
+    {
+      redoMenuItem.setEnabled(true);
+
+      CommandI command = (CommandI) viewport.redoList.peek();
+      redoMenuItem.setLabel("Redo " + command.getDescription());
+    }
+    else
+    {
+      redoMenuItem.setEnabled(false);
+      redoMenuItem.setLabel("Redo");
+    }
+  }
+
+  public void addHistoryItem(CommandI command)
+  {
+    if (command.getSize() > 0)
+    {
+      viewport.historyList.push(command);
+      viewport.redoList.removeAllElements();
+      updateEditMenuBar();
+      viewport.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null;
+    }
+  }
+  /**
+   * DOCUMENT ME!
+   *
+   * @param e DOCUMENT ME!
+   */
+  protected void undoMenuItem_actionPerformed()
+  {
+    if (viewport.historyList.size() < 1)
+    {
+      return;
+    }
+
+    CommandI command = (CommandI) viewport.historyList.pop();
+    viewport.redoList.push(command);
+    command.undoCommand(null);
+
+    AlignViewport originalSource = getOriginatingSource(command);
+
+    originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null;
+    updateEditMenuBar();
+    originalSource.firePropertyChange("alignment", null,
+                                      originalSource.alignment.getSequences());
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param e DOCUMENT ME!
+   */
+  protected void redoMenuItem_actionPerformed()
+  {
+    if (viewport.redoList.size() < 1)
+    {
+      return;
+    }
+
+    CommandI command = (CommandI) viewport.redoList.pop();
+    viewport.historyList.push(command);
+    command.doCommand(null);
+
+    AlignViewport originalSource = getOriginatingSource(command);
+    originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null;
+
+    updateEditMenuBar();
+    originalSource.firePropertyChange("alignment", null,
+                                      originalSource.alignment.getSequences());
+  }
+
+  AlignViewport getOriginatingSource(CommandI command)
+  {
+    AlignViewport originalSource = null;
+    //For sequence removal and addition, we need to fire
+    //the property change event FROM the viewport where the
+    //original alignment was altered
+    AlignmentI al = null;
+    if (command instanceof EditCommand)
+    {
+      EditCommand editCommand = (EditCommand) command;
+      al = editCommand.getAlignment();
+      Vector comps = (Vector) PaintRefresher.components
+          .get(viewport.getSequenceSetId());
+      for (int i = 0; i < comps.size(); i++)
+      {
+        if (comps.elementAt(i) instanceof AlignmentPanel)
+        {
+          if (al == ( (AlignmentPanel) comps.elementAt(i)).av.alignment)
+          {
+            originalSource = ( (AlignmentPanel) comps.elementAt(i)).av;
+            break;
+          }
+        }
+      }
+    }
+
+    if (originalSource == null)
+    {
+      //The original view is closed, we must validate
+      //the current view against the closed view first
+      if (al != null)
+      {
+        PaintRefresher.validateSequences(al, viewport.alignment);
+      }
+
+      originalSource = viewport;
+    }
+
+    return originalSource;
+  }
+
+  public void moveSelectedSequences(boolean up)
+  {
+    SequenceGroup sg = viewport.getSelectionGroup();
+    if (sg == null)
+    {
+      return;
+    }
+
+    if (up)
+    {
+      for (int i = 1; i < viewport.alignment.getHeight(); i++)
+      {
+        SequenceI seq = viewport.alignment.getSequenceAt(i);
+        if (!sg.getSequences(null).contains(seq))
+        {
+          continue;
+        }
+
+        SequenceI temp = viewport.alignment.getSequenceAt(i - 1);
+        if (sg.getSequences(null).contains(temp))
+        {
+          continue;
+        }
+
+        viewport.alignment.getSequences().setElementAt(temp, i);
+        viewport.alignment.getSequences().setElementAt(seq, i - 1);
+      }
+    }
+    else
+    {
+      for (int i = viewport.alignment.getHeight() - 2; i > -1; i--)
+      {
+        SequenceI seq = viewport.alignment.getSequenceAt(i);
+        if (!sg.getSequences(viewport.hiddenRepSequences).contains(seq))
+        {
+          continue;
+        }
+
+        SequenceI temp = viewport.alignment.getSequenceAt(i + 1);
+        if (sg.getSequences(viewport.hiddenRepSequences).contains(temp))
+        {
+          continue;
+        }
+
+        viewport.alignment.getSequences().setElementAt(temp, i);
+        viewport.alignment.getSequences().setElementAt(seq, i + 1);
+      }
+    }
+
+    alignPanel.paintAlignment(true);
+  }
+
+  synchronized void slideSequences(boolean right, int size)
+  {
+    Vector sg = new Vector();
+    if(viewport.cursorMode)
+    {
+      sg.addElement(viewport.alignment.getSequenceAt(
+          alignPanel.seqPanel.seqCanvas.cursorY));
+    }
+    else if(viewport.getSelectionGroup()!=null
+        && viewport.getSelectionGroup().getSize()!=viewport.alignment.getHeight())
+   {
+     sg = viewport.getSelectionGroup().getSequences(
+         viewport.hiddenRepSequences);
+   }
+
+    if(sg.size()<1)
+    {
+      return;
+    }
+
+    Vector invertGroup = new Vector();
+
+    for (int i = 0; i < viewport.alignment.getHeight(); i++)
+    {
+      if(!sg.contains(viewport.alignment.getSequenceAt(i)))
+         invertGroup.addElement(viewport.alignment.getSequenceAt(i));
+    }
+
+    SequenceI[] seqs1 = new SequenceI[sg.size()];
+    for (int i = 0; i < sg.size(); i++)
+      seqs1[i] = (SequenceI) sg.elementAt(i);
+
+    SequenceI[] seqs2 = new SequenceI[invertGroup.size()];
+    for (int i = 0; i < invertGroup.size(); i++)
+      seqs2[i] = (SequenceI) invertGroup.elementAt(i);
+
+    SlideSequencesCommand ssc;
+    if (right)
+      ssc = new SlideSequencesCommand("Slide Sequences",
+                                      seqs2, seqs1, size,
+                                      viewport.getGapCharacter()
+          );
+    else
+      ssc = new SlideSequencesCommand("Slide Sequences",
+                                      seqs1, seqs2, size,
+                                      viewport.getGapCharacter()
+          );
+
+    int groupAdjustment = 0;
+    if (ssc.getGapsInsertedBegin() && right)
+    {
+      if (viewport.cursorMode)
+        alignPanel.seqPanel.moveCursor(size, 0);
+      else
+        groupAdjustment = size;
+    }
+    else if (!ssc.getGapsInsertedBegin() && !right)
+    {
+      if (viewport.cursorMode)
+        alignPanel.seqPanel.moveCursor( -size, 0);
+      else
+        groupAdjustment = -size;
+    }
+
+    if (groupAdjustment != 0)
+    {
+      viewport.getSelectionGroup().setStartRes(
+          viewport.getSelectionGroup().getStartRes() + groupAdjustment);
+      viewport.getSelectionGroup().setEndRes(
+          viewport.getSelectionGroup().getEndRes() + groupAdjustment);
+    }
+
+
+    boolean appendHistoryItem = false;
+    if(viewport.historyList!=null
+       && viewport.historyList.size()>0
+      && viewport.historyList.peek() instanceof SlideSequencesCommand)
+    {
+      appendHistoryItem = ssc.appendSlideCommand(
+          (SlideSequencesCommand)viewport.historyList.peek())
+          ;
+    }
+
+    if(!appendHistoryItem)
+      addHistoryItem(ssc);
+
+    repaint();
+  }
+
+  static StringBuffer copiedSequences;
+  static Vector copiedHiddenColumns;
+  protected void copy_actionPerformed()
+  {
+    if (viewport.getSelectionGroup() == null)
+    {
+      return;
+    }
+
+    SequenceGroup sg = viewport.getSelectionGroup();
+    copiedSequences = new StringBuffer();
+    Hashtable orderedSeqs = new Hashtable();
+    for (int i = 0; i < sg.getSize(); i++)
+    {
+      SequenceI seq = sg.getSequenceAt(i);
+      int index = viewport.alignment.findIndex(seq);
+      orderedSeqs.put(index + "", seq);
+    }
+
+    int index = 0, startRes, endRes;
+    char ch;
+
+    if (viewport.hasHiddenColumns && viewport.getSelectionGroup() != null)
+    {
+      copiedHiddenColumns = new Vector();
+      int hiddenOffset = viewport.getSelectionGroup().getStartRes();
+      for (int i = 0; i < viewport.getColumnSelection().getHiddenColumns().size();
+           i++)
+      {
+        int[] region = (int[])
+            viewport.getColumnSelection().getHiddenColumns().elementAt(i);
+
+        copiedHiddenColumns.addElement(new int[]
+                                       {region[0] - hiddenOffset,
+                                       region[1] - hiddenOffset});
+      }
+    }
+    else
+    {
+      copiedHiddenColumns = null;
+    }
+
+    for (int i = 0; i < sg.getSize(); i++)
+    {
+      SequenceI seq = null;
+
+      while (seq == null)
+      {
+        if (orderedSeqs.containsKey(index + ""))
+        {
+          seq = (SequenceI) orderedSeqs.get(index + "");
+          index++;
+
+          break;
+        }
+        else
+        {
+          index++;
+        }
+      }
+
+      //FIND START RES
+      //Returns residue following index if gap
+      startRes = seq.findPosition(sg.getStartRes());
+
+      //FIND END RES
+      //Need to find the residue preceeding index if gap
+      endRes = 0;
+
+      for (int j = 0; j < sg.getEndRes() + 1 && j < seq.getLength(); j++)
+      {
+        ch = seq.getCharAt(j);
+        if (!jalview.util.Comparison.isGap( (ch)))
+        {
+          endRes++;
+        }
+      }
+
+      if (endRes > 0)
+      {
+        endRes += seq.getStart() - 1;
+      }
+
+      copiedSequences.append(seq.getName() + "\t" +
+                             startRes + "\t" +
+                             endRes + "\t" +
+                             seq.getSequenceAsString(sg.getStartRes(),
+          sg.getEndRes() + 1) + "\n");
+    }
+
+  }
+
+  protected void pasteNew_actionPerformed()
+  {
+    paste(true);
+  }
+
+  protected void pasteThis_actionPerformed()
+  {
+    paste(false);
+  }
+
+  void paste(boolean newAlignment)
+  {
+    try
+    {
+
+      if (copiedSequences == null)
+      {
+        return;
+      }
+
+      StringTokenizer st = new StringTokenizer(copiedSequences.toString());
+      Vector seqs = new Vector();
+      while (st.hasMoreElements())
+      {
+        String name = st.nextToken();
+        int start = Integer.parseInt(st.nextToken());
+        int end = Integer.parseInt(st.nextToken());
+        seqs.addElement(new Sequence(name, st.nextToken(), start, end));
+      }
+      SequenceI[] newSeqs = new SequenceI[seqs.size()];
+      for (int i = 0; i < seqs.size(); i++)
+      {
+        newSeqs[i] = (SequenceI) seqs.elementAt(i);
+      }
+
+      if (newAlignment)
+      {
+        String newtitle = new String("Copied sequences");
+        if (getTitle().startsWith("Copied sequences"))
+        {
+          newtitle = getTitle();
+        }
+        else
+        {
+          newtitle = newtitle.concat("- from " + getTitle());
+        }
+        AlignFrame af = new AlignFrame(new Alignment(newSeqs),
+                                       viewport.applet,
+                                       newtitle,
+                                       false);
+        if (copiedHiddenColumns != null)
+        {
+          for (int i = 0; i < copiedHiddenColumns.size(); i++)
+          {
+            int[] region = (int[]) copiedHiddenColumns.elementAt(i);
+            af.viewport.hideColumns(region[0], region[1]);
+          }
+        }
+
+        jalview.bin.JalviewLite.addFrame(af, newtitle, DEFAULT_WIDTH,
+                                         DEFAULT_HEIGHT);
+      }
+      else
+      {
+        addSequences(newSeqs);
+      }
+
+    }
+    catch (Exception ex)
+    {} // could be anything being pasted in here
+
+  }
+
+  void addSequences(SequenceI[] seqs)
+  {
+    for (int i = 0; i < seqs.length; i++)
+    {
+      viewport.alignment.addSequence(seqs[i]);
+    }
+
+    //!newAlignment
+    addHistoryItem(new EditCommand(
+        "Add sequences",
+        EditCommand.PASTE,
+        seqs,
+        0,
+        viewport.alignment.getWidth(),
+        viewport.alignment)
+        );
+
+    viewport.setEndSeq(viewport.alignment.getHeight());
+    viewport.alignment.getWidth();
+    viewport.firePropertyChange("alignment", null,
+                                viewport.alignment.getSequences());
+
+  }
+
+  protected void cut_actionPerformed()
+  {
+    copy_actionPerformed();
+    delete_actionPerformed();
+  }
+
+  protected void delete_actionPerformed()
+  {
+
+    SequenceGroup sg = viewport.getSelectionGroup();
+    if (sg == null)
+    {
+      return;
+    }
+
+    Vector seqs = new Vector();
+    SequenceI seq;
+    for (int i = 0; i < sg.getSize(); i++)
+    {
+      seq = sg.getSequenceAt(i);
+      seqs.addElement(seq);
+    }
+
+    // If the cut affects all sequences, remove highlighted columns
+    if (sg.getSize() == viewport.alignment.getHeight())
+    {
+      viewport.getColumnSelection().removeElements(sg.getStartRes(),
+          sg.getEndRes() + 1);
+    }
+
+    SequenceI[] cut = new SequenceI[seqs.size()];
+    for (int i = 0; i < seqs.size(); i++)
+    {
+      cut[i] = (SequenceI) seqs.elementAt(i);
+    }
+
+    /*
+         //ADD HISTORY ITEM
+     */
+    addHistoryItem(new EditCommand("Cut Sequences",
+                                   EditCommand.CUT,
+                                   cut,
+                                   sg.getStartRes(),
+                                   sg.getEndRes() - sg.getStartRes() + 1,
+                                   viewport.alignment));
+
+    viewport.setSelectionGroup(null);
+    viewport.alignment.deleteGroup(sg);
+
+    viewport.firePropertyChange("alignment", null,
+                                viewport.getAlignment().getSequences());
+
+    if (viewport.getAlignment().getHeight() < 1)
+    {
+      this.setVisible(false);
+    }
+  }
+
+  protected void deleteGroups_actionPerformed()
+  {
+    viewport.alignment.deleteAllGroups();
+    viewport.sequenceColours = null;
+    viewport.setSelectionGroup(null);
+
+    alignPanel.paintAlignment(true);
+  }
+
+  public void selectAllSequenceMenuItem_actionPerformed()
+  {
+    SequenceGroup sg = new SequenceGroup();
+    for (int i = 0; i < viewport.getAlignment().getSequences().size(); i++)
+    {
+      sg.addSequence(viewport.getAlignment().getSequenceAt(i), false);
+    }
+    sg.setEndRes(viewport.alignment.getWidth() - 1);
+    viewport.setSelectionGroup(sg);
+    alignPanel.paintAlignment(true);
+    PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());
+  }
+
+  public void deselectAllSequenceMenuItem_actionPerformed()
+  {
+    if (viewport.cursorMode)
+    {
+      alignPanel.seqPanel.keyboardNo1 = null;
+      alignPanel.seqPanel.keyboardNo2 = null;
+    }
+    viewport.setSelectionGroup(null);
+    viewport.getColumnSelection().clear();
+    viewport.setSelectionGroup(null);
+    alignPanel.idPanel.idCanvas.searchResults = null;
+    alignPanel.seqPanel.seqCanvas.highlightSearchResults(null);
+    alignPanel.paintAlignment(true);
+    PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());
+  }
+
+  public void invertSequenceMenuItem_actionPerformed()
+  {
+    SequenceGroup sg = viewport.getSelectionGroup();
+    for (int i = 0; i < viewport.getAlignment().getSequences().size(); i++)
+    {
+      sg.addOrRemove(viewport.getAlignment().getSequenceAt(i), false);
+    }
+
+    PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());
+  }
+
+  void trimAlignment(boolean trimLeft)
+  {
+    ColumnSelection colSel = viewport.getColumnSelection();
+    int column;
+
+    if (colSel.size() > 0)
+    {
+      if (trimLeft)
+      {
+        column = colSel.getMin();
+      }
+      else
+      {
+        column = colSel.getMax();
+      }
+
+      SequenceI[] seqs;
+      if (viewport.getSelectionGroup() != null)
+      {
+        seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.
+            hiddenRepSequences);
+      }
+      else
+      {
+        seqs = viewport.alignment.getSequencesArray();
+      }
+
+      TrimRegionCommand trimRegion;
+      if (trimLeft)
+      {
+        trimRegion = new TrimRegionCommand("Remove Left",
+                                           TrimRegionCommand.TRIM_LEFT,
+                                           seqs,
+                                           column,
+                                           viewport.alignment,
+                                           viewport.colSel,
+                                           viewport.selectionGroup);
+        viewport.setStartRes(0);
+      }
+      else
+      {
+        trimRegion = new TrimRegionCommand("Remove Right",
+                                           TrimRegionCommand.TRIM_RIGHT,
+                                           seqs,
+                                           column,
+                                           viewport.alignment,
+                                           viewport.colSel,
+                                           viewport.selectionGroup);
+      }
+
+      statusBar.setText("Removed " + trimRegion.getSize() + " columns.");
+
+      addHistoryItem(trimRegion);
+
+      Vector groups = viewport.alignment.getGroups();
+
+      for (int i = 0; i < groups.size(); i++)
+      {
+        SequenceGroup sg = (SequenceGroup) groups.elementAt(i);
+
+        if ( (trimLeft && !sg.adjustForRemoveLeft(column))
+            || (!trimLeft && !sg.adjustForRemoveRight(column)))
+        {
+          viewport.alignment.deleteGroup(sg);
+        }
+      }
+
+      viewport.firePropertyChange("alignment", null,
+                                  viewport.getAlignment().getSequences());
+    }
+  }
+
+  public void removeGappedColumnMenuItem_actionPerformed()
+  {
+    int start = 0, end = viewport.alignment.getWidth() - 1;
+
+    SequenceI[] seqs;
+    if (viewport.getSelectionGroup() != null)
+    {
+      seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.
+          hiddenRepSequences);
+      start = viewport.getSelectionGroup().getStartRes();
+      end = viewport.getSelectionGroup().getEndRes();
+    }
+    else
+    {
+      seqs = viewport.alignment.getSequencesArray();
+    }
+
+    RemoveGapColCommand removeGapCols =
+        new RemoveGapColCommand("Remove Gapped Columns",
+                                seqs,
+                                start, end,
+                                viewport.alignment);
+
+    addHistoryItem(removeGapCols);
+
+    statusBar.setText("Removed " + removeGapCols.getSize() + " empty columns.");
+
+    //This is to maintain viewport position on first residue
+    //of first sequence
+    SequenceI seq = viewport.alignment.getSequenceAt(0);
+    int startRes = seq.findPosition(viewport.startRes);
+    // ShiftList shifts;
+    // viewport.getAlignment().removeGaps(shifts=new ShiftList());
+    // edit.alColumnChanges=shifts.getInverse();
+    // if (viewport.hasHiddenColumns)
+    //   viewport.getColumnSelection().compensateForEdits(shifts);
+    viewport.setStartRes(seq.findIndex(startRes) - 1);
+    viewport.firePropertyChange("alignment", null,
+                                viewport.getAlignment().getSequences());
+
+  }
+
+  public void removeAllGapsMenuItem_actionPerformed()
+  {
+    int start = 0, end = viewport.alignment.getWidth() - 1;
+
+    SequenceI[] seqs;
+    if (viewport.getSelectionGroup() != null)
+    {
+      seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.
+          hiddenRepSequences);
+      start = viewport.getSelectionGroup().getStartRes();
+      end = viewport.getSelectionGroup().getEndRes();
+    }
+    else
+    {
+      seqs = viewport.alignment.getSequencesArray();
+    }
+
+    //This is to maintain viewport position on first residue
+    //of first sequence
+    SequenceI seq = viewport.alignment.getSequenceAt(0);
+    int startRes = seq.findPosition(viewport.startRes);
+
+    addHistoryItem(new RemoveGapsCommand("Remove Gaps",
+                                         seqs,
+                                         start, end,
+                                         viewport.alignment));
+
+    viewport.setStartRes(seq.findIndex(startRes) - 1);
+
+    viewport.firePropertyChange("alignment", null,
+                                viewport.getAlignment().getSequences());
+
+  }
+
+  public void findMenuItem_actionPerformed()
+  {
+    new Finder(alignPanel);
+  }
+
+  public void newView()
+  {
+    AlignmentI newal;
+    if (viewport.hasHiddenRows)
+    {
+      newal = new Alignment(viewport.getAlignment().
+                            getHiddenSequences()
+                            .getFullAlignment().
+                            getSequencesArray());
+    }
+    else
+    {
+      newal = new Alignment(viewport.alignment.getSequencesArray());
+    }
+
+    if (viewport.alignment.getAlignmentAnnotation() != null)
+    {
+      for (int i = 0; i < viewport.alignment.getAlignmentAnnotation().length; i++)
+      {
+        if (!viewport.alignment.getAlignmentAnnotation()[i].autoCalculated)
+        {
+          newal.addAnnotation(viewport.alignment.getAlignmentAnnotation()[i]);
+        }
+      }
+    }
+
+    AlignFrame newaf = new AlignFrame(newal,
+                                      viewport.applet,
+                                      "",
+                                      false);
+
+    newaf.viewport.sequenceSetID = alignPanel.av.getSequenceSetId();
+    PaintRefresher.Register(alignPanel, alignPanel.av.getSequenceSetId());
+    PaintRefresher.Register(newaf.alignPanel,
+                            newaf.alignPanel.av.getSequenceSetId());
+
+    PaintRefresher.Register(newaf.alignPanel.idPanel.idCanvas,
+                            newaf.alignPanel.av.getSequenceSetId());
+    PaintRefresher.Register(newaf.alignPanel.seqPanel.seqCanvas,
+                            newaf.alignPanel.av.getSequenceSetId());
+
+    Vector comps = (Vector) PaintRefresher.components.get(viewport.
+        getSequenceSetId());
+    int viewSize = -1;
+    for (int i = 0; i < comps.size(); i++)
+    {
+      if (comps.elementAt(i) instanceof AlignmentPanel)
+      {
+        viewSize++;
+      }
+    }
+
+    String title = new String(this.getTitle());
+    if (title.indexOf("(View") > -1)
+    {
+      title = title.substring(0, title.indexOf("(View"));
+    }
+
+    title += "(View " + viewSize + ")";
+
+    newaf.setTitle(title.toString());
+
+    newaf.viewport.historyList = viewport.historyList;
+    newaf.viewport.redoList = viewport.redoList;
+
+  }
+
+  public void seqLimits_itemStateChanged()
+  {
+    viewport.setShowJVSuffix(seqLimits.getState());
+    alignPanel.fontChanged();
+    alignPanel.paintAlignment(true);
+  }
+
+  protected void colourTextMenuItem_actionPerformed()
+  {
+    viewport.setColourText(colourTextMenuItem.getState());
+    alignPanel.paintAlignment(true);
+  }
+
+  protected void wrapMenuItem_actionPerformed()
+  {
+    viewport.setWrapAlignment(wrapMenuItem.getState());
+    alignPanel.setWrapAlignment(wrapMenuItem.getState());
+    scaleAbove.setEnabled(wrapMenuItem.getState());
+    scaleLeft.setEnabled(wrapMenuItem.getState());
+    scaleRight.setEnabled(wrapMenuItem.getState());
+    alignPanel.paintAlignment(true);
+  }
+
+  public void overviewMenuItem_actionPerformed()
+  {
+    if (alignPanel.overviewPanel != null)
+    {
+      return;
+    }
+
+    Frame frame = new Frame();
+    OverviewPanel overview = new OverviewPanel(alignPanel);
+    frame.add(overview);
+    // +50 must allow for applet frame window
+    jalview.bin.JalviewLite.addFrame(frame, "Overview " + this.getTitle(),
+                                     overview.getPreferredSize().width,
+                                     overview.getPreferredSize().height + 50);
+
+    frame.pack();
+    frame.addWindowListener(new WindowAdapter()
+    {
+      public void windowClosing(WindowEvent e)
+      {
+        alignPanel.setOverviewPanel(null);
+      };
+    });
+
+    alignPanel.setOverviewPanel(overview);
+
+  }
+
+  void changeColour(ColourSchemeI cs)
+  {
+    int threshold = 0;
+
+    if (cs != null)
+    {
+      if (viewport.getAbovePIDThreshold())
+      {
+        threshold = SliderPanel.setPIDSliderSource(alignPanel, cs, "Background");
+
+        cs.setThreshold(threshold, viewport.getIgnoreGapsConsensus());
+
+        viewport.setGlobalColourScheme(cs);
+      }
+      else
+      {
+        cs.setThreshold(0, viewport.getIgnoreGapsConsensus());
+      }
+
+      if (viewport.getConservationSelected())
+      {
+
+        Alignment al = (Alignment) viewport.alignment;
+        Conservation c = new Conservation("All",
+                                          ResidueProperties.propHash, 3,
+                                          al.getSequences(), 0,
+                                          al.getWidth() - 1);
+
+        c.calculate();
+        c.verdict(false, viewport.ConsPercGaps);
+
+        cs.setConservation(c);
+
+        cs.setConservationInc(SliderPanel.setConservationSlider(alignPanel, cs,
+            "Background"));
+
+      }
+      else
+      {
+        cs.setConservation(null);
+      }
+
+      cs.setConsensus(viewport.hconsensus);
+
+    }
+    viewport.setGlobalColourScheme(cs);
+
+    if (viewport.getColourAppliesToAllGroups())
+    {
+      Vector groups = viewport.alignment.getGroups();
+      for (int i = 0; i < groups.size(); i++)
+      {
+        SequenceGroup sg = (SequenceGroup) groups.elementAt(i);
+
+        if (cs == null)
+        {
+          sg.cs = null;
+          continue;
+        }
+        if (cs instanceof ClustalxColourScheme)
+        {
+          sg.cs = new ClustalxColourScheme(
+              sg.getSequences(viewport.hiddenRepSequences),
+              sg.getWidth());
+        }
+        else
+        {
+          try
+          {
+            sg.cs = (ColourSchemeI) cs.getClass().newInstance();
+          }
+          catch (Exception ex)
+          {
+            ex.printStackTrace();
+            sg.cs = cs;
+          }
+        }
+
+        if (viewport.getAbovePIDThreshold()
+            || cs instanceof PIDColourScheme
+            || cs instanceof Blosum62ColourScheme)
+        {
+          sg.cs.setThreshold(threshold, viewport.getIgnoreGapsConsensus());
+          sg.cs.setConsensus(AAFrequency.calculate(
+              sg.getSequences(viewport.hiddenRepSequences), 0, sg.getWidth()));
+        }
+        else
+        {
+          sg.cs.setThreshold(0, viewport.getIgnoreGapsConsensus());
+        }
+
+        if (viewport.getConservationSelected())
+        {
+          Conservation c = new Conservation("Group",
+                                            ResidueProperties.propHash, 3,
+                                            sg.getSequences(viewport.
+              hiddenRepSequences), 0,
+                                            viewport.alignment.getWidth() - 1);
+          c.calculate();
+          c.verdict(false, viewport.ConsPercGaps);
+          sg.cs.setConservation(c);
+        }
+        else
+        {
+          sg.cs.setConservation(null);
+          sg.cs.setThreshold(0, viewport.getIgnoreGapsConsensus());
+        }
+
+      }
+    }
+
+    if (alignPanel.getOverviewPanel() != null)
+    {
+      alignPanel.getOverviewPanel().updateOverviewImage();
+    }
+
+    jalview.structure.StructureSelectionManager.getStructureSelectionManager()
+        .sequenceColoursChanged(alignPanel);
+
+    alignPanel.paintAlignment(true);
+  }
+
+  protected void modifyPID_actionPerformed()
+  {
+    if (viewport.getAbovePIDThreshold() && viewport.globalColourScheme != null)
+    {
+      SliderPanel.setPIDSliderSource(alignPanel, viewport.getGlobalColourScheme(),
+                                     "Background");
+      SliderPanel.showPIDSlider();
+    }
+  }
+
+  protected void modifyConservation_actionPerformed()
+  {
+    if (viewport.getConservationSelected() && viewport.globalColourScheme != null)
+    {
+      SliderPanel.setConservationSlider(alignPanel, viewport.globalColourScheme,
+                                        "Background");
+      SliderPanel.showConservationSlider();
+    }
+  }
+
+  protected void conservationMenuItem_actionPerformed()
+  {
+    viewport.setConservationSelected(conservationMenuItem.getState());
+
+    viewport.setAbovePIDThreshold(false);
+    abovePIDThreshold.setState(false);
+
+    changeColour(viewport.getGlobalColourScheme());
+
+    modifyConservation_actionPerformed();
+  }
+
+  public void abovePIDThreshold_actionPerformed()
+  {
+    viewport.setAbovePIDThreshold(abovePIDThreshold.getState());
+
+    conservationMenuItem.setState(false);
+    viewport.setConservationSelected(false);
+
+    changeColour(viewport.getGlobalColourScheme());
+
+    modifyPID_actionPerformed();
+  }
+
+  public void sortPairwiseMenuItem_actionPerformed()
+  {
+    SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray();
+    AlignmentSorter.sortByPID(viewport.getAlignment(),
+                              viewport.getAlignment().getSequenceAt(0));
+    addHistoryItem(new OrderCommand("Pairwise Sort", oldOrder,
+                                    viewport.alignment));
+    alignPanel.paintAlignment(true);
+  }
+
+  public void sortIDMenuItem_actionPerformed()
+  {
+    //  addHistoryItem(new HistoryItem("ID Sort", viewport.alignment,
+    //                                HistoryItem.SORT));
+    AlignmentSorter.sortByID(viewport.getAlignment());
+    alignPanel.paintAlignment(true);
+  }
+
+  public void sortGroupMenuItem_actionPerformed()
+  {
+    //  addHistoryItem(new HistoryItem("Group Sort", viewport.alignment,
+    //                                 HistoryItem.SORT));
+    AlignmentSorter.sortByGroup(viewport.getAlignment());
+    alignPanel.paintAlignment(true);
+
+  }
+
+  public void removeRedundancyMenuItem_actionPerformed()
+  {
+    new RedundancyPanel(alignPanel);
+  }
+
+  public void pairwiseAlignmentMenuItem_actionPerformed()
+  {
+    if (viewport.getSelectionGroup() != null
+        && viewport.getSelectionGroup().getSize() > 1)
+    {
+      Frame frame = new Frame();
+      frame.add(new PairwiseAlignPanel(alignPanel));
+      jalview.bin.JalviewLite.addFrame(frame, "Pairwise Alignment", 600, 500);
+    }
+  }
+
+  public void PCAMenuItem_actionPerformed()
+  {
+    //are the sequences aligned?
+    if (!viewport.alignment.isAligned())
+    {
+      SequenceI current;
+      int Width = viewport.getAlignment().getWidth();
+
+      for (int i = 0; i < viewport.getAlignment().getSequences().size();
+           i++)
+      {
+        current = viewport.getAlignment().getSequenceAt(i);
+
+        if (current.getLength() < Width)
+        {
+          current.insertCharAt(Width - 1, viewport.getGapCharacter());
+        }
+      }
+      alignPanel.paintAlignment(true);
+    }
+
+    if ( (viewport.getSelectionGroup() != null &&
+          viewport.getSelectionGroup().getSize() < 4 &&
+          viewport.getSelectionGroup().getSize() > 0)
+        || viewport.getAlignment().getHeight() < 4)
+    {
+      return;
+    }
+
+    try
+    {
+      new PCAPanel(viewport);
+    }
+    catch (java.lang.OutOfMemoryError ex)
+    {
+    }
+
+  }
+
+  public void averageDistanceTreeMenuItem_actionPerformed()
+  {
+    NewTreePanel("AV", "PID", "Average distance tree using PID");
+  }
+
+  public void neighbourTreeMenuItem_actionPerformed()
+  {
+    NewTreePanel("NJ", "PID", "Neighbour joining tree using PID");
+  }
+
+  protected void njTreeBlosumMenuItem_actionPerformed()
+  {
+    NewTreePanel("NJ", "BL", "Neighbour joining tree using BLOSUM62");
+  }
+
+  protected void avTreeBlosumMenuItem_actionPerformed()
+  {
+    NewTreePanel("AV", "BL", "Average distance tree using BLOSUM62");
+  }
+
+  void NewTreePanel(String type, String pwType, String title)
+  {
+    //are the sequences aligned?
+    if (!viewport.alignment.isAligned())
+    {
+      SequenceI current;
+      int Width = viewport.getAlignment().getWidth();
+
+      for (int i = 0; i < viewport.getAlignment().getSequences().size();
+           i++)
+      {
+        current = viewport.getAlignment().getSequenceAt(i);
+
+        if (current.getLength() < Width)
+        {
+          current.insertCharAt(Width - 1, viewport.getGapCharacter());
+        }
+      }
+      alignPanel.paintAlignment(true);
+
+    }
+
+    if ( (viewport.getSelectionGroup() != null &&
+          viewport.getSelectionGroup().getSize() > 1)
+        || (viewport.getSelectionGroup() == null
+            && viewport.alignment.getHeight() > 1))
+    {
+      final TreePanel tp = new TreePanel(viewport,
+                                         type,
+                                         pwType);
+
+      addTreeMenuItem(tp, title);
+
+      jalview.bin.JalviewLite.addFrame(tp, title, 600, 500);
+    }
+  }
+
+  void loadTree_actionPerformed()
+  {
+    CutAndPasteTransfer cap = new CutAndPasteTransfer(true, this);
+    cap.setText("Paste your Newick tree file here.");
+    cap.setTreeImport();
+    Frame frame = new Frame();
+    frame.add(cap);
+    jalview.bin.JalviewLite.addFrame(frame, "Paste Newick file ", 400, 300);
+  }
+
+  public void loadTree(jalview.io.NewickFile tree, String treeFile)
+  {
+    TreePanel tp = new TreePanel(viewport,
+                                 treeFile,
+                                 "From File - ",
+                                 tree);
+    jalview.bin.JalviewLite.addFrame(tp, treeFile, 600, 500);
+    addTreeMenuItem(tp, treeFile);
+  }
+
+  void addTreeMenuItem(final TreePanel treePanel, String title)
+  {
+    final MenuItem item = new MenuItem(title);
+    sortByTreeMenu.add(item);
+    item.addActionListener(new java.awt.event.ActionListener()
+    {
+      public void actionPerformed(ActionEvent evt)
+      {
+        //  addHistoryItem(new HistoryItem("Sort", viewport.alignment,
+        //                                 HistoryItem.SORT));
+        AlignmentSorter.sortByTree(viewport.getAlignment(), treePanel.getTree());
+        alignPanel.paintAlignment(true);
+      }
+    });
+
+    treePanel.addWindowListener(new WindowAdapter()
+    {
+      public void windowClosing(WindowEvent e)
+      {
+        sortByTreeMenu.remove(item);
+      };
+    });
+  }
+
+  protected void documentation_actionPerformed()
+  {
+    showURL("http://www.jalview.org/help.html", "HELP");
+  }
+
+  protected void about_actionPerformed()
+  {
+
+    class AboutPanel
+        extends Canvas
+    {
+      String version;
+      public AboutPanel(String version)
+      {
+        this.version = version;
+      }
+
+      public void paint(Graphics g)
+      {
+        g.setColor(Color.white);
+        g.fillRect(0, 0, getSize().width, getSize().height);
+        g.setFont(new Font("Helvetica", Font.PLAIN, 12));
+        FontMetrics fm = g.getFontMetrics();
+        int fh = fm.getHeight();
+        int y = 5, x = 7;
+        g.setColor(Color.black);
+        g.setFont(new Font("Helvetica", Font.BOLD, 14));
+        g.drawString("Jalview - Release " + version, 200, y += fh);
+        g.setFont(new Font("Helvetica", Font.PLAIN, 12));
+        g.drawString("Authors:  Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse, Jim Procter & Geoff Barton.",
+                     x, y += fh * 2);
+        g.drawString("Current development managed by Andrew Waterhouse; Barton Group, University of Dundee.",
+                     x, y += fh);
+        g.drawString(
+            "For any issues relating to Jalview, email help@jalview.org", x,
+            y += fh);
+        g.drawString("If  you use JalView, please cite:", x, y += fh + 8);
+        g.drawString("\"Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004), The Jalview Java Alignment Editor\"",
+                     x, y += fh);
+        g.drawString("Bioinformatics,  2004 20;426-7.", x, y += fh);
+      }
+    }
+
+    String version = "test";
+    java.net.URL url = getClass().getResource("/.build_properties");
+    if (url != null)
+    {
+      try
+      {
+        BufferedReader reader = new BufferedReader(new InputStreamReader(
+            url.openStream()));
+        String line;
+        while ( (line = reader.readLine()) != null)
+        {
+          if (line.indexOf("VERSION") > -1)
+          {
+            version = line.substring(line.indexOf("=") + 1);
+          }
+        }
+      }
+      catch (Exception ex)
+      {
+        ex.printStackTrace();
+      }
+    }
+
+    Frame frame = new Frame();
+    frame.add(new AboutPanel(version));
+    jalview.bin.JalviewLite.addFrame(frame, "Jalview", 580, 200);
+
+  }
+
+  public void showURL(String url, String target)
+  {
+    if (viewport.applet == null)
+    {
+      System.out.println("Not running as applet - no browser available.");
+    }
+    else
+    {
+      try
+      {
+        System.out.println("Show url: " + url);
+        viewport.applet.getAppletContext().showDocument(new java.net.URL(url),
+            target);
+      }
+      catch (Exception ex)
+      {
+        ex.printStackTrace();
+      }
+    }
+  }
+
+  //////////////////////////////////////////////////////////////////////////////////
+  //JBuilder Graphics here
+
+   MenuBar alignFrameMenuBar = new MenuBar();
+   Menu fileMenu = new Menu("File");
+   MenuItem loadApplication = new MenuItem("View in Full Application");
+   MenuItem loadTree = new MenuItem("Load Associated Tree ...");
+   MenuItem loadAnnotations = new MenuItem(
+      "Load Features/Annotations ...");
+   MenuItem outputFeatures = new MenuItem("Export Features ...");
+   MenuItem outputAnnotations = new MenuItem("Export Annotations ...");
+
+   MenuItem closeMenuItem = new MenuItem("Close");
+   Menu editMenu = new Menu("Edit");
+   Menu viewMenu = new Menu("View");
+   Menu colourMenu = new Menu("Colour");
+   Menu calculateMenu = new Menu("Calculate");
+   MenuItem selectAllSequenceMenuItem = new MenuItem("Select all");
+   MenuItem deselectAllSequenceMenuItem = new MenuItem("Deselect All");
+   MenuItem invertSequenceMenuItem = new MenuItem("Invert Selection");
+   MenuItem remove2LeftMenuItem = new MenuItem();
+   MenuItem remove2RightMenuItem = new MenuItem();
+   MenuItem removeGappedColumnMenuItem = new MenuItem();
+   MenuItem removeAllGapsMenuItem = new MenuItem();
+   CheckboxMenuItem viewBoxesMenuItem = new CheckboxMenuItem();
+   CheckboxMenuItem viewTextMenuItem = new CheckboxMenuItem();
+   MenuItem sortPairwiseMenuItem = new MenuItem();
+   MenuItem sortIDMenuItem = new MenuItem();
+   MenuItem sortGroupMenuItem = new MenuItem();
+   MenuItem removeRedundancyMenuItem = new MenuItem();
+   MenuItem pairwiseAlignmentMenuItem = new MenuItem();
+   MenuItem PCAMenuItem = new MenuItem();
+   MenuItem averageDistanceTreeMenuItem = new MenuItem();
+   MenuItem neighbourTreeMenuItem = new MenuItem();
+  BorderLayout borderLayout1 = new BorderLayout();
+  public Label statusBar = new Label();
+   Menu outputTextboxMenu = new Menu();
+   MenuItem clustalColour = new MenuItem();
+   MenuItem zappoColour = new MenuItem();
+   MenuItem taylorColour = new MenuItem();
+   MenuItem hydrophobicityColour = new MenuItem();
+   MenuItem helixColour = new MenuItem();
+   MenuItem strandColour = new MenuItem();
+   MenuItem turnColour = new MenuItem();
+   MenuItem buriedColour = new MenuItem();
+   MenuItem userDefinedColour = new MenuItem();
+   MenuItem PIDColour = new MenuItem();
+   MenuItem BLOSUM62Colour = new MenuItem();
+  MenuItem njTreeBlosumMenuItem = new MenuItem();
+  MenuItem avDistanceTreeBlosumMenuItem = new MenuItem();
+   CheckboxMenuItem annotationPanelMenuItem = new CheckboxMenuItem();
+   CheckboxMenuItem colourTextMenuItem = new CheckboxMenuItem();
+   MenuItem alProperties = new MenuItem("Alignment Properties...");
+  MenuItem overviewMenuItem = new MenuItem();
+   MenuItem undoMenuItem = new MenuItem();
+   MenuItem redoMenuItem = new MenuItem();
+   CheckboxMenuItem conservationMenuItem = new CheckboxMenuItem();
+  MenuItem noColourmenuItem = new MenuItem();
+   CheckboxMenuItem wrapMenuItem = new CheckboxMenuItem();
+   CheckboxMenuItem renderGapsMenuItem = new CheckboxMenuItem();
+  MenuItem findMenuItem = new MenuItem();
+   CheckboxMenuItem abovePIDThreshold = new CheckboxMenuItem();
+   MenuItem nucleotideColour = new MenuItem();
+  MenuItem deleteGroups = new MenuItem();
+  MenuItem delete = new MenuItem();
+  MenuItem copy = new MenuItem();
+  MenuItem cut = new MenuItem();
+  Menu pasteMenu = new Menu();
+  MenuItem pasteNew = new MenuItem();
+  MenuItem pasteThis = new MenuItem();
+   CheckboxMenuItem applyToAllGroups = new CheckboxMenuItem();
+   MenuItem font = new MenuItem();
+   CheckboxMenuItem scaleAbove = new CheckboxMenuItem();
+   CheckboxMenuItem scaleLeft = new CheckboxMenuItem();
+   CheckboxMenuItem scaleRight = new CheckboxMenuItem();
+  MenuItem modifyPID = new MenuItem();
+  MenuItem modifyConservation = new MenuItem();
+   CheckboxMenuItem autoCalculate
+      = new CheckboxMenuItem("Autocalculate Consensus", true);
+   Menu sortByTreeMenu = new Menu();
+  Menu sort = new Menu();
+  Menu calculate = new Menu();
+  MenuItem inputText = new MenuItem();
+  Menu helpMenu = new Menu();
+  MenuItem documentation = new MenuItem();
+  MenuItem about = new MenuItem();
+   CheckboxMenuItem seqLimits = new CheckboxMenuItem();
+  Panel embeddedMenu;
+  Label embeddedEdit;
+  Label embeddedSelect;
+  Label embeddedView;
+  Label embeddedFormat;
+  Label embeddedColour;
+  Label embeddedFile;
+  Label embeddedHelp;
+  Label embeddedCalculate;
+  FlowLayout flowLayout1;
+
+  private void jbInit()
+      throws Exception
+  {
+
+    setMenuBar(alignFrameMenuBar);
+
+    MenuItem item;
+
+    // dynamically fill save as menu with available formats
+    for (int i = 0; i < jalview.io.AppletFormatAdapter.WRITEABLE_FORMATS.length;
+         i++)
+    {
+
+      item = new MenuItem(jalview.io.AppletFormatAdapter.WRITEABLE_FORMATS[i]);
+
+      item.addActionListener(new java.awt.event.ActionListener()
+      {
+        public void actionPerformed(ActionEvent e)
+        {
+          outputText_actionPerformed(e);
+        }
+      });
+
+      outputTextboxMenu.add(item);
+    }
+    closeMenuItem.addActionListener(this);
+    loadApplication.addActionListener(this);
+
+    loadTree.addActionListener(this);
+    loadAnnotations.addActionListener(this);
+    outputFeatures.addActionListener(this);
+    outputAnnotations.addActionListener(this);
+    selectAllSequenceMenuItem.addActionListener(this);
+    deselectAllSequenceMenuItem.addActionListener(this);
+    invertSequenceMenuItem.addActionListener(this);
+    remove2LeftMenuItem.setLabel("Remove Left");
+    remove2LeftMenuItem.addActionListener(this);
+    remove2RightMenuItem.setLabel("Remove Right");
+    remove2RightMenuItem.addActionListener(this);
+    removeGappedColumnMenuItem.setLabel("Remove Empty Columns");
+    removeGappedColumnMenuItem.addActionListener(this);
+    removeAllGapsMenuItem.setLabel("Remove All Gaps");
+    removeAllGapsMenuItem.addActionListener(this);
+    viewBoxesMenuItem.setLabel("Boxes");
+    viewBoxesMenuItem.setState(true);
+    viewBoxesMenuItem.addItemListener(this);
+    viewTextMenuItem.setLabel("Text");
+    viewTextMenuItem.setState(true);
+    viewTextMenuItem.addItemListener(this);
+    sortPairwiseMenuItem.setLabel("by Pairwise Identity");
+    sortPairwiseMenuItem.addActionListener(this);
+    sortIDMenuItem.setLabel("by ID");
+    sortIDMenuItem.addActionListener(this);
+    sortGroupMenuItem.setLabel("by Group");
+    sortGroupMenuItem.addActionListener(this);
+    removeRedundancyMenuItem.setLabel("Remove Redundancy...");
+    removeRedundancyMenuItem.addActionListener(this);
+    pairwiseAlignmentMenuItem.setLabel("Pairwise Alignments...");
+    pairwiseAlignmentMenuItem.addActionListener(this);
+    PCAMenuItem.setLabel("Principal Component Analysis");
+    PCAMenuItem.addActionListener(this);
+    averageDistanceTreeMenuItem.setLabel(
+        "Average Distance Using % Identity");
+    averageDistanceTreeMenuItem.addActionListener(this);
+    neighbourTreeMenuItem.setLabel("Neighbour Joining Using % Identity");
+    neighbourTreeMenuItem.addActionListener(this);
+    statusBar.setBackground(Color.white);
+    statusBar.setFont(new java.awt.Font("Verdana", 0, 11));
+    statusBar.setText("Status bar");
+    outputTextboxMenu.setLabel("Output to Textbox");
+    clustalColour.setLabel("Clustalx");
+
+    clustalColour.addActionListener(this);
+    zappoColour.setLabel("Zappo");
+    zappoColour.addActionListener(this);
+    taylorColour.setLabel("Taylor");
+    taylorColour.addActionListener(this);
+    hydrophobicityColour.setLabel("Hydrophobicity");
+    hydrophobicityColour.addActionListener(this);
+    helixColour.setLabel("Helix Propensity");
+    helixColour.addActionListener(this);
+    strandColour.setLabel("Strand Propensity");
+    strandColour.addActionListener(this);
+    turnColour.setLabel("Turn Propensity");
+    turnColour.addActionListener(this);
+    buriedColour.setLabel("Buried Index");
+    buriedColour.addActionListener(this);
+    userDefinedColour.setLabel("User Defined...");
+    userDefinedColour.addActionListener(this);
+    PIDColour.setLabel("Percentage Identity");
+    PIDColour.addActionListener(this);
+    BLOSUM62Colour.setLabel("BLOSUM62 Score");
+    BLOSUM62Colour.addActionListener(this);
+    avDistanceTreeBlosumMenuItem.setLabel(
+        "Average Distance Using BLOSUM62");
+    avDistanceTreeBlosumMenuItem.addActionListener(this);
+    njTreeBlosumMenuItem.setLabel("Neighbour Joining Using BLOSUM62");
+    njTreeBlosumMenuItem.addActionListener(this);
+    annotationPanelMenuItem.setLabel("Show Annotations");
+    annotationPanelMenuItem.addItemListener(this);
+    colourTextMenuItem.setLabel("Colour Text");
+    colourTextMenuItem.addItemListener(this);
+    alProperties.addActionListener(this);
+    overviewMenuItem.setLabel("Overview Window");
+    overviewMenuItem.addActionListener(this);
+    undoMenuItem.setEnabled(false);
+    undoMenuItem.setLabel("Undo");
+    undoMenuItem.addActionListener(this);
+    redoMenuItem.setEnabled(false);
+    redoMenuItem.setLabel("Redo");
+    redoMenuItem.addActionListener(this);
+    conservationMenuItem.setLabel("by Conservation");
+    conservationMenuItem.addItemListener(this);
+    noColourmenuItem.setLabel("None");
+    noColourmenuItem.addActionListener(this);
+    wrapMenuItem.setLabel("Wrap");
+    wrapMenuItem.addItemListener(this);
+    renderGapsMenuItem.setLabel("Show Gaps");
+    renderGapsMenuItem.setState(true);
+    renderGapsMenuItem.addItemListener(this);
+    findMenuItem.setLabel("Find...");
+    findMenuItem.addActionListener(this);
+    abovePIDThreshold.setLabel("Above Identity Threshold");
+    abovePIDThreshold.addItemListener(this);
+    nucleotideColour.setLabel("Nucleotide");
+    nucleotideColour.addActionListener(this);
+    deleteGroups.setLabel("Undefine Groups");
+    deleteGroups.addActionListener(this);
+    copy.setLabel("Copy");
+    copy.addActionListener(this);
+    cut.setLabel("Cut");
+    cut.addActionListener(this);
+    delete.setLabel("Delete");
+    delete.addActionListener(this);
+    pasteMenu.setLabel("Paste");
+    pasteNew.setLabel("To New Alignment");
+    pasteNew.addActionListener(this);
+    pasteThis.setLabel("Add To This Alignment");
+    pasteThis.addActionListener(this);
+    applyToAllGroups.setLabel("Apply Colour To All Groups");
+    applyToAllGroups.setState(true);
+    applyToAllGroups.addItemListener(this);
+    font.setLabel("Font...");
+    font.addActionListener(this);
+    scaleAbove.setLabel("Scale Above");
+    scaleAbove.setState(true);
+    scaleAbove.setEnabled(false);
+    scaleAbove.addItemListener(this);
+    scaleLeft.setEnabled(false);
+    scaleLeft.setState(true);
+    scaleLeft.setLabel("Scale Left");
+    scaleLeft.addItemListener(this);
+    scaleRight.setEnabled(false);
+    scaleRight.setState(true);
+    scaleRight.setLabel("Scale Right");
+    scaleRight.addItemListener(this);
+    modifyPID.setLabel("Modify Identity Threshold...");
+    modifyPID.addActionListener(this);
+    modifyConservation.setLabel("Modify Conservation Threshold...");
+    modifyConservation.addActionListener(this);
+    sortByTreeMenu.setLabel("By Tree Order");
+    sort.setLabel("Sort");
+    calculate.setLabel("Calculate Tree");
+    autoCalculate.addItemListener(this);
+    inputText.setLabel("Input from textbox");
+    inputText.addActionListener(this);
+
+    helpMenu.setLabel("Help");
+    documentation.setLabel("Documentation");
+    documentation.addActionListener(this);
+
+    about.setLabel("About...");
+    about.addActionListener(this);
+    seqLimits.setState(true);
+    seqLimits.setLabel("Show Sequence Limits");
+    seqLimits.addItemListener(this);
+    featureSettings.setLabel("Feature Settings...");
+    featureSettings.addActionListener(this);
+    sequenceFeatures.setLabel("Sequence Features");
+    sequenceFeatures.addItemListener(this);
+    sequenceFeatures.setState(false);
+    annotationColour.setLabel("by Annotation...");
+    annotationColour.addActionListener(this);
+    invertSequenceMenuItem.setLabel("Invert Sequence Selection");
+    invertColSel.setLabel("Invert Column Selection");
+    menu1.setLabel("Show");
+    showColumns.setLabel("All Columns ");
+    showSeqs.setLabel("All Sequences");
+    menu2.setLabel("Hide");
+    hideColumns.setLabel("Selected Columns");
+    hideSequences.setLabel("Selected Sequences");
+    invertColSel.addActionListener(this);
+    showColumns.addActionListener(this);
+    showSeqs.addActionListener(this);
+    hideColumns.addActionListener(this);
+    hideSequences.addActionListener(this);
+    formatMenu.setLabel("Format");
+    selectMenu.setLabel("Select");
+    newView.setLabel("New View");
+    newView.addActionListener(this);
+    alignFrameMenuBar.add(fileMenu);
+    alignFrameMenuBar.add(editMenu);
+    alignFrameMenuBar.add(selectMenu);
+    alignFrameMenuBar.add(viewMenu);
+    alignFrameMenuBar.add(formatMenu);
+    alignFrameMenuBar.add(colourMenu);
+    alignFrameMenuBar.add(calculateMenu);
+    alignFrameMenuBar.add(helpMenu);
+
+    fileMenu.add(inputText);
+    fileMenu.add(loadTree);
+    fileMenu.add(loadAnnotations);
+
+    fileMenu.addSeparator();
+    fileMenu.add(outputTextboxMenu);
+    fileMenu.add(outputFeatures);
+    fileMenu.add(outputAnnotations);
+
+    if (jalviewServletURL != null)
+    {
+      fileMenu.add(loadApplication);
+    }
+
+    fileMenu.addSeparator();
+    fileMenu.add(closeMenuItem);
+
+    editMenu.add(undoMenuItem);
+    editMenu.add(redoMenuItem);
+    editMenu.add(cut);
+    editMenu.add(copy);
+    editMenu.add(pasteMenu);
+    editMenu.add(delete);
+    editMenu.addSeparator();
+    editMenu.add(remove2LeftMenuItem);
+    editMenu.add(remove2RightMenuItem);
+    editMenu.add(removeGappedColumnMenuItem);
+    editMenu.add(removeAllGapsMenuItem);
+    editMenu.add(removeRedundancyMenuItem);
+    viewMenu.add(newView);
+    viewMenu.addSeparator();
+    viewMenu.add(menu1);
+    viewMenu.add(menu2);
+    viewMenu.addSeparator();
+    viewMenu.add(annotationPanelMenuItem);
+    viewMenu.addSeparator();
+    viewMenu.add(sequenceFeatures);
+    viewMenu.add(featureSettings);
+    viewMenu.addSeparator();
+    viewMenu.add(alProperties);
+    viewMenu.addSeparator();
+    viewMenu.add(overviewMenuItem);
+    colourMenu.add(applyToAllGroups);
+    colourMenu.addSeparator();
+    colourMenu.add(noColourmenuItem);
+    colourMenu.add(clustalColour);
+    colourMenu.add(BLOSUM62Colour);
+    colourMenu.add(PIDColour);
+    colourMenu.add(zappoColour);
+    colourMenu.add(taylorColour);
+    colourMenu.add(hydrophobicityColour);
+    colourMenu.add(helixColour);
+    colourMenu.add(strandColour);
+    colourMenu.add(turnColour);
+    colourMenu.add(buriedColour);
+    colourMenu.add(nucleotideColour);
+    colourMenu.add(userDefinedColour);
+    colourMenu.addSeparator();
+    colourMenu.add(conservationMenuItem);
+    colourMenu.add(modifyConservation);
+    colourMenu.add(abovePIDThreshold);
+    colourMenu.add(modifyPID);
+    colourMenu.add(annotationColour);
+    calculateMenu.add(sort);
+    calculateMenu.add(calculate);
+    calculateMenu.addSeparator();
+    calculateMenu.add(pairwiseAlignmentMenuItem);
+    calculateMenu.add(PCAMenuItem);
+    calculateMenu.add(autoCalculate);
+    this.add(statusBar, BorderLayout.SOUTH);
+    pasteMenu.add(pasteNew);
+    pasteMenu.add(pasteThis);
+    sort.add(sortIDMenuItem);
+    sort.add(sortByTreeMenu);
+    sort.add(sortGroupMenuItem);
+    sort.add(sortPairwiseMenuItem);
+    calculate.add(averageDistanceTreeMenuItem);
+    calculate.add(neighbourTreeMenuItem);
+    calculate.add(avDistanceTreeBlosumMenuItem);
+    calculate.add(njTreeBlosumMenuItem);
+    helpMenu.add(documentation);
+    helpMenu.add(about);
+    menu1.add(showColumns);
+    menu1.add(showSeqs);
+    menu2.add(hideColumns);
+    menu2.add(hideSequences);
+    formatMenu.add(font);
+    formatMenu.add(seqLimits);
+    formatMenu.add(wrapMenuItem);
+    formatMenu.add(scaleAbove);
+    formatMenu.add(scaleLeft);
+    formatMenu.add(scaleRight);
+    formatMenu.add(viewBoxesMenuItem);
+    formatMenu.add(viewTextMenuItem);
+    formatMenu.add(colourTextMenuItem);
+    formatMenu.add(renderGapsMenuItem);
+    selectMenu.add(findMenuItem);
+    selectMenu.addSeparator();
+    selectMenu.add(selectAllSequenceMenuItem);
+    selectMenu.add(deselectAllSequenceMenuItem);
+    selectMenu.add(invertSequenceMenuItem);
+    selectMenu.add(invertColSel);
+    selectMenu.add(deleteGroups);
+  }
+
+  public void setEmbedded()
+  {
+
+    embeddedMenu = new Panel();
+    embeddedEdit = new Label("Edit");
+    embeddedSelect = new Label("Select");
+    embeddedView = new Label("View");
+    embeddedFormat = new Label("Format");
+    embeddedColour = new Label("Colour");
+    embeddedFile = new Label("File");
+    embeddedHelp = new Label("Help");
+    embeddedCalculate = new Label("Calculate");
+    flowLayout1 = new FlowLayout();
+    embeddedMenu.setBackground(Color.lightGray);
+    embeddedMenu.setLayout(flowLayout1);
+    embeddedEdit.setFont(new java.awt.Font("Arial", Font.PLAIN, 10));
+    embeddedSelect.setFont(new java.awt.Font("Arial", Font.PLAIN, 10));
+    embeddedView.setFont(new java.awt.Font("Arial", Font.PLAIN, 10));
+    embeddedFormat.setFont(new java.awt.Font("Arial", Font.PLAIN, 10));
+    embeddedColour.setFont(new java.awt.Font("Arial", Font.PLAIN, 10));
+    embeddedFile.setFont(new java.awt.Font("Arial", Font.PLAIN, 10));
+    embeddedHelp.setFont(new java.awt.Font("Arial", Font.PLAIN, 10));
+    embeddedCalculate.setFont(new java.awt.Font("Arial", Font.PLAIN, 10));
+    embeddedMenu.add(embeddedFile);
+    embeddedMenu.add(embeddedEdit);
+    embeddedMenu.add(embeddedSelect);
+    embeddedMenu.add(embeddedView);
+    embeddedMenu.add(embeddedFormat);
+    embeddedMenu.add(embeddedColour);
+    embeddedMenu.add(embeddedCalculate);
+    embeddedMenu.add(embeddedHelp);
+    flowLayout1.setAlignment(FlowLayout.LEFT);
+    flowLayout1.setHgap(2);
+    flowLayout1.setVgap(0);
+    embeddedFile.addMouseListener(this);
+    embeddedEdit.addMouseListener(this);
+    embeddedSelect.addMouseListener(this);
+    embeddedView.addMouseListener(this);
+    embeddedFormat.addMouseListener(this);
+    embeddedColour.addMouseListener(this);
+    embeddedCalculate.addMouseListener(this);
+    embeddedHelp.addMouseListener(this);
+
+    fileMenu.remove(closeMenuItem);
+    fileMenu.remove(3); // Seperator
+
+    viewport.applet.setLayout(new BorderLayout());
+    viewport.applet.add(embeddedMenu, BorderLayout.NORTH);
+    viewport.applet.add(statusBar, BorderLayout.SOUTH);
+
+    alignPanel.setSize(viewport.applet.getSize().width,
+                       viewport.applet.getSize().height
+                       - embeddedMenu.HEIGHT - statusBar.HEIGHT);
+
+    viewport.applet.add(alignPanel, BorderLayout.CENTER);
+    viewport.applet.validate();
+
+  }
+
+  PopupMenu filePopup, editPopup, searchPopup,
+  viewPopup, formatPopup, colourPopup, calculatePopup, helpPopup;
+  MenuItem featureSettings = new MenuItem();
+  CheckboxMenuItem sequenceFeatures = new CheckboxMenuItem();
+  MenuItem annotationColour = new MenuItem();
+  MenuItem invertColSel = new MenuItem();
+  Menu menu1 = new Menu();
+  MenuItem showColumns = new MenuItem();
+  MenuItem showSeqs = new MenuItem();
+  Menu menu2 = new Menu();
+  MenuItem hideColumns = new MenuItem();
+  MenuItem hideSequences = new MenuItem();
+  Menu formatMenu = new Menu();
+  Menu selectMenu = new Menu();
+  MenuItem newView = new MenuItem();
+
+  public void mousePressed(MouseEvent evt)
+  {
+    PopupMenu popup = null;
+    Label source = (Label) evt.getSource();
+    if (source == embeddedFile)
+    {
+      popup = filePopup = genPopupMenu(filePopup, fileMenu);
+    }
+    else if (source == embeddedEdit)
+    {
+      popup = editPopup = genPopupMenu(editPopup, editMenu);
+    }
+    else if (source == embeddedSelect)
+    {
+      popup = searchPopup = genPopupMenu(searchPopup, selectMenu);
+    }
+    else if (source == embeddedView)
+    {
+      popup = viewPopup = genPopupMenu(viewPopup, viewMenu);
+    }
+    else if (source == embeddedFormat)
+    {
+      popup = formatPopup = genPopupMenu(formatPopup, formatMenu);
+    }
+    else if (source == embeddedColour)
+    {
+      popup = colourPopup = genPopupMenu(colourPopup, colourMenu);
+    }
+    else if (source == embeddedCalculate)
+    {
+      popup = calculatePopup = genPopupMenu(calculatePopup, calculateMenu);
+    }
+    else if (source == embeddedHelp)
+    {
+      popup = helpPopup = genPopupMenu(helpPopup, helpMenu);
+    }
+
+    embeddedMenu.add(popup);
+    popup.show(embeddedMenu,
+               source.getBounds().x,
+               source.getBounds().y + source.getBounds().getSize().height);
+  }
+
+  PopupMenu genPopupMenu(PopupMenu popup, Menu original)
+  {
+    if (popup != null)
+    {
+      return popup;
+    }
+    popup = new PopupMenu();
+    int m, mSize = original.getItemCount();
+    for (m = 0; m < mSize; m++)
+    {
+      popup.add(original.getItem(m));
+      mSize--;
+      m--;
+    }
+
+    return popup;
+  }
+
+  public void mouseClicked(MouseEvent evt)
+  {}
+
+  public void mouseReleased(MouseEvent evt)
+  {}
+
+  public void mouseEntered(MouseEvent evt)
+  {}
+
+  public void mouseExited(MouseEvent evt)
+  {}
+
+}
index 23180ce..9881b64 100755 (executable)
-/*\r
- * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2007 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
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
- */\r
-\r
-package jalview.appletgui;\r
-\r
-import java.util.*;\r
-\r
-import java.awt.*;\r
-import java.awt.event.*;\r
-\r
-import jalview.commands.*;\r
-import jalview.datamodel.*;\r
-\r
-public class RedundancyPanel\r
-    extends SliderPanel implements Runnable, WindowListener\r
-{\r
-  AlignmentPanel ap;\r
-\r
-  Stack historyList = new Stack(); // simpler than synching with alignFrame.\r
-  float[] redundancy;\r
-  SequenceI[] originalSequences;\r
-  Frame frame;\r
-  Vector redundantSeqs;\r
-\r
-  public RedundancyPanel(AlignmentPanel ap)\r
-  {\r
-    super(ap, 0, false, null);\r
-\r
-    redundantSeqs = new Vector();\r
-    this.ap = ap;\r
-    undoButton.setVisible(true);\r
-    applyButton.setVisible(true);\r
-    allGroupsCheck.setVisible(false);\r
-\r
-    label.setText("Enter the redundancy threshold");\r
-    valueField.setText("100");\r
-\r
-    slider.setVisibleAmount(1);\r
-    slider.setMinimum(0);\r
-    slider.setMaximum(100 + slider.getVisibleAmount());\r
-    slider.setValue(100);\r
-\r
-    slider.addAdjustmentListener(new AdjustmentListener()\r
-    {\r
-      public void adjustmentValueChanged(AdjustmentEvent evt)\r
-      {\r
-        valueField.setText(slider.getValue() + "");\r
-        sliderValueChanged();\r
-      }\r
-    });\r
-\r
-    frame = new Frame();\r
-    frame.add(this);\r
-    jalview.bin.JalviewLite.addFrame(frame, "Redundancy threshold selection",\r
-                                     400, 100);\r
-\r
-    frame.addWindowListener(this);\r
-\r
-    Thread worker = new Thread(this);\r
-    worker.start();\r
-  }\r
-\r
-  /**\r
-   * This is a copy of remove redundancy in jalivew.datamodel.Alignment\r
-   * except we dont want to remove redundancy, just calculate once\r
-   * so we can use the slider to dynamically hide redundant sequences\r
-   *\r
-   * @param threshold DOCUMENT ME!\r
-   * @param sel DOCUMENT ME!\r
-   *\r
-   * @return DOCUMENT ME!\r
-   */\r
-  public void run()\r
-  {\r
-    label.setText("Calculating....");\r
-\r
-    slider.setVisible(false);\r
-    applyButton.setEnabled(false);\r
-    valueField.setVisible(false);\r
-\r
-    validate();\r
-\r
-    String[] omitHidden = null;\r
-\r
-    SequenceGroup sg = ap.av.getSelectionGroup();\r
-    int height;\r
-\r
-    int start, end;\r
-\r
-    if ( (sg != null) && (sg.getSize() >= 1))\r
-    {\r
-      originalSequences = sg.getSequencesInOrder(ap.av.alignment);\r
-      start = sg.getStartRes();\r
-      end = sg.getEndRes();\r
-    }\r
-    else\r
-    {\r
-      originalSequences = ap.av.alignment.getSequencesArray();\r
-      start = 0;\r
-      end = ap.av.alignment.getWidth();\r
-    }\r
-\r
-    height = originalSequences.length;\r
-\r
-    redundancy = new float[height];\r
-    for (int i = 0; i < height; i++)\r
-    {\r
-      redundancy[i] = 0f;\r
-    }\r
-\r
-    //  if (ap.av.hasHiddenColumns)\r
-    {\r
-      //   omitHidden = ap.av.getSelectionAsString();\r
-    }\r
-\r
-    // long start = System.currentTimeMillis();\r
-\r
-    float pid;\r
-    String seqi, seqj;\r
-    for (int i = 0; i < height; i++)\r
-    {\r
-      for (int j = 0; j < i; j++)\r
-      {\r
-        if (i == j)\r
-        {\r
-          continue;\r
-        }\r
-\r
-        if (omitHidden == null)\r
-        {\r
-          seqi = originalSequences[i].getSequenceAsString(start, end);\r
-          seqj = originalSequences[j].getSequenceAsString(start, end);\r
-        }\r
-        else\r
-        {\r
-          seqi = omitHidden[i];\r
-          seqj = omitHidden[j];\r
-        }\r
-\r
-        pid = jalview.util.Comparison.PID(seqi, seqj);\r
-\r
-        if (seqj.length() < seqi.length())\r
-        {\r
-          redundancy[j] = Math.max(pid, redundancy[j]);\r
-        }\r
-        else\r
-        {\r
-          redundancy[i] = Math.max(pid, redundancy[i]);\r
-        }\r
-\r
-      }\r
-    }\r
-\r
-    label.setText("Enter the redundancy threshold");\r
-    slider.setVisible(true);\r
-    applyButton.setEnabled(true);\r
-    valueField.setVisible(true);\r
-\r
-    validate();\r
-    // System.out.println("blob done "+ (System.currentTimeMillis()-start));\r
-  }\r
-\r
-  void sliderValueChanged()\r
-  {\r
-    if (redundancy == null)\r
-    {\r
-      return;\r
-    }\r
-\r
-    float value = slider.getValue();\r
-\r
-    for (int i = 0; i < redundancy.length; i++)\r
-    {\r
-      if (value > redundancy[i])\r
-      {\r
-        redundantSeqs.removeElement(originalSequences[i]);\r
-      }\r
-      else if (!redundantSeqs.contains(originalSequences[i]))\r
-      {\r
-        redundantSeqs.addElement(originalSequences[i]);\r
-      }\r
-    }\r
-\r
-    ap.idPanel.idCanvas.setHighlighted(redundantSeqs);\r
-    PaintRefresher.Refresh(this,\r
-                           ap.av.getSequenceSetId(),\r
-                           true,\r
-                           true);\r
-\r
-  }\r
-\r
-  public void applyButton_actionPerformed()\r
-  {\r
-    Vector del = new Vector();\r
-\r
-    undoButton.setEnabled(true);\r
-\r
-    float value = slider.getValue();\r
-    SequenceGroup sg = ap.av.getSelectionGroup();\r
-\r
-    for (int i = 0; i < redundancy.length; i++)\r
-    {\r
-      if (value <= redundancy[i])\r
-      {\r
-        del.addElement(originalSequences[i]);\r
-      }\r
-    }\r
-\r
-    // This has to be done before the restoreHistoryItem method of alignFrame will\r
-    // actually restore these sequences.\r
-    if (del.size() > 0)\r
-    {\r
-      SequenceI[] deleted = new SequenceI[del.size()];\r
-\r
-      int width = 0;\r
-      for (int i = 0; i < del.size(); i++)\r
-      {\r
-        deleted[i] = (SequenceI) del.elementAt(i);\r
-        if (deleted[i].getLength() > width)\r
-        {\r
-          width = deleted[i].getLength();\r
-        }\r
-      }\r
-\r
-      EditCommand cut = new EditCommand("Remove Redundancy",\r
-                                        EditCommand.CUT, deleted, 0, width,\r
-                                        ap.av.alignment);\r
-\r
-      for (int i = 0; i < del.size(); i++)\r
-      {\r
-        ap.av.alignment.deleteSequence(deleted[i]);\r
-        PaintRefresher.Refresh(this,\r
-                               ap.av.getSequenceSetId(),\r
-                               true,\r
-                               true);\r
-        if (sg != null)\r
-        {\r
-          sg.deleteSequence(deleted[i], false);\r
-        }\r
-      }\r
-\r
-      historyList.push(cut);\r
-\r
-      ap.alignFrame.addHistoryItem(cut);\r
-\r
-      ap.av.firePropertyChange("alignment", null,\r
-                               ap.av.getAlignment().getSequences());\r
-    }\r
-\r
-  }\r
-\r
-  public void undoButton_actionPerformed()\r
-  {\r
-    CommandI command = (CommandI) historyList.pop();\r
-    command.undoCommand();\r
-\r
-    if (ap.av.historyList.contains(command))\r
-    {\r
-      ap.av.historyList.removeElement(command);\r
-      ap.alignFrame.updateEditMenuBar();\r
-    }\r
-\r
-    ap.paintAlignment(true);\r
-\r
-    if (historyList.size() == 0)\r
-    {\r
-      undoButton.setEnabled(false);\r
-    }\r
-  }\r
-\r
-  public void valueField_actionPerformed(ActionEvent e)\r
-  {\r
-    try\r
-    {\r
-      int i = Integer.parseInt(valueField.getText());\r
-      slider.setValue(i);\r
-    }\r
-    catch (Exception ex)\r
-    {\r
-      valueField.setText(slider.getValue() + "");\r
-    }\r
-  }\r
-\r
-  public void windowOpened(WindowEvent evt)\r
-  {}\r
-\r
-  public void windowClosing(WindowEvent evt)\r
-  {\r
-    ap.idPanel.idCanvas.setHighlighted(null);\r
-  }\r
-\r
-  public void windowClosed(WindowEvent evt)\r
-  {}\r
-\r
-  public void windowActivated(WindowEvent evt)\r
-  {}\r
-\r
-  public void windowDeactivated(WindowEvent evt)\r
-  {}\r
-\r
-  public void windowIconified(WindowEvent evt)\r
-  {}\r
-\r
-  public void windowDeiconified(WindowEvent evt)\r
-  {}\r
-}\r
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+package jalview.appletgui;
+
+import java.util.*;
+
+import java.awt.*;
+import java.awt.event.*;
+
+import jalview.commands.*;
+import jalview.datamodel.*;
+
+public class RedundancyPanel
+    extends SliderPanel implements Runnable, WindowListener
+{
+  AlignmentPanel ap;
+
+  Stack historyList = new Stack(); // simpler than synching with alignFrame.
+  float[] redundancy;
+  SequenceI[] originalSequences;
+  Frame frame;
+  Vector redundantSeqs;
+
+  public RedundancyPanel(AlignmentPanel ap)
+  {
+    super(ap, 0, false, null);
+
+    redundantSeqs = new Vector();
+    this.ap = ap;
+    undoButton.setVisible(true);
+    applyButton.setVisible(true);
+    allGroupsCheck.setVisible(false);
+
+    label.setText("Enter the redundancy threshold");
+    valueField.setText("100");
+
+    slider.setVisibleAmount(1);
+    slider.setMinimum(0);
+    slider.setMaximum(100 + slider.getVisibleAmount());
+    slider.setValue(100);
+
+    slider.addAdjustmentListener(new AdjustmentListener()
+    {
+      public void adjustmentValueChanged(AdjustmentEvent evt)
+      {
+        valueField.setText(slider.getValue() + "");
+        sliderValueChanged();
+      }
+    });
+
+    frame = new Frame();
+    frame.add(this);
+    jalview.bin.JalviewLite.addFrame(frame, "Redundancy threshold selection",
+                                     400, 100);
+
+    frame.addWindowListener(this);
+
+    Thread worker = new Thread(this);
+    worker.start();
+  }
+
+  /**
+   * This is a copy of remove redundancy in jalivew.datamodel.Alignment
+   * except we dont want to remove redundancy, just calculate once
+   * so we can use the slider to dynamically hide redundant sequences
+   *
+   * @param threshold DOCUMENT ME!
+   * @param sel DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public void run()
+  {
+    label.setText("Calculating....");
+
+    slider.setVisible(false);
+    applyButton.setEnabled(false);
+    valueField.setVisible(false);
+
+    validate();
+
+    String[] omitHidden = null;
+
+    SequenceGroup sg = ap.av.getSelectionGroup();
+    int height;
+
+    int start, end;
+
+    if ( (sg != null) && (sg.getSize() >= 1))
+    {
+      originalSequences = sg.getSequencesInOrder(ap.av.alignment);
+      start = sg.getStartRes();
+      end = sg.getEndRes();
+    }
+    else
+    {
+      originalSequences = ap.av.alignment.getSequencesArray();
+      start = 0;
+      end = ap.av.alignment.getWidth();
+    }
+
+    height = originalSequences.length;
+
+    redundancy = new float[height];
+    for (int i = 0; i < height; i++)
+    {
+      redundancy[i] = 0f;
+    }
+
+    //  if (ap.av.hasHiddenColumns)
+    {
+      //   omitHidden = ap.av.getSelectionAsString();
+    }
+
+    // long start = System.currentTimeMillis();
+
+    float pid;
+    String seqi, seqj;
+    for (int i = 0; i < height; i++)
+    {
+      for (int j = 0; j < i; j++)
+      {
+        if (i == j)
+        {
+          continue;
+        }
+
+        if (omitHidden == null)
+        {
+          seqi = originalSequences[i].getSequenceAsString(start, end);
+          seqj = originalSequences[j].getSequenceAsString(start, end);
+        }
+        else
+        {
+          seqi = omitHidden[i];
+          seqj = omitHidden[j];
+        }
+
+        pid = jalview.util.Comparison.PID(seqi, seqj);
+
+        if (seqj.length() < seqi.length())
+        {
+          redundancy[j] = Math.max(pid, redundancy[j]);
+        }
+        else
+        {
+          redundancy[i] = Math.max(pid, redundancy[i]);
+        }
+
+      }
+    }
+
+    label.setText("Enter the redundancy threshold");
+    slider.setVisible(true);
+    applyButton.setEnabled(true);
+    valueField.setVisible(true);
+
+    validate();
+    // System.out.println("blob done "+ (System.currentTimeMillis()-start));
+  }
+
+  void sliderValueChanged()
+  {
+    if (redundancy == null)
+    {
+      return;
+    }
+
+    float value = slider.getValue();
+
+    for (int i = 0; i < redundancy.length; i++)
+    {
+      if (value > redundancy[i])
+      {
+        redundantSeqs.removeElement(originalSequences[i]);
+      }
+      else if (!redundantSeqs.contains(originalSequences[i]))
+      {
+        redundantSeqs.addElement(originalSequences[i]);
+      }
+    }
+
+    ap.idPanel.idCanvas.setHighlighted(redundantSeqs);
+    PaintRefresher.Refresh(this,
+                           ap.av.getSequenceSetId(),
+                           true,
+                           true);
+
+  }
+
+  public void applyButton_actionPerformed()
+  {
+    Vector del = new Vector();
+
+    undoButton.setEnabled(true);
+
+    float value = slider.getValue();
+    SequenceGroup sg = ap.av.getSelectionGroup();
+
+    for (int i = 0; i < redundancy.length; i++)
+    {
+      if (value <= redundancy[i])
+      {
+        del.addElement(originalSequences[i]);
+      }
+    }
+
+    // This has to be done before the restoreHistoryItem method of alignFrame will
+    // actually restore these sequences.
+    if (del.size() > 0)
+    {
+      SequenceI[] deleted = new SequenceI[del.size()];
+
+      int width = 0;
+      for (int i = 0; i < del.size(); i++)
+      {
+        deleted[i] = (SequenceI) del.elementAt(i);
+        if (deleted[i].getLength() > width)
+        {
+          width = deleted[i].getLength();
+        }
+      }
+
+      EditCommand cut = new EditCommand("Remove Redundancy",
+                                        EditCommand.CUT, deleted, 0, width,
+                                        ap.av.alignment);
+
+      for (int i = 0; i < del.size(); i++)
+      {
+        ap.av.alignment.deleteSequence(deleted[i]);
+        PaintRefresher.Refresh(this,
+                               ap.av.getSequenceSetId(),
+                               true,
+                               true);
+        if (sg != null)
+        {
+          sg.deleteSequence(deleted[i], false);
+        }
+      }
+
+      historyList.push(cut);
+
+      ap.alignFrame.addHistoryItem(cut);
+
+      ap.av.firePropertyChange("alignment", null,
+                               ap.av.getAlignment().getSequences());
+    }
+
+  }
+
+  public void undoButton_actionPerformed()
+  {
+    CommandI command = (CommandI) historyList.pop();
+    command.undoCommand(null);
+
+    if (ap.av.historyList.contains(command))
+    {
+      ap.av.historyList.removeElement(command);
+      ap.alignFrame.updateEditMenuBar();
+    }
+
+    ap.paintAlignment(true);
+
+    if (historyList.size() == 0)
+    {
+      undoButton.setEnabled(false);
+    }
+  }
+
+  public void valueField_actionPerformed(ActionEvent e)
+  {
+    try
+    {
+      int i = Integer.parseInt(valueField.getText());
+      slider.setValue(i);
+    }
+    catch (Exception ex)
+    {
+      valueField.setText(slider.getValue() + "");
+    }
+  }
+
+  public void windowOpened(WindowEvent evt)
+  {}
+
+  public void windowClosing(WindowEvent evt)
+  {
+    ap.idPanel.idCanvas.setHighlighted(null);
+  }
+
+  public void windowClosed(WindowEvent evt)
+  {}
+
+  public void windowActivated(WindowEvent evt)
+  {}
+
+  public void windowDeactivated(WindowEvent evt)
+  {}
+
+  public void windowIconified(WindowEvent evt)
+  {}
+
+  public void windowDeiconified(WindowEvent evt)
+  {}
+}
index d34552d..976be92 100644 (file)
-/*\r
- * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2007 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
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
- */\r
-package jalview.commands;\r
-\r
-import jalview.datamodel.*;\r
-\r
-public class ChangeCaseCommand\r
-    implements CommandI\r
-{\r
-  String description;\r
-  public static int TO_LOWER = 0;\r
-  public static int TO_UPPER = 1;\r
-  public static int TOGGLE_CASE = 2;\r
-  int caseChange = -1;\r
-  SequenceI[] seqs;\r
-  int[][] regions;\r
-  public ChangeCaseCommand(String description,\r
-                           SequenceI[] seqs,\r
-                           int[][] regions,\r
-                           int caseChange)\r
-  {\r
-    this.description = description;\r
-    this.seqs = seqs;\r
-    this.regions = regions;\r
-    this.caseChange = caseChange;\r
-    doCommand();\r
-  }\r
-\r
-  public String getDescription()\r
-  {\r
-    return description;\r
-  }\r
-\r
-  public int getSize()\r
-  {\r
-    return 1;\r
-  }\r
-\r
-  public void doCommand()\r
-  {\r
-    changeCase(true);\r
-  }\r
-\r
-  public void undoCommand()\r
-  {\r
-    changeCase(false);\r
-  }\r
-\r
-  void changeCase(boolean doCommand)\r
-  {\r
-    String sequence;\r
-    int start, end;\r
-    char nextChar;\r
-    for (int r = 0; r < regions.length; r++)\r
-    {\r
-      start = regions[r][0];\r
-      for (int s = 0; s < seqs.length; s++)\r
-      {\r
-        sequence = seqs[s].getSequenceAsString();\r
-        StringBuffer newSeq = new StringBuffer();\r
-\r
-        if (regions[r][1] > sequence.length())\r
-        {\r
-          end = sequence.length();\r
-        }\r
-        else\r
-        {\r
-          end = regions[r][1];\r
-        }\r
-\r
-        if (start > 0)\r
-        {\r
-          newSeq.append(sequence.substring(0, start));\r
-        }\r
-\r
-        if ( (caseChange == TO_UPPER && doCommand)\r
-            || (caseChange == TO_LOWER && !doCommand))\r
-        {\r
-          newSeq.append(sequence.substring(start, end).toUpperCase());\r
-        }\r
-\r
-        else if ( (caseChange == TO_LOWER && doCommand)\r
-                 || (caseChange == TO_UPPER && !doCommand))\r
-        {\r
-          newSeq.append(sequence.substring(start, end).toLowerCase());\r
-        }\r
-\r
-        else //TOGGLE CASE\r
-        {\r
-          for (int c = start; c < end; c++)\r
-          {\r
-            nextChar = sequence.charAt(c);\r
-            if ('a' <= nextChar && nextChar <= 'z')\r
-            {\r
-              // TO UPPERCASE !!!\r
-              nextChar -= ('a' - 'A');\r
-            }\r
-            else if ('A' <= nextChar && nextChar <= 'Z')\r
-            {\r
-              // TO LOWERCASE !!!\r
-              nextChar += ('a' - 'A');\r
-            }\r
-            newSeq.append(nextChar);\r
-          }\r
-        }\r
-\r
-        if (end < sequence.length())\r
-        {\r
-          newSeq.append(sequence.substring(end));\r
-        }\r
-\r
-        seqs[s].setSequence(newSeq.toString());\r
-      }\r
-    }\r
-  }\r
-\r
-}\r
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+package jalview.commands;
+
+import jalview.datamodel.*;
+
+public class ChangeCaseCommand
+    implements CommandI
+{
+  String description;
+  public static int TO_LOWER = 0;
+  public static int TO_UPPER = 1;
+  public static int TOGGLE_CASE = 2;
+  int caseChange = -1;
+  SequenceI[] seqs;
+  int[][] regions;
+  public ChangeCaseCommand(String description,
+                           SequenceI[] seqs,
+                           int[][] regions,
+                           int caseChange)
+  {
+    this.description = description;
+    this.seqs = seqs;
+    this.regions = regions;
+    this.caseChange = caseChange;
+    doCommand(null);
+  }
+
+  public String getDescription()
+  {
+    return description;
+  }
+
+  public int getSize()
+  {
+    return 1;
+  }
+
+  public void doCommand(AlignmentI[] views)
+  {
+    changeCase(true);
+  }
+
+  public void undoCommand(AlignmentI[] views)
+  {
+    changeCase(false);
+  }
+
+  void changeCase(boolean doCommand)
+  {
+    String sequence;
+    int start, end;
+    char nextChar;
+    for (int r = 0; r < regions.length; r++)
+    {
+      start = regions[r][0];
+      for (int s = 0; s < seqs.length; s++)
+      {
+        sequence = seqs[s].getSequenceAsString();
+        StringBuffer newSeq = new StringBuffer();
+
+        if (regions[r][1] > sequence.length())
+        {
+          end = sequence.length();
+        }
+        else
+        {
+          end = regions[r][1];
+        }
+
+        if (start > 0)
+        {
+          newSeq.append(sequence.substring(0, start));
+        }
+
+        if ( (caseChange == TO_UPPER && doCommand)
+            || (caseChange == TO_LOWER && !doCommand))
+        {
+          newSeq.append(sequence.substring(start, end).toUpperCase());
+        }
+
+        else if ( (caseChange == TO_LOWER && doCommand)
+                 || (caseChange == TO_UPPER && !doCommand))
+        {
+          newSeq.append(sequence.substring(start, end).toLowerCase());
+        }
+
+        else //TOGGLE CASE
+        {
+          for (int c = start; c < end; c++)
+          {
+            nextChar = sequence.charAt(c);
+            if ('a' <= nextChar && nextChar <= 'z')
+            {
+              // TO UPPERCASE !!!
+              nextChar -= ('a' - 'A');
+            }
+            else if ('A' <= nextChar && nextChar <= 'Z')
+            {
+              // TO LOWERCASE !!!
+              nextChar += ('a' - 'A');
+            }
+            newSeq.append(nextChar);
+          }
+        }
+
+        if (end < sequence.length())
+        {
+          newSeq.append(sequence.substring(end));
+        }
+
+        seqs[s].setSequence(newSeq.toString());
+      }
+    }
+  }
+
+}
index d97a6bb..97675e7 100644 (file)
@@ -1,30 +1,30 @@
-/*\r
- * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2007 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
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
- */\r
-package jalview.commands;\r
-\r
-public interface CommandI\r
-{\r
-  public void doCommand();\r
-\r
-  public void undoCommand();\r
-\r
-  public String getDescription();\r
-\r
-  public int getSize();\r
-}\r
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+package jalview.commands;
+
+public interface CommandI
+{
+  public void doCommand(jalview.datamodel.AlignmentI[] views);
+
+  public void undoCommand(jalview.datamodel.AlignmentI[] views);
+
+  public String getDescription();
+
+  public int getSize();
+}
index cbcc700..aece057 100644 (file)
@@ -73,7 +73,7 @@ public class EditCommand
           new Edit(command, seqs, position, number, al)};
     }
 
-    performEdit(0);
+    performEdit(0, null);
   }
 
   public EditCommand(String description,
@@ -91,7 +91,7 @@ public class EditCommand
           { new Edit(command, seqs, position, number, al, replace)};
     }
 
-    performEdit(0);
+    performEdit(0, null);
   }
 
   final public String getDescription()
@@ -109,12 +109,42 @@ public class EditCommand
     return edits[0].al;
   }
 
+  /**
+   * append a new editCommand
+   * Note. this shouldn't be called if the edit is an operation affects more alignment objects than the one referenced
+   * in al (for example, cut or pasting whole sequences). Use the form with an additional AlignmentI[] views parameter. 
+   * @param command
+   * @param seqs
+   * @param position
+   * @param number
+   * @param al
+   * @param performEdit
+   */
+  final public void appendEdit(int command,
+          SequenceI[] seqs,
+          int position,
+          int number,
+          AlignmentI al,
+          boolean performEdit)
+  {
+    appendEdit(command, seqs, position, number, al, performEdit, null);
+  }
+  /**
+   * append a new edit command with a set of alignment views that may be operated on
+   * @param command
+   * @param seqs
+   * @param position
+   * @param number
+   * @param al
+   * @param performEdit
+   * @param views
+   */
   final public void appendEdit(int command,
                                SequenceI[] seqs,
                                int position,
                                int number,
                                AlignmentI al,
-                               boolean performEdit)
+                               boolean performEdit, AlignmentI[] views)
   {
     Edit edit = new Edit(command, seqs, position, number, al.getGapCharacter());
     if (al.getHeight() == seqs.length)
@@ -139,11 +169,11 @@ public class EditCommand
 
     if (performEdit)
     {
-      performEdit(edits.length - 1);
+      performEdit(edits.length - 1, views);
     }
   }
 
-  final void performEdit(int commandIndex)
+  final void performEdit(int commandIndex, AlignmentI[] views)
   {
     int eSize = edits.length;
     for (int e = commandIndex; e < eSize; e++)
@@ -157,10 +187,10 @@ public class EditCommand
         deleteGap(edits[e]);
           break;
         case CUT:
-        cut(edits[e]);
+        cut(edits[e], views);
           break;
         case PASTE:
-        paste(edits[e]);
+        paste(edits[e], views);
           break;
         case REPLACE:
           replace(edits[e]);
@@ -169,12 +199,12 @@ public class EditCommand
     }
   }
 
-  final public void doCommand()
+  final public void doCommand(AlignmentI[] views)
   {
-    performEdit(0);
+    performEdit(0,views);
   }
 
-  final public void undoCommand()
+  final public void undoCommand(AlignmentI[] views)
   {
     int e = 0, eSize = edits.length;
     for (e = eSize - 1; e > -1; e--)
@@ -188,10 +218,10 @@ public class EditCommand
         insertGap(edits[e]);
           break;
         case CUT:
-        paste(edits[e]);
+        paste(edits[e], views);
           break;
         case PASTE:
-        cut(edits[e]);
+        cut(edits[e], views);
           break;
         case REPLACE:
           replace(edits[e]);
@@ -209,7 +239,7 @@ public class EditCommand
                                    command.gapChar);
     }
 
-    adjustAnnotations(command, true, false);
+    adjustAnnotations(command, true, false, null);
   }
 
   final void deleteGap(Edit command)
@@ -220,10 +250,10 @@ public class EditCommand
                                   command.position + command.number);
     }
 
-    adjustAnnotations(command, false, false);
+    adjustAnnotations(command, false, false, null);
   }
 
-  void cut(Edit command)
+  void cut(Edit command, AlignmentI[] views)
   {
     boolean seqDeleted=false;
     command.string = new char[command.seqs.length][];
@@ -264,10 +294,10 @@ public class EditCommand
       }
     }
 
-    adjustAnnotations(command, false, seqDeleted);
+    adjustAnnotations(command, false, seqDeleted, views);
   }
 
-  void paste(Edit command)
+  void paste(Edit command, AlignmentI[] views)
   {
     StringBuffer tmp;
     boolean newDSNeeded;
@@ -345,7 +375,7 @@ public class EditCommand
         adjustFeatures(command, i, start, end, true);
       }
     }
-    adjustAnnotations(command, true, seqWasDeleted);
+    adjustAnnotations(command, true, seqWasDeleted, views);
 
     command.string = null;
   }
@@ -371,7 +401,7 @@ public class EditCommand
     }
   }
 
-  final void adjustAnnotations(Edit command, boolean insert, boolean modifyVisibility)
+  final void adjustAnnotations(Edit command, boolean insert, boolean modifyVisibility, AlignmentI[] views)
   {
 
     AlignmentAnnotation[] annotations = null;
@@ -398,12 +428,55 @@ public class EditCommand
             // remove rows
             tmp = command.seqs[s].getAnnotation();
             if (tmp!=null) {
-              command.deletedAnnotationRows.put(command.seqs[s], tmp);
+              int alen=tmp.length;
               for (int aa =0; aa<tmp.length; aa++)
               {
-                command.al.deleteAnnotation(tmp[aa]);
+                if (!command.al.deleteAnnotation(tmp[aa]))
+                {
+                  // strip out annotation not in the current al (will be put back on insert in all views)
+                  tmp[aa] = null;
+                  alen--;
+                }
               }
               command.seqs[s].setAlignmentAnnotation(null);
+              if (alen!=tmp.length)
+              { 
+                // save the non-null annotation references only
+                AlignmentAnnotation[] saved = new AlignmentAnnotation[alen];
+                for (int aa=0,aapos=0;aa<tmp.length;aa++)
+                {
+                  if (tmp[aa]!=null)
+                  {
+                    saved[aapos++] = tmp[aa];
+                    tmp[aa] = null;
+                  }
+                }
+                tmp = saved;
+                command.deletedAnnotationRows.put(command.seqs[s], saved);
+                // and then remove any annotation in the other views
+                for (int alview=0; views!=null && alview<views.length; alview++)
+                {
+                  if (views[alview]!=command.al)
+                  {
+                    AlignmentAnnotation[] toremove = views[alview].getAlignmentAnnotation();
+                    if (toremove==null || toremove.length==0)
+                    {
+                      continue;
+                    }
+                    // remove any alignment annotation on this sequence that's on that alignment view.
+                    for (int aa = 0; aa<toremove.length; aa++)
+                    {
+                      if (toremove[aa].sequenceRef==command.seqs[s])
+                      {
+                        views[alview].deleteAnnotation(toremove[aa]);
+                      }
+                    }
+                  }
+                }
+              } else {
+                // save all the annotation
+                command.deletedAnnotationRows.put(command.seqs[s], tmp);
+              }
             }
           } else {
             // recover rows
@@ -414,12 +487,30 @@ public class EditCommand
               if (revealed!=null) {
                 for (int aa =0; aa<revealed.length; aa++)
                 {
+                  // iterate through al adding original annotation
                   command.al.addAnnotation(revealed[aa]);
                 }
                 for (int aa =0; aa<revealed.length; aa++)
                 {
                   command.al.setAnnotationIndex(revealed[aa], aa);
                 }
+                // and then duplicate added annotation on every other alignment view
+                for (int vnum=0; views!=null && vnum<views.length; vnum++)
+                {
+                  if (views[vnum]!=command.al)
+                  {
+                    int avwidth = views[vnum].getWidth()+1;
+                    // duplicate in this view
+                    for (int a=0; a<revealed.length; a++)
+                    {
+                      AlignmentAnnotation newann = new AlignmentAnnotation(revealed[a]);
+                      command.seqs[s].addAlignmentAnnotation(newann);
+                      newann.padAnnotation(avwidth);
+                      views[vnum].addAnnotation(newann);
+                      views[vnum].setAnnotationIndex(newann, a);
+                    }
+                  }
+                }
               }
             }
           }
index 57097c0..b331690 100644 (file)
@@ -1,62 +1,62 @@
-/*\r
- * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2007 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
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
- */\r
-package jalview.commands;\r
-\r
-import jalview.analysis.*;\r
-import jalview.datamodel.*;\r
-\r
-public class OrderCommand\r
-    implements CommandI\r
-{\r
-  String description;\r
-  SequenceI[] seqs;\r
-  SequenceI[] seqs2;\r
-  AlignmentI al;\r
-\r
-  public OrderCommand(String description,\r
-                      SequenceI[] seqs,\r
-                      AlignmentI al)\r
-  {\r
-    this.description = description;\r
-    this.seqs = seqs;\r
-    this.seqs2 = al.getSequencesArray();\r
-    this.al = al;\r
-    doCommand();\r
-  }\r
-\r
-  public String getDescription()\r
-  {\r
-    return description;\r
-  }\r
-\r
-  public int getSize()\r
-  {\r
-    return 1;\r
-  }\r
-\r
-  public void doCommand()\r
-  {\r
-    AlignmentSorter.setOrder(al, seqs2);\r
-  }\r
-\r
-  public void undoCommand()\r
-  {\r
-    AlignmentSorter.setOrder(al, seqs);\r
-  }\r
-}\r
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+package jalview.commands;
+
+import jalview.analysis.*;
+import jalview.datamodel.*;
+
+public class OrderCommand
+    implements CommandI
+{
+  String description;
+  SequenceI[] seqs;
+  SequenceI[] seqs2;
+  AlignmentI al;
+
+  public OrderCommand(String description,
+                      SequenceI[] seqs,
+                      AlignmentI al)
+  {
+    this.description = description;
+    this.seqs = seqs;
+    this.seqs2 = al.getSequencesArray();
+    this.al = al;
+    doCommand(null);
+  }
+
+  public String getDescription()
+  {
+    return description;
+  }
+
+  public int getSize()
+  {
+    return 1;
+  }
+
+  public void doCommand(AlignmentI[] views)
+  {
+    AlignmentSorter.setOrder(al, seqs2);
+  }
+
+  public void undoCommand(AlignmentI[] views)
+  {
+    AlignmentSorter.setOrder(al, seqs);
+  }
+}
index 1e9b832..a874f71 100644 (file)
-package jalview.commands;\r
-\r
-/*\r
- * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2007 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
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
- */\r
-\r
-import jalview.datamodel.*;\r
-\r
-public class RemoveGapColCommand\r
-    extends EditCommand\r
-{\r
-  int columnsDeleted;\r
-  public RemoveGapColCommand(String description,\r
-                             SequenceI[] seqs,\r
-                             int start, int end, AlignmentI al)\r
-  {\r
-    this.description = description;\r
-\r
-    int j, jSize = seqs.length;\r
-\r
-    int startCol = -1, endCol = -1;\r
-    columnsDeleted = 0;\r
-\r
-    edits = new Edit[0];\r
-\r
-    boolean delete = true;\r
-    for (int i = start; i <= end; i++)\r
-    {\r
-      delete = true;\r
-\r
-      for (j = 0; j < jSize; j++)\r
-      {\r
-        if (seqs[j].getLength() > i)\r
-        {\r
-          if (!jalview.util.Comparison.isGap(seqs[j].getCharAt(i)))\r
-          {\r
-            if (delete)\r
-            {\r
-              endCol = i;\r
-            }\r
-\r
-            delete = false;\r
-            break;\r
-          }\r
-        }\r
-      }\r
-\r
-      if (delete && startCol == -1)\r
-      {\r
-        startCol = i;\r
-      }\r
-\r
-      if (!delete && startCol > -1)\r
-      {\r
-        this.appendEdit(DELETE_GAP, seqs,\r
-                        startCol - columnsDeleted,\r
-                        endCol - startCol,\r
-                        al,\r
-                        false);\r
-\r
-        columnsDeleted += (endCol - startCol);\r
-        startCol = -1;\r
-        endCol = -1;\r
-      }\r
-    }\r
-\r
-    if (delete && startCol > -1)\r
-    {\r
-      //This is for empty columns at the\r
-      //end of the alignment\r
-\r
-      this.appendEdit(DELETE_GAP, seqs,\r
-                      startCol - columnsDeleted,\r
-                      end - startCol + 1,\r
-                      al,\r
-                      false);\r
-\r
-      columnsDeleted += (end - startCol + 1);\r
-    }\r
-\r
-    performEdit(0);\r
-  }\r
-\r
-  public int getSize()\r
-  {\r
-    //We're interested in the number of columns deleted,\r
-    //Not the number of sequence edits.\r
-    return columnsDeleted;\r
-  }\r
-\r
-}\r
+package jalview.commands;
+
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+import jalview.datamodel.*;
+
+public class RemoveGapColCommand
+    extends EditCommand
+{
+  int columnsDeleted;
+  public RemoveGapColCommand(String description,
+                             SequenceI[] seqs,
+                             int start, int end, AlignmentI al)
+  {
+    this.description = description;
+
+    int j, jSize = seqs.length;
+
+    int startCol = -1, endCol = -1;
+    columnsDeleted = 0;
+
+    edits = new Edit[0];
+
+    boolean delete = true;
+    for (int i = start; i <= end; i++)
+    {
+      delete = true;
+
+      for (j = 0; j < jSize; j++)
+      {
+        if (seqs[j].getLength() > i)
+        {
+          if (!jalview.util.Comparison.isGap(seqs[j].getCharAt(i)))
+          {
+            if (delete)
+            {
+              endCol = i;
+            }
+
+            delete = false;
+            break;
+          }
+        }
+      }
+
+      if (delete && startCol == -1)
+      {
+        startCol = i;
+      }
+
+      if (!delete && startCol > -1)
+      {
+        this.appendEdit(DELETE_GAP, seqs,
+                        startCol - columnsDeleted,
+                        endCol - startCol,
+                        al,
+                        false,null);
+
+        columnsDeleted += (endCol - startCol);
+        startCol = -1;
+        endCol = -1;
+      }
+    }
+
+    if (delete && startCol > -1)
+    {
+      //This is for empty columns at the
+      //end of the alignment
+
+      this.appendEdit(DELETE_GAP, seqs,
+                      startCol - columnsDeleted,
+                      end - startCol + 1,
+                      al,
+                      false,null);
+
+      columnsDeleted += (end - startCol + 1);
+    }
+
+    performEdit(0,null);
+  }
+
+  public int getSize()
+  {
+    //We're interested in the number of columns deleted,
+    //Not the number of sequence edits.
+    return columnsDeleted;
+  }
+
+}
index ccc8008..5639fa5 100644 (file)
-package jalview.commands;\r
-\r
-/*\r
- * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2007 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
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
- */\r
-\r
-import jalview.datamodel.*;\r
-\r
-public class RemoveGapsCommand\r
-    extends EditCommand\r
-{\r
-  public RemoveGapsCommand(String description,\r
-                           SequenceI[] seqs, AlignmentI al)\r
-  {\r
-    this.description = description;\r
-    int width = 0;\r
-    for (int i = 0; i < seqs.length; i++)\r
-    {\r
-      if (seqs[i].getLength() > width)\r
-      {\r
-        width = seqs[i].getLength();\r
-      }\r
-    }\r
-\r
-    findGaps(seqs, 0, width, al);\r
-  }\r
-\r
-  public RemoveGapsCommand(String description,\r
-                           SequenceI[] seqs,\r
-                           int start, int end, AlignmentI al)\r
-  {\r
-    this.description = description;\r
-    findGaps(seqs, start, end, al);\r
-  }\r
-\r
-  void findGaps(SequenceI[] seqs, int start, int end, AlignmentI al)\r
-  {\r
-\r
-    int startCol = -1, endCol = -1;\r
-    int deletedCols = 0;\r
-\r
-    int j, jSize;\r
-\r
-    edits = new Edit[0];\r
-\r
-    boolean delete = true;\r
-    char[] sequence;\r
-\r
-    for (int s = 0; s < seqs.length; s++)\r
-    {\r
-      deletedCols = 0;\r
-      startCol = -1;\r
-      endCol = -1;\r
-      sequence = seqs[s].getSequence(start, end + 1);\r
-\r
-      jSize = sequence.length;\r
-      for (j = 0; j < jSize; j++)\r
-      {\r
-        delete = true;\r
-\r
-        if (!jalview.util.Comparison.isGap(sequence[j]))\r
-        {\r
-          if (delete)\r
-          {\r
-            endCol = j;\r
-          }\r
-\r
-          delete = false;\r
-        }\r
-\r
-        if (delete && startCol == -1)\r
-        {\r
-          startCol = j;\r
-        }\r
-\r
-        if (!delete && startCol > -1)\r
-        {\r
-          this.appendEdit(DELETE_GAP, new SequenceI[]\r
-                          {seqs[s]},\r
-                          start + startCol - deletedCols,\r
-                          endCol - startCol,\r
-                          al,\r
-                          false);\r
-\r
-          deletedCols += (endCol - startCol);\r
-          startCol = -1;\r
-          endCol = -1;\r
-        }\r
-      }\r
-      if (delete && startCol > -1)\r
-      {\r
-        this.appendEdit(DELETE_GAP, new SequenceI[]\r
-                        {seqs[s]},\r
-                        start + startCol - deletedCols,\r
-                        jSize - startCol,\r
-                        al,\r
-                        false);\r
-      }\r
-\r
-    }\r
-\r
-    performEdit(0);\r
-  }\r
-\r
-}\r
+package jalview.commands;
+
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+import jalview.datamodel.*;
+
+public class RemoveGapsCommand
+    extends EditCommand
+{
+  public RemoveGapsCommand(String description,
+                           SequenceI[] seqs, AlignmentI al)
+  {
+    this.description = description;
+    int width = 0;
+    for (int i = 0; i < seqs.length; i++)
+    {
+      if (seqs[i].getLength() > width)
+      {
+        width = seqs[i].getLength();
+      }
+    }
+
+    findGaps(seqs, 0, width, al);
+  }
+
+  public RemoveGapsCommand(String description,
+                           SequenceI[] seqs,
+                           int start, int end, AlignmentI al)
+  {
+    this.description = description;
+    findGaps(seqs, start, end, al);
+  }
+
+  void findGaps(SequenceI[] seqs, int start, int end, AlignmentI al)
+  {
+
+    int startCol = -1, endCol = -1;
+    int deletedCols = 0;
+
+    int j, jSize;
+
+    edits = new Edit[0];
+
+    boolean delete = true;
+    char[] sequence;
+
+    for (int s = 0; s < seqs.length; s++)
+    {
+      deletedCols = 0;
+      startCol = -1;
+      endCol = -1;
+      sequence = seqs[s].getSequence(start, end + 1);
+
+      jSize = sequence.length;
+      for (j = 0; j < jSize; j++)
+      {
+        delete = true;
+
+        if (!jalview.util.Comparison.isGap(sequence[j]))
+        {
+          if (delete)
+          {
+            endCol = j;
+          }
+
+          delete = false;
+        }
+
+        if (delete && startCol == -1)
+        {
+          startCol = j;
+        }
+
+        if (!delete && startCol > -1)
+        {
+          this.appendEdit(DELETE_GAP, new SequenceI[]
+                          {seqs[s]},
+                          start + startCol - deletedCols,
+                          endCol - startCol,
+                          al,
+                          false,null);
+
+          deletedCols += (endCol - startCol);
+          startCol = -1;
+          endCol = -1;
+        }
+      }
+      if (delete && startCol > -1)
+      {
+        this.appendEdit(DELETE_GAP, new SequenceI[]
+                        {seqs[s]},
+                        start + startCol - deletedCols,
+                        jSize - startCol,
+                        al,
+                        false,null);
+      }
+
+    }
+
+    performEdit(0,null);
+  }
+
+}
index 21385ad..9b9c99e 100644 (file)
@@ -1,93 +1,93 @@
-\r
-/*\r
-* Jalview - A Sequence Alignment Editor and Viewer\r
-* Copyright (C) 2007 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
-* as published by the Free Software Foundation; either version 2\r
-* of the License, or (at your option) any later version.\r
-*\r
-* This program is distributed in the hope that it will be useful,\r
-* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-* GNU General Public License for more details.\r
-*\r
-* You should have received a copy of the GNU General Public License\r
-* along with this program; if not, write to the Free Software\r
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
-*/\r
-\r
-package jalview.commands;\r
-\r
-import jalview.datamodel.*;\r
-\r
-public class SlideSequencesCommand extends EditCommand\r
-{\r
-  boolean gapsInsertedBegin = false;\r
-\r
-  public SlideSequencesCommand(String description,\r
-                               SequenceI[] seqsLeft,\r
-                               SequenceI[] seqsRight,\r
-                               int slideSize,\r
-                               char gapChar)\r
-  {\r
-    this.description = description;\r
-\r
-    int lSize = seqsLeft.length;\r
-    gapsInsertedBegin = false;\r
-    int i, j;\r
-    for (i = 0; i < lSize; i++)\r
-    {\r
-      for (j = 0; j < slideSize; j++)\r
-        if (!jalview.util.Comparison.isGap(seqsLeft[i].getCharAt(j)))\r
-        {\r
-          gapsInsertedBegin = true;\r
-          break;\r
-        }\r
-    }\r
-\r
-    if (!gapsInsertedBegin)\r
-      edits = new Edit[]\r
-          {  new Edit(DELETE_GAP, seqsLeft, 0, slideSize, gapChar)};\r
-    else\r
-      edits = new Edit[]\r
-          {  new Edit(INSERT_GAP, seqsRight, 0, slideSize, gapChar)};\r
-\r
-    performEdit(0);\r
-  }\r
-\r
-  public boolean getGapsInsertedBegin()\r
-  {\r
-    return gapsInsertedBegin;\r
-  }\r
-\r
-  public boolean appendSlideCommand(SlideSequencesCommand command)\r
-  {\r
-    boolean same = false;\r
-\r
-    if(command.edits[0].seqs.length==edits[0].seqs.length)\r
-    {\r
-      same = true;\r
-      for (int i = 0; i < command.edits[0].seqs.length; i++)\r
-      {\r
-        if (edits[0].seqs[i] != command.edits[0].seqs[i])\r
-        {\r
-          same = false;\r
-        }\r
-      }\r
-    }\r
-\r
-    if(same)\r
-    {\r
-      Edit[] temp = new Edit[command.edits.length + 1];\r
-      System.arraycopy(command.edits, 0, temp, 0, command.edits.length);\r
-      command.edits = temp;\r
-      command.edits[command.edits.length - 1] = edits[0];\r
-    }\r
-\r
-    return same;\r
-  }\r
-}\r
-\r
-\r
+
+/*
+* Jalview - A Sequence Alignment Editor and Viewer
+* Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+*/
+
+package jalview.commands;
+
+import jalview.datamodel.*;
+
+public class SlideSequencesCommand extends EditCommand
+{
+  boolean gapsInsertedBegin = false;
+
+  public SlideSequencesCommand(String description,
+                               SequenceI[] seqsLeft,
+                               SequenceI[] seqsRight,
+                               int slideSize,
+                               char gapChar)
+  {
+    this.description = description;
+
+    int lSize = seqsLeft.length;
+    gapsInsertedBegin = false;
+    int i, j;
+    for (i = 0; i < lSize; i++)
+    {
+      for (j = 0; j < slideSize; j++)
+        if (!jalview.util.Comparison.isGap(seqsLeft[i].getCharAt(j)))
+        {
+          gapsInsertedBegin = true;
+          break;
+        }
+    }
+
+    if (!gapsInsertedBegin)
+      edits = new Edit[]
+          {  new Edit(DELETE_GAP, seqsLeft, 0, slideSize, gapChar)};
+    else
+      edits = new Edit[]
+          {  new Edit(INSERT_GAP, seqsRight, 0, slideSize, gapChar)};
+
+    performEdit(0,null);
+  }
+
+  public boolean getGapsInsertedBegin()
+  {
+    return gapsInsertedBegin;
+  }
+
+  public boolean appendSlideCommand(SlideSequencesCommand command)
+  {
+    boolean same = false;
+
+    if(command.edits[0].seqs.length==edits[0].seqs.length)
+    {
+      same = true;
+      for (int i = 0; i < command.edits[0].seqs.length; i++)
+      {
+        if (edits[0].seqs[i] != command.edits[0].seqs[i])
+        {
+          same = false;
+        }
+      }
+    }
+
+    if(same)
+    {
+      Edit[] temp = new Edit[command.edits.length + 1];
+      System.arraycopy(command.edits, 0, temp, 0, command.edits.length);
+      command.edits = temp;
+      command.edits[command.edits.length - 1] = edits[0];
+    }
+
+    return same;
+  }
+}
+
+
index 4c1dea0..4110bd1 100644 (file)
-/*\r
- * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2007 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
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
- */\r
-package jalview.commands;\r
-\r
-import java.util.*;\r
-\r
-import jalview.datamodel.*;\r
-import jalview.util.*;\r
-\r
-public class TrimRegionCommand\r
-    extends EditCommand\r
-{\r
-  public static String TRIM_LEFT = "TrimLeft";\r
-  public static String TRIM_RIGHT = "TrimRight";\r
-\r
-  public ColumnSelection colSel = null;\r
-\r
-  int[] start;\r
-\r
-  ShiftList shiftList;\r
-\r
-  SequenceGroup selectionGroup;\r
-\r
-  Vector deletedHiddenColumns;\r
-\r
-  int columnsDeleted;\r
-\r
-  public TrimRegionCommand(String description,\r
-                           String command,\r
-                           SequenceI[] seqs,\r
-                           int column,\r
-                           AlignmentI al,\r
-                           ColumnSelection colSel,\r
-                           SequenceGroup selectedRegion)\r
-  {\r
-    this.description = description;\r
-    this.selectionGroup = selectedRegion;\r
-    this.colSel = colSel;\r
-    if (command.equalsIgnoreCase(TRIM_LEFT))\r
-    {\r
-      if (column == 0)\r
-      {\r
-        return;\r
-      }\r
-\r
-      columnsDeleted = column;\r
-\r
-      edits = new Edit[]\r
-          {\r
-          new Edit(CUT, seqs, 0, column, al)};\r
-    }\r
-    else if (command.equalsIgnoreCase(TRIM_RIGHT))\r
-    {\r
-      int width = al.getWidth() - column - 1;\r
-      if (width < 2)\r
-      {\r
-        return;\r
-      }\r
-\r
-      columnsDeleted = width - 1;\r
-\r
-      edits = new Edit[]\r
-          {\r
-          new Edit(CUT, seqs, column + 1, width, al)};\r
-    }\r
-\r
-    //We need to keep a record of the sequence start\r
-    //in order to restore the state after a redo\r
-    int i, isize = edits[0].seqs.length;\r
-    start = new int[isize];\r
-    for (i = 0; i < isize; i++)\r
-    {\r
-      start[i] = edits[0].seqs[i].getStart();\r
-    }\r
-\r
-    performEdit(0);\r
-  }\r
-\r
-  void cut(Edit command)\r
-  {\r
-    int column, j, jSize = command.seqs.length;\r
-    for (j = 0; j < jSize; j++)\r
-    {\r
-      if (command.position == 0)\r
-      {\r
-        //This is a TRIM_LEFT command\r
-        column = command.seqs[j].findPosition(command.number);\r
-        command.seqs[j].setStart(column);\r
-      }\r
-      else\r
-      {\r
-        //This is a TRIM_RIGHT command\r
-        column = command.seqs[j].findPosition(command.position) - 1;\r
-        command.seqs[j].setEnd(column);\r
-      }\r
-    }\r
-\r
-    super.cut(command);\r
-\r
-    if (command.position == 0)\r
-    {\r
-      deletedHiddenColumns = colSel.compensateForEdit(0, command.number);\r
-      if (selectionGroup != null)\r
-      {\r
-        selectionGroup.adjustForRemoveLeft(command.number);\r
-      }\r
-    }\r
-    else\r
-    {\r
-      deletedHiddenColumns = colSel.compensateForEdit(command.position,\r
-          command.number);\r
-      if (selectionGroup != null)\r
-      {\r
-        selectionGroup.adjustForRemoveRight(command.position);\r
-      }\r
-    }\r
-  }\r
-\r
-  void paste(Edit command)\r
-  {\r
-    super.paste(command);\r
-    int column, j, jSize = command.seqs.length;\r
-    for (j = 0; j < jSize; j++)\r
-    {\r
-      if (command.position == 0)\r
-      {\r
-        command.seqs[j].setStart(start[j]);\r
-      }\r
-      else\r
-      {\r
-        column = command.seqs[j]\r
-            .findPosition(command.number + command.position) - 1;\r
-        command.seqs[j].setEnd(column);\r
-      }\r
-    }\r
-\r
-    if (command.position == 0)\r
-    {\r
-      colSel.compensateForEdit(0, -command.number);\r
-      if (selectionGroup != null)\r
-      {\r
-        selectionGroup.adjustForRemoveLeft( -command.number);\r
-      }\r
-    }\r
-\r
-    if (deletedHiddenColumns != null)\r
-    {\r
-      int[] region;\r
-      for (int i = 0; i < deletedHiddenColumns.size(); i++)\r
-      {\r
-        region = (int[]) deletedHiddenColumns.elementAt(i);\r
-        colSel.hideColumns(region[0], region[1]);\r
-      }\r
-    }\r
-  }\r
-\r
-  public int getSize()\r
-  {\r
-    return columnsDeleted;\r
-  }\r
-\r
-}\r
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+package jalview.commands;
+
+import java.util.*;
+
+import jalview.datamodel.*;
+import jalview.util.*;
+
+public class TrimRegionCommand
+    extends EditCommand
+{
+  public static String TRIM_LEFT = "TrimLeft";
+  public static String TRIM_RIGHT = "TrimRight";
+
+  public ColumnSelection colSel = null;
+
+  int[] start;
+
+  ShiftList shiftList;
+
+  SequenceGroup selectionGroup;
+
+  Vector deletedHiddenColumns;
+
+  int columnsDeleted;
+
+  public TrimRegionCommand(String description,
+                           String command,
+                           SequenceI[] seqs,
+                           int column,
+                           AlignmentI al,
+                           ColumnSelection colSel,
+                           SequenceGroup selectedRegion)
+  {
+    this.description = description;
+    this.selectionGroup = selectedRegion;
+    this.colSel = colSel;
+    if (command.equalsIgnoreCase(TRIM_LEFT))
+    {
+      if (column == 0)
+      {
+        return;
+      }
+
+      columnsDeleted = column;
+
+      edits = new Edit[]
+          {
+          new Edit(CUT, seqs, 0, column, al)};
+    }
+    else if (command.equalsIgnoreCase(TRIM_RIGHT))
+    {
+      int width = al.getWidth() - column - 1;
+      if (width < 2)
+      {
+        return;
+      }
+
+      columnsDeleted = width - 1;
+
+      edits = new Edit[]
+          {
+          new Edit(CUT, seqs, column + 1, width, al)};
+    }
+
+    //We need to keep a record of the sequence start
+    //in order to restore the state after a redo
+    int i, isize = edits[0].seqs.length;
+    start = new int[isize];
+    for (i = 0; i < isize; i++)
+    {
+      start[i] = edits[0].seqs[i].getStart();
+    }
+
+    performEdit(0,null);
+  }
+
+  void cut(Edit command)
+  {
+    int column, j, jSize = command.seqs.length;
+    for (j = 0; j < jSize; j++)
+    {
+      if (command.position == 0)
+      {
+        //This is a TRIM_LEFT command
+        column = command.seqs[j].findPosition(command.number);
+        command.seqs[j].setStart(column);
+      }
+      else
+      {
+        //This is a TRIM_RIGHT command
+        column = command.seqs[j].findPosition(command.position) - 1;
+        command.seqs[j].setEnd(column);
+      }
+    }
+
+    super.cut(command, null);
+
+    if (command.position == 0)
+    {
+      deletedHiddenColumns = colSel.compensateForEdit(0, command.number);
+      if (selectionGroup != null)
+      {
+        selectionGroup.adjustForRemoveLeft(command.number);
+      }
+    }
+    else
+    {
+      deletedHiddenColumns = colSel.compensateForEdit(command.position,
+          command.number);
+      if (selectionGroup != null)
+      {
+        selectionGroup.adjustForRemoveRight(command.position);
+      }
+    }
+  }
+
+  void paste(Edit command)
+  {
+    super.paste(command, null);
+    int column, j, jSize = command.seqs.length;
+    for (j = 0; j < jSize; j++)
+    {
+      if (command.position == 0)
+      {
+        command.seqs[j].setStart(start[j]);
+      }
+      else
+      {
+        column = command.seqs[j]
+            .findPosition(command.number + command.position) - 1;
+        command.seqs[j].setEnd(column);
+      }
+    }
+
+    if (command.position == 0)
+    {
+      colSel.compensateForEdit(0, -command.number);
+      if (selectionGroup != null)
+      {
+        selectionGroup.adjustForRemoveLeft( -command.number);
+      }
+    }
+
+    if (deletedHiddenColumns != null)
+    {
+      int[] region;
+      for (int i = 0; i < deletedHiddenColumns.size(); i++)
+      {
+        region = (int[]) deletedHiddenColumns.elementAt(i);
+        colSel.hideColumns(region[0], region[1]);
+      }
+    }
+  }
+
+  public int getSize()
+  {
+    return columnsDeleted;
+  }
+
+}
index 6f5b09d..1e51879 100755 (executable)
-/*\r
- * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2007 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
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
- */\r
-package jalview.gui;\r
-\r
-import java.util.*;\r
-\r
-import java.awt.event.*;\r
-import javax.swing.*;\r
-import javax.swing.event.*;\r
-\r
-import jalview.commands.*;\r
-import jalview.datamodel.*;\r
-import jalview.jbgui.*;\r
-import jalview.util.*;\r
-\r
-/**\r
- * DOCUMENT ME!\r
- *\r
- * @author $author$\r
- * @version $Revision$\r
- */\r
-public class RedundancyPanel\r
-    extends GSliderPanel implements Runnable\r
-{\r
-  AlignFrame af;\r
-  AlignmentPanel ap;\r
-  Stack historyList = new Stack(); // simpler than synching with alignFrame.\r
-  float[] redundancy;\r
-  SequenceI[] originalSequences;\r
-  JInternalFrame frame;\r
-  Vector redundantSeqs;\r
-\r
-  /**\r
-   * Creates a new RedundancyPanel object.\r
-   *\r
-   * @param ap DOCUMENT ME!\r
-   * @param af DOCUMENT ME!\r
-   */\r
-  public RedundancyPanel(final AlignmentPanel ap, AlignFrame af)\r
-  {\r
-    this.ap = ap;\r
-    this.af = af;\r
-    redundantSeqs = new Vector();\r
-\r
-    slider.addChangeListener(new ChangeListener()\r
-    {\r
-      public void stateChanged(ChangeEvent evt)\r
-      {\r
-        valueField.setText(slider.getValue() + "");\r
-        sliderValueChanged();\r
-      }\r
-    });\r
-\r
-    applyButton.setText("Remove");\r
-    allGroupsCheck.setVisible(false);\r
-    slider.setMinimum(0);\r
-    slider.setMaximum(100);\r
-    slider.setValue(100);\r
-\r
-    Thread worker = new Thread(this);\r
-    worker.start();\r
-\r
-    frame = new JInternalFrame();\r
-    frame.setContentPane(this);\r
-    Desktop.addInternalFrame(frame, "Redundancy threshold selection", 400,\r
-                             100, false);\r
-    frame.addInternalFrameListener(new InternalFrameAdapter()\r
-    {\r
-      public void internalFrameClosing(InternalFrameEvent evt)\r
-      {\r
-        ap.idPanel.idCanvas.setHighlighted(null);\r
-      }\r
-    }\r
-    );\r
-\r
-  }\r
-\r
-  /**\r
-   * This is a copy of remove redundancy in jalivew.datamodel.Alignment\r
-   * except we dont want to remove redundancy, just calculate once\r
-   * so we can use the slider to dynamically hide redundant sequences\r
-   *\r
-   * @param threshold DOCUMENT ME!\r
-   * @param sel DOCUMENT ME!\r
-   *\r
-   * @return DOCUMENT ME!\r
-   */\r
-  public void run()\r
-  {\r
-    JProgressBar progress = new JProgressBar();\r
-    progress.setIndeterminate(true);\r
-    southPanel.add(progress, java.awt.BorderLayout.SOUTH);\r
-\r
-    label.setText("Calculating....");\r
-\r
-    slider.setVisible(false);\r
-    applyButton.setEnabled(false);\r
-    valueField.setVisible(false);\r
-\r
-    validate();\r
-\r
-    String[] omitHidden = null;\r
-\r
-    SequenceGroup sg = ap.av.getSelectionGroup();\r
-    int height;\r
-\r
-    int start, end;\r
-\r
-    if ( (sg != null) && (sg.getSize() >= 1))\r
-    {\r
-      originalSequences = sg.getSequencesInOrder(ap.av.alignment);\r
-      start = sg.getStartRes();\r
-      end = sg.getEndRes();\r
-    }\r
-    else\r
-    {\r
-      originalSequences = ap.av.alignment.getSequencesArray();\r
-      start = 0;\r
-      end = ap.av.alignment.getWidth();\r
-    }\r
-\r
-    height = originalSequences.length;\r
-\r
-    redundancy = new float[height];\r
-    for (int i = 0; i < height; i++)\r
-    {\r
-      redundancy[i] = 0f;\r
-    }\r
-\r
-    if (ap.av.hasHiddenColumns)\r
-    {\r
-      omitHidden = ap.av.getViewAsString(sg != null);\r
-    }\r
-\r
-    // long start = System.currentTimeMillis();\r
-\r
-    float pid;\r
-    String seqi, seqj;\r
-    for (int i = 0; i < height; i++)\r
-    {\r
-\r
-      for (int j = 0; j < i; j++)\r
-      {\r
-        if (i == j)\r
-        {\r
-          continue;\r
-        }\r
-\r
-        if (omitHidden == null)\r
-        {\r
-          seqi = originalSequences[i].getSequenceAsString(start, end);\r
-          seqj = originalSequences[j].getSequenceAsString(start, end);\r
-        }\r
-        else\r
-        {\r
-          seqi = omitHidden[i];\r
-          seqj = omitHidden[j];\r
-        }\r
-\r
-        pid = Comparison.PID(seqi, seqj);\r
-\r
-        if (seqj.length() < seqi.length())\r
-        {\r
-          redundancy[j] = Math.max(pid, redundancy[j]);\r
-        }\r
-        else\r
-        {\r
-          redundancy[i] = Math.max(pid, redundancy[i]);\r
-        }\r
-\r
-      }\r
-    }\r
-\r
-    progress.setIndeterminate(false);\r
-    progress.setVisible(false);\r
-    progress = null;\r
-\r
-    label.setText("Enter the redundancy threshold");\r
-    slider.setVisible(true);\r
-    applyButton.setEnabled(true);\r
-    valueField.setVisible(true);\r
-\r
-    validate();\r
-    // System.out.println((System.currentTimeMillis()-start));\r
-  }\r
-\r
-  void sliderValueChanged()\r
-  {\r
-    if (redundancy == null)\r
-    {\r
-      return;\r
-    }\r
-\r
-    float value = slider.getValue();\r
-\r
-    for (int i = 0; i < redundancy.length; i++)\r
-    {\r
-      if (value > redundancy[i])\r
-      {\r
-        redundantSeqs.remove(originalSequences[i]);\r
-      }\r
-      else if (!redundantSeqs.contains(originalSequences[i]))\r
-      {\r
-        redundantSeqs.add(originalSequences[i]);\r
-      }\r
-\r
-    }\r
-\r
-    ap.idPanel.idCanvas.setHighlighted(redundantSeqs);\r
-  }\r
-\r
-  /**\r
-   * DOCUMENT ME!\r
-   *\r
-   * @param e DOCUMENT ME!\r
-   */\r
-  public void applyButton_actionPerformed(ActionEvent e)\r
-  {\r
-    Vector del = new Vector();\r
-\r
-    undoButton.setEnabled(true);\r
-\r
-    float value = slider.getValue();\r
-    SequenceGroup sg = ap.av.getSelectionGroup();\r
-\r
-    for (int i = 0; i < redundancy.length; i++)\r
-    {\r
-      if (value <= redundancy[i])\r
-      {\r
-        del.addElement(originalSequences[i]);\r
-      }\r
-    }\r
-\r
-    // This has to be done before the restoreHistoryItem method of alignFrame will\r
-    // actually restore these sequences.\r
-    if (del.size() > 0)\r
-    {\r
-      SequenceI[] deleted = new SequenceI[del.size()];\r
-\r
-      int width = 0;\r
-      for (int i = 0; i < del.size(); i++)\r
-      {\r
-        deleted[i] = (SequenceI) del.elementAt(i);\r
-        if (deleted[i].getLength() > width)\r
-        {\r
-          width = deleted[i].getLength();\r
-        }\r
-      }\r
-\r
-      EditCommand cut = new EditCommand("Remove Redundancy",\r
-                                        EditCommand.CUT, deleted, 0, width,\r
-                                        ap.av.alignment);\r
-\r
-      for (int i = 0; i < del.size(); i++)\r
-      {\r
-        ap.av.alignment.deleteSequence(deleted[i]);\r
-        PaintRefresher.Refresh(this,\r
-                               ap.av.getSequenceSetId(),\r
-                               true,\r
-                               true);\r
-        if (sg != null)\r
-        {\r
-          sg.deleteSequence(deleted[i], false);\r
-        }\r
-      }\r
-\r
-      historyList.push(cut);\r
-\r
-      ap.alignFrame.addHistoryItem(cut);\r
-\r
-      ap.av.firePropertyChange("alignment", null,\r
-                               ap.av.getAlignment().getSequences());\r
-    }\r
-\r
-  }\r
-\r
-  /**\r
-   * DOCUMENT ME!\r
-   *\r
-   * @param e DOCUMENT ME!\r
-   */\r
-  public void undoButton_actionPerformed(ActionEvent e)\r
-  {\r
-    CommandI command = (CommandI) historyList.pop();\r
-    command.undoCommand();\r
-\r
-    if (ap.av.historyList.contains(command))\r
-    {\r
-      ap.av.historyList.remove(command);\r
-      af.updateEditMenuBar();\r
-    }\r
-\r
-    ap.paintAlignment(true);\r
-\r
-    if (historyList.size() == 0)\r
-    {\r
-      undoButton.setEnabled(false);\r
-    }\r
-  }\r
-\r
-  /**\r
-   * DOCUMENT ME!\r
-   *\r
-   * @param e DOCUMENT ME!\r
-   */\r
-  public void valueField_actionPerformed(ActionEvent e)\r
-  {\r
-    try\r
-    {\r
-      int i = Integer.parseInt(valueField.getText());\r
-      slider.setValue(i);\r
-    }\r
-    catch (Exception ex)\r
-    {\r
-      valueField.setText(slider.getValue() + "");\r
-    }\r
-  }\r
-\r
-}\r
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+package jalview.gui;
+
+import java.util.*;
+
+import java.awt.event.*;
+import javax.swing.*;
+import javax.swing.event.*;
+
+import jalview.commands.*;
+import jalview.datamodel.*;
+import jalview.jbgui.*;
+import jalview.util.*;
+
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class RedundancyPanel
+    extends GSliderPanel implements Runnable
+{
+  AlignFrame af;
+  AlignmentPanel ap;
+  Stack historyList = new Stack(); // simpler than synching with alignFrame.
+  float[] redundancy;
+  SequenceI[] originalSequences;
+  JInternalFrame frame;
+  Vector redundantSeqs;
+
+  /**
+   * Creates a new RedundancyPanel object.
+   *
+   * @param ap DOCUMENT ME!
+   * @param af DOCUMENT ME!
+   */
+  public RedundancyPanel(final AlignmentPanel ap, AlignFrame af)
+  {
+    this.ap = ap;
+    this.af = af;
+    redundantSeqs = new Vector();
+
+    slider.addChangeListener(new ChangeListener()
+    {
+      public void stateChanged(ChangeEvent evt)
+      {
+        valueField.setText(slider.getValue() + "");
+        sliderValueChanged();
+      }
+    });
+
+    applyButton.setText("Remove");
+    allGroupsCheck.setVisible(false);
+    slider.setMinimum(0);
+    slider.setMaximum(100);
+    slider.setValue(100);
+
+    Thread worker = new Thread(this);
+    worker.start();
+
+    frame = new JInternalFrame();
+    frame.setContentPane(this);
+    Desktop.addInternalFrame(frame, "Redundancy threshold selection", 400,
+                             100, false);
+    frame.addInternalFrameListener(new InternalFrameAdapter()
+    {
+      public void internalFrameClosing(InternalFrameEvent evt)
+      {
+        ap.idPanel.idCanvas.setHighlighted(null);
+      }
+    }
+    );
+
+  }
+
+  /**
+   * This is a copy of remove redundancy in jalivew.datamodel.Alignment
+   * except we dont want to remove redundancy, just calculate once
+   * so we can use the slider to dynamically hide redundant sequences
+   *
+   * @param threshold DOCUMENT ME!
+   * @param sel DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public void run()
+  {
+    JProgressBar progress = new JProgressBar();
+    progress.setIndeterminate(true);
+    southPanel.add(progress, java.awt.BorderLayout.SOUTH);
+
+    label.setText("Calculating....");
+
+    slider.setVisible(false);
+    applyButton.setEnabled(false);
+    valueField.setVisible(false);
+
+    validate();
+
+    String[] omitHidden = null;
+
+    SequenceGroup sg = ap.av.getSelectionGroup();
+    int height;
+
+    int start, end;
+
+    if ( (sg != null) && (sg.getSize() >= 1))
+    {
+      originalSequences = sg.getSequencesInOrder(ap.av.alignment);
+      start = sg.getStartRes();
+      end = sg.getEndRes();
+    }
+    else
+    {
+      originalSequences = ap.av.alignment.getSequencesArray();
+      start = 0;
+      end = ap.av.alignment.getWidth();
+    }
+
+    height = originalSequences.length;
+
+    redundancy = new float[height];
+    for (int i = 0; i < height; i++)
+    {
+      redundancy[i] = 0f;
+    }
+
+    if (ap.av.hasHiddenColumns)
+    {
+      omitHidden = ap.av.getViewAsString(sg != null);
+    }
+
+    // long start = System.currentTimeMillis();
+
+    float pid;
+    String seqi, seqj;
+    for (int i = 0; i < height; i++)
+    {
+
+      for (int j = 0; j < i; j++)
+      {
+        if (i == j)
+        {
+          continue;
+        }
+
+        if (omitHidden == null)
+        {
+          seqi = originalSequences[i].getSequenceAsString(start, end);
+          seqj = originalSequences[j].getSequenceAsString(start, end);
+        }
+        else
+        {
+          seqi = omitHidden[i];
+          seqj = omitHidden[j];
+        }
+
+        pid = Comparison.PID(seqi, seqj);
+
+        if (seqj.length() < seqi.length())
+        {
+          redundancy[j] = Math.max(pid, redundancy[j]);
+        }
+        else
+        {
+          redundancy[i] = Math.max(pid, redundancy[i]);
+        }
+
+      }
+    }
+
+    progress.setIndeterminate(false);
+    progress.setVisible(false);
+    progress = null;
+
+    label.setText("Enter the redundancy threshold");
+    slider.setVisible(true);
+    applyButton.setEnabled(true);
+    valueField.setVisible(true);
+
+    validate();
+    // System.out.println((System.currentTimeMillis()-start));
+  }
+
+  void sliderValueChanged()
+  {
+    if (redundancy == null)
+    {
+      return;
+    }
+
+    float value = slider.getValue();
+
+    for (int i = 0; i < redundancy.length; i++)
+    {
+      if (value > redundancy[i])
+      {
+        redundantSeqs.remove(originalSequences[i]);
+      }
+      else if (!redundantSeqs.contains(originalSequences[i]))
+      {
+        redundantSeqs.add(originalSequences[i]);
+      }
+
+    }
+
+    ap.idPanel.idCanvas.setHighlighted(redundantSeqs);
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param e DOCUMENT ME!
+   */
+  public void applyButton_actionPerformed(ActionEvent e)
+  {
+    Vector del = new Vector();
+
+    undoButton.setEnabled(true);
+
+    float value = slider.getValue();
+    SequenceGroup sg = ap.av.getSelectionGroup();
+
+    for (int i = 0; i < redundancy.length; i++)
+    {
+      if (value <= redundancy[i])
+      {
+        del.addElement(originalSequences[i]);
+      }
+    }
+
+    // This has to be done before the restoreHistoryItem method of alignFrame will
+    // actually restore these sequences.
+    if (del.size() > 0)
+    {
+      SequenceI[] deleted = new SequenceI[del.size()];
+
+      int width = 0;
+      for (int i = 0; i < del.size(); i++)
+      {
+        deleted[i] = (SequenceI) del.elementAt(i);
+        if (deleted[i].getLength() > width)
+        {
+          width = deleted[i].getLength();
+        }
+      }
+
+      EditCommand cut = new EditCommand("Remove Redundancy",
+                                        EditCommand.CUT, deleted, 0, width,
+                                        ap.av.alignment);
+
+      for (int i = 0; i < del.size(); i++)
+      {
+        ap.av.alignment.deleteSequence(deleted[i]);
+        PaintRefresher.Refresh(this,
+                               ap.av.getSequenceSetId(),
+                               true,
+                               true);
+        if (sg != null)
+        {
+          sg.deleteSequence(deleted[i], false);
+        }
+      }
+
+      historyList.push(cut);
+
+      ap.alignFrame.addHistoryItem(cut);
+
+      ap.av.firePropertyChange("alignment", null,
+                               ap.av.getAlignment().getSequences());
+    }
+
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param e DOCUMENT ME!
+   */
+  public void undoButton_actionPerformed(ActionEvent e)
+  {
+    CommandI command = (CommandI) historyList.pop();
+    command.undoCommand(af.getViewAlignments());
+
+    if (ap.av.historyList.contains(command))
+    {
+      ap.av.historyList.remove(command);
+      af.updateEditMenuBar();
+    }
+
+    ap.paintAlignment(true);
+
+    if (historyList.size() == 0)
+    {
+      undoButton.setEnabled(false);
+    }
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param e DOCUMENT ME!
+   */
+  public void valueField_actionPerformed(ActionEvent e)
+  {
+    try
+    {
+      int i = Integer.parseInt(valueField.getText());
+      slider.setValue(i);
+    }
+    catch (Exception ex)
+    {
+      valueField.setText(slider.getValue() + "");
+    }
+  }
+
+}