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 'develop' into bug/JAL-4059_update_swingJS_for_JalviewJS_2_11_2_and_2_11_3
[jalview.git]
/
src
/
jalview
/
bin
/
Jalview.java
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
3ffcdd0
..
ba9c5b0
100755
(executable)
--- a/
src/jalview/bin/Jalview.java
+++ b/
src/jalview/bin/Jalview.java
@@
-100,6
+100,8
@@
import jalview.schemes.ColourSchemeI;
import jalview.schemes.ColourSchemeProperty;
import jalview.util.ChannelProperties;
import jalview.util.HttpUtils;
import jalview.schemes.ColourSchemeProperty;
import jalview.util.ChannelProperties;
import jalview.util.HttpUtils;
+import jalview.util.IdUtils;
+import jalview.util.IdUtils.IdType;
import jalview.util.LaunchUtils;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.util.LaunchUtils;
import jalview.util.MessageManager;
import jalview.util.Platform;
@@
-206,7
+208,7
@@
public class Jalview implements JalviewObjectI
public void addFetcher(final AlignFrame af,
final Vector<String> dasSources)
{
public void addFetcher(final AlignFrame af,
final Vector<String> dasSources)
{
- final long id = System.currentTimeMillis();
+ final long id = IdUtils.newId(IdType.PROGRESS);
queued++;
final FeatureFetcher us = this;
new Thread(new Runnable()
queued++;
final FeatureFetcher us = this;
new Thread(new Runnable()
@@
-911,7
+913,7
@@
public class Jalview implements JalviewObjectI
desktop.setProgressBar(
MessageManager
.getString("status.processing_commandline_args"),
desktop.setProgressBar(
MessageManager
.getString("status.processing_commandline_args"),
- progress = System.currentTimeMillis());
+ progress = IdUtils.newId(IdType.PROGRESS));
}
Console.outPrintln("CMD [-open " + file + "] executed successfully!");
}
Console.outPrintln("CMD [-open " + file + "] executed successfully!");