X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Ffts%2Fservice%2Funiprot%2FUniprotFTSPanel.java;h=182e29b311018cf3e9adc741df0893f3a022b9de;hb=a3d82d30b2bc55f250bbf1c94975308407e8aae7;hp=020331aeaa4ab082dd6f625fb5fccd013ef1ce29;hpb=cef8dbc4cf7c8b47864b11aad36596901003639a;p=jalview.git diff --git a/src/jalview/fts/service/uniprot/UniprotFTSPanel.java b/src/jalview/fts/service/uniprot/UniprotFTSPanel.java index 020331a..182e29b 100644 --- a/src/jalview/fts/service/uniprot/UniprotFTSPanel.java +++ b/src/jalview/fts/service/uniprot/UniprotFTSPanel.java @@ -26,6 +26,8 @@ import jalview.fts.api.FTSRestClientI; import jalview.fts.core.FTSRestRequest; import jalview.fts.core.FTSRestResponse; import jalview.fts.core.GFTSPanel; +import jalview.gui.Help; +import jalview.gui.Help.HelpId; import jalview.gui.SequenceFetcher; import jalview.util.MessageManager; @@ -33,6 +35,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import javax.help.HelpSetException; + @SuppressWarnings("serial") public class UniprotFTSPanel extends GFTSPanel { @@ -44,9 +48,17 @@ public class UniprotFTSPanel extends GFTSPanel private static final String UNIPROT_FTS_CACHE_KEY = "CACHE.UNIPROT_FTS"; + private static final String UNIPROT_AUTOSEARCH = "FTS.UNIPROT.AUTOSEARCH"; + + /** + * Constructor given an (optional) sequence fetcher panel to revert to on + * clicking the 'Back' button + * + * @param fetcher + */ public UniprotFTSPanel(SequenceFetcher fetcher) { - super(); + super(fetcher); pageLimit = UniProtFTSRestClient.getInstance() .getDefaultResponsePageSize(); this.seqFetcher = fetcher; @@ -120,13 +132,15 @@ public class UniprotFTSPanel extends GFTSPanel { updateSearchFrameTitle(defaultFTSFrameTitle + " - " + result + " " - + totalNumberformatter.format((Number) (offSet + 1)) + + totalNumberformatter + .format(Integer.valueOf(offSet + 1)) + " to " + totalNumberformatter - .format((Number) (offSet + resultSetCount)) + .format(Integer + .valueOf(offSet + resultSetCount)) + " of " + totalNumberformatter - .format((Number) totalResultSetCount) + .format(Integer.valueOf(totalResultSetCount)) + " " + " (" + (endTime - startTime) + " milli secs)"); } else @@ -207,8 +221,7 @@ public class UniprotFTSPanel extends GFTSPanel } String ids = selectedIds.toString(); - // System.out.println(">>>>>>>>>>>>>>>> selected Ids: " + ids); - seqFetcher.getTextArea().setText(ids); + seqFetcher.setQuery(ids); Thread worker = new Thread(seqFetcher); worker.start(); delayAndEnableActionButtons(); @@ -237,4 +250,22 @@ public class UniprotFTSPanel extends GFTSPanel { return UNIPROT_FTS_CACHE_KEY; } + + @Override + public String getAutosearchPreference() + { + return UNIPROT_AUTOSEARCH; + } + + @Override + protected void showHelp() + { + try + { + Help.showHelpWindow(HelpId.UniprotFts); + } catch (HelpSetException e1) + { + e1.printStackTrace(); + } + } }