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 trialMerge
[jalview.git]
/
src
/
jalview
/
fts
/
service
/
uniprot
/
UniprotFTSPanel.java
diff --git
a/src/jalview/fts/service/uniprot/UniprotFTSPanel.java
b/src/jalview/fts/service/uniprot/UniprotFTSPanel.java
index
977abfa
..
182e29b
100644
(file)
--- a/
src/jalview/fts/service/uniprot/UniprotFTSPanel.java
+++ b/
src/jalview/fts/service/uniprot/UniprotFTSPanel.java
@@
-50,6
+50,12
@@
public class UniprotFTSPanel extends GFTSPanel
private static final String UNIPROT_AUTOSEARCH = "FTS.UNIPROT.AUTOSEARCH";
private static final String UNIPROT_AUTOSEARCH = "FTS.UNIPROT.AUTOSEARCH";
+ /**
+ * Constructor given an (optional) sequence fetcher panel to revert to on
+ * clicking the 'Back' button
+ *
+ * @param fetcher
+ */
public UniprotFTSPanel(SequenceFetcher fetcher)
{
super(fetcher);
public UniprotFTSPanel(SequenceFetcher fetcher)
{
super(fetcher);
@@
-126,13
+132,15
@@
public class UniprotFTSPanel extends GFTSPanel
{
updateSearchFrameTitle(defaultFTSFrameTitle + " - " + result
+ " "
{
updateSearchFrameTitle(defaultFTSFrameTitle + " - " + result
+ " "
- + totalNumberformatter.format((Number) (offSet + 1))
+ + totalNumberformatter
+ .format(Integer.valueOf(offSet + 1))
+ " to "
+ totalNumberformatter
+ " to "
+ totalNumberformatter
- .format((Number) (offSet + resultSetCount))
+ .format(Integer
+ .valueOf(offSet + resultSetCount))
+ " of "
+ totalNumberformatter
+ " of "
+ totalNumberformatter
- .format((Number) totalResultSetCount)
+ .format(Integer.valueOf(totalResultSetCount))
+ " " + " (" + (endTime - startTime) + " milli secs)");
}
else
+ " " + " (" + (endTime - startTime) + " milli secs)");
}
else
@@
-213,8
+221,7
@@
public class UniprotFTSPanel extends GFTSPanel
}
String ids = selectedIds.toString();
}
String ids = selectedIds.toString();
- // System.out.println(">>>>>>>>>>>>>>>> selected Ids: " + ids);
- seqFetcher.getTextArea().setText(ids);
+ seqFetcher.setQuery(ids);
Thread worker = new Thread(seqFetcher);
worker.start();
delayAndEnableActionButtons();
Thread worker = new Thread(seqFetcher);
worker.start();
delayAndEnableActionButtons();