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 'features/JAL-2316' into develop
[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
9c2c5ce
..
f04e4fa
100644
(file)
--- a/
src/jalview/fts/service/uniprot/UniprotFTSPanel.java
+++ b/
src/jalview/fts/service/uniprot/UniprotFTSPanel.java
@@
-46,10
+46,11
@@
public class UniprotFTSPanel extends GFTSPanel
public UniprotFTSPanel(SequenceFetcher seqFetcher)
{
public UniprotFTSPanel(SequenceFetcher seqFetcher)
{
+ super();
pageLimit = UniProtFTSRestClient.getInstance()
.getDefaultResponsePageSize();
this.seqFetcher = seqFetcher;
pageLimit = UniProtFTSRestClient.getInstance()
.getDefaultResponsePageSize();
this.seqFetcher = seqFetcher;
- this.progressIdicator = (seqFetcher == null) ? null : seqFetcher
+ this.progressIndicator = (seqFetcher == null) ? null : seqFetcher
.getProgressIndicator();
}
.getProgressIndicator();
}
@@
-61,7
+62,7
@@
public class UniprotFTSPanel extends GFTSPanel
offSet = 0;
}
new Thread()
offSet = 0;
}
new Thread()
- {
+ {
@Override
public void run()
{
@Override
public void run()
{
@@
-119,7
+120,9
@@
public class UniprotFTSPanel extends GFTSPanel
.getString("label.result");
if (isPaginationEnabled() && resultSetCount > 0)
{
.getString("label.result");
if (isPaginationEnabled() && resultSetCount > 0)
{
- updateSearchFrameTitle(defaultFTSFrameTitle + " - " + result
+ updateSearchFrameTitle(defaultFTSFrameTitle
+ + " - "
+ + result
+ " "
+ totalNumberformatter.format((Number) (offSet + 1))
+ " to "
+ " "
+ totalNumberformatter.format((Number) (offSet + 1))
+ " to "
@@
-127,8
+130,8
@@
public class UniprotFTSPanel extends GFTSPanel
.format((Number) (offSet + resultSetCount))
+ " of "
+ totalNumberformatter
.format((Number) (offSet + resultSetCount))
+ " of "
+ totalNumberformatter
- .format((Number) totalResultSetCount)
- + " " + " (" + (endTime - startTime) + " milli secs)");
+ .format((Number) totalResultSetCount) + " "
+ + " (" + (endTime - startTime) + " milli secs)");
}
else
{
}
else
{
@@
-172,7
+175,6
@@
public class UniprotFTSPanel extends GFTSPanel
return foundSearchTerms;
}
return foundSearchTerms;
}
-
@Override
public boolean isPaginationEnabled()
{
@Override
public boolean isPaginationEnabled()
{