← 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/NewMethodTypeMunger.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/NewMethodTypeMunger.java
69
69
        public static ResolvedTypeMunger readMethod(VersionedDataInputStream s, ISourceContext context) throws IOException {
70
70
                ISourceLocation sloc = null;
71
71
                ResolvedMemberImpl rmImpl = ResolvedMemberImpl.readResolvedMember(s, context);
72
 
                Set superMethodsCalled = readSuperMethodsCalled(s);
 
72
                Set<ResolvedMember> superMethodsCalled = readSuperMethodsCalled(s);
73
73
                sloc = readSourceLocation(s);
74
 
                List typeVarAliases = readInTypeAliases(s);
 
74
                List<String> typeVarAliases = readInTypeAliases(s);
75
75
 
76
76
                ResolvedTypeMunger munger = new NewMethodTypeMunger(rmImpl, superMethodsCalled, typeVarAliases);
77
77
                if (sloc != null) {
138
138
                return result;
139
139
        }
140
140
 
141
 
        public ResolvedTypeMunger parameterizeWith(Map m, World w) {
 
141
        public ResolvedTypeMunger parameterizeWith(Map<String, UnresolvedType> m, World w) {
142
142
                ResolvedMember parameterizedSignature = getSignature().parameterizedWith(m, w);
143
143
                NewMethodTypeMunger nmtm = new NewMethodTypeMunger(parameterizedSignature, getSuperMethodsCalled(), typeVariableAliases);
144
144
                nmtm.setDeclaredSignature(getSignature());