henning 2003/07/18 02:08:00
Modified: src/java/org/apache/turbine/services/intake/model
BooleanField.java Field.java
Log:
As we might need a log object in all derived field classes, make it
protected from the Field itself, a member variable and request the
facility by this.getClass()
Revision Changes Path
1.11 +1 -5
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/BooleanField.java
Index: BooleanField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/BooleanField.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BooleanField.java 18 Jul 2003 08:32:29 -0000 1.10
+++ BooleanField.java 18 Jul 2003 09:08:00 -0000 1.11
@@ -59,7 +59,6 @@
import org.apache.commons.lang.StringUtils;
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.BooleanValidator;
@@ -76,9 +75,6 @@
public class BooleanField
extends Field
{
- /** Used for logging */
- private static Log log = LogFactory.getLog(BooleanField.class);
-
public BooleanField(XmlField field, Group group)
throws IntakeException
{
1.14 +7 -9
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/Field.java
Index: Field.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/Field.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Field.java 18 Jul 2003 08:32:30 -0000 1.13
+++ Field.java 18 Jul 2003 09:08:00 -0000 1.14
@@ -188,14 +188,8 @@
protected ValueParser parser;
/** Logging */
- private static final Log log;
- private static final boolean isDebugEnabled;
-
- static
- {
- log = LogFactory.getLog(Field.class);
- isDebugEnabled = log.isDebugEnabled();
- }
+ protected Log log = LogFactory.getLog(this.getClass());
+ protected boolean isDebugEnabled = false;
/**
* Constructs a field based on data in the xml specification
@@ -210,12 +204,15 @@
*/
public Field(XmlField field, Group group) throws IntakeException
{
+ isDebugEnabled = log.isDebugEnabled();
+
this.group = group;
key = field.getKey();
name = field.getName();
displayName = field.getDisplayName();
displaySize = field.getDisplaySize();
isMultiValued = field.isMultiValued();
+
try
{
setDefaultValue(field.getDefaultValue());
@@ -226,6 +223,7 @@
this.getDisplayName() + " to "
+ field.getDefaultValue(), e);
}
+
String validatorClassName = field.getValidator();
if (validatorClassName == null && field.getRules().size() > 0)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
