add support for validating configuration

2010-12-13  Omair Majid  <[email protected]>

    * 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.

4 files changed, 4 insertions, 3 deletions

diff --git a/netx/net/sourceforge/jnlp/services/ServiceUtil.java b/netx/net/sourceforge/jnlp/services/ServiceUtil.java
index 96d040a..b55bba4 100644
--- a/netx/net/sourceforge/jnlp/services/ServiceUtil.java
+++ b/netx/net/sourceforge/jnlp/services/ServiceUtil.java
@@ -37,8 +37,8 @@ import javax.jnlp.SingleInstanceService;
 import javax.jnlp.UnavailableServiceException;
 
 import net.sourceforge.jnlp.JNLPFile;
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import net.sourceforge.jnlp.runtime.ApplicationInstance;
-import net.sourceforge.jnlp.runtime.DeploymentConfiguration;
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
 import net.sourceforge.jnlp.security.SecurityWarning;
 import net.sourceforge.jnlp.security.SecurityWarning.AccessType;
diff --git a/netx/net/sourceforge/jnlp/services/SingleInstanceLock.java b/netx/net/sourceforge/jnlp/services/SingleInstanceLock.java
index d9430a3..3684232 100644
--- a/netx/net/sourceforge/jnlp/services/SingleInstanceLock.java
+++ b/netx/net/sourceforge/jnlp/services/SingleInstanceLock.java
@@ -28,7 +28,7 @@ import java.net.BindException;
 import java.net.ServerSocket;
 
 import net.sourceforge.jnlp.JNLPFile;
-import net.sourceforge.jnlp.runtime.DeploymentConfiguration;
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
 import net.sourceforge.jnlp.util.FileUtils;
 
diff --git a/netx/net/sourceforge/jnlp/services/XBasicService.java b/netx/net/sourceforge/jnlp/services/XBasicService.java
index 124025c..7def5e6 100644
--- a/netx/net/sourceforge/jnlp/services/XBasicService.java
+++ b/netx/net/sourceforge/jnlp/services/XBasicService.java
@@ -28,8 +28,8 @@ import net.sourceforge.jnlp.InformationDesc;
 import net.sourceforge.jnlp.JARDesc;
 import net.sourceforge.jnlp.JNLPFile;
 import net.sourceforge.jnlp.Launcher;
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import net.sourceforge.jnlp.runtime.ApplicationInstance;
-import net.sourceforge.jnlp.runtime.DeploymentConfiguration;
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
 import net.sourceforge.jnlp.util.PropertiesFile;
 
diff --git a/netx/net/sourceforge/jnlp/services/XPersistenceService.java b/netx/net/sourceforge/jnlp/services/XPersistenceService.java
index 5388438..4f296e3 100644
--- a/netx/net/sourceforge/jnlp/services/XPersistenceService.java
+++ b/netx/net/sourceforge/jnlp/services/XPersistenceService.java
@@ -24,6 +24,7 @@ import javax.jnlp.*;
 
 import net.sourceforge.jnlp.*;
 import net.sourceforge.jnlp.cache.*;
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import net.sourceforge.jnlp.runtime.*;
 import net.sourceforge.jnlp.util.FileUtils;