cleanup

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

@@ -296,13 +296,13 @@ public class Converter {
   public static Set<String> modifiersListToModifiersSet(PsiModifierList modifierList) {
     HashSet<String> modifiersSet = new HashSet<String>();
     if (modifierList != null) {
-      if (modifierList.hasModifierProperty(PsiModifier.ABSTRACT)) modifiersSet.add(Modifier.ABSTRACT);
+      if (modifierList.hasExplicitModifier(PsiModifier.ABSTRACT)) modifiersSet.add(Modifier.ABSTRACT);
       if (modifierList.hasModifierProperty(PsiModifier.FINAL)) modifiersSet.add(Modifier.FINAL);
       if (modifierList.hasModifierProperty(PsiModifier.STATIC)) modifiersSet.add(Modifier.STATIC);
-      if (modifierList.hasModifierProperty(PsiModifier.PUBLIC)) modifiersSet.add(Modifier.PUBLIC);
+      if (modifierList.hasExplicitModifier(PsiModifier.PUBLIC)) modifiersSet.add(Modifier.PUBLIC);
-      if (modifierList.hasModifierProperty(PsiModifier.PROTECTED)) modifiersSet.add(Modifier.PROTECTED);
+      if (modifierList.hasExplicitModifier(PsiModifier.PROTECTED)) modifiersSet.add(Modifier.PROTECTED);
-      if (modifierList.hasModifierProperty(PsiModifier.PACKAGE_LOCAL)) modifiersSet.add(Modifier.INTERNAL);
+      if (modifierList.hasExplicitModifier(PsiModifier.PACKAGE_LOCAL)) modifiersSet.add(Modifier.INTERNAL);
-      if (modifierList.hasModifierProperty(PsiModifier.PRIVATE)) modifiersSet.add(Modifier.PRIVATE);
+      if (modifierList.hasExplicitModifier(PsiModifier.PRIVATE)) modifiersSet.add(Modifier.PRIVATE);
     }
     return modifiersSet;
   }

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

@@ -99,7 +99,7 @@ public class Class extends Member {
   }
 
   String bodyToKotlin() {
-    return "{" + N + classObjectToKotlin() + N +
+    return SPACE + "{" + N + classObjectToKotlin() + N +
       AstUtil.joinNodes(getNonStatic(myFields), N) + N +
       AstUtil.joinNodes(getNonStatic(methodsExceptConstructors()), N) + N +
       AstUtil.joinNodes(getNonStatic(myInnerClasses), N) + N +
@@ -142,6 +142,6 @@ public class Class extends Member {
     return modifiersToKotlin() + TYPE + SPACE + myName.toKotlin() + typeParametersToKotlin() +
       implementTypesToKotlin() +
       typeParameterWhereToKotlin() +
-      SPACE + bodyToKotlin();
+      bodyToKotlin();
   }
 }

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

@@ -30,6 +30,11 @@ public class Enum extends Class {
     return EMPTY;
   }
 
+  @Override
+  boolean needOpenModifier() {
+    return false;
+  }
+
   @NotNull
   @Override
   public String toKotlin() {

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

@@ -25,7 +25,7 @@ public class NewClassExpression extends Expression {
   @Override
   public String toKotlin() {
     return myAnonymousClass != null ?
-      myName.toKotlin() + "(" + myArguments.toKotlin() + ")" + SPACE + myAnonymousClass.toKotlin() :
+      myName.toKotlin() + "(" + myArguments.toKotlin() + ")" + myAnonymousClass.toKotlin() :
       myName.toKotlin() + "(" + myArguments.toKotlin() + ")";
   }
 }

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

@@ -17,8 +17,4 @@ public class Trait extends Class {
   boolean needOpenModifier() {
     return false;
   }
-
+}
-  boolean needAbstractModifier() {
-    return false;
-  }
-}

test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java

@@ -48,8 +48,11 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
     else if (javaFile.getParent().endsWith("/file")) actual = fileToKotlin(javaCode);
 
     assert !actual.equals("");
+    final File tmp = new File(kotlinPath + ".tmp");
     if (!expected.equals(actual))
-      writeStringToFile(new File(kotlinPath + ".tmp"), actual);
+      writeStringToFile(tmp, actual);
+    if (expected.equals(actual) && tmp.exists())
+      tmp.delete();
     Assert.assertEquals(expected, actual);
   }
 
@@ -138,8 +141,9 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
     return code
       .trim()
       .replaceAll("\r\n", "\n")
-      .replaceAll("\n+", "\n")
+      .replaceAll(" \n", "\n")
       .replaceAll("\n ", "\n")
+      .replaceAll("\n+", "\n")
       .replaceAll(" +", " ")
       .trim()
       ;

testData/ast/class/class/abstractClass.kt

@@ -1,5 +1,5 @@
 abstract open class A {
-abstract fun callme() : Unit 
+abstract fun callme() : Unit
 fun callmetoo() : Unit {
 print("This is a concrete method.")
 }

testData/ast/class/class/abstractClassShape.kt

@@ -6,5 +6,5 @@ color = c
 public fun getColor() : String? {
 return color
 }
-abstract public fun area() : Double 
+abstract public fun area() : Double
 }

testData/ast/trait/class/abstactInterface.jav

@@ -0,0 +1 @@
+abstract interface I {}

testData/ast/trait/class/abstactInterface.kt

@@ -0,0 +1,2 @@
+abstract trait I {
+}

testData/ast/trait/class/interfaceWithFields.kt

@@ -1,7 +1,7 @@
 trait INode {
 class object {
-public val IN : String? = "in"
+val IN : String? = "in"
-public val AT : String? = "@"
+val AT : String? = "@"
-public val COMMA_WITH_SPACE : String? = (COMMA + SPACE)
+val COMMA_WITH_SPACE : String? = (COMMA + SPACE)
 }
 }

testData/ast/trait/class/interfaceWithMethodDeclaration.kt

@@ -1,4 +1,4 @@
 trait INode {
-public fun getTag() : Tag? 
+fun getTag() : Tag?
-public fun toKotlin() : String? 
+fun toKotlin() : String?
 }