X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=99227e1be983d0b9c7862599b56d96fc7a9ef475;hb=a4833a9c3e15e416598b61e6887ee5743c3c2734;hp=3082f74c6fdcdb02f1ea084abc8ed1071c9c454a;hpb=5d455c2d0b8b1ac94d82584e2885654693abb39f;p=jalview.git

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 3082f74..99227e1 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,20 +24,19 @@ 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 javax.swing.event.MenuEvent;
 
 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.*;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ChangeEvent;
 
 /**
  * DOCUMENT ME!
@@ -45,7 +44,8 @@ import javax.swing.event.ChangeEvent;
  * @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;
@@ -59,9 +59,13 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   Vector alignPanels = new Vector();
 
 
-  /** DOCUMENT ME!! */
+  /** 
+   * Last format used to load or save alignments in this window 
+   */
   String currentFileFormat = null;
-
+  /**
+   * Current filename for this alignment
+   */
   String fileName = null;
 
 
@@ -113,8 +117,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
   void init()
   {
-    this.setDropTarget(new java.awt.dnd.DropTarget(this, this));
-
     if (viewport.conservation == null)
     {
       BLOSUM62Colour.setEnabled(false);
@@ -128,23 +130,33 @@ 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)
    {
+     this.setDropTarget(new java.awt.dnd.DropTarget(this, this));
      addServiceListeners();
      setGUINucleotide(viewport.alignment.isNucleotide());
    }
 
    setMenusFromViewport(viewport);
-
+   buildSortByAnnotationScoresMenu();
    if (viewport.wrapAlignment)
    {
      wrapMenuItem_actionPerformed(null);
    }
 
+    if (jalview.bin.Cache.getDefault("SHOW_OVERVIEW",false))
+    {
+      this.overviewMenuItem_actionPerformed(null);
+    }
+
    addKeyListener();
 
   }
@@ -162,12 +174,15 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       {
         public void keyPressed(KeyEvent evt)
         {
-          if (viewport.cursorMode
-              && evt.getKeyCode() >= KeyEvent.VK_0
-              && evt.getKeyCode() <= KeyEvent.VK_9)
-          {
+          if (viewport.cursorMode &&
+              ( (evt.getKeyCode() >= KeyEvent.VK_0 &&
+                 evt.getKeyCode() <= KeyEvent.VK_9)
+               ||
+               (evt.getKeyCode() >= KeyEvent.VK_NUMPAD0 &&
+                evt.getKeyCode() <= KeyEvent.VK_NUMPAD9)
+              )
+              && Character.isDigit(evt.getKeyChar()))
             alignPanel.seqPanel.numberPressed(evt.getKeyChar());
-          }
 
           switch (evt.getKeyCode())
           {
@@ -178,35 +193,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:
@@ -225,9 +241,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
                 cut_actionPerformed(null);
               }
               else
+            {
                 alignPanel.seqPanel.deleteGapAtCursor(evt.isControlDown()
                                            || evt.isShiftDown()
                                            || evt.isAltDown());
+            }
 
               break;
 
@@ -315,9 +333,12 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
                   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)
               {
@@ -325,31 +346,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;
+        }
+      }
       });
   }
 
@@ -388,7 +439,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     if(newPanel)
     {
       if (ap.av.padGaps)
+      {
         ap.av.alignment.padGaps();
+      }
       ap.av.updateConservation(ap);
       ap.av.updateConsensus(ap);
     }
@@ -449,14 +502,17 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     showTranslation.setVisible( nucleotide );
     conservationMenuItem.setEnabled( !nucleotide );
     modifyConservation.setEnabled(   !nucleotide );
-
+    
     //Remember AlignFrame always starts as protein
     if(!nucleotide)
     {
       calculateMenu.remove(calculateMenu.getItemCount()-2);
     }
+    setShowProductsEnabled();
   }
 
