From 251b69eab3fe783ab481a5f8dc9613906798f130 Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Mon, 14 Nov 2011 14:44:52 +0400
Subject: [PATCH] cleanup

---
 src/org/jetbrains/jet/j2k/Converter.java          |  6 +++---
 src/org/jetbrains/jet/j2k/ast/AnonymousClass.java | 11 +++++------
 src/org/jetbrains/jet/j2k/ast/Block.java          | 13 ++++++++-----
 src/org/jetbrains/jet/j2k/ast/ClassType.java      |  4 ++--
 src/org/jetbrains/jet/j2k/ast/Trait.java          |  2 --
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/org/jetbrains/jet/j2k/Converter.java b/src/org/jetbrains/jet/j2k/Converter.java
index 3934c8864ea..52d985989ac 100644
--- a/src/org/jetbrains/jet/j2k/Converter.java
+++ b/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);
   }
diff --git a/src/org/jetbrains/jet/j2k/ast/AnonymousClass.java b/src/org/jetbrains/jet/j2k/ast/AnonymousClass.java
index 4c4d084be07..adb95335884 100644
--- a/src/org/jetbrains/jet/j2k/ast/AnonymousClass.java
+++ b/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.LinkedList;
+import java.util.Collections;
 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>(),
-      new LinkedList<Element>(),
-      new LinkedList<Type>(),
-      new LinkedList<Type>(),
+      Collections.<String>emptySet(),
+      Collections.<Element>emptyList(),
+      Collections.<Type>emptyList(),
+      Collections.<Type>emptyList(),
       innerClasses,
       methods,
       fields);
diff --git a/src/org/jetbrains/jet/j2k/ast/Block.java b/src/org/jetbrains/jet/j2k/ast/Block.java
index a0f3f789fd4..8d185070527 100644
--- a/src/org/jetbrains/jet/j2k/ast/Block.java
+++ b/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() {
-    return myStatements;
-  }
-
-  private List<Statement> myStatements = new LinkedList<Statement>();
+  private List<Statement> myStatements;
   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() {
diff --git a/src/org/jetbrains/jet/j2k/ast/ClassType.java b/src/org/jetbrains/jet/j2k/ast/ClassType.java
index 2dbb513c316..a6822eebba4 100644
--- a/src/org/jetbrains/jet/j2k/ast/ClassType.java
+++ b/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
diff --git a/src/org/jetbrains/jet/j2k/ast/Trait.java b/src/org/jetbrains/jet/j2k/ast/Trait.java
index db6d5a8af86..9f58a557785 100644
--- a/src/org/jetbrains/jet/j2k/ast/Trait.java
+++ b/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;