less noise if a browser cannot be opened

source/net/yacy/gui/framework/Browser.java

@@ -61,11 +61,17 @@ public class Browser {
         // check operation system type
         final Properties sysprop = System.getProperties();
         final String sysname = sysprop.getProperty("os.name","").toLowerCase();
-        if (sysname.startsWith("mac os x")) systemOS = systemMacOSX;
-        else if (sysname.startsWith("mac os")) systemOS = systemMacOSC;
-        else if (sysname.startsWith("windows")) systemOS = systemWindows;
-        else if ((sysname.startsWith("linux")) || (sysname.startsWith("unix"))) systemOS = systemUnix;
-        else systemOS = systemUnknown;
+        if (sysname.startsWith("mac os x")) {
+            systemOS = systemMacOSX;
+        } else if (sysname.startsWith("mac os")) {
+            systemOS = systemMacOSC;
+        } else if (sysname.startsWith("windows")) {
+            systemOS = systemWindows;
+        } else if ((sysname.startsWith("linux")) || (sysname.startsWith("unix"))) {
+            systemOS = systemUnix;
+        } else {
+            systemOS = systemUnknown;
+        }
 
         isMacArchitecture = ((systemOS == systemMacOSC) || (systemOS == systemMacOSX));
         isUnixFS = ((systemOS == systemMacOSX) || (systemOS == systemUnix));
@@ -74,7 +80,11 @@ public class Browser {
         isWin32 = (isWindows && System.getProperty("os.arch", "").contains("x86"));
 
         // set up maximum path length according to system
-        if (isWindows) maxPathLength = 255; else maxPathLength = 65535;
+        if (isWindows) {
+            maxPathLength = 255;
+        } else {
+            maxPathLength = 65535;
+        }
     }
 
     public static void openBrowser(final String url) {
@@ -93,11 +103,13 @@ public class Browser {
             } else {
                 throw new RuntimeException("System unknown");
             }
-        } catch (Exception e) {
-            if (head) try {
+        } catch (Throwable e) {
+            if (head) {
+                try {
                     openBrowserJava(url);
                 } catch (Exception ee) {
                     logBrowserFail(url, ee);
+                }
             } else {
                 logBrowserFail(url, e);
             }
@@ -111,14 +123,18 @@ public class Browser {
     private static void openBrowserMac(final String url) throws Exception {
         Process p = Runtime.getRuntime().exec(new String[] {"/usr/bin/osascript", "-e", "open location \"" + url + "\""});
         p.waitFor();
-        if (p.exitValue() != 0) throw new RuntimeException("Mac Exec Error: " + errorResponse(p));
+        if (p.exitValue() != 0) {
+            throw new RuntimeException("Mac Exec Error: " + errorResponse(p));
+        }
     }
 
     private static void openBrowserUnixFirefox(final String url) throws Exception {
         String cmd = "firefox -remote openURL(" + url + ")";
         Process p = Runtime.getRuntime().exec(cmd);
         p.waitFor();
-        if (p.exitValue() != 0) throw new RuntimeException("Unix Exec Error/Firefox: " + errorResponse(p));
+        if (p.exitValue() != 0) {
+            throw new RuntimeException("Unix Exec Error/Firefox: " + errorResponse(p));
+        }
     }
     /*
     private static void openBrowserUnixGeneric(final String url) throws Exception {
@@ -131,16 +147,21 @@ public class Browser {
     private static void openBrowserWin(final String url) throws Exception {
         // see forum at http://forum.java.sun.com/thread.jsp?forum=57&thread=233364&message=838441
         String cmd;
-        if (System.getProperty("os.name").contains("2000")) cmd = "rundll32 url.dll,FileProtocolHandler " + url;
-        else cmd = "rundll32 url.dll,FileProtocolHandler \"" + url + "\"";
+        if (System.getProperty("os.name").contains("2000")) {
+            cmd = "rundll32 url.dll,FileProtocolHandler " + url;
+        } else {
+            cmd = "rundll32 url.dll,FileProtocolHandler \"" + url + "\"";
+        }
         //cmd = "cmd.exe /c start javascript:document.location='" + url + "'";
         Process p = Runtime.getRuntime().exec(cmd);
         p.waitFor();
-        if (p.exitValue() != 0) throw new RuntimeException("EXEC ERROR: " + errorResponse(p));
+        if (p.exitValue() != 0) {
+            throw new RuntimeException("EXEC ERROR: " + errorResponse(p));
+        }
     }
 
-    private static void logBrowserFail(final String url, Exception e) {
-        if (e != null) Log.logException(e);
+    private static void logBrowserFail(final String url, Throwable e) {
+        //if (e != null) Log.logException(e);
         Log.logInfo("Browser", "please start your browser and open the following location: " + url);
     }