+
+
   /**
    * Need to call this method when tabs are selected for multiple views,
    * or when loading from Jalview2XML.java
@@ -494,7 +550,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();
@@ -505,7 +563,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
        progressBars.remove( progressPanel );
        progressPanel = null;
        if(message!=null)
+      {
          statusBar.setText(message);
+      }
 
        layout.setRows(layout.getRows() - 1);
      }
@@ -568,42 +628,35 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
               && frames[i] != this
               && ( (AlignFrame) frames[i]).fileName.equals(fileName))
           {
-            try{
+            try
+            {
               frames[i].setSelected(true);
               Desktop.instance.closeAssociatedWindows();
-            }catch(java.beans.PropertyVetoException ex){}
+          }
+            catch (java.beans.PropertyVetoException ex)
+            {}
           }
 
         }
         Desktop.instance.closeAssociatedWindows();
 
+        FileLoader loader = new FileLoader();
+        String protocol = fileName.startsWith("http:")? "URL":"File";
+        loader.LoadFile(viewport, fileName, protocol, currentFileFormat);
       }
       else
       {
-        viewport.alignment.deleteAllGroups();
-        viewport.sequenceColours=null;
-        while (viewport.alignment.getHeight() > 0)
-        {
-          viewport.alignment.deleteSequence(0);
-        }
+        Rectangle bounds = this.getBounds();
 
-        viewport.historyList.clear();
-        viewport.redoList.clear();
-        Alignment dset = viewport.alignment.getDataset();
-        while (dset.getHeight() > 0)
-        {
-          dset.deleteSequence(0);
-        }
+        FileLoader loader = new FileLoader();
+        String protocol = fileName.startsWith("http:") ? "URL" : "File";
+        AlignFrame newframe =
+            loader.LoadFileWaitTillLoaded(fileName, protocol, currentFileFormat);
 
-        firePropertyChange("Alignment", null, viewport.alignment.getSequences());
+        newframe.setBounds(bounds);
 
-        updateEditMenuBar();
+        this.closeMenuItem_actionPerformed(true);
       }
-
-      FileLoader loader = new FileLoader();
-      String protocol = fileName.startsWith("http:")? "URL":"File";
-      loader.LoadFile(viewport, fileName, protocol, currentFileFormat);
-
     }
   }
 
@@ -625,10 +678,14 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
        || currentFileFormat==null
        || fileName.startsWith("http")
         )
+    {
       saveAs_actionPerformed(null);
+    }
     else
+    {
       saveAlignment(fileName, currentFileFormat);
   }
+  }
 
   /**
    * DOCUMENT ME!
@@ -639,10 +696,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   {
     JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
         getProperty( "LAST_DIRECTORY"),
-        new String[]
-        { "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc","jar" },
-        new String[]
-        { "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "Jalview" },
+        jalview.io.AppletFormatAdapter.WRITABLE_EXTENSIONS,
+        jalview.io.AppletFormatAdapter.WRITABLE_FNAMES,
         currentFileFormat,
         false);
 
@@ -672,7 +727,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
                                     currentFileFormat);
 
       jalview.bin.Cache.setProperty("LAST_DIRECTORY", fileName);
-
+      if (currentFileFormat.indexOf(" ")>-1)
+      {
+        currentFileFormat = currentFileFormat.substring(0, currentFileFormat.indexOf(" "));
+      }
       saveAlignment(fileName, currentFileFormat);
     }
   }
@@ -712,13 +770,16 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
             JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
 
         if (reply == JOptionPane.YES_OPTION)
+        {
           omitHidden = viewport.getViewAsString(false);
       }
+      }
+      FormatAdapter f = new FormatAdapter();
 
-      String output = new FormatAdapter().formatSequences(
+      String output = f.formatSequences(
           format,
-          viewport.alignment.getSequencesArray(),
-          omitHidden);
+          (Alignment) viewport.alignment, // class cast exceptions will occur in the distant future
+          omitHidden, f.getCacheSuffixDefault(format), viewport.colSel);
 
       if (output == null)
       {
@@ -747,10 +808,12 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     }
 
     if (!success)
+    {
       JOptionPane.showInternalMessageDialog(
           this, "Couldn't save file: " + fileName,
           "Error Saving File",
           JOptionPane.WARNING_MESSAGE);
+    }
 
     return success;
   }
@@ -787,8 +850,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
     cap.setText(new FormatAdapter().formatSequences(
         e.getActionCommand(),
-        viewport.alignment.getSequencesArray(),
-        omitHidden));
+        viewport.alignment,
+        omitHidden, viewport.colSel));
   }
 
   /**
@@ -798,7 +861,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
    */
   protected void htmlMenuItem_actionPerformed(ActionEvent e)
   {
-    new HTMLOutput(viewport,
+    new HTMLOutput(alignPanel,
                    alignPanel.seqPanel.seqCanvas.getSequenceRenderer(),
         alignPanel.seqPanel.seqCanvas.getFeatureRenderer());
   }
@@ -857,8 +920,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   {
     new AnnotationExporter().exportAnnotations(
       alignPanel,
-      viewport.alignment.getAlignmentAnnotation(),
-      viewport.alignment.getGroups()
+        viewport.showAnnotation ? viewport.alignment.getAlignmentAnnotation() : null,
+      viewport.alignment.getGroups(),
+      ((Alignment)viewport.alignment).alignmentProperties
         );
   }
 
@@ -893,20 +957,27 @@ 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();
@@ -915,6 +986,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
           PaintRefresher.RemoveComponent(alignPanel.seqPanel.seqCanvas);
           PaintRefresher.RemoveComponent(alignPanel.idPanel.idCanvas);
           PaintRefresher.RemoveComponent(alignPanel);
+          viewport.alignment = null;
           alignPanel = null;
           viewport = null;
 
@@ -922,15 +994,19 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
           tabbedPane.validate();
 
           if(index==tabbedPane.getTabCount())
+          {
             index --;
+          }
 
           this.tabSelectionChanged(index);
         }
       }
 
       if (closeAllTabs)
+      {
         this.setClosed(true);
     }
+    }
     catch (Exception ex)
     {
       ex.printStackTrace();
@@ -982,8 +1058,28 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     }
   }
 
-
-
+  /**
+   *
+   * @return alignment objects for all views
+   */
+  AlignmentI[] getViewAlignments()
+  {
+    if (alignPanels!=null)
+    {
+      Enumeration e = alignPanels.elements();
+      AlignmentI[] als = new AlignmentI[alignPanels.size()];
+      for (int i=0; e.hasMoreElements(); i++)
+      {
+        als[i] = ((AlignmentPanel) e.nextElement()).av.getAlignment();
+      }
+      return als;
+    }
+    if (viewport!=null)
+    {
+      return new AlignmentI[] { viewport.alignment };
+    }
+    return null;
+  }
   /**
    * DOCUMENT ME!
    *
@@ -991,9 +1087,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
    */
   protected void undoMenuItem_actionPerformed(ActionEvent e)
   {
+    if (viewport.historyList.empty())
+      return;
     CommandI command = (CommandI)viewport.historyList.pop();
     viewport.redoList.push(command);
-    command.undoCommand();
+    command.undoCommand(getViewAlignments());
 
     AlignViewport originalSource = getOriginatingSource(command);
     updateEditMenuBar();
@@ -1015,11 +1113,13 @@ 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();
+    command.doCommand(getViewAlignments());
 
     AlignViewport originalSource = getOriginatingSource(command);
     updateEditMenuBar();
@@ -1065,7 +1165,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       //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;
     }
