/hg/icedtea-web: remove check for jnlp spec number

omajid at icedtea.classpath.org omajid at icedtea.classpath.org
Wed Dec 8 09:12:28 PST 2010


changeset 78afe7c627ae in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=78afe7c627ae
author: Omair Majid <omajid at redhat.com>
date: Wed Dec 08 12:09:00 2010 -0500

	remove check for jnlp spec number

	2010-12-08 Omair Majid <omajid at redhat.com>

	 * netx/net/sourceforge/jnlp/JNLPFile.java
	(getSupportedVersions): Remove method.
	    * netx/net/sourceforge/jnlp/Parser.java: Remove supportedVersions.
	(Parser(JNLPFile,URL,Node,boolean,boolean)): Remove check for
	supported version. (getSupportedVersions): Remove method.
	    * netx/net/sourceforge/jnlp/resources/Messages.properties: Remove
	PSpecUnsupported.


diffstat:

4 files changed, 11 insertions(+), 22 deletions(-)
ChangeLog                                               |   11 +++++++++++
netx/net/sourceforge/jnlp/JNLPFile.java                 |    7 -------
netx/net/sourceforge/jnlp/Parser.java                   |   14 --------------
netx/net/sourceforge/jnlp/resources/Messages.properties |    1 -

diffs (79 lines):

diff -r 80f49d5a17b9 -r 78afe7c627ae ChangeLog
--- a/ChangeLog	Wed Dec 08 11:54:38 2010 -0500
+++ b/ChangeLog	Wed Dec 08 12:09:00 2010 -0500
@@ -1,3 +1,14 @@ 2010-12-08  Omair Majid  <omajid at redhat.
+2010-12-08  Omair Majid  <omajid at redhat.com>
+
+	* netx/net/sourceforge/jnlp/JNLPFile.java
+	(getSupportedVersions): Remove method.
+	* netx/net/sourceforge/jnlp/Parser.java: Remove supportedVersions.
+	(Parser(JNLPFile,URL,Node,boolean,boolean)): Remove check for supported
+	version.
+	(getSupportedVersions): Remove method.
+	* netx/net/sourceforge/jnlp/resources/Messages.properties:
+	Remove PSpecUnsupported.
+
 2010-12-08  Omair Majid  <omajid at redhat.com>
 
 	* netx/net/sourceforge/jnlp/tools/JarRunner.java: Remove unused class.
diff -r 80f49d5a17b9 -r 78afe7c627ae netx/net/sourceforge/jnlp/JNLPFile.java
--- a/netx/net/sourceforge/jnlp/JNLPFile.java	Wed Dec 08 11:54:38 2010 -0500
+++ b/netx/net/sourceforge/jnlp/JNLPFile.java	Wed Dec 08 12:09:00 2010 -0500
@@ -254,13 +254,6 @@ public class JNLPFile {
         } catch (Exception ex) {
             throw new IOException(ex.getMessage());
         }
-    }
-
-    /**
-     * Returns the JNLP specification versions supported.
-     */
-    public static Version getSupportedVersions() {
-        return Parser.getSupportedVersions();
     }
 
     /**
diff -r 80f49d5a17b9 -r 78afe7c627ae netx/net/sourceforge/jnlp/Parser.java
--- a/netx/net/sourceforge/jnlp/Parser.java	Wed Dec 08 11:54:38 2010 -0500
+++ b/netx/net/sourceforge/jnlp/Parser.java	Wed Dec 08 12:09:00 2010 -0500
@@ -65,9 +65,6 @@ class Parser {
     };
     */
 
-    /** the supported JNLP file versions */
-    private static Version supportedVersions = new Version("1.0 1.1 1.2 1.3 1.4 1.5 1.6 6.0");
-
     // fix: some descriptors need to use the jnlp file at a later
     // date and having file ref lets us pass it to their
     // constructors
@@ -128,19 +125,8 @@ class Parser {
         this.base = (codebase != null) ? codebase : base; // if codebase not specified use default codebase
         fileLocation = getURL(root, "href", this.base);
 
-        // ensure version is supported
-        if (!supportedVersions.matchesAny(spec))
-            throw new ParseException(R("PSpecUnsupported", supportedVersions));
-
         // normalize the text nodes
         root.normalize();
-    }
-
-    /**
-     * Return the JNLP specification versions supported.
-     */
-    public static Version getSupportedVersions() {
-        return supportedVersions;
     }
 
     /**
diff -r 80f49d5a17b9 -r 78afe7c627ae netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties	Wed Dec 08 11:54:38 2010 -0500
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties	Wed Dec 08 12:09:00 2010 -0500
@@ -87,7 +87,6 @@ LAskToContinue=Would you still like to c
 
 # Parser
 PInvalidRoot=Root node is not a jnlp node
-PSpecUnsupported=Spec version not supported (supports {0})
 PNoResources=No resources section defined
 PUntrustedNative=nativelib element cannot be specified unless a trusted environment is requested.
 PExtensionHasJ2SE=j2se element cannot be specified in a component extension file.



More information about the distro-pkg-dev mailing list