Author: tv
Date: Fri Apr 17 14:27:19 2015
New Revision: 1674320
URL: http://svn.apache.org/r1674320
Log:
Add serial id
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BigDecimalField.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BooleanField.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DateStringField.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DoubleField.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FileItemField.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FloatField.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/StringField.java
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BigDecimalField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BigDecimalField.java?rev=1674320&r1=1674319&r2=1674320&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BigDecimalField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BigDecimalField.java
Fri Apr 17 14:27:19 2015
@@ -35,7 +35,10 @@ import org.apache.fulcrum.intake.validat
public class BigDecimalField
extends Field<BigDecimal>
{
- /**
+ /** Serial version */
+ private static final long serialVersionUID = -8356433008715252236L;
+
+ /**
* Constructor.
*
* @param field xml field definition object
@@ -53,7 +56,8 @@ public class BigDecimalField
*
* @param prop Parameter for the default values
*/
- public void setDefaultValue(String prop)
+ @Override
+ public void setDefaultValue(String prop)
{
defaultValue = null;
@@ -73,7 +77,8 @@ public class BigDecimalField
*
* @param prop The value to use if the field is empty.
*/
- public void setEmptyValue(String prop)
+ @Override
+ public void setEmptyValue(String prop)
{
emptyValue = null;
@@ -90,7 +95,8 @@ public class BigDecimalField
*
* @return A suitable validator
*/
- protected String getDefaultValidator()
+ @Override
+ protected String getDefaultValidator()
{
return BigDecimalValidator.class.getName();
}
@@ -98,7 +104,8 @@ public class BigDecimalField
/**
* Sets the value of the field from data in the parser.
*/
- protected void doSetValue()
+ @Override
+ protected void doSetValue()
{
if (isMultiValued)
{
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BooleanField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BooleanField.java?rev=1674320&r1=1674319&r2=1674320&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BooleanField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BooleanField.java
Fri Apr 17 14:27:19 2015
@@ -30,7 +30,10 @@ import org.apache.fulcrum.intake.validat
public class BooleanField
extends Field<Boolean>
{
- /**
+ /** Serial version */
+ private static final long serialVersionUID = 6689670469518374083L;
+
+ /**
* Constructor.
*
* @param field xml field definition object
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DateStringField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DateStringField.java?rev=1674320&r1=1674319&r2=1674320&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DateStringField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DateStringField.java
Fri Apr 17 14:27:19 2015
@@ -42,7 +42,10 @@ import org.apache.fulcrum.intake.validat
public class DateStringField
extends Field<Date>
{
- /** date format */
+ /** Serial version */
+ private static final long serialVersionUID = 3659498567870484883L;
+
+ /** date format */
private DateFormat df = null;
/**
@@ -69,7 +72,8 @@ public class DateStringField
*
* @param prop Parameter for the default values
*/
- public void setDefaultValue(String prop)
+ @Override
+ public void setDefaultValue(String prop)
{
defaultValue = null;
@@ -97,7 +101,8 @@ public class DateStringField
*
* @param prop The value to use if the field is empty.
*/
- public void setEmptyValue(String prop)
+ @Override
+ public void setEmptyValue(String prop)
{
emptyValue = null;
@@ -122,7 +127,8 @@ public class DateStringField
*
* @return "DateStringValidator"
*/
- protected String getDefaultValidator()
+ @Override
+ protected String getDefaultValidator()
{
return DateStringValidator.class.getName();
}
@@ -130,7 +136,8 @@ public class DateStringField
/**
* Sets the value of the field from data in the parser.
*/
- protected void doSetValue()
+ @Override
+ protected void doSetValue()
{
if (isMultiValued)
{
@@ -194,7 +201,8 @@ public class DateStringField
*
* @return a String representation
*/
- public String toString()
+ @Override
+ public String toString()
{
String s = null;
Object value = getValue();
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DoubleField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DoubleField.java?rev=1674320&r1=1674319&r2=1674320&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DoubleField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DoubleField.java
Fri Apr 17 14:27:19 2015
@@ -31,7 +31,10 @@ import org.apache.fulcrum.intake.validat
public class DoubleField
extends Field<Double>
{
- /**
+ /** Serial version */
+ private static final long serialVersionUID = -1685467778904884936L;
+
+ /**
* Constructor.
*
* @param field xml field definition object
@@ -49,7 +52,8 @@ public class DoubleField
*
* @param prop Parameter for the default values
*/
- public void setDefaultValue(String prop)
+ @Override
+ public void setDefaultValue(String prop)
{
defaultValue = null;
@@ -69,7 +73,8 @@ public class DoubleField
*
* @param prop The value to use if the field is empty.
*/
- public void setEmptyValue(String prop)
+ @Override
+ public void setEmptyValue(String prop)
{
emptyValue = null;
@@ -91,7 +96,8 @@ public class DoubleField
* @return the value to use when the field is empty or an Object that
* wraps the empty value for primitive types.
*/
- protected Object getSafeEmptyValue()
+ @Override
+ protected Object getSafeEmptyValue()
{
if (isMultiValued)
{
@@ -109,7 +115,8 @@ public class DoubleField
*
* @return A suitable validator
*/
- protected String getDefaultValidator()
+ @Override
+ protected String getDefaultValidator()
{
return DoubleValidator.class.getName();
}
@@ -117,7 +124,8 @@ public class DoubleField
/**
* Sets the value of the field from data in the parser.
*/
- protected void doSetValue()
+ @Override
+ protected void doSetValue()
{
if (isMultiValued)
{
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FileItemField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FileItemField.java?rev=1674320&r1=1674319&r2=1674320&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FileItemField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FileItemField.java
Fri Apr 17 14:27:19 2015
@@ -36,8 +36,10 @@ import org.apache.fulcrum.parser.ValuePa
public class FileItemField
extends Field<FileItem>
{
+ /** Serial version */
+ private static final long serialVersionUID = -963692413506822188L;
- /**
+ /**
* Constructor.
*
* @param field xml field definition object
@@ -58,7 +60,8 @@ public class FileItemField
* @param prop Parameter for the default values
* @throws TurbineRuntimeException
*/
- public void setDefaultValue(String prop)
+ @Override
+ public void setDefaultValue(String prop)
{
if (prop != null)
{
@@ -78,7 +81,8 @@ public class FileItemField
* @param prop Parameter for the empty values
* @throws TurbineRuntimeException
*/
- public void setEmptyValue(String prop)
+ @Override
+ public void setEmptyValue(String prop)
{
if (prop != null)
{
@@ -95,7 +99,8 @@ public class FileItemField
*
* @return A suitable validator
*/
- protected String getDefaultValidator()
+ @Override
+ protected String getDefaultValidator()
{
return FileValidator.class.getName();
}
@@ -110,7 +115,8 @@ public class FileItemField
* @return a <code>Field</code> value
* @exception IntakeException if an error occurs
*/
- public Field<FileItem> init(ValueParser vp)
+ @Override
+ public Field<FileItem> init(ValueParser vp)
throws IntakeException
{
super.parser = vp;
@@ -138,7 +144,8 @@ public class FileItemField
*
* @return the valid flag
*/
- public boolean validate()
+ @Override
+ public boolean validate()
{
ParameterParser pp = (ParameterParser) super.parser;
if (isMultiValued)
@@ -207,7 +214,8 @@ public class FileItemField
/**
* Sets the value of the field from data in the parser.
*/
- protected void doSetValue()
+ @Override
+ protected void doSetValue()
{
ParameterParser pp = (ParameterParser) super.parser;
if (isMultiValued)
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FloatField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FloatField.java?rev=1674320&r1=1674319&r2=1674320&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FloatField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FloatField.java
Fri Apr 17 14:27:19 2015
@@ -31,7 +31,10 @@ import org.apache.fulcrum.intake.validat
public class FloatField
extends Field<Float>
{
- /**
+ /** Serial version */
+ private static final long serialVersionUID = -8878247008849251720L;
+
+ /**
* Constructor.
*
* @param field xml field definition object
@@ -49,7 +52,8 @@ public class FloatField
*
* @param prop Parameter for the default values
*/
- public void setDefaultValue(String prop)
+ @Override
+ public void setDefaultValue(String prop)
{
defaultValue = null;
@@ -69,7 +73,8 @@ public class FloatField
*
* @param prop The value to use if the field is empty.
*/
- public void setEmptyValue(String prop)
+ @Override
+ public void setEmptyValue(String prop)
{
emptyValue = null;
@@ -91,7 +96,8 @@ public class FloatField
* @return the value to use when the field is empty or an Object that
* wraps the empty value for primitive types.
*/
- protected Object getSafeEmptyValue()
+ @Override
+ protected Object getSafeEmptyValue()
{
if (isMultiValued)
{
@@ -109,7 +115,8 @@ public class FloatField
*
* @return A suitable validator
*/
- protected String getDefaultValidator()
+ @Override
+ protected String getDefaultValidator()
{
return FloatValidator.class.getName();
}
@@ -117,7 +124,8 @@ public class FloatField
/**
* Sets the value of the field from data in the parser.
*/
- protected void doSetValue()
+ @Override
+ protected void doSetValue()
{
if (isMultiValued)
{
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java?rev=1674320&r1=1674319&r2=1674320&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java
Fri Apr 17 14:27:19 2015
@@ -30,7 +30,10 @@ import org.apache.fulcrum.intake.validat
public class IntegerField
extends Field<Integer>
{
- /**
+ /** Serial version */
+ private static final long serialVersionUID = -4186153269451228653L;
+
+ /**
* Constructor.
*
* @param field xml field definition object
@@ -48,7 +51,8 @@ public class IntegerField
*
* @param prop Parameter for the default values
*/
- public void setDefaultValue(String prop)
+ @Override
+ public void setDefaultValue(String prop)
{
defaultValue = null;
@@ -68,7 +72,8 @@ public class IntegerField
*
* @param prop The value to use if the field is empty.
*/
- public void setEmptyValue(String prop)
+ @Override
+ public void setEmptyValue(String prop)
{
emptyValue = null;
@@ -90,7 +95,8 @@ public class IntegerField
* @return the value to use when the field is empty or an Object that
* wraps the empty value for primitive types.
*/
- protected Object getSafeEmptyValue()
+ @Override
+ protected Object getSafeEmptyValue()
{
if (isMultiValued)
{
@@ -108,7 +114,8 @@ public class IntegerField
*
* @return A suitable validator
*/
- protected String getDefaultValidator()
+ @Override
+ protected String getDefaultValidator()
{
return IntegerValidator.class.getName();
}
@@ -116,7 +123,8 @@ public class IntegerField
/**
* Sets the value of the field from data in the parser.
*/
- protected void doSetValue()
+ @Override
+ protected void doSetValue()
{
if (isMultiValued)
{
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java?rev=1674320&r1=1674319&r2=1674320&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java
Fri Apr 17 14:27:19 2015
@@ -30,8 +30,10 @@ import org.apache.fulcrum.intake.validat
public class LongField
extends Field<Long>
{
+ /** Serial version */
+ private static final long serialVersionUID = -7142823708600937188L;
- /**
+ /**
* Constructor.
*
* @param field xml field definition object
@@ -49,7 +51,8 @@ public class LongField
*
* @param prop Parameter for the default values
*/
- public void setDefaultValue(String prop)
+ @Override
+ public void setDefaultValue(String prop)
{
defaultValue = null;
@@ -69,7 +72,8 @@ public class LongField
*
* @param prop The value to use if the field is empty.
*/
- public void setEmptyValue(String prop)
+ @Override
+ public void setEmptyValue(String prop)
{
emptyValue = null;
@@ -91,7 +95,8 @@ public class LongField
* @return the value to use when the field is empty or an Object that
* wraps the empty value for primitive types.
*/
- protected Object getSafeEmptyValue()
+ @Override
+ protected Object getSafeEmptyValue()
{
if (isMultiValued)
{
@@ -108,7 +113,8 @@ public class LongField
*
* @return A suitable validator
*/
- protected String getDefaultValidator()
+ @Override
+ protected String getDefaultValidator()
{
return LongValidator.class.getName();
}
@@ -116,7 +122,8 @@ public class LongField
/**
* Sets the value of the field from data in the parser.
*/
- protected void doSetValue()
+ @Override
+ protected void doSetValue()
{
if (isMultiValued)
{
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=1674320&r1=1674319&r2=1674320&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
Fri Apr 17 14:27:19 2015
@@ -30,7 +30,10 @@ import org.apache.fulcrum.intake.validat
public class ShortField
extends Field<Short>
{
- /**
+ /** Serial version */
+ private static final long serialVersionUID = -5838127207028024370L;
+
+ /**
* Constructor.
*
* @param field xml field definition object
@@ -48,7 +51,8 @@ public class ShortField
*
* @param prop Parameter for the default values
*/
- public void setDefaultValue(String prop)
+ @Override
+ public void setDefaultValue(String prop)
{
defaultValue = null;
@@ -68,7 +72,8 @@ public class ShortField
*
* @param prop The value to use if the field is empty.
*/
- public void setEmptyValue(String prop)
+ @Override
+ public void setEmptyValue(String prop)
{
emptyValue = null;
@@ -90,7 +95,8 @@ public class ShortField
* @return the value to use when the field is empty or an Object that
* wraps the empty value for primitive types.
*/
- protected Object getSafeEmptyValue()
+ @Override
+ protected Object getSafeEmptyValue()
{
if (isMultiValued)
{
@@ -108,7 +114,8 @@ public class ShortField
*
* @return A suitable validator
*/
- protected String getDefaultValidator()
+ @Override
+ protected String getDefaultValidator()
{
return ShortValidator.class.getName();
}
@@ -116,7 +123,8 @@ public class ShortField
/**
* Sets the value of the field from data in the parser.
*/
- protected void doSetValue()
+ @Override
+ protected void doSetValue()
{
if (isMultiValued)
{
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/StringField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/StringField.java?rev=1674320&r1=1674319&r2=1674320&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/StringField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/StringField.java
Fri Apr 17 14:27:19 2015
@@ -34,8 +34,10 @@ import org.apache.fulcrum.intake.validat
public class StringField
extends Field<String>
{
+ /** Serial version */
+ private static final long serialVersionUID = -7218385325093690333L;
- /**
+ /**
* Constructor.
*
* @param field xml field definition object
@@ -53,7 +55,8 @@ public class StringField
*
* @return class name of the default validator
*/
- protected String getDefaultValidator()
+ @Override
+ protected String getDefaultValidator()
{
return StringValidator.class.getName();
}
@@ -63,7 +66,8 @@ public class StringField
*
* @param prop Parameter for the default values
*/
- public void setDefaultValue(String prop)
+ @Override
+ public void setDefaultValue(String prop)
{
defaultValue = prop;
}
@@ -76,7 +80,8 @@ public class StringField
*
* @param prop The value to use if the field is empty.
*/
- public void setEmptyValue(String prop)
+ @Override
+ public void setEmptyValue(String prop)
{
emptyValue = prop;
}
@@ -84,7 +89,8 @@ public class StringField
/**
* Sets the value of the field from data in the parser.
*/
- protected void doSetValue()
+ @Override
+ protected void doSetValue()
{
if (isMultiValued)
{
@@ -109,7 +115,8 @@ public class StringField
* @param v Value to assign to required.
* @param message an error message
*/
- public void setRequired(boolean v, String message)
+ @Override
+ public void setRequired(boolean v, String message)
{
this.required = v;
if (v)