mkwan 2003/10/15 07:48:28
Modified: java/src/org/apache/xalan/xslt Tag: xslt20-compiled
EnvironmentCheck.java
java/src/org/apache/xalan/xsltc/compiler Tag:
xslt20-compiled AttributeValueTemplate.java
java/src/org/apache/xml/serializer Tag: xslt20-compiled
CharInfo.java
java/src/org/apache/xml/utils Tag: xslt20-compiled
Hashtree2Node.java
Log:
Propagate the fix for bug 22342 from the head branch.
Revision Changes Path
No revision
No revision
1.21.2.1 +15 -15
xml-xalan/java/src/org/apache/xalan/xslt/EnvironmentCheck.java
Index: EnvironmentCheck.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xslt/EnvironmentCheck.java,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -r1.21 -r1.21.2.1
--- EnvironmentCheck.java 14 Aug 2003 16:27:44 -0000 1.21
+++ EnvironmentCheck.java 15 Oct 2003 14:48:28 -0000 1.21.2.1
@@ -298,12 +298,12 @@
"#---- BEGIN writeEnvironmentReport($Revision$): Useful stuff found:
----");
// Fake the Properties-like output
- for (Enumeration enum = h.keys();
- enum.hasMoreElements();
+ for (Enumeration keys = h.keys();
+ keys.hasMoreElements();
/* no increment portion */
)
{
- Object key = enum.nextElement();
+ Object key = keys.nextElement();
String keyStr = (String) key;
try
{
@@ -401,12 +401,12 @@
{
Hashtable subhash = (Hashtable) v.elementAt(i);
- for (Enumeration enum = subhash.keys();
- enum.hasMoreElements();
+ for (Enumeration keys = subhash.keys();
+ keys.hasMoreElements();
/* no increment portion */
)
{
- Object key = enum.nextElement();
+ Object key = keys.nextElement();
String keyStr = (String) key;
try
{
@@ -470,12 +470,12 @@
Element hashNode = factory.createElement("environment");
envCheckNode.appendChild(hashNode);
- for (Enumeration enum = h.keys();
- enum.hasMoreElements();
+ for (Enumeration keys = h.keys();
+ keys.hasMoreElements();
/* no increment portion */
)
{
- Object key = enum.nextElement();
+ Object key = keys.nextElement();
String keyStr = (String) key;
try
{
@@ -552,12 +552,12 @@
{
Hashtable subhash = (Hashtable) v.elementAt(i);
- for (Enumeration enum = subhash.keys();
- enum.hasMoreElements();
+ for (Enumeration keys = subhash.keys();
+ keys.hasMoreElements();
/* no increment portion */
)
{
- Object key = enum.nextElement();
+ Object key = keys.nextElement();
try
{
String keyStr = (String) key;
No revision
No revision
1.8.6.1 +4 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AttributeValueTemplate.java
Index: AttributeValueTemplate.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AttributeValueTemplate.java,v
retrieving revision 1.8
retrieving revision 1.8.6.1
diff -u -r1.8 -r1.8.6.1
--- AttributeValueTemplate.java 30 Jan 2003 18:45:59 -0000 1.8
+++ AttributeValueTemplate.java 15 Oct 2003 14:48:28 -0000 1.8.6.1
@@ -197,9 +197,9 @@
il.append(DUP);
il.append(new INVOKESPECIAL(initBuffer));
// StringBuffer is on the stack
- final Enumeration enum = elements();
- while (enum.hasMoreElements()) {
- final Expression exp = (Expression)enum.nextElement();
+ final Enumeration elements = elements();
+ while (elements.hasMoreElements()) {
+ final Expression exp = (Expression)elements.nextElement();
exp.translate(classGen, methodGen);
il.append(append);
}
No revision
No revision
1.6.2.2 +3 -3
xml-xalan/java/src/org/apache/xml/serializer/CharInfo.java
Index: CharInfo.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/serializer/CharInfo.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- CharInfo.java 5 Oct 2003 14:01:57 -0000 1.6.2.1
+++ CharInfo.java 15 Oct 2003 14:48:28 -0000 1.6.2.2
@@ -214,9 +214,9 @@
}
if (entities != null) {
- Enumeration enum = entities.getKeys();
- while (enum.hasMoreElements()){
- String name = (String) enum.nextElement();
+ Enumeration keys = entities.getKeys();
+ while (keys.hasMoreElements()){
+ String name = (String) keys.nextElement();
String value = entities.getString(name);
int code = Integer.parseInt(value);
defineEntity(name, (char) code);
No revision
No revision
1.3.6.1 +8 -8
xml-xalan/java/src/org/apache/xml/utils/Hashtree2Node.java
Index: Hashtree2Node.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/Hashtree2Node.java,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- Hashtree2Node.java 30 Jan 2003 18:46:19 -0000 1.3
+++ Hashtree2Node.java 15 Oct 2003 14:48:28 -0000 1.3.6.1
@@ -119,12 +119,12 @@
Element hashNode = factory.createElement(elemName);
container.appendChild(hashNode);
- Enumeration enum = hash.keys();
+ Enumeration keys = hash.keys();
Vector v = new Vector();
- while (enum.hasMoreElements())
+ while (keys.hasMoreElements())
{
- Object key = enum.nextElement();
+ Object key = keys.nextElement();
String keyStr = key.toString();
Object item = hash.get(key);
@@ -157,12 +157,12 @@
}
// Now go back and do the saved hashes
- enum = v.elements();
- while (enum.hasMoreElements())
+ keys = v.elements();
+ while (keys.hasMoreElements())
{
// Retrieve name and hash in two steps
- String n = (String) enum.nextElement();
- Hashtable h = (Hashtable) enum.nextElement();
+ String n = (String) keys.nextElement();
+ Hashtable h = (Hashtable) keys.nextElement();
appendHashToNode(h, n, hashNode, factory);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
