X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FHelp.java;h=8829be919fdbf204a83b19cca147ed389b6a32ff;hb=c932f0e85a8852824cdd8ce790af68682732c85c;hp=48f84c354e618d0cc05884914c14aff755887ab2;hpb=d9f0a24d9662a0b530fd79b51108dd074d03d6e0;p=jalview.git diff --git a/src/jalview/gui/Help.java b/src/jalview/gui/Help.java index 48f84c3..8829be9 100644 --- a/src/jalview/gui/Help.java +++ b/src/jalview/gui/Help.java @@ -20,11 +20,7 @@ */ package jalview.gui; -import jalview.util.BrowserLauncher; -import jalview.util.Platform; - import java.awt.Point; -import java.io.IOException; import java.net.URL; import javax.help.BadIDException; @@ -32,6 +28,9 @@ import javax.help.HelpBroker; import javax.help.HelpSet; import javax.help.HelpSetException; +import jalview.util.BrowserLauncher; +import jalview.util.Platform; + /** * Utility class to show the help documentation window * @@ -42,18 +41,22 @@ public class Help private static final String HELP_PAGE_ROOT = "http://www.jalview.org/help/"; /** - * Defines selected help targets with links to inbuilt (Java) help page target, - * and externally hosted help page. Will need to be maintained manually if help - * pages are reorganised in future. + * Defines selected help targets with links to inbuilt (Java) help page + * target, and externally hosted help page. Will need to be maintained + * manually if help pages are reorganised in future. */ public enum HelpId { - Home("home", "help.html"), SequenceFeatureSettings("seqfeatures.settings", "html/features/featuresettings.html"), - StructureViewer("viewingpdbs", "html/features/viewingpdbs.html"), PdbFts("pdbfts", "html/features/pdbsequencefetcher.html#pdbfts"), - UniprotFts("uniprotfts", "html/features/uniprotsequencefetcher.html#uniprotfts"); + Home("home", "help.html"), + SequenceFeatureSettings("seqfeatures.settings", + "html/features/featuresettings.html"), + StructureViewer("viewingpdbs", "html/features/viewingpdbs.html"), + PdbFts("pdbfts", "html/features/pdbsequencefetcher.html#pdbfts"), + UniprotFts("uniprotfts", + "html/features/uniprotsequencefetcher.html#uniprotfts"); private String id; - + private String path; private HelpId(String hepLoc, String htmlPath) @@ -94,18 +97,22 @@ public class Help { if (Platform.isJS()) { + /* try { - BrowserLauncher.openURL(HELP_PAGE_ROOT + id.getPath()); + */ + BrowserLauncher.openURL(HELP_PAGE_ROOT + id.getPath()); + /* } catch (IOException e) { } + */ } else /** * Java only * - * @j2sNative + * @j2sIgnore */ { @@ -126,7 +133,7 @@ public class Help hb.setCurrentID(id.getId()); } catch (BadIDException bad) { - System.out.println("Bad help link: " + id.getId() + jalview.bin.Console.outPrintln("Bad help link: " + id.getId() + ": must match a target in help.jhm"); throw bad; }