@@ -1132,11 +1234,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!
    *
@@ -1149,7 +1342,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     {
       return;
     }
-
+    //  TODO: preserve the ordering of displayed alignment annotation in any internal paste (particularly sequence associated annotation)
     SequenceI [] seqs = viewport.getSelectionAsNewSequence();
     String[] omitHidden = null;
 
@@ -1200,19 +1393,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.");
@@ -1245,6 +1440,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
    */
   void paste(boolean newAlignment)
   {
+    boolean externalPaste=true;
     try
     {
       Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard();
@@ -1260,7 +1456,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");
 
@@ -1285,96 +1483,175 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       }
 
       SequenceI[] sequences;
-
+      boolean annotationAdded = false;
+      AlignmentI alignment = null;
 
      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];
+       SequenceI[] newseq = (SequenceI[])Desktop.jalviewClipboard[0];
+       // be doubly sure that we create *new* sequence objects.
+       sequences = new SequenceI[newseq.length];
+       for (int i=0;i<newseq.length;i++) {
+         sequences[i] = new Sequence(newseq[i]);
+       }
+       alignment = new Alignment(sequences);
+       externalPaste = false;
      }
      else
      {
-       sequences = new FormatAdapter().readFile(str, "Paste", format).getSequencesArray();
+       // parse the clipboard as an alignment.
+       alignment = new FormatAdapter().readFile(str, "Paste", format);
+       sequences = alignment.getSequencesArray();
      }
 
-     AlignmentI alignment = null;
+     int alwidth=0;
 
-      if (newAlignment)
-      {
-          alignment = new Alignment(sequences);
+     if (newAlignment)
+     {
 
-          if (Desktop.jalviewClipboard != null)
-            alignment.setDataset( (Alignment) Desktop.jalviewClipboard[1]);
-          else
-            alignment.setDataset(null);
-      }
-      else
-      {
-        alignment = viewport.getAlignment();
+       if (Desktop.jalviewClipboard != null)
+       {
+         // dataset is inherited
+         alignment.setDataset( (Alignment) Desktop.jalviewClipboard[1]);
+       }
+       else
+       {
+         // new dataset is constructed
+         alignment.setDataset(null);
+       }
+       alwidth = alignment.getWidth()+1;
+     }
+     else
+     {
+       AlignmentI pastedal = alignment; // preserve pasted alignment object
+       // Add pasted sequences and dataset into existing alignment.
+       alignment = viewport.getAlignment();
+       alwidth = alignment.getWidth()+1;
+        // decide if we need to import sequences from an existing dataset
+        boolean importDs = Desktop.jalviewClipboard != null
+                && Desktop.jalviewClipboard[1] != alignment.getDataset();
+        // importDs==true instructs us to copy over new dataset sequences from
+        // an existing alignment
+        Vector newDs = (importDs) ? new Vector() : null; // used to create
+                                                          // minimum dataset set
 
-        //!newAlignment
-        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());
-
-          alignment.addSequence(newseqs[i]);
+          if (importDs)
+          {
+            newDs.addElement(null);
+          }
+          SequenceI ds = sequences[i].getDatasetSequence(); // null for a simple
+                                                            // paste
+          if (importDs && ds != null)
+          {
+            if (!newDs.contains(ds))
+            {
+              newDs.setElementAt(ds, i);
+              ds = new Sequence(ds);
+              // update with new dataset sequence
+              sequences[i].setDatasetSequence(ds);
+            }
+            else
+            {
+              ds = sequences[newDs.indexOf(ds)].getDatasetSequence();
+            }
+          }
+          else
+          {
+            // copy and derive new dataset sequence
+            sequences[i] = sequences[i].deriveSequence();
+            alignment.getDataset().addSequence(sequences[i].getDatasetSequence());
+            // TODO: avoid creation of duplicate dataset sequences with a
+            // 'contains' method using SequenceI.equals()/SequenceI.contains()
+          }
+          alignment.addSequence(sequences[i]); // merges dataset
         }
-
-        /*
-         //ADD HISTORY ITEM
-         */
-        addHistoryItem(new EditCommand(
-            "Add sequences",
-            EditCommand.PASTE,
-            newseqs,
-            0,
-            alignment.getWidth(),
-            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 (newDs != null)
+        {
+          newDs.clear(); // tidy up
+        }
+        if (pastedal.getAlignmentAnnotation()!=null) {
+          // Add any annotation attached to alignment.
+          AlignmentAnnotation[] alann = pastedal.getAlignmentAnnotation();
+          for (int i=0; i<alann.length; i++)
+          {
+            annotationAdded=true;
+            if (alann[i].sequenceRef==null && !alann[i].autoCalculated) {
+              AlignmentAnnotation newann = new AlignmentAnnotation(alann[i]);
+              newann.padAnnotation(alwidth);
+              alignment.addAnnotation(newann);
+            }
+          }
+        }
+     }
+     if (!newAlignment) {
+       ///////
+       // ADD HISTORY ITEM
+       //
+       addHistoryItem(new EditCommand(
+               "Add sequences",
+               EditCommand.PASTE,
+               sequences,
+               0,
+               alignment.getWidth(),
+               alignment)
+              );
+     }
+     // 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);
+           annotationAdded=true;
+           sequences[i].getAnnotation()[a].adjustForAlignment();
+           sequences[i].getAnnotation()[a].padAnnotation(alwidth);
+           alignment.addAnnotation(sequences[i].getAnnotation()[a]); // annotation was duplicated earlier
+           alignment.setAnnotationIndex(sequences[i].getAnnotation()[a], a);
          }
