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-2622 no vertical scroll of wrapped alignment from trackpad / mouse
[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
1dfabce
..
b944b9b
100644
(file)
--- a/
src/jalview/fts/service/pdb/PDBFTSPanel.java
+++ b/
src/jalview/fts/service/pdb/PDBFTSPanel.java
@@
-39,10
+39,11
@@
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 Map<String, Integer> tempUserPrefs = new HashMap<String, Integer>();
+ private static final String PDB_FTS_CACHE_KEY = "CACHE.PDB_FTS";
+
public PDBFTSPanel(SequenceFetcher seqFetcher)
{
super();
public PDBFTSPanel(SequenceFetcher seqFetcher)
{
super();
@@
-55,6
+56,7
@@
public class PDBFTSPanel extends GFTSPanel
@Override
public void searchAction(boolean isFreshSearch)
{
@Override
public void searchAction(boolean isFreshSearch)
{
+ mainFrame.requestFocusInWindow();
if (isFreshSearch)
{
offSet = 0;
if (isFreshSearch)
{
offSet = 0;
@@
-64,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)
@@
-76,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();
@@
-143,6
+144,7
@@
public class PDBFTSPanel extends GFTSPanel
refreshPaginatorState();
updateSummaryTableSelections();
}
refreshPaginatorState();
updateSummaryTableSelections();
}
+ txt_search.updateCache();
}
}.start();
}
}
}.start();
}
@@
-200,7
+202,7
@@
public class PDBFTSPanel extends GFTSPanel
e.printStackTrace();
}
int[] selectedRows = getResultTable().getSelectedRows();
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,
@@
-261,7
+263,7
@@
public class PDBFTSPanel extends GFTSPanel
@Override
public String getFTSFrameTitle()
{
@Override
public String getFTSFrameTitle()
{
- return ftsFrameTitle;
+ return defaultFTSFrameTitle;
}
@Override
}
@Override
@@
-276,4
+278,12
@@
public class PDBFTSPanel extends GFTSPanel
return tempUserPrefs;
}
return tempUserPrefs;
}
+
+ @Override
+ public String getCacheKey()
+ {
+ return PDB_FTS_CACHE_KEY;
+ }
+
+
}
}