From 41bd2f399b754a0cba5dd64ce5f32191cfe9ea38 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Mon, 13 Dec 2010 17:28:01 -0500
Subject: add support for validating configuration

2010-12-13  Omair Majid  <omajid@redhat.com>

    * netx/net/sourceforge/jnlp/config/ValueValidator.java: New file.
    * netx/net/sourceforge/jnlp/config/BasicValueValidators.java: New
    file. Provides methods to get some common validators.
    * netx/net/sourceforge/jnlp/config/ConfiguratonValidator.java: New
    file. Provides methods to validate a configuration.
    * netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java:
    Moved to config subpackage instead and split off into Setting.java,
    DeploymentConfiguration.java and Defaults.java.
    * netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java:
    Renamed version of original DeploymentConfiguration.
    (load): Delegate to load.
    (load(boolean)): Load configuration and optionally fix any issues
    found.
    (checkAndFixConfiguration): New method. Validate all settings and
    set them to default values if problems found.
    * netx/net/sourceforge/jnlp/config/Setting.java: New file. Based on
    ConfigValue which was originally a part of DeploymentConfiguration.
    * netx/net/sourceforge/jnlp/config/Defaults.java: New file.
    Contains the default configuration settings. Originally from
    DeploymentConfiguration.java's loadDefaultProperties.
    * netx/net/sourceforge/jnlp/resources/Messages.properties: Add new
    messages.
    * netx/net/sourceforge/jnlp/Launcher.java: Fix imports.
    * netx/net/sourceforge/jnlp/SecurityDesc.java: Likewise.
    * netx/net/sourceforge/jnlp/cache/CacheUtil.java: Likewise.
    * netx/net/sourceforge/jnlp/controlpanel
    /AdvancedProxySettingsDialog.java: Likewise
    * netx/net/sourceforge/jnlp/controlpanel
    /AdvancedProxySettingsPane.java: Likewise.
    * netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java: Likewise
    * netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java:
    Likewise.
    * netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java:
    Likewise.
    * netx/net/sourceforge/jnlp/controlpanel/MiddleClickListener.java:
    Likewise
    * netx/net/sourceforge/jnlp/controlpanel/NetworkSettingsPanel.java:
    Likewise.
    * netx/net/sourceforge/jnlp/controlpanel/SecuritySettingsPanel.java:
    Likewise.
    * netx/net/sourceforge/jnlp/controlpanel
    /TemporaryInternetFilesPanel.java:Likewise.
    * netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java:
    Likewise.
    * netx/net/sourceforge/jnlp/runtime/JNLPProxySelector.java:
    Likewise.
    * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: Likewise.
    * netx/net/sourceforge/jnlp/security/KeyStores.java: Likewise.
    * netx/net/sourceforge/jnlp/security/SecurityWarning.java: Likewise.
    * netx/net/sourceforge/jnlp/services/ServiceUtil.java: Likewise.
    * netx/net/sourceforge/jnlp/services/SingleInstanceLock.java:
    Likewise.
    * netx/net/sourceforge/jnlp/services/XBasicService.java: Likewise
    * netx/net/sourceforge/jnlp/services/XPersistenceService.java:
    Likewise.
    * netx/net/sourceforge/jnlp/util/XDesktopEntry.java: Likewise.
    * plugin/icedteanp/java/sun/applet/JavaConsole.java: Likewise.
    * plugin/icedteanp/java/sun/applet/PluginMain.java: Likewise.
---
 plugin/icedteanp/java/sun/applet/JavaConsole.java | 2 +-
 plugin/icedteanp/java/sun/applet/PluginMain.java  | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'plugin/icedteanp/java/sun')

diff --git a/plugin/icedteanp/java/sun/applet/JavaConsole.java b/plugin/icedteanp/java/sun/applet/JavaConsole.java
index ae33343..55c98e3 100644
--- a/plugin/icedteanp/java/sun/applet/JavaConsole.java
+++ b/plugin/icedteanp/java/sun/applet/JavaConsole.java
@@ -63,7 +63,7 @@ import javax.swing.UIManager;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
-import net.sourceforge.jnlp.runtime.DeploymentConfiguration;
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
 
 /**
diff --git a/plugin/icedteanp/java/sun/applet/PluginMain.java b/plugin/icedteanp/java/sun/applet/PluginMain.java
index 283a452..80fbae4 100644
--- a/plugin/icedteanp/java/sun/applet/PluginMain.java
+++ b/plugin/icedteanp/java/sun/applet/PluginMain.java
@@ -66,16 +66,14 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.PrintStream;
 import java.net.Authenticator;
 import java.net.CookieHandler;
 import java.net.CookieManager;
-import java.net.PasswordAuthentication;
 import java.net.ProxySelector;
 import java.util.Enumeration;
 import java.util.Properties;
 
-import net.sourceforge.jnlp.runtime.DeploymentConfiguration;
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
 import net.sourceforge.jnlp.security.JNLPAuthenticator;
 
-- 
cgit v1.2.3