don't manually add groovyObject methods to stubGenerator

plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java

@@ -90,7 +90,10 @@ public class GrClassImplUtil {
     if (grType.isInterface() /*|| extendsTypes.length > 0*/) return extendsTypes;
     for (PsiClassType type : extendsTypes) {
       final PsiClass superClass = type.resolve();
-      if (superClass instanceof GrTypeDefinition && !superClass.isInterface()) return extendsTypes;
+      if (superClass instanceof GrTypeDefinition && !superClass.isInterface() ||
+          superClass != null && GroovyCommonClassNames.GROOVY_OBJECT_SUPPORT.equals(superClass.getQualifiedName())) {
+        return extendsTypes;
+      }
     }
 
     PsiClass grObSupport = GroovyPsiManager.getInstance(grType.getProject()).findClassWithCache(GroovyCommonClassNames.GROOVY_OBJECT_SUPPORT, grType.getResolveScope());

plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java

@@ -37,16 +37,16 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariableDeclaration;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrEnumConstantInitializer;
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrConstructor;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrEnumConstant;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod;
 import org.jetbrains.plugins.groovy.lang.psi.api.types.GrTypeElement;
 import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.TypesUtil;
-import org.jetbrains.plugins.groovy.lang.psi.util.GrClassImplUtil;
 
 import java.util.*;
 
+import static org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames.DEFAULT_BASE_CLASS_NAME;
+import static org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames.GROOVY_OBJECT_SUPPORT;
 import static org.jetbrains.plugins.groovy.refactoring.convertToJava.GenerationUtil.writeType;
 
 /**
@@ -276,21 +276,35 @@ public class StubGenerator implements ClassItemGenerator {
     if (classDef) {
       final Collection<MethodSignature> toOverride = OverrideImplementUtil.getMethodSignaturesToOverride(typeDefinition);
       for (MethodSignature signature : toOverride) {
-        if (signature instanceof MethodSignatureBackedByPsiMethod) {
-          final PsiMethod method = ((MethodSignatureBackedByPsiMethod)signature).getMethod();
-          final PsiClass baseClass = method.getContainingClass();
-          if (GenerationUtil.isAbstractInJava(method) && baseClass != null && typeDefinition.isInheritor(baseClass, true)) {
-            methods.add(mirrorMethod(typeDefinition, method, baseClass, PsiSubstitutor.EMPTY, GenerationUtil.JAVA_MODIFIERS));
-          }
+        if (!(signature instanceof MethodSignatureBackedByPsiMethod)) continue;
+
+        final PsiMethod method = ((MethodSignatureBackedByPsiMethod)signature).getMethod();
+        final PsiClass baseClass = method.getContainingClass();
+        if (baseClass == null) continue;
+        final String qname = baseClass.getQualifiedName();
+        if (DEFAULT_BASE_CLASS_NAME.equals(qname) || GROOVY_OBJECT_SUPPORT.equals(qname) ||
+            GenerationUtil.isAbstractInJava(method) && typeDefinition.isInheritor(baseClass, true)) {
+          if (method.isConstructor()) continue;
+          methods.add(mirrorMethod(typeDefinition, method, baseClass, signature.getSubstitutor()));
         }
       }
 
-      final PsiElementFactory factory = JavaPsiFacade.getInstance(myProject).getElementFactory();
+      final Collection<MethodSignature> toImplement = OverrideImplementUtil.getMethodSignaturesToImplement(typeDefinition);
+      for (MethodSignature signature : toImplement) {
+        if (!(signature instanceof MethodSignatureBackedByPsiMethod)) continue;
+        final PsiMethod resolved = ((MethodSignatureBackedByPsiMethod)signature).getMethod();
+        final PsiClass baseClass = resolved.getContainingClass();
+        if (baseClass == null) continue;
+        if (!DEFAULT_BASE_CLASS_NAME.equals(baseClass.getQualifiedName())) continue;
+
+        methods.add(mirrorMethod(typeDefinition, resolved, baseClass, signature.getSubstitutor()));
+      }
+      /*final PsiElementFactory factory = JavaPsiFacade.getInstance(myProject).getElementFactory();
       methods.add(factory.createMethodFromText("public groovy.lang.MetaClass getMetaClass() {}", null));
       methods.add(factory.createMethodFromText("public void setMetaClass(groovy.lang.MetaClass mc) {}", null));
       methods.add(factory.createMethodFromText("public Object invokeMethod(String name, Object args) {}", null));
       methods.add(factory.createMethodFromText("public Object getProperty(String propertyName) {}", null));
-      methods.add(factory.createMethodFromText("public void setProperty(String propertyName, Object newValue) {}", null));
+      methods.add(factory.createMethodFromText("public void setProperty(String propertyName, Object newValue) {}", null));*/
     }
 
     /*if (typeDefinition instanceof GrTypeDefinition) {
@@ -305,15 +319,14 @@ public class StubGenerator implements ClassItemGenerator {
   private static LightMethodBuilder mirrorMethod(PsiClass typeDefinition,
                                                  PsiMethod method,
                                                  PsiClass baseClass,
-                                                 PsiSubstitutor substitutor,
-                                                 String... modifierFilter) {
+                                                 PsiSubstitutor substitutor) {
     final LightMethodBuilder builder = new LightMethodBuilder(method.getManager(), method.getName());
     substitutor = substitutor.putAll(TypeConversionUtil.getSuperClassSubstitutor(baseClass, typeDefinition, PsiSubstitutor.EMPTY));
     for (PsiParameter parameter : method.getParameterList().getParameters()) {
       builder.addParameter(StringUtil.notNullize(parameter.getName()), substitutor.substitute(GenerationUtil.findOutParameterType(parameter)));
     }
     builder.setReturnType(substitutor.substitute(method.getReturnType()));
-    for (String modifier : modifierFilter) {
+    for (String modifier : GenerationUtil.JAVA_MODIFIERS) {
       if (method.hasModifierProperty(modifier)) {
         builder.addModifier(modifier);
       }

plugins/groovy/testdata/groovy/stubGenerator/arrayType1.test

@@ -1,4 +1,4 @@
-class Foo {
+class ArrayType1 {
  def int[] integers
  def String[] strings
 
@@ -6,7 +6,7 @@ class Foo {
  def Object[] getObj () {}
 }
 -----
-public class Foo extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public class ArrayType1 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
 public int[] foo() {
 return null;
 }
@@ -31,11 +31,11 @@ public void setStrings(java.lang.String[] strings) {
 return ;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -43,11 +43,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/atInterface.test

@@ -1,9 +1,9 @@
 import java.lang.annotation.*
 
-@Retention(RetentionPolicy.RUNTIME) @interface III {
+@Retention(RetentionPolicy.RUNTIME) @interface AtInterface {
 
 }
 -----
-public @interface III {
+public @interface AtInterface {
 }
 ---

plugins/groovy/testdata/groovy/stubGenerator/checkedExceptionInConstructorDelegate.test

@@ -1,25 +1,25 @@
-class Foo extends foo.SuperClass {
-  protected Foo(Foo p) {
+class CheckedException extends foo.SuperClass {
+  protected CheckedException(CheckedException p) {
     this("");
   }
-  protected Foo(String s) {
+  protected CheckedException(String s) {
     super(s);
   }
 }
 
 -----
-public class Foo extends foo.SuperClass implements groovy.lang.GroovyObject {
-public Foo(Foo p) throws java.io.IOException {
+public class CheckedException extends foo.SuperClass implements groovy.lang.GroovyObject {
+public CheckedException(CheckedException p) throws java.io.IOException {
 this((java.lang.String)null);
 }
-public Foo(java.lang.String s) throws java.io.IOException {
+public CheckedException(java.lang.String s) throws java.io.IOException {
 super((java.lang.String)null);
 }
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -27,11 +27,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/defInInterface.test

@@ -1,8 +1,8 @@
-interface Foo {
+interface DefInInterface {
   def bar
 }
 -----
-public interface Foo {
+public interface DefInInterface {
 public static final java.lang.Object bar = null;
 }
 ---

plugins/groovy/testdata/groovy/stubGenerator/delegateAnno.test

@@ -16,11 +16,11 @@ public java.lang.Object foo() ;
 }
 ---
 public class Doo extends groovy.lang.GroovyObjectSupport implements java.io.Serializable, groovy.lang.GroovyObject {
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -28,11 +28,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 
@@ -55,11 +55,11 @@ public void run() {
 return ;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -67,11 +67,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/delegationGenerics.test

@@ -1,18 +1,18 @@
-interface Foo<K,V> {
+interface DelegationGenerics<K,V> {
   V get(K k);
 }
 
 class ConfigNode {
-  @Delegate final Foo<String, Object> delegate
+  @Delegate final DelegationGenerics<String, Object> delegate
 }
 -----
-public interface Foo<K, V> {
+public interface DelegationGenerics<K, V> {
 public V get(K k) ;
 
 }
 ---
-public class ConfigNode extends groovy.lang.GroovyObjectSupport implements Foo<java.lang.String, java.lang.Object>, groovy.lang.GroovyObject {
-public final Foo<java.lang.String, java.lang.Object> getDelegate() {
+public class ConfigNode extends groovy.lang.GroovyObjectSupport implements DelegationGenerics<java.lang.String, java.lang.Object>, groovy.lang.GroovyObject {
+public final DelegationGenerics<java.lang.String, java.lang.Object> getDelegate() {
 return null;
 }
 
@@ -20,11 +20,11 @@ public java.lang.Object get(java.lang.String k) {
 return null;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -32,14 +32,14 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 
-private final Foo<java.lang.String, java.lang.Object> delegate = null;
+private final DelegationGenerics<java.lang.String, java.lang.Object> delegate = null;
 }
 ---

plugins/groovy/testdata/groovy/stubGenerator/extends1.test

@@ -1,14 +1,14 @@
-class b {
+class BExtends {
 }
-class a extends b {
+class AExtends extends BExtends {
 }
 -----
-public class b extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public groovy.lang.MetaClass getMetaClass() {
+public class BExtends extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -16,22 +16,22 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 
 }
 ---
-public class a extends b implements groovy.lang.GroovyObject {
-public groovy.lang.MetaClass getMetaClass() {
+public class AExtends extends BExtends implements groovy.lang.GroovyObject {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -39,11 +39,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/extendsImplements.test

@@ -1,12 +1,12 @@
-class a extends GroovyObjectSupport implements GroovyObject {
+class ExtendsImplements extends GroovyObjectSupport implements GroovyObject {
 }
 -----
-public class a extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public groovy.lang.MetaClass getMetaClass() {
+public class ExtendsImplements extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -14,11 +14,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/grvy1098.test

@@ -1,21 +1,21 @@
-class A {
+class Grvy1098 {
   static final def TEST
 }
 
-class B extends A {
+class B extends Grvy1098 {
   static final def TEST
 }
 -----
-public class A extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public class Grvy1098 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
 public static final java.lang.Object getTEST() {
 return null;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -23,23 +23,23 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 
 private static final java.lang.Object TEST = null;
 }
 ---
-public class B extends A implements groovy.lang.GroovyObject {
-public groovy.lang.MetaClass getMetaClass() {
+public class B extends Grvy1098 implements groovy.lang.GroovyObject {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -47,11 +47,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/grvy118.test

@@ -1,21 +1,21 @@
-abstract class A {
+abstract class A118 {
     public abstract myMethod()
 }
 
-class B extends A {
+class B118 extends A118 {
     public myMethod() {
         println "hello"
     }
 }
 -----
-public abstract class A extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public abstract class A118 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
 public abstract java.lang.Object myMethod() ;
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -23,26 +23,26 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 
 }
 ---
-public class B extends A implements groovy.lang.GroovyObject {
+public class B118 extends A118 implements groovy.lang.GroovyObject {
 public java.lang.Object myMethod() {
 return null;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -50,11 +50,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/grvy1358.test

@@ -1,8 +1,8 @@
-class MyClass {
+class Grvy1358 {
   boolean enabled
 }
 -----
-public class MyClass extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public class Grvy1358 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
 public boolean getEnabled() {
 return false;
 }
@@ -15,11 +15,11 @@ public void setEnabled(boolean enabled) {
 return ;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -27,11 +27,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/grvy1376.test

@@ -8,11 +8,11 @@ public class PerformanceLine extends java.util.HashMap implements groovy.lang.Gr
 public PerformanceLine(java.lang.String... data) {
 super((java.util.Map)null);
 }
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -20,11 +20,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/grvy170.test

@@ -1,22 +1,22 @@
-interface IBar extends groovy.lang.GroovyObject {}
-interface Foo extends IBar {
+interface IBar170 extends groovy.lang.GroovyObject {}
+interface Foo170 extends IBar170 {
 
 }
-class Test1 implements Foo {
+class Test1 implements Foo170 {
 }
 -----
-public interface IBar extends groovy.lang.GroovyObject {
+public interface IBar170 extends groovy.lang.GroovyObject {
 }
 ---
-public interface Foo extends IBar {
+public interface Foo170 extends IBar170 {
 }
 ---
-public class Test1 extends groovy.lang.GroovyObjectSupport implements Foo, groovy.lang.GroovyObject {
-public groovy.lang.MetaClass getMetaClass() {
+public class Test1 extends groovy.lang.GroovyObjectSupport implements Foo170, groovy.lang.GroovyObject {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -24,11 +24,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/grvy903.test

@@ -1,24 +1,24 @@
-class MyTestClass {
+class Grvy903 {
 
-    public MyTestClass(String s) {}
+    public Grvy903(String s) {}
 
-    public MyTestClass() {
+    public Grvy903() {
         this('some value')
     }
 }
 -----
-public class MyTestClass extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public MyTestClass(java.lang.String s) {
+public class Grvy903 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public Grvy903(java.lang.String s) {
 
 }
-public MyTestClass() {
+public Grvy903() {
 this((java.lang.String)null);
 }
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -26,11 +26,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/grvy908.test

@@ -1,25 +1,25 @@
-class MyClass {
-    MyClass(int i) {
+class Grvy908 {
+    Grvy908(int i) {
         this('something')
     }
 
-    MyClass(Object o) {
+    Grvy908(Object o) {
 
     }
 }
 -----
-public class MyClass extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public MyClass(int i) {
+public class Grvy908 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public Grvy908(int i) {
 this((java.lang.Object)null);
 }
-public MyClass(java.lang.Object o) {
+public Grvy908(java.lang.Object o) {
 
 }
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -27,11 +27,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/immutableAnno.test

@@ -15,11 +15,11 @@ protected void act() {
 return ;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -27,11 +27,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 
@@ -42,11 +42,11 @@ public void act() {
 return ;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -54,11 +54,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/implements1.test

@@ -1,17 +1,17 @@
-class A implements Comparable {
-   def int compare(A anotherA) {}
+class Implements1 implements Comparable {
+   def int compare(Implements1 anotherA) {}
 }
 -----
-public class A extends groovy.lang.GroovyObjectSupport implements java.lang.Comparable, groovy.lang.GroovyObject {
-public int compare(A anotherA) {
+public class Implements1 extends groovy.lang.GroovyObjectSupport implements java.lang.Comparable, groovy.lang.GroovyObject {
+public int compare(Implements1 anotherA) {
 return 0;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -19,11 +19,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/inaccessibleConstructor.test

@@ -1,30 +1,30 @@
-class Foo {
-  private Foo(Void v, Foo p) {}
-  protected Foo(Foo p) {}
-  protected Foo() {}
+class InaccessibleConstructor {
+  private InaccessibleConstructor(Void v, InaccessibleConstructor p) {}
+  protected InaccessibleConstructor(InaccessibleConstructor p) {}
+  protected InaccessibleConstructor() {}
 }
 
-class ExtensionLoader extends Foo {
+class ExtensionLoader extends InaccessibleConstructor {
   ExtensionLoader(parent) {
     super(parent);
   }
 }
 -----
-public class Foo extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public Foo(java.lang.Void v, Foo p) {
+public class InaccessibleConstructor extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public InaccessibleConstructor(java.lang.Void v, InaccessibleConstructor p) {
 
 }
-public Foo(Foo p) {
+public InaccessibleConstructor(InaccessibleConstructor p) {
 
 }
-public Foo() {
+public InaccessibleConstructor() {
 
 }
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -32,25 +32,25 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 
 }
 ---
-public class ExtensionLoader extends Foo implements groovy.lang.GroovyObject {
+public class ExtensionLoader extends InaccessibleConstructor implements groovy.lang.GroovyObject {
 public ExtensionLoader(java.lang.Object parent) {
-super((Foo)null);
+super((InaccessibleConstructor)null);
 }
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -58,11 +58,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/inaccessiblePropertyType.test

@@ -12,11 +12,11 @@ public void setProp(java.lang.Object prop) {
 return ;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -24,11 +24,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/kireyev.test

@@ -20,11 +20,11 @@ public T next() {
 return null;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -32,11 +32,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/methodTypeParameters.test

@@ -1,17 +1,17 @@
-class Foo {
+class MethodtypeParameters {
   def <T extends String> f() {}
 }
 -----
-public class Foo extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public class MethodtypeParameters extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
 public <T extends java.lang.String> java.lang.Object f() {
 return null;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -19,11 +19,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/optionalParameter.test

@@ -1,8 +1,8 @@
-class Test {
+class OptionalParameter {
   def foo(h, i = 0, j = 0, k = 0) {}
 }
 -----
-public class Test extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public class OptionalParameter extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
 public java.lang.Object foo(java.lang.Object h, java.lang.Object i, java.lang.Object j, java.lang.Object k) {
 return null;
 }
@@ -19,11 +19,11 @@ public java.lang.Object foo(java.lang.Object h) {
 return null;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -31,11 +31,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/overrideFinalGetter.test

@@ -1,21 +1,21 @@
-class Base {
+class OverrideFinalGetter {
   final int getP() {0}
 }
 
-class Derived extends Base {
+class Derived extends OverrideFinalGetter {
   int p = 0 //should not create a getter here
 }
 -----
-public class Base extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public class OverrideFinalGetter extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
 public final int getP() {
 return 0;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -23,26 +23,26 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 
 }
 ---
-public class Derived extends Base implements groovy.lang.GroovyObject {
+public class Derived extends OverrideFinalGetter implements groovy.lang.GroovyObject {
 public void setP(int p) {
 return ;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -50,11 +50,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/package1.test

@@ -1,16 +1,16 @@
 package a.b
 
-class D {
+class Package1 {
 }
 -----
 package a.b;
 
-public class D extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public groovy.lang.MetaClass getMetaClass() {
+public class Package1 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -18,11 +18,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/parameterReturnType.test

@@ -23,11 +23,11 @@ public java.lang.CharSequence execute(java.util.List action) {
 return null;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -35,11 +35,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/rawReturnTypeInImplementation.test

@@ -17,11 +17,11 @@ public java.lang.String call() {
 return null;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -29,11 +29,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/setUpper1.test

@@ -1,13 +1,13 @@
-class F {
+class SetUpper {
   setUp () {}
 }
 -----
-public class F extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public groovy.lang.MetaClass getMetaClass() {
+public class SetUpper extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -15,11 +15,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/setterAlreadyDefined1.test

@@ -1,9 +1,9 @@
-class D {
+class SetterAlreadyDefined {
   def DDD
   void setDDD (def ddd) {}
 }
 -----
-public class D extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public class SetterAlreadyDefined extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
 public void setDDD(java.lang.Object ddd) {
 return ;
 }
@@ -12,11 +12,11 @@ public java.lang.Object getDDD() {
 return null;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -24,11 +24,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/singletonConstructor.test

@@ -1,16 +1,16 @@
-class Foo {
-  private Foo() {}
+class SingletonConstructor {
+  private SingletonConstructor() {}
 }
 -----
-public class Foo extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public Foo() {
+public class SingletonConstructor extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public SingletonConstructor() {
 
 }
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -18,11 +18,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/stringMethodName.test

@@ -48,11 +48,11 @@ return null;
 }
 
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -60,11 +60,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/subclassProperty.test

@@ -1,21 +1,21 @@
-class Super {
+class SuperSubclass {
   String getFoo() {}
 }
-class Sub extends Super {
+class SubSuperSubClass extends SuperSubclass {
   def foo
 }
 
 -----
-public class Super extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public class SuperSubclass extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
 public java.lang.String getFoo() {
 return null;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -23,26 +23,26 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 
 }
 ---
-public class Sub extends Super implements groovy.lang.GroovyObject {
+public class SubSuperSubClass extends SuperSubclass implements groovy.lang.GroovyObject {
 public void setFoo(java.lang.Object foo) {
 return ;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -50,11 +50,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/superInvocation.test

@@ -12,11 +12,11 @@ public class Base extends groovy.lang.GroovyObjectSupport implements groovy.lang
 public Base(java.lang.String s, int i) {
 
 }
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -24,11 +24,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 
@@ -38,11 +38,11 @@ public class Derived extends Base implements groovy.lang.GroovyObject {
 public Derived() {
 super((java.lang.String)null, (int)0);
 }
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -50,11 +50,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/superInvocation1.test

@@ -1,22 +1,22 @@
-class Base {
-  Base(String s, int i) throws Exception {}
+class BaseSuperInvocation1 {
+  BaseSuperInvocation1(String s, int i) throws Exception {}
 }
 
-class Derived extends Base {
-  Derived() {
+class DerivedSuperInvocation1 extends BaseSuperInvocation1 {
+  DerivedSuperInvocation1() {
     super("", 0)
   }
 }
 -----
-public class Base extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public Base(java.lang.String s, int i) {
+public class BaseSuperInvocation1 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public BaseSuperInvocation1(java.lang.String s, int i) {
 
 }
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -24,25 +24,25 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 
 }
 ---
-public class Derived extends Base implements groovy.lang.GroovyObject {
-public Derived() throws java.lang.Exception {
+public class DerivedSuperInvocation1 extends BaseSuperInvocation1 implements groovy.lang.GroovyObject {
+public DerivedSuperInvocation1() throws java.lang.Exception {
 super((java.lang.String)null, (int)0);
 }
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -50,11 +50,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/synchronizedProperty.test

@@ -1,8 +1,8 @@
-class Foo {
+class SynchronizedProperty {
   synchronized def bar
 }
 -----
-public class Foo extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public class SynchronizedProperty extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
 public java.lang.Object getBar() {
 return null;
 }
@@ -11,11 +11,11 @@ public void setBar(java.lang.Object bar) {
 return ;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -23,11 +23,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/throwsCheckedException.test

@@ -1,17 +1,17 @@
-class Foo {
+class ThrowsCheckedException {
   def foo() throws IOException {}
 }
 -----
-public class Foo extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public class ThrowsCheckedException extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
 public java.lang.Object foo() throws java.io.IOException {
 return null;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -19,11 +19,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/toGenerate.test

@@ -1,12 +1,12 @@
-class s {
+class ToGenerate {
 }
 -----
-public class s extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public groovy.lang.MetaClass getMetaClass() {
+public class ToGenerate extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -14,11 +14,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/toGenerate1.test

@@ -1,4 +1,4 @@
-class s {
+class sToGenerate1 {
 }
 
 println "foo"
@@ -14,12 +14,12 @@ return null;
 
 }
 ---
-public class s extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public groovy.lang.MetaClass getMetaClass() {
+public class sToGenerate1 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -27,11 +27,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/vararg1.test

@@ -1,9 +1,9 @@
-class Foo {
+class Vararg1 {
  def void foo(String... foo) {}
  def void foo(String... foo, bar="bar") {}
 }
 -----
-public class Foo extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public class Vararg1 extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
 public void foo(java.lang.String... foo) {
 return ;
 }
@@ -16,11 +16,11 @@ public void foo(java.lang.String[] foo) {
 return ;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -28,11 +28,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 

plugins/groovy/testdata/groovy/stubGenerator/varargs.test

@@ -1,27 +1,27 @@
-class Foo {
-  def Foo(String... s) {}
+class Vararags {
+  def Vararags(String... s) {}
   def foo(String... s) {}
 }
 
-class Derived {
-  def Derived(String... s) {
+class DerivedVarargs {
+  def DerivedVarargs(String... s) {
     super(s)
   }
 }
 -----
-public class Foo extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public Foo(java.lang.String... s) {
+public class Vararags extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public Vararags(java.lang.String... s) {
 
 }
 public java.lang.Object foo(java.lang.String... s) {
 return null;
 }
 
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -29,25 +29,25 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }
 
 }
 ---
-public class Derived extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
-public Derived(java.lang.String... s) {
+public class DerivedVarargs extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
+public DerivedVarargs(java.lang.String... s) {
 super();
 }
-public groovy.lang.MetaClass getMetaClass() {
+public java.lang.Object getProperty(java.lang.String property) {
 return null;
 }
 
-public void setMetaClass(groovy.lang.MetaClass mc) {
+public void setProperty(java.lang.String property, java.lang.Object newValue) {
 return ;
 }
 
@@ -55,11 +55,11 @@ public java.lang.Object invokeMethod(java.lang.String name, java.lang.Object arg
 return null;
 }
 
-public java.lang.Object getProperty(java.lang.String propertyName) {
+public groovy.lang.MetaClass getMetaClass() {
 return null;
 }
 
-public void setProperty(java.lang.String propertyName, java.lang.Object newValue) {
+public void setMetaClass(groovy.lang.MetaClass metaClass) {
 return ;
 }