From ef3abfd10d58ec8664e008a36f5f587c1787aac9 Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Mon, 31 Oct 2011 20:39:07 +0400
Subject: [PATCH] cleanup

---
 src/org/jetbrains/jet/j2k/Converter.java      |  2 +-
 .../jet/j2k/ast/AssignmentExpression.java     | 12 +++-------
 .../jet/j2k/ast/BinaryExpression.java         |  6 ++---
 src/org/jetbrains/jet/j2k/ast/Class.java      | 12 +++++-----
 src/org/jetbrains/jet/j2k/ast/ClassType.java  |  2 +-
 .../jet/j2k/ast/DeclarationStatement.java     |  2 +-
 .../j2k/ast/DummyMethodCallExpression.java    |  6 ++---
 .../jetbrains/jet/j2k/ast/ExpressionList.java |  2 +-
 .../jet/j2k/ast/ExpressionListStatement.java  |  2 +-
 src/org/jetbrains/jet/j2k/ast/Field.java      |  6 ++---
 src/org/jetbrains/jet/j2k/ast/File.java       |  6 ++---
 src/org/jetbrains/jet/j2k/ast/Function.java   |  8 +++----
 src/org/jetbrains/jet/j2k/ast/Import.java     |  2 +-
 .../jet/j2k/ast/LiteralExpression.java        |  2 +-
 .../jetbrains/jet/j2k/ast/LocalVariable.java  |  6 ++---
 .../jet/j2k/ast/MethodCallExpression.java     |  4 ++--
 src/org/jetbrains/jet/j2k/ast/Parameter.java  |  4 ++--
 .../jetbrains/jet/j2k/ast/ParameterList.java  |  2 +-
 .../jetbrains/jet/j2k/ast/PrimitiveType.java  |  2 +-
 .../jet/j2k/ast/ReturnStatement.java          |  2 +-
 src/org/jetbrains/jet/j2k/ast/Statement.java  |  2 +-
 .../jetbrains/jet/j2k/JetTestCaseBase.java    | 24 +++++++++----------
 22 files changed, 55 insertions(+), 61 deletions(-)

diff --git a/src/org/jetbrains/jet/j2k/Converter.java b/src/org/jetbrains/jet/j2k/Converter.java
index c94a5804f28..7f639708fc3 100644
--- a/src/org/jetbrains/jet/j2k/Converter.java
+++ b/src/org/jetbrains/jet/j2k/Converter.java
@@ -36,7 +36,7 @@ public class Converter {
     return result;
   }
 
