cleanup

src/org/jetbrains/jet/j2k/Converter.java

@@ -136,9 +136,9 @@ public class Converter {
       methods.add(
         new Constructor(
           Identifier.EMPTY_IDENTIFIER,
-          new HashSet<String>(),
+          Collections.<String>emptySet(),
           new ClassType(name, false),
-          new LinkedList<Element>(),
+          Collections.<Element>emptyList(),
           new ParameterList(createParametersFromFields(finalOrWithEmptyInitializer)),
           new Block(createInitStatementsFromFields(finalOrWithEmptyInitializer)),
           true
@@ -149,7 +149,7 @@ public class Converter {
     if (psiClass.isInterface())
       return new Trait(name, modifiers, typeParameters, extendsTypes, implementsTypes, innerClasses, methods, fields);
     if (psiClass.isEnum())
-      return new Enum(name, modifiers, typeParameters, new LinkedList<Type>(), implementsTypes,
+      return new Enum(name, modifiers, typeParameters, Collections.<Type>emptyList(), implementsTypes,
         innerClasses, methods, fieldsToFieldListForEnums(psiClass.getAllFields()));
     return new Class(name, modifiers, typeParameters, extendsTypes, implementsTypes, innerClasses, methods, fields);
   }

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

@@ -2,8 +2,7 @@ package org.jetbrains.jet.j2k.ast;
 
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashSet;
+import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -12,10 +11,10 @@ import java.util.List;
 public class AnonymousClass extends Class {
   public AnonymousClass(List<Class> innerClasses, List<Function> methods, List<Field> fields) {
     super(new IdentifierImpl("anonClass"),
-      new HashSet<String>(),
+      Collections.<String>emptySet(),
-      new LinkedList<Element>(),
+      Collections.<Element>emptyList(),
-      new LinkedList<Type>(),
+      Collections.<Type>emptyList(),
-      new LinkedList<Type>(),
+      Collections.<Type>emptyList(),
       innerClasses,
       methods,
       fields);

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

@@ -12,21 +12,20 @@ import java.util.List;
 public class Block extends Statement {
   public final static Block EMPTY_BLOCK = new Block();
 
-  public List<Statement> getStatements() {
+  private List<Statement> myStatements;
-    return myStatements;
-  }
-
-  private List<Statement> myStatements = new LinkedList<Statement>();
   private boolean myNotEmpty = false;
 
   private Block() {
+    myStatements = new LinkedList<Statement>();
   }
 
   public Block(List<Statement> statements) {
+    myStatements = new LinkedList<Statement>();
     myStatements = statements;
   }
 
   public Block(List<Statement> statements, boolean notEmpty) {
+    myStatements = new LinkedList<Statement>();
     myStatements = statements;
     myNotEmpty = notEmpty;
   }
@@ -35,6 +34,10 @@ public class Block extends Statement {
     return !myNotEmpty && myStatements.size() == 0;
   }
 
+  public List<Statement> getStatements() {
+    return myStatements;
+  }
+
   @NotNull
   @Override
   public String toKotlin() {

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

@@ -3,7 +3,7 @@ package org.jetbrains.jet.j2k.ast;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.j2k.util.AstUtil;
 
-import java.util.LinkedList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -21,7 +21,7 @@ public class ClassType extends Type {
   public ClassType(Identifier type, boolean isNullable) {
     myType = type;
     myNullable = isNullable;
-    myParameters = new LinkedList<Type>();
+    myParameters = Collections.<Type>emptyList();
   }
 
   @NotNull

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

@@ -1,7 +1,5 @@
 package org.jetbrains.jet.j2k.ast;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.List;
 import java.util.Set;