[patch] xpp2 patch replacing enum variable names

xpp2-2.1.10-enum.patch (text/plain), 4.87 KB, created by postmodern on 2005-09-16 14:08:13 UTC

diff -Naur PullParser2.1.10.old/src/java/impl/format/org/gjt/xpp/impl/format/Recorder.java PullParser2.1.10/src/java/impl/format/org/gjt/xpp/impl/format/Recorder.java
--- PullParser2.1.10.old/src/java/impl/format/org/gjt/xpp/impl/format/Recorder.java	2003-11-15 05:42:07.000000000 +0000
+++ PullParser2.1.10/src/java/impl/format/org/gjt/xpp/impl/format/Recorder.java	2005-09-16 21:10:14.000000000 +0000
@@ -186,13 +186,13 @@
 //	out.write('>');
 	
 	// for each children - print it
-	//Enumeration enum = node.children();
+	//Enumeration enumeration = node.children();
 	boolean hadChildren = false;
-	//while (enum.hasMoreElements())
+	//while (enumeration.hasMoreElements())
 	int childCount = node.getChildrenCount();
 	for(int i = 0; i < childCount; ++i)
 	{
-	  Object o = node.getChildAt(i);//enum.nextElement();
+	  Object o = node.getChildAt(i);//enumeration.nextElement();
 	  // do not output null or empty string "" nodes
 	  if(o == null
 //		 || (o instanceof String && o.toString().length() == 0)
diff -Naur PullParser2.1.10.old/src/java/impl/node/org/gjt/xpp/impl/node/Node.java PullParser2.1.10/src/java/impl/node/org/gjt/xpp/impl/node/Node.java
--- PullParser2.1.10.old/src/java/impl/node/org/gjt/xpp/impl/node/Node.java	2003-11-15 05:42:07.000000000 +0000
+++ PullParser2.1.10/src/java/impl/node/org/gjt/xpp/impl/node/Node.java	2005-09-16 21:10:46.000000000 +0000
@@ -273,9 +273,9 @@
         oneChild = null;
 
         if(children != null && children.size() > 0) {
-            Enumeration enum = children.elements();
-            while (enum.hasMoreElements()) {
-                Object child = enum.nextElement();
+            Enumeration enumeration = children.elements();
+            while (enumeration.hasMoreElements()) {
+                Object child = enumeration.nextElement();
                 if(child instanceof XmlNode) {
                     ((XmlNode)child).setParentNode(null);
                 }
@@ -373,11 +373,11 @@
         if(declaredNs != null) {
             System.arraycopy(declaredNs, 0, uris, off, len);
         }
-        //    Enumeration enum = prefix2Ns.keys();
+        //    Enumeration enumeration = prefix2Ns.keys();
         //    int i = off;
-        //    while (enum.hasMoreElements() && i < off + len)
+        //    while (enumeration.hasMoreElements() && i < off + len)
         //    {
-        //        uris[i++] = (String) prefix2Ns.get( enum.nextElement() );
+        //        uris[i++] = (String) prefix2Ns.get( enumeration.nextElement() );
         //    }
     }
 
@@ -512,10 +512,10 @@
                 buf.append(declaredNs[i]);
                 buf.append("'");
             }
-            //        Enumeration enum = prefix2Ns.keys();
-            //        while (enum.hasMoreElements())
+            //        Enumeration enumeration = prefix2Ns.keys();
+            //        while (enumeration.hasMoreElements())
             //        {
-            //              Object key = enum.nextElement();
+            //              Object key = enumeration.nextElement();
             //              buf.append("xmlns:");
             //              buf.append(key);
             //              buf.append("='");
diff -Naur PullParser2.1.10.old/src/java/tests/node/NodeTest.java PullParser2.1.10/src/java/tests/node/NodeTest.java
--- PullParser2.1.10.old/src/java/tests/node/NodeTest.java	2003-11-15 05:42:08.000000000 +0000
+++ PullParser2.1.10/src/java/tests/node/NodeTest.java	2005-09-16 21:09:56.000000000 +0000
@@ -386,20 +386,20 @@
         assertEquals("", t1.getDefaultNamespaceUri());
 
         // check enumeration stuff...
-        Enumeration enum = t1.children();
+        Enumeration enumeration = t1.children();
         assertEquals(0, t1.getChildrenCountSoFar());
         //child1, child2...
-        assertTrue(enum.hasMoreElements());
-        child1 = (XmlPullNode) enum.nextElement();
+        assertTrue(enumeration.hasMoreElements());
+        child1 = (XmlPullNode) enumeration.nextElement();
         assertEquals("child1", child1.getLocalName());
-        assertNotNull(enum.nextElement());
-        child3 = (XmlPullNode) enum.nextElement();
+        assertNotNull(enumeration.nextElement());
+        child3 = (XmlPullNode) enumeration.nextElement();
         assertEquals("child3", child3.getLocalName());
-        assertNotNull(enum.nextElement());
+        assertNotNull(enumeration.nextElement());
         assertEquals(4, t1.getChildrenCountSoFar());
-        assertEquals(true, enum.hasMoreElements());
-        assertNotNull(enum.nextElement());
-        assertEquals(false, enum.hasMoreElements());
+        assertEquals(true, enumeration.hasMoreElements());
+        assertNotNull(enumeration.nextElement());
+        assertEquals(false, enumeration.hasMoreElements());
 
         XmlPullNode t2 = (XmlPullNode) node.getChildAt(1);
         assertEquals("t2", t2.getLocalName());