X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=7db8f01805fec6f67eb2650b1b925eb7e018c4ef;hb=1146ae7f678127be7796772b228d5fc6823435d4;hp=e38d96d89ad9a3ad6cf75986c8a408e8be85afc5;hpb=9caf82ff1918a16e7ace4b9590373d584e5e4e9b;p=jalview.git

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index e38d96d..7db8f01 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * 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
@@ -24,18 +24,18 @@ import java.util.*;
 
 import java.awt.*;
 import java.awt.datatransfer.*;
+import java.awt.dnd.*;
 import java.awt.event.*;
 import java.awt.print.*;
 import javax.swing.*;
 
 import jalview.analysis.*;
+import jalview.commands.*;
 import jalview.datamodel.*;
 import jalview.io.*;
 import jalview.jbgui.*;
 import jalview.schemes.*;
-import jalview.commands.*;
 import jalview.ws.*;
-import java.awt.dnd.*;
 
 /**
  * DOCUMENT ME!
@@ -43,7 +43,8 @@ import java.awt.dnd.*;
  * @author $author$
  * @version $Revision$
  */
-public class AlignFrame extends GAlignFrame implements DropTargetListener
+public class AlignFrame
+    extends GAlignFrame implements DropTargetListener
 {
   /** DOCUMENT ME!! */
   public static final int DEFAULT_WIDTH = 700;
@@ -62,7 +63,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
   String fileName = null;
 
-  private int treeCount = 0;
 
   /**
    * Creates a new AlignFrame object.
@@ -127,9 +127,13 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     String sortby = jalview.bin.Cache.getDefault("SORT_ALIGNMENT", "No sort");
 
     if (sortby.equals("Id"))
+    {
       sortIDMenuItem_actionPerformed(null);
+    }
     else if (sortby.equals("Pairwise Identity"))
+    {
       sortPairwiseMenuItem_actionPerformed(null);
+    }
 
     if (Desktop.desktop != null)
    {
@@ -144,6 +148,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
      wrapMenuItem_actionPerformed(null);
    }
 
+    if (jalview.bin.Cache.getDefault("SHOW_OVERVIEW",false))
+    {
+      this.overviewMenuItem_actionPerformed(null);
+    }
+
    addKeyListener();
 
   }
@@ -157,7 +166,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
   void addKeyListener()
   {
-      final AlignFrame af = this;
       addKeyListener(new KeyAdapter()
       {
         public void keyPressed(KeyEvent evt)
@@ -171,17 +179,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
           switch (evt.getKeyCode())
           {
-            case KeyEvent.VK_G:
-              Desktop.instance.gatherViews(af);
-              break;
-
-            case KeyEvent.VK_X:
-              if (!evt.isControlDown())
-              {
-                Desktop.instance.explodeViews(af);
-              }
-              break;
-
 
             case 27: // escape key
               deselectAllSequenceMenuItem_actionPerformed(null);
@@ -189,35 +186,36 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
               break;
 
             case KeyEvent.VK_DOWN:
+             if (evt.isAltDown() || !viewport.cursorMode)
+              moveSelectedSequences(false);
               if (viewport.cursorMode)
-              {
                 alignPanel.seqPanel.moveCursor(0, 1);
-              }
-              else
-                moveSelectedSequences(false);
               break;
 
             case KeyEvent.VK_UP:
+            if (evt.isAltDown() || !viewport.cursorMode)
+              moveSelectedSequences(true);
               if (viewport.cursorMode)
-              {
                 alignPanel.seqPanel.moveCursor(0, -1);
-              }
-              else
-                moveSelectedSequences(true);
+
               break;
 
             case KeyEvent.VK_LEFT:
-              if (viewport.cursorMode)
-              {
+            if (evt.isAltDown() || !viewport.cursorMode)
+              slideSequences(false,
+                             alignPanel.seqPanel.getKeyboardNo1());
+            else
                 alignPanel.seqPanel.moveCursor( -1, 0);
-              }
+
+
               break;
 
             case KeyEvent.VK_RIGHT:
-              if (viewport.cursorMode)
-              {
+            if (evt.isAltDown() || !viewport.cursorMode)
+              slideSequences(true,
+                             alignPanel.seqPanel.getKeyboardNo1());
+            else
                 alignPanel.seqPanel.moveCursor(1, 0);
-              }
               break;
 
             case KeyEvent.VK_SPACE:
@@ -236,9 +234,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
                 cut_actionPerformed(null);
               }
               else
+            {
                 alignPanel.seqPanel.deleteGapAtCursor(evt.isControlDown()
                                            || evt.isShiftDown()
                                            || evt.isAltDown());
+            }
 
               break;
 
@@ -321,14 +321,17 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
               SequenceGroup sg = viewport.getSelectionGroup();
               if (toggleSeqs)
               {
-                if (sg != null && sg.getSize(false) != viewport.alignment.getHeight())
+                if (sg != null && sg.getSize() != viewport.alignment.getHeight())
                 {
                   hideSelSequences_actionPerformed(null);
                   hide = true;
                 }
-                else if (! (toggleCols && viewport.colSel.getSelected().size() > 0))
+              else if (! (toggleCols &&
+                          viewport.colSel.getSelected().size() > 0))
+              {
                   showAllSeqs_actionPerformed(null);
               }
+            }
 
               if (toggleCols)
               {
@@ -336,31 +339,61 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
                 {
                   hideSelColumns_actionPerformed(null);
                   if (!toggleSeqs)
+                {
                     viewport.selectionGroup = sg;
                 }
+              }
                 else if (!hide)
+              {
                   showAllColumns_actionPerformed(null);
               }
+            }
               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;
           }
         }
+
+      public void keyReleased(KeyEvent evt)
+      {
+        switch(evt.getKeyCode())
+        {
+          case KeyEvent.VK_LEFT:
+            if (evt.isAltDown() || !viewport.cursorMode)
+              viewport.firePropertyChange("alignment", null,
+                                          viewport.getAlignment().getSequences());
+            break;
+
+          case KeyEvent.VK_RIGHT:
+            if (evt.isAltDown() || !viewport.cursorMode)
+              viewport.firePropertyChange("alignment", null,
+                                          viewport.getAlignment().getSequences());
+            break;
+        }
+      }
       });
   }
 
@@ -372,6 +405,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
     alignPanels.addElement(ap);
 
+    PaintRefresher.Register(ap, ap.av.getSequenceSetId());
+
     int aSize = alignPanels.size();
 
     tabbedPane.setVisible(aSize>1 || ap.av.viewName!=null);
@@ -384,24 +419,37 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     {
       if (aSize == 2)
       {
-        AlignmentPanel first = (AlignmentPanel) alignPanels.firstElement();
-        tabbedPane.addTab(first.av.viewName==null?"Original":first.av.viewName,first);
-
-        this.getContentPane().add(tabbedPane, BorderLayout.CENTER);
+        setInitialTabVisible();
       }
 
-      tabbedPane.addTab(ap.av.viewName==null?"Original":ap.av.viewName, ap);
+      expandViews.setEnabled(true);
+      gatherViews.setEnabled(true);
+      tabbedPane.addTab(ap.av.viewName, ap);
 
       ap.setVisible(false);
     }
 
     if(newPanel)
     {
-      ap.av.updateConsensus(ap);
+      if (ap.av.padGaps)
+      {
+        ap.av.alignment.padGaps();
+      }
       ap.av.updateConservation(ap);
+      ap.av.updateConsensus(ap);
     }
   }
 
+  public void setInitialTabVisible()
+  {
+    expandViews.setEnabled(true);
+    gatherViews.setEnabled(true);
+    tabbedPane.setVisible(true);
+    AlignmentPanel first = (AlignmentPanel) alignPanels.firstElement();
+    tabbedPane.addTab(first.av.viewName,first);
+    this.getContentPane().add(tabbedPane, BorderLayout.CENTER);
+  }
+
 
   public AlignViewport getViewport()
   {
@@ -462,12 +510,17 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
    */
   void setMenusFromViewport(AlignViewport av)
   {
+    padGapsMenuitem.setSelected(av.padGaps);
     colourTextMenuItem.setSelected(av.showColourText);
     abovePIDThreshold.setSelected(av.getAbovePIDThreshold());
     conservationMenuItem.setSelected(av.getConservationSelected());
     seqLimits.setSelected(av.getShowJVSuffix());
+    idRightAlign.setSelected(av.rightAlignIds);
     renderGapsMenuItem.setSelected(av.renderGaps);
     wrapMenuItem.setSelected(av.wrapAlignment);
+    scaleAbove.setVisible(av.wrapAlignment);
+    scaleLeft.setVisible(av.wrapAlignment);
+    scaleRight.setVisible(av.wrapAlignment);
     annotationPanelMenuItem.setState(av.showAnnotation);
     viewBoxesMenuItem.setSelected(av.showBoxes);
     viewTextMenuItem.setSelected(av.showText);
@@ -487,7 +540,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   public void setProgressBar(String message, long id)
   {
     if(progressBars == null)
+    {
       progressBars = new Hashtable();
+    }
 
     JPanel progressPanel;
     GridLayout layout = (GridLayout) statusPanel.getLayout();
@@ -498,7 +553,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
        progressBars.remove( progressPanel );
        progressPanel = null;
        if(message!=null)
+      {
          statusBar.setText(message);
+      }
 
        layout.setRows(layout.getRows() - 1);
      }
@@ -554,32 +611,42 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     {
       if(currentFileFormat.equals("Jalview"))
       {
-        this.closeMenuItem_actionPerformed(true);
-      }
-      else
-      {
-        viewport.alignment.deleteAllGroups();
-        while (viewport.alignment.getHeight() > 0)
+        JInternalFrame [] frames = Desktop.desktop.getAllFrames();
+        for(int i=0; i<frames.length; i++)
         {
-          viewport.alignment.deleteSequence(0);
-        }
+          if (frames[i] instanceof AlignFrame
+              && frames[i] != this
+              && ( (AlignFrame) frames[i]).fileName.equals(fileName))
+          {
+            try
+            {
+              frames[i].setSelected(true);
+              Desktop.instance.closeAssociatedWindows();
+          }
+            catch (java.beans.PropertyVetoException ex)
+            {}
+          }
 
-        viewport.historyList.clear();
-        viewport.redoList.clear();
-        Alignment dset = viewport.alignment.getDataset();
-        while (dset.getHeight() > 0)
-        {
-          dset.deleteSequence(0);
         }
+        Desktop.instance.closeAssociatedWindows();
 
-        firePropertyChange("Alignment", null, null);
-
-        updateEditMenuBar();
+        FileLoader loader = new FileLoader();
+        String protocol = fileName.startsWith("http:")? "URL":"File";
+        loader.LoadFile(viewport, fileName, protocol, currentFileFormat);
       }
+      else
+      {
+        Rectangle bounds = this.getBounds();
+
+        FileLoader loader = new FileLoader();
+        String protocol = fileName.startsWith("http:") ? "URL" : "File";
+        AlignFrame newframe =
+            loader.LoadFileWaitTillLoaded(fileName, protocol, currentFileFormat);
 
-      FileLoader loader = new FileLoader();
-      loader.LoadFile(viewport, fileName, "File", currentFileFormat);
+        newframe.setBounds(bounds);
 
+        this.closeMenuItem_actionPerformed(true);
+      }
     }
   }
 
@@ -597,11 +664,18 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
   public void save_actionPerformed(ActionEvent e)
   {
-    if(fileName==null || currentFileFormat==null)
+    if(fileName==null
+       || currentFileFormat==null
+       || fileName.startsWith("http")
+        )
+    {
       saveAs_actionPerformed(null);
+    }
     else
+    {
       saveAlignment(fileName, currentFileFormat);
   }
+  }
 
   /**
    * DOCUMENT ME!
@@ -652,6 +726,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
   public boolean saveAlignment(String file, String format)
   {
+    boolean success = true;
+
     if (format.equalsIgnoreCase("Jalview"))
     {
       String shortName = title;
@@ -662,15 +738,12 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
             java.io.File.separatorChar) + 1);
       }
 
-      new Jalview2XML().SaveAlignment(this, file, shortName);
+      success = new Jalview2XML().SaveAlignment(this, file, shortName);
 
       statusBar.setText("Successfully saved to file: "
                           +fileName+" in "
                           +format +" format.");
 
-
-      // USE Jalview2XML to save this file
-      return true;
     }
     else
     {
@@ -686,8 +759,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
             JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
 
         if (reply == JOptionPane.YES_OPTION)
+        {
           omitHidden = viewport.getViewAsString(false);
       }
+      }
 
       String output = new FormatAdapter().formatSequences(
           format,
@@ -696,28 +771,39 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
       if (output == null)
       {
-        return false;
+        success = false;
       }
-
-      try
-      {
-        java.io.PrintWriter out = new java.io.PrintWriter(
-            new java.io.FileWriter(file));
-
-        out.print(output);
-        out.close();
-        this.setTitle(file);
-        statusBar.setText("Successfully saved to file: "
-                          +fileName+" in "
-                          +format +" format.");
-        return true;
-      }
-      catch (Exception ex)
+      else
       {
-        ex.printStackTrace();
+        try
+        {
+          java.io.PrintWriter out = new java.io.PrintWriter(
+              new java.io.FileWriter(file));
+
+          out.print(output);
+          out.close();
+          this.setTitle(file);
+          statusBar.setText("Successfully saved to file: "
+                            + fileName + " in "
+                            + format + " format.");
+        }
+        catch (Exception ex)
+        {
+          success = false;
+          ex.printStackTrace();
+        }
       }
     }
-    return false;
+
+    if (!success)
+    {
+      JOptionPane.showInternalMessageDialog(
+          this, "Couldn't save file: " + fileName,
+          "Error Saving File",
+          JOptionPane.WARNING_MESSAGE);
+    }
+
+    return success;
   }
 
   /**
@@ -793,6 +879,13 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     alignPanel.makeEPS(f);
   }
 
+
+  public void pageSetup_actionPerformed(ActionEvent e)
+  {
+    PrinterJob printJob = PrinterJob.getPrinterJob();
+    PrintThread.pf = printJob.pageDialog(printJob.defaultPage());
+  }
+
   /**
    * DOCUMENT ME!
    *
@@ -801,7 +894,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   public void printMenuItem_actionPerformed(ActionEvent e)
   {
     //Putting in a thread avoids Swing painting problems
-    PrintThread thread = new PrintThread();
+    PrintThread thread = new PrintThread(alignPanel);
     thread.start();
   }
 
@@ -815,7 +908,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   {
     new AnnotationExporter().exportAnnotations(
       alignPanel,
-      viewport.alignment.getAlignmentAnnotation()
+        viewport.showAnnotation ? viewport.alignment.getAlignmentAnnotation() : null,
+      viewport.alignment.getGroups()
         );
   }
 
@@ -850,43 +944,56 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   public void closeMenuItem_actionPerformed(boolean closeAllTabs)
   {
     if(alignPanels!=null && alignPanels.size()<2)
+    {
       closeAllTabs = true;
+    }
 
     try
     {
       if(alignPanels!=null)
       {
         if (closeAllTabs)
+        {
           for (int i = 0; i < alignPanels.size(); i++)
           {
             AlignmentPanel ap = (AlignmentPanel) alignPanels.elementAt(i);
+            jalview.structure.StructureSelectionManager.getStructureSelectionManager()
+                .removeStructureViewerListener(ap.seqPanel, null);
             PaintRefresher.RemoveComponent(ap.seqPanel.seqCanvas);
             PaintRefresher.RemoveComponent(ap.idPanel.idCanvas);
             PaintRefresher.RemoveComponent(ap);
+            ap.av.alignment = null;
           }
+        }
         else
         {
           int index = tabbedPane.getSelectedIndex();
 
-          tabbedPane.removeTabAt(index);
           alignPanels.removeElement(alignPanel);
           PaintRefresher.RemoveComponent(alignPanel.seqPanel.seqCanvas);
           PaintRefresher.RemoveComponent(alignPanel.idPanel.idCanvas);
           PaintRefresher.RemoveComponent(alignPanel);
+          viewport.alignment = null;
           alignPanel = null;
           viewport = null;
+
+          tabbedPane.removeTabAt(index);
           tabbedPane.validate();
 
           if(index==tabbedPane.getTabCount())
+          {
             index --;
+          }
 
           this.tabSelectionChanged(index);
         }
       }
 
       if (closeAllTabs)
+      {
         this.setClosed(true);
     }
+    }
     catch (Exception ex)
     {
       ex.printStackTrace();
@@ -951,10 +1058,16 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     viewport.redoList.push(command);
     command.undoCommand();
 
-    viewport.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null;
+    AlignViewport originalSource = getOriginatingSource(command);
     updateEditMenuBar();
-    viewport.firePropertyChange("alignment", null,
-                                viewport.getAlignment().getSequences());
+
+    if(originalSource!=null)
+    {
+      originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null;
+      originalSource.firePropertyChange("alignment",
+                                        null,
+                                        originalSource.alignment.getSequences());
+    }
   }
 
   /**
@@ -964,15 +1077,68 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
    */
   protected void redoMenuItem_actionPerformed(ActionEvent e)
   {
+    if(viewport.redoList.size()<1)
+    {
+      return;
+    }
+
     CommandI command = (CommandI) viewport.redoList.pop();
     viewport.historyList.push(command);
     command.doCommand();
-    viewport.hasHiddenColumns = viewport.colSel.getHiddenColumns()!=null;
 
+    AlignViewport originalSource = getOriginatingSource(command);
     updateEditMenuBar();
-    viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
+
+    if(originalSource!=null)
+    {
+      originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null;
+      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;
+  }
 
   /**
    * DOCUMENT ME!
@@ -994,14 +1160,14 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       {
         SequenceI seq = viewport.alignment.getSequenceAt(i);
 
-        if (!sg.getSequences(false).contains(seq))
+        if (!sg.getSequences(null).contains(seq))
         {
           continue;
         }
 
         SequenceI temp = viewport.alignment.getSequenceAt(i - 1);
 
-        if (sg.getSequences(false).contains(temp))
+        if (sg.getSequences(null).contains(temp))
         {
           continue;
         }
@@ -1016,14 +1182,14 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       {
         SequenceI seq = viewport.alignment.getSequenceAt(i);
 
-        if (!sg.getSequences(false).contains(seq))
+        if (!sg.getSequences(null).contains(seq))
         {
           continue;
         }
 
         SequenceI temp = viewport.alignment.getSequenceAt(i + 1);
 
-        if (sg.getSequences(false).contains(temp))
+        if (sg.getSequences(null).contains(temp))
         {
           continue;
         }
@@ -1033,11 +1199,102 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       }
     }
 
-    alignPanel.repaint();
+    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.add(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();
+  }
+
+
   /**
    * DOCUMENT ME!
    *
@@ -1068,6 +1325,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
     try
     {
+      jalview.gui.Desktop.internalCopy = true;
       //Its really worth setting the clipboard contents
       //to empty before setting the large StringSelection!!
       Toolkit.getDefaultToolkit().getSystemClipboard()
@@ -1100,19 +1358,21 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     {
       hiddenColumns =new Vector();
       int hiddenOffset = viewport.getSelectionGroup().getStartRes();
-      for(int i=0; i<viewport.getColumnSelection().getHiddenColumns().size(); i++)
+      for (int i = 0; i < viewport.getColumnSelection().getHiddenColumns().size();
+           i++)
       {
         int[] region = (int[])
             viewport.getColumnSelection().getHiddenColumns().elementAt(i);
 
-        hiddenColumns.addElement(new int[]{region[0]-hiddenOffset,
+        hiddenColumns.addElement(new int[]
+                                 {region[0] - hiddenOffset,
                           region[1]-hiddenOffset});
       }
     }
 
-
-
-    Desktop.jalviewClipboard = new Object[]{ seqs,
+    Desktop.jalviewClipboard = new Object[]
+        {
+        seqs,
         viewport.alignment.getDataset(),
         hiddenColumns};
     statusBar.setText("Copied "+seqs.length+" sequences to clipboard.");
@@ -1160,7 +1420,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       {
         str = (String) contents.getTransferData(DataFlavor.stringFlavor);
         if (str.length() < 1)
+        {
           return;
+        }
 
         format = new IdentifyFile().Identify(str, "Paste");
 
@@ -1195,7 +1457,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
      }
      else
      {
-       sequences = new FormatAdapter().readFile(str, "Paste", format);
+        sequences = new FormatAdapter().readFile(str, "Paste", format).
+            getSequencesArray();
      }
 
      AlignmentI alignment = null;
@@ -1205,10 +1468,14 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
           alignment = new Alignment(sequences);
 
           if (Desktop.jalviewClipboard != null)
+        {
             alignment.setDataset( (Alignment) Desktop.jalviewClipboard[1]);
+        }
           else
+        {
             alignment.setDataset(null);
       }
+      }
       else
       {
         alignment = viewport.getAlignment();
@@ -1218,7 +1485,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
         for (int i = 0; i < sequences.length; i++)
         {
           newseqs[i] = new Sequence(sequences[i].getName(),
-              sequences[i].getSequence(), sequences[i].getStart(),
+                                    sequences[i].getSequence(),
+                                    sequences[i].getStart(),
               sequences[i].getEnd());
 
           alignment.addSequence(newseqs[i]);
@@ -1346,20 +1614,16 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     }
 
     Vector seqs = new Vector();
-    int cutLength = sg.getEndRes()-sg.getStartRes()+1;
-    boolean seqsCut = false;
     SequenceI seq;
-    for (int i = 0; i < sg.getSize(false); i++)
+    for (int i = 0; i < sg.getSize(); i++)
     {
       seq = sg.getSequenceAt(i);
       seqs.addElement(seq);
-      if(seq.getLength()<=cutLength)
-        seqsCut = true;
     }
 
 
    // If the cut affects all sequences, remove highlighted columns
-   if (sg.getSize(false) == viewport.alignment.getHeight())
+   if (sg.getSize() == viewport.alignment.getHeight())
    {
      viewport.getColumnSelection().removeElements(sg.getStartRes(),
          sg.getEndRes() + 1);
@@ -1368,7 +1632,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
     SequenceI [] cut = new SequenceI[seqs.size()];
     for(int i=0; i<seqs.size(); i++)
+    {
       cut[i] = (SequenceI)seqs.elementAt(i);
+    }
 
 
     /*
@@ -1408,9 +1674,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   protected void deleteGroups_actionPerformed(ActionEvent e)
   {
     viewport.alignment.deleteAllGroups();
+    viewport.sequenceColours = null;
     viewport.setSelectionGroup(null);
     PaintRefresher.Refresh(this, viewport.getSequenceSetId());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1430,7 +1697,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
     sg.setEndRes(viewport.alignment.getWidth() - 1);
     viewport.setSelectionGroup(sg);
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
     PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());
   }
 
@@ -1451,8 +1718,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     viewport.setSelectionGroup(null);
     alignPanel.seqPanel.seqCanvas.highlightSearchResults(null);
     alignPanel.idPanel.idCanvas.searchResults = null;
-    alignPanel.repaint();
-    PaintRefresher.Refresh(this, viewport.getSequenceSetId());
+    alignPanel.paintAlignment(true);
+    PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());
   }
 
   /**
@@ -1477,13 +1744,15 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       sg.addOrRemove(viewport.getAlignment().getSequenceAt(i), false);
     }
 
-    PaintRefresher.Refresh(this, viewport.getSequenceSetId());
+    alignPanel.paintAlignment(true);
+
+    PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());
   }
 
   public void invertColSel_actionPerformed(ActionEvent e)
   {
     viewport.invertColumnSelection();
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
 
@@ -1515,15 +1784,24 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     if (colSel.size() > 0)
     {
       if(trimLeft)
+      {
         column = colSel.getMin();
+      }
       else
+      {
         column = colSel.getMax();
+      }
 
       SequenceI [] seqs;
       if(viewport.getSelectionGroup()!=null)
-        seqs = viewport.getSelectionGroup().getSequencesAsArray(true);
+      {
+        seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.
+            hiddenRepSequences);
+      }
       else
+      {
         seqs = viewport.alignment.getSequencesArray();
+      }
 
 
       TrimRegionCommand trimRegion;
@@ -1536,6 +1814,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
                                     viewport.alignment,
                                     viewport.colSel,
                                     viewport.selectionGroup);
+        viewport.setStartRes(0);
       }
      else
      {
@@ -1583,19 +1862,22 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     SequenceI[] seqs;
     if (viewport.getSelectionGroup() != null)
     {
-      seqs = viewport.getSelectionGroup().getSequencesAsArray(true);
+      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.getGapCharacter());
+                                viewport.alignment);
 
     addHistoryItem(removeGapCols);
 
@@ -1611,7 +1893,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
    // if (viewport.hasHiddenColumns)
    //   viewport.getColumnSelection().compensateForEdits(shifts);
    viewport.setStartRes(seq.findIndex(startRes)-1);
-   viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
+    viewport.firePropertyChange("alignment", null,
+                                viewport.getAlignment().getSequences());
 
   }
 
@@ -1627,12 +1910,15 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     SequenceI[] seqs;
     if (viewport.getSelectionGroup() != null)
     {
-      seqs = viewport.getSelectionGroup().getSequencesAsArray(true);
+      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
@@ -1640,13 +1926,14 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     int startRes = seq.findPosition(viewport.startRes);
 
     addHistoryItem(new RemoveGapsCommand("Remove Gaps",
-                                           seqs,
-                                           start, end,
-                     viewport.getGapCharacter()));
+                                         seqs,
+                                         start, end,
+                                         viewport.alignment));
 
     viewport.setStartRes(seq.findIndex(startRes)-1);
 
-    viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
+    viewport.firePropertyChange("alignment", null,
+                                viewport.getAlignment().getSequences());
 
   }
 
@@ -1671,11 +1958,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
    */
   public void findMenuItem_actionPerformed(ActionEvent e)
   {
-    JInternalFrame frame = new JInternalFrame();
-    Finder finder = new Finder(viewport, alignPanel, frame);
-    frame.setContentPane(finder);
-    frame.setLayer(JLayeredPane.PALETTE_LAYER);
-    Desktop.addInternalFrame(frame, "Find", 340, 110);
+    new Finder();
   }
 
   public void newView_actionPerformed(ActionEvent e)
@@ -1683,24 +1966,61 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     AlignmentPanel newap =
         new Jalview2XML().copyAlignPanel(alignPanel, true);
 
+    newap.av.gatherViewsHere = false;
+
     if (viewport.viewName == null)
-      viewport.viewName = "View 1";
+    {
+      viewport.viewName = "Original";
+    }
 
     newap.av.historyList = viewport.historyList;
     newap.av.redoList = viewport.redoList;
-    newap.av.viewName = "View " +
-        (Desktop.getViewCount(viewport.getSequenceSetId()) + 1);
+
+    int index = Desktop.getViewCount(viewport.getSequenceSetId());
+    String newViewName = "View " +index;
+
+    Vector comps = (Vector) PaintRefresher.components.get(viewport.
+        getSequenceSetId());
+    Vector existingNames = new Vector();
+    for(int i=0; i<comps.size(); i++)
+    {
+      if(comps.elementAt(i) instanceof AlignmentPanel)
+      {
+        AlignmentPanel ap = (AlignmentPanel)comps.elementAt(i);
+        if(!existingNames.contains(ap.av.viewName))
+        {
+          existingNames.addElement(ap.av.viewName);
+      }
+    }
+    }
+
+    while(existingNames.contains(newViewName))
+    {
+      newViewName = "View "+ (++index);
+    }
+
+    newap.av.viewName = newViewName;
 
     addAlignmentPanel(newap, false);
 
     if(alignPanels.size()==2)
     {
-      System.out.println("set gather once2");
       viewport.gatherViewsHere = true;
     }
     tabbedPane.setSelectedIndex(tabbedPane.getTabCount() - 1);
   }
 
+  public void expandViews_actionPerformed(ActionEvent e)
+  {
+        Desktop.instance.explodeViews(this);
+  }
+
+  public void gatherViews_actionPerformed(ActionEvent e)
+  {
+    Desktop.instance.gatherViews(this);
+  }
+
+
 
   /**
    * DOCUMENT ME!
@@ -1723,10 +2043,17 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     viewport.setShowJVSuffix(seqLimits.isSelected());
 
     alignPanel.idPanel.idCanvas.setPreferredSize(alignPanel.calculateIdWidth());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
+  }
+
+  public void idRightAlign_actionPerformed(ActionEvent e)
+  {
+    viewport.rightAlignIds = idRightAlign.isSelected();
+    alignPanel.paintAlignment(true);
   }
 
 
+
   /**
    * DOCUMENT ME!
    *
@@ -1735,7 +2062,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   protected void colourTextMenuItem_actionPerformed(ActionEvent e)
   {
     viewport.setColourText(colourTextMenuItem.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1766,13 +2093,13 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   public void hideSelSequences_actionPerformed(ActionEvent e)
   {
     viewport.hideAllSelectedSeqs();
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   public void hideSelColumns_actionPerformed(ActionEvent e)
   {
     viewport.hideSelectedColumns();
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   public void hiddenMarkers_actionPerformed(ActionEvent e)
@@ -1789,7 +2116,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   protected void scaleAbove_actionPerformed(ActionEvent e)
   {
     viewport.setScaleAboveWrapped(scaleAbove.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1800,7 +2127,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   protected void scaleLeft_actionPerformed(ActionEvent e)
   {
     viewport.setScaleLeftWrapped(scaleLeft.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1811,7 +2138,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   protected void scaleRight_actionPerformed(ActionEvent e)
   {
     viewport.setScaleRightWrapped(scaleRight.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1822,7 +2149,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   public void viewBoxesMenuItem_actionPerformed(ActionEvent e)
   {
     viewport.setShowBoxes(viewBoxesMenuItem.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1833,7 +2160,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   public void viewTextMenuItem_actionPerformed(ActionEvent e)
   {
     viewport.setShowText(viewTextMenuItem.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1844,7 +2171,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   protected void renderGapsMenuItem_actionPerformed(ActionEvent e)
   {
     viewport.setRenderGaps(renderGapsMenuItem.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
 
@@ -1867,7 +2194,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   public void showSeqFeatures_actionPerformed(ActionEvent evt)
   {
     viewport.setShowSequenceFeatures(showSeqFeatures.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
     if (alignPanel.getOverviewPanel() != null)
     {
       alignPanel.getOverviewPanel().updateOverviewImage();
@@ -1917,6 +2244,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     alignPanel.setOverviewPanel(overview);
   }
 
+  public void textColour_actionPerformed(ActionEvent e)
+  {
+    new TextColourChooser().chooseColour(alignPanel, null);
+  }
+
   /**
    * DOCUMENT ME!
    *
@@ -2104,7 +2436,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
         if (cs instanceof ClustalxColourScheme)
         {
           sg.cs = new ClustalxColourScheme(
-              sg.getSequences(true), sg.getWidth());
+              sg.getSequences(viewport.hiddenRepSequences), sg.getWidth());
         }
         else if (cs instanceof UserColourScheme)
         {
@@ -2129,18 +2461,21 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
                 viewport.getIgnoreGapsConsensus());
 
          sg.cs.setConsensus(AAFrequency.calculate(
-             sg.getSequences(true), sg.getStartRes(),
+             sg.getSequences(viewport.hiddenRepSequences), sg.getStartRes(),
              sg.getEndRes()+1));
        }
         else
+        {
           sg.cs.setThreshold(0, viewport.getIgnoreGapsConsensus());
+        }
 
 
         if (viewport.getConservationSelected())
         {
           Conservation c = new Conservation("Group",
                                             ResidueProperties.propHash, 3,
-                                            sg.getSequences(true),
+                                            sg.getSequences(viewport.
+              hiddenRepSequences),
                                             sg.getStartRes(),
                                             sg.getEndRes()+1);
           c.calculate();
@@ -2148,16 +2483,21 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
           sg.cs.setConservation(c);
         }
         else
+        {
           sg.cs.setConservation(null);
       }
     }
+    }
 
     if (alignPanel.getOverviewPanel() != null)
     {
       alignPanel.getOverviewPanel().updateOverviewImage();
     }
 
-    alignPanel.repaint();
+
+
+
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -2267,7 +2607,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
       while (userColours.hasMoreElements())
       {
-        final JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem(userColours.
+        final JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem(
+            userColours.
             nextElement().toString());
         radioItem.setName("USER_DEFINED");
         radioItem.addMouseListener(new MouseAdapter()
@@ -2278,16 +2619,19 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
                 {
                   radioItem.removeActionListener(radioItem.getActionListeners()[0]);
 
-                  int option = JOptionPane.showInternalConfirmDialog(jalview.gui.Desktop.desktop,
+              int option = JOptionPane.showInternalConfirmDialog(jalview.gui.
+                  Desktop.desktop,
                       "Remove from default list?",
                       "Remove user defined colour",
                       JOptionPane.YES_NO_OPTION);
                   if(option == JOptionPane.YES_OPTION)
                   {
-                    jalview.gui.UserDefinedColours.removeColourFromDefaults(radioItem.getText());
+                jalview.gui.UserDefinedColours.removeColourFromDefaults(
+                    radioItem.getText());
                     colourMenu.remove(radioItem);
                   }
                   else
+              {
                     radioItem.addActionListener(new ActionListener()
                     {
                       public void actionPerformed(ActionEvent evt)
@@ -2297,6 +2641,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
                     });
                 }
               }
+          }
             });
         radioItem.addActionListener(new ActionListener()
         {
@@ -2342,8 +2687,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     SequenceI [] oldOrder = viewport.getAlignment().getSequencesArray();
     AlignmentSorter.sortByPID(viewport.getAlignment(),
                               viewport.getAlignment().getSequenceAt(0));
-    addHistoryItem(new OrderCommand("Pairwise Sort", oldOrder, viewport.alignment));
-    alignPanel.repaint();
+    addHistoryItem(new OrderCommand("Pairwise Sort", oldOrder,
+                                    viewport.alignment));
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -2356,7 +2702,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     SequenceI [] oldOrder = viewport.getAlignment().getSequencesArray();
     AlignmentSorter.sortByID(viewport.getAlignment());
     addHistoryItem(new OrderCommand("ID Sort", oldOrder, viewport.alignment));
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -2370,7 +2716,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     AlignmentSorter.sortByGroup(viewport.getAlignment());
     addHistoryItem(new OrderCommand("Group Sort", oldOrder, viewport.alignment));
 
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -2392,7 +2738,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   public void pairwiseAlignmentMenuItem_actionPerformed(ActionEvent e)
   {
     if ( (viewport.getSelectionGroup() == null) ||
-        (viewport.getSelectionGroup().getSize(false) < 2))
+        (viewport.getSelectionGroup().getSize() < 2))
     {
       JOptionPane.showInternalMessageDialog(this,
                                             "You must select at least 2 sequences.",
@@ -2415,8 +2761,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   public void PCAMenuItem_actionPerformed(ActionEvent e)
   {
     if ( ( (viewport.getSelectionGroup() != null) &&
-          (viewport.getSelectionGroup().getSize(false) < 4) &&
-          (viewport.getSelectionGroup().getSize(false) > 0)) ||
+          (viewport.getSelectionGroup().getSize() < 4) &&
+          (viewport.getSelectionGroup().getSize() > 0)) ||
         (viewport.getAlignment().getHeight() < 4))
     {
       JOptionPane.showInternalMessageDialog(this,
@@ -2428,7 +2774,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       return;
     }
 
-     new PCAPanel(viewport);
+     new PCAPanel(alignPanel);
   }
 
 
@@ -2495,8 +2841,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   {
     TreePanel tp;
 
-    if (viewport.getSelectionGroup() != null) {
-      if (viewport.getSelectionGroup().getSize(false) < 3) {
+    if (viewport.getSelectionGroup() != null)
+    {
+      if (viewport.getSelectionGroup().getSize() < 3)
+      {
         JOptionPane.showMessageDialog(Desktop.desktop,
                                       "You need to have more than two sequences selected to build a tree!",
                                       "Not enough sequences",
@@ -2508,9 +2856,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       SequenceGroup sg = viewport.getSelectionGroup();
 
       /* Decide if the selection is a column region */
-      while (s < sg.getSize(false))
+      while (s < sg.getSize())
       {
-        if ( ( (SequenceI) sg.getSequences(false).elementAt(s++)).getLength() <
+        if ( ( (SequenceI) sg.getSequences(null).elementAt(s++)).getLength() <
             sg.getEndRes())
         {
           JOptionPane.showMessageDialog(Desktop.desktop,
@@ -2543,14 +2891,23 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       }
 
       if(viewport.alignment.getHeight()<2)
+      {
         return;
+      }
 
       tp = new TreePanel(alignPanel, type, pwType);
     }
 
-    addTreeMenuItem(tp, title);
+    title += " from ";
+
+    if(viewport.viewName!=null)
+    {
+      title+= viewport.viewName+" of ";
+    }
 
-    Desktop.addInternalFrame(tp, title + " from " + this.title, 600, 500);
+    title += this.title;
+
+    Desktop.addInternalFrame(tp, title, 600, 500);
   }
 
   /**
@@ -2572,9 +2929,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
         // TODO: JBPNote - have to map order entries to curent SequenceI pointers
         AlignmentSorter.sortBy(viewport.getAlignment(), order);
 
-        addHistoryItem(new OrderCommand(order.getName(), oldOrder, viewport.alignment));
+        addHistoryItem(new OrderCommand(order.getName(), oldOrder,
+                                        viewport.alignment));
 
-        alignPanel.repaint();
+        alignPanel.paintAlignment(true);
       }
     });
   }
@@ -2588,51 +2946,54 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
    * @param treePanel Displayed tree window.
    * @param title SortBy menu item title.
    */
-  void addTreeMenuItem(final TreePanel treePanel, String title)
+  public void buildTreeMenu()
   {
-    final JMenuItem item = new JMenuItem(title);
-
-    treeCount++;
+    sortByTreeMenu.removeAll();
 
-    if (treeCount == 1)
+    Vector comps = (Vector) PaintRefresher.components.get(viewport.
+        getSequenceSetId());
+    Vector treePanels = new Vector();
+    int i, iSize = comps.size();
+    for(i=0; i<iSize; i++)
     {
-      sort.add(sortByTreeMenu);
-    }
-
-    sortByTreeMenu.add(item);
-    item.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
+      if(comps.elementAt(i) instanceof TreePanel)
       {
-        SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray();
-        AlignmentSorter.sortByTree(viewport.getAlignment(),
-                                   treePanel.getTree());
+        treePanels.add(comps.elementAt(i));
+      }
+    }
 
-        addHistoryItem(new OrderCommand("Tree Sort",
-                                        oldOrder,
-                                        viewport.alignment));
+    iSize = treePanels.size();
 
+    if(iSize<1)
+    {
+      sortByTreeMenu.setVisible(false);
+      return;
+    }
 
-        alignPanel.repaint();
-      }
-    });
+    sortByTreeMenu.setVisible(true);
 
