Author: tv
Date: Sun Jun 22 02:34:11 2008
New Revision: 670328
URL: http://svn.apache.org/viewvc?rev=670328&view=rev
Log:
Major code cleanup, formatting and styling
Removed:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/AbstractNumberField.java
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeError.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeException.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeRuntimeException.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceFacade.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldFactory.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BigDecimalValidator.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BooleanValidator.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DefaultValidator.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DoubleValidator.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FileValidator.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FloatValidator.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerValidator.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/LongValidator.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/ShortValidator.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/StringValidator.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/xmlmodel/Rule.java
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeError.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeError.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeError.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeError.java
Sun Jun 22 02:34:11 2008
@@ -19,15 +19,13 @@
* under the License.
*/
-import org.apache.commons.lang.exception.NestableError;
-
/**
* Base exception thrown by the Intake service.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Quinton McCombs</a>
* @version $Id$
*/
-public class IntakeError extends NestableError
+public class IntakeError extends Error
{
/**
* Serial version id
@@ -40,6 +38,7 @@
*/
public IntakeError()
{
+ super();
}
/**
@@ -77,5 +76,4 @@
{
super(msg, nested);
}
-
}
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeException.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeException.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeException.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeException.java
Sun Jun 22 02:34:11 2008
@@ -38,6 +38,7 @@
*/
public IntakeException()
{
+ super();
}
/**
@@ -75,5 +76,4 @@
{
super(msg, nested);
}
-
}
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeRuntimeException.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeRuntimeException.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeRuntimeException.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeRuntimeException.java
Sun Jun 22 02:34:11 2008
@@ -38,6 +38,7 @@
*/
public IntakeRuntimeException()
{
+ super();
}
/**
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceFacade.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceFacade.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceFacade.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceFacade.java
Sun Jun 22 02:34:11 2008
@@ -26,70 +26,73 @@
/**
* This is a Facade class for IntakeService.
- *
+ *
* This class provides static methods that call related methods of the
- * implementation of the IntakeService used by the System, according to
- * the settings in your intake.xml file.
- *
- * Note: How should a facade class work? It seems to me that maybe it should
+ * implementation of the IntakeService used by the System, according to the
+ * settings in your intake.xml file.
+ *
+ * Note: How should a facade class work? It seems to me that maybe it should
* only have a hook into the Avalon Component Manager somehow?
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">John McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Quinton McCombs</a>
* @version $Id$
*/
public class IntakeServiceFacade
{
- /** Static instance of the intakeService. */
+ /** Static instance of the intakeService. */
- private static IntakeService intakeService;
+ private static IntakeService intakeService;
/**
- * Gets an instance of a named group either from the pool
- * or by calling the Factory Service if the pool is empty.
- *
- * @param groupName the name of the group.
+ * Gets an instance of a named group either from the pool or by calling the
+ * Factory Service if the pool is empty.
+ *
+ * @param groupName
+ * the name of the group.
* @return a Group instance.
- * @throws IntakeException if recycling fails.
+ * @throws IntakeException
+ * if recycling fails.
*/
- public static Group getGroup(String groupName)
- throws IntakeException
+ public static Group getGroup(String groupName) throws IntakeException
{
if (groupName == null)
{
- throw new IntakeException(
- "IntakeServiceFacade.getGroup(groupName) is null");
+ throw new IntakeException("IntakeServiceFacade.getGroup(groupName)
is null");
}
return getService().getGroup(groupName);
}
/**
* Puts a group back to the pool.
- * @param instance the object instance to recycle.
- * @throws IntakeException A non existant group was passed
+ *
+ * @param instance
+ * the object instance to recycle.
+ * @throws IntakeException
+ * A non existant group was passed
*/
- public static void releaseGroup(Group instance)
- throws IntakeException
+ public static void releaseGroup(Group instance) throws IntakeException
{
getService().releaseGroup(instance);
}
/**
* Gets the current size of the pool for a named group.
- *
- * @param groupName the name of the group.
+ *
+ * @param groupName
+ * the name of the group.
* @return the current pool size
- * @throws IntakeException A non existant group was passed
+ * @throws IntakeException
+ * A non existant group was passed
*/
- public static int getSize(String groupName)
- throws IntakeException
+ public static int getSize(String groupName) throws IntakeException
{
return getService().getSize(groupName);
}
/**
* Names of all the defined groups.
- *
+ *
* @return array of names.
*/
public static String[] getGroupNames()
@@ -99,8 +102,9 @@
/**
* Gets the key (usually a short identifier) for a group.
- *
- * @param groupName the name of the group.
+ *
+ * @param groupName
+ * the name of the group.
* @return the the key.
*/
public static String getGroupKey(String groupName)
@@ -110,8 +114,9 @@
/**
* Gets the group name given its key.
- *
- * @param groupKey the key.
+ *
+ * @param groupKey
+ * the key.
* @return groupName the name of the group.
*/
public static String getGroupName(String groupKey)
@@ -121,57 +126,49 @@
/**
* Gets the Method that can be used to set a property.
- *
- * @param className the name of the object.
- * @param propName the name of the property.
+ *
+ * @param className
+ * the name of the object.
+ * @param propName
+ * the name of the property.
* @return the setter.
* @throws ClassNotFoundException
* @throws IntrospectionException
*/
- public static Method getFieldSetter(String className, String propName)
- throws IntrospectionException, ClassNotFoundException
+ public static Method getFieldSetter(String className, String propName)
throws IntrospectionException, ClassNotFoundException
{
return getService().getFieldSetter(className, propName);
}
/**
* Gets the Method that can be used to get a property value.
- *
- * @param className the name of the object.
- * @param propName the name of the property.
+ *
+ * @param className
+ * the name of the object.
+ * @param propName
+ * the name of the property.
* @return the getter.
* @throws ClassNotFoundException
* @throws IntrospectionException
*/
- public static Method getFieldGetter(String className, String propName)
- throws IntrospectionException, ClassNotFoundException
+ public static Method getFieldGetter(String className, String propName)
throws IntrospectionException, ClassNotFoundException
{
return getService().getFieldGetter(className, propName);
}
/**
- * Utility method for accessing the service
- * implementation
- *
+ * Utility method for accessing the service implementation
+ *
* @return a IntakeService implementation instance
*/
private static IntakeService getService()
{
- return (IntakeService) intakeService;
+ return intakeService;
}
- public static void setIntakeService(IntakeService service){
- intakeService = service;
+ public static void setIntakeService(IntakeService service)
+ {
+ intakeService = service;
}
}
-
-
-
-
-
-
-
-
-
-
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
Sun Jun 22 02:34:11 2008
@@ -614,21 +614,17 @@
for (int i = 0; i < nameVal.length; i++)
{
String val = nameVal[i].getValue();
- // getLogger.debug("Registered " + val
- // + " for Crypto Algorithm " + key);
xmlPathes.add(val);
}
}
Map appDataElements = null;
- String serialDataPath = conf.getChild(SERIAL_XML, false).getValue(
- SERIAL_XML_DEFAULT);
+ String serialDataPath = conf.getChild(SERIAL_XML,
false).getValue(SERIAL_XML_DEFAULT);
if (!serialDataPath.equalsIgnoreCase("none"))
{
- serialDataPath = new File(applicationRoot, serialDataPath)
- .getAbsolutePath();
+ serialDataPath = new File(applicationRoot,
serialDataPath).getAbsolutePath();
}
else
{
@@ -644,16 +640,6 @@
setterMap = new HashMap();
keyedPools = new HashMap();
- if (xmlPathes == null)
- {
- String LOAD_ERROR = "No paths for XML files were specified. "
- + "Check that the property exists in "
- + "TurbineResources.props and were loaded.";
-
- getLogger().error(LOAD_ERROR);
- throw new ConfigurationException(LOAD_ERROR);
- }
-
Set xmlFiles = new HashSet();
long timeStamp = 0;
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java
Sun Jun 22 02:34:11 2008
@@ -203,8 +203,7 @@
{
validatorClassName = getDefaultValidator();
}
- else if (validatorClassName != null
- && validatorClassName.indexOf('.') == -1)
+ else if (validatorClassName.indexOf('.') == -1)
{
validatorClassName = defaultValidatorPackage + validatorClassName;
}
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldFactory.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldFactory.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldFactory.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldFactory.java
Sun Jun 22 02:34:11 2008
@@ -182,7 +182,7 @@
return fieldCtors;
}
- private static abstract class FieldCtor
+ protected static abstract class FieldCtor
{
public Field getInstance(XmlField f, Group g) throws IntakeException
{
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java
Sun Jun 22 02:34:11 2008
@@ -139,7 +139,7 @@
if (value == null)
{
- setTestValue((Short)getEmptyValue());
+ setTestValue(getEmptyValue());
}
else
{
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BigDecimalValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BigDecimalValidator.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BigDecimalValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BigDecimalValidator.java
Sun Jun 22 02:34:11 2008
@@ -68,13 +68,6 @@
}
/**
- * Default Constructor
- */
- public BigDecimalValidator()
- {
- }
-
- /**
* Method to initialise Object
*
* @param paramMap
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BooleanValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BooleanValidator.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BooleanValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BooleanValidator.java
Sun Jun 22 02:34:11 2008
@@ -66,13 +66,6 @@
private static String[] falseValues = {"FALSE","F","NO","N","0","OFF"};
/**
- * Default Constructor
- */
- public BooleanValidator()
- {
- }
-
- /**
* Constructor to use when initialising Object
*
* @param paramMap
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DefaultValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DefaultValidator.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DefaultValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DefaultValidator.java
Sun Jun 22 02:34:11 2008
@@ -92,6 +92,7 @@
*/
public DefaultValidator()
{
+ //
}
/**
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DoubleValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DoubleValidator.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DoubleValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DoubleValidator.java
Sun Jun 22 02:34:11 2008
@@ -70,13 +70,6 @@
}
/**
- * Default Constructor
- */
- public DoubleValidator()
- {
- }
-
- /**
* Method to initialise Object
*
* @param paramMap
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FileValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FileValidator.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FileValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FileValidator.java
Sun Jun 22 02:34:11 2008
@@ -57,13 +57,6 @@
}
/**
- * Default constructor
- */
- public FileValidator()
- {
- }
-
- /**
* Determine whether a testValue meets the criteria specified
* in the constraints defined for this validator
*
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FloatValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FloatValidator.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FloatValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FloatValidator.java
Sun Jun 22 02:34:11 2008
@@ -70,13 +70,6 @@
}
/**
- * Default Constructor
- */
- public FloatValidator()
- {
- }
-
- /**
* Method to initialise Object
*
* @param paramMap
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerValidator.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerValidator.java
Sun Jun 22 02:34:11 2008
@@ -65,13 +65,6 @@
}
/**
- * Default Constructor
- */
- public IntegerValidator()
- {
- }
-
- /**
* Method to initialise Object
*
* @param paramMap
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/LongValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/LongValidator.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/LongValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/LongValidator.java
Sun Jun 22 02:34:11 2008
@@ -65,13 +65,6 @@
}
/**
- * Default Constructor
- */
- public LongValidator()
- {
- }
-
- /**
* Method to initialise Object
*
* @param paramMap
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/ShortValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/ShortValidator.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/ShortValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/ShortValidator.java
Sun Jun 22 02:34:11 2008
@@ -65,13 +65,6 @@
}
/**
- * Default Constructor
- */
- public ShortValidator()
- {
- }
-
- /**
* Method to initialise Object
*
* @param paramMap
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/StringValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/StringValidator.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/StringValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/StringValidator.java
Sun Jun 22 02:34:11 2008
@@ -73,13 +73,6 @@
}
/**
- * Default constructor
- */
- public StringValidator()
- {
- }
-
- /**
* Extract the relevant parameters from the constraints listed
* in <rule> tags within the intake.xml file.
*
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/xmlmodel/Rule.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/xmlmodel/Rule.java?rev=670328&r1=670327&r2=670328&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/xmlmodel/Rule.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/xmlmodel/Rule.java
Sun Jun 22 02:34:11 2008
@@ -50,6 +50,7 @@
*/
public Rule()
{
+ //
}
/**
