GROOVY-8757

groovy · Sep 16, 2019 · 59ef171 · 59ef171
1 parent 64f3ae0
commit 59ef171
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/base/org.codehaus.groovy24/src/org/codehaus/groovy/transform/trait/TraitComposer.java b/base/org.codehaus.groovy24/src/org/codehaus/groovy/transform/trait/TraitComposer.java
@@ -329,9 +329,9 @@ private static void createForwarderMethod(
                 helperMethodArgList
         );
         mce.setImplicitThis(false);
-
+        /* GRECLIPSE edit -- GROOVY-8757
         genericsSpec = GenericsUtils.addMethodGenerics(helperMethod,genericsSpec);
-
+        */
         ClassNode[] exceptionNodes = correctToGenericsSpecRecurse(genericsSpec, copyExceptions(helperMethod.getExceptions()));
         ClassNode fixedReturnType = correctToGenericsSpecRecurse(genericsSpec, helperMethod.getReturnType());
         boolean noCastRequired = genericsSpec.isEmpty() || fixedReturnType.getName().equals(ClassHelper.VOID_TYPE.getName());
@@ -341,8 +341,7 @@ private static void createForwarderMethod(
         // guaranteed to be always present
         boolean isHelperForStaticMethod = helperMethodParams[0].getOriginType().equals(ClassHelper.CLASS_Type);
         if (Modifier.isPrivate(access) && !isHelperForStaticMethod) {
-            // do not create forwarder for private methods
-            // see GROOVY-7213
+            // GROOVY-7213: do not create forwarder for private methods
             return;
         }
         if (!isHelperForStaticMethod) {

diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/trait/TraitComposer.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/trait/TraitComposer.java
@@ -333,9 +333,9 @@ private static void createForwarderMethod(
                 helperMethodArgList
         );
         mce.setImplicitThis(false);
-
+        /* GRECLIPSE edit -- GROOVY-8757
         genericsSpec = GenericsUtils.addMethodGenerics(helperMethod,genericsSpec);
-
+        */
         ClassNode[] exceptionNodes = correctToGenericsSpecRecurse(genericsSpec, copyExceptions(helperMethod.getExceptions()));
         ClassNode fixedReturnType = correctToGenericsSpecRecurse(genericsSpec, helperMethod.getReturnType());
         boolean noCastRequired = genericsSpec.isEmpty() || fixedReturnType.getName().equals(ClassHelper.VOID_TYPE.getName());
@@ -345,8 +345,7 @@ private static void createForwarderMethod(
         // guaranteed to be always present
         boolean isHelperForStaticMethod = helperMethodParams[0].getOriginType().equals(ClassHelper.CLASS_Type);
         if (Modifier.isPrivate(access) && !isHelperForStaticMethod) {
-            // do not create forwarder for private methods
-            // see GROOVY-7213
+            // GROOVY-7213: do not create forwarder for private methods
             return;
         }
         if (!isHelperForStaticMethod) {

diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/trait/TraitComposer.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/trait/TraitComposer.java
@@ -333,9 +333,9 @@ private static void createForwarderMethod(
                 helperMethodArgList
         );
         mce.setImplicitThis(false);
-
+        /* GRECLIPSE edit -- GROOVY-8757
         genericsSpec = GenericsUtils.addMethodGenerics(helperMethod,genericsSpec);
-
+        */
         ClassNode[] exceptionNodes = correctToGenericsSpecRecurse(genericsSpec, copyExceptions(helperMethod.getExceptions()));
         ClassNode fixedReturnType = correctToGenericsSpecRecurse(genericsSpec, helperMethod.getReturnType());
         boolean noCastRequired = genericsSpec.isEmpty() || fixedReturnType.getName().equals(ClassHelper.VOID_TYPE.getName());
@@ -345,8 +345,7 @@ private static void createForwarderMethod(
         // guaranteed to be always present
         boolean isHelperForStaticMethod = helperMethodParams[0].getOriginType().equals(ClassHelper.CLASS_Type);
         if (Modifier.isPrivate(access) && !isHelperForStaticMethod) {
-            // do not create forwarder for private methods
-            // see GROOVY-7213
+            // GROOVY-7213: do not create forwarder for private methods
             return;
         }
         if (!isHelperForStaticMethod) {