diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java b/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java index 941bde126c1..2a260406d9f 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java @@ -27,14 +27,14 @@ import org.jetbrains.k2js.translate.context.generator.Generator; import org.jetbrains.k2js.translate.context.generator.Rule; import org.jetbrains.k2js.translate.intrinsic.Intrinsics; import org.jetbrains.k2js.translate.utils.AnnotationsUtils; -import org.jetbrains.k2js.translate.utils.DescriptorUtils; +import org.jetbrains.k2js.translate.utils.JsDescriptorUtils; import org.jetbrains.k2js.translate.utils.JsAstUtils; import org.jetbrains.k2js.translate.utils.PredefinedAnnotation; import java.util.Map; import static org.jetbrains.k2js.translate.utils.AnnotationsUtils.*; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.*; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.*; /** * @author Pavel Talanov @@ -437,7 +437,7 @@ public final class StaticContext { if (!(descriptor instanceof NamespaceDescriptor)) { return null; } - if (DescriptorUtils.isTopLevelNamespace((NamespaceDescriptor)descriptor)) { + if (JsDescriptorUtils.isTopLevelNamespace((NamespaceDescriptor) descriptor)) { return true; } return null; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java index b68205b26b5..f1f803550b5 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java @@ -36,7 +36,7 @@ import org.jetbrains.k2js.translate.utils.ClassSortingUtils; import java.util.ArrayList; import java.util.List; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getAllClassesDefinedInNamespace; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getAllClassesDefinedInNamespace; import static org.jetbrains.k2js.translate.utils.JsAstUtils.*; /** diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java index 1f13b9636eb..9c6c9b1e2f2 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java @@ -40,7 +40,7 @@ import java.util.Map; import static com.google.dart.compiler.util.AstUtil.newSequence; import static org.jetbrains.k2js.translate.utils.BindingUtils.getClassDescriptor; import static org.jetbrains.k2js.translate.utils.BindingUtils.getPropertyDescriptorForConstructorParameter; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.*; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.*; import static org.jetbrains.k2js.translate.utils.PsiUtils.getPrimaryConstructorParameters; import static org.jetbrains.k2js.translate.utils.TranslationUtils.getQualifiedReference; import static org.jetbrains.k2js.translate.utils.TranslationUtils.getThisObject; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/NamespaceDeclarationTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/declaration/NamespaceDeclarationTranslator.java index e97cfffae61..cd6a5fdcabf 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/NamespaceDeclarationTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/declaration/NamespaceDeclarationTranslator.java @@ -27,14 +27,14 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.k2js.translate.context.Namer; import org.jetbrains.k2js.translate.context.TranslationContext; import org.jetbrains.k2js.translate.general.AbstractTranslator; -import org.jetbrains.k2js.translate.utils.DescriptorUtils; +import org.jetbrains.k2js.translate.utils.JsDescriptorUtils; import org.jetbrains.k2js.translate.utils.TranslationUtils; import java.util.List; import java.util.Set; import static org.jetbrains.k2js.translate.utils.BindingUtils.getAllNonNativeNamespaceDescriptors; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getAllClassesDefinedInNamespace; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getAllClassesDefinedInNamespace; import static org.jetbrains.k2js.translate.utils.JsAstUtils.setQualifier; /** @@ -126,7 +126,7 @@ public final class NamespaceDeclarationTranslator extends AbstractTranslator { private static List filterTopLevelNamespaces(@NotNull List namespaceDescriptors) { List result = Lists.newArrayList(); for (NamespaceDescriptor descriptor : namespaceDescriptors) { - if (DescriptorUtils.isTopLevelNamespace(descriptor)) { + if (JsDescriptorUtils.isTopLevelNamespace(descriptor)) { result.add(descriptor); } } @@ -137,7 +137,7 @@ public final class NamespaceDeclarationTranslator extends AbstractTranslator { private static List filterNonEmptyNamespaces(@NotNull List namespaceDescriptors) { List result = Lists.newArrayList(); for (NamespaceDescriptor descriptor : namespaceDescriptors) { - if (!DescriptorUtils.isNamespaceEmpty(descriptor)) { + if (!JsDescriptorUtils.isNamespaceEmpty(descriptor)) { result.add(descriptor); } } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java index c5e38968209..5c9d0ae03c1 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.k2js.translate.context.TranslationContext; import org.jetbrains.k2js.translate.general.AbstractTranslator; import org.jetbrains.k2js.translate.general.Translation; -import org.jetbrains.k2js.translate.utils.DescriptorUtils; +import org.jetbrains.k2js.translate.utils.JsDescriptorUtils; import java.util.ArrayList; import java.util.List; @@ -97,7 +97,7 @@ public final class NamespaceTranslator extends AbstractTranslator { @NotNull private List getNestedNamespaceDeclarations() { List result = Lists.newArrayList(); - List nestedNamespaces = DescriptorUtils.getNestedNamespaces(descriptor); + List nestedNamespaces = JsDescriptorUtils.getNestedNamespaces(descriptor); for (NamespaceDescriptor nestedNamespace : nestedNamespaces) { NamespaceTranslator nestedNamespaceTranslator = new NamespaceTranslator(nestedNamespace, classDeclarationTranslator, context()); result.add(nestedNamespaceTranslator.getDeclarationAsInitializer()); diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java index 9076fb0c937..a25486beab3 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java @@ -26,30 +26,23 @@ import org.jetbrains.jet.lang.psi.JetDeclarationWithBody; import org.jetbrains.jet.lang.psi.JetElement; import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.JetStandardClasses; import org.jetbrains.k2js.translate.context.Namer; import org.jetbrains.k2js.translate.context.TemporaryVariable; import org.jetbrains.k2js.translate.context.TranslationContext; import org.jetbrains.k2js.translate.general.AbstractTranslator; -import org.jetbrains.k2js.translate.general.Translation; import org.jetbrains.k2js.translate.reference.ReferenceTranslator; -import org.jetbrains.k2js.translate.utils.DescriptorUtils; -import org.jetbrains.k2js.translate.utils.FunctionBodyTranslator; +import org.jetbrains.k2js.translate.utils.JsDescriptorUtils; import org.jetbrains.k2js.translate.utils.TranslationUtils; import org.jetbrains.k2js.translate.utils.closure.ClosureContext; import org.jetbrains.k2js.translate.utils.closure.ClosureUtils; -import org.jetbrains.k2js.translate.utils.mutator.Mutator; import java.util.ArrayList; import java.util.List; import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptor; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.*; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.*; import static org.jetbrains.k2js.translate.utils.FunctionBodyTranslator.translateFunctionBody; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.convertToBlock; import static org.jetbrains.k2js.translate.utils.JsAstUtils.setParameters; -import static org.jetbrains.k2js.translate.utils.mutator.LastExpressionMutator.mutateLastExpression; /** @@ -228,7 +221,7 @@ public final class FunctionTranslator extends AbstractTranslator { } private boolean isExtensionFunction() { - return DescriptorUtils.isExtensionFunction(descriptor) && !isLiteral(); + return JsDescriptorUtils.isExtensionFunction(descriptor) && !isLiteral(); } private boolean isLiteral() { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/ArrayForTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/ArrayForTranslator.java index bdd2eda0bb8..1807ffc5abd 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/ArrayForTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/ArrayForTranslator.java @@ -32,7 +32,7 @@ import org.jetbrains.k2js.translate.utils.BindingUtils; import java.util.Collections; import java.util.List; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getClassDescriptorForType; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getClassDescriptorForType; import static org.jetbrains.k2js.translate.utils.JsAstUtils.*; import static org.jetbrains.k2js.translate.utils.PsiUtils.getLoopRange; import static org.jetbrains.k2js.translate.utils.TemporariesUtils.temporariesInitialization; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/RangeForTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/RangeForTranslator.java index f951bdd1f89..1120a78773e 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/RangeForTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/RangeForTranslator.java @@ -30,7 +30,7 @@ import org.jetbrains.k2js.translate.utils.BindingUtils; import java.util.List; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getClassDescriptorForType; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getClassDescriptorForType; import static org.jetbrains.k2js.translate.utils.JsAstUtils.*; import static org.jetbrains.k2js.translate.utils.PsiUtils.getLoopRange; import static org.jetbrains.k2js.translate.utils.TemporariesUtils.temporariesInitialization; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java index 4ee6151550f..2acd667e54b 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java @@ -34,15 +34,15 @@ import org.jetbrains.k2js.translate.intrinsic.primitive.*; import org.jetbrains.k2js.translate.intrinsic.string.CharAtIntrinsic; import org.jetbrains.k2js.translate.intrinsic.tuple.TupleAccessIntrinsic; import org.jetbrains.k2js.translate.operation.OperatorTable; -import org.jetbrains.k2js.translate.utils.DescriptorUtils; +import org.jetbrains.k2js.translate.utils.JsDescriptorUtils; import java.util.HashMap; import java.util.List; import java.util.Map; import static org.jetbrains.jet.lang.types.expressions.OperatorConventions.*; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getFunctionByName; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getPropertyByName; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getFunctionByName; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getPropertyByName; //TODO: class is monstrous, should be refactored. @@ -288,7 +288,7 @@ public final class Intrinsics { } private boolean isUnaryOperation(@NotNull FunctionDescriptor descriptor) { - return !DescriptorUtils.hasParameters(descriptor); + return !JsDescriptorUtils.hasParameters(descriptor); } } } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java index bf1f191349c..5389fae9639 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java @@ -39,7 +39,7 @@ import static org.jetbrains.k2js.translate.operation.AssignmentTranslator.isAssi import static org.jetbrains.k2js.translate.operation.CompareToTranslator.isCompareToCall; import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptorForOperationExpression; import static org.jetbrains.k2js.translate.utils.BindingUtils.getResolvedCall; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.isEquals; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.isEquals; import static org.jetbrains.k2js.translate.utils.JsAstUtils.not; import static org.jetbrains.k2js.translate.utils.PsiUtils.*; import static org.jetbrains.k2js.translate.utils.TranslationUtils.*; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/operation/CompareToTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/operation/CompareToTranslator.java index 74a6d5f778e..5e6c63b6d6e 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/operation/CompareToTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/operation/CompareToTranslator.java @@ -30,7 +30,7 @@ import org.jetbrains.k2js.translate.intrinsic.CompareToIntrinsic; import org.jetbrains.k2js.translate.utils.TranslationUtils; import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptorForOperationExpression; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.isCompareTo; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.isCompareTo; import static org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken; import static org.jetbrains.k2js.translate.utils.TranslationUtils.applyIntrinsicToBinaryExpression; import static org.jetbrains.k2js.translate.utils.TranslationUtils.isIntrinsicOperation; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallParametersResolver.java b/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallParametersResolver.java index 82a96c0466e..72f4e3652c9 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallParametersResolver.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallParametersResolver.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.resolve.calls.ResolvedCall; import org.jetbrains.k2js.translate.context.TranslationContext; import org.jetbrains.k2js.translate.utils.TranslationUtils; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.*; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.*; /** * @author Pavel Talanov diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java index ea05ba7ddc2..5cbb541079d 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java @@ -38,7 +38,7 @@ import java.util.ArrayList; import java.util.List; import static org.jetbrains.k2js.translate.reference.CallParametersResolver.resolveCallParameters; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.isConstructorDescriptor; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.isConstructorDescriptor; import static org.jetbrains.k2js.translate.utils.JsAstUtils.*; /** diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/InlinedCallExpressionTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/reference/InlinedCallExpressionTranslator.java index c10b7c16b64..d87781c06d4 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/InlinedCallExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/reference/InlinedCallExpressionTranslator.java @@ -43,8 +43,8 @@ import java.util.Map; import static org.jetbrains.k2js.translate.reference.CallParametersResolver.resolveCallParameters; import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionForDescriptor; import static org.jetbrains.k2js.translate.utils.BindingUtils.getResolvedCallForCallExpression; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getExpectedReceiverDescriptor; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getExpectedThisDescriptor; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getExpectedReceiverDescriptor; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getExpectedThisDescriptor; import static org.jetbrains.k2js.translate.utils.FunctionBodyTranslator.translateFunctionBody; /** diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/NativePropertyAccessTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/reference/NativePropertyAccessTranslator.java index 7f72df2f481..d0cafec5e4c 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/NativePropertyAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/reference/NativePropertyAccessTranslator.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; import org.jetbrains.k2js.translate.context.TranslationContext; import org.jetbrains.k2js.translate.utils.TranslationUtils; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getExpectedThisDescriptor; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getExpectedThisDescriptor; import static org.jetbrains.k2js.translate.utils.JsAstUtils.assignment; import static org.jetbrains.k2js.translate.utils.JsAstUtils.qualified; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/AnnotationsUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/AnnotationsUtils.java index 8067255bc0f..303ca774236 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/AnnotationsUtils.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/AnnotationsUtils.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getContainingClass; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getContainingClass; /** * @author Pavel Talanov diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java index 30d51c13e66..c9f522fb33b 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java @@ -34,7 +34,7 @@ import java.util.Set; import static org.jetbrains.jet.lang.resolve.BindingContext.INDEXED_LVALUE_GET; import static org.jetbrains.jet.lang.resolve.BindingContext.INDEXED_LVALUE_SET; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.*; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.*; /** * @author Pavel Talanov @@ -140,7 +140,7 @@ public final class BindingUtils { public static boolean hasAncestorClass(@NotNull BindingContext context, @NotNull JetClassOrObject classDeclaration) { ClassDescriptor classDescriptor = getClassDescriptor(context, classDeclaration); List superclassDescriptors = getSuperclassDescriptors(classDescriptor); - return (DescriptorUtils.findAncestorClass(superclassDescriptors) != null); + return (JsDescriptorUtils.findAncestorClass(superclassDescriptors) != null); } public static boolean isStatement(@NotNull BindingContext context, @NotNull JetExpression expression) { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/ClassSortingUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/ClassSortingUtils.java index cf4817eda37..d522d241a33 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/ClassSortingUtils.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/ClassSortingUtils.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import java.util.ArrayList; import java.util.List; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getSuperclassDescriptors; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getSuperclassDescriptors; //TODO: can optimise using less dumb implementation diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java similarity index 99% rename from js/js.translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java rename to js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java index 364045342ce..a81bba4489b 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java @@ -36,9 +36,9 @@ import static org.jetbrains.k2js.translate.utils.BindingUtils.isNotAny; /** * @author Pavel Talanov */ -public final class DescriptorUtils { +public final class JsDescriptorUtils { - private DescriptorUtils() { + private JsDescriptorUtils() { } private static int valueParametersCount(@NotNull FunctionDescriptor functionDescriptor) { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java index c036b836989..efdf8c9a8a5 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java @@ -34,8 +34,8 @@ import java.util.List; import static com.google.dart.compiler.util.AstUtil.newAssignment; import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptorForOperationExpression; import static org.jetbrains.k2js.translate.utils.BindingUtils.getPropertyDescriptor; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getDeclarationDescriptorForReceiver; -import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getExpectedReceiverDescriptor; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getDeclarationDescriptorForReceiver; +import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getExpectedReceiverDescriptor; import static org.jetbrains.k2js.translate.utils.JsAstUtils.*; /**