Author: alex.guizar(a)jboss.com Date: 2008-09-25 15:26:24 -0400 (Thu, 25 Sep 2008) New Revision: 2386 Modified: jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/ArrayUtil.java jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/ByteUtil.java jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/ClassLoaderUtil.java jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/EqualsUtil.java jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/IoUtil.java jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/JndiUtil.java jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/StaticUtil.java jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/StringUtil.java jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/XmlUtil.java Log: made utility classes uninstantiable (as opposed to abstract) Modified: jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/ArrayUtil.java =================================================================== --- jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/ArrayUtil.java 2008-09-25 16:21:31 UTC (rev 2385) +++ jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/ArrayUtil.java 2008-09-25 19:26:24 UTC (rev 2386) @@ -21,8 +21,12 @@ */ package org.jbpm.util; -public abstract class ArrayUtil { +public class ArrayUtil { + private ArrayUtil() { + // hide default constructor to prevent instantiation + } + public static String toString(Object[] array) { if (array==null) { return "null"; Modified: jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/ByteUtil.java =================================================================== --- jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/ByteUtil.java 2008-09-25 16:21:31 UTC (rev 2385) +++ jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/ByteUtil.java 2008-09-25 19:26:24 UTC (rev 2386) @@ -1,7 +1,10 @@ package org.jbpm.util; +public class ByteUtil { -public abstract class ByteUtil { + private ByteUtil() { + // hide default constructor to prevent instantiation + } public static String toString(byte[] bytes) { if (bytes == null) return "null"; Modified: jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/ClassLoaderUtil.java =================================================================== --- jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/ClassLoaderUtil.java 2008-09-25 16:21:31 UTC (rev 2385) +++ jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/ClassLoaderUtil.java 2008-09-25 19:26:24 UTC (rev 2386) @@ -34,6 +34,10 @@ */ public class ClassLoaderUtil { + private ClassLoaderUtil() { + // hide default constructor to prevent instantiation + } + public static Class loadClass(String className) { try { return getClassLoader().loadClass(className); Modified: jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/EqualsUtil.java =================================================================== --- jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/EqualsUtil.java 2008-09-25 16:21:31 UTC (rev 2385) +++ jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/EqualsUtil.java 2008-09-25 19:26:24 UTC (rev 2386) @@ -21,8 +21,12 @@ */ package org.jbpm.util; -public abstract class EqualsUtil { +public class EqualsUtil { + private EqualsUtil() { + // hide default constructor to prevent instantiation + } + public static boolean equals(Object thisObject, Object otherObject) { if ( (thisObject==null) || (otherObject==null) ) return false; Modified: jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/IoUtil.java =================================================================== --- jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/IoUtil.java 2008-09-25 16:21:31 UTC (rev 2385) +++ jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/IoUtil.java 2008-09-25 19:26:24 UTC (rev 2386) @@ -28,10 +28,14 @@ import org.jbpm.JbpmException; -public abstract class IoUtil { +public class IoUtil { - public static final int BUFFERSIZE = 4096; + private IoUtil() { + // hide default constructor to prevent instantiation + } + private static final int BUFFERSIZE = 4096; + public static byte[] readBytes(InputStream inputStream) throws IOException { byte[] bytes = null; if (inputStream==null) { Modified: jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/JndiUtil.java =================================================================== --- jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/JndiUtil.java 2008-09-25 16:21:31 UTC (rev 2385) +++ jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/JndiUtil.java 2008-09-25 19:26:24 UTC (rev 2386) @@ -27,8 +27,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -public abstract class JndiUtil { - +public class JndiUtil { + + private JndiUtil() { + // hide default constructor to prevent instantiation + } + public static Object lookup(String jndiName, Class type) { Object object = null; try { Modified: jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/StaticUtil.java =================================================================== --- jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/StaticUtil.java 2008-09-25 16:21:31 UTC (rev 2385) +++ jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/StaticUtil.java 2008-09-25 19:26:24 UTC (rev 2386) @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.Map; -public abstract class StaticUtil { +public class StaticUtil { /* public class MyClass ... { @@ -45,7 +45,7 @@ ... } */ - + static Map initializers = Collections.synchronizedMap(new HashMap()); public abstract static class Initializer { @@ -56,6 +56,28 @@ public abstract void init(); } + /* + public class MyClass ... { + static AType aStaticInMyClass = null; + static AnotherType anotherStaticInMyClass = null; + + static { + new StaticUtil.Initializer(MyClass.class) { + public void init() { + // initialize static members here + aStaticInMyClass = ...; + anotherStaticInMyClass = ...; + } + }; + } + ... + } + */ + + private StaticUtil() { + // hide default constructor to prevent instantiation + } + public static void add(Class clazz, Initializer initializer) { initializers.put(clazz, initializer); } Modified: jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/StringUtil.java =================================================================== --- jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/StringUtil.java 2008-09-25 16:21:31 UTC (rev 2385) +++ jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/StringUtil.java 2008-09-25 19:26:24 UTC (rev 2386) @@ -10,6 +10,10 @@ static final byte[] HEX_CHAR_TABLE = { (byte) '0', (byte) '1', (byte) '2', (byte) '3', (byte) '4', (byte) '5', (byte) '6', (byte) '7', (byte) '8', (byte) '9', (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e', (byte) 'f' }; + private StringUtil() { + // hide default constructor to prevent instantiation + } + public static String toHexString(byte[] bytes) { try { byte[] hex = new byte[2 * bytes.length]; Modified: jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/XmlUtil.java =================================================================== --- jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/XmlUtil.java 2008-09-25 16:21:31 UTC (rev 2385) +++ jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/util/XmlUtil.java 2008-09-25 19:26:24 UTC (rev 2386) @@ -47,8 +47,12 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; -public abstract class XmlUtil { - +public class XmlUtil { + + private XmlUtil() { + // hide default constructor to prevent instantiation + } + public static Document parseXmlText(String xml) { ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes()); return parseXmlInputSource(new InputSource(bais));