Rename security warning classes to security dialog classes.

Some of the security dialogs that are shown are not warning dialogs.

2011-02-28  Omair Majid  <[email protected]>

    Rename files
    * netx/net/sourceforge/jnlp/security/PasswordAuthenticationDialog.java:
    Rename to ...
    * netx/net/sourceforge/jnlp/security/PasswordAuthenticationPane.java: New
    file.
    * netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java: Rename
    to...
    * netx/net/sourceforge/jnlp/security/SecurityDialog.java: New file.
    * netx/net/sourceforge/jnlp/security/SecurityWarning.java: Rename to...
    * netx/net/sourceforge/jnlp/security/SecurityDialogs.java: New file.
    * netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java,
    * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java,
    * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java,
    * netx/net/sourceforge/jnlp/security/AccessWarningPane.java,
    * netx/net/sourceforge/jnlp/security/AppletWarningPane.java,
    * netx/net/sourceforge/jnlp/security/CertWarningPane.java,
    * netx/net/sourceforge/jnlp/security/CertsInfoPane.java,
    * netx/net/sourceforge/jnlp/security/JNLPAuthenticator.java,
    * netx/net/sourceforge/jnlp/security/MoreInfoPane.java,
    * netx/net/sourceforge/jnlp/security/NotAllSignedWarningPane.java,
    * netx/net/sourceforge/jnlp/security/SecurityDialogMessage.java,
    * netx/net/sourceforge/jnlp/security/SecurityDialogMessageHandler.java,
    * netx/net/sourceforge/jnlp/security/SecurityDialogPanel.java,
    * netx/net/sourceforge/jnlp/security/SingleCertInfoPane.java,
    * netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java,
    * netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java,
    * netx/net/sourceforge/jnlp/services/ServiceUtil.java,
    * netx/net/sourceforge/jnlp/services/XClipboardService.java,
    * netx/net/sourceforge/jnlp/services/XExtendedService.java,
    * netx/net/sourceforge/jnlp/services/XFileOpenService.java,
    * netx/net/sourceforge/jnlp/services/XFileSaveService.java: Update class
    names to the new classes.

3 files changed, 12 insertions, 12 deletions

diff --git a/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java b/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java
index 842385c..320228a 100644
--- a/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java
+++ b/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java
@@ -35,8 +35,8 @@ import net.sourceforge.jnlp.ShortcutDesc;
 import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import net.sourceforge.jnlp.event.ApplicationEvent;
 import net.sourceforge.jnlp.event.ApplicationListener;
-import net.sourceforge.jnlp.security.SecurityWarning;
-import net.sourceforge.jnlp.security.SecurityWarning.AccessType;
+import net.sourceforge.jnlp.security.SecurityDialogs;
+import net.sourceforge.jnlp.security.SecurityDialogs.AccessType;
 import net.sourceforge.jnlp.util.WeakList;
 import net.sourceforge.jnlp.util.XDesktopEntry;
 
@@ -184,12 +184,12 @@ public class ApplicationInstance {
         } else if (currentSetting.equals(ShortcutDesc.CREATE_ALWAYS)) {
             createShortcut = true;
         } else if (currentSetting.equals(ShortcutDesc.CREATE_ASK_USER)) {
-            if (SecurityWarning.showAccessWarningDialog(AccessType.CREATE_DESTKOP_SHORTCUT, file)) {
+            if (SecurityDialogs.showAccessWarningDialog(AccessType.CREATE_DESTKOP_SHORTCUT, file)) {
                 createShortcut = true;
             }
         } else if (currentSetting.equals(ShortcutDesc.CREATE_ASK_USER_IF_HINTED)) {
             if (sd != null && sd.onDesktop()) {
-                if (SecurityWarning.showAccessWarningDialog(AccessType.CREATE_DESTKOP_SHORTCUT, file)) {
+                if (SecurityDialogs.showAccessWarningDialog(AccessType.CREATE_DESTKOP_SHORTCUT, file)) {
                     createShortcut = true;
                 }
             }
diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
index da3c4c3..841e874 100644
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
@@ -58,8 +58,8 @@ import net.sourceforge.jnlp.Version;
 import net.sourceforge.jnlp.cache.CacheUtil;
 import net.sourceforge.jnlp.cache.ResourceTracker;
 import net.sourceforge.jnlp.cache.UpdatePolicy;
-import net.sourceforge.jnlp.security.SecurityWarning;
-import net.sourceforge.jnlp.security.SecurityWarning.AccessType;
+import net.sourceforge.jnlp.security.SecurityDialogs;
+import net.sourceforge.jnlp.security.SecurityDialogs.AccessType;
 import net.sourceforge.jnlp.tools.JarSigner;
 import net.sourceforge.jnlp.util.FileUtils;
 import sun.misc.JarIndex;
@@ -289,7 +289,7 @@ public class JNLPClassLoader extends URLClassLoader {
 
                 if (extLoader != null && extLoader != loader) {
                     if (loader.signing && !extLoader.signing)
-                        if (!SecurityWarning.showNotAllSignedWarningDialog(file))
+                        if (!SecurityDialogs.showNotAllSignedWarningDialog(file))
                             throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LSignedAppJarUsingUnsignedJar"), R("LSignedAppJarUsingUnsignedJarInfo"));
 
                     loader.merge(extLoader);
@@ -436,7 +436,7 @@ public class JNLPClassLoader extends URLClassLoader {
                 signing = true;
 
                 if (!js.allJarsSigned() &&
-                                    !SecurityWarning.showNotAllSignedWarningDialog(file))
+                                    !SecurityDialogs.showNotAllSignedWarningDialog(file))
                     throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LSignedAppJarUsingUnsignedJar"), R("LSignedAppJarUsingUnsignedJarInfo"));
 
                 //user does not trust this publisher
@@ -503,7 +503,7 @@ public class JNLPClassLoader extends URLClassLoader {
 
     private void checkTrustWithUser(JarSigner js) throws LaunchException {
         if (!js.getRootInCacerts()) { //root cert is not in cacerts
-            boolean b = SecurityWarning.showCertWarningDialog(
+            boolean b = SecurityDialogs.showCertWarningDialog(
                     AccessType.UNVERIFIED, file, js);
             if (!b)
                 throw new LaunchException(null, null, R("LSFatal"),
@@ -511,10 +511,10 @@ public class JNLPClassLoader extends URLClassLoader {
         } else if (js.getRootInCacerts()) { //root cert is in cacerts
             boolean b = false;
             if (js.noSigningIssues())
-                b = SecurityWarning.showCertWarningDialog(
+                b = SecurityDialogs.showCertWarningDialog(
                         AccessType.VERIFIED, file, js);
             else if (!js.noSigningIssues())
-                b = SecurityWarning.showCertWarningDialog(
+                b = SecurityDialogs.showCertWarningDialog(
                         AccessType.SIGNING_ERROR, file, js);
             if (!b)
                 throw new LaunchException(null, null, R("LSFatal"),
diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java b/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
index b5b23ca..fca019e 100644
--- a/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
@@ -30,7 +30,7 @@ import java.security.SecurityPermission;
 import javax.swing.JWindow;
 
 import net.sourceforge.jnlp.JNLPFile;
-import net.sourceforge.jnlp.security.SecurityWarning.AccessType;
+import net.sourceforge.jnlp.security.SecurityDialogs.AccessType;
 import net.sourceforge.jnlp.services.ServiceUtil;
 import net.sourceforge.jnlp.util.WeakList;
 import sun.awt.AWTSecurityManager;