CSSTUDIO-3165 Move the method determineHelpLocation() from the class 'HelpBrowser' to the class 'OpenHelp'.

Author: abrahamwolk

core/ui/src/main/java/org/phoebus/ui/help/HelpBrowser.java

@@ -64,37 +64,11 @@ protected void fillInformation(final StringBuilder info)
 
     private void loadHelp(final JobMonitor monitor)
     {
-        final String location = determineHelpLocation();
+        final String location = OpenHelp.determineHelpLocation();
         logger.log(Level.CONFIG, "Showing help from " + location);
         Platform.runLater(() -> browser.getEngine().load(location));
     }
 
-    public static String determineHelpLocation()
-    {
-        final File phoenix_install = Locations.install();
-
-        // The distribution includes a lib/ and a doc/ folder.
-        // Check for the doc/index.html
-        File loc = new File(phoenix_install, "doc/index.html");
-        if (loc.exists())
-            return loc.toURI().toString();
-
-        // During development,
-        // product is started from IDE as ....../git/phoebus/phoebus-product.
-        // Check for copy of docs in      ....../git/phoebus/docs/build/html
-        loc = new File(phoenix_install, "docs");
-        if (loc.exists())
-        {
-            loc = new File(loc, "build/html/index.html");
-            if (loc.exists())
-                return loc.toURI().toString();
-            logger.log(Level.WARNING, "Found phoebus-doc repository, but no build/html/index.html. Run 'make html'");
-        }
-
-        // Fall back to online copy of the manual
-        return "https://control-system-studio.readthedocs.io";
-    }
-
     @Override
     public AppDescriptor getAppDescriptor()
     {

core/ui/src/main/java/org/phoebus/ui/help/OpenHelp.java

@@ -7,15 +7,20 @@
  *******************************************************************************/
 package org.phoebus.ui.help;
 
+import org.phoebus.framework.workbench.Locations;
 import org.phoebus.ui.application.Messages;
 import org.phoebus.ui.javafx.ImageCache;
 import org.phoebus.ui.spi.MenuEntry;
 
 import javafx.scene.image.Image;
 import org.phoebus.ui.web.WebBrowserApplication;
 
+import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.logging.Level;
+
+import static org.phoebus.ui.application.PhoebusApplication.logger;
 
 /** Menu entry to open help
  *  @author Kay Kasemir
@@ -45,12 +50,38 @@ public Image getIcon()
     public Void call()
     {
         try {
-            URI helpLocationURI = new URI(HelpBrowser.determineHelpLocation());
+            URI helpLocationURI = new URI(determineHelpLocation());
             WebBrowserApplication webBrowserApplication = new WebBrowserApplication();
             webBrowserApplication.create(helpLocationURI);
         } catch (URISyntaxException uriSyntaxException) {
             throw new RuntimeException(uriSyntaxException);
         }
         return null;
     }
+
+    public static String determineHelpLocation()
+    {
+        final File phoenix_install = Locations.install();
+
+        // The distribution includes a lib/ and a doc/ folder.
+        // Check for the doc/index.html
+        File loc = new File(phoenix_install, "doc/index.html");
+        if (loc.exists())
+            return loc.toURI().toString();
+
+        // During development,
+        // product is started from IDE as ....../git/phoebus/phoebus-product.
+        // Check for copy of docs in      ....../git/phoebus/docs/build/html
+        loc = new File(phoenix_install, "docs");
+        if (loc.exists())
+        {
+            loc = new File(loc, "build/html/index.html");
+            if (loc.exists())
+                return loc.toURI().toString();
+            logger.log(Level.WARNING, "Found phoebus-doc repository, but no build/html/index.html. Run 'make html'");
+        }
+
+        // Fall back to online copy of the manual
+        return "https://control-system-studio.readthedocs.io";
+    }
 }