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-1563 JAL-2091 Added total result count to Uniprot pagination, implemented caching...
[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
acf2fb0
..
6c28ee5
100644
(file)
--- a/
src/jalview/fts/service/uniprot/UniprotFTSPanel.java
+++ b/
src/jalview/fts/service/uniprot/UniprotFTSPanel.java
@@
-109,7
+109,9
@@
public class UniprotFTSPanel extends GFTSPanel
}
long endTime = System.currentTimeMillis();
}
long endTime = System.currentTimeMillis();
- resultSetCount = resultList.getNumberOfItemsFound();
+ totalResultSetCount = resultList.getNumberOfItemsFound();
+ resultSetCount = resultList.getSearchSummary() == null ? 0
+ : resultList.getSearchSummary().size();
String result = (resultSetCount > 0) ? MessageManager
.getString("label.results") : MessageManager
.getString("label.result");
String result = (resultSetCount > 0) ? MessageManager
.getString("label.results") : MessageManager
.getString("label.result");
@@
-117,7
+119,8
@@
public class UniprotFTSPanel extends GFTSPanel
{
updateSearchFrameTitle(defaultFTSFrameTitle + " - " + result
+ " " + (offSet + 1) + " to "
{
updateSearchFrameTitle(defaultFTSFrameTitle + " - " + result
+ " " + (offSet + 1) + " to "
- + (offSet + resultSetCount)
+ + (offSet + resultSetCount) + " of "
+ + totalResultSetCount
+ " " + " (" + (endTime - startTime) + " milli secs)");
}
else
+ " " + " (" + (endTime - startTime) + " milli secs)");
}
else
@@
-128,6
+131,7
@@
public class UniprotFTSPanel extends GFTSPanel
}
setSearchInProgress(false);
refreshPaginatorState();
}
setSearchInProgress(false);
refreshPaginatorState();
+ updateSummaryTableSelections();
}
}
}.start();
}
}
}.start();
@@
-190,7
+194,7
@@
public class UniprotFTSPanel extends GFTSPanel
primaryKeyColIndex).toString();
selectedIdsSet.add(idStr);
}
primaryKeyColIndex).toString();
selectedIdsSet.add(idStr);
}
-
+ selectedIdsSet.addAll(paginatorCart);
for (String selectedId : selectedIdsSet)
{
selectedIds.append(selectedId).append(";");
for (String selectedId : selectedIdsSet)
{
selectedIds.append(selectedId).append(";");