-
-         alignPanel.annotationPanel.adjustPanelHeight();
        }
      }
+     if (!newAlignment) {
 
-     if(newAlignment)
-     {
+       // propagate alignment changed.
+       viewport.setEndSeq(alignment.getHeight());
+       if (annotationAdded)
+       {
+         // Duplicate sequence annotation in all views.
+         AlignmentI[] alview = this.getViewAlignments();
+         for (int i = 0; i < sequences.length; i++)
+         {
+           AlignmentAnnotation sann[] = sequences[i].getAnnotation();
+           if (sann == null)
+             continue;
+           for (int avnum=0;avnum<alview.length; avnum++)
+           {
+             if (alview[avnum]!=alignment)
+             {
+               // duplicate in a view other than the one with input focus
+               int avwidth = alview[avnum].getWidth()+1;
+               // this relies on sann being preserved after we 
+               // modify the sequence's annotation array for each duplication
+               for (int a=0; a<sann.length; a++)
+               {
+                 AlignmentAnnotation newann = new AlignmentAnnotation(sann[a]);
+                 sequences[i].addAlignmentAnnotation(newann);
+                 newann.padAnnotation(avwidth);
+                 alview[avnum].addAnnotation(newann); // annotation was duplicated earlier
+                 alview[avnum].setAnnotationIndex(newann, a);
+               }
+             }
+           }
+         }
+         buildSortByAnnotationScoresMenu();
+       }
+       viewport.firePropertyChange("alignment", null, alignment.getSequences());
+
+     } else {
        AlignFrame af = new AlignFrame(alignment, DEFAULT_WIDTH, DEFAULT_HEIGHT);
        String newtitle = new String("Copied sequences");
 
@@ -1393,14 +1670,18 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
        af.alignPanel.seqPanel.seqCanvas.getFeatureRenderer().transferSettings(
            alignPanel.seqPanel.seqCanvas.getFeatureRenderer());
 
-
-       if (title.startsWith("Copied sequences"))
-       {
-         newtitle = title;
-       }
-       else
-       {
-         newtitle = newtitle.concat("- from " + title);
+       // TODO: maintain provenance of an alignment, rather than just make the title a concatenation of operations.
+       if (!externalPaste) {
+         if (title.startsWith("Copied sequences"))
+         {
+           newtitle = title;
+         }
+         else
+         {
+           newtitle = newtitle.concat("- from " + title);
+         }
+       } else {
+         newtitle = new String("Pasted sequences");
        }
 
        Desktop.addInternalFrame(af, newtitle, DEFAULT_WIDTH,
@@ -1464,7 +1745,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);
+    }
 
 
     /*
@@ -1507,7 +1790,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     viewport.sequenceColours = null;
     viewport.setSelectionGroup(null);
     PaintRefresher.Refresh(this, viewport.getSequenceSetId());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1527,7 +1810,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());
   }
 
@@ -1548,7 +1831,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     viewport.setSelectionGroup(null);
     alignPanel.seqPanel.seqCanvas.highlightSearchResults(null);
     alignPanel.idPanel.idCanvas.searchResults = null;
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
     PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());
   }
 
@@ -1574,7 +1857,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       sg.addOrRemove(viewport.getAlignment().getSequenceAt(i), false);
     }
 
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
 
     PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());
   }
@@ -1582,7 +1865,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   public void invertColSel_actionPerformed(ActionEvent e)
   {
     viewport.invertColumnSelection();
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
 
@@ -1614,15 +1897,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(viewport.hiddenRepSequences);
+      {
+        seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.
+            hiddenRepSequences);
+      }
       else
+      {
         seqs = viewport.alignment.getSequencesArray();
+      }
 
 
       TrimRegionCommand trimRegion;
@@ -1683,12 +1975,15 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     SequenceI[] seqs;
     if (viewport.getSelectionGroup() != null)
     {
-      seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.hiddenRepSequences);
+      seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.
+          hiddenRepSequences);
       start = viewport.getSelectionGroup().getStartRes();
       end = viewport.getSelectionGroup().getEndRes();
     }
     else
+    {
       seqs = viewport.alignment.getSequencesArray();
+    }
 
 
     RemoveGapColCommand removeGapCols =
@@ -1711,7 +2006,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());
 
   }
 
@@ -1727,12 +2023,15 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     SequenceI[] seqs;
     if (viewport.getSelectionGroup() != null)
     {
-      seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.hiddenRepSequences);
+      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
@@ -1746,7 +2045,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
     viewport.setStartRes(seq.findIndex(startRes)-1);
 
-    viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
+    viewport.firePropertyChange("alignment", null,
+                                viewport.getAlignment().getSequences());
 
   }
 
@@ -1779,8 +2079,12 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     AlignmentPanel newap =
         new Jalview2XML().copyAlignPanel(alignPanel, true);
 
+    newap.av.gatherViewsHere = false;
+
     if (viewport.viewName == null)
+    {
       viewport.viewName = "Original";
+    }
 
     newap.av.historyList = viewport.historyList;
     newap.av.redoList = viewport.redoList;
@@ -1788,7 +2092,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     int index = Desktop.getViewCount(viewport.getSequenceSetId());
     String newViewName = "View " +index;
 
-    Vector comps = (Vector)PaintRefresher.components.get(viewport.getSequenceSetId());
+    Vector comps = (Vector) PaintRefresher.components.get(viewport.
+        getSequenceSetId());
     Vector existingNames = new Vector();
     for(int i=0; i<comps.size(); i++)
     {
@@ -1796,9 +2101,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       {
         AlignmentPanel ap = (AlignmentPanel)comps.elementAt(i);
         if(!existingNames.contains(ap.av.viewName))
+        {
           existingNames.addElement(ap.av.viewName);
       }
     }
+    }
 
     while(existingNames.contains(newViewName))
     {
@@ -1849,13 +2156,13 @@ 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.repaint();
+    alignPanel.paintAlignment(true);
   }
 
 
@@ -1868,7 +2175,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   protected void colourTextMenuItem_actionPerformed(ActionEvent e)
   {
     viewport.setColourText(colourTextMenuItem.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1899,13 +2206,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)
@@ -1922,7 +2229,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   protected void scaleAbove_actionPerformed(ActionEvent e)
   {
     viewport.setScaleAboveWrapped(scaleAbove.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1933,7 +2240,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   protected void scaleLeft_actionPerformed(ActionEvent e)
   {
     viewport.setScaleLeftWrapped(scaleLeft.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1944,7 +2251,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   protected void scaleRight_actionPerformed(ActionEvent e)
   {
     viewport.setScaleRightWrapped(scaleRight.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1955,7 +2262,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   public void viewBoxesMenuItem_actionPerformed(ActionEvent e)
   {
     viewport.setShowBoxes(viewBoxesMenuItem.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1966,7 +2273,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   public void viewTextMenuItem_actionPerformed(ActionEvent e)
   {
     viewport.setShowText(viewTextMenuItem.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
   /**
@@ -1977,7 +2284,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   protected void renderGapsMenuItem_actionPerformed(ActionEvent e)
   {
     viewport.setRenderGaps(renderGapsMenuItem.isSelected());
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
 
 
@@ -2000,7 +2307,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();
@@ -2018,6 +2325,65 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     alignPanel.setAnnotationVisible(annotationPanelMenuItem.isSelected());
   }
 
+  public void alignmentProperties()
+  {
+    JEditorPane editPane = new JEditorPane("text/html","");
+    editPane.setEditable(false);
+    StringBuffer contents = new StringBuffer("<html>");
+
+    float avg  = 0;
+    int min=Integer.MAX_VALUE, max=0;
+    for(int i=0; i<viewport.alignment.getHeight(); i++)
+    {
+      int size = viewport.alignment.getSequenceAt(i).getEnd()
+          -viewport.alignment.getSequenceAt(i).getStart();
+      avg += size;
+      if(size>max)
+        max = size;
+      if(size<min)
+        min = size;
+    }
+    avg = avg/(float)viewport.alignment.getHeight();
+
+    contents.append("<br>Sequences: "+ viewport.alignment.getHeight());
+    contents.append("<br>Minimum Sequence Length: "+min);
+    contents.append("<br>Maximum Sequence Length: "+max);
+    contents.append("<br>Average Length: "+(int)avg);
+
+    if (((Alignment)viewport.alignment).getProperties() != null)
+    {
+      Hashtable props = ((Alignment)viewport.alignment).getProperties();
+      Enumeration en = props.keys();
+      contents.append("<br><br><table border=\"1\">");
+      while(en.hasMoreElements())
+      {
+        String key = en.nextElement().toString();
+        StringBuffer val = new StringBuffer();
+        String vals = props.get(key).toString();
+        int pos=0, npos;
+        do {
+          npos = vals.indexOf("\n",pos);
+          if (npos==-1)
+          {
+            val.append(vals.substring(pos));
+          } else {
+            val.append(vals.substring(pos, npos));
+            val.append("<br>");
+          }
+          pos = npos+1;
+        } while (npos!=-1);
+        contents.append("<tr><td>"+key+"</td><td>"+val+"</td></tr>");
+      }
+      contents.append("</table>");
+    }
+    editPane.setText(contents.toString()+"</html>");
+    JInternalFrame frame = new JInternalFrame();
+    frame.getContentPane().add(new JScrollPane(editPane));
+
+    Desktop.instance.addInternalFrame(frame,"Alignment Properties: "+getTitle(),500,400);
+  }
+
+
   /**
    * DOCUMENT ME!
    *
@@ -2271,14 +2637,17 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
              sg.getEndRes()+1));
        }
         else
+        {
           sg.cs.setThreshold(0, viewport.getIgnoreGapsConsensus());
+        }
 
 
         if (viewport.getConservationSelected())
         {
           Conservation c = new Conservation("Group",
                                             ResidueProperties.propHash, 3,
-                                            sg.getSequences(viewport.hiddenRepSequences),
+                                            sg.getSequences(viewport.
+              hiddenRepSequences),
                                             sg.getStartRes(),
                                             sg.getEndRes()+1);
           c.calculate();
@@ -2286,16 +2655,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);
   }
 
   /**
@@ -2405,7 +2779,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()
@@ -2416,16 +2791,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)
@@ -2435,6 +2813,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
                     });
                 }
               }
+          }
             });
         radioItem.addActionListener(new ActionListener()
         {
@@ -2480,8 +2859,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);
   }
 
   /**
@@ -2494,7 +2874,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);
   }
 
   /**
@@ -2508,9 +2888,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     AlignmentSorter.sortByGroup(viewport.getAlignment());
     addHistoryItem(new OrderCommand("Group Sort", oldOrder, viewport.alignment));
 
-    alignPanel.repaint();
+    alignPanel.paintAlignment(true);
   }
-
   /**
    * DOCUMENT ME!
    *
@@ -2633,8 +3012,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   {
     TreePanel tp;
 
-    if (viewport.getSelectionGroup() != null) {
-      if (viewport.getSelectionGroup().getSize() < 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",
@@ -2681,7 +3062,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       }
 
       if(viewport.alignment.getHeight()<2)
+      {
         return;
+      }
 
       tp = new TreePanel(alignPanel, type, pwType);
     }
@@ -2689,7 +3072,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     title += " from ";
 
     if(viewport.viewName!=null)
+    {
       title+= viewport.viewName+" of ";
+    }
 
     title += this.title;
 
@@ -2715,12 +3100,80 @@ 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);
+      }
+    });
+  }
+  /**
+   * Add a new sort by annotation score menu item
+   * @param sort the menu to add the option to
+   * @param scoreLabel the label used to retrieve scores for each sequence on the alignment
+   */
+  public void addSortByAnnotScoreMenuItem(JMenu sort, final String scoreLabel)
+  {
+    final JMenuItem item = new JMenuItem(scoreLabel);
+    sort.add(item);
+    item.addActionListener(new java.awt.event.ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        SequenceI [] oldOrder = viewport.getAlignment().getSequencesArray();
+        AlignmentSorter.sortByAnnotationScore(scoreLabel, viewport.getAlignment());
+        addHistoryItem(new OrderCommand("Sort by "+scoreLabel, oldOrder, viewport.alignment));
+        alignPanel.paintAlignment(true);
       }
     });
   }