-  public static Class classToClass(PsiClass psiClass) {
+  private static Class classToClass(PsiClass psiClass) {
     final List<Function> methods = methodsToFunctionList(psiClass.getMethods(), true);
 
     final List<Class> innerClasses = classesToClassList(psiClass.getAllInnerClasses());
diff --git a/src/org/jetbrains/jet/j2k/ast/AssignmentExpression.java b/src/org/jetbrains/jet/j2k/ast/AssignmentExpression.java
index 4353ac8753e..7d0b10938a1 100644
--- a/src/org/jetbrains/jet/j2k/ast/AssignmentExpression.java
+++ b/src/org/jetbrains/jet/j2k/ast/AssignmentExpression.java
@@ -6,15 +6,9 @@ import org.jetbrains.annotations.NotNull;
  * @author ignatov
  */
 public class AssignmentExpression extends Expression {
-  private Expression myLeft;
-  private Expression myRight;
-  private String myOp;
-
-  public AssignmentExpression(Expression left, Expression right) {
-    myLeft = left;
-    myRight = right;
-    myOp = EQUAL;
-  }
+  private final Expression myLeft;
+  private final Expression myRight;
+  private final String myOp;
 
   public AssignmentExpression(Expression left, Expression right, String op) {
     myLeft = left;
diff --git a/src/org/jetbrains/jet/j2k/ast/BinaryExpression.java b/src/org/jetbrains/jet/j2k/ast/BinaryExpression.java
index bba976bf2a4..5be8a82d2be 100644
--- a/src/org/jetbrains/jet/j2k/ast/BinaryExpression.java
+++ b/src/org/jetbrains/jet/j2k/ast/BinaryExpression.java
@@ -6,9 +6,9 @@ import org.jetbrains.annotations.NotNull;
  * @author ignatov
  */
 public class BinaryExpression extends Expression {
-  private Expression myLeft;
-  private Expression myRight;
-  private String myOp;
+  private final Expression myLeft;
+  private final Expression myRight;
+  private final String myOp;
 
   public BinaryExpression(Expression left, Expression right, String op) {
     myLeft = left;
diff --git a/src/org/jetbrains/jet/j2k/ast/Class.java b/src/org/jetbrains/jet/j2k/ast/Class.java
index 29395972876..f67972163bc 100644
--- a/src/org/jetbrains/jet/j2k/ast/Class.java
+++ b/src/org/jetbrains/jet/j2k/ast/Class.java
@@ -10,11 +10,11 @@ import java.util.List;
  * @author ignatov
  */
 public class Class extends Node {
-  protected String TYPE = "class";
-  protected Identifier myName;
-  protected List<Class> myInnerClasses;
-  protected List<Function> myMethods;
-  protected List<Field> myFields;
+  String TYPE = "class";
+  final Identifier myName;
+  final List<Class> myInnerClasses;
+  final List<Function> myMethods;
+  final List<Field> myFields;
 
   public Class(Identifier name, List<Class> innerClasses, List<Function> methods, List<Field> fields) {
     myName = name;
@@ -24,7 +24,7 @@ public class Class extends Node {
   }
 
   @NotNull
-  protected List<Function> methodsExceptConstructors() {
+  List<Function> methodsExceptConstructors() {
     final LinkedList<Function> result = new LinkedList<Function>();
     for (Function m : myMethods)
       if (m.getKind() != Kind.CONSTRUCTOR)
diff --git a/src/org/jetbrains/jet/j2k/ast/ClassType.java b/src/org/jetbrains/jet/j2k/ast/ClassType.java
index 73b6e43c7a2..7020e7c2c44 100644
--- a/src/org/jetbrains/jet/j2k/ast/ClassType.java
+++ b/src/org/jetbrains/jet/j2k/ast/ClassType.java
@@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull;
  * @author ignatov
  */
 public class ClassType extends Type {
-  private Identifier myType;
+  private final Identifier myType;
 
   public ClassType(Identifier type) {
     myType = type;
diff --git a/src/org/jetbrains/jet/j2k/ast/DeclarationStatement.java b/src/org/jetbrains/jet/j2k/ast/DeclarationStatement.java
index c3135869842..75fdbb04621 100644
--- a/src/org/jetbrains/jet/j2k/ast/DeclarationStatement.java
+++ b/src/org/jetbrains/jet/j2k/ast/DeclarationStatement.java
@@ -10,7 +10,7 @@ import java.util.List;
  * @author ignatov
  */
 public class DeclarationStatement extends Statement {
-  private List<Element> myElements;
+  private final List<Element> myElements;
 
   public DeclarationStatement(List<Element> elements) {
     myElements = elements;
diff --git a/src/org/jetbrains/jet/j2k/ast/DummyMethodCallExpression.java b/src/org/jetbrains/jet/j2k/ast/DummyMethodCallExpression.java
index 6961b67e03c..fabb9d3d92f 100644
--- a/src/org/jetbrains/jet/j2k/ast/DummyMethodCallExpression.java
+++ b/src/org/jetbrains/jet/j2k/ast/DummyMethodCallExpression.java
@@ -6,9 +6,9 @@ import org.jetbrains.annotations.NotNull;
  * @author ignatov
  */
 public class DummyMethodCallExpression extends Expression {
-  private Expression myWho;
-  private String myMethodName;
-  private Expression myWhat;
+  private final Expression myWho;
+  private final String myMethodName;
+  private final Expression myWhat;
 
   public DummyMethodCallExpression(Expression who, String methodName, Expression what) {
     myWho = who;
diff --git a/src/org/jetbrains/jet/j2k/ast/ExpressionList.java b/src/org/jetbrains/jet/j2k/ast/ExpressionList.java
index 774d73b1573..e8f1d48d6e1 100644
--- a/src/org/jetbrains/jet/j2k/ast/ExpressionList.java
+++ b/src/org/jetbrains/jet/j2k/ast/ExpressionList.java
@@ -9,7 +9,7 @@ import java.util.List;
  * @author ignatov
  */
 public class ExpressionList extends Expression {
-  private List<Expression> myExpressions;
+  private final List<Expression> myExpressions;
   private List<Type> myTypes; // TODO: add types to toKotlin
 
   public ExpressionList(List<Expression> expressions, List<Type> types) {
diff --git a/src/org/jetbrains/jet/j2k/ast/ExpressionListStatement.java b/src/org/jetbrains/jet/j2k/ast/ExpressionListStatement.java
index b7cfb59e5bf..1c67340e655 100644
--- a/src/org/jetbrains/jet/j2k/ast/ExpressionListStatement.java
+++ b/src/org/jetbrains/jet/j2k/ast/ExpressionListStatement.java
@@ -9,7 +9,7 @@ import java.util.List;
  * @author ignatov
  */
 public class ExpressionListStatement extends Expression {
-  private List<Expression> myExpressions;
+  private final List<Expression> myExpressions;
 
   public ExpressionListStatement(List<Expression> expressions) {
     myExpressions = expressions;
diff --git a/src/org/jetbrains/jet/j2k/ast/Field.java b/src/org/jetbrains/jet/j2k/ast/Field.java
index f500e621093..c15a01e4cee 100644
--- a/src/org/jetbrains/jet/j2k/ast/Field.java
+++ b/src/org/jetbrains/jet/j2k/ast/Field.java
@@ -6,9 +6,9 @@ import org.jetbrains.annotations.NotNull;
  * @author ignatov
  */
 public class Field extends Node {
-  protected Identifier myIdentifier;
-  protected Type myType;
-  protected Element myInitializer;
+  final Identifier myIdentifier;
+  private final Type myType;
+  final Element myInitializer;
 
   public Field(Identifier identifier, Type type, Element initializer) {
     myIdentifier = identifier;
diff --git a/src/org/jetbrains/jet/j2k/ast/File.java b/src/org/jetbrains/jet/j2k/ast/File.java
index ba9c4952556..c3d924a569d 100644
--- a/src/org/jetbrains/jet/j2k/ast/File.java
+++ b/src/org/jetbrains/jet/j2k/ast/File.java
@@ -9,9 +9,9 @@ import java.util.List;
  * @author ignatov
  */
 public class File extends Node {
-  private String myPackageName;
-  private List<Import> myImports;
-  private List<Class> myClasses;
+  private final String myPackageName;
+  private final List<Import> myImports;
+  private final List<Class> myClasses;
 
   public File(String packageName, List<Import> imports, List<Class> classes) {
     myPackageName = packageName;
diff --git a/src/org/jetbrains/jet/j2k/ast/Function.java b/src/org/jetbrains/jet/j2k/ast/Function.java
index 262d063bdff..4573c71bb24 100644
--- a/src/org/jetbrains/jet/j2k/ast/Function.java
+++ b/src/org/jetbrains/jet/j2k/ast/Function.java
@@ -6,10 +6,10 @@ import org.jetbrains.annotations.NotNull;
  * @author ignatov
  */
 public class Function extends Node {
-  private Identifier myName;
-  private Type myType;
-  protected Element myParams;
-  private Block myBlock;
+  private final Identifier myName;
+  private final Type myType;
+  final Element myParams;
+  private final Block myBlock;
 
   public Function(Identifier name, Type type, Element params, Block block) {
     myName = name;
diff --git a/src/org/jetbrains/jet/j2k/ast/Import.java b/src/org/jetbrains/jet/j2k/ast/Import.java
index 973f2387f80..6cf6cca560a 100644
--- a/src/org/jetbrains/jet/j2k/ast/Import.java
+++ b/src/org/jetbrains/jet/j2k/ast/Import.java
@@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull;
  * @author ignatov
  */
 public class Import extends Node {
-  private String myName;
+  private final String myName;
 
   public Import(String name) {
     myName = name;
diff --git a/src/org/jetbrains/jet/j2k/ast/LiteralExpression.java b/src/org/jetbrains/jet/j2k/ast/LiteralExpression.java
index 2c46150f753..4737458e389 100644
--- a/src/org/jetbrains/jet/j2k/ast/LiteralExpression.java
+++ b/src/org/jetbrains/jet/j2k/ast/LiteralExpression.java
@@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull;
  * @author ignatov
  */
 public class LiteralExpression extends Expression {
-  private Identifier myIdentifier;
+  private final Identifier myIdentifier;
 
   public LiteralExpression(Identifier identifier) {
     myIdentifier = identifier;
diff --git a/src/org/jetbrains/jet/j2k/ast/LocalVariable.java b/src/org/jetbrains/jet/j2k/ast/LocalVariable.java
index 572199b3cab..8c66ab2ec01 100644
--- a/src/org/jetbrains/jet/j2k/ast/LocalVariable.java
+++ b/src/org/jetbrains/jet/j2k/ast/LocalVariable.java
@@ -6,9 +6,9 @@ import org.jetbrains.annotations.NotNull;
  * @author ignatov
  */
 public class LocalVariable extends Expression {
-  private Identifier myIdentifier;
-  private Type myType;
-  private Expression myInitializer;
+  private final Identifier myIdentifier;
+  private final Type myType;
+  private final Expression myInitializer;
 
   public LocalVariable(Identifier identifier, Type type, Expression initializer) {
     myIdentifier = identifier;
diff --git a/src/org/jetbrains/jet/j2k/ast/MethodCallExpression.java b/src/org/jetbrains/jet/j2k/ast/MethodCallExpression.java
index 3153d6fb760..9178f9ef278 100644
--- a/src/org/jetbrains/jet/j2k/ast/MethodCallExpression.java
+++ b/src/org/jetbrains/jet/j2k/ast/MethodCallExpression.java
@@ -6,8 +6,8 @@ import org.jetbrains.annotations.NotNull;
  * @author ignatov
  */
 public class MethodCallExpression extends Expression {
-  private Expression myMethodCall;
-  private Element myParamList;
+  private final Expression myMethodCall;
+  private final Element myParamList;
 
   public MethodCallExpression(Expression methodCall, Element paramList) {
     myMethodCall = methodCall;
diff --git a/src/org/jetbrains/jet/j2k/ast/Parameter.java b/src/org/jetbrains/jet/j2k/ast/Parameter.java
index 40fd542b34d..625b78e7351 100644
--- a/src/org/jetbrains/jet/j2k/ast/Parameter.java
+++ b/src/org/jetbrains/jet/j2k/ast/Parameter.java
@@ -6,8 +6,8 @@ import org.jetbrains.annotations.NotNull;
  * @author ignatov
  */
 public class Parameter extends Expression {
-  private IdentifierImpl myIdentifier;
-  private Type myType;
+  private final IdentifierImpl myIdentifier;
+  private final Type myType;
 
   public Parameter(IdentifierImpl identifier, Type type) {
     myIdentifier = identifier;
diff --git a/src/org/jetbrains/jet/j2k/ast/ParameterList.java b/src/org/jetbrains/jet/j2k/ast/ParameterList.java
index 06470e1d7a9..9528a74e103 100644
--- a/src/org/jetbrains/jet/j2k/ast/ParameterList.java
+++ b/src/org/jetbrains/jet/j2k/ast/ParameterList.java
@@ -9,7 +9,7 @@ import java.util.List;
  * @author ignatov
  */
 public class ParameterList extends Expression {
-  private List<Parameter> myParameters;
+  private final List<Parameter> myParameters;
 
   public ParameterList(List<Parameter> parameters) {
     myParameters = parameters;
diff --git a/src/org/jetbrains/jet/j2k/ast/PrimitiveType.java b/src/org/jetbrains/jet/j2k/ast/PrimitiveType.java
index 46af927081e..cb862c0b11c 100644
--- a/src/org/jetbrains/jet/j2k/ast/PrimitiveType.java
+++ b/src/org/jetbrains/jet/j2k/ast/PrimitiveType.java
@@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull;
  * @author ignatov
  */
 public class PrimitiveType extends Type {
-  private Identifier myType;
+  private final Identifier myType;
 
   public PrimitiveType(Identifier type) {
     myType = type;
diff --git a/src/org/jetbrains/jet/j2k/ast/ReturnStatement.java b/src/org/jetbrains/jet/j2k/ast/ReturnStatement.java
index 034c538e0f5..b4040c3d824 100644
--- a/src/org/jetbrains/jet/j2k/ast/ReturnStatement.java
+++ b/src/org/jetbrains/jet/j2k/ast/ReturnStatement.java
@@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull;
  * @author ignatov
  */
 public class ReturnStatement extends Statement {
-  private Expression myExpression;
+  private final Expression myExpression;
 
   public ReturnStatement(Expression expression) {
     myExpression = expression;
diff --git a/src/org/jetbrains/jet/j2k/ast/Statement.java b/src/org/jetbrains/jet/j2k/ast/Statement.java
index c173147f8ae..1be7eaf810b 100644
--- a/src/org/jetbrains/jet/j2k/ast/Statement.java
+++ b/src/org/jetbrains/jet/j2k/ast/Statement.java
@@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull;
  * @author ignatov
  */
 public abstract class Statement extends Element {
-  public static Statement EMPTY_STATEMENT = new EmptyStatement();
+  public static final Statement EMPTY_STATEMENT = new EmptyStatement();
 
   /**
    * @author ignatov
diff --git a/test/org/jetbrains/jet/j2k/JetTestCaseBase.java b/test/org/jetbrains/jet/j2k/JetTestCaseBase.java
index b210ee6fc36..e47ef7c7cf8 100644
--- a/test/org/jetbrains/jet/j2k/JetTestCaseBase.java
+++ b/test/org/jetbrains/jet/j2k/JetTestCaseBase.java
@@ -22,14 +22,14 @@ import java.util.List;
  */
 public abstract class JetTestCaseBase extends LightDaemonAnalyzerTestCase {
   private boolean checkInfos = false;
-  private String dataPath;
-  protected final String name;
+  private final String dataPath;
+  private final String name;
 
   protected JetTestCaseBase() {
     this("", "");
   }
 
-  public JetTestCaseBase(String dataPath, String name) {
+  private JetTestCaseBase(String dataPath, String name) {
     this.dataPath = dataPath;
     this.name = name;
   }
@@ -39,7 +39,7 @@ public abstract class JetTestCaseBase extends LightDaemonAnalyzerTestCase {
     return this;
   }
 
-  public static Sdk jdkFromIdeaHome() {
+  private static Sdk jdkFromIdeaHome() {
     return new JavaSdkImpl().createJdk("JDK", "compiler/testData/mockJDK-1.7/jre", true);
   }
 
@@ -48,11 +48,11 @@ public abstract class JetTestCaseBase extends LightDaemonAnalyzerTestCase {
     return getTestDataPathBase();
   }
 
-  public static String getTestDataPathBase() {
+  private static String getTestDataPathBase() {
     return getHomeDirectory() + "/compiler/testData";
   }
 
-  public static String getHomeDirectory() {
+  private static String getHomeDirectory() {
     return new File(PathManager.getResourceRoot(JetTestCaseBase.class, "/org/jetbrains/jet/JetTestCaseBase.class")).getParentFile().getParentFile().getParent();
   }
 
@@ -80,7 +80,7 @@ public abstract class JetTestCaseBase extends LightDaemonAnalyzerTestCase {
     return dataPath;
   }
 
-  protected void configureFromText(String text) throws IOException {
+  void configureFromText(String text) throws IOException {
     configureFromFileText("test.java", text);
   }
 
@@ -101,12 +101,12 @@ public abstract class JetTestCaseBase extends LightDaemonAnalyzerTestCase {
     return toSingleLine(classToKotlin(text));
   }
 
-  protected String fileToKotlin(String text) throws IOException {
+  String fileToKotlin(String text) throws IOException {
     configureFromText(text);
     return prettify(Converter.fileToFile((PsiJavaFile) myFile).toKotlin());
   }
 
-  protected String methodToKotlin(String text) throws IOException {
+  String methodToKotlin(String text) throws IOException {
     String result = classToKotlin("class C {" + text + "}")
       .replaceAll("class C \\{", "");
     result = result.substring(0, result.lastIndexOf("}"));
@@ -144,7 +144,7 @@ public abstract class JetTestCaseBase extends LightDaemonAnalyzerTestCase {
   }
 
   @NotNull
-  public static TestSuite suiteForDirectory(String baseDataDir, @NotNull final String dataPath, boolean recursive, @NotNull NamedTestFactory factory) {
+  private static TestSuite suiteForDirectory(String baseDataDir, @NotNull final String dataPath, boolean recursive, @NotNull NamedTestFactory factory) {
     TestSuite suite = new TestSuite(dataPath);
     final String extension = ".jet";
     FilenameFilter extensionFilter = new FilenameFilter() {
@@ -180,7 +180,7 @@ public abstract class JetTestCaseBase extends LightDaemonAnalyzerTestCase {
   }
 
   @NotNull
-  protected static String prettify(String code) {
+  private static String prettify(String code) {
     if (code == null)
       return "";
     return code
@@ -194,7 +194,7 @@ public abstract class JetTestCaseBase extends LightDaemonAnalyzerTestCase {
   }
 
   @NotNull
-  protected static String toSingleLine(String string) {
+  static String toSingleLine(String string) {
     return prettify(string.replaceAll("\n", " "));
   }
 }
\ No newline at end of file