mpoeschl 2003/02/13 03:57:27
Modified: src/java/org/apache/turbine/services/intake/model
BigDecimalField.java ComboKeyField.java
DateStringField.java DoubleField.java
FileItemField.java FloatField.java
IntegerField.java NumberKeyField.java
StringField.java StringKeyField.java
Log:
o remove log as it is not used
o javadocs
Revision Changes Path
1.6 +1 -7
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/BigDecimalField.java
Index: BigDecimalField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/BigDecimalField.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BigDecimalField.java 29 Jan 2003 22:20:18 -0000 1.5
+++ BigDecimalField.java 13 Feb 2003 11:57:26 -0000 1.6
@@ -56,9 +56,6 @@
import java.math.BigDecimal;
import java.text.DecimalFormatSymbols;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.validator.NumberValidator;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -73,9 +70,6 @@
public class BigDecimalField
extends Field
{
- /** Used for logging */
- private static Log log = LogFactory.getLog(BigDecimalField.class);
-
/**
* Constructor.
*
1.7 +8 -6
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/ComboKeyField.java
Index: ComboKeyField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/ComboKeyField.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ComboKeyField.java 29 Jan 2003 22:20:18 -0000 1.6
+++ ComboKeyField.java 13 Feb 2003 11:57:26 -0000 1.7
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.torque.om.ComboKey;
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -69,9 +67,13 @@
public class ComboKeyField
extends Field
{
- /** Used for logging */
- private static Log log = LogFactory.getLog(ComboKeyField.class);
-
+ /**
+ * Constructor.
+ *
+ * @param field xml field definition object
+ * @param group xml group definition object
+ * @throws IntakeException thrown by superclass
+ */
public ComboKeyField(XmlField field, Group group)
throws IntakeException
{
1.5 +23 -14
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/DateStringField.java
Index: DateStringField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/DateStringField.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DateStringField.java 29 Jan 2003 22:20:18 -0000 1.4
+++ DateStringField.java 13 Feb 2003 11:57:26 -0000 1.5
@@ -57,9 +57,6 @@
import java.text.DateFormat;
import java.text.ParseException;
import java.util.Date;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.validator.DateStringValidator;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -78,11 +75,16 @@
public class DateStringField
extends Field
{
- /** Used for logging */
- private static Log log = LogFactory.getLog(DateStringField.class);
-
+ /** date format */
private DateFormat df = null;
+ /**
+ * Constructor.
+ *
+ * @param field xml field definition object
+ * @param group xml group definition object
+ * @throws IntakeException thrown by superclass
+ */
public DateStringField(XmlField field, Group group)
throws IntakeException
{
@@ -99,7 +101,6 @@
* Sets the default value for a DateString field
*
* @param prop Parameter for the default values
- * @throws TurbineRuntimeException the date string could not be parsed.
*/
public void setDefaultValue(String prop)
{
@@ -116,8 +117,8 @@
}
catch (ParseException e)
{
- throw new TurbineRuntimeException("Could not parse " + prop +
- " into a valid Date", e);
+ throw new TurbineRuntimeException("Could not parse " + prop
+ + " into a valid Date", e);
}
}
@@ -150,8 +151,9 @@
}
catch (ParseException e)
{
- // do nothing. By the time this method is called, the
validator will
- // have already ensured that the string can be parsed.
+ // do nothing. By the time this method is called,
+ // the validator will have already ensured that the
+ // string can be parsed.
}
}
else
@@ -172,8 +174,9 @@
}
catch (ParseException e)
{
- // do nothing. By the time this method is called, the
validator will
- // have already ensured that the string can be parsed.
+ // do nothing. By the time this method is called, the
+ // validator will have already ensured that the string
+ // can be parsed.
}
}
else
@@ -187,6 +190,7 @@
* Parses a test date string using the Validator if is exists and
* is an instance of DateStringValidator. Otherwise, DateFormat.parse()
* is used.
+ *
* @param dateString The string date to parse
* @return A <code>Date</code> object
* @throws ParseException The date could not be parsed.
@@ -207,6 +211,11 @@
return date;
}
+ /**
+ * returns a String representation
+ *
+ * @return a String representation
+ */
public String toString()
{
String s = null;
1.3 +8 -7
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/DoubleField.java
Index: DoubleField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/DoubleField.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DoubleField.java 29 Jan 2003 22:20:18 -0000 1.2
+++ DoubleField.java 13 Feb 2003 11:57:26 -0000 1.3
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.validator.NumberValidator;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -66,13 +64,16 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Quinton McCombs</a>
* @version $Id$
*/
-
public class DoubleField
extends Field
{
- /** Used for logging */
- private static Log log = LogFactory.getLog(DoubleField.class);
-
+ /**
+ * Constructor.
+ *
+ * @param field xml field definition object
+ * @param group xml group definition object
+ * @throws IntakeException thrown by superclass
+ */
public DoubleField(XmlField field, Group group)
throws IntakeException
{
1.8 +17 -9
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FileItemField.java
Index: FileItemField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FileItemField.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FileItemField.java 12 Feb 2003 17:50:08 -0000 1.7
+++ FileItemField.java 13 Feb 2003 11:57:26 -0000 1.8
@@ -55,8 +55,6 @@
*/
import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.validator.FileValidator;
import org.apache.turbine.services.intake.validator.ValidationException;
@@ -74,9 +72,14 @@
public class FileItemField
extends Field
{
- /** Used for logging */
- private static Log log = LogFactory.getLog(FileItemField.class);
+ /**
+ * Constructor.
+ *
+ * @param field xml field definition object
+ * @param group xml group definition object
+ * @throws IntakeException thrown by superclass
+ */
public FileItemField(XmlField field, Group group)
throws IntakeException
{
@@ -84,16 +87,20 @@
}
/**
- * It is not possible to set the default value for this field type. Calling
this
- * method with a non-null parameter will result in a TurbineRuntimeException
+ * It is not possible to set the default value for this field type.
+ * Calling this method with a non-null parameter will result in a
+ * TurbineRuntimeException
*
+ * @param prop Parameter for the default values
* @throws TurbineRuntimeException
*/
public void setDefaultValue(String prop)
{
if (prop != null)
{
- throw new TurbineRuntimeException("Default values are not valid for " +
this.getClass().getName());
+ throw new TurbineRuntimeException(
+ "Default values are not valid for "
+ + this.getClass().getName());
}
defaultValue = null;
@@ -146,6 +153,8 @@
/**
* Compares request data with constraints and sets the valid flag.
+ *
+ * @return the valid flag
*/
protected boolean validate()
{
@@ -179,7 +188,6 @@
{
doSetValue();
}
-
}
else
{
1.5 +8 -6
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FloatField.java
Index: FloatField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FloatField.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FloatField.java 29 Jan 2003 22:20:18 -0000 1.4
+++ FloatField.java 13 Feb 2003 11:57:26 -0000 1.5
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.validator.NumberValidator;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -69,13 +67,17 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Quinton McCombs</a>
* @version $Id$
*/
-
public class FloatField
extends Field
{
- /** Used for logging */
- private static Log log = LogFactory.getLog(FloatField.class);
+ /**
+ * Constructor.
+ *
+ * @param field xml field definition object
+ * @param group xml group definition object
+ * @throws IntakeException thrown by superclass
+ */
public FloatField(XmlField field, Group group)
throws IntakeException
{
1.6 +8 -5
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/IntegerField.java
Index: IntegerField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/IntegerField.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IntegerField.java 29 Jan 2003 22:20:18 -0000 1.5
+++ IntegerField.java 13 Feb 2003 11:57:26 -0000 1.6
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.validator.IntegerValidator;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -69,9 +67,14 @@
public class IntegerField
extends Field
{
- /** Used for logging */
- private static Log log = LogFactory.getLog(IntegerField.class);
+ /**
+ * Constructor.
+ *
+ * @param field xml field definition object
+ * @param group xml group definition object
+ * @throws IntakeException thrown by superclass
+ */
public IntegerField(XmlField field, Group group)
throws IntakeException
{
1.6 +8 -6
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/NumberKeyField.java
Index: NumberKeyField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/NumberKeyField.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NumberKeyField.java 29 Jan 2003 22:20:18 -0000 1.5
+++ NumberKeyField.java 13 Feb 2003 11:57:26 -0000 1.6
@@ -55,9 +55,6 @@
*/
import java.math.BigDecimal;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.torque.om.NumberKey;
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.validator.NumberKeyValidator;
@@ -73,9 +70,14 @@
public class NumberKeyField
extends BigDecimalField
{
- /** Used for logging */
- private static Log log = LogFactory.getLog(NumberKeyField.class);
+ /**
+ * Constructor.
+ *
+ * @param field xml field definition object
+ * @param group xml group definition object
+ * @throws IntakeException thrown by superclass
+ */
public NumberKeyField(XmlField field, Group group)
throws IntakeException
{
1.5 +10 -7
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/StringField.java
Index: StringField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/StringField.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringField.java 29 Jan 2003 22:20:18 -0000 1.4
+++ StringField.java 13 Feb 2003 11:57:26 -0000 1.5
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -70,9 +68,14 @@
public class StringField
extends Field
{
- /** Used for logging */
- private static Log log = LogFactory.getLog(StringField.class);
+ /**
+ * Constructor.
+ *
+ * @param field xml field definition object
+ * @param group xml group definition object
+ * @throws IntakeException thrown by superclass
+ */
public StringField(XmlField field, Group group)
throws IntakeException
{
@@ -84,7 +87,6 @@
*
* @param prop Parameter for the default values
*/
-
public void setDefaultValue(String prop)
{
defaultValue = prop;
@@ -128,7 +130,9 @@
/**
* Set the value of required.
+ *
* @param v Value to assign to required.
+ * @param message an error message
*/
public void setRequired(boolean v, String message)
{
@@ -168,7 +172,6 @@
this.message = message;
}
}
-
}
}
}
1.7 +8 -5
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/StringKeyField.java
Index: StringKeyField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/StringKeyField.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StringKeyField.java 29 Jan 2003 22:20:18 -0000 1.6
+++ StringKeyField.java 13 Feb 2003 11:57:26 -0000 1.7
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.torque.om.StringKey;
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -69,9 +67,14 @@
public class StringKeyField
extends Field
{
- /** Used for logging */
- private static Log log = LogFactory.getLog(StringKeyField.class);
+ /**
+ * Constructor.
+ *
+ * @param field xml field definition object
+ * @param group xml group definition object
+ * @throws IntakeException thrown by superclass
+ */
public StringKeyField(XmlField field, Group group)
throws IntakeException
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
