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
JAL-1957 JAL-1479 Further optimisation of SIFTs Client and addition of support for...
[jalview.git]
/
src
/
jalview
/
ws
/
DBRefFetcher.java
diff --git
a/src/jalview/ws/DBRefFetcher.java
b/src/jalview/ws/DBRefFetcher.java
index
2e0197c
..
473d54f
100644
(file)
--- a/
src/jalview/ws/DBRefFetcher.java
+++ b/
src/jalview/ws/DBRefFetcher.java
@@
-57,7
+57,7
@@
public class DBRefFetcher implements Runnable
{
SequenceI[] dataset;
{
SequenceI[] dataset;
- IProgressIndicator af;
+ IProgressIndicator progressWindow;
CutAndPasteTransfer output = new CutAndPasteTransfer();
CutAndPasteTransfer output = new CutAndPasteTransfer();
@@
-109,7
+109,7
@@
public class DBRefFetcher implements Runnable
IProgressIndicator progressIndicatorFrame,
DbSourceProxy[] sources, FeatureSettings featureSettings, boolean isNucleotide)
{
IProgressIndicator progressIndicatorFrame,
DbSourceProxy[] sources, FeatureSettings featureSettings, boolean isNucleotide)
{
- this.af = progressIndicatorFrame;
+ this.progressWindow = progressIndicatorFrame;
alseqs = new SequenceI[seqs.length];
SequenceI[] ds = new SequenceI[seqs.length];
for (int i = 0; i < seqs.length; i++)
alseqs = new SequenceI[seqs.length];
SequenceI[] ds = new SequenceI[seqs.length];
for (int i = 0; i < seqs.length; i++)
@@
-286,8
+286,12
@@
public class DBRefFetcher implements Runnable
}
running = true;
long startTime = System.currentTimeMillis();
}
running = true;
long startTime = System.currentTimeMillis();
- af.setProgressBar(MessageManager.getString("status.fetching_db_refs"),
+ if (progressWindow != null)
+ {
+ progressWindow.setProgressBar(
+ MessageManager.getString("status.fetching_db_refs"),
startTime);
startTime);
+ }
try
{
if (Cache.getDefault("DBREFFETCH_USEPICR", false))
try
{
if (Cache.getDefault("DBREFFETCH_USEPICR", false))
@@
-472,11
+476,14
@@
public class DBRefFetcher implements Runnable
// of the viewed sequence
}
// of the viewed sequence
}
+ if (progressWindow != null)
+ {
+ progressWindow.setProgressBar(
+ MessageManager.getString("label.dbref_search_completed"),
+ startTime);
+ // promptBeforeBlast();
- af.setProgressBar(
- MessageManager.getString("label.dbref_search_completed"),
- startTime);
- // promptBeforeBlast();
+ }
running = false;
running = false;