← Back to branch summary

~ubuntu-branches/ubuntu/wily/aspectj/wily-proposed

« back to all changes in this revision

Viewing changes to org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/AnnotationAccessFieldVar.java

  • Committer: Bazaar Package Importer
  • Author(s): Damien Raude-Morvan
  • Date: 2011-03-15 23:54:31 UTC
  • mfrom: (1.1.5 upstream) (7.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20110315235431-7d8cs3gvs4tnqx7t
Tags: 1.6.11+dfsg-1
* New upstream release.
* Updated Standards-Version to 3.9.1 (no changes needed).
* Fix local Javadoc links:
  - d/patches/07_javadoc_links.diff: Use locally installed
   javadoc packages and hyperlink with them.
  - d/control: Add B-D on default-java-doc and libasm3-java-doc.
* d/control: Drop B-D on itself (our new bootstrap infrastructure doesn't need
  that anymore).
* Split packages into :
  - aspectj: only contains CLI tools.
  - libaspectj-java: JAR librairies for /usr/share/java.
  - libaspectj-java-doc: 4 API's Javadoc.
  - aspectj-doc: Programming Guides and SDK Documentation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/AnnotationAccessFieldVar.java
60
60
                for (int i = 0; i < annos.length; i++) {
61
61
                        AnnotationGen annotation = ((BcelAnnotation) annos[i]).getBcelAnnotation();
62
62
                        if (annotation.getTypeSignature().equals(annotationOfInterestSignature)) {
63
 
                                List vals = annotation.getValues();
 
63
                                List<NameValuePair> vals = annotation.getValues();
64
64
                                boolean doneAndDusted = false;
65
 
                                for (Iterator iterator = vals.iterator(); iterator.hasNext();) {
66
 
                                        NameValuePair object = (NameValuePair) iterator.next();
 
65
                                for (Iterator<NameValuePair> iterator = vals.iterator(); iterator.hasNext();) {
 
66
                                        NameValuePair object = iterator.next();
67
67
                                        Object o = object.getValue();
68
68
                                        if (o instanceof EnumElementValue) {
69
69
                                                EnumElementValue v = (EnumElementValue) object.getValue();
84
84
                                                // il.append(fact.createGetStatic(rt.getName(), v.getEnumValueString(), Type.getType(rt.getSignature())));
85
85
                                                // doneAndDusted = true;
86
86
                                                // }
87
 
                                                int stop = 1;
88
87
                                        }
89
88
                                }
90
89
                                if (!doneAndDusted) {
91
 
                                        ResolvedMember[] annotationFields = toType.getWorld().resolve(
92
 
                                                        UnresolvedType.forSignature(annotation.getTypeSignature())).getDeclaredMethods();
 
90
                                        ResolvedMember[] annotationFields = toType.getWorld()
 
91
                                                        .resolve(UnresolvedType.forSignature(annotation.getTypeSignature())).getDeclaredMethods();
93
92
 
94
93
                                        // ResolvedMember[] fs = rt.getDeclaredFields();
95
94
                                        for (int ii = 0; ii < annotationFields.length; ii++) {