JAL-1115 refactor reordering code operating directly on Sequence collection as Alignm...

[jalview.git] / src / jalview / gui / AlignFrame.java

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index f597a60..d8157c0 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -1508,52 +1508,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     {
       return;
     }
-
-    if (up)
-    {
-      for (int i = 1; i < viewport.getAlignment().getHeight(); i++)
-      {
-        SequenceI seq = viewport.getAlignment().getSequenceAt(i);
-
-        if (!sg.getSequences(null).contains(seq))
-        {
-          continue;
-        }
-
-        SequenceI temp = viewport.getAlignment().getSequenceAt(i - 1);
-
-        if (sg.getSequences(null).contains(temp))
-        {
-          continue;
-        }
-
-        viewport.getAlignment().getSequences().setElementAt(temp, i);
-        viewport.getAlignment().getSequences().setElementAt(seq, i - 1);
-      }
-    }
-    else
-    {
-      for (int i = viewport.getAlignment().getHeight() - 2; i > -1; i--)
-      {
-        SequenceI seq = viewport.getAlignment().getSequenceAt(i);
-
-        if (!sg.getSequences(null).contains(seq))
-        {
-          continue;
-        }
-
-        SequenceI temp = viewport.getAlignment().getSequenceAt(i + 1);
-
-        if (sg.getSequences(null).contains(temp))
-        {
-          continue;
-        }
-
-        viewport.getAlignment().getSequences().setElementAt(temp, i);
-        viewport.getAlignment().getSequences().setElementAt(seq, i + 1);
-      }
-    }
-
+    viewport.getAlignment().moveSelectedSequencesByOne(sg, viewport.getHiddenRepSequences(), up);
     alignPanel.paintAlignment(true);
   }