svn commit: r14752 - trunk/src/argouml-app/src/org/argouml/persistence/ResolvedCriticXMLHelper.java

Author: tfmorris
Date: 2008-05-16 09:09:14-0700
New Revision: 14752

Modified:
   trunk/src/argouml-app/src/org/argouml/persistence/ResolvedCriticXMLHelper.java

Log:
Deprecate API that use Vector return type

Modified: trunk/src/argouml-app/src/org/argouml/persistence/ResolvedCriticXMLHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/ResolvedCriticXMLHelper.java?view=diff&rev=14752&p1=trunk/src/argouml-app/src/org/argouml/persistence/ResolvedCriticXMLHelper.java&p2=trunk/src/argouml-app/src/org/argouml/persistence/ResolvedCriticXMLHelper.java&r1=14751&r2=14752
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/persistence/ResolvedCriticXMLHelper.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/persistence/ResolvedCriticXMLHelper.java	2008-05-16 09:09:14-0700
@@ -24,7 +24,7 @@
 
 package org.argouml.persistence;
 
-import java.util.Iterator;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 
@@ -76,28 +76,38 @@
      * @return	A Vector of OffenderXMLHelpers, or null if there are
      *		no offenders.
      * @see	OffenderXMLHelper
+     * @deprecated for 0.25.6 by tfmorris.  Use {@link #getOffenders()}.
      */
-    public Vector getOffenderList() {
-	List in = item.getOffenderList();
-	Iterator elems;
-	Vector out;
-
-	if (in == null) {
-	    return null;
-	}
-	out = new Vector();
-	elems = in.iterator();
-	while (elems.hasNext()) {
-	    try {
-		OffenderXMLHelper helper =
-		    new OffenderXMLHelper((String) elems.next());
-		out.addElement(helper);
-	    } catch (ClassCastException cce) {
-	        // TODO: Shouldn't we do something here?
-	    }
-	}
-
+    public Vector<OffenderXMLHelper> getOffenderList() {
+        Vector<OffenderXMLHelper> out = new Vector<OffenderXMLHelper>();
+        collectOffenders(out);
 	return out;
     }
+
+
+    private void collectOffenders(List<OffenderXMLHelper> out) {
+        List<String> in = item.getOffenderList();
+        if (in == null) {
+            return;
+        }
+        for (String element : in) {
+            out.add(new OffenderXMLHelper(element));
+        }
+    }
+    
+    /**
+     * Gets the offender list of this critic where each offender is wrapped in
+     * an OffenderXMLHelper.
+     * 
+     * @return A List of OffenderXMLHelpers. If there are no offenders it
+     *         returns an empty list.
+     * @see OffenderXMLHelper
+     */
+    public List<OffenderXMLHelper> getOffenders() {
+        List<OffenderXMLHelper> out = new ArrayList<OffenderXMLHelper>();
+        collectOffenders(out);
+        return out;
+    }
+
 }