X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=0756e2da307cdecbe6c6dee1a084313673e49e7a;hb=4484ac6bdcc92f0e0e430f64d3587f026fafb476;hp=ae814c19943ded422aa2191bbb3403741ad52e3e;hpb=dcf795defdc686708f6b5a00f9089855a68a7733;p=jalview.git

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index ae814c1..0756e2d 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -57,11 +57,13 @@ public class AlignFrame
 
   Vector alignPanels = new Vector();
 
+
   /** DOCUMENT ME!! */
   String currentFileFormat = null;
 
   String fileName = null;
 
+
   /**
    * Creates a new AlignFrame object.
    *
@@ -72,6 +74,7 @@ public class AlignFrame
     this(al, null, width, height);
   }
 
+
   /**
    * new alignment window with hidden columns
    * @param al AlignmentI
@@ -85,7 +88,7 @@ public class AlignFrame
 
     alignPanel = new AlignmentPanel(this, viewport);
 
-    if (al.getDataset() == null)
+    if(al.getDataset()==null)
     {
       al.setDataset(null);
     }
@@ -116,9 +119,9 @@ public class AlignFrame
       BLOSUM62Colour.setEnabled(false);
       conservationMenuItem.setEnabled(false);
       modifyConservation.setEnabled(false);
-      //  PIDColour.setEnabled(false);
-      //  abovePIDThreshold.setEnabled(false);
-      //  modifyPID.setEnabled(false);
+    //  PIDColour.setEnabled(false);
+    //  abovePIDThreshold.setEnabled(false);
+    //  modifyPID.setEnabled(false);
     }
 
     String sortby = jalview.bin.Cache.getDefault("SORT_ALIGNMENT", "No sort");
@@ -133,252 +136,268 @@ public class AlignFrame
     }
 
     if (Desktop.desktop != null)
-    {
-      addServiceListeners();
-      setGUINucleotide(viewport.alignment.isNucleotide());
-    }
+   {
+     addServiceListeners();
+     setGUINucleotide(viewport.alignment.isNucleotide());
+   }
 
-    setMenusFromViewport(viewport);
+   setMenusFromViewport(viewport);
 
-    if (viewport.wrapAlignment)
-    {
-      wrapMenuItem_actionPerformed(null);
-    }
+   if (viewport.wrapAlignment)
+   {
+     wrapMenuItem_actionPerformed(null);
+   }
 
     if (jalview.bin.Cache.getDefault("SHOW_OVERVIEW",false))
     {
       this.overviewMenuItem_actionPerformed(null);
     }
 
-    addKeyListener();
+   addKeyListener();
 
   }
 
   public void setFileName(String file, String format)
   {
-    fileName = file;
-    currentFileFormat = format;
-    reload.setEnabled(true);
+     fileName = file;
+     currentFileFormat = format;
+     reload.setEnabled(true);
   }
 
   void addKeyListener()
   {
-    addKeyListener(new KeyAdapter()
-    {
-      public void keyPressed(KeyEvent evt)
+      addKeyListener(new KeyAdapter()
       {
-        if (viewport.cursorMode
-            && evt.getKeyCode() >= KeyEvent.VK_0
-            && evt.getKeyCode() <= KeyEvent.VK_9)
+        public void keyPressed(KeyEvent evt)
         {
-          alignPanel.seqPanel.numberPressed(evt.getKeyChar());
-        }
+          if (viewport.cursorMode
+              && evt.getKeyCode() >= KeyEvent.VK_0
+              && evt.getKeyCode() <= KeyEvent.VK_9)
+          {
+            alignPanel.seqPanel.numberPressed(evt.getKeyChar());
+          }
 
-        switch (evt.getKeyCode())
-        {
+          switch (evt.getKeyCode())
+          {
 
-          case 27: // escape key
-            deselectAllSequenceMenuItem_actionPerformed(null);
+            case 27: // escape key
+              deselectAllSequenceMenuItem_actionPerformed(null);
 
-            break;
+              break;
 
-          case KeyEvent.VK_DOWN:
-            if (viewport.cursorMode)
-            {
-              alignPanel.seqPanel.moveCursor(0, 1);
-            }
-            else
-            {
+            case KeyEvent.VK_DOWN:
+             if (evt.isAltDown() || !viewport.cursorMode)
               moveSelectedSequences(false);
-            }
-            break;
+              if (viewport.cursorMode)
+                alignPanel.seqPanel.moveCursor(0, 1);
+              break;
 
-          case KeyEvent.VK_UP:
-            if (viewport.cursorMode)
-            {
-              alignPanel.seqPanel.moveCursor(0, -1);
-            }
-            else
-            {
+            case KeyEvent.VK_UP:
+            if (evt.isAltDown() || !viewport.cursorMode)
               moveSelectedSequences(true);
-            }
-            break;
+              if (viewport.cursorMode)
+                alignPanel.seqPanel.moveCursor(0, -1);
 
-          case KeyEvent.VK_LEFT:
-            if (viewport.cursorMode)
-            {
-              alignPanel.seqPanel.moveCursor( -1, 0);
-            }
-            break;
+              break;
 
-          case KeyEvent.VK_RIGHT:
-            if (viewport.cursorMode)
-            {
-              alignPanel.seqPanel.moveCursor(1, 0);
-            }
-            break;
+            case KeyEvent.VK_LEFT:
+            if (evt.isAltDown() || !viewport.cursorMode)
+              slideSequences(false,
+                             alignPanel.seqPanel.getKeyboardNo1());
+            else
+                alignPanel.seqPanel.moveCursor( -1, 0);
 
-          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)
-            {
-              cut_actionPerformed(null);
-            }
+              break;
+
+            case KeyEvent.VK_RIGHT:
+            if (evt.isAltDown() || !viewport.cursorMode)
+              slideSequences(true,
+                             alignPanel.seqPanel.getKeyboardNo1());
             else
-            {
-              alignPanel.seqPanel.deleteGapAtCursor(evt.isControlDown()
-                  || evt.isShiftDown()
-                  || evt.isAltDown());
-            }
+                alignPanel.seqPanel.moveCursor(1, 0);
+              break;
 
-            break;
+            case KeyEvent.VK_SPACE:
+              if (viewport.cursorMode)
+              {
+                alignPanel.seqPanel.insertGapAtCursor(evt.isControlDown()
+                                           || evt.isShiftDown()
+                                           || evt.isAltDown());
+              }
+              break;
 
-          case KeyEvent.VK_S:
-            if (viewport.cursorMode)
-            {
-              alignPanel.seqPanel.setCursorRow();
-            }
-            break;
-          case KeyEvent.VK_C:
-            if (viewport.cursorMode && !evt.isControlDown())
-            {
-              alignPanel.seqPanel.setCursorColumn();
-            }
-            break;
-          case KeyEvent.VK_P:
-            if (viewport.cursorMode)
+            case KeyEvent.VK_DELETE:
+            case KeyEvent.VK_BACK_SPACE:
+              if (!viewport.cursorMode)
+              {
+                cut_actionPerformed(null);
+              }
+              else
             {
-              alignPanel.seqPanel.setCursorPosition();
+                alignPanel.seqPanel.deleteGapAtCursor(evt.isControlDown()
+                                           || evt.isShiftDown()
+                                           || evt.isAltDown());
             }
-            break;
 
-          case KeyEvent.VK_ENTER:
-          case KeyEvent.VK_COMMA:
-            if (viewport.cursorMode)
-            {
-              alignPanel.seqPanel.setCursorRowAndColumn();
-            }
-            break;
+              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_S:
+              if (viewport.cursorMode)
+              {
+                alignPanel.seqPanel.setCursorRow();
+              }
+              break;
+            case KeyEvent.VK_C:
+              if (viewport.cursorMode && !evt.isControlDown())
+              {
+                alignPanel.seqPanel.setCursorColumn();
+              }
+              break;
+            case KeyEvent.VK_P:
+              if (viewport.cursorMode)
+              {
+                alignPanel.seqPanel.setCursorPosition();
+              }
+              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;
-            }
-            alignPanel.seqPanel.seqCanvas.repaint();
-            break;
+            case KeyEvent.VK_ENTER:
+            case KeyEvent.VK_COMMA:
+              if (viewport.cursorMode)
+              {
+                alignPanel.seqPanel.setCursorRowAndColumn();
+              }
+              break;
 
-          case KeyEvent.VK_F1:
-            try
-            {
-              ClassLoader cl = jalview.gui.Desktop.class.getClassLoader();
-              java.net.URL url = javax.help.HelpSet.findHelpSet(cl, "help/help");
-              javax.help.HelpSet hs = new javax.help.HelpSet(cl, url);
+            case KeyEvent.VK_Q:
+              if (viewport.cursorMode)
+              {
+                alignPanel.seqPanel.setSelectionAreaAtCursor(true);
+              }
+              break;
+            case KeyEvent.VK_M:
+              if (viewport.cursorMode)
+              {
+                alignPanel.seqPanel.setSelectionAreaAtCursor(false);
+              }
+              break;
 
-              javax.help.HelpBroker hb = hs.createHelpBroker();
-              hb.setCurrentID("home");
-              hb.setDisplayed(true);
-            }
-            catch (Exception ex)
-            {
-              ex.printStackTrace();
-            }
-            break
-                ;
-          case KeyEvent.VK_H:
-          {
-            boolean toggleSeqs = !evt.isControlDown();
-            boolean toggleCols = !evt.isShiftDown();
+            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;
+              }
+              alignPanel.seqPanel.seqCanvas.repaint();
+              break;
 
-            boolean hide = false;
+            case KeyEvent.VK_F1:
+              try
+              {
+                ClassLoader cl = jalview.gui.Desktop.class.getClassLoader();
+                java.net.URL url = javax.help.HelpSet.findHelpSet(cl, "help/help");
+                javax.help.HelpSet hs = new javax.help.HelpSet(cl, url);
 
-            SequenceGroup sg = viewport.getSelectionGroup();
-            if (toggleSeqs)
-            {
-              if (sg != null && sg.getSize() != viewport.alignment.getHeight())
+                javax.help.HelpBroker hb = hs.createHelpBroker();
+                hb.setCurrentID("home");
+                hb.setDisplayed(true);
+              }
+              catch (Exception ex)
               {
-                hideSelSequences_actionPerformed(null);
-                hide = true;
+                ex.printStackTrace();
               }
+              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())
+                {
+                  hideSelSequences_actionPerformed(null);
+                  hide = true;
+                }
               else if (! (toggleCols &&
                           viewport.colSel.getSelected().size() > 0))
               {
-                showAllSeqs_actionPerformed(null);
+                  showAllSeqs_actionPerformed(null);
               }
             }
 
-            if (toggleCols)
-            {
-              if (viewport.colSel.getSelected().size() > 0)
+              if (toggleCols)
               {
-                hideSelColumns_actionPerformed(null);
-                if (!toggleSeqs)
+                if (viewport.colSel.getSelected().size() > 0)
+                {
+                  hideSelColumns_actionPerformed(null);
+                  if (!toggleSeqs)
                 {
-                  viewport.selectionGroup = sg;
+                    viewport.selectionGroup = sg;
                 }
               }
-              else if (!hide)
+                else if (!hide)
               {
-                showAllColumns_actionPerformed(null);
+                  showAllColumns_actionPerformed(null);
               }
             }
-            break;
-          }
-          case KeyEvent.VK_PAGE_UP:
-            if (viewport.wrapAlignment)
+              break;
+            }
+            case KeyEvent.VK_PAGE_UP:
+              if (viewport.wrapAlignment)
             {
-              alignPanel.scrollUp(true);
+                alignPanel.scrollUp(true);
             }
-            else
+              else
             {
-              alignPanel.setScrollValues(viewport.startRes,
-                                         viewport.startSeq
-                                         - viewport.endSeq + viewport.startSeq);
+                alignPanel.setScrollValues(viewport.startRes,
+                                           viewport.startSeq
+                                           - viewport.endSeq + viewport.startSeq);
             }
-            break;
-          case KeyEvent.VK_PAGE_DOWN:
-            if (viewport.wrapAlignment)
+              break;
+            case KeyEvent.VK_PAGE_DOWN:
+              if (viewport.wrapAlignment)
             {
-              alignPanel.scrollUp(false);
+                alignPanel.scrollUp(false);
             }
-            else
+              else
             {
-              alignPanel.setScrollValues(viewport.startRes,
-                                         viewport.startSeq
-                                         + viewport.endSeq - viewport.startSeq);
+                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;
         }
       }
-    });
+      });
   }
 
+
   public void addAlignmentPanel(final AlignmentPanel ap,
                                 boolean newPanel)
   {
@@ -390,9 +409,9 @@ public class AlignFrame
 
     int aSize = alignPanels.size();
 
-    tabbedPane.setVisible(aSize > 1 || ap.av.viewName != null);
+    tabbedPane.setVisible(aSize>1 || ap.av.viewName!=null);
 
-    if (aSize == 1 && ap.av.viewName == null)
+    if (aSize == 1 && ap.av.viewName==null)
     {
       this.getContentPane().add(ap, BorderLayout.CENTER);
     }
@@ -410,7 +429,7 @@ public class AlignFrame
       ap.setVisible(false);
     }
 
-    if (newPanel)
+    if(newPanel)
     {
       if (ap.av.padGaps)
       {
@@ -427,10 +446,11 @@ public class AlignFrame
     gatherViews.setEnabled(true);
     tabbedPane.setVisible(true);
     AlignmentPanel first = (AlignmentPanel) alignPanels.firstElement();
-    tabbedPane.addTab(first.av.viewName, first);
+    tabbedPane.addTab(first.av.viewName,first);
     this.getContentPane().add(tabbedPane, BorderLayout.CENTER);
   }
 
+
   public AlignViewport getViewport()
   {
     return viewport;
@@ -472,14 +492,14 @@ public class AlignFrame
 
   public void setGUINucleotide(boolean nucleotide)
   {
-    showTranslation.setVisible(nucleotide);
-    conservationMenuItem.setEnabled(!nucleotide);
-    modifyConservation.setEnabled(!nucleotide);
+    showTranslation.setVisible( nucleotide );
+    conservationMenuItem.setEnabled( !nucleotide );
+    modifyConservation.setEnabled(   !nucleotide );
 
     //Remember AlignFrame always starts as protein
-    if (!nucleotide)
+    if(!nucleotide)
     {
-      calculateMenu.remove(calculateMenu.getItemCount() - 2);
+      calculateMenu.remove(calculateMenu.getItemCount()-2);
     }
   }
 
@@ -515,29 +535,30 @@ public class AlignFrame
     updateEditMenuBar();
   }
 
+
   Hashtable progressBars;
   public void setProgressBar(String message, long id)
   {
-    if (progressBars == null)
+    if(progressBars == null)
     {
       progressBars = new Hashtable();
     }
 
     JPanel progressPanel;
     GridLayout layout = (GridLayout) statusPanel.getLayout();
-    if (progressBars.get(new Long(id)) != null)
-    {
-      progressPanel = (JPanel) progressBars.get(new Long(id));
-      statusPanel.remove(progressPanel);
-      progressBars.remove(progressPanel);
-      progressPanel = null;
-      if (message != null)
+    if(progressBars.get( new Long(id) )!=null)
+     {
+       progressPanel = (JPanel)progressBars.get( new Long(id) );
+       statusPanel.remove(progressPanel);
+       progressBars.remove( progressPanel );
+       progressPanel = null;
+       if(message!=null)
       {
-        statusBar.setText(message);
+         statusBar.setText(message);
       }
 
-      layout.setRows(layout.getRows() - 1);
-    }
+       layout.setRows(layout.getRows() - 1);
+     }
     else
     {
       progressPanel = new JPanel(new BorderLayout(10, 5));
@@ -557,12 +578,15 @@ public class AlignFrame
     validate();
   }
 
+
+
+
   /*
    Added so Castor Mapping file can obtain Jalview Version
-   */
+  */
   public String getVersion()
   {
-    return jalview.bin.Cache.getProperty("VERSION");
+    return  jalview.bin.Cache.getProperty("VERSION");
   }
 
   public FeatureRenderer getFeatureRenderer()
