diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 157e8aa474e..4d566126bbc 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,5 +1,8 @@ + + @@ -11,13 +14,23 @@ - + + + - + + + + + + - - + + + + + @@ -220,94 +233,91 @@ - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -386,22 +396,22 @@ @@ -1212,12 +1222,12 @@ + - @@ -1255,7 +1265,7 @@ @@ -1302,119 +1312,118 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/translator/src/org/jetbrains/k2js/translate/context/Aliaser.java b/translator/src/org/jetbrains/k2js/translate/context/Aliaser.java index 8688d5ad3fe..9da816d2252 100644 --- a/translator/src/org/jetbrains/k2js/translate/context/Aliaser.java +++ b/translator/src/org/jetbrains/k2js/translate/context/Aliaser.java @@ -18,7 +18,7 @@ public class Aliaser { @NotNull private final Map aliasesForDescriptors = new HashMap(); @NotNull - private Stack thisAliases = new Stack(); + private final Stack thisAliases = new Stack(); private Aliaser() { } diff --git a/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java b/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java index aba48ed0753..717957b8877 100644 --- a/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java +++ b/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java @@ -31,7 +31,7 @@ public class StaticContext { private final JsProgram program; @NotNull - public final BindingContext bindingContext; + private final BindingContext bindingContext; @NotNull private final Declarations declarations; diff --git a/translator/src/org/jetbrains/k2js/translate/general/Translation.java b/translator/src/org/jetbrains/k2js/translate/general/Translation.java index c231c3d9d4a..dafd4033a84 100644 --- a/translator/src/org/jetbrains/k2js/translate/general/Translation.java +++ b/translator/src/org/jetbrains/k2js/translate/general/Translation.java @@ -31,59 +31,59 @@ import org.jetbrains.k2js.translate.utils.BindingUtils; public final class Translation { @NotNull - static public FunctionTranslator functionTranslator(@NotNull JetDeclarationWithBody function, + public static FunctionTranslator functionTranslator(@NotNull JetDeclarationWithBody function, @NotNull TranslationContext context) { return FunctionTranslator.newInstance(function, context); } @NotNull - static public JsStatement translateNamespace(@NotNull JetNamespace namespace, + public static JsStatement translateNamespace(@NotNull JetNamespace namespace, @NotNull TranslationContext context) { return NamespaceTranslator.translateNamespace(namespace, context); } @NotNull - static public JsInvocation translateClassDeclaration(@NotNull JetClass classDeclaration, + public static JsInvocation translateClassDeclaration(@NotNull JetClass classDeclaration, @NotNull TranslationContext context) { return ClassTranslator.translateClass(classDeclaration, context); } @NotNull - static public PatternTranslator patternTranslator(@NotNull TranslationContext context) { + public static PatternTranslator patternTranslator(@NotNull TranslationContext context) { return PatternTranslator.newInstance(context); } @NotNull - static public JsNode translateExpression(@NotNull JetExpression expression, @NotNull TranslationContext context) { + public static JsNode translateExpression(@NotNull JetExpression expression, @NotNull TranslationContext context) { return expression.accept(new ExpressionVisitor(), context); } @NotNull - static public JsExpression translateAsExpression(@NotNull JetExpression expression, + public static JsExpression translateAsExpression(@NotNull JetExpression expression, @NotNull TranslationContext context) { return AstUtil.convertToExpression(translateExpression(expression, context)); } @NotNull - static public JsStatement translateAsStatement(@NotNull JetExpression expression, + public static JsStatement translateAsStatement(@NotNull JetExpression expression, @NotNull TranslationContext context) { return AstUtil.convertToStatement(translateExpression(expression, context)); } @NotNull - static public JsNode translateWhenExpression(@NotNull JetWhenExpression expression, + public static JsNode translateWhenExpression(@NotNull JetWhenExpression expression, @NotNull TranslationContext context) { return WhenTranslator.translateWhenExpression(expression, context); } @NotNull - static public JsPropertyInitializer generateClassInitializerMethod(@NotNull JetClass classDeclaration, + public static JsPropertyInitializer generateClassInitializerMethod(@NotNull JetClass classDeclaration, @NotNull TranslationContext context) { return (new ClassInitializerTranslator(classDeclaration, context)).generateInitializeMethod(); } @NotNull - static public JsPropertyInitializer generateNamespaceInitializerMethod(@NotNull JetNamespace namespace, + public static JsPropertyInitializer generateNamespaceInitializerMethod(@NotNull JetNamespace namespace, @NotNull TranslationContext context) { return (new NamespaceInitializerTranslator(namespace, context)).generateInitializeMethod(); } diff --git a/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java b/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java index d2907c3cee2..1c7ffd36f0b 100644 --- a/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java +++ b/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java @@ -18,7 +18,7 @@ import java.util.List; public abstract class AbstractInitializerTranslator extends AbstractTranslator { @NotNull - protected final InitializerVisitor visitor; + private final InitializerVisitor visitor; @NotNull protected final NamingScope initializerMethodScope; diff --git a/translator/src/org/jetbrains/k2js/translate/intrinsic/CompareToIntrinsic.java b/translator/src/org/jetbrains/k2js/translate/intrinsic/CompareToIntrinsic.java index f09a3befb9d..64f6524894f 100644 --- a/translator/src/org/jetbrains/k2js/translate/intrinsic/CompareToIntrinsic.java +++ b/translator/src/org/jetbrains/k2js/translate/intrinsic/CompareToIntrinsic.java @@ -12,7 +12,7 @@ public abstract class CompareToIntrinsic implements Intrinsic { private JetToken comparisonToken = null; @NotNull - public JetToken getComparisonToken() { + protected JetToken getComparisonToken() { assert comparisonToken != null : "Should use set token first"; return comparisonToken; } diff --git a/translator/src/org/jetbrains/k2js/translate/intrinsic/EqualsIntrinsic.java b/translator/src/org/jetbrains/k2js/translate/intrinsic/EqualsIntrinsic.java index 37c7feb813b..b60db5a5dfc 100644 --- a/translator/src/org/jetbrains/k2js/translate/intrinsic/EqualsIntrinsic.java +++ b/translator/src/org/jetbrains/k2js/translate/intrinsic/EqualsIntrinsic.java @@ -14,7 +14,7 @@ public abstract class EqualsIntrinsic implements Intrinsic { this.isNegated = isNegated; } - public boolean isNegated() { + protected boolean isNegated() { return isNegated; } } diff --git a/translator/src/org/jetbrains/k2js/translate/intrinsic/array/IntrinsicArrayUtils.java b/translator/src/org/jetbrains/k2js/translate/intrinsic/array/IntrinsicArrayUtils.java index 08a24dae5b6..620d2ef7dff 100644 --- a/translator/src/org/jetbrains/k2js/translate/intrinsic/array/IntrinsicArrayUtils.java +++ b/translator/src/org/jetbrains/k2js/translate/intrinsic/array/IntrinsicArrayUtils.java @@ -34,7 +34,7 @@ public final class IntrinsicArrayUtils { } @NotNull - public static JsExpression throwOutOfBoundsException() { + private static JsExpression throwOutOfBoundsException() { //TODO: think about exception return new JsThisRef(); } diff --git a/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java b/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java index 5aaa41d88bd..04b794ad3fc 100644 --- a/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java +++ b/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java @@ -49,9 +49,6 @@ public abstract class IncrementTranslator extends AbstractTranslator { this.accessTranslator = AccessTranslator.getAccessTranslator(baseExpression, context()); } - @NotNull - protected abstract JsExpression translate(); - @NotNull protected JsExpression translateAsMethodCall() { if (returnValueIgnored() || isPrefix(expression)) { diff --git a/translator/src/org/jetbrains/k2js/translate/operation/IntrinsicIncrementTranslator.java b/translator/src/org/jetbrains/k2js/translate/operation/IntrinsicIncrementTranslator.java index abe32160c3f..4432dac3fc7 100644 --- a/translator/src/org/jetbrains/k2js/translate/operation/IntrinsicIncrementTranslator.java +++ b/translator/src/org/jetbrains/k2js/translate/operation/IntrinsicIncrementTranslator.java @@ -25,12 +25,11 @@ public final class IntrinsicIncrementTranslator extends IncrementTranslator { .translate(); } - protected IntrinsicIncrementTranslator(@NotNull JetUnaryExpression expression, - @NotNull TranslationContext context) { + private IntrinsicIncrementTranslator(@NotNull JetUnaryExpression expression, + @NotNull TranslationContext context) { super(expression, context); } - @Override @NotNull protected JsExpression translate() { if (isPrimitiveExpressionIncrement()) { diff --git a/translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java b/translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java index e7ae6922a91..865e2b72c65 100644 --- a/translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java +++ b/translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java @@ -16,8 +16,8 @@ import java.util.Map; //TODO: change using guava builders public final class OperatorTable { - private static Map binaryOperatorsMap = new HashMap(); - private static Map unaryOperatorsMap = new HashMap(); + private static final Map binaryOperatorsMap = new HashMap(); + private static final Map unaryOperatorsMap = new HashMap(); static { unaryOperatorsMap.put(JetTokens.PLUSPLUS, JsUnaryOperator.INC); //++ diff --git a/translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java b/translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java index 79a4ae9a068..fd4ced47e33 100644 --- a/translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java +++ b/translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java @@ -31,7 +31,6 @@ public final class OverloadedIncrementTranslator extends IncrementTranslator { this.operationReference = getMethodReferenceForOverloadedOperation(context, expression); } - @Override @NotNull protected JsExpression translate() { return translateAsMethodCall(); diff --git a/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java b/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java index c1c021f0930..94c3a35b7b7 100644 --- a/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java +++ b/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java @@ -86,7 +86,7 @@ public final class CallTranslator extends AbstractTranslator { } @NotNull - public static JsExpression mayBeWrapWithNegation(@NotNull JsExpression expression, boolean shouldWrap) { + private static JsExpression mayBeWrapWithNegation(@NotNull JsExpression expression, boolean shouldWrap) { if (shouldWrap) { return not(expression); } else { diff --git a/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java b/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java index c87a7154eda..b162b567bfa 100644 --- a/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java +++ b/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java @@ -29,7 +29,7 @@ import static org.jetbrains.k2js.translate.utils.TranslationUtils.getImplicitRec */ public final class PropertyAccessTranslator extends AccessTranslator { - private static String MESSAGE = "Cannot be accessor call. Use canBeProperty*Call to ensure this method " + + private static final String MESSAGE = "Cannot be accessor call. Use canBeProperty*Call to ensure this method " + "can be called safely."; diff --git a/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java b/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java index ba5d0ae154f..485653d7c8c 100644 --- a/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java +++ b/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java @@ -98,7 +98,7 @@ public final class BindingUtils { } @NotNull - public static ClassDescriptor getClassDescriptorForType(@NotNull JetType type) { + private static ClassDescriptor getClassDescriptorForType(@NotNull JetType type) { DeclarationDescriptor superClassDescriptor = type.getConstructor().getDeclarationDescriptor(); assert superClassDescriptor instanceof ClassDescriptor @@ -190,8 +190,8 @@ public final class BindingUtils { } @NotNull - public static ResolvedCall getResolvedCall(@NotNull BindingContext context, - @NotNull JetExpression expression) { + private static ResolvedCall getResolvedCall(@NotNull BindingContext context, + @NotNull JetExpression expression) { ResolvedCall resolvedCall = context.get(BindingContext.RESOLVED_CALL, expression); assert resolvedCall != null : "Must resolve to a call."; return resolvedCall; diff --git a/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java b/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java index cc2e2a9f24c..ceb9ed94234 100644 --- a/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java +++ b/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java @@ -48,7 +48,7 @@ public final class TranslationUtils { } @NotNull - public static JsExpression translateArgument(@NotNull TranslationContext context, @NotNull ValueArgument argument) { + private static JsExpression translateArgument(@NotNull TranslationContext context, @NotNull ValueArgument argument) { JetExpression jetExpression = argument.getArgumentExpression(); if (jetExpression == null) { throw new AssertionError("Argument with no expression encountered!"); @@ -108,8 +108,8 @@ public final class TranslationUtils { } @NotNull - public static JsNameRef getThisQualifiedNameReference(@NotNull TranslationContext context, - @NotNull JsName name) { + private static JsNameRef getThisQualifiedNameReference(@NotNull TranslationContext context, + @NotNull JsName name) { JsExpression qualifier = getThisQualifier(context); JsNameRef reference = name.makeRef(); AstUtil.setQualifier(reference, qualifier); @@ -117,7 +117,7 @@ public final class TranslationUtils { } @NotNull - public static JsExpression getThisQualifier(@NotNull TranslationContext context) { + private static JsExpression getThisQualifier(@NotNull TranslationContext context) { JsExpression qualifier; if (context.aliaser().hasAliasForThis()) { qualifier = context.aliaser().getAliasForThis(); diff --git a/translator/test/org/jetbrains/k2js/test/RhinoFunctionResultChecker.java b/translator/test/org/jetbrains/k2js/test/RhinoFunctionResultChecker.java index 2e3c845a55c..191da8c2408 100644 --- a/translator/test/org/jetbrains/k2js/test/RhinoFunctionResultChecker.java +++ b/translator/test/org/jetbrains/k2js/test/RhinoFunctionResultChecker.java @@ -11,9 +11,9 @@ import static org.junit.Assert.assertTrue; */ public final class RhinoFunctionResultChecker implements RhinoResultChecker { - final String namespaceName; - final String functionName; - final Object expectedResult; + private final String namespaceName; + private final String functionName; + private final Object expectedResult; public RhinoFunctionResultChecker(@Nullable String namespaceName, String functionName, Object expectedResult) { this.namespaceName = namespaceName; diff --git a/translator/test/org/jetbrains/k2js/test/TranslationTest.java b/translator/test/org/jetbrains/k2js/test/TranslationTest.java index 38ab109d9bf..e9571617f1a 100644 --- a/translator/test/org/jetbrains/k2js/test/TranslationTest.java +++ b/translator/test/org/jetbrains/k2js/test/TranslationTest.java @@ -14,7 +14,7 @@ import java.util.List; */ public abstract class TranslationTest { - final protected static String TEST_FILES = "translator/testFiles/"; + private final static String TEST_FILES = "translator/testFiles/"; final private static String CASES = "cases/"; final private static String OUT = "out/"; final private static String KOTLIN_JS_LIB = TEST_FILES + "kotlin_lib.js";