← 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/CflowPointcut.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/org.aspectj.matcher/src/org/aspectj/weaver/patterns/CflowPointcut.java
34
34
import org.aspectj.weaver.ResolvedPointcutDefinition;
35
35
import org.aspectj.weaver.ResolvedType;
36
36
import org.aspectj.weaver.Shadow;
 
37
import org.aspectj.weaver.ShadowMunger;
37
38
import org.aspectj.weaver.UnresolvedType;
38
39
import org.aspectj.weaver.VersionedDataInputStream;
39
40
import org.aspectj.weaver.WeaverMessages;
185
186
                ResolvedType concreteAspect = bindings.getConcreteAspect();
186
187
 
187
188
                CrosscuttingMembers xcut = concreteAspect.crosscuttingMembers;
188
 
                Collection previousCflowEntries = xcut.getCflowEntries();
 
189
                Collection<ShadowMunger> previousCflowEntries = xcut.getCflowEntries();
189
190
 
190
191
                entryBindings.pushEnclosingDefinition(CFLOW_MARKER);
191
192
                // This block concretizes the pointcut within the cflow pointcut
195
196
                        entryBindings.popEnclosingDefinitition();
196
197
                }
197
198
 
198
 
                List innerCflowEntries = new ArrayList(xcut.getCflowEntries());
 
199
                List<ShadowMunger> innerCflowEntries = new ArrayList<ShadowMunger>(xcut.getCflowEntries());
199
200
                innerCflowEntries.removeAll(previousCflowEntries);
200
201
 
201
202
                // Four routes of interest through this code (did I hear someone say