github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-20 16:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #367 from awhitford/SettingsCleanup

Browse Source 
Settings cleanup
This commit is contained in:
Jeremy Long
2015-10-09 07:00:39 -04:00
parent 67502fb9d3 f2a2a91682
commit e7ef4b6906
1 changed files with 6 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/Settings.java
View File

@@ -460,12 +460,7 @@ public final class Settings {
* @param value the value for the property * @param value the value for the property
*/ */
public static void setBoolean(String key, boolean value) { public static void setBoolean(String key, boolean value) {
if (value) { setString(key, Boolean.toString(value));
localSettings.get().props.setProperty(key, Boolean.TRUE.toString());
} else {
localSettings.get().props.setProperty(key, Boolean.FALSE.toString());
}
LOGGER.debug("Setting: {}='{}'", key, value);
} }
/** /**
@@ -664,13 +659,11 @@ public final class Settings {
* @throws InvalidSettingException is thrown if there is an error retrieving the setting * @throws InvalidSettingException is thrown if there is an error retrieving the setting
*/ */
public static int getInt(String key) throws InvalidSettingException { public static int getInt(String key) throws InvalidSettingException {
int value;
try { try {
value = Integer.parseInt(Settings.getString(key)); return Integer.parseInt(Settings.getString(key));
} catch (NumberFormatException ex) { } catch (NumberFormatException ex) {
throw new InvalidSettingException("Could not convert property '" + key + "' to an int.", ex); throw new InvalidSettingException("Could not convert property '" + key + "' to an int.", ex);
} }
return value;
} }
/** /**
@@ -704,13 +697,11 @@ public final class Settings {
* @throws InvalidSettingException is thrown if there is an error retrieving the setting * @throws InvalidSettingException is thrown if there is an error retrieving the setting
*/ */
public static long getLong(String key) throws InvalidSettingException { public static long getLong(String key) throws InvalidSettingException {
long value;
try { try {
value = Long.parseLong(Settings.getString(key)); return Long.parseLong(Settings.getString(key));
} catch (NumberFormatException ex) { } catch (NumberFormatException ex) {
throw new InvalidSettingException("Could not convert property '" + key + "' to an int.", ex); throw new InvalidSettingException("Could not convert property '" + key + "' to a long.", ex);
} }
return value;
} }
/** /**
@@ -723,13 +714,7 @@ public final class Settings {
* @throws InvalidSettingException is thrown if there is an error retrieving the setting * @throws InvalidSettingException is thrown if there is an error retrieving the setting
*/ */
public static boolean getBoolean(String key) throws InvalidSettingException { public static boolean getBoolean(String key) throws InvalidSettingException {
boolean value; return Boolean.parseBoolean(Settings.getString(key));
try {
value = Boolean.parseBoolean(Settings.getString(key));
} catch (NumberFormatException ex) {
throw new InvalidSettingException("Could not convert property '" + key + "' to an int.", ex);
}
return value;
} }
/** /**
@@ -743,17 +728,7 @@ public final class Settings {
* @throws InvalidSettingException is thrown if there is an error retrieving the setting * @throws InvalidSettingException is thrown if there is an error retrieving the setting
*/ */
public static boolean getBoolean(String key, boolean defaultValue) throws InvalidSettingException { public static boolean getBoolean(String key, boolean defaultValue) throws InvalidSettingException {
boolean value; return Boolean.parseBoolean(Settings.getString(key, Boolean.toString(defaultValue)));
try {
final String strValue = Settings.getString(key);
if (strValue == null) {
return defaultValue;
}
value = Boolean.parseBoolean(strValue);
} catch (NumberFormatException ex) {
throw new InvalidSettingException("Could not convert property '" + key + "' to an int.", ex);
}
return value;
} }
/** /**