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 feature/JAL-2759
[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
b944b9b
..
053d91b
100644
(file)
--- a/
src/jalview/fts/service/pdb/PDBFTSPanel.java
+++ b/
src/jalview/fts/service/pdb/PDBFTSPanel.java
@@
-39,18
+39,19
@@
public class PDBFTSPanel extends GFTSPanel
private static String defaultFTSFrameTitle = MessageManager
.getString("label.pdb_sequence_fetcher");
private static String defaultFTSFrameTitle = MessageManager
.getString("label.pdb_sequence_fetcher");
-
private static Map<String, Integer> tempUserPrefs = new HashMap<String, Integer>();
private static final String PDB_FTS_CACHE_KEY = "CACHE.PDB_FTS";
private static Map<String, Integer> tempUserPrefs = new HashMap<String, Integer>();
private static final String PDB_FTS_CACHE_KEY = "CACHE.PDB_FTS";
- public PDBFTSPanel(SequenceFetcher seqFetcher)
+ private static final String PDB_AUTOSEARCH = "FTS.PDB.AUTOSEARCH";
+
+ public PDBFTSPanel(SequenceFetcher fetcher)
{
{
- super();
+ super(fetcher);
pageLimit = PDBFTSRestClient.getInstance().getDefaultResponsePageSize();
pageLimit = PDBFTSRestClient.getInstance().getDefaultResponsePageSize();
- this.seqFetcher = seqFetcher;
- this.progressIndicator = (seqFetcher == null) ? null : seqFetcher
- .getProgressIndicator();
+ this.seqFetcher = fetcher;
+ this.progressIndicator = (fetcher == null) ? null
+ : fetcher.getProgressIndicator();
}
@Override
}
@Override
@@
-87,24
+88,24
@@
public class PDBFTSPanel extends GFTSPanel
request.setSearchTerm(searchTerm + ")");
request.setOffSet(offSet);
request.setWantedFields(wantedFields);
request.setSearchTerm(searchTerm + ")");
request.setOffSet(offSet);
request.setWantedFields(wantedFields);
- FTSRestClientI pdbRestCleint = PDBFTSRestClient.getInstance();
+ FTSRestClientI pdbRestClient = PDBFTSRestClient.getInstance();
FTSRestResponse resultList;
try
{
FTSRestResponse resultList;
try
{
- resultList = pdbRestCleint.executeRequest(request);
+ resultList = pdbRestClient.executeRequest(request);
} catch (Exception e)
{
setErrorMessage(e.getMessage());
checkForErrors();
} catch (Exception e)
{
setErrorMessage(e.getMessage());
checkForErrors();
+ setSearchInProgress(false);
return;
}
if (resultList.getSearchSummary() != null
&& resultList.getSearchSummary().size() > 0)
{
return;
}
if (resultList.getSearchSummary() != null
&& resultList.getSearchSummary().size() > 0)
{
- getResultTable().setModel(
- FTSRestResponse.getTableModel(request,
- resultList.getSearchSummary()));
+ getResultTable().setModel(FTSRestResponse.getTableModel(request,
+ resultList.getSearchSummary()));
FTSRestResponse.configureTableColumn(getResultTable(),
wantedFields, tempUserPrefs);
getResultTable().setVisible(true);
FTSRestResponse.configureTableColumn(getResultTable(),
wantedFields, tempUserPrefs);
getResultTable().setVisible(true);
@@
-114,15
+115,13
@@
public class PDBFTSPanel extends GFTSPanel
totalResultSetCount = resultList.getNumberOfItemsFound();
resultSetCount = resultList.getSearchSummary() == null ? 0
: resultList.getSearchSummary().size();
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");
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 "
@@
-130,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
{
@@
-174,8
+173,8
@@
public class PDBFTSPanel extends GFTSPanel
foundSearchTerms = foundSearchTermsBuilder.toString();
if (foundSearchTerms.contains(" OR "))
{
foundSearchTerms = foundSearchTermsBuilder.toString();
if (foundSearchTerms.contains(" OR "))
{
- foundSearchTerms = foundSearchTerms.substring(
- targetField.length() + 1, endIndex);
+ foundSearchTerms = foundSearchTerms
+ .substring(targetField.length() + 1, endIndex);
}
}
else if (enteredText.contains(":"))
}
}
else if (enteredText.contains(":"))
@@
-195,8
+194,8
@@
public class PDBFTSPanel extends GFTSPanel
int primaryKeyColIndex = 0;
try
{
int primaryKeyColIndex = 0;
try
{
- primaryKeyColIndex = getFTSRestClient().getPrimaryKeyColumIndex(
- wantedFields, false);
+ primaryKeyColIndex = getFTSRestClient()
+ .getPrimaryKeyColumIndex(wantedFields, false);
} catch (Exception e)
{
e.printStackTrace();
} catch (Exception e)
{
e.printStackTrace();
@@
-205,8
+204,8
@@
public class PDBFTSPanel extends GFTSPanel
String searchTerm = getTypedText();
for (int summaryRow : selectedRows)
{
String searchTerm = getTypedText();
for (int summaryRow : selectedRows)
{
- String idStr = getResultTable().getValueAt(summaryRow,
- primaryKeyColIndex).toString();
+ String idStr = getResultTable()
+ .getValueAt(summaryRow, primaryKeyColIndex).toString();
selectedIdsSet.add(getPDBIdwithSpecifiedChain(idStr, searchTerm));
}
selectedIdsSet.add(getPDBIdwithSpecifiedChain(idStr, searchTerm));
}
@@
-278,12
+277,15
@@
public class PDBFTSPanel extends GFTSPanel
return tempUserPrefs;
}
return tempUserPrefs;
}
-
@Override
public String getCacheKey()
{
return PDB_FTS_CACHE_KEY;
}
@Override
public String getCacheKey()
{
return PDB_FTS_CACHE_KEY;
}
-
-}
+ @Override
+ public String getAutosearchPreference()
+ {
+ return PDB_AUTOSEARCH;
+ }
+}
\ No newline at end of file