From 51a02acc93ad80f349a60e226fffce1cd982d9fa Mon Sep 17 00:00:00 2001 From: clemenso Date: Thu, 13 Aug 2009 09:27:34 +0000 Subject: [#427] No help in BKULocal git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@426 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../java/at/gv/egiz/bku/local/gui/LocalHelpListener.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java') diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java index d551ae0d..c957e132 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java @@ -17,6 +17,7 @@ package at.gv.egiz.bku.local.gui; import at.gv.egiz.bku.gui.AbstractHelpListener; +import at.gv.egiz.bku.gui.DefaultHelpListener; import java.awt.Desktop; import java.io.IOException; import java.net.URISyntaxException; @@ -24,30 +25,37 @@ import java.net.URL; import java.util.Locale; /** - * + * Open help document in browser, fallback to default (swing dialog) if Java Desktop API not supported. + * * @author Clemens Orthacker */ public class LocalHelpListener extends AbstractHelpListener { protected Desktop desktop; + protected DefaultHelpListener fallback; public LocalHelpListener(URL baseURL, Locale locale) { super(baseURL, locale); if (Desktop.isDesktopSupported()) { desktop = Desktop.getDesktop(); + } else { + log.info("Java Desktop API not available on current platform (libgnome installed?), falling back to DefaultHelpListener"); + fallback = new DefaultHelpListener(baseURL, locale); } } @Override public void showDocument(URL helpDocument, String helpTopic) throws IOException, URISyntaxException { - if (desktop == null) { - log.error("Failed to open default browser: Desktop API not available (libgnome installed?)"); - } else { + if (desktop != null) { if (!desktop.isSupported(Desktop.Action.BROWSE)) { log.error("Failed to open default browser: The system provides the Desktop API, but does not support the BROWSE action"); } else { Desktop.getDesktop().browse(helpDocument.toURI()); } + } else if (fallback != null) { + fallback.showDocument(helpDocument, helpTopic); + } else { + log.error("failed to display help document"); } } } -- cgit v1.2.3