You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2011/05/11 18:14:11 UTC
svn commit: r1101945 -
/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/
Author: simonetripodi
Date: Wed May 11 16:14:10 2011
New Revision: 1101945
URL: http://svn.apache.org/viewvc?rev=1101945&view=rev
Log:
'match' made private, used already existing getter instead to access to it
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/Digester.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/ObjectCreateRule.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
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=1101945&r1=1101944&r2=1101945&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 Wed May 11 16:14:10 2011
@@ -104,7 +104,7 @@ public class BeanPropertySetterRule exte
// log some debugging information
if (getDigester().getLogger().isDebugEnabled()) {
getDigester().getLogger().debug("[BeanPropertySetterRule]{" +
- getDigester().match + "} Called with text '" + text + "'");
+ getDigester().getMatch() + "} Called with text '" + text + "'");
}
bodyText = text.trim();
@@ -140,7 +140,7 @@ public class BeanPropertySetterRule exte
// log some debugging information
if (getDigester().getLogger().isDebugEnabled()) {
- getDigester().getLogger().debug("[BeanPropertySetterRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[BeanPropertySetterRule]{" + getDigester().getMatch() +
"} 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=1101945&r1=1101944&r2=1101945&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 Wed May 11 16:14:10 2011
@@ -513,7 +513,7 @@ public class CallMethodRule extends Rule
if (target == null) {
StringBuffer sb = new StringBuffer();
sb.append("[CallMethodRule]{");
- sb.append(getDigester().match);
+ sb.append(getDigester().getMatch());
sb.append("} Call target is null (");
sb.append("targetOffset=");
sb.append(targetOffset);
@@ -526,7 +526,7 @@ public class CallMethodRule extends Rule
// Invoke the required method on the top object
if (getDigester().getLogger().isDebugEnabled()) {
StringBuffer sb = new StringBuffer("[CallMethodRule]{");
- sb.append(getDigester().match);
+ sb.append(getDigester().getMatch());
sb.append("} Call ");
sb.append(target.getClass().getName());
sb.append(".");
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=1101945&r1=1101944&r2=1101945&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 Wed May 11 16:14:10 2011
@@ -165,7 +165,7 @@ public class CallParamRule extends Rule
if (getDigester().getLogger().isDebugEnabled()) {
StringBuffer sb = new StringBuffer("[CallParamRule]{");
- sb.append(getDigester().match);
+ sb.append(getDigester().getMatch());
sb.append("} Save from stack; from stack?").append(fromStack);
sb.append("; object=").append(param);
getDigester().getLogger().debug(sb.toString());
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Digester.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Digester.java?rev=1101945&r1=1101944&r2=1101945&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Digester.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Digester.java Wed May 11 16:14:10 2011
@@ -214,7 +214,7 @@ public class Digester extends DefaultHan
/**
* The current match pattern for nested element processing.
*/
- protected String match = "";
+ private String match = "";
/**
@@ -1282,7 +1282,6 @@ public class Digester extends DefaultHan
}
-
/**
* Process notification of a skipped entity.
*
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=1101945&r1=1101944&r2=1101945&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 Wed May 11 16:14:10 2011
@@ -271,7 +271,7 @@ public class FactoryCreateRule extends R
Object instance = getFactory(attributes).createObject(attributes);
if (getDigester().getLogger().isDebugEnabled()) {
- getDigester().getLogger().debug("[FactoryCreateRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[FactoryCreateRule]{" + getDigester().getMatch() +
"} New " + (instance == null ? "null object" :
instance.getClass().getName()));
}
@@ -294,7 +294,7 @@ public class FactoryCreateRule extends R
Object instance = getFactory(attributes).createObject(attributes);
if (getDigester().getLogger().isDebugEnabled()) {
- getDigester().getLogger().debug("[FactoryCreateRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[FactoryCreateRule]{" + getDigester().getMatch() +
"} New " + (instance == null ? "null object" :
instance.getClass().getName()));
}
@@ -328,7 +328,7 @@ public class FactoryCreateRule extends R
Object top = getDigester().pop();
if (getDigester().getLogger().isDebugEnabled()) {
- getDigester().getLogger().debug("[FactoryCreateRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[FactoryCreateRule]{" + getDigester().getMatch() +
"} Pop " + top.getClass().getName());
}
@@ -392,7 +392,7 @@ public class FactoryCreateRule extends R
}
}
if (getDigester().getLogger().isDebugEnabled()) {
- getDigester().getLogger().debug("[FactoryCreateRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[FactoryCreateRule]{" + getDigester().getMatch() +
"} New factory " + realClassName);
}
Class<?> clazz = getDigester().getClassLoader().loadClass(realClassName);
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=1101945&r1=1101944&r2=1101945&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 Wed May 11 16:14:10 2011
@@ -125,7 +125,7 @@ public class ObjectCreateRule extends Ru
}
}
if (getDigester().getLogger().isDebugEnabled()) {
- getDigester().getLogger().debug("[ObjectCreateRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[ObjectCreateRule]{" + getDigester().getMatch() +
"}New " + realClassName);
}
@@ -145,7 +145,7 @@ public class ObjectCreateRule extends Ru
Object top = getDigester().pop();
if (getDigester().getLogger().isDebugEnabled()) {
- getDigester().getLogger().debug("[ObjectCreateRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[ObjectCreateRule]{" + getDigester().getMatch() +
"} Pop " + top.getClass().getName());
}
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=1101945&r1=1101944&r2=1101945&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 Wed May 11 16:14:10 2011
@@ -407,7 +407,7 @@ public class SetNestedPropertiesRule ext
boolean debug = log.isDebugEnabled();
if (debug) {
- log.debug("[SetNestedPropertiesRule]{" + getDigester().match +
+ log.debug("[SetNestedPropertiesRule]{" + getDigester().getMatch() +
"} Setting property '" + propName + "' to '" +
text + "'");
}
@@ -416,11 +416,11 @@ public class SetNestedPropertiesRule ext
Object top = getDigester().peek();
if (debug) {
if (top != null) {
- log.debug("[SetNestedPropertiesRule]{" + getDigester().match +
+ log.debug("[SetNestedPropertiesRule]{" + getDigester().getMatch() +
"} Set " + top.getClass().getName() +
" properties");
} else {
- log.debug("[SetPropertiesRule]{" + getDigester().match +
+ log.debug("[SetPropertiesRule]{" + getDigester().getMatch() +
"} 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=1101945&r1=1101944&r2=1101945&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 Wed May 11 16:14:10 2011
@@ -150,11 +150,11 @@ public class SetNextRule extends Rule {
Object parent = getDigester().peek(1);
if (getDigester().getLogger().isDebugEnabled()) {
if (parent == null) {
- getDigester().getLogger().debug("[SetNextRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[SetNextRule]{" + getDigester().getMatch() +
"} Call [NULL PARENT]." +
methodName + "(" + child + ")");
} else {
- getDigester().getLogger().debug("[SetNextRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[SetNextRule]{" + getDigester().getMatch() +
"} Call " + parent.getClass().getName() + "." +
methodName + "(" + child + ")");
}
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=1101945&r1=1101944&r2=1101945&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 Wed May 11 16:14:10 2011
@@ -186,7 +186,7 @@ public class SetPropertiesRule extends R
}
if (getDigester().getLogger().isDebugEnabled()) {
- getDigester().getLogger().debug("[SetPropertiesRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[SetPropertiesRule]{" + getDigester().getMatch() +
"} Setting property '" + attributeName + "' to '" +
value + "'");
}
@@ -226,11 +226,11 @@ public class SetPropertiesRule extends R
Object top = getDigester().peek();
if (getDigester().getLogger().isDebugEnabled()) {
if (top != null) {
- getDigester().getLogger().debug("[SetPropertiesRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[SetPropertiesRule]{" + getDigester().getMatch() +
"} Set " + top.getClass().getName() +
" properties");
} else {
- getDigester().getLogger().debug("[SetPropertiesRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[SetPropertiesRule]{" + getDigester().getMatch() +
"} 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=1101945&r1=1101944&r2=1101945&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 Wed May 11 16:14:10 2011
@@ -109,7 +109,7 @@ public class SetPropertyRule extends Rul
// Log some debugging information
if (getDigester().getLogger().isDebugEnabled()) {
- getDigester().getLogger().debug("[SetPropertyRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[SetPropertyRule]{" + getDigester().getMatch() +
"} 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=1101945&r1=1101944&r2=1101945&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 Wed May 11 16:14:10 2011
@@ -143,11 +143,11 @@ public class SetRootRule extends Rule {
Object parent = getDigester().root;
if (getDigester().getLogger().isDebugEnabled()) {
if (parent == null) {
- getDigester().getLogger().debug("[SetRootRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[SetRootRule]{" + getDigester().getMatch() +
"} Call [NULL ROOT]." +
methodName + "(" + child + ")");
} else {
- getDigester().getLogger().debug("[SetRootRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[SetRootRule]{" + getDigester().getMatch() +
"} Call " + parent.getClass().getName() + "." +
methodName + "(" + child + ")");
}
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=1101945&r1=1101944&r2=1101945&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 Wed May 11 16:14:10 2011
@@ -142,11 +142,11 @@ public class SetTopRule extends Rule {
if (getDigester().getLogger().isDebugEnabled()) {
if (child == null) {
- getDigester().getLogger().debug("[SetTopRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[SetTopRule]{" + getDigester().getMatch() +
"} Call [NULL CHILD]." +
methodName + "(" + parent + ")");
} else {
- getDigester().getLogger().debug("[SetTopRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[SetTopRule]{" + getDigester().getMatch() +
"} Call " + child.getClass().getName() + "." +
methodName + "(" + parent + ")");
}