@@ -570,6 +594,7 @@ public class AlignFrame
     return alignPanel.seqPanel.seqCanvas.getFeatureRenderer();
   }
 
+
   public void fetchSequence_actionPerformed(ActionEvent e)
   {
     new SequenceFetcher(this);
@@ -582,12 +607,12 @@ public class AlignFrame
 
   public void reload_actionPerformed(ActionEvent e)
   {
-    if (fileName != null)
+    if(fileName!=null)
     {
-      if (currentFileFormat.equals("Jalview"))
+      if(currentFileFormat.equals("Jalview"))
       {
-        JInternalFrame[] frames = Desktop.desktop.getAllFrames();
-        for (int i = 0; i < frames.length; i++)
+        JInternalFrame [] frames = Desktop.desktop.getAllFrames();
+        for(int i=0; i<frames.length; i++)
         {
           if (frames[i] instanceof AlignFrame
               && frames[i] != this
@@ -597,7 +622,7 @@ public class AlignFrame
             {
               frames[i].setSelected(true);
               Desktop.instance.closeAssociatedWindows();
-            }
+          }
             catch (java.beans.PropertyVetoException ex)
             {}
           }
@@ -625,6 +650,7 @@ public class AlignFrame
     }
   }
 
+
   public void addFromText_actionPerformed(ActionEvent e)
   {
     Desktop.instance.inputTextboxMenuItem_actionPerformed(viewport);
@@ -635,11 +661,12 @@ public class AlignFrame
     Desktop.instance.inputURLMenuItem_actionPerformed(viewport);
   }
 
+
   public void save_actionPerformed(ActionEvent e)
   {
-    if (fileName == null
-        || currentFileFormat == null
-        || fileName.startsWith("http")
+    if(fileName==null
+       || currentFileFormat==null
+       || fileName.startsWith("http")
         )
     {
       saveAs_actionPerformed(null);
@@ -647,7 +674,7 @@ public class AlignFrame
     else
     {
       saveAlignment(fileName, currentFileFormat);
-    }
+  }
   }
 
   /**
@@ -658,14 +685,15 @@ public class AlignFrame
   public void saveAs_actionPerformed(ActionEvent e)
   {
     JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
-        getProperty("LAST_DIRECTORY"),
+        getProperty( "LAST_DIRECTORY"),
         new String[]
-        {"fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc", "jar"},
+        { "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc","jar" },
         new String[]
-        {"Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "Jalview"},
+        { "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "Jalview" },
         currentFileFormat,
         false);
 
+
     chooser.setFileView(new JalviewFileView());
     chooser.setDialogTitle("Save Alignment to file");
     chooser.setToolTipText("Save");
@@ -674,18 +702,18 @@ public class AlignFrame
 
     if (value == JalviewFileChooser.APPROVE_OPTION)
     {
-      currentFileFormat = chooser.getSelectedFormat();
-      if (currentFileFormat == null)
-      {
-        JOptionPane.showInternalMessageDialog(Desktop.desktop,
-                                              "You must select a file format before saving!",
-                                              "File format not specified",
-                                              JOptionPane.WARNING_MESSAGE);
-        value = chooser.showSaveDialog(this);
-        return;
-      }
+        currentFileFormat = chooser.getSelectedFormat();
+        if (currentFileFormat == null)
+        {
+          JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                                                "You must select a file format before saving!",
+                                                "File format not specified",
+                                                JOptionPane.WARNING_MESSAGE);
+          value = chooser.showSaveDialog(this);
+          return;
+        }
 
-      fileName = chooser.getSelectedFile().getPath();
+        fileName = chooser.getSelectedFile().getPath();
 
       jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT",
                                     currentFileFormat);
@@ -713,8 +741,8 @@ public class AlignFrame
       success = new Jalview2XML().SaveAlignment(this, file, shortName);
 
       statusBar.setText("Successfully saved to file: "
-                        + fileName + " in "
-                        + format + " format.");
+                          +fileName+" in "
+                          +format +" format.");
 
     }
     else
@@ -733,7 +761,7 @@ public class AlignFrame
         if (reply == JOptionPane.YES_OPTION)
         {
           omitHidden = viewport.getViewAsString(false);
-        }
+      }
       }
 
       String output = new FormatAdapter().formatSequences(
@@ -785,17 +813,17 @@ public class AlignFrame
    */
   protected void outputText_actionPerformed(ActionEvent e)
   {
-    String[] omitHidden = null;
+    String [] omitHidden = null;
 
-    if (viewport.hasHiddenColumns)
+    if(viewport.hasHiddenColumns)
     {
       int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop,
           "The Alignment contains hidden columns."
-          + "\nDo you want to output only the visible alignment?",
-          "Save / Omit Hidden Columns",
-          JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+      +"\nDo you want to output only the visible alignment?",
+      "Save / Omit Hidden Columns",
+      JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
 
-      if (reply == JOptionPane.YES_OPTION)
+      if(reply==JOptionPane.YES_OPTION)
       {
         omitHidden = viewport.getViewAsString(false);
       }
@@ -807,6 +835,7 @@ public class AlignFrame
                              "Alignment output - " + e.getActionCommand(), 600,
                              500);
 
+
     cap.setText(new FormatAdapter().formatSequences(
         e.getActionCommand(),
         viewport.alignment.getSequencesArray(),
@@ -822,7 +851,7 @@ public class AlignFrame
   {
     new HTMLOutput(viewport,
                    alignPanel.seqPanel.seqCanvas.getSequenceRenderer(),
-                   alignPanel.seqPanel.seqCanvas.getFeatureRenderer());
+        alignPanel.seqPanel.seqCanvas.getFeatureRenderer());
   }
 
   public void createImageMap(File file, String image)
@@ -850,6 +879,7 @@ public class AlignFrame
     alignPanel.makeEPS(f);
   }
 
+
   public void pageSetup_actionPerformed(ActionEvent e)
   {
     PrinterJob printJob = PrinterJob.getPrinterJob();
@@ -873,15 +903,17 @@ public class AlignFrame
     new AnnotationExporter().exportFeatures(alignPanel);
   }
 
+
   public void exportAnnotations_actionPerformed(ActionEvent e)
   {
     new AnnotationExporter().exportAnnotations(
-        alignPanel,
+      alignPanel,
         viewport.showAnnotation ? viewport.alignment.getAlignmentAnnotation() : null,
-        viewport.alignment.getGroups()
+      viewport.alignment.getGroups()
         );
   }
 
+
   public void associatedData_actionPerformed(ActionEvent e)
   {
     // Pick the tree file
@@ -903,6 +935,7 @@ public class AlignFrame
 
   }
 
+
   /**
    * DOCUMENT ME!
    *
@@ -910,14 +943,14 @@ public class AlignFrame
    */
   public void closeMenuItem_actionPerformed(boolean closeAllTabs)
   {
-    if (alignPanels != null && alignPanels.size() < 2)
+    if(alignPanels!=null && alignPanels.size()<2)
     {
       closeAllTabs = true;
     }
 
     try
     {
-      if (alignPanels != null)
+      if(alignPanels!=null)
       {
         if (closeAllTabs)
         {
@@ -943,9 +976,9 @@ public class AlignFrame
           tabbedPane.removeTabAt(index);
           tabbedPane.validate();
 
-          if (index == tabbedPane.getTabCount())
+          if(index==tabbedPane.getTabCount())
           {
-            index--;
+            index --;
           }
 
           this.tabSelectionChanged(index);
@@ -955,7 +988,7 @@ public class AlignFrame
       if (closeAllTabs)
       {
         this.setClosed(true);
-      }
+    }
     }
     catch (Exception ex)
     {
@@ -963,6 +996,7 @@ public class AlignFrame
     }
   }
 
+
   /**
    * DOCUMENT ME!
    */
@@ -995,9 +1029,10 @@ public class AlignFrame
     }
   }
 
+
   public void addHistoryItem(CommandI command)
   {
-    if (command.getSize() > 0)
+    if(command.getSize()>0)
     {
       viewport.historyList.push(command);
       viewport.redoList.clear();
@@ -1006,6 +1041,8 @@ public class AlignFrame
     }
   }
 
+
+
   /**
    * DOCUMENT ME!
    *
@@ -1013,14 +1050,14 @@ public class AlignFrame
    */
   protected void undoMenuItem_actionPerformed(ActionEvent e)
   {
-    CommandI command = (CommandI) viewport.historyList.pop();
+    CommandI command = (CommandI)viewport.historyList.pop();
     viewport.redoList.push(command);
     command.undoCommand();
 
     AlignViewport originalSource = getOriginatingSource(command);
     updateEditMenuBar();
 
-    if (originalSource != null)
+    if(originalSource!=null)
     {
       originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null;
       originalSource.firePropertyChange("alignment",
@@ -1036,7 +1073,7 @@ public class AlignFrame
    */
   protected void redoMenuItem_actionPerformed(ActionEvent e)
   {
-    if (viewport.redoList.size() < 1)
+    if(viewport.redoList.size()<1)
     {
       return;
     }
@@ -1048,7 +1085,7 @@ public class AlignFrame
     AlignViewport originalSource = getOriginatingSource(command);
     updateEditMenuBar();
 
-    if (originalSource != null)
+    if(originalSource!=null)
     {
       originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null;
       originalSource.firePropertyChange("alignment",
@@ -1061,9 +1098,9 @@ public class AlignFrame
   {
     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;
+   //the property change event FROM the viewport where the
+   //original alignment was altered
+    AlignmentI al=null;
     if (command instanceof EditCommand)
     {
       EditCommand editCommand = (EditCommand) command;
@@ -1158,8 +1195,109 @@ public class AlignFrame
       }
     }
 
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
+  }
+
+
+
+
+  synchronized void slideSequences(boolean right, int size)
+  {
+    if(viewport.hasHiddenColumns)
+    {
+      JOptionPane.showInternalMessageDialog(Desktop.desktop,
+          "Slide Sequences not available with hidden columns",
+          "Slide Sequence not Available",
+          JOptionPane.WARNING_MESSAGE);
+      return;
+    }
+    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!
@@ -1174,7 +1312,7 @@ public class AlignFrame
       return;
     }
 
-    SequenceI[] seqs = viewport.getSelectionAsNewSequence();
+    SequenceI [] seqs = viewport.getSelectionAsNewSequence();
     String[] omitHidden = null;
 
     if (viewport.hasHiddenColumns)
@@ -1204,25 +1342,25 @@ public class AlignFrame
     {
       er.printStackTrace();
       javax.swing.SwingUtilities.invokeLater(new Runnable()
-      {
-        public void run()
-        {
-          javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
-              "Out of memory copying region!!"
-              +
-              "\nSee help files for increasing Java Virtual Machine memory."
-              , "Out of memory",
-              javax.swing.JOptionPane.WARNING_MESSAGE);
-        }
-      });
+          {
+            public void run()
+            {
+              javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                  "Out of memory copying region!!"
+                  +
+                  "\nSee help files for increasing Java Virtual Machine memory."
+                  , "Out of memory",
+                  javax.swing.JOptionPane.WARNING_MESSAGE);
+            }
+          });
 
       return;
     }
 
     Vector hiddenColumns = null;
-    if (viewport.hasHiddenColumns)
+    if(viewport.hasHiddenColumns)
     {
-      hiddenColumns = new Vector();
+      hiddenColumns =new Vector();
       int hiddenOffset = viewport.getSelectionGroup().getStartRes();
       for (int i = 0; i < viewport.getColumnSelection().getHiddenColumns().size();
            i++)
@@ -1232,7 +1370,7 @@ public class AlignFrame
 
         hiddenColumns.addElement(new int[]
                                  {region[0] - hiddenOffset,
-                                 region[1] - hiddenOffset});
+                          region[1]-hiddenOffset});
       }
     }
 
@@ -1241,7 +1379,7 @@ public class AlignFrame
         seqs,
         viewport.alignment.getDataset(),
         hiddenColumns};
-    statusBar.setText("Copied " + seqs.length + " sequences to clipboard.");
+    statusBar.setText("Copied "+seqs.length+" sequences to clipboard.");
   }
 
   /**
@@ -1314,45 +1452,46 @@ public class AlignFrame
 
       SequenceI[] sequences;
 
-      if (Desktop.jalviewClipboard != null)
-      {
-        // The clipboard was filled from within Jalview, we must use the sequences
-        // And dataset from the copied alignment
-        sequences = (SequenceI[]) Desktop.jalviewClipboard[0];
-      }
-      else
-      {
+
+     if(Desktop.jalviewClipboard!=null)
+     {
+       // The clipboard was filled from within Jalview, we must use the sequences
+       // And dataset from the copied alignment
+       sequences = (SequenceI[])Desktop.jalviewClipboard[0];
+     }
+     else
+     {
         sequences = new FormatAdapter().readFile(str, "Paste", format).
             getSequencesArray();
-      }
+     }
 
-      AlignmentI alignment = null;
+     AlignmentI alignment = null;
 
       if (newAlignment)
       {
-        alignment = new Alignment(sequences);
+          alignment = new Alignment(sequences);
 
-        if (Desktop.jalviewClipboard != null)
+          if (Desktop.jalviewClipboard != null)
         {
-          alignment.setDataset( (Alignment) Desktop.jalviewClipboard[1]);
+            alignment.setDataset( (Alignment) Desktop.jalviewClipboard[1]);
         }
-        else
+          else
         {
-          alignment.setDataset(null);
-        }
+            alignment.setDataset(null);
+      }
       }
       else
       {
         alignment = viewport.getAlignment();
 
         //!newAlignment
-        SequenceI[] newseqs = new SequenceI[sequences.length];
+        SequenceI [] newseqs = new SequenceI[sequences.length];
         for (int i = 0; i < sequences.length; i++)
         {
           newseqs[i] = new Sequence(sequences[i].getName(),
                                     sequences[i].getSequence(),
                                     sequences[i].getStart(),
-                                    sequences[i].getEnd());
+              sequences[i].getEnd());
 
           alignment.addSequence(newseqs[i]);
         }
@@ -1369,81 +1508,88 @@ public class AlignFrame
             alignment)
             );
 
+
         viewport.setEndSeq(alignment.getHeight());
         alignment.getWidth();
         viewport.firePropertyChange("alignment", null, alignment.getSequences());
       }
 
+
+
       // Add any annotations attached to sequences
       for (int i = 0; i < sequences.length; i++)
-      {
-        if (sequences[i].getAnnotation() != null)
-        {
-          for (int a = 0; a < sequences[i].getAnnotation().length; a++)
-          {
-            AlignmentAnnotation newAnnot =
-                new AlignmentAnnotation(
-                    sequences[i].getAnnotation()[a].label,
-                    sequences[i].getAnnotation()[a].description,
-                    sequences[i].getAnnotation()[a].annotations,
-                    sequences[i].getAnnotation()[a].graphMin,
-                    sequences[i].getAnnotation()[a].graphMax,
-                    sequences[i].getAnnotation()[a].graph);
-
-            sequences[i].getAnnotation()[a] = newAnnot;
-            newAnnot.sequenceMapping = sequences[i].getAnnotation()[a].
-                sequenceMapping;
-            newAnnot.sequenceRef = sequences[i];
-            newAnnot.adjustForAlignment();
-            alignment.addAnnotation(newAnnot);
-            alignment.setAnnotationIndex(newAnnot, a);
-          }
+     {
+       if (sequences[i].getAnnotation() != null)
+       {
+         for (int a = 0; a < sequences[i].getAnnotation().length; a++)
+         {
+           AlignmentAnnotation newAnnot =
+               new AlignmentAnnotation(
+                   sequences[i].getAnnotation()[a].label,
+                   sequences[i].getAnnotation()[a].description,
+                   sequences[i].getAnnotation()[a].annotations,
+                   sequences[i].getAnnotation()[a].graphMin,
+                   sequences[i].getAnnotation()[a].graphMax,
+                   sequences[i].getAnnotation()[a].graph);
+
+           sequences[i].getAnnotation()[a] = newAnnot;
+           newAnnot.sequenceMapping = sequences[i].getAnnotation()[a].
+               sequenceMapping;
+           newAnnot.sequenceRef = sequences[i];
+           newAnnot.adjustForAlignment();
+           alignment.addAnnotation(newAnnot);
+           alignment.setAnnotationIndex(newAnnot, a);
+         }
+
+         alignPanel.annotationPanel.adjustPanelHeight();
+       }
+     }
 
-          alignPanel.annotationPanel.adjustPanelHeight();
-        }
-      }
+     if(newAlignment)
+     {
+       AlignFrame af = new AlignFrame(alignment, DEFAULT_WIDTH, DEFAULT_HEIGHT);
+       String newtitle = new String("Copied sequences");
 
-      if (newAlignment)
-      {
-        AlignFrame af = new AlignFrame(alignment, DEFAULT_WIDTH, DEFAULT_HEIGHT);
-        String newtitle = new String("Copied sequences");
+       if(Desktop.jalviewClipboard!=null && Desktop.jalviewClipboard[2]!=null)
+         {
+           Vector hc = (Vector)Desktop.jalviewClipboard[2];
+           for(int i=0; i<hc.size(); i++)
+           {
+             int [] region = (int[]) hc.elementAt(i);
+             af.viewport.hideColumns(region[0], region[1]);
+           }
+         }
 
-        if (Desktop.jalviewClipboard != null && Desktop.jalviewClipboard[2] != null)
-        {
-          Vector hc = (Vector) Desktop.jalviewClipboard[2];
-          for (int i = 0; i < hc.size(); i++)
-          {
-            int[] region = (int[]) hc.elementAt(i);
-            af.viewport.hideColumns(region[0], region[1]);
-          }
-        }
 
-        //>>>This is a fix for the moment, until a better solution is found!!<<<
-        af.alignPanel.seqPanel.seqCanvas.getFeatureRenderer().transferSettings(
-            alignPanel.seqPanel.seqCanvas.getFeatureRenderer());
+       //>>>This is a fix for the moment, until a better solution is found!!<<<
+       af.alignPanel.seqPanel.seqCanvas.getFeatureRenderer().transferSettings(
+           alignPanel.seqPanel.seqCanvas.getFeatureRenderer());
 
-        if (title.startsWith("Copied sequences"))
-        {
-          newtitle = title;
-        }
-        else
-        {
-          newtitle = newtitle.concat("- from " + title);
-        }
 
-        Desktop.addInternalFrame(af, newtitle, DEFAULT_WIDTH,
-                                 DEFAULT_HEIGHT);
+       if (title.startsWith("Copied sequences"))
+       {
+         newtitle = title;
+       }
+       else
+       {
+         newtitle = newtitle.concat("- from " + title);
+       }
+
+       Desktop.addInternalFrame(af, newtitle, DEFAULT_WIDTH,
+                                DEFAULT_HEIGHT);
+
+     }
 
-      }
 
     }
     catch (Exception ex)
     {
       ex.printStackTrace();
-      System.out.println("Exception whilst pasting: " + ex);
-      // could be anything being pasted in here
+        System.out.println("Exception whilst pasting: "+ex);
+        // could be anything being pasted in here
     }
 
+
   }
 
   /**
@@ -1479,34 +1625,38 @@ public class AlignFrame
       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++)
+   // 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);
+      cut[i] = (SequenceI)seqs.elementAt(i);
     }
 
+
     /*
-         //ADD HISTORY ITEM
-     */
+    //ADD HISTORY ITEM
+    */
     addHistoryItem(new EditCommand("Cut Sequences",
-                                   EditCommand.CUT,
-                                   cut,
-                                   sg.getStartRes(),
-                                   sg.getEndRes() - sg.getStartRes() + 1,
-                                   viewport.alignment));
+                                      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());
+                                  viewport.getAlignment().getSequences());
 
     if (viewport.getAlignment().getHeight() < 1)
     {
@@ -1531,7 +1681,7 @@ public class AlignFrame
     viewport.sequenceColours = null;
     viewport.setSelectionGroup(null);
     PaintRefresher.Refresh(this, viewport.getSequenceSetId());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1551,7 +1701,7 @@ public class AlignFrame
 
     sg.setEndRes(viewport.alignment.getWidth() - 1);
     viewport.setSelectionGroup(sg);
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
     PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());
   }
 