+  /**
+   * last hash for alignment's annotation array - used to minimise cost of rebuild.
+   */
+  protected int _annotationScoreVectorHash;
+  /**
+   * search the alignment and rebuild the sort by annotation score submenu
+   * the last alignment annotation vector hash is stored to minimize
+   * cost of rebuilding in subsequence calls.
+   *
+   */
+  public void buildSortByAnnotationScoresMenu()
+  {
+    if(viewport.alignment.getAlignmentAnnotation()==null)
+    {
+      return;
+    }
+
+    if (viewport.alignment.getAlignmentAnnotation().hashCode()!=_annotationScoreVectorHash)
+    {
+      sortByAnnotScore.removeAll();
+      // almost certainly a quicker way to do this - but we keep it simple
+      Hashtable scoreSorts=new Hashtable();
+      AlignmentAnnotation aann[];
+      Enumeration sq = viewport.alignment.getSequences().elements();
+      while (sq.hasMoreElements())
+      {
+        aann = ((SequenceI) sq.nextElement()).getAnnotation();
+        for (int i=0;aann!=null && i<aann.length; i++)
+        {
+          if (aann[i].hasScore() && aann[i].sequenceRef!=null)
+          {
+            scoreSorts.put(aann[i].label, aann[i].label);
+          }
+        }
+      }
+      Enumeration labels = scoreSorts.keys();
+      while (labels.hasMoreElements())
+      {
+        addSortByAnnotScoreMenuItem(sortByAnnotScore, (String) labels.nextElement());
+      }
+      sortByAnnotScore.setVisible(scoreSorts.size()>0);
+      scoreSorts.clear();
+
+      _annotationScoreVectorHash =
+          viewport.alignment.getAlignmentAnnotation().hashCode();
+    }
+  }
 
   /**
    * Maintain the Order by->Displayed Tree menu.
@@ -2735,7 +3188,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   {
     sortByTreeMenu.removeAll();
 
-    Vector comps = (Vector)PaintRefresher.components.get(viewport.getSequenceSetId());
+    Vector comps = (Vector) PaintRefresher.components.get(viewport.
+        getSequenceSetId());
     Vector treePanels = new Vector();
     int i, iSize = comps.size();
     for(i=0; i<iSize; i++)
@@ -2772,7 +3226,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
                                           oldOrder,
                                           viewport.alignment));
 
-          alignPanel.repaint();
+          alignPanel.paintAlignment(true);
         }
       });
 
@@ -2845,7 +3299,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;
   }
@@ -2870,21 +3325,28 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     {
       String choice = chooser.getSelectedFile().getPath();
       jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
-
+      jalview.io.NewickFile fin = null;
       try
       {
-        jalview.io.NewickFile fin = new jalview.io.NewickFile(choice,
+        fin = new jalview.io.NewickFile(choice,
             "File");
         viewport.setCurrentTree(ShowNewickTree(fin, choice).getTree());
       }
       catch (Exception ex)
       {
         JOptionPane.showMessageDialog(Desktop.desktop,
-                                      "Problem reading tree file",
                                       ex.getMessage(),
+                                      "Problem reading tree file",
                                       JOptionPane.WARNING_MESSAGE);
         ex.printStackTrace();
       }
+      if (fin!=null && fin.hasWarningMessage())
+      {
+        JOptionPane.showMessageDialog(Desktop.desktop,
+                fin.getWarningMessage(),
+                "Possible problem with tree file",
+                JOptionPane.WARNING_MESSAGE);
+      }
     }
   }
 
@@ -2893,11 +3355,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);
   }
   /**
@@ -2912,7 +3379,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
@@ -2929,7 +3399,9 @@ 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);
@@ -2939,7 +3411,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     {
       ex.printStackTrace();
     }
-
+    
     return tp;
   }
 
@@ -2950,6 +3422,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
    */
   public void BuildWebServiceMenu()
   {
+    // TODO: add support for context dependent disabling of services based on alignment and current selection
+    // TODO: refactor to allow list of AbstractName/Handler bindings to be stored or retrieved from elsewhere
+    // TODO: add additional serviceHandle parameter to specify abstract handler class independently of AbstractName
+    // TODO: add in rediscovery GUI function to restart discoverer
+    // TODO: group services by location as well as function and/or introduce object broker mechanism.
     if ( (Discoverer.services != null)
         && (Discoverer.services.size() > 0))
     {
@@ -2972,7 +3449,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);
 
             }
 
