X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FIdPanel.java;h=6b312ad5b1c49643b9ee23b6f6f5199b13eaef79;hb=afffa24481a7d3cb65ae41e0948c16a5f490f302;hp=46e5f147c829351d0c59e63c5ded5bf2d5f64227;hpb=3da878124135ff033f42d19d8733891b09e953cd;p=jalview.git diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java index 46e5f14..6b312ad 100755 --- a/src/jalview/gui/IdPanel.java +++ b/src/jalview/gui/IdPanel.java @@ -273,6 +273,7 @@ public class IdPanel extends JPanel if (scrollThread != null) { scrollThread.stopScrolling(); + scrollThread = null; } } @@ -317,14 +318,7 @@ public class IdPanel extends JPanel void startScrolling(boolean up) { scrollThread = new ScrollThread(up); - if (!Platform.isJS()) - { - /* - * Java - run in a new thread - */ - scrollThread.start(); - } - else + if (Platform.isJS()) { /* * for JalviewJS using Swing Timer @@ -348,13 +342,22 @@ public class IdPanel extends JPanel { if (scrollThread == null) { - // finished and nulled itself + // IdPanel.stopScrolling called t.stop(); } } }); t.start(); } + else + /** + * Java only + * + * @j2sIgnore + */ + { + scrollThread.start(); + } } /** @@ -549,7 +552,7 @@ public class IdPanel extends JPanel { if (scrollThread != null) { - scrollThread.stopScrolling(); + stopScrolling(); } MousePos pos = alignPanel.getSeqPanel().findMousePosition(e); @@ -618,7 +621,6 @@ public class IdPanel extends JPanel { this.up = up; setName("IdPanel$ScrollThread$" + String.valueOf(up)); - start(); } /**