polish

diff --git a/testing/src/test/java/org/aspectj/testing/util/AccumulatingFileFilter.java b/testing/src/test/java/org/aspectj/testing/util/AccumulatingFileFilter.java
index e01f7187473820a62f57b65983b82243d2fc9732..3ee387a7f7df2e9dbfd29d95b2b58b21486efd12 100644 (file)
--- a/testing/src/test/java/org/aspectj/testing/util/AccumulatingFileFilter.java
+++ b/testing/src/test/java/org/aspectj/testing/util/AccumulatingFileFilter.java
@@ -22,7 +22,7 @@ import java.util.Vector;
  * accumulated.
  */
 public class AccumulatingFileFilter extends ValidFileFilter {
-    Vector files = new Vector();
+    Vector<File> files = new Vector<File>();
     public final boolean accept(File f) {
         if (super.accept(f) && (accumulate(f))) {
             files.add(f);

diff --git a/testing/src/test/java/org/aspectj/testing/util/BridgeUtil.java b/testing/src/test/java/org/aspectj/testing/util/BridgeUtil.java
index f06e93850b1c63e926218ddb7c1a86f8ec47868a..a4672b23f8147b08bcdba224fc467b56337b1ca9 100644 (file)
--- a/testing/src/test/java/org/aspectj/testing/util/BridgeUtil.java
+++ b/testing/src/test/java/org/aspectj/testing/util/BridgeUtil.java
@@ -150,8 +150,8 @@ public class BridgeUtil {
          * 
          * Use only for sorts, not to maintain maps.
          */
-        public static final Comparator WEAK_File = new Comparator() {
-            public int compare(Object o1, Object o2) {
+        public static final Comparator<File> WEAK_File = new Comparator<File>() {
+            public int compare(File o1, File o2) {
                 if ((o1 == o2) 
                     || (o1 == ISourceLocation.NO_FILE) 
                     || (o2 == ISourceLocation.NO_FILE) ) {
@@ -182,8 +182,8 @@ public class BridgeUtil {
          * Ordering only uses line number.
          * Use only for sorts, not to maintain maps.
          */
-        public static final Comparator WEAK_ISourceLocation = new Comparator() {
-            public int compare(Object o1, Object o2) {
+        public static final Comparator<ISourceLocation> WEAK_ISourceLocation = new Comparator<ISourceLocation>() {
+            public int compare(ISourceLocation o1, ISourceLocation o2) {
                 if (o1 == o2) {
                     return 0;
                 }
@@ -204,8 +204,8 @@ public class BridgeUtil {
          * uses WEAK_FILE on the sourceFile.
          * Use only for sorts, not to maintain maps.
          */
-        public static final Comparator MEDIUM_ISourceLocation = new Comparator() {
-            public int compare(Object o1, Object o2) {
+        public static final Comparator<ISourceLocation> MEDIUM_ISourceLocation = new Comparator<ISourceLocation>() {
+            public int compare(ISourceLocation o1, ISourceLocation o2) {
                 int result = WEAK_ISourceLocation.compare(o1, o2);
                 if (0 != result) {
                     return result;
@@ -229,8 +229,8 @@ public class BridgeUtil {
          * and ignores message
          * so use only for sorts, not to maintain maps
          */
-        public static final Comparator WEAK_IMessage = new Comparator() {
-            public int compare(Object o1, Object o2) {
+        public static final Comparator<IMessage> WEAK_IMessage = new Comparator<IMessage>() {
+            public int compare(IMessage o1, IMessage o2) {
                 if (o1 == o2) {
                     return 0;
                 }
@@ -258,8 +258,8 @@ public class BridgeUtil {
      *  or if either is empty, i.e., none specified).
      * so use only for sorts, not to maintain maps
      */
-    public static final Comparator MEDIUM_IMessage = new Comparator() {
-        public int compare(Object o1, Object o2) {
+    public static final Comparator<IMessage> MEDIUM_IMessage = new Comparator<IMessage>() {
+        public int compare(IMessage o1, IMessage o2) {
             int result = WEAK_IMessage.compare(o1, o2);
             if (0 != result) {
                 return result;

diff --git a/testing/src/test/java/org/aspectj/testing/util/Diffs.java b/testing/src/test/java/org/aspectj/testing/util/Diffs.java
index a6edf0d87778d3d6a0e4325dc6f77890e71ef0ac..eb09f97005cfb8b4d9d98c08c048e53e2c13907c 100644 (file)
--- a/testing/src/test/java/org/aspectj/testing/util/Diffs.java
+++ b/testing/src/test/java/org/aspectj/testing/util/Diffs.java
@@ -69,12 +69,12 @@ public class Diffs {
        /**
         * Compare IMessages based on kind and source location line (only).
         */
-       public static final Comparator MESSAGE_LINEKIND = new Comparator() {
+       public static final Comparator<IMessage> MESSAGE_LINEKIND = new Comparator<IMessage>() {
                /**
                 * Compare IMessages based on kind and source location line (only).
                 * @throws NullPointerException if anything is null
                 */
-               public int compare(Object lhs, Object rhs) {
+               public int compare(IMessage lhs, IMessage rhs) {
                        IMessage lm = (IMessage) lhs;
                        IMessage rm = (IMessage) rhs;
             ISourceLocation ls = (lm == null ? null : lm.getSourceLocation());
@@ -444,7 +444,7 @@ public class Diffs {
        private static ArrayList getExcept(
                IMessage[] source,
                IMessage.Kind[] skip) {
-               ArrayList sink = new ArrayList();
+               ArrayList<IMessage> sink = new ArrayList<IMessage>();
                if (LangUtil.isEmpty(source)) {
                        return sink;
                }

diff --git a/testing/src/test/java/org/aspectj/testing/util/FileUtil.java b/testing/src/test/java/org/aspectj/testing/util/FileUtil.java
index db77cbd1070af3e67fb6025996efe93221e253e7..86db6baa5159faf3922f42c14a5885f68afee579 100644 (file)
--- a/testing/src/test/java/org/aspectj/testing/util/FileUtil.java
+++ b/testing/src/test/java/org/aspectj/testing/util/FileUtil.java
@@ -329,9 +329,9 @@ public class FileUtil {
      * @throws IllegalArgumentException if null == dir 
      * @return a Collection of String of paths, including paths inside jars
      */
-    public static Collection directoryToString(File dir, Collection results) {
+    public static Collection<String> directoryToString(File dir, Collection results) {
         if (null == dir) throw new IllegalArgumentException("null dir");
-        final Collection result = (results != null? results : new Vector());
+        final Collection<String> result = (results != null? results : new Vector());
         if (isZipFile(dir)) {
             zipFileToString(dir, result);
         } else if (!dir.isDirectory()) {

diff --git a/testing/src/test/java/org/aspectj/testing/util/LinkCheck.java b/testing/src/test/java/org/aspectj/testing/util/LinkCheck.java
index 3f1ef92a1b599125a741ebfd544b079b15ea4b8b..0e81b24d379cfd7f6b41bf8568f40b0f07bf4093 100644 (file)
--- a/testing/src/test/java/org/aspectj/testing/util/LinkCheck.java
+++ b/testing/src/test/java/org/aspectj/testing/util/LinkCheck.java
@@ -157,10 +157,10 @@ public class LinkCheck {
     
     private final Messages messages;
     private final HTMLEditorKit.Parser parser; // XXX untested - stateful
-    private final ArrayList linksToCheck; // Link
-    private final ArrayList checkedUrls;  // String (URL.toString)
-    private final ArrayList validRefs;  // String (URL.toString)
-    private final ArrayList refsToCheck;  // String (URL.toString)
+    private final ArrayList<Link> linksToCheck;
+    private final ArrayList<String> checkedUrls;  // String (URL.toString)
+    private final ArrayList<String> validRefs;  // String (URL.toString)
+    private final ArrayList<String> refsToCheck;  // String (URL.toString)
     
     private final Link.Check checkExists;
     private final Link.Check checkContents;
@@ -172,10 +172,10 @@ public class LinkCheck {
         LangUtil.throwIaxIfNull(checkExists, "checkExists");
         LangUtil.throwIaxIfNull(checkContents, "checkContents");
         this.messages = new Messages(handler);
-        linksToCheck = new ArrayList();
-        checkedUrls = new ArrayList();
-        refsToCheck = new ArrayList();
-        validRefs = new ArrayList();
+        linksToCheck = new ArrayList<Link>();
+        checkedUrls = new ArrayList<String>();
+        refsToCheck = new ArrayList<String>();
+        validRefs = new ArrayList<String>();
         parser = new HTMLEditorKit() {
             public HTMLEditorKit.Parser getParser() {
                 return super.getParser();
@@ -207,13 +207,13 @@ public class LinkCheck {
     }
 
     public synchronized void run() {
-        ArrayList list = new ArrayList();
+        ArrayList<Link> list = new ArrayList<Link>();
         while (0 < linksToCheck.size()) {
             messages.checkingLinks(linksToCheck.size());
             list.clear();
             list.addAll(linksToCheck);
-            for (Iterator iter = list.iterator(); iter.hasNext();) {
-                final Link link = (Link) iter.next();
+            for (Iterator<Link> iter = list.iterator(); iter.hasNext();) {
+                final Link link = iter.next();
                 String urlString = link.url.toString();
                 if (!checkedUrls.contains(urlString)) {
                     checkedUrls.add(urlString);
@@ -224,8 +224,8 @@ public class LinkCheck {
             linksToCheck.removeAll(list);
         }
         // now check that all named references are accounted for
-        for (Iterator iter = refsToCheck.iterator(); iter.hasNext();) {
-            String ref = (String) iter.next();
+        for (Iterator<String> iter = refsToCheck.iterator(); iter.hasNext();) {
+            String ref = iter.next();
             if (!validRefs.contains(ref)) {
                 messages.namedReferenceNotFound(ref);
             }