@@ -1562,7 +1712,7 @@ public class AlignFrame
    */
   public void deselectAllSequenceMenuItem_actionPerformed(ActionEvent e)
   {
-    if (viewport.cursorMode)
+    if(viewport.cursorMode)
     {
       alignPanel.seqPanel.keyboardNo1 = null;
       alignPanel.seqPanel.keyboardNo2 = null;
@@ -1572,7 +1722,7 @@ public class AlignFrame
     viewport.setSelectionGroup(null);
     alignPanel.seqPanel.seqCanvas.highlightSearchResults(null);
     alignPanel.idPanel.idCanvas.searchResults = null;
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
     PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());
   }
 
@@ -1598,7 +1748,7 @@ public class AlignFrame
       sg.addOrRemove(viewport.getAlignment().getSequenceAt(i), false);
     }
 
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
 
     PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());
   }
@@ -1606,9 +1756,10 @@ public class AlignFrame
   public void invertColSel_actionPerformed(ActionEvent e)
   {
     viewport.invertColumnSelection();
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
+
   /**
    * DOCUMENT ME!
    *
@@ -1626,7 +1777,7 @@ public class AlignFrame
    */
   public void remove2RightMenuItem_actionPerformed(ActionEvent e)
   {
-    trimAlignment(false);
+      trimAlignment(false);
   }
 
   void trimAlignment(boolean trimLeft)
@@ -1636,7 +1787,7 @@ public class AlignFrame
 
     if (colSel.size() > 0)
     {
-      if (trimLeft)
+      if(trimLeft)
       {
         column = colSel.getMin();
       }
@@ -1645,8 +1796,8 @@ public class AlignFrame
         column = colSel.getMax();
       }
 
-      SequenceI[] seqs;
-      if (viewport.getSelectionGroup() != null)
+      SequenceI [] seqs;
+      if(viewport.getSelectionGroup()!=null)
       {
         seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.
             hiddenRepSequences);
@@ -1656,30 +1807,32 @@ public class AlignFrame
         seqs = viewport.alignment.getSequencesArray();
       }
 