-    treePanel.addInternalFrameListener(new javax.swing.event.
-                                       InternalFrameAdapter()
+    for(i=0; i<treePanels.size(); i++)
     {
-      public void internalFrameClosed(
-          javax.swing.event.InternalFrameEvent evt)
+      TreePanel tp = (TreePanel)treePanels.elementAt(i);
+      final JMenuItem item = new JMenuItem(tp.getTitle());
+      final NJTree tree = ((TreePanel)treePanels.elementAt(i)).getTree();
+      item.addActionListener(new java.awt.event.ActionListener()
       {
-        treeCount--;
-        sortByTreeMenu.remove(item);
-
-        if (treeCount == 0)
+        public void actionPerformed(ActionEvent e)
         {
-          sort.remove(sortByTreeMenu);
+          SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray();
+          AlignmentSorter.sortByTree(viewport.getAlignment(), tree);
+
+          addHistoryItem(new OrderCommand("Tree Sort",
+                                          oldOrder,
+                                          viewport.alignment));
+
+          alignPanel.paintAlignment(true);
         }
-      }
-      ;
-    });
+      });
+
+      sortByTreeMenu.add(item);
+    }
   }
 
   /**
@@ -2646,7 +3007,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     AlignmentView msa = null;
 
     if ( (viewport.getSelectionGroup() != null) &&
-        (viewport.getSelectionGroup().getSize(false) > 1))
+        (viewport.getSelectionGroup().getSize() > 1))
     {
       // JBPNote UGLY! To prettify, make SequenceGroup and Alignment conform to some common interface!
       /*SequenceGroup seqs = viewport.getSelectionGroup();
@@ -2688,7 +3049,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
    AlignmentView seqs = null;
 
     if ( (viewport.getSelectionGroup() != null) &&
-        (viewport.getSelectionGroup().getSize(false) > 0))
+        (viewport.getSelectionGroup().getSize() > 0))
     {
       seqs = viewport.getAlignmentView(true);
     }
@@ -2700,7 +3061,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     // TODO: viewport.alignment.isAligned is a global state - the local selection may well be aligned - we preserve 2.0.8 behaviour for moment.
     if (!viewport.alignment.isAligned())
     {
-      seqs.setSequences(new SeqCigar[] { seqs.getSequences()[0] } );
+      seqs.setSequences(new SeqCigar[]
+                        {seqs.getSequences()[0]});
     }
     return seqs;
   }
@@ -2748,11 +3110,16 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   {
     return ShowNewickTree(nf,title,600,500,4,5);
   }
-  public TreePanel ShowNewickTree(NewickFile nf, String title, AlignmentView input)
+
+  public TreePanel ShowNewickTree(NewickFile nf, String title,
+                                  AlignmentView input)
   {
     return ShowNewickTree(nf,title, input, 600,500,4,5);
   }
-  public TreePanel ShowNewickTree(NewickFile nf, String title, int w,int h,int x, int y) {
+
+  public TreePanel ShowNewickTree(NewickFile nf, String title, int w, int h,
+                                  int x, int y)
+  {
     return ShowNewickTree(nf, title, null, w, h, x, y);
   }
   /**
@@ -2767,7 +3134,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
    * @param y position
    * @return TreePanel handle
    */
