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-2446 merged to spike branch
[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
32c171e
..
b944b9b
100644
(file)
--- a/
src/jalview/fts/service/pdb/PDBFTSPanel.java
+++ b/
src/jalview/fts/service/pdb/PDBFTSPanel.java
@@
-29,7
+29,9
@@
import jalview.fts.core.GFTSPanel;
import jalview.gui.SequenceFetcher;
import jalview.util.MessageManager;
import jalview.gui.SequenceFetcher;
import jalview.util.MessageManager;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.HashSet;
+import java.util.Map;
@SuppressWarnings("serial")
public class PDBFTSPanel extends GFTSPanel
@SuppressWarnings("serial")
public class PDBFTSPanel extends GFTSPanel
@@
-37,20
+39,24
@@
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 String ftsFrameTitle = defaultFTSFrameTitle;
+
+ 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)
{
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)
{
+ mainFrame.requestFocusInWindow();
if (isFreshSearch)
{
offSet = 0;
if (isFreshSearch)
{
offSet = 0;
@@
-60,7
+66,6
@@
public class PDBFTSPanel extends GFTSPanel
@Override
public void run()
{
@Override
public void run()
{
- ftsFrameTitle = defaultFTSFrameTitle;
reset();
boolean allowEmptySequence = false;
if (getTypedText().length() > 0)
reset();
boolean allowEmptySequence = false;
if (getTypedText().length() > 0)
@@
-72,7
+77,7
@@
public class PDBFTSPanel extends GFTSPanel
.getSelectedItem()).getCode();
wantedFields = PDBFTSRestClient.getInstance()
.getAllDefaultDisplayedFTSDataColumns();
.getSelectedItem()).getCode();
wantedFields = PDBFTSRestClient.getInstance()
.getAllDefaultDisplayedFTSDataColumns();
- String searchTerm = decodeSearchTerm(txt_search.getText(),
+ String searchTerm = decodeSearchTerm(getTypedText(),
searchTarget);
FTSRestRequest request = new FTSRestRequest();
searchTarget);
FTSRestRequest request = new FTSRestRequest();
@@
-99,9
+104,9
@@
public class PDBFTSPanel extends GFTSPanel
{
getResultTable().setModel(
FTSRestResponse.getTableModel(request,
{
getResultTable().setModel(
FTSRestResponse.getTableModel(request,
- resultList.getSearchSummary()));
+ resultList.getSearchSummary()));
FTSRestResponse.configureTableColumn(getResultTable(),
FTSRestResponse.configureTableColumn(getResultTable(),
- wantedFields);
+ wantedFields, tempUserPrefs);
getResultTable().setVisible(true);
}
getResultTable().setVisible(true);
}
@@
-112,10
+117,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 "
@@
-123,8
+130,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
{
@@
-132,11
+139,12
@@
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();
}
+ txt_search.updateCache();
}
}.start();
}
}
}.start();
}
@@
-188,19
+196,17
@@
public class PDBFTSPanel extends GFTSPanel
try
{
primaryKeyColIndex = getFTSRestClient().getPrimaryKeyColumIndex(
try
{
primaryKeyColIndex = getFTSRestClient().getPrimaryKeyColumIndex(
- wantedFields,
- false);
+ wantedFields, false);
} catch (Exception e)
{
e.printStackTrace();
}
int[] selectedRows = getResultTable().getSelectedRows();
} catch (Exception e)
{
e.printStackTrace();
}
int[] selectedRows = getResultTable().getSelectedRows();
- String searchTerm = txt_search.getText();
+ String searchTerm = getTypedText();
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));
}
@@
-222,7
+228,6
@@
public class PDBFTSPanel extends GFTSPanel
delayAndEnableActionButtons();
}
delayAndEnableActionButtons();
}
-
public static String getPDBIdwithSpecifiedChain(String pdbId,
String searchTerm)
{
public static String getPDBIdwithSpecifiedChain(String pdbId,
String searchTerm)
{
@@
-258,7
+263,7
@@
public class PDBFTSPanel extends GFTSPanel
@Override
public String getFTSFrameTitle()
{
@Override
public String getFTSFrameTitle()
{
- return ftsFrameTitle;
+ return defaultFTSFrameTitle;
}
@Override
}
@Override
@@
-267,4
+272,18
@@
public class PDBFTSPanel extends GFTSPanel
return true;
}
return true;
}
+ @Override
+ public Map<String, Integer> getTempUserPrefs()
+ {
+ return tempUserPrefs;
+ }
+
+
+ @Override
+ public String getCacheKey()
+ {
+ return PDB_FTS_CACHE_KEY;
+ }
+
+
}
}