+
       TrimRegionCommand trimRegion;
-      if (trimLeft)
+      if(trimLeft)
       {
         trimRegion = new TrimRegionCommand("Remove Left",
-                                           TrimRegionCommand.TRIM_LEFT,
-                                           seqs,
-                                           column,
-                                           viewport.alignment,
-                                           viewport.colSel,
-                                           viewport.selectionGroup);
+                                    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);
-      }
+     else
+     {
+       trimRegion = new TrimRegionCommand("Remove Right",
+                                   TrimRegionCommand.TRIM_RIGHT,
+                                   seqs,
+                                   column,
+                                   viewport.alignment,
+                                   viewport.colSel,
+                                   viewport.selectionGroup);
+     }
+
+     statusBar.setText("Removed "+trimRegion.getSize()+" columns.");
 
-      statusBar.setText("Removed " + trimRegion.getSize() + " columns.");
 
       addHistoryItem(trimRegion);
 
@@ -1708,7 +1861,7 @@ public class AlignFrame
    */
   public void removeGappedColumnMenuItem_actionPerformed(ActionEvent e)
   {
-    int start = 0, end = viewport.alignment.getWidth() - 1;
+    int start = 0, end = viewport.alignment.getWidth()-1;
 
     SequenceI[] seqs;
     if (viewport.getSelectionGroup() != null)
@@ -1723,6 +1876,7 @@ public class AlignFrame
       seqs = viewport.alignment.getSequencesArray();
     }
 