-  public TreePanel ShowNewickTree(NewickFile nf, String title, AlignmentView input, int w,int h,int x, int y) {
+  public TreePanel ShowNewickTree(NewickFile nf, String title,
+                                  AlignmentView input, int w, int h, int x,
+                                  int y)
+  {
     TreePanel tp = null;
 
     try
@@ -2784,11 +3154,12 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
         tp.setSize(w,h);
 
         if(x>0 && y>0)
+        {
           tp.setLocation(x,y);
+        }
 
 
         Desktop.addInternalFrame(tp, title, w, h);
-        addTreeMenuItem(tp, title);
       }
     }
     catch (Exception ex)
@@ -2799,28 +3170,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     return tp;
   }
 
-  class PrintThread
-      extends Thread
-  {
-    public void run()
-    {
-      PrinterJob printJob = PrinterJob.getPrinterJob();
-      PageFormat pf = printJob.pageDialog(printJob.defaultPage());
-      printJob.setPrintable(alignPanel, pf);
-
-      if (printJob.printDialog())
-      {
-        try
-        {
-          printJob.print();
-        }
-        catch (Exception PrintException)
-        {
-          PrintException.printStackTrace();
-        }
-      }
-    }
-  }
 
   /**
    * Generates menu items and listener event actions for web service clients
@@ -2850,7 +3199,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
             {
               AlignmentView msa = gatherSequencesForAlignment();
               new jalview.ws.MsaWSClient(sh, title, msa,
-                  false, true, viewport.getAlignment().getDataset(), af);
+                                         false, true,
+                                         viewport.getAlignment().getDataset(),
+                                         af);
 
             }
 
@@ -2867,7 +3218,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
               {
                 AlignmentView msa = gatherSequencesForAlignment();
                 new jalview.ws.MsaWSClient(sh, title, msa,
-                    true, true, viewport.getAlignment().getDataset(), af);
+                                           true, true,
+                                           viewport.getAlignment().getDataset(),
+                                           af);
 
               }
 
@@ -2952,92 +3305,32 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
 public void showTranslation_actionPerformed(ActionEvent e)
 {
+  ///////////////////////////////
+  // Collect Data to be translated/transferred
+
   SequenceI [] selection = viewport.getSelectionAsNewSequence();
   String [] seqstring = viewport.getViewAsString(true);
-
-  int s, sSize = selection.length;
-  SequenceI [] newSeq = new SequenceI[sSize];
-
-  int res, resSize;
-  StringBuffer protein;
-  String seq;
-  for(s=0; s<sSize; s++)
-  {
-    protein = new StringBuffer();
-    seq = AlignSeq.extractGaps("-. ", seqstring[s]);
-    resSize = seq.length();
-    resSize -= resSize%3;
-
-    for(res = 0; res < resSize; res+=3)
-    {
-      String codon = seq.substring(res, res+3);
-      codon = codon.replace('U', 'T');
-      String aa = ResidueProperties.codonTranslate(codon);
-      if(aa==null)
-        protein.append(viewport.getGapCharacter());
-      else if(aa.equals("STOP"))
-        protein.append("X");
-      else
-        protein.append( aa );
-    }
-    newSeq[s] = new Sequence(selection[s].getName(),
-                             protein.toString());
-  }
-
-
-  AlignmentI al = new Alignment(newSeq);
-  al.setDataset(null);
-
-
-  ////////////////////////////////
-  // Copy annotations across
-  jalview.datamodel.AlignmentAnnotation[] annotations
-      = viewport.alignment.getAlignmentAnnotation();
-  int a, aSize;
-  if(annotations!=null)
-  {
-    for (int i = 0; i < annotations.length; i++)
-    {
-      if (annotations[i].label.equals("Quality") ||
-          annotations[i].label.equals("Conservation") ||
-          annotations[i].label.equals("Consensus"))
-      {
-        continue;
-      }
-
-      aSize = viewport.alignment.getWidth() / 3;
-      jalview.datamodel.Annotation[] anots =
-          new jalview.datamodel.Annotation[aSize];
-
-      for (a = 0; a < viewport.alignment.getWidth(); a++)
-      {
-        if (annotations[i].annotations[a] == null
-            || annotations[i].annotations[a] == null)
-          continue;
-
-        anots[a / 3] = new Annotation(
-            annotations[i].annotations[a].displayCharacter,
-            annotations[i].annotations[a].description,
-            annotations[i].annotations[a].secondaryStructure,
-            annotations[i].annotations[a].value,
-            annotations[i].annotations[a].colour);
-      }
-
-      jalview.datamodel.AlignmentAnnotation aa
-          = new jalview.datamodel.AlignmentAnnotation(annotations[i].label,
-          annotations[i].description, anots);
-      al.addAnnotation(aa);
-    }
-  }
-
+  AlignmentI al  = null;
+  try {
+    al = jalview.analysis.Dna.CdnaTranslate(selection, seqstring, viewport.getViewAsVisibleContigs(true),
+        viewport.getGapCharacter(), viewport.alignment.getAlignmentAnnotation(),
+        viewport.alignment.getWidth());
+  } catch (Exception ex) {
+    al = null;
+    jalview.bin.Cache.log.debug("Exception during translation.",ex);
+  }
+  if (al==null)
+  {
+    JOptionPane.showMessageDialog(Desktop.desktop,
+        "Please select at least three bases in at least one sequence in order to perform a cDNA translation.",
+        "Translation Failed",
+        JOptionPane.WARNING_MESSAGE);
+  } else {
     AlignFrame af = new AlignFrame(al, DEFAULT_WIDTH, DEFAULT_HEIGHT);
     Desktop.addInternalFrame(af, "Translation of "+this.getTitle(),
                              DEFAULT_WIDTH,
                              DEFAULT_HEIGHT);
-
-
-
-
+  }
 }
 
 /**
@@ -3048,8 +3341,10 @@ public void showTranslation_actionPerformed(ActionEvent e)
 public boolean parseFeaturesFile(String file, String type)
 {
     boolean featuresFile = false;
-    try{
-      featuresFile = new FeaturesFile(file, type).parse(viewport.alignment.getDataset(),
+    try
+    {
+      featuresFile = new FeaturesFile(file,
+          type).parse(viewport.alignment.getDataset(),
                                          alignPanel.seqPanel.seqCanvas.
                                          getFeatureRenderer().featureColours,
                                          false);
@@ -3063,7 +3358,7 @@ public boolean parseFeaturesFile(String file, String type)
     {
       viewport.showSequenceFeatures = true;
       showSeqFeatures.setSelected(true);
-      alignPanel.repaint();
+      alignPanel.paintAlignment(true);
     }
 
     return featuresFile;
@@ -3088,12 +3383,14 @@ public void drop(DropTargetDropEvent evt)
 
     try
     {
-      DataFlavor uriListFlavor = new DataFlavor("text/uri-list;class=java.lang.String");
+      DataFlavor uriListFlavor = new DataFlavor(
+          "text/uri-list;class=java.lang.String");
       if (t.isDataFlavorSupported(DataFlavor.javaFileListFlavor))
       {
         //Works on Windows and MacOSX
         evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
-        files = (java.util.List) t.getTransferData(DataFlavor.javaFileListFlavor);
+        files = (java.util.List) t.getTransferData(DataFlavor.
+            javaFileListFlavor);
       }
       else if (t.isDataFlavorSupported(uriListFlavor))
       {
@@ -3146,7 +3443,8 @@ public void drop(DropTargetDropEvent evt)
   // AlignFrame
    public void loadJalviewDataFile(String file)
   {
-    try{
+    try
+    {
       String protocol = "File";
 
       if (file.indexOf("http:") > -1 || file.indexOf("file:") > -1)
@@ -3155,7 +3453,7 @@ public void drop(DropTargetDropEvent evt)
       }
 
       boolean isAnnotation = new AnnotationFile().readAnnotationFile(viewport.
-          alignment, file);
+          alignment, file, protocol);
 
       if (!isAnnotation)
       {
@@ -3172,19 +3470,22 @@ public void drop(DropTargetDropEvent evt)
                 viewport.getAlignment(),
                 0, false);
             alignPanel.adjustAnnotationHeight();
-            alignPanel.repaint();
+            alignPanel.paintAlignment(true);
           }
           else
+          {
             new FileLoader().LoadFile(viewport, file, protocol, format);
         }
       }
+      }
       else
       {
         // (isAnnotation)
         alignPanel.adjustAnnotationHeight();
       }
 
-    }catch(Exception ex)
+    }
+    catch (Exception ex)
     {
       ex.printStackTrace();
     }
@@ -3223,3 +3524,39 @@ public void drop(DropTargetDropEvent evt)
     return viewport;
   }
 }
+
+class PrintThread
+    extends Thread
+{
+  AlignmentPanel ap;
+  public PrintThread(AlignmentPanel ap)
+  {
+   this.ap = ap;
+  }
+  static PageFormat pf;
+  public void run()
+  {
+    PrinterJob printJob = PrinterJob.getPrinterJob();
+
+    if (pf != null)
+    {
+      printJob.setPrintable(ap, pf);
+    }
+    else
+    {
+      printJob.setPrintable(ap);
+    }
+
+    if (printJob.printDialog())
+    {
+      try
+      {
+        printJob.print();
+      }
+      catch (Exception PrintException)
+      {
+        PrintException.printStackTrace();
+      }
+    }
+  }
+}