X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Ffts%2Fservice%2Fpdb%2FPDBFTSPanel.java;h=1dfabcea139bb5485286c0cd7e7fcc814ee3ad59;hb=853624fb32058cccc544ae7d13af6ad4b0800b6c;hp=5f5c71675b4aef0aab45c45d15f3c8c757c11318;hpb=a31a02714259bddad8163062afc770e89114d0d4;p=jalview.git diff --git a/src/jalview/fts/service/pdb/PDBFTSPanel.java b/src/jalview/fts/service/pdb/PDBFTSPanel.java index 5f5c716..1dfabce 100644 --- a/src/jalview/fts/service/pdb/PDBFTSPanel.java +++ b/src/jalview/fts/service/pdb/PDBFTSPanel.java @@ -45,13 +45,13 @@ public class PDBFTSPanel extends GFTSPanel public PDBFTSPanel(SequenceFetcher seqFetcher) { + super(); pageLimit = PDBFTSRestClient.getInstance().getDefaultResponsePageSize(); this.seqFetcher = seqFetcher; - this.progressIdicator = (seqFetcher == null) ? null : seqFetcher + this.progressIndicator = (seqFetcher == null) ? null : seqFetcher .getProgressIndicator(); } - @Override public void searchAction(boolean isFreshSearch) { @@ -103,7 +103,7 @@ public class PDBFTSPanel extends GFTSPanel { getResultTable().setModel( FTSRestResponse.getTableModel(request, - resultList.getSearchSummary())); + resultList.getSearchSummary())); FTSRestResponse.configureTableColumn(getResultTable(), wantedFields, tempUserPrefs); getResultTable().setVisible(true); @@ -116,10 +116,12 @@ public class PDBFTSPanel extends GFTSPanel String result = (resultSetCount > 0) ? MessageManager .getString("label.results") : MessageManager .getString("label.result"); - + if (isPaginationEnabled() && resultSetCount > 0) { - updateSearchFrameTitle(defaultFTSFrameTitle + " - " + result + updateSearchFrameTitle(defaultFTSFrameTitle + + " - " + + result + " " + totalNumberformatter.format((Number) (offSet + 1)) + " to " @@ -127,8 +129,8 @@ public class PDBFTSPanel extends GFTSPanel .format((Number) (offSet + resultSetCount)) + " of " + totalNumberformatter - .format((Number) totalResultSetCount) - + " " + " (" + (endTime - startTime) + " milli secs)"); + .format((Number) totalResultSetCount) + " " + + " (" + (endTime - startTime) + " milli secs)"); } else { @@ -136,7 +138,7 @@ public class PDBFTSPanel extends GFTSPanel + resultSetCount + " " + result + " (" + (endTime - startTime) + " milli secs)"); } - + setSearchInProgress(false); refreshPaginatorState(); updateSummaryTableSelections(); @@ -192,8 +194,7 @@ public class PDBFTSPanel extends GFTSPanel try { primaryKeyColIndex = getFTSRestClient().getPrimaryKeyColumIndex( - wantedFields, - false); + wantedFields, false); } catch (Exception e) { e.printStackTrace(); @@ -203,8 +204,7 @@ public class PDBFTSPanel extends GFTSPanel for (int summaryRow : selectedRows) { String idStr = getResultTable().getValueAt(summaryRow, - primaryKeyColIndex) - .toString(); + primaryKeyColIndex).toString(); selectedIdsSet.add(getPDBIdwithSpecifiedChain(idStr, searchTerm)); } @@ -226,7 +226,6 @@ public class PDBFTSPanel extends GFTSPanel delayAndEnableActionButtons(); } - public static String getPDBIdwithSpecifiedChain(String pdbId, String searchTerm) {