You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mu...@apache.org on 2023/06/16 08:24:58 UTC
[xalan-java] branch xalan-j_xslt3.0 updated: doing little bit of code refactoring, for xalanj
This is an automated email from the ASF dual-hosted git repository.
mukulg pushed a commit to branch xalan-j_xslt3.0
in repository https://gitbox.apache.org/repos/asf/xalan-java.git
The following commit(s) were added to refs/heads/xalan-j_xslt3.0 by this push:
new 1ab719cd doing little bit of code refactoring, for xalanj
1ab719cd is described below
commit 1ab719cd13affb23f5880ab51efec96aa0d2fb56
Author: Mukul Gandhi <ga...@gmail.com>
AuthorDate: Fri Jun 16 13:54:41 2023 +0530
doing little bit of code refactoring, for xalanj
---
src/org/apache/xalan/templates/ElemIterate.java | 14 +++++++-------
src/org/apache/xalan/templates/ElemIterateBreak.java | 4 ++--
.../apache/xalan/templates/ElemIterateOnCompletion.java | 4 ++--
src/org/apache/xalan/xslt/Process.java | 5 +++--
...er.java => XslTransformationGlobalSharedDatastore.java} | 7 +++++--
src/org/apache/xml/utils/DefaultErrorHandler.java | 4 ++--
6 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/src/org/apache/xalan/templates/ElemIterate.java b/src/org/apache/xalan/templates/ElemIterate.java
index b1bfae10..95e55710 100644
--- a/src/org/apache/xalan/templates/ElemIterate.java
+++ b/src/org/apache/xalan/templates/ElemIterate.java
@@ -23,7 +23,7 @@ import java.util.List;
import javax.xml.transform.TransformerException;
import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xalan.xslt.util.XslTransformErrorLocatorHelper;
+import org.apache.xalan.xslt.util.XslTransformationGlobalSharedDatastore;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.utils.IntStack;
@@ -250,7 +250,7 @@ public class ElemIterate extends ElemTemplateElement implements ExpressionOwner
xslOnCompletionTemplate = (ElemIterateOnCompletion)elemTemplate;
}
- if (!(XslTransformErrorLocatorHelper.isXslIterateBreakEvaluated).booleanValue()) {
+ if (!(XslTransformationGlobalSharedDatastore.isXslIterateBreakEvaluated).booleanValue()) {
xctxt.setSAXLocator(elemTemplate);
transformer.setCurrentElement(elemTemplate);
elemTemplate.execute(transformer);
@@ -260,21 +260,21 @@ public class ElemIterate extends ElemTemplateElement implements ExpressionOwner
}
}
- if ((XslTransformErrorLocatorHelper.isXslIterateBreakEvaluated).booleanValue()) {
+ if ((XslTransformationGlobalSharedDatastore.isXslIterateBreakEvaluated).booleanValue()) {
break;
}
}
- if ((xslOnCompletionTemplate != null) && !(XslTransformErrorLocatorHelper.
+ if ((xslOnCompletionTemplate != null) && !(XslTransformationGlobalSharedDatastore.
isXslIterateBreakEvaluated).booleanValue()) {
- XslTransformErrorLocatorHelper.isXslIterateOnCompletionActive = Boolean.TRUE;
+ XslTransformationGlobalSharedDatastore.isXslIterateOnCompletionActive = Boolean.TRUE;
xctxt.setSAXLocator(xslOnCompletionTemplate);
transformer.setCurrentElement(xslOnCompletionTemplate);
xslOnCompletionTemplate.execute(transformer);
- XslTransformErrorLocatorHelper.isXslIterateOnCompletionActive = Boolean.FALSE;
+ XslTransformationGlobalSharedDatastore.isXslIterateOnCompletionActive = Boolean.FALSE;
}
- XslTransformErrorLocatorHelper.isXslIterateBreakEvaluated = Boolean.FALSE;
+ XslTransformationGlobalSharedDatastore.isXslIterateBreakEvaluated = Boolean.FALSE;
}
finally {
xctxt.popSAXLocator();
diff --git a/src/org/apache/xalan/templates/ElemIterateBreak.java b/src/org/apache/xalan/templates/ElemIterateBreak.java
index 6bb57128..7842b3fc 100644
--- a/src/org/apache/xalan/templates/ElemIterateBreak.java
+++ b/src/org/apache/xalan/templates/ElemIterateBreak.java
@@ -20,7 +20,7 @@ package org.apache.xalan.templates;
import javax.xml.transform.TransformerException;
import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xalan.xslt.util.XslTransformErrorLocatorHelper;
+import org.apache.xalan.xslt.util.XslTransformationGlobalSharedDatastore;
import org.apache.xml.serializer.SerializationHandler;
import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionOwner;
@@ -169,7 +169,7 @@ public class ElemIterateBreak extends ElemTemplateElement implements ExpressionO
if (isXslBreakDescendantOfXslIterate && isXslInstructionInTailPositionOfSequenceConstructor(this)) {
transformXslBreakInstruction(transformer);
- XslTransformErrorLocatorHelper.isXslIterateBreakEvaluated = Boolean.TRUE;
+ XslTransformationGlobalSharedDatastore.isXslIterateBreakEvaluated = Boolean.TRUE;
}
else {
throw new TransformerException("XTSE3120 : an xsl:break instruction is not in a "
diff --git a/src/org/apache/xalan/templates/ElemIterateOnCompletion.java b/src/org/apache/xalan/templates/ElemIterateOnCompletion.java
index 3c69b392..5f0acf4e 100644
--- a/src/org/apache/xalan/templates/ElemIterateOnCompletion.java
+++ b/src/org/apache/xalan/templates/ElemIterateOnCompletion.java
@@ -20,7 +20,7 @@ package org.apache.xalan.templates;
import javax.xml.transform.TransformerException;
import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xalan.xslt.util.XslTransformErrorLocatorHelper;
+import org.apache.xalan.xslt.util.XslTransformationGlobalSharedDatastore;
import org.apache.xml.serializer.SerializationHandler;
import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionOwner;
@@ -170,7 +170,7 @@ public class ElemIterateOnCompletion extends ElemTemplateElement implements Expr
public void transformXslOncompletionInstruction(TransformerImpl transformer) throws
TransformerException {
- if ((XslTransformErrorLocatorHelper.isXslIterateOnCompletionActive).booleanValue()) {
+ if ((XslTransformationGlobalSharedDatastore.isXslIterateOnCompletionActive).booleanValue()) {
final XPathContext originalXctxt = transformer.getXPathContext();
XPathContext xctxt = transformer.getXPathContext();
diff --git a/src/org/apache/xalan/xslt/Process.java b/src/org/apache/xalan/xslt/Process.java
index 654c0587..af1a5806 100644
--- a/src/org/apache/xalan/xslt/Process.java
+++ b/src/org/apache/xalan/xslt/Process.java
@@ -56,7 +56,7 @@ import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.trace.PrintTraceListener;
import org.apache.xalan.trace.TraceManager;
import org.apache.xalan.transformer.XalanProperties;
-import org.apache.xalan.xslt.util.XslTransformErrorLocatorHelper;
+import org.apache.xalan.xslt.util.XslTransformationGlobalSharedDatastore;
import org.apache.xml.utils.DefaultErrorHandler;
import org.apache.xml.utils.SystemIDResolver;
import org.w3c.dom.Document;
@@ -750,7 +750,8 @@ public class Process
else
{
// System.out.println("Calling newTemplates: "+xslFileName);
- XslTransformErrorLocatorHelper.systemId = SystemIDResolver.getAbsoluteURI(xslFileName);
+ XslTransformationGlobalSharedDatastore.xslSystemId = SystemIDResolver.
+ getAbsoluteURI(xslFileName);
stylesheet = tfactory.newTemplates(new StreamSource(xslFileName));
// System.out.println("Done calling newTemplates: "+xslFileName);
}
diff --git a/src/org/apache/xalan/xslt/util/XslTransformErrorLocatorHelper.java b/src/org/apache/xalan/xslt/util/XslTransformationGlobalSharedDatastore.java
similarity index 82%
rename from src/org/apache/xalan/xslt/util/XslTransformErrorLocatorHelper.java
rename to src/org/apache/xalan/xslt/util/XslTransformationGlobalSharedDatastore.java
index 9b6399b3..d45b3514 100644
--- a/src/org/apache/xalan/xslt/util/XslTransformErrorLocatorHelper.java
+++ b/src/org/apache/xalan/xslt/util/XslTransformationGlobalSharedDatastore.java
@@ -25,12 +25,15 @@ package org.apache.xalan.xslt.util;
/*
* This class, stores few XSLT document transformation wide variables.
*/
-public class XslTransformErrorLocatorHelper {
+public class XslTransformationGlobalSharedDatastore {
- public static String systemId;
+ // XSLT document's uri used for error reporting
+ public static String xslSystemId;
+ // to support xsl:iterate instruction evaluation
public static Boolean isXslIterateBreakEvaluated = Boolean.FALSE;
+ // to support xsl:iterate instruction evaluation
public static Boolean isXslIterateOnCompletionActive = Boolean.FALSE;
}
diff --git a/src/org/apache/xml/utils/DefaultErrorHandler.java b/src/org/apache/xml/utils/DefaultErrorHandler.java
index dc37ede9..666d7a25 100644
--- a/src/org/apache/xml/utils/DefaultErrorHandler.java
+++ b/src/org/apache/xml/utils/DefaultErrorHandler.java
@@ -27,7 +27,7 @@ import javax.xml.transform.ErrorListener;
import javax.xml.transform.SourceLocator;
import javax.xml.transform.TransformerException;
-import org.apache.xalan.xslt.util.XslTransformErrorLocatorHelper;
+import org.apache.xalan.xslt.util.XslTransformationGlobalSharedDatastore;
import org.apache.xml.res.XMLErrorResources;
import org.apache.xml.res.XMLMessages;
@@ -336,7 +336,7 @@ public class DefaultErrorHandler implements ErrorHandler, ErrorListener
SourceLocator causeLocator = ((TransformerException)cause).getLocator();
if(null != causeLocator) {
if (causeLocator.getSystemId() == null) {
- xslSystemId = XslTransformErrorLocatorHelper.systemId;
+ xslSystemId = XslTransformationGlobalSharedDatastore.xslSystemId;
}
locator = causeLocator;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org