Fix part 1 for pr110307

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java
index d3ff29a8bf52993af090a85be024ea18fa792d80..cb2044e4b78e7c3b3aff831603c546b11e889e3b 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java
@@ -197,5 +197,9 @@ public class EclipseTypeMunger extends ConcreteTypeMunger {
        public AbstractMethodDeclaration getSourceMethod() {
                return sourceMethod;
        }
+       
+       public ConcreteTypeMunger parameterizedFor(ResolvedType target) {
+               return new EclipseTypeMunger(world,munger.parameterizedFor(target),aspectType,sourceMethod);
+       }
 
 }

diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index 8f638cc41ed582c2c9a71e6c20a9583c1ec32cc0..90375c3ca9bf35e95919ea175b1d6ffe0054f89f 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -485,9 +485,9 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 //  public void testCantProvideDefaultImplViaITD_pr110307_1() {runTest("Cant provide default implementation via ITD - 1");}
 //  public void testCantProvideDefaultImplViaITD_pr110307_2() {runTest("Cant provide default implementation via ITD - 2");}
 //  public void testCantProvideDefaultImplViaITD_pr110307_3() {runTest("Cant provide default implementation via ITD - 3");}
-//  public void testCantProvideDefaultImplViaITD_pr110307_4() {runTest("Cant provide default implementation via ITD - 4");}
+  public void testCantProvideDefaultImplViaITD_pr110307_4() {runTest("Cant provide default implementation via ITD - 4");}
 //  public void testCantProvideDefaultImplViaITD_pr110307_5() {runTest("Cant provide default implementation via ITD - 5");}
- // public void testCantProvideDefaultImplViaITD_pr110307_6() {runTest("Cant provide default implementation via ITD - 6");}
+//  public void testCantProvideDefaultImplViaITD_pr110307_6() {runTest("Cant provide default implementation via ITD - 6");}
   
   public void testCallJoinPointsInAnonymousInnerClasses() {
          runTest("call join points in anonymous inner classes");