git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9c74181
)
JAL-3463 avoid Thread.sleep() as not supported in SwingJS
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Mon, 18 May 2020 15:01:54 +0000
(16:01 +0100)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Thu, 28 May 2020 13:18:07 +0000
(14:18 +0100)
src/jalview/ws/DBRefFetcher.java
patch
|
blob
|
history
diff --git
a/src/jalview/ws/DBRefFetcher.java
b/src/jalview/ws/DBRefFetcher.java
index
6b8843d
..
7daa7b4
100644
(file)
--- a/
src/jalview/ws/DBRefFetcher.java
+++ b/
src/jalview/ws/DBRefFetcher.java
@@
-20,6
+20,16
@@
*/
package jalview.ws;
*/
package jalview.ws;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
import jalview.analysis.AlignSeq;
import jalview.api.FeatureSettingsModelI;
import jalview.bin.Cache;
import jalview.analysis.AlignSeq;
import jalview.api.FeatureSettingsModelI;
import jalview.bin.Cache;
@@
-36,17
+46,6
@@
import jalview.gui.OOMWarning;
import jalview.util.DBRefUtils;
import jalview.util.MessageManager;
import jalview.ws.seqfetcher.DbSourceProxy;
import jalview.util.DBRefUtils;
import jalview.util.MessageManager;
import jalview.ws.seqfetcher.DbSourceProxy;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
import uk.ac.ebi.picr.model.UPEntry;
import uk.ac.ebi.www.picr.AccessionMappingService.AccessionMapperServiceLocator;
import uk.ac.ebi.picr.model.UPEntry;
import uk.ac.ebi.www.picr.AccessionMappingService.AccessionMapperServiceLocator;
@@
-74,8
+73,6
@@
public class DBRefFetcher implements Runnable
CutAndPasteTransfer output = new CutAndPasteTransfer();
CutAndPasteTransfer output = new CutAndPasteTransfer();
- boolean running = false;
-
/**
* picr client instance
*/
/**
* picr client instance
*/
@@
-225,24
+222,13
@@
public class DBRefFetcher implements Runnable
*/
public void fetchDBRefs(boolean waitTillFinished)
{
*/
public void fetchDBRefs(boolean waitTillFinished)
{
- // TODO can we not simply write
- // if (waitTillFinished) { run(); } else { new Thread(this).start(); }
-
- Thread thread = new Thread(this);
- thread.start();
- running = true;
-
if (waitTillFinished)
{
if (waitTillFinished)
{
- while (running)
- {
- try
- {
- Thread.sleep(500);
- } catch (Exception ex)
- {
- }
- }
+ run();
+ }
+ else
+ {
+ new Thread(this).start();
}
}
}
}
@@
-295,7
+281,6
@@
public class DBRefFetcher implements Runnable
throw new Error(MessageManager
.getString("error.implementation_error_must_init_dbsources"));
}
throw new Error(MessageManager
.getString("error.implementation_error_must_init_dbsources"));
}
- running = true;
long startTime = System.currentTimeMillis();
if (progressWindow != null)
{
long startTime = System.currentTimeMillis();
if (progressWindow != null)
{
@@
-498,7
+483,6
@@
public class DBRefFetcher implements Runnable
{
listener.finished();
}
{
listener.finished();
}
- running = false;
}
/**
}
/**