From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 21 Sep 2020 11:01:51 +0000 (+0100)
Subject: Merge branch 'merge_review/JAL-3490_2_11_2_develop' into develop
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~2^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=490bea038483dcc853766de08a8971668930f43a;hp=-c;p=jalview.git

Merge branch 'merge_review/JAL-3490_2_11_2_develop' into develop
---

490bea038483dcc853766de08a8971668930f43a
diff --combined src/jalview/gui/AlignFrame.java
index 8e7820f,b02a83d..1f3f409
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@@ -1782,10 -1782,10 +1782,10 @@@ public class AlignFrame extends GAlignF
    }
  
    /**
 -   * DOCUMENT ME!
 +   * Calls AlignmentI.moveSelectedSequencesByOne with current sequence selection or the sequence under cursor in keyboard mode 
     * 
     * @param up
 -   *          DOCUMENT ME!
 +   *          or down (if !up)
     */
    public void moveSelectedSequences(boolean up)
    {
@@@ -1793,23 -1793,8 +1793,23 @@@
  
      if (sg == null)
      {
 -      return;
 +      if (viewport.cursorMode) 
 +      {
 +        sg = new SequenceGroup();
 +        sg.addSequence(viewport.getAlignment()
 +                .getSequenceAt(alignPanel.getSeqPanel().seqCanvas.cursorY),false);
 +      } else {
 +        return;
 +      }
 +    }
 +    
 +    if (sg.getSize() < 1)
 +    {
 +        return;
      }
 +    
 +    // TODO: JAL-3733 - add an event to the undo buffer for this !
 +    
      viewport.getAlignment().moveSelectedSequencesByOne(sg,
              viewport.getHiddenRepSequences(), up);
      alignPanel.paintAlignment(true, false);
@@@ -2764,15 -2749,14 +2764,14 @@@
    }
  
    /**
-    * DOCUMENT ME!
+    * Opens a Finder dialog
     * 
     * @param e
-    *          DOCUMENT ME!
     */
    @Override
    public void findMenuItem_actionPerformed(ActionEvent e)
    {
-     new Finder();
+     new Finder(alignPanel);
    }
  
    /**