Index: java/java/beans/XMLEncoder.java =================================================================== --- java/java/beans/XMLEncoder.java (revision 412374) +++ java/java/beans/XMLEncoder.java (working copy) @@ -153,9 +153,9 @@ printBytes(tabCount, tag.toStringOnOpen()); - Enumeration e = node.statements(); - while(e.hasMoreElements()) { - Statement s = (Statement) e.nextElement(); + Iterator e = node.statements(); + while(e.hasNext()) { + Statement s = (Statement) e.next(); printVoidTag(++tabCount, s); --tabCount; } @@ -173,10 +173,10 @@ boolean isReferenced = node.getReferencesNumber() > 0; if(!isReferenced) { - Enumeration referencedExpressions = node.referencedExpressions(); - while(referencedExpressions.hasMoreElements()) { + Iterator referencedExpressions = node.referencedExpressions(); + while(referencedExpressions.hasNext()) { Expression expr = - (Expression) referencedExpressions.nextElement(); + (Expression) referencedExpressions.next(); //System.out.println("expr.getMethodName() = " // + expr.getMethodName()); @@ -238,17 +238,17 @@ --tabCount; } - Enumeration e1 = node.expressions(); - while(e1.hasMoreElements()) { - Expression e = (Expression) e1.nextElement(); + Iterator i1 = node.expressions(); + while(i1.hasNext()) { + Expression e = (Expression) i1.next(); printVoidTag(++tabCount, e); --tabCount; } - Enumeration e2 = node.statements(); - while(e2.hasMoreElements()) { - Statement s = (Statement) e2.nextElement(); + Iterator i2 = node.statements(); + while(i2.hasNext()) { + Statement s = (Statement) i2.next(); printVoidTag(++tabCount, s); --tabCount; Index: java/org/apache/harmony/beans/ObjectNode.java =================================================================== --- java/org/apache/harmony/beans/ObjectNode.java (revision 412374) +++ java/org/apache/harmony/beans/ObjectNode.java (working copy) @@ -22,9 +22,9 @@ import java.beans.Expression; import java.beans.Statement; -import java.util.Enumeration; -import java.util.HashMap; import java.util.Iterator; +import java.util.HashMap; +import java.util.HashSet; import java.util.Vector; /** @@ -38,7 +38,7 @@ private Object objectValue = null; private HashMap nodes; - private Vector statements = new Vector(); + private HashSet statements = new HashSet(); private Vector expressions = new Vector(); private Vector referencedExpressions = new Vector(); @@ -123,33 +123,21 @@ public void addExpression(Expression expression) { expressions.add(expression); } - + + // FIXME should be replaced with HashSet public void addStatement(Statement statement) { - boolean found = false; - Iterator i = statements.iterator(); - while(i.hasNext()) { - Statement s = (Statement) i.next(); - - if(s.equals(statement)) { - found = true; - break; - } - } - - if(!found) { - statements.add(statement); - } + statements.add(statement); } - public Enumeration expressions() { - return expressions.elements(); + public Iterator expressions() { + return expressions.iterator(); } - public Enumeration referencedExpressions() { - return referencedExpressions.elements(); + public Iterator referencedExpressions() { + return referencedExpressions.iterator(); } - public Enumeration statements() { - return statements.elements(); + public Iterator statements() { + return statements.iterator(); } }