From 548f8b6a118d06874d511ffcc13602b4ec756d9a Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Fri, 2 Mar 2012 08:15:27 -0800 Subject: [PATCH] generics --- .../harness/bridge/AbstractRunSpec.java | 14 +++++----- .../taskdefs/AjcTaskCompileCommandTest.java | 8 +++--- ...jectIncrementalAjdeInteractionTestbed.java | 26 +++++++------------ 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java b/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java index f3d260028..d45037aac 100644 --- a/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java +++ b/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java @@ -89,7 +89,7 @@ abstract public class AbstractRunSpec implements IRunSpec { protected final ArrayList paths; // XXXXXunused protected final ArrayList /*ISourceLocation*/ sourceLocations; // XXX remove? protected final ArrayList children; - protected final ArrayList /* DirChanges.Spec */dirChanges; + protected final ArrayList dirChanges; protected XMLNames xmlNames; protected String comment; @@ -775,10 +775,10 @@ abstract public class AbstractRunSpec implements IRunSpec { private boolean verbose; /** null unless parent set options for children to consider */ - final private ArrayList /* String */parentOptions; + final private ArrayList parentOptions; public RT() { - parentOptions = new ArrayList(); + parentOptions = new ArrayList(); } public boolean isVerbose() { @@ -878,15 +878,15 @@ abstract public class AbstractRunSpec implements IRunSpec { if (LangUtil.isEmpty(validOptions) || LangUtil.isEmpty(parentOptions)) { return new String[0]; } - ArrayList result = new ArrayList(); + ArrayList result = new ArrayList(); // boolean haveOption = false; for (int i = 0; i < validOptions.length; i++) { String option = validOptions[i]; if (LangUtil.isEmpty(option)) { continue; } - for (ListIterator iter = parentOptions.listIterator(); iter.hasNext();) { - String parentOption = (String) iter.next(); + for (ListIterator iter = parentOptions.listIterator(); iter.hasNext();) { + String parentOption = iter.next(); if (parentOption.startsWith(option)) { result.add(parentOption); if (absorb) { @@ -899,7 +899,7 @@ abstract public class AbstractRunSpec implements IRunSpec { } /** Get ListIterator that permits removals */ - ListIterator getListIterator() { + ListIterator getListIterator() { return parentOptions.listIterator(); } diff --git a/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java b/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java index f6e59abdc..6ab5a386b 100644 --- a/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java +++ b/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java @@ -32,7 +32,7 @@ import junit.framework.TestCase; public class AjcTaskCompileCommandTest extends TestCase { static boolean loggedWarning = false; static boolean runAllTests = true; - static ArrayList tempFiles = new ArrayList(); + static ArrayList tempFiles = new ArrayList(); private static File getClassesDir() { File tempDir = FileUtil.getTempDir("AjcTaskCompileCommandTest-classes"); @@ -40,7 +40,7 @@ public class AjcTaskCompileCommandTest extends TestCase { return tempDir; } - private static void addCommonArgs(ArrayList list) { + private static void addCommonArgs(ArrayList list) { list.add("-d"); list.add(getClassesDir().getAbsolutePath()); list.add("-classpath"); @@ -109,7 +109,7 @@ public class AjcTaskCompileCommandTest extends TestCase { void runSimpleTest(String path, int expectedErrors) { File file = new File(path); assertTrue(path, file.canRead()); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList(); addCommonArgs(list); if (path.endsWith(".lst")) { list.add("-argfile"); @@ -123,7 +123,7 @@ public class AjcTaskCompileCommandTest extends TestCase { runTest(list, expectedErrors); } - void runTest(ArrayList args, int expectedErrors) { + void runTest(ArrayList args, int expectedErrors) { AjcTaskCompileCommand command = new AjcTaskCompileCommand(); MessageHandler handler = new MessageHandler(); diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/AbstractMultiProjectIncrementalAjdeInteractionTestbed.java b/tests/src/org/aspectj/systemtest/incremental/tools/AbstractMultiProjectIncrementalAjdeInteractionTestbed.java index a87d563c6..10c108067 100644 --- a/tests/src/org/aspectj/systemtest/incremental/tools/AbstractMultiProjectIncrementalAjdeInteractionTestbed.java +++ b/tests/src/org/aspectj/systemtest/incremental/tools/AbstractMultiProjectIncrementalAjdeInteractionTestbed.java @@ -61,8 +61,8 @@ public class AbstractMultiProjectIncrementalAjdeInteractionTestbed extends AjdeI // System.out.println("kvp: " + object + " = " + m.get(object)); // } // } - for (Iterator i = node.getChildren().iterator(); i.hasNext();) { - dumptree((IProgramElement) i.next(), indent + 2); + for (Iterator i = node.getChildren().iterator(); i.hasNext();) { + dumptree( i.next(), indent + 2); } } } @@ -88,17 +88,12 @@ public class AbstractMultiProjectIncrementalAjdeInteractionTestbed extends AjdeI public int getRelationshipCount(String project) { IRelationshipMap relmap = getModelFor(project).getRelationshipMap(); int ctr = 0; - Set entries = relmap.getEntries(); - for (Iterator iter = entries.iterator(); iter.hasNext();) { + Set entries = relmap.getEntries(); + for (Iterator iter = entries.iterator(); iter.hasNext();) { String hid = (String) iter.next(); - List rels = relmap.get(hid); - for (Iterator iterator = rels.iterator(); iterator.hasNext();) { - IRelationship ir = (IRelationship) iterator.next(); - List targets = ir.getTargets(); - for (Iterator iterator2 = targets.iterator(); iterator2.hasNext();) { - String thid = (String) iterator2.next(); - ctr++; - } + List rels = relmap.get(hid); + for (Iterator iterator = rels.iterator(); iterator.hasNext();) { + ctr+=iterator.next().getTargets().size(); } } return ctr; @@ -114,14 +109,13 @@ public class AbstractMultiProjectIncrementalAjdeInteractionTestbed extends AjdeI private void constructUpToDateLstFile(String pname, String configname) { File projectBase = new File(sandboxDir, pname); File toConstruct = new File(projectBase, configname); - List filesForCompilation = new ArrayList(); + List filesForCompilation = new ArrayList(); collectUpFiles(projectBase, projectBase, filesForCompilation); try { FileOutputStream fos = new FileOutputStream(toConstruct); DataOutputStream dos = new DataOutputStream(fos); - for (Iterator iter = filesForCompilation.iterator(); iter.hasNext();) { - String file = (String) iter.next(); + for (String file: filesForCompilation) { dos.writeBytes(file + "\n"); } dos.close(); @@ -130,7 +124,7 @@ public class AbstractMultiProjectIncrementalAjdeInteractionTestbed extends AjdeI } } - private void collectUpFiles(File location, File base, List collectionPoint) { + private void collectUpFiles(File location, File base, List collectionPoint) { String contents[] = location.list(); if (contents == null) return; -- 2.39.5