remm 2004/06/26 14:37:52
Modified: util/java/org/apache/tomcat/util/digester Digester.java
util/java/org/apache/tomcat/util/compat Jdk14Compat.java
JdkCompat.java
util/java/org/apache/tomcat/util/http ServerCookie.java
Removed: util/java/org/apache/tomcat/util/digester Substitutor.java
RegexRules.java RegexMatcher.java
SimpleRegexMatcher.java
Log:
- First cleanup for digester.
Revision Changes Path
1.2 +1 -32
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/Digester.java
Index: Digester.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/Digester.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Digester.java 26 Jun 2004 17:41:30 -0000 1.1
+++ Digester.java 26 Jun 2004 21:37:52 -0000 1.2
@@ -331,12 +331,6 @@
protected static final String W3C_XML_SCHEMA =
"http://www.w3.org/2001/XMLSchema";;
- /**
- * An optional class that substitutes values in attributes and body text.
- * This may be null and so a null check is always required before use.
- */
- protected Substitutor substitutor;
-
/** Stacks used for interrule communication, indexed by name String */
private HashMap stacksByName = new HashMap();
@@ -918,23 +912,6 @@
return reader;
}
- /**
- * Gets the <code>Substitutor</code> used to convert attributes and body text.
- * @return Substitutor, null if not substitutions are to be performed.
- */
- public Substitutor getSubstitutor() {
- return substitutor;
- }
-
- /**
- * Sets the <code>Substitutor</code> to be used to convert attributes and body
text.
- * @param substitutor the Substitutor to be used to convert attributes and body
text
- * or null if not substitution of these values is to be performed.
- */
- public void setSubstitutor(Substitutor substitutor) {
- this.substitutor = substitutor;
- }
-
// ------------------------------------------------- ContentHandler Methods
@@ -1041,10 +1018,6 @@
List rules = (List) matches.pop();
if ((rules != null) && (rules.size() > 0)) {
String bodyText = this.bodyText.toString();
- Substitutor substitutor = getSubstitutor();
- if (substitutor!= null) {
- bodyText = substitutor.substitute(bodyText);
- }
for (int i = 0; i < rules.size(); i++) {
try {
Rule rule = (Rule) rules.get(i);
@@ -1293,10 +1266,6 @@
List rules = getRules().match(namespaceURI, match);
matches.push(rules);
if ((rules != null) && (rules.size() > 0)) {
- Substitutor substitutor = getSubstitutor();
- if (substitutor!= null) {
- list = substitutor.substitute(list);
- }
for (int i = 0; i < rules.size(); i++) {
try {
Rule rule = (Rule) rules.get(i);
1.12 +0 -2
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java
Index: Jdk14Compat.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Jdk14Compat.java 9 May 2004 19:58:43 -0000 1.11
+++ Jdk14Compat.java 26 Jun 2004 21:37:52 -0000 1.12
@@ -20,8 +20,6 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Locale;
-import java.text.MessageFormat;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.16 +0 -2
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java
Index: JdkCompat.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JdkCompat.java 9 May 2004 19:58:43 -0000 1.15
+++ JdkCompat.java 26 Jun 2004 21:37:52 -0000 1.16
@@ -21,10 +21,8 @@
import java.net.URL;
import java.net.MalformedURLException;
import java.util.Vector;
-import java.util.Locale;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.text.MessageFormat;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.5 +5 -4
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/ServerCookie.java
Index: ServerCookie.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/ServerCookie.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServerCookie.java 24 Feb 2004 08:50:04 -0000 1.4
+++ ServerCookie.java 26 Jun 2004 21:37:52 -0000 1.5
@@ -16,11 +16,12 @@
package org.apache.tomcat.util.http;
-import org.apache.tomcat.util.buf.MessageBytes;
+import java.io.Serializable;
+import java.text.FieldPosition;
+import java.util.Date;
+
import org.apache.tomcat.util.buf.DateTool;
-import java.text.*;
-import java.io.*;
-import java.util.*;
+import org.apache.tomcat.util.buf.MessageBytes;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
