Merge branch 'master' of ssh://dev.cccs.uwe.ac.uk:22/var/git/cristal-kernel

1 files changed, 14 insertions, 3 deletions

diff --git a/src/main/java/com/c2kernel/utils/ObjectProperties.java b/src/main/java/com/c2kernel/utils/ObjectProperties.java
index 79aee78..731b009 100644
--- a/src/main/java/com/c2kernel/utils/ObjectProperties.java
+++ b/src/main/java/com/c2kernel/utils/ObjectProperties.java
@@ -144,13 +144,24 @@ 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());

 	    }

 	}

-		

+

+	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);

+	}		

 	

 }