first bit of java 5 in the weaver module - will the build machine cope?

diff --git a/weaver/.isJava5 b/weaver/.isJava5
new file mode 100644 (file)
index 0000000..136d063
--- /dev/null
+++ b/weaver/.isJava5
@@ -0,0 +1 @@
+  
\ No newline at end of file

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelAnnotation.java b/weaver/src/org/aspectj/weaver/bcel/BcelAnnotation.java
index 9dfaa22c6d888b203242f5f084b3251b25bf5f93..a7da4be1e1e40a2295c16aba67d3496c718c8bec 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/BcelAnnotation.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelAnnotation.java
@@ -42,9 +42,9 @@ public class BcelAnnotation extends AbstractAnnotationAJ {
        /**
         * {@inheritDoc}
         */
-       public Set /* of String */getTargets() {
+       public Set<String> getTargets() {
                if (!type.equals(UnresolvedType.AT_TARGET)) {
-                       return Collections.EMPTY_SET;
+                       return Collections.emptySet();
                }
                List values = bcelAnnotation.getValues();
                ElementNameValuePairGen envp = (ElementNameValuePairGen) values.get(0);