changeset in /hg/icedtea6: 2008-07-10 Joshua Sumali <jsumali at r...

[Joshua Sumali]

changeset 8e512374e35d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8e512374e35d
description:
	2008-07-10  Joshua Sumali  <jsumali at redhat.com>

		* rt/net/sourceforge/jnlp/runtime/Boot.java: Remove restriction of only
		files ending with .jnlp being loaded. Also refactored a bit.

diffstat:

2 files changed, 45 insertions(+), 45 deletions(-)
ChangeLog                                 |    5 +
rt/net/sourceforge/jnlp/runtime/Boot.java |   85 +++++++++++++----------------

diffs (151 lines):

diff -r 58510fd936ff -r 8e512374e35d ChangeLog
--- a/ChangeLog	Tue Jul 08 16:35:46 2008 -0400
+++ b/ChangeLog	Thu Jul 10 16:38:01 2008 -0400
@@ -1,3 +1,8 @@ 2008-07-08  Lillian Angel  <langel at redha
+2008-07-10  Joshua Sumali  <jsumali at redhat.com>
+
+	* rt/net/sourceforge/jnlp/runtime/Boot.java: Remove restriction of only
+	files ending with .jnlp being loaded. Also refactored a bit.
+
 2008-07-08  Lillian Angel  <langel at redhat.com>
 
 	* patches/icedtea-security-updates.patch: New patch containing OpenJDK
diff -r 58510fd936ff -r 8e512374e35d rt/net/sourceforge/jnlp/runtime/Boot.java
--- a/rt/net/sourceforge/jnlp/runtime/Boot.java	Tue Jul 08 16:35:46 2008 -0400
+++ b/rt/net/sourceforge/jnlp/runtime/Boot.java	Thu Jul 10 16:38:01 2008 -0400
@@ -53,7 +53,7 @@ public final class Boot implements Privi
 
     /** the JNLP file to open to display the network-based about window */
     private static final String aboutFile = 
-    	System.getProperty("java.home") + "/lib/about.jnlp";
+        System.getProperty("java.home") + "/lib/about.jnlp";
 
     /** the text to display before launching the about link */
     private static final String aboutMessage = ""
@@ -115,13 +115,13 @@ public final class Boot implements Privi
         
         if (null != getOption("-viewer")) {
 
-        	try {
-        		CertificateViewer.main(null);
-        		System.exit(0);
-        	} catch (Exception e) {
-        		// TODO Auto-generated catch block
-        		e.printStackTrace();
-        	}
+            try {
+                CertificateViewer.main(null);
+                System.exit(0);
+            } catch (Exception e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
 
         }
 
@@ -194,13 +194,13 @@ public final class Boot implements Privi
      * Returns the about.jnlp file in {java.home}/lib or null if this file
      * does not exist.
      */
-	private static String getAboutFile() {
-
-		if (new File(aboutFile).exists())
-			return aboutFile;
-		else
-			return null;
-	}
+    private static String getAboutFile() {
+
+        if (new File(aboutFile).exists())
+            return aboutFile;
+        else
+            return null;
+    }
 
     /**
      * Returns the file to open; does not return if no file was
@@ -212,11 +212,11 @@ public final class Boot implements Privi
         
         // override -jnlp with aboutFile
         if (getOption("-about") != null) {
-        	location = getAboutFile();
-        	if (location == null)
-        		fatalError("Unable to find about.jnlp in {java.home}/lib/");
+            location = getAboutFile();
+            if (location == null)
+                fatalError("Unable to find about.jnlp in {java.home}/lib/");
         } else {
-        	location = getJNLPFile();
+            location = getJNLPFile();
         }
 
         if (location == null) {
@@ -230,14 +230,14 @@ public final class Boot implements Privi
         URL url = null;
 
         try {
-        	if (new File(location).exists())
-        		url = new File(location).toURL(); // Why use file.getCanonicalFile?
-        	else 
-        		url = new URL(ServiceUtil.getBasicService().getCodeBase(), location);
+            if (new File(location).exists())
+                url = new File(location).toURL(); // Why use file.getCanonicalFile?
+            else 
+                url = new URL(ServiceUtil.getBasicService().getCodeBase(), location);
         } catch (Exception e) {
-        	fatalError("Invalid jnlp file " + location);
-        	if (JNLPRuntime.isDebug())
-        		e.printStackTrace();
+            fatalError("Invalid jnlp file " + location);
+            if (JNLPRuntime.isDebug())
+                e.printStackTrace();
         }
         
         boolean strict = (null != getOption("-strict"));
@@ -321,32 +321,27 @@ public final class Boot implements Privi
     }
 
     /**
-     * Gets the JNLP file from the command line arguments, or exists upon error.
+     * Gets the JNLP file from the command line arguments, or exits upon error.
      */
     private static String getJNLPFile() {
 
-    	if (args.length == 0) {
+        if (args.length == 0) {
             System.out.println(helpMessage);
             System.exit(0);
-    	} else if (args.length == 1) {
-    		
-    		String lastArg = args[args.length - 1];
-    		if (lastArg.endsWith(".jnlp")) {
-    			return args[args.length - 1];
-    		} else
-    			return null;
-    	} else {
-    		String lastArg = args[args.length - 1];
-    		String secondLastArg = args[args.length - 2];
-
-    		if (doubleArgs.indexOf(secondLastArg) == -1) {
-    			return lastArg;
-    		} else {
+        } else if (args.length == 1) {
+            return args[args.length - 1];
+        } else {
+            String lastArg = args[args.length - 1];
+            String secondLastArg = args[args.length - 2];
+
+            if (doubleArgs.indexOf(secondLastArg) == -1) {
+                return lastArg;
+            } else {
                 System.out.println(helpMessage);
                 System.exit(0);
-    		}
-    	}
-    	return null;
+            }
+        }
+        return null;
     }
     
     /**