minor refactoring

translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java

@@ -28,17 +28,17 @@ import static org.jetbrains.k2js.translate.utils.DescriptorUtils.findAncestorCla
  */
 public final class ClassTranslator extends AbstractTranslator {
 
+    @NotNull
+    public static JsInvocation translateClass(@NotNull JetClass classDeclaration, @NotNull TranslationContext context) {
+        return (new ClassTranslator(classDeclaration, context)).translateClass();
+    }
+
     @NotNull
     private final DeclarationBodyVisitor declarationBodyVisitor = new DeclarationBodyVisitor();
 
     @NotNull
     private final JetClass classDeclaration;
 
-    @NotNull
-    static public JsInvocation translateClass(@NotNull JetClass classDeclaration, @NotNull TranslationContext context) {
-        return (new ClassTranslator(classDeclaration, context)).translateClass();
-    }
-
     private ClassTranslator(@NotNull JetClass classDeclaration, @NotNull TranslationContext context) {
         super(context.newClass(classDeclaration));
         this.classDeclaration = classDeclaration;

translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java

@@ -17,7 +17,6 @@ import java.util.List;
  */
 public abstract class AbstractInitializerTranslator extends AbstractTranslator {
 
-
     @NotNull
     protected final InitializerVisitor visitor;
     @NotNull

translator/src/org/jetbrains/k2js/translate/initializer/InitializerVisitor.java

@@ -20,7 +20,7 @@ import java.util.List;
 public final class InitializerVisitor extends TranslatorVisitor<List<JsStatement>> {
 
 
-    protected InitializerVisitor() {
+    /*package*/ InitializerVisitor() {
     }
 
     @Override

translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java

@@ -12,6 +12,8 @@ import java.util.Map;
 /**
  * @author Pavel Talanov
  */
+
+//TODO: change using guava builders
 public final class OperatorTable {
 
     private static Map<JetToken, JsBinaryOperator> binaryOperatorsMap = new HashMap<JetToken, JsBinaryOperator>();

translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java

@@ -85,6 +85,7 @@ public final class CallTranslator extends AbstractTranslator {
         return translate(context, receiver, arguments, functionDescriptor);
     }
 
+    @NotNull
     public static JsExpression mayBeWrapWithNegation(@NotNull JsExpression expression, boolean shouldWrap) {
         if (shouldWrap) {
             return not(expression);
@@ -167,6 +168,7 @@ public final class CallTranslator extends AbstractTranslator {
         return functionIntrinsic.apply(receiver, arguments, context());
     }
 
+    @NotNull
     private JsInvocation methodCall() {
         return AstUtil.newInvocation(calleeReference(), arguments);
     }
@@ -209,6 +211,7 @@ public final class CallTranslator extends AbstractTranslator {
         return methodReference;
     }
 
+    @NotNull
     private JsExpression extensionFunctionReference(@NotNull JsExpression methodReference) {
         JsExpression qualifier = TranslationUtils.getExtensionFunctionImplicitReceiver(context(), functionDescriptor);
         if (qualifier != null) {

translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java

@@ -16,7 +16,7 @@ import static org.jetbrains.k2js.translate.utils.TranslationUtils.getImplicitRec
 /**
  * @author Pavel Talanov
  */
-public class ReferenceTranslator extends AbstractTranslator {
+public final class ReferenceTranslator extends AbstractTranslator {
 
     @NotNull
     public static JsExpression translateSimpleName(@NotNull JetSimpleNameExpression expression,

translator/src/org/jetbrains/k2js/translate/utils/ClassSorter.java

@@ -29,7 +29,7 @@ public final class ClassSorter {
     private final BindingContext bindingContext;
 
     @NotNull
-    static public List<JetClass> sortUsingInheritanceOrder(@NotNull List<JetClass> original,
+    public static List<JetClass> sortUsingInheritanceOrder(@NotNull List<JetClass> original,
                                                            @NotNull BindingContext bindingContext) {
         ClassSorter sorter = new ClassSorter(original, bindingContext);
         return sorter.sortUsingInheritanceOrder();