summaryrefslogtreecommitdiff
path: root/src/main/java/com/c2kernel/process/Gateway.java
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2014-09-15 11:41:39 +0200
committerAndrew Branson <andrew.branson@cern.ch>2014-09-15 11:41:39 +0200
commit3bb0aefa38c27221114a2db749d2eaa1a9df0336 (patch)
tree022a172278d54a35ae464ecd3fc8a19ab6231bf9 /src/main/java/com/c2kernel/process/Gateway.java
parent95b8f12336bbc46f8d3e7cd407b89911aba8d2c5 (diff)
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.
Diffstat (limited to 'src/main/java/com/c2kernel/process/Gateway.java')
-rw-r--r--src/main/java/com/c2kernel/process/Gateway.java21
1 files changed, 2 insertions, 19 deletions
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() {