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-2189 source formatting
[jalview.git]
/
src
/
jalview
/
fts
/
service
/
pdb
/
PDBFTSPanel.java
diff --git
a/src/jalview/fts/service/pdb/PDBFTSPanel.java
b/src/jalview/fts/service/pdb/PDBFTSPanel.java
index
5f5c716
..
1dfabce
100644
(file)
--- 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)
{
public PDBFTSPanel(SequenceFetcher seqFetcher)
{
+ super();
pageLimit = PDBFTSRestClient.getInstance().getDefaultResponsePageSize();
this.seqFetcher = seqFetcher;
pageLimit = PDBFTSRestClient.getInstance().getDefaultResponsePageSize();
this.seqFetcher = seqFetcher;
- this.progressIdicator = (seqFetcher == null) ? null : seqFetcher
+ this.progressIndicator = (seqFetcher == null) ? null : seqFetcher
.getProgressIndicator();
}
.getProgressIndicator();
}
-
@Override
public void searchAction(boolean isFreshSearch)
{
@Override
public void searchAction(boolean isFreshSearch)
{
@@
-103,7
+103,7
@@
public class PDBFTSPanel extends GFTSPanel
{
getResultTable().setModel(
FTSRestResponse.getTableModel(request,
{
getResultTable().setModel(
FTSRestResponse.getTableModel(request,
- resultList.getSearchSummary()));
+ resultList.getSearchSummary()));
FTSRestResponse.configureTableColumn(getResultTable(),
wantedFields, tempUserPrefs);
getResultTable().setVisible(true);
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");
String result = (resultSetCount > 0) ? MessageManager
.getString("label.results") : MessageManager
.getString("label.result");
-
+
if (isPaginationEnabled() && resultSetCount > 0)
{
if (isPaginationEnabled() && resultSetCount > 0)
{
- updateSearchFrameTitle(defaultFTSFrameTitle + " - " + result
+ updateSearchFrameTitle(defaultFTSFrameTitle
+ + " - "
+ + result
+ " "
+ totalNumberformatter.format((Number) (offSet + 1))
+ " to "
+ " "
+ totalNumberformatter.format((Number) (offSet + 1))
+ " to "
@@
-127,8
+129,8
@@
public class PDBFTSPanel 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
{
@@
-136,7
+138,7
@@
public class PDBFTSPanel extends GFTSPanel
+ resultSetCount + " " + result + " ("
+ (endTime - startTime) + " milli secs)");
}
+ resultSetCount + " " + result + " ("
+ (endTime - startTime) + " milli secs)");
}
-
+
setSearchInProgress(false);
refreshPaginatorState();
updateSummaryTableSelections();
setSearchInProgress(false);
refreshPaginatorState();
updateSummaryTableSelections();
@@
-192,8
+194,7
@@
public class PDBFTSPanel extends GFTSPanel
try
{
primaryKeyColIndex = getFTSRestClient().getPrimaryKeyColumIndex(
try
{
primaryKeyColIndex = getFTSRestClient().getPrimaryKeyColumIndex(
- wantedFields,
- false);
+ wantedFields, false);
} catch (Exception e)
{
e.printStackTrace();
} catch (Exception e)
{
e.printStackTrace();
@@
-203,8
+204,7
@@
public class PDBFTSPanel extends GFTSPanel
for (int summaryRow : selectedRows)
{
String idStr = getResultTable().getValueAt(summaryRow,
for (int summaryRow : selectedRows)
{
String idStr = getResultTable().getValueAt(summaryRow,
- primaryKeyColIndex)
- .toString();
+ primaryKeyColIndex).toString();
selectedIdsSet.add(getPDBIdwithSpecifiedChain(idStr, searchTerm));
}
selectedIdsSet.add(getPDBIdwithSpecifiedChain(idStr, searchTerm));
}
@@
-226,7
+226,6
@@
public class PDBFTSPanel extends GFTSPanel
delayAndEnableActionButtons();
}
delayAndEnableActionButtons();
}
-
public static String getPDBIdwithSpecifiedChain(String pdbId,
String searchTerm)
{
public static String getPDBIdwithSpecifiedChain(String pdbId,
String searchTerm)
{