← 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/BcelRenderer.java

  • Committer: Bazaar Package Importer
  • Author(s): Damien Raude-Morvan
  • Date: 2011-03-15 23:54:31 UTC
  • mfrom: (1.2.5 upstream)
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: james.westby@ubuntu.com-20110315235431-iq2gxbsx08kpwuiw
* 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/BcelRenderer.java
150
150
                InstructionList il = new InstructionList();
151
151
 
152
152
                // If it is null jump past the advice call
153
 
                il.append(fact.createBranchInstruction(Constants.IFNULL, fk));
 
153
                il.append(InstructionFactory.createBranchInstruction(Constants.IFNULL, fk));
154
154
 
155
155
                // Load up the var again
156
156
                il.append(((BcelVar) hasAnnotation.getVar()).createLoad(fact));
157
157
 
158
 
                Member getClass = MemberImpl.method(UnresolvedType.OBJECT, 0, UnresolvedType.JAVA_LANG_CLASS, "getClass",
 
158
                Member getClass = MemberImpl.method(UnresolvedType.OBJECT, 0, UnresolvedType.JL_CLASS, "getClass",
159
159
                                UnresolvedType.NONE);
160
160
                il.append(Utility.createInvoke(fact, world, getClass));
161
161
                // aload annotationClass
162
162
                il.append(fact.createConstant(new ObjectType(hasAnnotation.getAnnotationType().getName())));
163
163
                // int annClassIndex = fact.getConstantPool().addClass(hasAnnotation.getAnnotationType().getSignature());
164
164
                // il.append(new LDC_W(annClassIndex));
165
 
                Member isAnnotationPresent = MemberImpl.method(UnresolvedType.JAVA_LANG_CLASS, 0, ResolvedType.BOOLEAN,
166
 
                                "isAnnotationPresent", new UnresolvedType[] { UnresolvedType.JAVA_LANG_CLASS });
 
165
                Member isAnnotationPresent = MemberImpl.method(UnresolvedType.JL_CLASS, 0, ResolvedType.BOOLEAN,
 
166
                                "isAnnotationPresent", new UnresolvedType[] { UnresolvedType.JL_CLASS });
167
167
                il.append(Utility.createInvoke(fact, world, isAnnotationPresent));
168
168
                il.append(createJumpBasedOnBooleanOnStack());
169
169
                instructions.insert(il);
201
201
        }
202
202
 
203
203
        public void visit(Literal literal) {
204
 
                if (literal == Literal.FALSE)
 
204
                if (literal == Literal.FALSE) {
205
205
                        throw new BCException("visiting a false expression");
 
206
                }
206
207
        }
207
208
 
208
209
        public void visit(Call call) {