+
     RemoveGapColCommand removeGapCols =
         new RemoveGapColCommand("Remove Gapped Columns",
                                 seqs,
@@ -1731,18 +1885,18 @@ public class AlignFrame
 
     addHistoryItem(removeGapCols);
 
-    statusBar.setText("Removed " + removeGapCols.getSize() + " empty columns.");
+    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);
+   // 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());
 
@@ -1755,7 +1909,7 @@ public class AlignFrame
    */
   public void removeAllGapsMenuItem_actionPerformed(ActionEvent e)
   {
-    int start = 0, end = viewport.alignment.getWidth() - 1;
+    int start = 0, end = viewport.alignment.getWidth()-1;
 
     SequenceI[] seqs;
     if (viewport.getSelectionGroup() != null)
@@ -1780,7 +1934,7 @@ public class AlignFrame
                                          start, end,
                                          viewport.alignment));
 
-    viewport.setStartRes(seq.findIndex(startRes) - 1);
+    viewport.setStartRes(seq.findIndex(startRes)-1);
 
     viewport.firePropertyChange("alignment", null,
                                 viewport.getAlignment().getSequences());
@@ -1825,33 +1979,33 @@ public class AlignFrame
     newap.av.redoList = viewport.redoList;
 
     int index = Desktop.getViewCount(viewport.getSequenceSetId());
-    String newViewName = "View " + index;
+    String newViewName = "View " +index;
 
     Vector comps = (Vector) PaintRefresher.components.get(viewport.
         getSequenceSetId());
     Vector existingNames = new Vector();
