[freenet-cvs] r13174 - trunk/apps/new_installer/src

[nextgens at freenetproject.org]

Author: nextgens
Date: 2007-05-09 17:55:56 +0000 (Wed, 09 May 2007)
New Revision: 13174

Modified:
   trunk/apps/new_installer/src/BareBonesBrowserLaunch.java
Log:
new_installer: cleanup BareBonesBrowserLaunch, indent and display a better error message

Modified: trunk/apps/new_installer/src/BareBonesBrowserLaunch.java
===================================================================
--- trunk/apps/new_installer/src/BareBonesBrowserLaunch.java	2007-05-09 17:27:37 UTC (rev 13173)
+++ trunk/apps/new_installer/src/BareBonesBrowserLaunch.java	2007-05-09 17:55:56 UTC (rev 13174)
@@ -1,9 +1,16 @@
-///////////////////////////////////////////////////////// // Bare Bones Browser Launch // // Version 1.5 // // December 10, 2005 // // Supports: Mac OS X, GNU/Linux, Unix, Windows XP // // Example Usage: // // String url = "http://www.centerkey.com/";
-// // BareBonesBrowserLaunch.openURL(url);
-// // Public Domain Software -- Free to Use as You Like // /////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////
+// Bare Bones Browser Launch //
+// Version 1.5 //
+// December 10, 2005 //
+// Supports: Mac OS X, GNU/Linux, Unix, Windows XP //
+// Example Usage: // // String url = "http://www.centerkey.com/";
+// BareBonesBrowserLaunch.openURL(url);
+// Public Domain Software -- Free to Use as You Like //
+/////////////////////////////////////////////////////////
+
 import java.lang.reflect.Method;
 import java.util.Arrays;
-import javax.swing.JOptionPane;
+
 public class BareBonesBrowserLaunch {
 	private static final String errMsg = "Error attempting to launch web browser";
 	public static void main(String arg[]) {
@@ -12,34 +19,27 @@
 		try {
 			if (osName.startsWith("Mac OS")) {
 				Class fileMgr = Class.forName("com.apple.eio.FileManager");
-				Method openURL = fileMgr.getDeclaredMethod("openURL", new Class[] {
-					String.class
-				}
-				);
-				openURL.invoke(null, new Object[] {
-					url}
-					);
+				Method openURL = fileMgr.getDeclaredMethod("openURL", new Class[] { String.class });
+
+				openURL.invoke(null, new Object[] { url });
 			}
 			else if (osName.startsWith("Windows")) Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
 			else {
 				//assume Unix or Linux
-				String[] browsers = {"firefox", "opera", "konqueror", "epiphany", "mozilla", "netscape" }
-				;
+				String[] browsers = {"firefox", "opera", "konqueror", "epiphany", "mozilla", "netscape" };
 				String browser = null;
-				for (int count = 0;
-						count < browsers.length && browser == null;
-						count++) if (Runtime.getRuntime().exec( new String[] {
-					"which", browsers[count]}
-					).waitFor() == 0) browser = browsers[count];
-						if (browser == null) throw new Exception("Could not find web browser");
-						else Runtime.getRuntime().exec(new String[] {
-							browser, url}
-							);
+
+				for (int count = 0; count < browsers.length && browser == null; count++)
+					if (Runtime.getRuntime().exec( new String[] { "which", browsers[count]} ).waitFor() == 0)
+						browser = browsers[count];
+				if (browser == null)
+					throw new Exception("Could not find web browser");
+				else 
+					Runtime.getRuntime().exec(new String[] { browser, url});
 			}
 		}
 		catch (Exception e) {
-			JOptionPane.showMessageDialog(null, errMsg + ":\n" + e.getLocalizedMessage());
+			System.out.println("Unable to detect/startup your browser... please go to " + url + " for futher instructions");
 		}
 	}
 }
-