X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Ffts%2Fservice%2Funiprot%2FUniprotFTSPanel.java;h=33ad8c46eb8313cf00b88915b13f607d0bfb3ee5;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=df54dea5c841eda0f6e6a7886d18fb5c6a862a37;hpb=f8b17a9e7363b8a9e7cd12d61bc6d611c7c97d7d;p=jalview.git diff --git a/src/jalview/fts/service/uniprot/UniprotFTSPanel.java b/src/jalview/fts/service/uniprot/UniprotFTSPanel.java index df54dea..33ad8c4 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 { @@ -46,6 +50,12 @@ public class UniprotFTSPanel extends GFTSPanel 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(fetcher); @@ -120,16 +130,18 @@ public class UniprotFTSPanel extends GFTSPanel : MessageManager.getString("label.result"); if (isPaginationEnabled() && resultSetCount > 0) { - updateSearchFrameTitle(defaultFTSFrameTitle + " - " + result - + " " - + totalNumberformatter.format((Number) (offSet + 1)) - + " to " - + totalNumberformatter - .format((Number) (offSet + resultSetCount)) - + " of " - + totalNumberformatter - .format((Number) totalResultSetCount) - + " " + " (" + (endTime - startTime) + " milli secs)"); + updateSearchFrameTitle( + defaultFTSFrameTitle + " - " + result + " " + + totalNumberformatter + .format(Integer.valueOf(offSet + 1)) + + " to " + + totalNumberformatter.format(Integer + .valueOf(offSet + resultSetCount)) + + " of " + + totalNumberformatter.format( + Integer.valueOf(totalResultSetCount)) + + " " + " (" + (endTime - startTime) + + " milli secs)"); } else { @@ -209,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(); @@ -245,4 +256,16 @@ public class UniprotFTSPanel extends GFTSPanel { return UNIPROT_AUTOSEARCH; } + + @Override + protected void showHelp() + { + try + { + Help.showHelpWindow(HelpId.UniprotFts); + } catch (HelpSetException e1) + { + e1.printStackTrace(); + } + } }