cleanup

src/org/jetbrains/jet/j2k/ast/Trait.java

@@ -17,10 +17,4 @@ public class Trait extends Class {
   boolean needOpenModifier() {
     return false;
   }
-
-  @NotNull
-  @Override
-  public Kind getKind() {
-    return Kind.TRAIT;
-  }
 }

src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java

@@ -21,8 +21,6 @@ public class TypeVisitor extends PsiTypeVisitor<Type> implements Visitor {
 
   @Override
   public Type visitType(PsiType type) {
-    if (type instanceof PsiIntersectionType)
-      System.out.println("&");
     return super.visitType(type);
   }
 
@@ -35,7 +33,8 @@ public class TypeVisitor extends PsiTypeVisitor<Type> implements Visitor {
       myResult = new PrimitiveType(new IdentifierImpl("Unit"));
     else if (Node.PRIMITIVE_TYPES.contains(name))
       myResult = new PrimitiveType(new IdentifierImpl(AstUtil.upperFirstCharacter(name)));
-    else myResult = new PrimitiveType(identifier);
+    else
+        myResult = new PrimitiveType(identifier);
     return super.visitPrimitiveType(primitiveType);
   }
 
@@ -55,11 +54,6 @@ public class TypeVisitor extends PsiTypeVisitor<Type> implements Visitor {
     return super.visitClassType(classType);
   }
 
-  @Override
-  public Type visitCapturedWildcardType(PsiCapturedWildcardType capturedWildcardType) {
-    return super.visitCapturedWildcardType(capturedWildcardType);
-  }
-
   @Override
   public Type visitWildcardType(PsiWildcardType wildcardType) {
     if (wildcardType.isExtends())
@@ -77,6 +71,11 @@ public class TypeVisitor extends PsiTypeVisitor<Type> implements Visitor {
     return super.visitEllipsisType(ellipsisType);
   }
 
+    @Override
+    public Type visitCapturedWildcardType(PsiCapturedWildcardType capturedWildcardType) {
+        return super.visitCapturedWildcardType(capturedWildcardType);
+    }
+
   @Override
   public Type visitDisjunctionType(PsiDisjunctionType disjunctionType) {
     return super.visitDisjunctionType(disjunctionType);