From 6f1332fb24e04b6970fc636788d219ac0d133e9a Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Wed, 9 Apr 2014 11:51:51 +0200 Subject: Improve property dumping, using Object.toString and giving the property class. --- src/main/java/com/c2kernel/utils/ObjectProperties.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/main/java/com/c2kernel/utils/ObjectProperties.java') diff --git a/src/main/java/com/c2kernel/utils/ObjectProperties.java b/src/main/java/com/c2kernel/utils/ObjectProperties.java index 79aee78..dd4a59d 100644 --- a/src/main/java/com/c2kernel/utils/ObjectProperties.java +++ b/src/main/java/com/c2kernel/utils/ObjectProperties.java @@ -144,11 +144,10 @@ public class ObjectProperties extends Properties { } public void dumpProps(int logLevel) { - if (!Logger.doLog(logLevel)) return; Logger.msg(logLevel, "Properties:"); for (Enumeration e = propertyNames(); e.hasMoreElements();) { String name = (String) e.nextElement(); - Logger.msg(" "+name+": "+getProperty(name)); + Logger.msg(" "+name+" ("+getObject(name).getClass().getSimpleName()+"): "+getObject(name).toString()); } } -- cgit v1.2.3 From 8bb86312d4f07dcb343ca2d212f4020906dbdb52 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Thu, 5 Jun 2014 15:00:02 +0200 Subject: ObjectProperties.getInstance() - if the property contains a String then attempt to instantiate an object from that classname, otherwise return the object. --- src/main/java/com/c2kernel/utils/ObjectProperties.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/c2kernel/utils/ObjectProperties.java') diff --git a/src/main/java/com/c2kernel/utils/ObjectProperties.java b/src/main/java/com/c2kernel/utils/ObjectProperties.java index dd4a59d..731b009 100644 --- a/src/main/java/com/c2kernel/utils/ObjectProperties.java +++ b/src/main/java/com/c2kernel/utils/ObjectProperties.java @@ -150,6 +150,18 @@ public class ObjectProperties extends Properties { Logger.msg(" "+name+" ("+getObject(name).getClass().getSimpleName()+"): "+getObject(name).toString()); } } - + + public Object getInstance(String propName, Object defaultVal) throws InstantiationException, IllegalAccessException, ClassNotFoundException { + Object prop = getObject(propName, defaultVal); + if (prop == null || prop.equals("")) + throw new InstantiationException("Property '"+propName+"' was not defined. Cannot instantiate."); + if (prop instanceof String) + return Class.forName((String)prop).newInstance(); + return prop; + } + + public Object getInstance(String propName) throws InstantiationException, IllegalAccessException, ClassNotFoundException { + return getInstance(propName, null); + } } -- cgit v1.2.3