-    for (int i = 0; i < comps.size(); i++)
+    for(int i=0; i<comps.size(); i++)
     {
-      if (comps.elementAt(i) instanceof AlignmentPanel)
+      if(comps.elementAt(i) instanceof AlignmentPanel)
       {
-        AlignmentPanel ap = (AlignmentPanel) comps.elementAt(i);
-        if (!existingNames.contains(ap.av.viewName))
+        AlignmentPanel ap = (AlignmentPanel)comps.elementAt(i);
+        if(!existingNames.contains(ap.av.viewName))
         {
           existingNames.addElement(ap.av.viewName);
-        }
       }
     }
+    }
 
-    while (existingNames.contains(newViewName))
+    while(existingNames.contains(newViewName))
     {
-      newViewName = "View " + (++index);
+      newViewName = "View "+ (++index);
     }
 
     newap.av.viewName = newViewName;
 
     addAlignmentPanel(newap, false);
 
-    if (alignPanels.size() == 2)
+    if(alignPanels.size()==2)
     {
       viewport.gatherViewsHere = true;
     }
@@ -1860,7 +2014,7 @@ public class AlignFrame
 
   public void expandViews_actionPerformed(ActionEvent e)
   {
-    Desktop.instance.explodeViews(this);
+        Desktop.instance.explodeViews(this);
   }
 
   public void gatherViews_actionPerformed(ActionEvent e)
@@ -1868,6 +2022,8 @@ public class AlignFrame
     Desktop.instance.gatherViews(this);
   }
 
