diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/ClashingGettersInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/ClashingGettersInspection.java
index 9570fb633f74..c66b9673dde8 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/ClashingGettersInspection.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/ClashingGettersInspection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,6 +57,7 @@ public class ClashingGettersInspection extends BaseInspection {
     return GroovyInspectionBundle.message("getter.0.clashes.with.getter.1", args);
   }
 
+  @NotNull
   @Override
   protected BaseInspectionVisitor buildVisitor() {
     return new BaseInspectionVisitor() {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/GroovyAnnotationNamingConventionInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/GroovyAnnotationNamingConventionInspection.java
index 62b21ed08d85..dfaca8f5081c 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/GroovyAnnotationNamingConventionInspection.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/GroovyAnnotationNamingConventionInspection.java
@@ -20,7 +20,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.codeInspection.BaseInspectionVisitor;
 import org.jetbrains.plugins.groovy.codeInspection.GroovyFix;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrAnnotationTypeDefinition;
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
 
 public class GroovyAnnotationNamingConventionInspection extends ConventionInspection {
 
@@ -32,7 +31,7 @@ public class GroovyAnnotationNamingConventionInspection extends ConventionInspec
     return "Annotation naming convention";
   }
 
-  protected GroovyFix buildFix(PsiElement location) {
+  protected GroovyFix buildFix(@NotNull PsiElement location) {
     return new RenameFix();
   }
 
@@ -63,18 +62,15 @@ public class GroovyAnnotationNamingConventionInspection extends ConventionInspec
     return DEFAULT_MAX_LENGTH;
   }
 
+  @NotNull
   public BaseInspectionVisitor buildVisitor() {
     return new NamingConventionsVisitor();
   }
 
   private class NamingConventionsVisitor extends BaseInspectionVisitor {
-
-    public void visitTypeDefinition(GrTypeDefinition grTypeDefinition) {
-      super.visitTypeDefinition(grTypeDefinition);
-      if (!(grTypeDefinition instanceof GrAnnotationTypeDefinition)) {
-        return;
-      }
-      final GrAnnotationTypeDefinition aClass = (GrAnnotationTypeDefinition) grTypeDefinition;
+    @Override
+    public void visitAnnotationTypeDefinition(GrAnnotationTypeDefinition aClass) {
+      super.visitAnnotationTypeDefinition(aClass);
 
       final String name = aClass.getName();
       if (name == null) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/GroovyClassNamingConventionInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/GroovyClassNamingConventionInspection.java
index 66937b0ed39c..cc48722ff817 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/GroovyClassNamingConventionInspection.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/GroovyClassNamingConventionInspection.java
@@ -20,7 +20,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.codeInspection.BaseInspectionVisitor;
 import org.jetbrains.plugins.groovy.codeInspection.GroovyFix;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrClassDefinition;
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
 
 public class GroovyClassNamingConventionInspection extends ConventionInspection {
 
@@ -32,7 +31,7 @@ public class GroovyClassNamingConventionInspection extends ConventionInspection
     return "Class naming convention";
   }
 
-  protected GroovyFix buildFix(PsiElement location) {
+  protected GroovyFix buildFix(@NotNull PsiElement location) {
     return new RenameFix();
   }
 
@@ -63,26 +62,23 @@ public class GroovyClassNamingConventionInspection extends ConventionInspection
     return DEFAULT_MAX_LENGTH;
   }
 
+  @NotNull
   public BaseInspectionVisitor buildVisitor() {
     return new NamingConventionsVisitor();
   }
 
   private class NamingConventionsVisitor extends BaseInspectionVisitor {
-
-    public void visitTypeDefinition(GrTypeDefinition grTypeDefinition) {
-      super.visitTypeDefinition(grTypeDefinition);
-      if (!(grTypeDefinition instanceof GrClassDefinition)) {
-        return;
-      }
-      GrClassDefinition aClass = (GrClassDefinition) grTypeDefinition;
-      final String name = aClass.getName();
+    @Override
+    public void visitClassDefinition(GrClassDefinition classDefinition) {
+      super.visitClassDefinition(classDefinition);
+      final String name = classDefinition.getName();
       if (name == null) {
         return;
       }
       if (isValid(name)) {
         return;
       }
-      registerClassError(aClass, name);
+      registerClassError(classDefinition, name);
     }
   }
 }
\ No newline at end of file
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/GroovyEnumerationNamingConventionInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/GroovyEnumerationNamingConventionInspection.java
index a53d2ed40bad..15aa51b20b1c 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/GroovyEnumerationNamingConventionInspection.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/GroovyEnumerationNamingConventionInspection.java
@@ -20,7 +20,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.codeInspection.BaseInspectionVisitor;
 import org.jetbrains.plugins.groovy.codeInspection.GroovyFix;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrEnumTypeDefinition;
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
 
 public class GroovyEnumerationNamingConventionInspection extends ConventionInspection {
 
@@ -32,7 +31,7 @@ public class GroovyEnumerationNamingConventionInspection extends ConventionInspe
         return "Enumeration naming convention";
     }
 
-    protected GroovyFix buildFix(PsiElement location) {
+    protected GroovyFix buildFix(@NotNull PsiElement location) {
         return new RenameFix();
     }
 
@@ -63,27 +62,24 @@ public class GroovyEnumerationNamingConventionInspection extends ConventionInspe
         return DEFAULT_MAX_LENGTH;
     }
 
+    @NotNull
     public BaseInspectionVisitor buildVisitor() {
         return new NamingConventionsVisitor();
     }
 
     private class NamingConventionsVisitor extends BaseInspectionVisitor {
+      @Override
+      public void visitEnumDefinition(GrEnumTypeDefinition aClass) {
+        super.visitEnumDefinition(aClass);
 
-        public void visitTypeDefinition(GrTypeDefinition grTypeDefinition) {
-            super.visitTypeDefinition(grTypeDefinition);
-            if (!(grTypeDefinition instanceof GrEnumTypeDefinition)) {
-                return;
-            }
-            final GrEnumTypeDefinition aClass = (GrEnumTypeDefinition) grTypeDefinition;
-
-            final String name = aClass.getName();
-            if (name == null) {
-                return;
-            }
-            if (isValid(name)) {
-                return;
-            }
-            registerClassError(aClass, name);
+        final String name = aClass.getName();
+        if (name == null) {
+          return;
         }
+        if (isValid(name)) {
+          return;
+        }
+        registerClassError(aClass, name);
+      }
     }
 }
\ No newline at end of file
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/GroovyInterfaceNamingConventionInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/GroovyInterfaceNamingConventionInspection.java
index 832a8882c048..188995a7b9dd 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/GroovyInterfaceNamingConventionInspection.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/GroovyInterfaceNamingConventionInspection.java
@@ -20,7 +20,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.codeInspection.BaseInspectionVisitor;
 import org.jetbrains.plugins.groovy.codeInspection.GroovyFix;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrInterfaceDefinition;
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
 
 public class GroovyInterfaceNamingConventionInspection extends ConventionInspection {
 
@@ -32,7 +31,7 @@ public class GroovyInterfaceNamingConventionInspection extends ConventionInspect
     return "Interface naming convention";
   }
 
-  protected GroovyFix buildFix(PsiElement location) {
+  protected GroovyFix buildFix(@NotNull PsiElement location) {
     return new RenameFix();
   }
 
@@ -63,18 +62,15 @@ public class GroovyInterfaceNamingConventionInspection extends ConventionInspect
     return DEFAULT_MAX_LENGTH;
   }
 
+  @NotNull
   public BaseInspectionVisitor buildVisitor() {
     return new NamingConventionsVisitor();
   }
 
   private class NamingConventionsVisitor extends BaseInspectionVisitor {
-
-    public void visitTypeDefinition(GrTypeDefinition grTypeDefinition) {
-      super.visitTypeDefinition(grTypeDefinition);
-      if (!(grTypeDefinition instanceof GrInterfaceDefinition)) {
-        return;
-      }
-      final GrInterfaceDefinition aClass = (GrInterfaceDefinition) grTypeDefinition;
+    @Override
+    public void visitInterfaceDefinition(GrInterfaceDefinition aClass) {
+      super.visitInterfaceDefinition(aClass);
 
       final String name = aClass.getName();
       if (name == null) {
@@ -85,5 +81,6 @@ public class GroovyInterfaceNamingConventionInspection extends ConventionInspect
       }
       registerClassError(aClass, name);
     }
+
   }
 }
\ No newline at end of file
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyElementVisitor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyElementVisitor.java
index e362cba389ec..06b53a45d492 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyElementVisitor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyElementVisitor.java
@@ -255,6 +255,26 @@ public abstract class GroovyElementVisitor {
     visitElement(typeDefinition);
   }
 
+  public void visitClassDefinition(GrClassDefinition classDefinition) {
+    visitTypeDefinition(classDefinition);
+  }
+
+  public void visitEnumDefinition(GrEnumTypeDefinition enumDefinition) {
+    visitTypeDefinition(enumDefinition);
+  }
+
+  public void visitInterfaceDefinition(GrInterfaceDefinition interfaceDefinition) {
+    visitTypeDefinition(interfaceDefinition);
+  }
+
+  public void visitAnonymousClassDefinition(GrAnonymousClassDefinition anonymousClassDefinition) {
+    visitTypeDefinition(anonymousClassDefinition);
+  }
+
+  public void visitAnnotationTypeDefinition(GrAnnotationTypeDefinition annotationTypeDefinition) {
+    visitTypeDefinition(annotationTypeDefinition);
+  }
+
   public void visitExtendsClause(GrExtendsClause extendsClause) {
     visitElement(extendsClause);
   }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrAnnotationTypeDefinitionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrAnnotationTypeDefinitionImpl.java
index 47d849fb9cf0..16d52d00b414 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrAnnotationTypeDefinitionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrAnnotationTypeDefinitionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,11 @@ package org.jetbrains.plugins.groovy.lang.psi.impl.statements.typedef;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiClassType;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes;
+import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrAnnotationTypeDefinition;
 import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.TypesUtil;
 import org.jetbrains.plugins.groovy.lang.psi.stubs.GrTypeDefinitionStub;
-import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes;
 
 /**
  * @author Dmitry.Krasilschikov
@@ -61,4 +62,9 @@ public class GrAnnotationTypeDefinitionImpl extends GrTypeDefinitionImpl impleme
   private PsiClassType createAnnotationType() {
     return TypesUtil.createTypeByFQClassName("java.lang.annotation.Annotation", this);
   }
+
+  @Override
+  public void accept(GroovyElementVisitor visitor) {
+    visitor.visitAnnotationTypeDefinition(this);
+  }
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrAnonymousClassDefinitionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrAnonymousClassDefinitionImpl.java
index 495603bccbb3..aa7876a19db6 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrAnonymousClassDefinitionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrAnonymousClassDefinitionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes;
+import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrNewExpression;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrAnonymousClassDefinition;
@@ -250,4 +251,10 @@ public class GrAnonymousClassDefinitionImpl extends GrTypeDefinitionImpl impleme
   public PsiIdentifier getNameIdentifier() {
     return null;
   }
+
+  @Override
+  public void accept(GroovyElementVisitor visitor) {
+    visitor.visitAnonymousClassDefinition(this);
+  }
+
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrClassDefinitionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrClassDefinitionImpl.java
index cafc77953e33..2e0b3d969606 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrClassDefinitionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrClassDefinitionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ package org.jetbrains.plugins.groovy.lang.psi.impl.statements.typedef;
 import com.intellij.lang.ASTNode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes;
+import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrClassDefinition;
 import org.jetbrains.plugins.groovy.lang.psi.stubs.GrTypeDefinitionStub;
 
@@ -39,4 +40,9 @@ public class GrClassDefinitionImpl extends GrTypeDefinitionImpl implements GrCla
   public String toString() {
     return "Class definition";
   }
+
+  @Override
+  public void accept(GroovyElementVisitor visitor) {
+    visitor.visitClassDefinition(this);
+  }
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrEnumTypeDefinitionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrEnumTypeDefinitionImpl.java
index 42308ec1959b..56f4ffdedb38 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrEnumTypeDefinitionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrEnumTypeDefinitionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes;
+import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrField;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrEnumDefinitionBody;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrEnumTypeDefinition;
@@ -175,4 +176,9 @@ public class GrEnumTypeDefinitionImpl extends GrTypeDefinitionImpl implements Gr
     if (enumDefinitionBody != null) return enumDefinitionBody.getEnumConstantList();
     return null;
   }
+
+  @Override
+  public void accept(GroovyElementVisitor visitor) {
+    visitor.visitEnumDefinition(this);
+  }
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrInterfaceDefinitionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrInterfaceDefinitionImpl.java
index d4fa5a864f22..d093babb670b 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrInterfaceDefinitionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrInterfaceDefinitionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,11 @@
 package org.jetbrains.plugins.groovy.lang.psi.impl.statements.typedef;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.psi.stubs.IStubElementType;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes;
+import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrInterfaceDefinition;
 import org.jetbrains.plugins.groovy.lang.psi.stubs.GrTypeDefinitionStub;
-import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes;
 
 /**
  * @author Dmitry.Krasilschikov
@@ -44,4 +44,9 @@ public class GrInterfaceDefinitionImpl extends GrTypeDefinitionImpl implements G
   public boolean isInterface() {
     return true;
   }
+
+  @Override
+  public void accept(GroovyElementVisitor visitor) {
+    visitor.visitInterfaceDefinition(this);
+  }
 }
\ No newline at end of file
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/LocalVarAnalyzer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/LocalVarAnalyzer.java
index c130ec26f8fd..edb9c901c095 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/LocalVarAnalyzer.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/LocalVarAnalyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.