/hg/icedtea-web: add support for validating configuration
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Mon Dec 13 14:28:24 PST 2010
changeset adef5d4159ee in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=adef5d4159ee
author: Omair Majid <omajid at redhat.com>
date: Mon Dec 13 17:28:01 2010 -0500
add support for validating configuration
2010-12-13 Omair Majid <omajid at 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.
diffstat:
33 files changed, 1733 insertions(+), 712 deletions(-)
ChangeLog | 61
netx/net/sourceforge/jnlp/Launcher.java | 2
netx/net/sourceforge/jnlp/SecurityDesc.java | 2
netx/net/sourceforge/jnlp/cache/CacheUtil.java | 1
netx/net/sourceforge/jnlp/config/BasicValueValidators.java | 268 +++
netx/net/sourceforge/jnlp/config/ConfiguratonValidator.java | 120 +
netx/net/sourceforge/jnlp/config/Defaults.java | 394 +++++
netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java | 611 ++++++++
netx/net/sourceforge/jnlp/config/Setting.java | 176 ++
netx/net/sourceforge/jnlp/config/ValueValidator.java | 66
netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java | 2
netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsPane.java | 2
netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java | 2
netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java | 2
netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java | 2
netx/net/sourceforge/jnlp/controlpanel/MiddleClickListener.java | 2
netx/net/sourceforge/jnlp/controlpanel/NetworkSettingsPanel.java | 2
netx/net/sourceforge/jnlp/controlpanel/SecuritySettingsPanel.java | 2
netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java | 2
netx/net/sourceforge/jnlp/resources/Messages.properties | 11
netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 1
netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java | 690 ----------
netx/net/sourceforge/jnlp/runtime/JNLPProxySelector.java | 2
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 3
netx/net/sourceforge/jnlp/security/KeyStores.java | 2
netx/net/sourceforge/jnlp/security/SecurityWarning.java | 2
netx/net/sourceforge/jnlp/services/ServiceUtil.java | 2
netx/net/sourceforge/jnlp/services/SingleInstanceLock.java | 2
netx/net/sourceforge/jnlp/services/XBasicService.java | 2
netx/net/sourceforge/jnlp/services/XPersistenceService.java | 1
netx/net/sourceforge/jnlp/util/XDesktopEntry.java | 2
plugin/icedteanp/java/sun/applet/JavaConsole.java | 2
plugin/icedteanp/java/sun/applet/PluginMain.java | 4
diffs (truncated from 2749 to 500 lines):
diff -r 0f2fddf76a78 -r adef5d4159ee ChangeLog
--- a/ChangeLog Mon Dec 13 16:12:06 2010 -0500
+++ b/ChangeLog Mon Dec 13 17:28:01 2010 -0500
@@ -1,3 +1,64 @@ 2010-12-13 Omair Majid <omajid at redhat.
+2010-12-13 Omair Majid <omajid at 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.
+
2010-12-13 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/Parser.java
diff -r 0f2fddf76a78 -r adef5d4159ee netx/net/sourceforge/jnlp/Launcher.java
--- a/netx/net/sourceforge/jnlp/Launcher.java Mon Dec 13 16:12:06 2010 -0500
+++ b/netx/net/sourceforge/jnlp/Launcher.java Mon Dec 13 17:28:01 2010 -0500
@@ -39,10 +39,10 @@ import net.sourceforge.jnlp.cache.CacheU
import net.sourceforge.jnlp.cache.CacheUtil;
import net.sourceforge.jnlp.cache.ResourceTracker;
import net.sourceforge.jnlp.cache.UpdatePolicy;
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
import net.sourceforge.jnlp.runtime.AppThreadGroup;
import net.sourceforge.jnlp.runtime.AppletInstance;
import net.sourceforge.jnlp.runtime.ApplicationInstance;
-import net.sourceforge.jnlp.runtime.DeploymentConfiguration;
import net.sourceforge.jnlp.runtime.JNLPClassLoader;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
import net.sourceforge.jnlp.services.InstanceExistsException;
diff -r 0f2fddf76a78 -r adef5d4159ee netx/net/sourceforge/jnlp/SecurityDesc.java
--- a/netx/net/sourceforge/jnlp/SecurityDesc.java Mon Dec 13 16:12:06 2010 -0500
+++ b/netx/net/sourceforge/jnlp/SecurityDesc.java Mon Dec 13 17:28:01 2010 -0500
@@ -22,7 +22,7 @@ import java.security.*;
import java.security.*;
import java.awt.AWTPermission;
-import net.sourceforge.jnlp.runtime.DeploymentConfiguration;
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
/**
diff -r 0f2fddf76a78 -r adef5d4159ee netx/net/sourceforge/jnlp/cache/CacheUtil.java
--- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java Mon Dec 13 16:12:06 2010 -0500
+++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java Mon Dec 13 17:28:01 2010 -0500
@@ -27,6 +27,7 @@ import javax.jnlp.*;
import javax.jnlp.*;
import net.sourceforge.jnlp.*;
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
import net.sourceforge.jnlp.runtime.*;
import net.sourceforge.jnlp.util.FileUtils;
diff -r 0f2fddf76a78 -r adef5d4159ee netx/net/sourceforge/jnlp/config/BasicValueValidators.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/config/BasicValueValidators.java Mon Dec 13 17:28:01 2010 -0500
@@ -0,0 +1,268 @@
+/* BasicValueCheckers.java
+ Copyright (C) 2010 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package net.sourceforge.jnlp.config;
+
+import static net.sourceforge.jnlp.runtime.Translator.R;
+
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Locale;
+
+/**
+ * Provides {@link ValueValidator} implementations for some common value types
+ *
+ * @see #getBooleanValidator()
+ * @see #getFilePathValidator()
+ * @see #getRangedIntegerValidator(int, int)
+ * @see #getStringValidator(String[])
+ * @see #getUrlValidator()
+ */
+public class BasicValueValidators {
+
+ /**
+ * Checks if a value is a valid boolean
+ */
+ private static class BooleanValidator implements ValueValidator {
+
+ @Override
+ public void validate(Object value) throws IllegalArgumentException {
+ Object possibleValue = value;
+
+ if (possibleValue instanceof String) {
+ String lower = ((String) possibleValue).toLowerCase(Locale.ENGLISH);
+ if (lower.equals(Boolean.TRUE.toString())
+ || (lower.equals(Boolean.FALSE.toString()))) {
+ possibleValue = Boolean.valueOf(lower);
+ }
+ }
+
+ if (!(possibleValue instanceof Boolean)) {
+ throw new IllegalArgumentException();
+ }
+ }
+
+ @Override
+ public String getPossibleValues() {
+ return R("VVPossibleBooleanValues", Boolean.TRUE.toString(), Boolean.FALSE.toString());
+ }
+ };
+
+ /**
+ * Checks if a value is a valid file path (not a valid file!). The actual
+ * file may or may not exist
+ */
+ private static class FilePathValidator implements ValueValidator {
+
+ @Override
+ public void validate(Object value) throws IllegalArgumentException {
+ if (value == null) {
+ return;
+ }
+
+ Object possibleValue = value;
+
+ if (!(possibleValue instanceof String)) {
+ throw new IllegalArgumentException();
+ }
+
+ String possibleFile = (String) possibleValue;
+ if (!(possibleFile.startsWith("/"))) {
+ throw new IllegalArgumentException();
+ }
+
+ }
+
+ @Override
+ public String getPossibleValues() {
+ return R("VVPossibleFileValues");
+ }
+
+ }
+
+ /**
+ * Checks that the value is an Integer or Long (or a String representation
+ * of one) that is within a desired range).
+ */
+ private static class RangedIntegerValidator implements ValueValidator {
+ private int low = 0;
+ private int high = 0;
+
+ public RangedIntegerValidator(int low, int high) {
+ this.low = low;
+ this.high = high;
+ }
+
+ @Override
+ public void validate(Object value) throws IllegalArgumentException {
+ Object possibleValue = value;
+
+ long actualValue = 0;
+ try {
+ if (possibleValue instanceof String) {
+ actualValue = Long.valueOf((String) possibleValue);
+ } else if (possibleValue instanceof Integer) {
+ actualValue = (Integer) possibleValue;
+ } else if (possibleValue instanceof Long) {
+ actualValue = (Long) possibleValue;
+ } else {
+ throw new IllegalArgumentException("Must be an integer");
+ }
+ } catch (NumberFormatException e) {
+ throw new IllegalArgumentException("Must be an integer");
+
+ }
+
+ if (actualValue < low || actualValue > high) {
+ throw new IllegalArgumentException("Not in range from " + low + " to " + high);
+ }
+ }
+
+ @Override
+ public String getPossibleValues() {
+ return R("VVPossibleRangedIntegerValues", low, high);
+ }
+
+ };
+
+ /**
+ * Checks that the value is one of the acceptable String values
+ */
+ private static class StringValueValidator implements ValueValidator {
+ String[] options = null;
+
+ public StringValueValidator(String[] acceptableOptions) {
+ options = acceptableOptions;
+ }
+
+ @Override
+ public void validate(Object value) throws IllegalArgumentException {
+ Object possibleValue = value;
+ if (!(possibleValue instanceof String)) {
+ throw new IllegalArgumentException("Must be a string");
+ }
+
+ String stringVal = (String) possibleValue;
+ boolean found = false;
+ for (String knownVal : options) {
+ if (knownVal.equals(stringVal)) {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found) {
+ throw new IllegalArgumentException();
+ }
+ }
+
+ @Override
+ public String getPossibleValues() {
+ return Arrays.toString(options);
+ }
+
+ }
+
+ /**
+ * Checks that the value is a URL
+ */
+ private static class UrlValidator implements ValueValidator {
+
+ @Override
+ public void validate(Object value) throws IllegalArgumentException {
+ if (value == null) {
+ return;
+ }
+ try {
+ new URL((String) value);
+ } catch (Exception e) {
+ throw new IllegalArgumentException();
+ }
+ }
+
+ @Override
+ public String getPossibleValues() {
+ return R("VVPossibleUrlValues");
+ }
+
+ }
+
+ /**
+ * @return a {@link ValueValidator} that can be used to check if an object is
+ * a valid Boolean
+ */
+ public static ValueValidator getBooleanValidator() {
+ return new BooleanValidator();
+ }
+
+ /**
+ * @return a {@link ValueValidator} that can be used to check if an object is
+ * a String containing a valid file path or not
+ */
+ public static ValueValidator getFilePathValidator() {
+ return new FilePathValidator();
+ }
+
+ /**
+ * Returns a {@link ValueValidator} that checks if an object represents a
+ * valid integer (it is a Integer or Long or a String representation of
+ * one), within the given range. The values are inclusive.
+ * @param low the lowest valid value
+ * @param high the highest valid value
+ */
+ public static ValueValidator getRangedIntegerValidator(int low, int high) {
+ return new RangedIntegerValidator(low, high);
+ }
+
+ /**
+ * Returns a {@link ValueValidator} that checks if an object is a string from
+ * one of the provided Strings.
+ * @param validValues an array of Strings which are considered valid
+ */
+ public static ValueValidator getStringValidator(String[] validValues) {
+ return new StringValueValidator(validValues);
+ }
+
+ /**
+ * @return a {@link ValueValidator} that checks if an object represents a
+ * valid url
+ */
+ public static ValueValidator getUrlValidator() {
+ return new UrlValidator();
+ }
+
+}
diff -r 0f2fddf76a78 -r adef5d4159ee netx/net/sourceforge/jnlp/config/ConfiguratonValidator.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/config/ConfiguratonValidator.java Mon Dec 13 17:28:01 2010 -0500
@@ -0,0 +1,120 @@
+/* Validator.java
+ Copyright (C) 2010 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package net.sourceforge.jnlp.config;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Validates a DeploymentConfiguration by identifying settings with
+ * unrecognized names or incorrect values.
+ */
+public class ConfiguratonValidator {
+
+ private List<Setting<String>> incorrectEntries;
+ private List<Setting<String>> unrecognizedEntries;
+ private Map<String, Setting<String>> toValidate = null;
+
+ private boolean validated = false;
+
+ /**
+ * @param toValidate the settings to validate
+ */
+ public ConfiguratonValidator(Map<String, Setting<String>> toValidate) {
+ this.toValidate = toValidate;
+ }
+
+ /**
+ * Validates the settings used in the constructor. Use
+ * {@link #getIncorrectSetting()} and {@link #getUnrecognizedSetting()} to
+ * get the list of incorrect or unrecognized settings.
+ */
+ public void validate() {
+ incorrectEntries = new ArrayList<Setting<String>>();
+ unrecognizedEntries = new ArrayList<Setting<String>>();
+
+ Map<String, Setting<String>> knownGood = Defaults.getDefaults();
+
+ for (String key : toValidate.keySet()) {
+ // check for known incorrect settings
+ if (knownGood.containsKey(key)) {
+ Setting<String> good = knownGood.get(key);
+ Setting<String> unknown = toValidate.get(key);
+ ValueValidator checker = good.getValidator();
+ if (checker != null) {
+ try {
+ checker.validate(unknown.getValue());
+ } catch (IllegalArgumentException e) {
+ Setting<String> strange = new Setting<String>(unknown);
+ strange.setValue(unknown.getValue());
+ incorrectEntries.add(strange);
+ }
+ }
+ } else {
+ // check for unknown settings
+ Setting<String> strange = new Setting<String>(toValidate.get(key));
+ unrecognizedEntries.add(strange);
+ }
+ }
+
+ validated = true;
+ }
+
+ /**
+ * @return a list of settings which have incorrect values
+ */
+ public List<Setting<String>> getIncorrectSetting() {
+ if (!validated) {
+ throw new IllegalStateException();
+ }
+
+ return new ArrayList<Setting<String>>(incorrectEntries);
+ }
+
+ /**
+ * @return a list of settings which are not recognized
+ */
+ public List<Setting<String>> getUnrecognizedSetting() {
+ if (!validated) {
+ throw new IllegalStateException();
+ }
+ return new ArrayList<Setting<String>>(unrecognizedEntries);
+ }
More information about the distro-pkg-dev
mailing list