+
+
   /**
    * DOCUMENT ME!
    *
@@ -1878,6 +2034,7 @@ public class AlignFrame
     new FontChooser(alignPanel);
   }
 
+
   /**
    * DOCUMENT ME!
    *
@@ -1888,15 +2045,17 @@ public class AlignFrame
     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.repaint();
+    alignPanel.paintAlignment(true);
   }
 
+
+
   /**
    * DOCUMENT ME!
    *
@@ -1905,7 +2064,7 @@ public class AlignFrame
   protected void colourTextMenuItem_actionPerformed(ActionEvent e)
   {
     viewport.setColourText(colourTextMenuItem.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1936,13 +2095,13 @@ public class AlignFrame
   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)
@@ -1959,7 +2118,7 @@ public class AlignFrame
   protected void scaleAbove_actionPerformed(ActionEvent e)
   {
     viewport.setScaleAboveWrapped(scaleAbove.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1970,7 +2129,7 @@ public class AlignFrame
   protected void scaleLeft_actionPerformed(ActionEvent e)
   {
     viewport.setScaleLeftWrapped(scaleLeft.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1981,7 +2140,7 @@ public class AlignFrame
   protected void scaleRight_actionPerformed(ActionEvent e)
   {
     viewport.setScaleRightWrapped(scaleRight.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1992,7 +2151,7 @@ public class AlignFrame
   public void viewBoxesMenuItem_actionPerformed(ActionEvent e)
   {
     viewport.setShowBoxes(viewBoxesMenuItem.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -2003,7 +2162,7 @@ public class AlignFrame
   public void viewTextMenuItem_actionPerformed(ActionEvent e)
   {
     viewport.setShowText(viewTextMenuItem.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -2014,13 +2173,14 @@ public class AlignFrame
   protected void renderGapsMenuItem_actionPerformed(ActionEvent e)
   {
     viewport.setRenderGaps(renderGapsMenuItem.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
+
   public FeatureSettings featureSettings;
   public void featureSettings_actionPerformed(ActionEvent e)
   {
-    if (featureSettings != null)
+    if(featureSettings !=null )
     {
       featureSettings.close();
       featureSettings = null;
@@ -2036,7 +2196,7 @@ public class AlignFrame
   public void showSeqFeatures_actionPerformed(ActionEvent evt)
   {
     viewport.setShowSequenceFeatures(showSeqFeatures.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
     if (alignPanel.getOverviewPanel() != null)
     {
       alignPanel.getOverviewPanel().updateOverviewImage();
@@ -2197,6 +2357,7 @@ public class AlignFrame
     new AnnotationColourChooser(viewport, alignPanel);
   }
 
+
   /**
    * DOCUMENT ME!
    *
@@ -2216,12 +2377,12 @@ public class AlignFrame
   {
     int threshold = 0;
 
-    if (cs != null)
+    if(cs!=null)
     {
       if (viewport.getAbovePIDThreshold())
       {
         threshold = SliderPanel.setPIDSliderSource(alignPanel, cs,
-            "Background");
+                                                   "Background");
 
         cs.setThreshold(threshold,
                         viewport.getIgnoreGapsConsensus());
@@ -2298,18 +2459,19 @@ public class AlignFrame
             || cs instanceof PIDColourScheme
             || cs instanceof Blosum62ColourScheme)
         {
-          sg.cs.setThreshold(threshold,
-                             viewport.getIgnoreGapsConsensus());
+         sg.cs.setThreshold(threshold,
+                viewport.getIgnoreGapsConsensus());
 
-          sg.cs.setConsensus(AAFrequency.calculate(
-              sg.getSequences(viewport.hiddenRepSequences), sg.getStartRes(),
-              sg.getEndRes() + 1));
-        }
+         sg.cs.setConsensus(AAFrequency.calculate(
+             sg.getSequences(viewport.hiddenRepSequences), sg.getStartRes(),
+             sg.getEndRes()+1));
+       }
         else
         {
           sg.cs.setThreshold(0, viewport.getIgnoreGapsConsensus());
         }
 
+
         if (viewport.getConservationSelected())
         {
           Conservation c = new Conservation("Group",
@@ -2317,7 +2479,7 @@ public class AlignFrame
                                             sg.getSequences(viewport.
               hiddenRepSequences),
                                             sg.getStartRes(),
-                                            sg.getEndRes() + 1);
+                                            sg.getEndRes()+1);
           c.calculate();
           c.verdict(false, viewport.ConsPercGaps);
           sg.cs.setConservation(c);
@@ -2325,16 +2487,19 @@ public class AlignFrame
         else
         {
           sg.cs.setConservation(null);
-        }
       }
     }
+    }
 
     if (alignPanel.getOverviewPanel() != null)
     {
       alignPanel.getOverviewPanel().updateOverviewImage();
     }
 
-    alignPanel.repaint();
+
+
+
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -2344,7 +2509,7 @@ public class AlignFrame
    */
   protected void modifyPID_actionPerformed(ActionEvent e)
   {
-    if (viewport.getAbovePIDThreshold() && viewport.globalColourScheme != null)
+    if (viewport.getAbovePIDThreshold() && viewport.globalColourScheme!=null)
     {
       SliderPanel.setPIDSliderSource(alignPanel,
                                      viewport.getGlobalColourScheme(),
@@ -2360,7 +2525,7 @@ public class AlignFrame
    */
   protected void modifyConservation_actionPerformed(ActionEvent e)
   {
-    if (viewport.getConservationSelected() && viewport.globalColourScheme != null)
+    if (viewport.getConservationSelected() && viewport.globalColourScheme!=null)
     {
       SliderPanel.setConservationSlider(alignPanel,
                                         viewport.globalColourScheme,
@@ -2449,37 +2614,37 @@ public class AlignFrame
             nextElement().toString());
         radioItem.setName("USER_DEFINED");
         radioItem.addMouseListener(new MouseAdapter()
-        {
-          public void mousePressed(MouseEvent evt)
-          {
-            if (evt.isControlDown() || SwingUtilities.isRightMouseButton(evt))
             {
-              radioItem.removeActionListener(radioItem.getActionListeners()[0]);
+              public void mousePressed(MouseEvent evt)
+              {
+                if(evt.isControlDown() || SwingUtilities.isRightMouseButton(evt))
+                {
+                  radioItem.removeActionListener(radioItem.getActionListeners()[0]);
 
               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)
-              {
+                      "Remove from default list?",
+                      "Remove user defined colour",
+                      JOptionPane.YES_NO_OPTION);
+                  if(option == JOptionPane.YES_OPTION)
+                  {
                 jalview.gui.UserDefinedColours.removeColourFromDefaults(
                     radioItem.getText());
-                colourMenu.remove(radioItem);
-              }
-              else
-              {
-                radioItem.addActionListener(new ActionListener()
-                {
-                  public void actionPerformed(ActionEvent evt)
-                  {
-                    userDefinedColour_actionPerformed(evt);
+                    colourMenu.remove(radioItem);
                   }
-                });
+                  else
+              {
+                    radioItem.addActionListener(new ActionListener()
+                    {
+                      public void actionPerformed(ActionEvent evt)
+                      {
+                        userDefinedColour_actionPerformed(evt);
+                      }
+                    });
+                }
               }
-            }
           }
-        });
+            });
         radioItem.addActionListener(new ActionListener()
         {
           public void actionPerformed(ActionEvent evt)
@@ -2521,12 +2686,12 @@ public class AlignFrame
    */
   public void sortPairwiseMenuItem_actionPerformed(ActionEvent e)
   {
-    SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray();
+    SequenceI [] oldOrder = viewport.getAlignment().getSequencesArray();
     AlignmentSorter.sortByPID(viewport.getAlignment(),
                               viewport.getAlignment().getSequenceAt(0));
     addHistoryItem(new OrderCommand("Pairwise Sort", oldOrder,
                                     viewport.alignment));
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -2536,10 +2701,10 @@ public class AlignFrame
    */
   public void sortIDMenuItem_actionPerformed(ActionEvent e)
   {
-    SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray();
+    SequenceI [] oldOrder = viewport.getAlignment().getSequencesArray();
     AlignmentSorter.sortByID(viewport.getAlignment());
     addHistoryItem(new OrderCommand("ID Sort", oldOrder, viewport.alignment));
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -2549,11 +2714,11 @@ public class AlignFrame
    */
   public void sortGroupMenuItem_actionPerformed(ActionEvent e)
   {
-    SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray();
+    SequenceI [] oldOrder = viewport.getAlignment().getSequencesArray();
     AlignmentSorter.sortByGroup(viewport.getAlignment());
     addHistoryItem(new OrderCommand("Group Sort", oldOrder, viewport.alignment));
 
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -2566,6 +2731,7 @@ public class AlignFrame
     new RedundancyPanel(alignPanel, this);
   }
 
+
   /**
    * DOCUMENT ME!
    *
@@ -2610,13 +2776,14 @@ public class AlignFrame
       return;
     }
 
-    new PCAPanel(alignPanel);
+     new PCAPanel(alignPanel);
   }
 
+
   public void autoCalculate_actionPerformed(ActionEvent e)
   {
     viewport.autoCalculateConsensus = autoCalculate.isSelected();
-    if (viewport.autoCalculateConsensus)
+    if(viewport.autoCalculateConsensus)
     {
       viewport.firePropertyChange("alignment",
                                   null,
@@ -2624,6 +2791,7 @@ public class AlignFrame
     }
   }
 
+
   /**
    * DOCUMENT ME!
    *
@@ -2724,7 +2892,7 @@ public class AlignFrame
         return;
       }
 
-      if (viewport.alignment.getHeight() < 2)
+      if(viewport.alignment.getHeight()<2)
       {
         return;
       }
@@ -2734,9 +2902,9 @@ public class AlignFrame
 
     title += " from ";
 
-    if (viewport.viewName != null)
+    if(viewport.viewName!=null)
     {
-      title += viewport.viewName + " of ";
+      title+= viewport.viewName+" of ";
     }
 
     title += this.title;
@@ -2758,7 +2926,7 @@ public class AlignFrame
     {
       public void actionPerformed(ActionEvent e)
       {
-        SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray();
+        SequenceI [] oldOrder = viewport.getAlignment().getSequencesArray();
 
         // TODO: JBPNote - have to map order entries to curent SequenceI pointers
         AlignmentSorter.sortBy(viewport.getAlignment(), order);
@@ -2766,7 +2934,7 @@ public class AlignFrame
         addHistoryItem(new OrderCommand(order.getName(), oldOrder,
                                         viewport.alignment));
 
-        alignPanel.repaint();
+        alignPanel.paintAlignment(true);
       }
     });
   }
@@ -2788,9 +2956,9 @@ public class AlignFrame
         getSequenceSetId());
     Vector treePanels = new Vector();
     int i, iSize = comps.size();
-    for (i = 0; i < iSize; i++)
+    for(i=0; i<iSize; i++)
     {
-      if (comps.elementAt(i) instanceof TreePanel)
+      if(comps.elementAt(i) instanceof TreePanel)
       {
         treePanels.add(comps.elementAt(i));
       }
@@ -2798,7 +2966,7 @@ public class AlignFrame
 
     iSize = treePanels.size();
 
-    if (iSize < 1)
+    if(iSize<1)
     {
       sortByTreeMenu.setVisible(false);
       return;
@@ -2806,11 +2974,11 @@ public class AlignFrame
 
     sortByTreeMenu.setVisible(true);
 
-    for (i = 0; i < treePanels.size(); i++)
+    for(i=0; i<treePanels.size(); i++)
     {
-      TreePanel tp = (TreePanel) treePanels.elementAt(i);
+      TreePanel tp = (TreePanel)treePanels.elementAt(i);
       final JMenuItem item = new JMenuItem(tp.getTitle());
-      final NJTree tree = ( (TreePanel) treePanels.elementAt(i)).getTree();
+      final NJTree tree = ((TreePanel)treePanels.elementAt(i)).getTree();
       item.addActionListener(new java.awt.event.ActionListener()
       {
         public void actionPerformed(ActionEvent e)
@@ -2822,7 +2990,7 @@ public class AlignFrame
                                           oldOrder,
                                           viewport.alignment));
 
-          alignPanel.repaint();
+          alignPanel.paintAlignment(true);
         }
       });
 
@@ -2845,27 +3013,28 @@ public class AlignFrame
     {
       // JBPNote UGLY! To prettify, make SequenceGroup and Alignment conform to some common interface!
       /*SequenceGroup seqs = viewport.getSelectionGroup();
-             int sz;
-             msa = new SequenceI[sz = seqs.getSize(false)];
+      int sz;
+      msa = new SequenceI[sz = seqs.getSize(false)];
 
-             for (int i = 0; i < sz; i++)
-             {
+      for (int i = 0; i < sz; i++)
+      {
         msa[i] = (SequenceI) seqs.getSequenceAt(i);
-             } */
+      } */
       msa = viewport.getAlignmentView(true);
     }
     else
     {
       /*Vector seqs = viewport.getAlignment().getSequences();
-             if (seqs.size() > 1)
-             {
+
+      if (seqs.size() > 1)
+      {
         msa = new SequenceI[seqs.size()];
 
         for (int i = 0; i < seqs.size(); i++)
         {
           msa[i] = (SequenceI) seqs.elementAt(i);
         }
-             }*/
+      }*/
       msa = viewport.getAlignmentView(false);
     }
     return msa;
@@ -2879,7 +3048,7 @@ public class AlignFrame
    */
   AlignmentView gatherSeqOrMsaForSecStrPrediction()
   {
-    AlignmentView seqs = null;
+   AlignmentView seqs = null;
 
     if ( (viewport.getSelectionGroup() != null) &&
         (viewport.getSelectionGroup().getSize() > 0))
@@ -2899,7 +3068,6 @@ public class AlignFrame
     }
     return seqs;
   }
-
   /**
    * DOCUMENT ME!
    *
@@ -2939,15 +3107,16 @@ public class AlignFrame
     }
   }
 
+
   public TreePanel ShowNewickTree(NewickFile nf, String title)
   {
-    return ShowNewickTree(nf, title, 600, 500, 4, 5);
+    return ShowNewickTree(nf,title,600,500,4,5);
   }
 
   public TreePanel ShowNewickTree(NewickFile nf, String title,
                                   AlignmentView input)
   {
-    return ShowNewickTree(nf, title, input, 600, 500, 4, 5);
+    return ShowNewickTree(nf,title, input, 600,500,4,5);
   }
 
   public TreePanel ShowNewickTree(NewickFile nf, String title, int w, int h,
@@ -2955,7 +3124,6 @@ public class AlignFrame
   {
     return ShowNewickTree(nf, title, null, w, h, x, y);
   }
-
   /**
    * Add a treeviewer for the tree extracted from a newick file object to the current alignment view
    *
@@ -2985,13 +3153,14 @@ public class AlignFrame
                            title,
                            nf, input);
 
-        tp.setSize(w, h);
+        tp.setSize(w,h);
 
-        if (x > 0 && y > 0)
+        if(x>0 && y>0)
         {
-          tp.setLocation(x, y);
+          tp.setLocation(x,y);
         }
 
+
         Desktop.addInternalFrame(tp, title, w, h);
       }
     }
@@ -3003,6 +3172,7 @@ public class AlignFrame
     return tp;
   }
 
+
   /**
    * Generates menu items and listener event actions for web service clients
    *
@@ -3043,7 +3213,7 @@ public class AlignFrame
           if (sh.getName().indexOf("lustal") > -1)
           {
             // We know that ClustalWS can accept partial alignments for refinement.
-            final JMenuItem methodR = new JMenuItem(sh.getName() + " Realign");
+            final JMenuItem methodR = new JMenuItem(sh.getName()+" Realign");
             methodR.addActionListener(new ActionListener()
             {
               public void actionPerformed(ActionEvent e)
@@ -3088,7 +3258,7 @@ public class AlignFrame
                 {
                   // Sequence profile based prediction
                   new jalview.ws.JPredClient(sh,
-                                             title, true, msa, af, true);
+                      title, true, msa, af, true);
                 }
               }
             }
@@ -3113,167 +3283,103 @@ public class AlignFrame
     // TODO: group services by location as well as function.
   }
 
-  /* public void vamsasStore_actionPerformed(ActionEvent e)
-   {
-     JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
-         getProperty("LAST_DIRECTORY"));
-
-     chooser.setFileView(new JalviewFileView());
-     chooser.setDialogTitle("Export to Vamsas file");
-     chooser.setToolTipText("Export");
-
-     int value = chooser.showSaveDialog(this);
-
-     if (value == JalviewFileChooser.APPROVE_OPTION)
-     {
-   jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(viewport);
-       //vs.store(chooser.getSelectedFile().getAbsolutePath()   );
-       vs.storeJalview( chooser.getSelectedFile().getAbsolutePath(), this);
-     }
-   }*/
-
-
-
-
-  public void showTranslation_actionPerformed(ActionEvent e)
+ /* public void vamsasStore_actionPerformed(ActionEvent e)
   {
-    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;
+    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
+        getProperty("LAST_DIRECTORY"));
 
-      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());
-    }
+    chooser.setFileView(new JalviewFileView());
+    chooser.setDialogTitle("Export to Vamsas file");
+    chooser.setToolTipText("Export");
 
-    AlignmentI al = new Alignment(newSeq);
-    al.setDataset(null);
+    int value = chooser.showSaveDialog(this);
 
-    ////////////////////////////////
-    // Copy annotations across
-    jalview.datamodel.AlignmentAnnotation[] annotations
-        = viewport.alignment.getAlignmentAnnotation();
-    int a, aSize;
-    if (annotations != null)
+    if (value == JalviewFileChooser.APPROVE_OPTION)
     {
-      for (int i = 0; i < annotations.length; i++)
-      {
-        if (annotations[i] == viewport.quality ||
-            annotations[i] == viewport.conservation ||
-            annotations[i] == viewport.consensus)
-        {
-          System.out.println("COPT HERE");
-          continue;
-        }
-
-        aSize = viewport.alignment.getWidth() / 3;
-        jalview.datamodel.Annotation[] anots =
-            new jalview.datamodel.Annotation[aSize];
+      jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(viewport);
+      //vs.store(chooser.getSelectedFile().getAbsolutePath()   );
+      vs.storeJalview( chooser.getSelectedFile().getAbsolutePath(), this);
+    }
+  }*/
 
-        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);
-      }
-    }
 
+public void showTranslation_actionPerformed(ActionEvent e)
+{
+  ///////////////////////////////
+  // Collect Data to be translated/transferred
+    
+  SequenceI [] selection = viewport.getSelectionAsNewSequence();
+  String [] seqstring = viewport.getViewAsString(true);
+  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(),
+    Desktop.addInternalFrame(af, "Translation of "+this.getTitle(),
                              DEFAULT_WIDTH,
                              DEFAULT_HEIGHT);
-
   }
+}
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @param String DOCUMENT ME!
-   */
-  public boolean parseFeaturesFile(String file, String type)
-  {
+/**
+ * DOCUMENT ME!
+ *
+ * @param String DOCUMENT ME!
+ */
+public boolean parseFeaturesFile(String file, String type)
+{
     boolean featuresFile = false;
     try
     {
       featuresFile = new FeaturesFile(file,
           type).parse(viewport.alignment.getDataset(),
-                      alignPanel.seqPanel.seqCanvas.
-                      getFeatureRenderer().featureColours,
-                      false);
+                                         alignPanel.seqPanel.seqCanvas.
+                                         getFeatureRenderer().featureColours,
+                                         false);
     }
-    catch (Exception ex)
+    catch(Exception ex)
     {
       ex.printStackTrace();
     }
 
-    if (featuresFile)
+    if(featuresFile)
     {
       viewport.showSequenceFeatures = true;
       showSeqFeatures.setSelected(true);
-      alignPanel.repaint();
+      alignPanel.paintAlignment(true);
     }
 
     return featuresFile;
-  }
+}
 
