|
|
d516255 |
diff -up adaptx-0.9.14-src/src/main/org/exolab/adaptx/jaxp/transform/IdentityTransformer.java.BAD adaptx-0.9.14-src/src/main/org/exolab/adaptx/jaxp/transform/IdentityTransformer.java
|
|
|
d516255 |
--- adaptx-0.9.14-src/src/main/org/exolab/adaptx/jaxp/transform/IdentityTransformer.java.BAD 2007-10-17 13:48:06.000000000 -0400
|
|
|
d516255 |
+++ adaptx-0.9.14-src/src/main/org/exolab/adaptx/jaxp/transform/IdentityTransformer.java 2007-10-17 13:48:25.000000000 -0400
|
|
|
d516255 |
@@ -424,9 +424,9 @@ public class IdentityTransformer
|
|
|
d516255 |
}
|
|
|
d516255 |
else {
|
|
|
d516255 |
_outputProperties = new Properties();
|
|
|
d516255 |
- Enumeration enum = properties.keys();
|
|
|
d516255 |
- while (enum.hasMoreElements()) {
|
|
|
d516255 |
- String name = (String)enum.nextElement();
|
|
|
d516255 |
+ Enumeration MyEnum = properties.keys();
|
|
|
d516255 |
+ while (MyEnum.hasMoreElements()) {
|
|
|
d516255 |
+ String name = (String)MyEnum.nextElement();
|
|
|
d516255 |
String value = properties.getProperty(name);
|
|
|
d516255 |
_outputProperties.setProperty(name, value);
|
|
|
d516255 |
}
|
|
|
d516255 |
diff -up adaptx-0.9.14-src/src/main/org/exolab/adaptx/jaxp/transform/TransformerImpl.java.BAD adaptx-0.9.14-src/src/main/org/exolab/adaptx/jaxp/transform/TransformerImpl.java
|
|
|
d516255 |
--- adaptx-0.9.14-src/src/main/org/exolab/adaptx/jaxp/transform/TransformerImpl.java.BAD 2007-10-17 13:48:46.000000000 -0400
|
|
|
d516255 |
+++ adaptx-0.9.14-src/src/main/org/exolab/adaptx/jaxp/transform/TransformerImpl.java 2007-10-17 13:49:15.000000000 -0400
|
|
|
d516255 |
@@ -454,9 +454,9 @@ public class TransformerImpl
|
|
|
d516255 |
else {
|
|
|
d516255 |
_outputProperties = new Properties();
|
|
|
d516255 |
XSLOutput output = new XSLOutput();
|
|
|
d516255 |
- Enumeration enum = properties.keys();
|
|
|
d516255 |
- while (enum.hasMoreElements()) {
|
|
|
d516255 |
- String name = (String)enum.nextElement();
|
|
|
d516255 |
+ Enumeration MyEnum = properties.keys();
|
|
|
d516255 |
+ while (MyEnum.hasMoreElements()) {
|
|
|
d516255 |
+ String name = (String)MyEnum.nextElement();
|
|
|
d516255 |
String value = properties.getProperty(name);
|
|
|
d516255 |
_outputProperties.setProperty(name, value);
|
|
|
d516255 |
try {
|
|
|
d516255 |
diff -up adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/XSLTProcessor.java.BAD adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/XSLTProcessor.java
|
|
|
d516255 |
--- adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/XSLTProcessor.java.BAD 2007-10-17 13:50:28.000000000 -0400
|
|
|
d516255 |
+++ adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/XSLTProcessor.java 2007-10-17 13:50:49.000000000 -0400
|
|
|
d516255 |
@@ -1266,9 +1266,9 @@ public class XSLTProcessor
|
|
|
d516255 |
* @param ruleProcessor the RuleProcessor to copy parameters to
|
|
|
d516255 |
**/
|
|
|
d516255 |
private void copyParams(RuleProcessor ruleProcessor) {
|
|
|
d516255 |
- Enumeration enum = params.keys();
|
|
|
d516255 |
- while (enum.hasMoreElements()) {
|
|
|
d516255 |
- String name = (String)enum.nextElement();
|
|
|
d516255 |
+ Enumeration MyEnum = params.keys();
|
|
|
d516255 |
+ while (MyEnum.hasMoreElements()) {
|
|
|
d516255 |
+ String name = (String)MyEnum.nextElement();
|
|
|
d516255 |
ruleProcessor.setParameter(name, params.getProperty(name));
|
|
|
d516255 |
}
|
|
|
d516255 |
} //-- copyParams
|
|
|
d516255 |
diff -up adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/XSLTStylesheet.java.BAD adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/XSLTStylesheet.java
|
|
|
d516255 |
--- adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/XSLTStylesheet.java.BAD 2007-10-17 13:50:56.000000000 -0400
|
|
|
d516255 |
+++ adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/XSLTStylesheet.java 2007-10-17 13:52:01.000000000 -0400
|
|
|
d516255 |
@@ -569,10 +569,10 @@ public class XSLTStylesheet extends XSLO
|
|
|
d516255 |
if (namespace == null) return null;
|
|
|
d516255 |
String qns = (String) quotedns.get(namespace);
|
|
|
d516255 |
if (qns != null) {
|
|
|
d516255 |
- Enumeration enum = namespaces.keys();
|
|
|
d516255 |
+ Enumeration MyEnum = namespaces.keys();
|
|
|
d516255 |
String key;
|
|
|
d516255 |
- while (enum.hasMoreElements()) {
|
|
|
d516255 |
- key = (String)enum.nextElement();
|
|
|
d516255 |
+ while (MyEnum.hasMoreElements()) {
|
|
|
d516255 |
+ key = (String)MyEnum.nextElement();
|
|
|
d516255 |
if (qns.equals(namespaces.get(key)))
|
|
|
d516255 |
return key;
|
|
|
d516255 |
}
|
|
|
d516255 |
@@ -1094,16 +1094,16 @@ public class XSLTStylesheet extends XSLO
|
|
|
d516255 |
|
|
|
d516255 |
// combine global variables and parameters
|
|
|
d516255 |
try {
|
|
|
d516255 |
- Enumeration enum = xsl.getVariables();
|
|
|
d516255 |
- while (enum.hasMoreElements()) {
|
|
|
d516255 |
- Variable v = (Variable) enum.nextElement();
|
|
|
d516255 |
+ Enumeration MyEnum = xsl.getVariables();
|
|
|
d516255 |
+ while (MyEnum.hasMoreElements()) {
|
|
|
d516255 |
+ Variable v = (Variable) MyEnum.nextElement();
|
|
|
d516255 |
Variable tmp = getVariable(v.getName());
|
|
|
d516255 |
if (tmp != null) variables.remove(tmp);
|
|
|
d516255 |
addVariable(v, true);
|
|
|
d516255 |
}
|
|
|
d516255 |
- enum = xsl.getParameters();
|
|
|
d516255 |
- while (enum.hasMoreElements()) {
|
|
|
d516255 |
- Param p = (Param) enum.nextElement();
|
|
|
d516255 |
+ MyEnum = xsl.getParameters();
|
|
|
d516255 |
+ while (MyEnum.hasMoreElements()) {
|
|
|
d516255 |
+ Param p = (Param) MyEnum.nextElement();
|
|
|
d516255 |
Param tmp = getParameter(p.getName());
|
|
|
d516255 |
if (tmp != null) parameters.remove(tmp);
|
|
|
d516255 |
addParam(p);
|
|
|
d516255 |
diff -up adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/RuleProcessor.java.BAD adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/RuleProcessor.java
|
|
|
d516255 |
--- adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/RuleProcessor.java.BAD 2007-10-17 13:49:26.000000000 -0400
|
|
|
d516255 |
+++ adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/RuleProcessor.java 2007-10-17 13:50:20.000000000 -0400
|
|
|
d516255 |
@@ -262,7 +262,7 @@ public class RuleProcessor extends Error
|
|
|
d516255 |
|
|
|
d516255 |
ResultFormatter rf = ps.getResultFormatter();
|
|
|
d516255 |
|
|
|
d516255 |
- Enumeration enum = null;
|
|
|
d516255 |
+ Enumeration MyEnum = null;
|
|
|
d516255 |
//-- copy top-level declared namespaces
|
|
|
d516255 |
/*
|
|
|
d516255 |
Hashtable namespaces = stylesheet.getNamespaces();
|
|
|
d516255 |
@@ -304,9 +304,9 @@ public class RuleProcessor extends Error
|
|
|
d516255 |
|
|
|
d516255 |
// Process top-level parameters
|
|
|
d516255 |
ScopedVariableSet vars = ps.getVariables();
|
|
|
d516255 |
- enum = stylesheet.getParameters();
|
|
|
d516255 |
- while (enum.hasMoreElements()) {
|
|
|
d516255 |
- Param param = (Param)enum.nextElement();
|
|
|
d516255 |
+ MyEnum = stylesheet.getParameters();
|
|
|
d516255 |
+ while (MyEnum.hasMoreElements()) {
|
|
|
d516255 |
+ Param param = (Param)MyEnum.nextElement();
|
|
|
d516255 |
//-- first check passed in parameters
|
|
|
d516255 |
String value = getParameter(param.getName());
|
|
|
d516255 |
if (value != null) {
|
|
|
d516255 |
@@ -322,9 +322,9 @@ public class RuleProcessor extends Error
|
|
|
d516255 |
}
|
|
|
d516255 |
|
|
|
d516255 |
//-- Process top-level variables
|
|
|
d516255 |
- enum = stylesheet.getVariables();
|
|
|
d516255 |
- while (enum.hasMoreElements()) {
|
|
|
d516255 |
- Variable variable = (Variable)enum.nextElement();
|
|
|
d516255 |
+ MyEnum = stylesheet.getVariables();
|
|
|
d516255 |
+ while (MyEnum.hasMoreElements()) {
|
|
|
d516255 |
+ Variable variable = (Variable)MyEnum.nextElement();
|
|
|
d516255 |
XPathResult value = processVariable(variable, ps);
|
|
|
d516255 |
if (value != null) {
|
|
|
d516255 |
vars.setVariable(variable.getName(), value);
|
|
|
d516255 |
diff -up adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/handlers/ResultHandlerAdapter2.java.BAD adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/handlers/ResultHandlerAdapter2.java
|
|
|
d516255 |
--- adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/handlers/ResultHandlerAdapter2.java.BAD 2007-10-17 13:52:09.000000000 -0400
|
|
|
d516255 |
+++ adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/handlers/ResultHandlerAdapter2.java 2007-10-17 13:52:24.000000000 -0400
|
|
|
d516255 |
@@ -200,9 +200,9 @@ public class ResultHandlerAdapter2 imple
|
|
|
d516255 |
_handler.endElement(uri, name, name);
|
|
|
d516255 |
}
|
|
|
d516255 |
|
|
|
d516255 |
- Enumeration enum = _namespaces.getLocalNamespacePrefixes();
|
|
|
d516255 |
- while (enum.hasMoreElements()) {
|
|
|
d516255 |
- _handler.endPrefixMapping((String)enum.nextElement());
|
|
|
d516255 |
+ Enumeration MyEnum = _namespaces.getLocalNamespacePrefixes();
|
|
|
d516255 |
+ while (MyEnum.hasMoreElements()) {
|
|
|
d516255 |
+ _handler.endPrefixMapping((String)MyEnum.nextElement());
|
|
|
d516255 |
}
|
|
|
d516255 |
_namespaces = _namespaces.getParent();
|
|
|
d516255 |
|