/hg/icedtea: JNLP files are now launched when system is offline ...

[mwong at icedtea.classpath.org]

changeset c431444e42b9 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c431444e42b9
author: Man Lung Wong <mwong at redhat.com>
date: Mon Dec 14 16:00:31 2009 -0500

	JNLP files are now launched when system is offline only if offline-
	allowed tag is present. Also corrected my previous Changelog entry
	on Dec 03, 09.


diffstat:

2 files changed, 28 insertions(+), 9 deletions(-)
ChangeLog                               |   14 ++++++++++----
netx/net/sourceforge/jnlp/Launcher.java |   23 ++++++++++++++++++-----

diffs (79 lines):

diff -r 3a383ae55a7e -r c431444e42b9 ChangeLog
--- a/ChangeLog	Mon Dec 14 20:35:12 2009 +0000
+++ b/ChangeLog	Mon Dec 14 16:00:31 2009 -0500
@@ -1,3 +1,9 @@ 2009-12-14  Andrew John Hughes  <ahughes
+2009-12-14  Man Lung Wong  <mwong at redhat.com>
+
+	* netx/net/sourceforge/jnlp/Launcher.java
+	(launch): File is not launched if offline-allowed tag not present and 
+	system offline.
+
 2009-12-14  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/boot/icedtea.patch:
@@ -56,18 +62,18 @@ 2009-12-07  Andrew John Hughes  <ahughes
 	
 2009-12-03  Man Lung Wong <mwong at redhat.com>
 
-	* rt/net/sourceforge/jnlp/JNLPFile.java
+	* netx/net/sourceforge/jnlp/JNLPFile.java
 	(JNLPFile): Download the jnlp file from the webspace it originated, if
 	it exists.
-	* rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java
+	* netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java
 	(initialize): Enable desktop element and revise the list of fixme.
 	(addMenuAndDesktopEntries): No longer errors out when shortcut tag not
 	specified.
-	* rt/net/sourceforge/jnlp/runtime/Boot.java
+	* netx/net/sourceforge/jnlp/runtime/Boot.java
 	(getFile): Launches the original jnlp file (i.e. if the file was
 	downloaded from http://icedtea.classpath.org, then it will launch the
 	one from http://icedtea.classpath.org).
-	* rt/net/sourceforge/jnlp/util/XDesktopEntry.java
+	* netx/net/sourceforge/jnlp/util/XDesktopEntry.java
 	(getContentsAsReader): Shortcut uses jnlp file in cache and launches
 	with system preferred javaws.
 
diff -r 3a383ae55a7e -r c431444e42b9 netx/net/sourceforge/jnlp/Launcher.java
--- a/netx/net/sourceforge/jnlp/Launcher.java	Mon Dec 14 20:35:12 2009 +0000
+++ b/netx/net/sourceforge/jnlp/Launcher.java	Mon Dec 14 16:00:31 2009 -0500
@@ -19,14 +19,11 @@ package net.sourceforge.jnlp;
 
 import java.applet.Applet;
 import java.awt.Container;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadMXBean;
 import java.lang.reflect.Method;
-import java.net.URL;
+import java.net.*;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.jar.JarFile;
@@ -187,6 +184,22 @@ public class Launcher {
      */
     public ApplicationInstance launch(JNLPFile file, Container cont) throws LaunchException {
         TgThread tg;
+        
+        //First checks whether offline-allowed tag is specified inside the jnlp
+        //file.
+        if (!file.getInformation().isOfflineAllowed()) {
+            try {
+                //Checks the offline/online status of the system.
+                //If system is offline do not launch.
+                InetAddress.getByName(file.getSourceLocation().getHost());
+
+            } catch (UnknownHostException ue) {
+			    System.err.println("File cannot be launched because offline-allowed tag not specified and system currently offline.");
+                return null;
+            } catch (Exception e) {
+                System.err.println(e);
+            }
+        }
 
         if (file instanceof PluginBridge && cont != null)
         	tg = new TgThread(file, cont, true);