/hg/icedtea-web: Extract JNLPClassLoader initialization logic in...

[adomurad at icedtea.classpath.org]

changeset be2248aa2eee in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=be2248aa2eee
author: Adam Domurad <adomurad at redhat.com>
date: Mon Feb 25 13:06:12 2013 -0500

	Extract JNLPClassLoader initialization logic into createInstance() method


diffstat:

 ChangeLog                                              |   7 ++
 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |  59 +++++++++++------
 2 files changed, 45 insertions(+), 21 deletions(-)

diffs (90 lines):

diff -r 568458b32abe -r be2248aa2eee ChangeLog
--- a/ChangeLog	Mon Feb 25 10:52:51 2013 +0100
+++ b/ChangeLog	Mon Feb 25 13:06:12 2013 -0500
@@ -1,3 +1,10 @@
+2013-02-25  Adam Domurad  <adomurad at redhat.com>
+
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+	(createInstance): Extract initialization logic from 'getInstance' into 
+	new 'createInstace' method.
+	(getInstance): Call newly introduced createInstance method.
+
 2013-02-25  Jiri Vanek  <jvanek at redhat.com>
 
 	Removed unused legacy-launcher sources
diff -r 568458b32abe -r be2248aa2eee netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Mon Feb 25 10:52:51 2013 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Mon Feb 25 13:06:12 2013 -0500
@@ -365,6 +365,43 @@
     }
 
     /**
+     * Creates a fully initialized JNLP classloader for the specified JNLPFile, 
+     * to be used as an applet/application's classloader.
+     * In contrast, JNLP classloaders can also be constructed simply to merge 
+     * its resources into another classloader.
+     *
+     * @param file the file to load classes for
+     * @param policy the update policy to use when downloading resources
+     * @param mainName Overrides the main class name of the application
+     */
+    private static JNLPClassLoader createInstance(JNLPFile file, UpdatePolicy policy, String mainName) throws LaunchException {
+        String uniqueKey = file.getUniqueKey();
+        JNLPClassLoader baseLoader = uniqueKeyToLoader.get(uniqueKey);
+        JNLPClassLoader loader = new JNLPClassLoader(file, policy, mainName);
+
+        // New loader init may have caused extentions to create a
+        // loader for this unique key. Check.
+        JNLPClassLoader extLoader = uniqueKeyToLoader.get(uniqueKey);
+
+        if (extLoader != null && extLoader != loader) {
+            if (loader.signing && !extLoader.signing)
+                if (!SecurityDialogs.showNotAllSignedWarningDialog(file))
+                    throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LSignedAppJarUsingUnsignedJar"), R("LSignedAppJarUsingUnsignedJarInfo"));
+
+            loader.merge(extLoader);
+            extLoader.decrementLoaderUseCount(); // loader urls have been merged, ext loader is no longer used
+        }
+
+        // loader is now current + ext. But we also need to think of
+        // the baseLoader
+        if (baseLoader != null && baseLoader != loader) {
+           loader.merge(baseLoader);
+        }
+
+        return loader;
+    }
+
+    /**
      * Returns a JNLP classloader for the specified JNLP file.
      *
      * @param file the file to load classes for
@@ -395,27 +432,7 @@
                     (file.isApplication() && 
                      !baseLoader.getJNLPFile().getFileLocation().equals(file.getFileLocation()))) {
 
-                loader = new JNLPClassLoader(file, policy, mainName);
-
-                // New loader init may have caused extentions to create a
-                // loader for this unique key. Check.
-                JNLPClassLoader extLoader = uniqueKeyToLoader.get(uniqueKey);
-
-                if (extLoader != null && extLoader != loader) {
-                    if (loader.signing && !extLoader.signing)
-                        if (!SecurityDialogs.showNotAllSignedWarningDialog(file))
-                            throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LSignedAppJarUsingUnsignedJar"), R("LSignedAppJarUsingUnsignedJarInfo"));
-
-                    loader.merge(extLoader);
-                    extLoader.decrementLoaderUseCount(); // loader urls have been merged, ext loader is no longer used
-                }
-
-                // loader is now current + ext. But we also need to think of
-                // the baseLoader
-                if (baseLoader != null && baseLoader != loader) {
-                   loader.merge(baseLoader);
-                }
-
+                loader = createInstance(file, policy, mainName);
             } else {
                 // if key is same and locations match, this is the loader we want
                 if (!file.isApplication()) {