Author: simonetripodi
Date: Tue May 10 09:30:49 2011
New Revision: 1101378
URL: http://svn.apache.org/viewvc?rev=1101378&view=rev
Log:
reduced digester reference visibility inside Rule class, used the getter instead
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/NodeCreateRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectParamRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/PathCallParamRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Rule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/plugins/PluginCreateRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/plugins/PluginDeclarationRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/DigesterRuleParser.java
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/IncludeTest.java
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java
Tue May 10 09:30:49 2011
@@ -137,9 +137,9 @@ public class BeanPropertySetterRule exte
throws Exception {
// log some debugging information
- if (digester.log.isDebugEnabled()) {
- digester.log.debug("[BeanPropertySetterRule]{" +
- digester.match + "} Called with text '" + text + "'");
+ if (getDigester().log.isDebugEnabled()) {
+ getDigester().log.debug("[BeanPropertySetterRule]{" +
+ getDigester().match + "} Called with text '" + text + "'");
}
bodyText = text.trim();
@@ -171,11 +171,11 @@ public class BeanPropertySetterRule exte
}
// Get a reference to the top object
- Object top = digester.peek();
+ Object top = getDigester().peek();
// log some debugging information
- if (digester.log.isDebugEnabled()) {
- digester.log.debug("[BeanPropertySetterRule]{" + digester.match +
+ if (getDigester().log.isDebugEnabled()) {
+ getDigester().log.debug("[BeanPropertySetterRule]{" +
getDigester().match +
"} Set " + top.getClass().getName() + " property " +
property + " with text " + bodyText);
}
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java
Tue May 10 09:30:49 2011
@@ -475,7 +475,7 @@ public class CallMethodRule extends Rule
for (int i = 0; i < parameters.length; i++) {
parameters[i] = null;
}
- digester.pushParams(parameters);
+ getDigester().pushParams(parameters);
}
}
@@ -506,11 +506,11 @@ public class CallMethodRule extends Rule
Object parameters[] = null;
if (paramCount > 0) {
- parameters = (Object[]) digester.popParams();
+ parameters = (Object[]) getDigester().popParams();
- if (digester.log.isTraceEnabled()) {
+ if (getDigester().log.isTraceEnabled()) {
for (int i=0,size=parameters.length;i<size;i++) {
- digester.log.trace("[CallMethodRule](" + i + ")" +
parameters[i]) ;
+ getDigester().log.trace("[CallMethodRule](" + i + ")" +
parameters[i]) ;
}
}
@@ -574,28 +574,28 @@ public class CallMethodRule extends Rule
// Determine the target object for the method call
Object target;
if (targetOffset >= 0) {
- target = digester.peek(targetOffset);
+ target = getDigester().peek(targetOffset);
} else {
- target = digester.peek( digester.getCount() + targetOffset );
+ target = getDigester().peek( getDigester().getCount() +
targetOffset );
}
if (target == null) {
StringBuffer sb = new StringBuffer();
sb.append("[CallMethodRule]{");
- sb.append(digester.match);
+ sb.append(getDigester().match);
sb.append("} Call target is null (");
sb.append("targetOffset=");
sb.append(targetOffset);
sb.append(",stackdepth=");
- sb.append(digester.getCount());
+ sb.append(getDigester().getCount());
sb.append(")");
throw new org.xml.sax.SAXException(sb.toString());
}
// Invoke the required method on the top object
- if (digester.log.isDebugEnabled()) {
+ if (getDigester().log.isDebugEnabled()) {
StringBuffer sb = new StringBuffer("[CallMethodRule]{");
- sb.append(digester.match);
+ sb.append(getDigester().match);
sb.append("} Call ");
sb.append(target.getClass().getName());
sb.append(".");
@@ -618,7 +618,7 @@ public class CallMethodRule extends Rule
}
}
sb.append(")");
- digester.log.debug(sb.toString());
+ getDigester().log.debug(sb.toString());
}
Object result = null;
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java
Tue May 10 09:30:49 2011
@@ -204,15 +204,15 @@ public class CallParamRule extends Rule
} else if(fromStack) {
- param = digester.peek(stackIndex);
+ param = getDigester().peek(stackIndex);
- if (digester.log.isDebugEnabled()) {
+ if (getDigester().log.isDebugEnabled()) {
StringBuffer sb = new StringBuffer("[CallParamRule]{");
- sb.append(digester.match);
+ sb.append(getDigester().match);
sb.append("} Save from stack; from stack?").append(fromStack);
sb.append("; object=").append(param);
- digester.log.debug(sb.toString());
+ getDigester().log.debug(sb.toString());
}
}
@@ -223,7 +223,7 @@ public class CallParamRule extends Rule
// if this CallParamRule is reused in subsequent nesting.
if(param != null) {
- Object parameters[] = (Object[]) digester.peekParams();
+ Object parameters[] = (Object[]) getDigester().peekParams();
parameters[paramIndex] = param;
}
}
@@ -256,7 +256,7 @@ public class CallParamRule extends Rule
public void end(String namespace, String name) {
if (bodyTextStack != null && !bodyTextStack.empty()) {
// what we do now is push one parameter onto the top set of
parameters
- Object parameters[] = (Object[]) digester.peekParams();
+ Object parameters[] = (Object[]) getDigester().peekParams();
parameters[paramIndex] = bodyTextStack.pop();
}
}
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java
Tue May 10 09:30:49 2011
@@ -373,21 +373,21 @@ public class FactoryCreateRule extends R
try {
Object instance =
getFactory(attributes).createObject(attributes);
- if (digester.log.isDebugEnabled()) {
- digester.log.debug("[FactoryCreateRule]{" + digester.match
+
+ if (getDigester().log.isDebugEnabled()) {
+ getDigester().log.debug("[FactoryCreateRule]{" +
getDigester().match +
"} New " + (instance == null ? "null object" :
instance.getClass().getName()));
}
- digester.push(instance);
+ getDigester().push(instance);
exceptionIgnoredStack.push(Boolean.FALSE);
} catch (Exception e) {
// log message and error
- if (digester.log.isInfoEnabled()) {
- digester.log.info("[FactoryCreateRule] Create exception
ignored: " +
+ if (getDigester().log.isInfoEnabled()) {
+ getDigester().log.info("[FactoryCreateRule] Create
exception ignored: " +
((e.getMessage() == null) ? e.getClass().getName() :
e.getMessage()));
- if (digester.log.isDebugEnabled()) {
- digester.log.debug("[FactoryCreateRule] Ignored
exception:", e);
+ if (getDigester().log.isDebugEnabled()) {
+ getDigester().log.debug("[FactoryCreateRule] Ignored
exception:", e);
}
}
exceptionIgnoredStack.push(Boolean.TRUE);
@@ -396,12 +396,12 @@ public class FactoryCreateRule extends R
} else {
Object instance = getFactory(attributes).createObject(attributes);
- if (digester.log.isDebugEnabled()) {
- digester.log.debug("[FactoryCreateRule]{" + digester.match +
+ if (getDigester().log.isDebugEnabled()) {
+ getDigester().log.debug("[FactoryCreateRule]{" +
getDigester().match +
"} New " + (instance == null ? "null object" :
instance.getClass().getName()));
}
- digester.push(instance);
+ getDigester().push(instance);
}
}
@@ -422,16 +422,16 @@ public class FactoryCreateRule extends R
if (exceptionIgnoredStack.pop().booleanValue()) {
// creation exception was ignored
// nothing was put onto the stack
- if (digester.log.isTraceEnabled()) {
- digester.log.trace("[FactoryCreateRule] No creation so no
push so no pop");
+ if (getDigester().log.isTraceEnabled()) {
+ getDigester().log.trace("[FactoryCreateRule] No creation
so no push so no pop");
}
return;
}
}
- Object top = digester.pop();
- if (digester.log.isDebugEnabled()) {
- digester.log.debug("[FactoryCreateRule]{" + digester.match +
+ Object top = getDigester().pop();
+ if (getDigester().log.isDebugEnabled()) {
+ getDigester().log.debug("[FactoryCreateRule]{" +
getDigester().match +
"} Pop " + top.getClass().getName());
}
@@ -494,14 +494,14 @@ public class FactoryCreateRule extends R
realClassName = value;
}
}
- if (digester.log.isDebugEnabled()) {
- digester.log.debug("[FactoryCreateRule]{" + digester.match +
+ if (getDigester().log.isDebugEnabled()) {
+ getDigester().log.debug("[FactoryCreateRule]{" +
getDigester().match +
"} New factory " + realClassName);
}
- Class<?> clazz =
digester.getClassLoader().loadClass(realClassName);
+ Class<?> clazz =
getDigester().getClassLoader().loadClass(realClassName);
creationFactory = (ObjectCreationFactory)
clazz.newInstance();
- creationFactory.setDigester(digester);
+ creationFactory.setDigester(getDigester());
}
return (creationFactory);
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/NodeCreateRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/NodeCreateRule.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/NodeCreateRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/NodeCreateRule.java
Tue May 10 09:30:49 2011
@@ -111,7 +111,7 @@ public class NodeCreateRule extends Rule
this.root = root;
this.top = root;
- oldContentHandler = digester.getCustomContentHandler();
+ oldContentHandler = getDigester().getCustomContentHandler();
}
@@ -471,7 +471,7 @@ public class NodeCreateRule extends Rule
@Override
public void end(String namespace, String name) throws Exception {
- digester.pop();
+ getDigester().pop();
}
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
Tue May 10 09:30:49 2011
@@ -201,15 +201,15 @@ public class ObjectCreateRule extends Ru
realClassName = value;
}
}
- if (digester.log.isDebugEnabled()) {
- digester.log.debug("[ObjectCreateRule]{" + digester.match +
+ if (getDigester().log.isDebugEnabled()) {
+ getDigester().log.debug("[ObjectCreateRule]{" +
getDigester().match +
"}New " + realClassName);
}
// Instantiate the new object and push it on the context stack
- Class<?> clazz = digester.getClassLoader().loadClass(realClassName);
+ Class<?> clazz =
getDigester().getClassLoader().loadClass(realClassName);
Object instance = clazz.newInstance();
- digester.push(instance);
+ getDigester().push(instance);
}
@@ -220,9 +220,9 @@ public class ObjectCreateRule extends Ru
@Override
public void end(String namespace, String name) throws Exception {
- Object top = digester.pop();
- if (digester.log.isDebugEnabled()) {
- digester.log.debug("[ObjectCreateRule]{" + digester.match +
+ Object top = getDigester().pop();
+ if (getDigester().log.isDebugEnabled()) {
+ getDigester().log.debug("[ObjectCreateRule]{" +
getDigester().match +
"} Pop " + top.getClass().getName());
}
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectParamRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectParamRule.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectParamRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectParamRule.java
Tue May 10 09:30:49 2011
@@ -97,7 +97,7 @@ public class ObjectParamRule extends Rul
public void begin(String namespace, String name,
Attributes attributes) throws Exception {
Object anAttribute = null;
- Object parameters[] = (Object[]) digester.peekParams();
+ Object parameters[] = (Object[]) getDigester().peekParams();
if (attributeName != null) {
anAttribute = attributes.getValue(attributeName);
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/PathCallParamRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/PathCallParamRule.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/PathCallParamRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/PathCallParamRule.java
Tue May 10 09:30:49 2011
@@ -74,7 +74,7 @@ public class PathCallParamRule extends R
String param = getDigester().getMatch();
if(param != null) {
- Object parameters[] = (Object[]) digester.peekParams();
+ Object parameters[] = (Object[]) getDigester().peekParams();
parameters[paramIndex] = param;
}
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Rule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Rule.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Rule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Rule.java
Tue May 10 09:30:49 2011
@@ -58,13 +58,13 @@ public abstract class Rule {
/**
* The Digester with which this Rule is associated.
*/
- protected Digester digester = null;
+ private Digester digester = null;
/**
* The namespace URI for which this Rule is relevant, if any.
*/
- protected String namespaceURI = null;
+ private String namespaceURI = null;
// ------------------------------------------------------------- Properties
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java
Tue May 10 09:30:49 2011
@@ -247,12 +247,12 @@ public class SetNestedPropertiesRule ext
@Override
public void begin(String namespace, String name, Attributes attributes)
throws Exception {
- Rules oldRules = digester.getRules();
+ Rules oldRules = getDigester().getRules();
AnyChildRule anyChildRule = new AnyChildRule();
- anyChildRule.setDigester(digester);
+ anyChildRule.setDigester(getDigester());
AnyChildRules newRules = new AnyChildRules(anyChildRule);
- newRules.init(digester.getMatch()+"/", oldRules);
- digester.setRules(newRules);
+ newRules.init(getDigester().getMatch()+"/", oldRules);
+ getDigester().setRules(newRules);
}
/**
@@ -262,8 +262,8 @@ public class SetNestedPropertiesRule ext
*/
@Override
public void body(String namespace, String name, String text) throws
Exception {
- AnyChildRules newRules = (AnyChildRules) digester.getRules();
- digester.setRules(newRules.getOldRules());
+ AnyChildRules newRules = (AnyChildRules) getDigester().getRules();
+ getDigester().setRules(newRules.getOldRules());
}
/**
@@ -411,20 +411,20 @@ public class SetNestedPropertiesRule ext
boolean debug = log.isDebugEnabled();
if (debug) {
- log.debug("[SetNestedPropertiesRule]{" + digester.match +
+ log.debug("[SetNestedPropertiesRule]{" + getDigester().match +
"} Setting property '" + propName + "' to '" +
text + "'");
}
// Populate the corresponding properties of the top object
- Object top = digester.peek();
+ Object top = getDigester().peek();
if (debug) {
if (top != null) {
- log.debug("[SetNestedPropertiesRule]{" + digester.match +
+ log.debug("[SetNestedPropertiesRule]{" +
getDigester().match +
"} Set " + top.getClass().getName() +
" properties");
} else {
- log.debug("[SetPropertiesRule]{" + digester.match +
+ log.debug("[SetPropertiesRule]{" + getDigester().match +
"} Set NULL properties");
}
}
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java
Tue May 10 09:30:49 2011
@@ -187,15 +187,15 @@ public class SetNextRule extends Rule {
public void end(String namespace, String name) throws Exception {
// Identify the objects to be used
- Object child = digester.peek(0);
- Object parent = digester.peek(1);
- if (digester.log.isDebugEnabled()) {
+ Object child = getDigester().peek(0);
+ Object parent = getDigester().peek(1);
+ if (getDigester().log.isDebugEnabled()) {
if (parent == null) {
- digester.log.debug("[SetNextRule]{" + digester.match +
+ getDigester().log.debug("[SetNextRule]{" + getDigester().match
+
"} Call [NULL PARENT]." +
methodName + "(" + child + ")");
} else {
- digester.log.debug("[SetNextRule]{" + digester.match +
+ getDigester().log.debug("[SetNextRule]{" + getDigester().match
+
"} Call " + parent.getClass().getName() + "." +
methodName + "(" + child + ")");
}
@@ -205,7 +205,7 @@ public class SetNextRule extends Rule {
Class<?> paramTypes[] = new Class<?>[1];
if (paramType != null) {
paramTypes[0] =
- digester.getClassLoader().loadClass(paramType);
+ getDigester().getClassLoader().loadClass(paramType);
} else {
paramTypes[0] = child.getClass();
}
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java
Tue May 10 09:30:49 2011
@@ -202,8 +202,8 @@ public class SetPropertiesRule extends R
}
}
- if (digester.log.isDebugEnabled()) {
- digester.log.debug("[SetPropertiesRule]{" + digester.match +
+ if (getDigester().log.isDebugEnabled()) {
+ getDigester().log.debug("[SetPropertiesRule]{" +
getDigester().match +
"} Setting property '" + attributeName + "' to '" +
value + "'");
}
@@ -228,7 +228,7 @@ public class SetPropertiesRule extends R
// compared and the PropertyUtils functionality does appear
// compatible so we'll accept the risk here.
- Object top = digester.peek();
+ Object top = getDigester().peek();
boolean test = PropertyUtils.isWriteable(top, attributeName);
if (!test)
throw new NoSuchMethodException("Property " +
attributeName + " can't be set");
@@ -240,14 +240,14 @@ public class SetPropertiesRule extends R
}
// Populate the corresponding properties of the top object
- Object top = digester.peek();
- if (digester.log.isDebugEnabled()) {
+ Object top = getDigester().peek();
+ if (getDigester().log.isDebugEnabled()) {
if (top != null) {
- digester.log.debug("[SetPropertiesRule]{" + digester.match +
+ getDigester().log.debug("[SetPropertiesRule]{" +
getDigester().match +
"} Set " + top.getClass().getName() +
" properties");
} else {
- digester.log.debug("[SetPropertiesRule]{" + digester.match +
+ getDigester().log.debug("[SetPropertiesRule]{" +
getDigester().match +
"} Set NULL properties");
}
}
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java
Tue May 10 09:30:49 2011
@@ -126,11 +126,11 @@ public class SetPropertyRule extends Rul
}
// Get a reference to the top object
- Object top = digester.peek();
+ Object top = getDigester().peek();
// Log some debugging information
- if (digester.log.isDebugEnabled()) {
- digester.log.debug("[SetPropertyRule]{" + digester.match +
+ if (getDigester().log.isDebugEnabled()) {
+ getDigester().log.debug("[SetPropertyRule]{" + getDigester().match
+
"} Set " + top.getClass().getName() + " property " +
actualName + " to " + actualValue);
}
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java
Tue May 10 09:30:49 2011
@@ -180,15 +180,15 @@ public class SetRootRule extends Rule {
public void end(String namespace, String name) throws Exception {
// Identify the objects to be used
- Object child = digester.peek(0);
- Object parent = digester.root;
- if (digester.log.isDebugEnabled()) {
+ Object child = getDigester().peek(0);
+ Object parent = getDigester().root;
+ if (getDigester().log.isDebugEnabled()) {
if (parent == null) {
- digester.log.debug("[SetRootRule]{" + digester.match +
+ getDigester().log.debug("[SetRootRule]{" + getDigester().match
+
"} Call [NULL ROOT]." +
methodName + "(" + child + ")");
} else {
- digester.log.debug("[SetRootRule]{" + digester.match +
+ getDigester().log.debug("[SetRootRule]{" + getDigester().match
+
"} Call " + parent.getClass().getName() + "." +
methodName + "(" + child + ")");
}
@@ -198,7 +198,7 @@ public class SetRootRule extends Rule {
Class<?> paramTypes[] = new Class<?>[1];
if (paramType != null) {
paramTypes[0] =
- digester.getClassLoader().loadClass(paramType);
+ getDigester().getClassLoader().loadClass(paramType);
} else {
paramTypes[0] = child.getClass();
}
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java
Tue May 10 09:30:49 2011
@@ -178,16 +178,16 @@ public class SetTopRule extends Rule {
public void end(String namespace, String name) throws Exception {
// Identify the objects to be used
- Object child = digester.peek(0);
- Object parent = digester.peek(1);
+ Object child = getDigester().peek(0);
+ Object parent = getDigester().peek(1);
- if (digester.log.isDebugEnabled()) {
+ if (getDigester().log.isDebugEnabled()) {
if (child == null) {
- digester.log.debug("[SetTopRule]{" + digester.match +
+ getDigester().log.debug("[SetTopRule]{" + getDigester().match +
"} Call [NULL CHILD]." +
methodName + "(" + parent + ")");
} else {
- digester.log.debug("[SetTopRule]{" + digester.match +
+ getDigester().log.debug("[SetTopRule]{" + getDigester().match +
"} Call " + child.getClass().getName() + "." +
methodName + "(" + parent + ")");
}
@@ -197,7 +197,7 @@ public class SetTopRule extends Rule {
Class<?> paramTypes[] = new Class<?>[1];
if (paramType != null) {
paramTypes[0] =
- digester.getClassLoader().loadClass(paramType);
+ getDigester().getClassLoader().loadClass(paramType);
} else {
paramTypes[0] = parent.getClass();
}
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/plugins/PluginCreateRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/plugins/PluginCreateRule.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/plugins/PluginCreateRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/plugins/PluginCreateRule.java
Tue May 10 09:30:49 2011
@@ -154,14 +154,14 @@ public class PluginCreateRule extends Ru
*/
public void postRegisterInit(String matchPattern)
throws PluginConfigurationException {
- Log log = LogUtils.getLogger(digester);
+ Log log = LogUtils.getLogger(getDigester());
boolean debug = log.isDebugEnabled();
if (debug) {
log.debug("PluginCreateRule.postRegisterInit" +
": rule registered for pattern [" + matchPattern + "]");
}
- if (digester == null) {
+ if (getDigester() == null) {
// We require setDigester to be called before this method.
// Note that this means that PluginCreateRule cannot be added
// to a Rules object which has not yet been added to a
@@ -210,7 +210,7 @@ public class PluginCreateRule extends Ru
baseClass = Object.class;
}
- PluginRules rules = (PluginRules) digester.getRules();
+ PluginRules rules = (PluginRules) getDigester().getRules();
PluginManager pm = rules.getPluginManager();
// check default class is valid
@@ -225,7 +225,7 @@ public class PluginCreateRule extends Ru
}
try {
- defaultPlugin.init(digester, pm);
+ defaultPlugin.init(getDigester(), pm);
} catch(PluginException pwe) {
@@ -302,11 +302,11 @@ public class PluginCreateRule extends Ru
public void begin(String namespace, String name,
org.xml.sax.Attributes attributes)
throws java.lang.Exception {
- Log log = digester.getLogger();
+ Log log = getDigester().getLogger();
boolean debug = log.isDebugEnabled();
if (debug) {
log.debug("PluginCreateRule.begin" + ": pattern=[" + pattern + "]"
+
- " match=[" + digester.getMatch() + "]");
+ " match=[" + getDigester().getMatch() + "]");
}
if (initException != null) {
@@ -316,7 +316,7 @@ public class PluginCreateRule extends Ru
}
// load any custom rules associated with the plugin
- PluginRules oldRules = (PluginRules) digester.getRules();
+ PluginRules oldRules = (PluginRules) getDigester().getRules();
PluginManager pluginManager = oldRules.getPluginManager();
Declaration currDeclaration = null;
@@ -356,7 +356,7 @@ public class PluginCreateRule extends Ru
if (currDeclaration == null) {
currDeclaration = new Declaration(pluginClassName);
try {
- currDeclaration.init(digester, pluginManager);
+ currDeclaration.init(getDigester(), pluginManager);
} catch(PluginException pwe) {
throw new PluginInvalidInputException(
pwe.getMessage(), pwe.getCause());
@@ -381,15 +381,15 @@ public class PluginCreateRule extends Ru
// get the class of the user plugged-in type
Class<?> pluginClass = currDeclaration.getPluginClass();
- String path = digester.getMatch();
+ String path = getDigester().getMatch();
// create a new Rules object and effectively push it onto a stack of
// rules objects. The stack is actually a linked list; using the
// PluginRules constructor below causes the new instance to link
// to the previous head-of-stack, then the Digester.setRules() makes
// the new instance the new head-of-stack.
- PluginRules newRules = new PluginRules(digester, path, oldRules,
pluginClass);
- digester.setRules(newRules);
+ PluginRules newRules = new PluginRules(getDigester(), path, oldRules,
pluginClass);
+ getDigester().setRules(newRules);
if (debug) {
log.debug("PluginCreateRule.begin: installing new plugin: " +
@@ -398,7 +398,7 @@ public class PluginCreateRule extends Ru
}
// load up the custom rules
- currDeclaration.configure(digester, pattern);
+ currDeclaration.configure(getDigester(), pattern);
// create an instance of the plugin class
Object instance = pluginClass.newInstance();
@@ -406,7 +406,7 @@ public class PluginCreateRule extends Ru
if (debug) {
log.debug(
"PluginCreateRule.begin" + ": pattern=[" + pattern + "]" +
- " match=[" + digester.getMatch() + "]" +
+ " match=[" + getDigester().getMatch() + "]" +
" pushed instance of plugin [" + pluginClass.getName() + "]");
}
@@ -439,8 +439,8 @@ public class PluginCreateRule extends Ru
// Note that this applies only to rules matching exactly the path
// which is also matched by this PluginCreateRule.
- String path = digester.getMatch();
- PluginRules newRules = (PluginRules) digester.getRules();
+ String path = getDigester().getMatch();
+ PluginRules newRules = (PluginRules) getDigester().getRules();
List<Rule> rules = newRules.getDecoratedRules().match(namespace, path);
fireBodyMethods(rules, namespace, name, text);
}
@@ -462,18 +462,18 @@ public class PluginCreateRule extends Ru
// see body method for more info
- String path = digester.getMatch();
- PluginRules newRules = (PluginRules) digester.getRules();
+ String path = getDigester().getMatch();
+ PluginRules newRules = (PluginRules) getDigester().getRules();
List<Rule> rules = newRules.getDecoratedRules().match(namespace, path);
fireEndMethods(rules, namespace, name);
// pop the stack of PluginRules instances, which
// discards all custom rules associated with this plugin
- digester.setRules(newRules.getParent());
+ getDigester().setRules(newRules.getParent());
// and get rid of the instance of the plugin class from the
// digester object stack.
- digester.pop();
+ getDigester().pop();
}
/**
@@ -504,7 +504,7 @@ public class PluginCreateRule extends Ru
throws java.lang.Exception {
if ((rules != null) && (rules.size() > 0)) {
- Log log = digester.getLogger();
+ Log log = getDigester().getLogger();
boolean debug = log.isDebugEnabled();
for (int i = 0; i < rules.size(); i++) {
try {
@@ -514,7 +514,7 @@ public class PluginCreateRule extends Ru
}
rule.begin(namespace, name, list);
} catch (Exception e) {
- throw digester.createSAXException(e);
+ throw getDigester().createSAXException(e);
} catch (Error e) {
throw e;
}
@@ -533,7 +533,7 @@ public class PluginCreateRule extends Ru
String text) throws Exception {
if ((rules != null) && (rules.size() > 0)) {
- Log log = digester.getLogger();
+ Log log = getDigester().getLogger();
boolean debug = log.isDebugEnabled();
for (int i = 0; i < rules.size(); i++) {
try {
@@ -543,7 +543,7 @@ public class PluginCreateRule extends Ru
}
rule.body(namespaceURI, name, text);
} catch (Exception e) {
- throw digester.createSAXException(e);
+ throw getDigester().createSAXException(e);
} catch (Error e) {
throw e;
}
@@ -563,7 +563,7 @@ public class PluginCreateRule extends Ru
// Fire "end" events for all relevant rules in reverse order
if (rules != null) {
- Log log = digester.getLogger();
+ Log log = getDigester().getLogger();
boolean debug = log.isDebugEnabled();
for (int i = 0; i < rules.size(); i++) {
int j = (rules.size() - i) - 1;
@@ -574,7 +574,7 @@ public class PluginCreateRule extends Ru
}
rule.end(namespaceURI, name);
} catch (Exception e) {
- throw digester.createSAXException(e);
+ throw getDigester().createSAXException(e);
} catch (Error e) {
throw e;
}
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/plugins/PluginDeclarationRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/plugins/PluginDeclarationRule.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/plugins/PluginDeclarationRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/plugins/PluginDeclarationRule.java
Tue May 10 09:30:49 2011
@@ -78,10 +78,10 @@ public class PluginDeclarationRule exten
}
try {
- declarePlugin(digester, props);
+ declarePlugin(getDigester(), props);
} catch(PluginInvalidInputException ex) {
throw new PluginInvalidInputException(
- "Error on element [" + digester.getMatch() +
+ "Error on element [" + getDigester().getMatch() +
"]: " + ex.getMessage());
}
}
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/DigesterRuleParser.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/DigesterRuleParser.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/DigesterRuleParser.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/DigesterRuleParser.java
Tue May 10 09:30:49 2011
@@ -837,7 +837,7 @@ public class DigesterRuleParser extends
String attrName = attributes.getValue("attr-name");
String propName = attributes.getValue("prop-name");
- SetPropertiesRule rule = (SetPropertiesRule) digester.peek();
+ SetPropertiesRule rule = (SetPropertiesRule) getDigester().peek();
rule.addAlias(attrName, propName);
}
}
@@ -864,7 +864,7 @@ public class DigesterRuleParser extends
String attrName = attributes.getValue("attr-name");
String propName = attributes.getValue("prop-name");
- SetNestedPropertiesRule rule = (SetNestedPropertiesRule)
digester.peek();
+ SetNestedPropertiesRule rule = (SetNestedPropertiesRule)
getDigester().peek();
rule.addAlias(attrName, propName);
}
}
Modified:
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/IncludeTest.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/IncludeTest.java?rev=1101378&r1=1101377&r2=1101378&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/IncludeTest.java
(original)
+++
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/IncludeTest.java
Tue May 10 09:30:49 2011
@@ -41,7 +41,7 @@ public class IncludeTest {
new Rule() {
@Override
public void body(String namespace, String name, String
text) {
- ((ArrayList<String>) this.digester.peek()).add(text);
+ ((ArrayList<String>)
this.getDigester().peek()).add(text);
}
});
}