@@ -2989,7 +3468,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);
 
               }
 
@@ -3034,7 +3515,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
         }
         wsmenu.add(secstrmenu);
       }
-      this.webService.removeAll();
+      resetWebServiceMenu();
       for (int i = 0, j = wsmenu.size(); i < j; i++)
       {
         webService.add( (JMenu) wsmenu.get(i));
@@ -3042,12 +3523,34 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     }
     else
     {
-      this.webService.removeAll();
+      resetWebServiceMenu();
       this.webService.add(this.webServiceNoServices);
     }
-    // TODO: add in rediscovery function
-    // TODO: reduce code redundancy.
-    // TODO: group services by location as well as function.
+  }
+
+
+  /**
+   * empty the web service menu and add any ad-hoc functions
+   * not dynamically discovered.
+   *
+   */
+  private void resetWebServiceMenu()
+  {
+    webService.removeAll();
+    // Temporary hack - DBRef Fetcher always top level ws entry.
+    JMenuItem rfetch = new JMenuItem("Fetch DB References");
+    rfetch.setToolTipText("Retrieve and parse uniprot records for the alignment or the currently selected sequences");
+    webService.add(rfetch);
+    rfetch.addActionListener(new ActionListener() {
+
+      public void actionPerformed(ActionEvent e)
+      {
+        new jalview.ws.DBRefFetcher(
+                alignPanel.av.getSequenceSelection(),
+                alignPanel.alignFrame).fetchDBRefs(false);
+      }
+
+    });
   }
 
  /* public void vamsasStore_actionPerformed(ActionEvent e)
@@ -3068,98 +3571,193 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       vs.storeJalview( chooser.getSelectedFile().getAbsolutePath(), this);
     }
   }*/
