dgraham 2003/08/13 20:19:43
Modified: src/share/org/apache/struts/plugins DigestingPlugIn.java
Log:
Change ruleSets property to rulesets to match the struts-config name.
Revision Changes Path
1.5 +18 -18
jakarta-struts/src/share/org/apache/struts/plugins/DigestingPlugIn.java
Index: DigestingPlugIn.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/plugins/DigestingPlugIn.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DigestingPlugIn.java 10 Aug 2003 10:20:50 -0000 1.4
+++ DigestingPlugIn.java 14 Aug 2003 03:19:43 -0000 1.5
@@ -115,7 +115,7 @@
protected ModuleConfig moduleConfig = null;
- protected String ruleSets = null;
+ protected String rulesets = null;
protected ActionServlet servlet = null;
@@ -241,27 +241,27 @@
/**
* Instantiate any <code>RuleSet</code> classes defined in the
- * <code>ruleSets</code> property and use them to add rules to our
+ * <code>rulesets</code> property and use them to add rules to our
* <code>Digester</code>.
* @param digester the Digester instance to add RuleSet objects to.
* @throws ServletException
*/
protected void applyRuleSets(Digester digester) throws ServletException {
- if (this.ruleSets == null || this.ruleSets.trim().length() == 0) {
+ if (this.rulesets == null || this.rulesets.trim().length() == 0) {
return;
}
- ruleSets = ruleSets.trim();
+ rulesets = rulesets.trim();
String ruleSet = null;
- while (ruleSets.length() > 0) {
- int comma = ruleSets.indexOf(",");
+ while (rulesets.length() > 0) {
+ int comma = rulesets.indexOf(",");
if (comma < 0) {
- ruleSet = ruleSets.trim();
- ruleSets = "";
+ ruleSet = rulesets.trim();
+ rulesets = "";
} else {
- ruleSet = ruleSets.substring(0, comma).trim();
- ruleSets = ruleSets.substring(comma + 1).trim();
+ ruleSet = rulesets.substring(0, comma).trim();
+ rulesets = rulesets.substring(comma + 1).trim();
}
if (log.isDebugEnabled()) {
@@ -426,15 +426,15 @@
* <p>A comma-delimited list of one or more classes which implement
* <code>org.apache.commons.digester.RuleSet</code>. (Optional)</p>
*/
- public void setRuleSets(String ruleSets) {
- this.ruleSets = ruleSets;
+ public void setRulesets(String ruleSets) {
+ this.rulesets = ruleSets;
}
/**
* @return The configured list of <code>RuleSet</code> classes.
*/
- public String getRuleSets() {
- return this.ruleSets;
+ public String getRulesets() {
+ return this.rulesets;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
