PR1533: Inherit jnlp.packEnabled and jnlp.versionEnabled like other properties

Treat jnlp.packEnabled and jnlp.versionEnabled just like other
properties that can be set in one resource element and
inherited/filtered in others.

2013-09-09  Omair Majid  <[email protected]>

    * netx/net/sourceforge/jnlp/JNLPFile.java
    (getDownloadOptionsForJar): Rename to ...
    (getDownloadOptions): New method. Look up jnlp.packEnabled and
    jnlp.versionEnabled in any resources element.
    * netx/net/sourceforge/jnlp/PluginBridge.java
    (getDownloadOptionsForJar): Rename to ...
    (getDownloadOptions): New method.
    * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
    (initializeResources): Invoke file.getDownloadResources.
    (getDownloadOptionsForJar): Remove.
    * tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java
    (testDownloadOptionsAppliedEverywhere): New method.
    (testDownloadOptionsFilteredOut): New method.

1 files changed, 1 insertions, 5 deletions

diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
index a74f541..4efa435 100644
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
@@ -626,7 +626,7 @@ public class JNLPClassLoader extends URLClassLoader {
 
             tracker.addResource(jars[i].getLocation(),
                                 jars[i].getVersion(),
-                                getDownloadOptionsForJar(jars[i]),
+                                file.getDownloadOptions(),
                                 jars[i].isCacheable() ? JNLPRuntime.getDefaultUpdatePolicy() : UpdatePolicy.FORCE
                                );
         }
@@ -1966,10 +1966,6 @@ public class JNLPClassLoader extends URLClassLoader {
         }
     }
 
-    private DownloadOptions getDownloadOptionsForJar(JARDesc jar) {
-        return file.getDownloadOptionsForJar(jar);
-    }
-
     /**
      * Returns a set of paths that indicate the Class-Path entries in the
      * manifest file. The paths are rooted in the same directory as the