vgritsenko 2003/10/24 05:50:08
Modified: src/java/org/apache/cocoon/transformation
LogTransformer.java TraxTransformer.java
src/java/org/apache/cocoon/transformation
LogTransformer.java TraxTransformer.java
Log:
Minor tweaks.
Fix argument in LogTransformer.endElement.
Revision Changes Path
1.3 +4 -4
cocoon-2.1/src/java/org/apache/cocoon/transformation/LogTransformer.java
Index: LogTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/LogTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LogTransformer.java 20 May 2003 20:48:44 -0000 1.2
+++ LogTransformer.java 24 Oct 2003 12:50:08 -0000 1.3
@@ -227,11 +227,11 @@
/**
* Receive notification of the end of an element.
*/
- public void endElement(String uri, String loc, String qname)
+ public void endElement(String uri, String loc, String raw)
throws SAXException {
- this.log ("endElement", "uri="+uri+",local="+loc+",qname="+qname);
+ this.log ("endElement", "uri="+uri+",local="+loc+",raw="+raw);
if (super.contentHandler!=null) {
- super.contentHandler.endElement(uri,loc,qname);
+ super.contentHandler.endElement(uri,loc,raw);
}
}
1.7 +11 -11
cocoon-2.1/src/java/org/apache/cocoon/transformation/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/TraxTransformer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TraxTransformer.java 6 May 2003 09:00:17 -0000 1.6
+++ TraxTransformer.java 24 Oct 2003 12:50:08 -0000 1.7
@@ -228,16 +228,16 @@
if (!xsltProcessorRole.startsWith(XSLTProcessor.ROLE)) {
xsltProcessorRole = XSLTProcessor.ROLE + '/' + xsltProcessorRole;
}
- if (this.getLogger().isDebugEnabled()) {
- this.getLogger().debug("Use parameters is " +
this.useParameters);
- this.getLogger().debug("Use cookies is " + this.useCookies);
- this.getLogger().debug("Use session info is " +
this.useSessionInfo);
- this.getLogger().debug("Use TrAX Processor " +
xsltProcessorRole);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Use parameters is " + this.useParameters);
+ getLogger().debug("Use cookies is " + this.useCookies);
+ getLogger().debug("Use session info is " + this.useSessionInfo);
+ getLogger().debug("Use TrAX Processor " + xsltProcessorRole);
if (traxFactory != null) {
- this.getLogger().debug("Use TrAX Transformer Factory " +
traxFactory);
+ getLogger().debug("Use TrAX Transformer Factory " +
traxFactory);
} else {
- this.getLogger().debug("Use default TrAX Transformer
Factory.");
+ getLogger().debug("Use default TrAX Transformer Factory.");
}
}
@@ -293,8 +293,8 @@
_useCookies = par.getParameterAsBoolean("use-cookies",
this.useCookies);
_useSessionInfo = par.getParameterAsBoolean("use-session-info",
this.useSessionInfo);
- if (this.getLogger().isDebugEnabled()) {
- this.getLogger().debug("Using stylesheet: '" +
this.inputSource.getURI() + "' in " + this);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Using stylesheet: '" +
this.inputSource.getURI() + "' in " + this);
}
/** Get a Transformer Handler */
@@ -315,7 +315,7 @@
* @return The generated key hashes the src
*/
public java.io.Serializable getKey() {
- Map map = this.getLogicSheetParameters();
+ Map map = getLogicSheetParameters();
if (map == null) {
return this.inputSource.getURI();
}
1.4 +4 -4
cocoon-2.2/src/java/org/apache/cocoon/transformation/LogTransformer.java
Index: LogTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/LogTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LogTransformer.java 22 Oct 2003 18:07:15 -0000 1.3
+++ LogTransformer.java 24 Oct 2003 12:50:08 -0000 1.4
@@ -227,11 +227,11 @@
/**
* Receive notification of the end of an element.
*/
- public void endElement(String uri, String loc, String qname)
+ public void endElement(String uri, String loc, String raw)
throws SAXException {
- this.log ("endElement", "uri="+uri+",local="+loc+",qname="+qname);
+ this.log ("endElement", "uri="+uri+",local="+loc+",raw="+raw);
if (super.contentHandler!=null) {
- super.contentHandler.endElement(uri,loc,qname);
+ super.contentHandler.endElement(uri,loc,raw);
}
}
1.8 +11 -11
cocoon-2.2/src/java/org/apache/cocoon/transformation/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/TraxTransformer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TraxTransformer.java 22 Oct 2003 18:07:15 -0000 1.7
+++ TraxTransformer.java 24 Oct 2003 12:50:08 -0000 1.8
@@ -228,16 +228,16 @@
if (!xsltProcessorRole.startsWith(XSLTProcessor.ROLE)) {
xsltProcessorRole = XSLTProcessor.ROLE + '/' + xsltProcessorRole;
}
- if (this.getLogger().isDebugEnabled()) {
- this.getLogger().debug("Use parameters is " +
this.useParameters);
- this.getLogger().debug("Use cookies is " + this.useCookies);
- this.getLogger().debug("Use session info is " +
this.useSessionInfo);
- this.getLogger().debug("Use TrAX Processor " +
xsltProcessorRole);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Use parameters is " + this.useParameters);
+ getLogger().debug("Use cookies is " + this.useCookies);
+ getLogger().debug("Use session info is " + this.useSessionInfo);
+ getLogger().debug("Use TrAX Processor " + xsltProcessorRole);
if (traxFactory != null) {
- this.getLogger().debug("Use TrAX Transformer Factory " +
traxFactory);
+ getLogger().debug("Use TrAX Transformer Factory " +
traxFactory);
} else {
- this.getLogger().debug("Use default TrAX Transformer
Factory.");
+ getLogger().debug("Use default TrAX Transformer Factory.");
}
}
@@ -293,8 +293,8 @@
_useCookies = par.getParameterAsBoolean("use-cookies",
this.useCookies);
_useSessionInfo = par.getParameterAsBoolean("use-session-info",
this.useSessionInfo);
- if (this.getLogger().isDebugEnabled()) {
- this.getLogger().debug("Using stylesheet: '" +
this.inputSource.getURI() + "' in " + this);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Using stylesheet: '" +
this.inputSource.getURI() + "' in " + this);
}
/** Get a Transformer Handler */
@@ -315,7 +315,7 @@
* @return The generated key hashes the src
*/
public java.io.Serializable getKey() {
- Map map = this.getLogicSheetParameters();
+ Map map = getLogicSheetParameters();
if (map == null) {
return this.inputSource.getURI();
}