-  public void dragEnter(DropTargetDragEvent evt)
-  {}
+public void dragEnter(DropTargetDragEvent evt)
+{}
 
-  public void dragExit(DropTargetEvent evt)
-  {}
+public void dragExit(DropTargetEvent evt)
+{}
 
-  public void dragOver(DropTargetDragEvent evt)
-  {}
+public void dragOver(DropTargetDragEvent evt)
+{}
 
-  public void dropActionChanged(DropTargetDragEvent evt)
-  {}
+public void dropActionChanged(DropTargetDragEvent evt)
+{}
 
-  public void drop(DropTargetDropEvent evt)
-  {
+public void drop(DropTargetDropEvent evt)
+{
     Transferable t = evt.getTransferable();
     java.util.List files = null;
 
@@ -3331,13 +3437,13 @@ public class AlignFrame
         ex.printStackTrace();
       }
     }
-  }
+}
 
   // This method will attempt to load a "dropped" file first by testing
   // whether its and Annotation file, then features file. If both are
   // false then the user may have dropped an alignment file onto this
   // AlignFrame
-  public void loadJalviewDataFile(String file)
+   public void loadJalviewDataFile(String file)
   {
     try
     {
@@ -3353,12 +3459,12 @@ public class AlignFrame
 
       if (!isAnnotation)
       {
-        boolean isGroupsFile = parseFeaturesFile(file, protocol);
+        boolean isGroupsFile = parseFeaturesFile(file,protocol);
         if (!isGroupsFile)
         {
           String format = new IdentifyFile().Identify(file, protocol);
 
-          if (format.equalsIgnoreCase("JnetFile"))
+          if(format.equalsIgnoreCase("JnetFile"))
           {
             jalview.io.JPredFile predictions = new jalview.io.JPredFile(
                 file, protocol);
@@ -3366,14 +3472,14 @@ public class AlignFrame
                 viewport.getAlignment(),
                 0, false);
             alignPanel.adjustAnnotationHeight();
-            alignPanel.repaint();
+            alignPanel.paintAlignment(true);
           }
           else
           {
             new FileLoader().LoadFile(viewport, file, protocol, format);
-          }
         }
       }
+      }
       else
       {
         // (isAnnotation)
@@ -3399,7 +3505,7 @@ public class AlignFrame
 
   public void tabbedPane_mousePressed(MouseEvent e)
   {
-    if (SwingUtilities.isRightMouseButton(e))
+    if(SwingUtilities.isRightMouseButton(e))
     {
       String reply = JOptionPane.showInternalInputDialog(this,
           "Enter View Name",
@@ -3409,11 +3515,12 @@ public class AlignFrame
       if (reply != null)
       {
         viewport.viewName = reply;
-        tabbedPane.setTitleAt(tabbedPane.getSelectedIndex(), reply);
+        tabbedPane.setTitleAt( tabbedPane.getSelectedIndex() ,reply);
       }
     }
   }
 
+
   public AlignViewport getCurrentView()
   {
     return viewport;
@@ -3426,9 +3533,8 @@ class PrintThread
   AlignmentPanel ap;
   public PrintThread(AlignmentPanel ap)
   {
-    this.ap = ap;
+   this.ap = ap;
   }
-
   static PageFormat pf;
   public void run()
   {