git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into...
[jalview.git]
/
src
/
jalview
/
gui
/
IdPanel.java
diff --git
a/src/jalview/gui/IdPanel.java
b/src/jalview/gui/IdPanel.java
index
46e5f14
..
6b312ad
100755
(executable)
--- 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();
if (scrollThread != null)
{
scrollThread.stopScrolling();
+ scrollThread = null;
}
}
}
}
@@
-317,14
+318,7
@@
public class IdPanel extends JPanel
void startScrolling(boolean up)
{
scrollThread = new ScrollThread(up);
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
{
/*
* for JalviewJS using Swing Timer
@@
-348,13
+342,22
@@
public class IdPanel extends JPanel
{
if (scrollThread == null)
{
{
if (scrollThread == null)
{
- // finished and nulled itself
+ // IdPanel.stopScrolling called
t.stop();
}
}
});
t.start();
}
t.stop();
}
}
});
t.start();
}
+ else
+ /**
+ * Java only
+ *
+ * @j2sIgnore
+ */
+ {
+ scrollThread.start();
+ }
}
/**
}
/**
@@
-549,7
+552,7
@@
public class IdPanel extends JPanel
{
if (scrollThread != null)
{
{
if (scrollThread != null)
{
- scrollThread.stopScrolling();
+ stopScrolling();
}
MousePos pos = alignPanel.getSeqPanel().findMousePosition(e);
}
MousePos pos = alignPanel.getSeqPanel().findMousePosition(e);
@@
-618,7
+621,6
@@
public class IdPanel extends JPanel
{
this.up = up;
setName("IdPanel$ScrollThread$" + String.valueOf(up));
{
this.up = up;
setName("IdPanel$ScrollThread$" + String.valueOf(up));
- start();
}
/**
}
/**