/hg/icedtea-web: 2 new changesets

[omajid at icedtea.classpath.org]

changeset 6915efabb42c in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6915efabb42c
author: Omair Majid <omajid at redhat.com>
date: Fri Feb 11 20:04:24 2011 -0500

	Consistently name methods relating to ResourcesDesc

	2011-02-11 Omair Majid <omajid at redhat.com>

	 * netx/net/sourceforge/jnlp/JNLPFile.java
	(getResourceDescs): Renamed to... (getResourcesDescs): New
	method. (getResourceDescs): Renamed to...
	(getResourcesDescs): New method.
	    * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
	(getDownloadOptionsForJar): Call renamed method.


changeset c6f717dfcb97 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c6f717dfcb97
author: Omair Majid <omajid at redhat.com>
date: Fri Feb 11 20:13:11 2011 -0500

	Fix NullPointerException in plugin caused by a non-overridden method

	2011-02-11 Omair Majid <omajid at redhat.com>

	 * netx/net/sourceforge/jnlp/PluginBridge.java
	(getResourcesDescs): New method implemented to override behaviour in
	JNLPFile class.


diffstat:

4 files changed, 28 insertions(+), 4 deletions(-)
ChangeLog                                              |   16 ++++++++++++++++
netx/net/sourceforge/jnlp/JNLPFile.java                |    6 +++---
netx/net/sourceforge/jnlp/PluginBridge.java            |    8 ++++++++
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |    2 +-

diffs (75 lines):

diff -r 0768433ea58d -r c6f717dfcb97 ChangeLog
--- a/ChangeLog	Thu Feb 10 17:25:18 2011 -0500
+++ b/ChangeLog	Fri Feb 11 20:13:11 2011 -0500
@@ -1,3 +1,19 @@ 2011-02-10  Omair Majid  <omajid at redhat.
+2011-02-11  Omair Majid  <omajid at redhat.com>
+
+	* netx/net/sourceforge/jnlp/PluginBridge.java
+	(getResourcesDescs): New method implemented to override behaviour in
+	JNLPFile class.
+
+2011-02-11  Omair Majid  <omajid at redhat.com>
+
+	* netx/net/sourceforge/jnlp/JNLPFile.java
+	(getResourceDescs): Renamed to...
+	(getResourcesDescs): New method.
+	(getResourceDescs): Renamed to...
+	(getResourcesDescs): New method.
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+	(getDownloadOptionsForJar): Call renamed method.
+
 2011-02-10  Omair Majid  <omajid at redhat.com>
 
 	Fix RH669942; Add support for packEnabled and versionEnabled.
diff -r 0768433ea58d -r c6f717dfcb97 netx/net/sourceforge/jnlp/JNLPFile.java
--- a/netx/net/sourceforge/jnlp/JNLPFile.java	Thu Feb 10 17:25:18 2011 -0500
+++ b/netx/net/sourceforge/jnlp/JNLPFile.java	Fri Feb 11 20:13:11 2011 -0500
@@ -396,15 +396,15 @@ public class JNLPFile {
      * through the default locale and the os.name and os.arch
      * properties.
      */
-    public ResourcesDesc[] getResourceDescs() {
-        return getResourceDescs(defaultLocale, defaultOS, defaultArch);
+    public ResourcesDesc[] getResourcesDescs() {
+        return getResourcesDescs(defaultLocale, defaultOS, defaultArch);
     }
 
     /**
      * Returns the resources section of the JNLP file for the
      * specified locale, os, and arch.
      */
-    public ResourcesDesc[] getResourceDescs(final Locale locale, final String os, final String arch) {
+    public ResourcesDesc[] getResourcesDescs(final Locale locale, final String os, final String arch) {
         List<ResourcesDesc> matchingResources = new ArrayList<ResourcesDesc>();
         for (ResourcesDesc rescDesc: resources) {
             if (localMatches(locale, rescDesc.getLocales())
diff -r 0768433ea58d -r c6f717dfcb97 netx/net/sourceforge/jnlp/PluginBridge.java
--- a/netx/net/sourceforge/jnlp/PluginBridge.java	Thu Feb 10 17:25:18 2011 -0500
+++ b/netx/net/sourceforge/jnlp/PluginBridge.java	Fri Feb 11 20:13:11 2011 -0500
@@ -244,6 +244,14 @@ public class PluginBridge extends JNLPFi
         };
     }
 
+    /**
+     * Returns the resources section of the JNLP file for the
+     * specified locale, os, and arch.
+     */
+    public ResourcesDesc[] getResourcesDescs(final Locale locale, final String os, final String arch) {
+        return new ResourcesDesc[] { getResources(locale, os, arch) };
+    }
+
     public boolean isApplet() {
         return true;
     }
diff -r 0768433ea58d -r c6f717dfcb97 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Thu Feb 10 17:25:18 2011 -0500
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Fri Feb 11 20:13:11 2011 -0500
@@ -1255,7 +1255,7 @@ public class JNLPClassLoader extends URL
         boolean usePack = false;
         boolean useVersion = false;
 
-        ResourcesDesc[] descs = file.getResourceDescs();
+        ResourcesDesc[] descs = file.getResourcesDescs();
         for (ResourcesDesc desc: descs) {
             JARDesc[] jars = desc.getJARs();
             for (JARDesc aJar: jars) {