-
-
-
-
-public void showTranslation_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++)
+  /**
+   * prototype of an automatically enabled/disabled analysis function
+   *
+   */
+  protected void setShowProductsEnabled()
   {
-    protein = new StringBuffer();
-    seq = AlignSeq.extractGaps("-. ", seqstring[s]);
-    resSize = seq.length();
-    resSize -= resSize%3;
-
-    for(res = 0; res < resSize; res+=3)
+    SequenceI [] selection = viewport.getSequenceSelection();
+    if (canShowProducts(selection, viewport.getSelectionGroup()!=null, viewport.getAlignment().getDataset()))
     {
-      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 );
+      showProducts.setEnabled(true);
+      
+    } else {
+      showProducts.setEnabled(false);
     }
-    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)
+  /**
+   * search selection for sequence xRef products and build the
+   * show products menu.
+   * @param selection
+   * @param dataset
+   * @return true if showProducts menu should be enabled.
+   */
+  public boolean canShowProducts(SequenceI[] selection, boolean isRegionSelection, Alignment dataset)
   {
-    for (int i = 0; i < annotations.length; i++)
-    {
-      if (annotations[i].label.equals("Quality") ||
-          annotations[i].label.equals("Conservation") ||
-          annotations[i].label.equals("Consensus"))
+    boolean showp=false;
+    try {
+      showProducts.removeAll();
+      final boolean dna = viewport.getAlignment().isNucleotide();
+      final Alignment ds = dataset;
+      String[] ptypes = CrossRef.findSequenceXrefTypes(dna, selection, dataset);
+      //Object[] prods = CrossRef.buildXProductsList(viewport.getAlignment().isNucleotide(), selection, dataset, true);
+      final SequenceI[] sel = selection;
+      for (int t=0; ptypes!=null && t<ptypes.length; t++)
       {
-        continue;
+        showp=true;
+        final boolean isRegSel = isRegionSelection;
+        final AlignFrame af = this;
+        final String source = ptypes[t];
+        JMenuItem xtype = new JMenuItem(ptypes[t]);
+        xtype.addActionListener(new ActionListener() {
+
+          public void actionPerformed(ActionEvent e)
+          {
+            // TODO: new thread for this call with vis-delay
+            af.showProductsFor(sel, ds, isRegSel, dna, source);
+          }
+          
+        });
+        showProducts.add(xtype);
       }
+      showProducts.setVisible(showp);
+      showProducts.setEnabled(showp);
+    } catch (Exception e)
+    {
+      jalview.bin.Cache.log.warn("canTranslate threw an exception - please report to help@jalview.org",e);
+     return false;
+    }
+    return showp;
+  }
+protected void showProductsFor(SequenceI[] sel, Alignment ds, boolean isRegSel, boolean dna, String source)
+  {
+  final boolean fisRegSel = isRegSel;
+  final boolean fdna = dna;
+  final String fsrc = source;
+  final AlignFrame ths = this;
+  final SequenceI[] fsel = sel;
+  Runnable foo = new Runnable() {
 
-      aSize = viewport.alignment.getWidth() / 3;
-      jalview.datamodel.Annotation[] anots =
-          new jalview.datamodel.Annotation[aSize];
-
-      for (a = 0; a < viewport.alignment.getWidth(); a++)
+    public void run()
+    {
+      final long sttime = System.currentTimeMillis();
+      ths.setProgressBar("Searching for sequences from "+fsrc, sttime);
+      try {
+        Alignment ds = ths.getViewport().alignment.getDataset(); // update our local dataset reference
+      Alignment prods = CrossRef.findXrefSequences(fsel, fdna, fsrc, ds);
+      if (prods!=null)
       {
-        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);
+        SequenceI[] sprods = new SequenceI[prods.getHeight()];
+        for (int s=0; s<sprods.length;s++)
+        {
+          sprods[s] = (prods.getSequenceAt(s)).deriveSequence();
+          if (ds.getSequences()==null || !ds.getSequences().contains(sprods[s].getDatasetSequence()))
+            ds.addSequence(sprods[s].getDatasetSequence());
+          sprods[s].updatePDBIds();
+        }
+        Alignment al = new Alignment(sprods);
+        AlignedCodonFrame[] cf = prods.getCodonFrames();
+        for (int s=0; cf!=null && s<cf.length; s++)
+        {
+          al.addCodonFrame(cf[s]);
+          cf[s] = null;
+        }
+        al.setDataset(ds);
+        AlignFrame naf = new AlignFrame(al, DEFAULT_WIDTH, DEFAULT_HEIGHT);
+        String newtitle =""+((fdna) ? "Proteins " : "Nucleotides ") + " for "+((fisRegSel) ? "selected region of " : "")
+                + getTitle();
+        Desktop.addInternalFrame(naf, newtitle, DEFAULT_WIDTH,
+                DEFAULT_HEIGHT);
+      } else {
+        System.err.println("No Sequences generated for xRef type "+fsrc);
+      }
+      }
+      catch (Exception e)
+      {
+        jalview.bin.Cache.log.error("Exception when finding crossreferences",e);
+      }
+      catch (Error e)
+      {
+        jalview.bin.Cache.log.error("Error when finding crossreferences",e);
       }
+      ths.setProgressBar("Finished searching for sequences from "+fsrc, sttime);
+    }
+    
+  };
+  Thread frunner = new Thread(foo);
+  frunner.start();
+  }
 
