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-4059 Tidy getting the namespace, and save the namespace in the Jalview instance...
[jalview.git]
/
src
/
jalview
/
gui
/
SequenceFetcher.java
diff --git
a/src/jalview/gui/SequenceFetcher.java
b/src/jalview/gui/SequenceFetcher.java
index
3b93059
..
77bac76
100755
(executable)
--- a/
src/jalview/gui/SequenceFetcher.java
+++ b/
src/jalview/gui/SequenceFetcher.java
@@
-55,6
+55,8
@@
import jalview.fts.service.uniprot.UniprotFTSPanel;
import jalview.io.FileFormatI;
import jalview.io.gff.SequenceOntologyI;
import jalview.util.DBRefUtils;
import jalview.io.FileFormatI;
import jalview.io.gff.SequenceOntologyI;
import jalview.util.DBRefUtils;
+import jalview.util.IdUtils;
+import jalview.util.IdUtils.IdType;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.ws.seqfetcher.DbSourceProxy;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.ws.seqfetcher.DbSourceProxy;
@@
-186,7
+188,7
@@
public class SequenceFetcher extends JPanel implements Runnable
frame = new JInternalFrame();
frame.setContentPane(this);
frame = new JInternalFrame();
frame.setContentPane(this);
- frame.setFrameIcon(WindowIcons.fetchIcon);
+ frame.setFrameIcon(null);
Desktop.addInternalFrame(frame, getFrameTitle(), true, 400,
Platform.isAMacAndNotJS() ? 240 : 180);
}
Desktop.addInternalFrame(frame, getFrameTitle(), true, 400,
Platform.isAMacAndNotJS() ? 240 : 180);
}
@@
-571,7
+573,7
@@
public class SequenceFetcher extends JPanel implements Runnable
"status.fetching_sequence_queries_from", new String[]
{ Integer.valueOf(nqueries).toString(),
proxy.getDbName() }),
"status.fetching_sequence_queries_from", new String[]
{ Integer.valueOf(nqueries).toString(),
proxy.getDbName() }),
- Thread.currentThread().hashCode());
+ IdUtils.newId(IdType.PROGRESS, Thread.currentThread()));
if (proxy.getMaximumQueryCount() == 1)
{
/*
if (proxy.getMaximumQueryCount() == 1)
{
/*
@@
-599,7
+601,7
@@
public class SequenceFetcher extends JPanel implements Runnable
+ ((StringPair) database.getSelectedItem()).getDisplay());
// error
// +="Couldn't retrieve sequences from "+database.getSelectedItem();
+ ((StringPair) database.getSelectedItem()).getDisplay());
// error
// +="Couldn't retrieve sequences from "+database.getSelectedItem();
- System.err.println("Retrieval failed for source ='"
+ jalview.bin.Console.errPrintln("Retrieval failed for source ='"
+ ((StringPair) database.getSelectedItem()).getDisplay()
+ "' and query\n'" + textArea.getText() + "'\n");
e.printStackTrace();
+ ((StringPair) database.getSelectedItem()).getDisplay()
+ "' and query\n'" + textArea.getText() + "'\n");
e.printStackTrace();
@@
-667,7
+669,7
@@
public class SequenceFetcher extends JPanel implements Runnable
}
guiWindow.setProgressBar(
MessageManager.getString("status.finshed_querying"),
}
guiWindow.setProgressBar(
MessageManager.getString("status.finshed_querying"),
- Thread.currentThread().hashCode());
+ IdUtils.newId(IdType.PROGRESS, Thread.currentThread()));
}
guiWindow
.setProgressBar(
}
guiWindow
.setProgressBar(
@@
-675,7
+677,7
@@
public class SequenceFetcher extends JPanel implements Runnable
? MessageManager
.getString("status.parsing_results")
: MessageManager.getString("status.processing"),
? MessageManager
.getString("status.parsing_results")
: MessageManager.getString("status.processing"),
- Thread.currentThread().hashCode());
+ IdUtils.newId(IdType.PROGRESS, Thread.currentThread()));
// process results
while (presult.size() > 0)
{
// process results
while (presult.size() > 0)
{
@@
-683,7
+685,8
@@
public class SequenceFetcher extends JPanel implements Runnable
preferredFeatureColours);
}
// only remove visual delay after we finished parsing.
preferredFeatureColours);
}
// only remove visual delay after we finished parsing.
- guiWindow.setProgressBar(null, Thread.currentThread().hashCode());
+ guiWindow.setProgressBar(null,
+ IdUtils.newId(IdType.PROGRESS, Thread.currentThread()));
if (nextFetch.size() > 0)
{
StringBuffer sb = new StringBuffer();
if (nextFetch.size() > 0)
{
StringBuffer sb = new StringBuffer();