From 3bb0aefa38c27221114a2db749d2eaa1a9df0336 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Mon, 15 Sep 2014 11:41:39 +0200 Subject: Add trim calls to ObjectProperties.getString() to discard any extra whitespace around the values. Fixes #165 Remove old Gateway.getProperty methods - there should be no deprecated methods in the 3.0 release Move all getProperty() calls to getString or other so they will be trimmed. Introduce ObjectProperties.getInstances to create ArrayLists of objects from comma-separated class name lists. --- src/main/java/com/c2kernel/process/Gateway.java | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'src/main/java/com/c2kernel/process/Gateway.java') diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java index c2dd646..2de2b99 100644 --- a/src/main/java/com/c2kernel/process/Gateway.java +++ b/src/main/java/com/c2kernel/process/Gateway.java @@ -135,7 +135,7 @@ public class Gateway dumpC2KProps(7); //Initialise language file - String languageFile = getProperty("language.file"); + String languageFile = getProperties().getString("language.file"); if (languageFile != null && languageFile.length() > 0) { Language.isTranlated=true; Language.mTableOfTranslation = FileStringUtility.loadLanguageFile(languageFile); @@ -376,24 +376,7 @@ public class Gateway } static public String getCentreId() { - return getProperty("LocalCentre"); - } - - @Deprecated - static public String getProperty(String propName) { - return getProperty(propName, null); - } - - @Deprecated - static public String getProperty(String propName, String defaultValue) { - if (mC2KProps == null) return defaultValue; - return mC2KProps.getProperty(propName, defaultValue); - } - - @Deprecated - static public void setProperty(String propName, String propValue) { - if (mC2KProps == null) return; - mC2KProps.put(propName, propValue); + return getProperties().getString("LocalCentre"); } static public Enumeration propertyNames() { -- cgit v1.2.3