-      jalview.datamodel.AlignmentAnnotation aa
-          = new jalview.datamodel.AlignmentAnnotation(annotations[i].label,
-          annotations[i].description, anots);
-      al.addAnnotation(aa);
+
+public boolean canShowTranslationProducts(SequenceI[] selection, AlignmentI alignment)
+{
+  // old way
+  try {
+      return (jalview.analysis.Dna.canTranslate(selection, viewport.getViewAsVisibleContigs(true)));
+  } catch (Exception e)
+  {
+    jalview.bin.Cache.log.warn("canTranslate threw an exception - please report to help@jalview.org",e);
+   return false;
+  }
+}
+
+public void showProducts_actionPerformed(ActionEvent e)
+{
+  ///////////////////////////////
+  // Collect Data to be translated/transferred
+  
+  SequenceI [] selection = viewport.getSequenceSelection();
+  AlignmentI al  = null;
+  try {
+      al = jalview.analysis.Dna.CdnaTranslate(selection, viewport.getViewAsVisibleContigs(true),
+          viewport.getGapCharacter(), viewport.getAlignment().getDataset());
+    } 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);
     }
   }
 
+public void showTranslation_actionPerformed(ActionEvent e)
+{
+  ///////////////////////////////
+  // Collect Data to be translated/transferred
+
+  SequenceI [] selection = viewport.getSequenceSelection();
+  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(), viewport.getAlignment().getDataset());
+  } 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);
-
-
-
-
+  }
 }
 
 /**
@@ -3170,8 +3768,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);
@@ -3185,7 +3785,7 @@ public boolean parseFeaturesFile(String file, String type)
     {
       viewport.showSequenceFeatures = true;
       showSeqFeatures.setSelected(true);
-      alignPanel.repaint();
+      alignPanel.paintAlignment(true);
     }
 
     return featuresFile;
@@ -3210,12 +3810,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))
       {
@@ -3268,7 +3870,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)
@@ -3294,19 +3897,23 @@ 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();
+        buildSortByAnnotationScoresMenu();
       }
 
-    }catch(Exception ex)
+    }
+    catch (Exception ex)
     {
       ex.printStackTrace();
     }
@@ -3344,9 +3951,23 @@ public void drop(DropTargetDropEvent evt)
   {
     return viewport;
   }
+
+
+  /**
+   * Open the dialog for regex description parsing.
+   */
+  protected void extractScores_actionPerformed(ActionEvent e)
+  {
+    ParseProperties pp = new jalview.analysis.ParseProperties(viewport.alignment);
+    if (pp.getScoresFromDescription("col", "score column ", "\\W+([-+]?\\d*\\.?\\d*e?-?\\d*)\\W+([-+]?\\d*\\.?\\d*e?-?\\d*)")>0)
+    {
+      buildSortByAnnotationScoresMenu();
+    }
+  }
 }
 
-class PrintThread extends Thread
+class PrintThread
+    extends Thread
 {
   AlignmentPanel ap;
   public PrintThread(AlignmentPanel ap)
@@ -3359,9 +3980,13 @@ class PrintThread extends Thread
     PrinterJob printJob = PrinterJob.getPrinterJob();
 
     if (pf != null)
+    {
       printJob.setPrintable(ap, pf);
+    }
     else
+    {
       printJob.setPrintable(ap);
+    }
 
     if (printJob.printDialog())
     {