← Back to branch summary

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

« back to all changes in this revision

Viewing changes to org.aspectj/modules/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerCflow.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/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerCflow.java
30
30
import org.aspectj.weaver.ResolvedMemberImpl;
31
31
import org.aspectj.weaver.ResolvedType;
32
32
import org.aspectj.weaver.Shadow;
 
33
import org.aspectj.weaver.ShadowMunger;
33
34
import org.aspectj.weaver.UnresolvedType;
34
35
import org.aspectj.weaver.VersionedDataInputStream;
35
36
import org.aspectj.weaver.World;
94
95
 
95
96
                CrosscuttingMembers xcut = inAspect.crosscuttingMembers;
96
97
 
97
 
                Collection previousCflowEntries = xcut.getCflowEntries();
 
98
                Collection<ShadowMunger> previousCflowEntries = xcut.getCflowEntries();
98
99
                Pointcut concreteEntry = entry.concretize(inAspect, inAspect, 0, null); // IntMap
99
100
                // .
100
101
                // EMPTY
101
102
                // )
102
103
                // ;
103
 
                List innerCflowEntries = new ArrayList(xcut.getCflowEntries());
 
104
                List<ShadowMunger> innerCflowEntries = new ArrayList<ShadowMunger>(xcut.getCflowEntries());
104
105
                innerCflowEntries.removeAll(previousCflowEntries);
105
106
 
106
107
                xcut.addConcreteShadowMunger(Advice.makePerCflowEntry(world, concreteEntry, isBelow, cflowStackField, inAspect,
108
109
 
109
110
                // ATAJ: add a munger to add the aspectOf(..) to the @AJ aspects
110
111
                if (inAspect.isAnnotationStyleAspect() && !inAspect.isAbstract()) {
111
 
                        inAspect.crosscuttingMembers.addLateTypeMunger(inAspect.getWorld().getWeavingSupport().makePerClauseAspect(inAspect,
112
 
                                        getKind()));
 
112
                        inAspect.crosscuttingMembers.addLateTypeMunger(inAspect.getWorld().getWeavingSupport()
 
113
                                        .makePerClauseAspect(inAspect, getKind()));
113
114
                }
114
115
 
115
116
                // ATAJ inline around advice support - don't use a late munger to allow