fix problems in control panel caused by removing JNLPRuntime.initialize()

2011-01-12  Omair Majid  <[email protected]>

    * netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java
    (main): Set look and feel. Set config object to use with KeyStores.
    * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
    (initialize): Set config object to use with KeyStores.
    * netx/net/sourceforge/jnlp/security/KeyStores.java: Add new member
    config.
    (setConfiguration): New method. Sets the value of config after security
    check.
    (getKeyStoreLocation): Use config object instead of querying JNLPRuntime.

1 files changed, 3 insertions, 0 deletions

diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
index 393b3cb..61417a4 100644
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
@@ -37,6 +37,7 @@ import net.sourceforge.jnlp.*;
 import net.sourceforge.jnlp.cache.*;
 import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import net.sourceforge.jnlp.security.JNLPAuthenticator;
+import net.sourceforge.jnlp.security.KeyStores;
 import net.sourceforge.jnlp.security.SecurityDialogMessageHandler;
 import net.sourceforge.jnlp.security.VariableX509TrustManager;
 import net.sourceforge.jnlp.services.*;
@@ -160,6 +161,8 @@ public class JNLPRuntime {
             }
         }
 
+        KeyStores.setConfiguration(config);
+
         initializeStreams();
 
         isWebstartApplication = isApplication;