Rename package k2js -> kotlin.js in js.translator

org.jetbrains.k2js -> org.jetbrains.kotlin.js

compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java

@@ -53,9 +53,11 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
 import org.jetbrains.jet.utils.PathUtil;
 import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS;
-import org.jetbrains.k2js.config.*;
-import org.jetbrains.k2js.facade.MainCallParameters;
-import org.jetbrains.k2js.facade.Status;
+import org.jetbrains.k2js.config.Config;
+import org.jetbrains.k2js.config.EcmaVersion;
+import org.jetbrains.k2js.config.LibrarySourcesConfig;
+import org.jetbrains.kotlin.js.facade.MainCallParameters;
+import org.jetbrains.kotlin.js.facade.Status;
 
 import java.io.File;
 import java.util.List;
@@ -63,7 +65,7 @@ import java.util.List;
 import static org.jetbrains.jet.cli.common.ExitCode.COMPILATION_ERROR;
 import static org.jetbrains.jet.cli.common.ExitCode.OK;
 import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION;
-import static org.jetbrains.k2js.facade.K2JSTranslator.translateWithMainCallParameters;
+import static org.jetbrains.kotlin.js.facade.K2JSTranslator.translateWithMainCallParameters;
 
 public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments> {
 

js/js.frontend/src/org/jetbrains/k2js/analyze/suppressWarnings.kt

@@ -16,10 +16,7 @@
 
 package org.jetbrains.k2js.analyze
 
-import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
-import org.jetbrains.jet.lang.resolve.DescriptorUtils
 import org.jetbrains.jet.lang.diagnostics.Errors
-import org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression
 import org.jetbrains.k2js.PredefinedAnnotation.*
 import org.jetbrains.jet.lang.diagnostics.Diagnostic
 import org.jetbrains.jet.lang.diagnostics.Severity
@@ -59,4 +56,4 @@ public class SuppressWarningsFromExternalModules : DiagnosticsWithSuppression.Di
         return diagnostic.getSeverity() == Severity.WARNING &&
                file is JetFile && file.getUserData(LibrarySourcesConfig.EXTERNAL_MODULE_NAME) != null
     }
-}
+}

js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java

@@ -28,11 +28,11 @@ import java.util.IdentityHashMap;
 import java.util.Set;
 import java.util.Stack;
 
-import static org.jetbrains.k2js.translate.utils.JsAstUtils.flattenStatement;
 import static org.jetbrains.kotlin.js.inline.FunctionInlineMutator.getInlineableCallReplacement;
 import static org.jetbrains.kotlin.js.inline.clean.CleanPackage.removeUnusedFunctionDefinitions;
 import static org.jetbrains.kotlin.js.inline.clean.CleanPackage.removeUnusedLocalFunctionDeclarations;
 import static org.jetbrains.kotlin.js.inline.util.UtilPackage.*;
+import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.flattenStatement;
 
 public class JsInliner extends JsVisitorWithContextImpl {
 

js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeDefaultInitializers.kt

@@ -21,9 +21,9 @@ import com.google.dart.compiler.backend.js.ast.metadata.hasDefaultValue
 
 import org.jetbrains.kotlin.js.inline.util.toIdentitySet
 import org.jetbrains.kotlin.js.inline.util.zipWithDefault
-import org.jetbrains.k2js.translate.context.Namer
-import org.jetbrains.k2js.translate.context.Namer.isUndefined
-import org.jetbrains.k2js.translate.utils.JsAstUtils.flattenStatement
+import org.jetbrains.kotlin.js.translate.context.Namer
+import org.jetbrains.kotlin.js.translate.context.Namer.isUndefined
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.flattenStatement
 
 /**
  * Removes initializers for default parameters with defined arguments given

js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/NamingContext.kt

@@ -21,7 +21,7 @@ import com.google.dart.compiler.backend.js.ast.*
 import java.util.ArrayList
 import java.util.IdentityHashMap
 
-import org.jetbrains.k2js.translate.utils.JsAstUtils
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
 import org.jetbrains.kotlin.js.inline.util.replaceNames
 
 class NamingContext(

js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/invocationUtils.kt

@@ -21,7 +21,7 @@ import com.google.dart.compiler.backend.js.ast.JsName
 import com.google.dart.compiler.backend.js.ast.JsExpression
 import com.google.dart.compiler.backend.js.ast.JsNameRef
 import com.google.dart.compiler.backend.js.ast.JsFunction
-import org.jetbrains.k2js.translate.context.Namer
+import org.jetbrains.kotlin.js.translate.context.Namer
 import com.google.dart.compiler.backend.js.ast.HasName
 import com.google.dart.compiler.backend.js.ast.JsNode
 import com.google.dart.compiler.backend.js.ast.metadata.staticRef

js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/ReturnReplacingVisitor.kt

@@ -26,7 +26,7 @@ import com.google.dart.compiler.backend.js.ast.JsObjectLiteral
 import com.google.dart.compiler.backend.js.ast.JsReturn
 import com.google.dart.compiler.backend.js.ast.JsVisitorWithContextImpl
 import org.jetbrains.kotlin.js.inline.util.canHaveSideEffect
-import org.jetbrains.k2js.translate.utils.JsAstUtils
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
 
 class ReturnReplacingVisitor(private val resultRef: JsNameRef?, private val breakLabel: JsNameRef?) : JsVisitorWithContextImpl() {
 

js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java

@@ -44,11 +44,11 @@ import org.jetbrains.k2js.config.Config;
 import org.jetbrains.k2js.config.EcmaVersion;
 import org.jetbrains.k2js.config.LibrarySourcesConfig;
 import org.jetbrains.k2js.config.LibrarySourcesConfigWithCaching;
-import org.jetbrains.k2js.facade.Status;
-import org.jetbrains.k2js.facade.MainCallParameters;
 import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
 import org.jetbrains.k2js.test.utils.JsTestUtils;
-import org.jetbrains.k2js.translate.context.Namer;
+import org.jetbrains.kotlin.js.facade.MainCallParameters;
+import org.jetbrains.kotlin.js.facade.Status;
+import org.jetbrains.kotlin.js.translate.context.Namer;
 
 import java.io.File;
 import java.io.IOException;
@@ -57,9 +57,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import static org.jetbrains.k2js.facade.K2JSTranslator.translateWithMainCallParameters;
 import static org.jetbrains.k2js.test.rhino.RhinoUtils.runRhinoTest;
 import static org.jetbrains.k2js.test.utils.JsTestUtils.convertFileNameToDotJsFile;
+import static org.jetbrains.kotlin.js.facade.K2JSTranslator.translateWithMainCallParameters;
 
 public abstract class BasicTest extends KotlinTestWithEnvironment {
     // predictable order of ecma version in tests
@@ -198,7 +198,7 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
         return false;
     }
 
-    protected boolean shouldGenerateSourcemap() {
+    protected boolean shouldGenerateSourceMap() {
         return false;
     }
 
@@ -280,10 +280,10 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
     @NotNull
     private Config createConfig(@NotNull Project project, @NotNull String moduleId, @NotNull EcmaVersion ecmaVersion, @Nullable List<String> libraries) {
         if (libraries == null) {
-            return new LibrarySourcesConfigWithCaching(project, moduleId, ecmaVersion, shouldGenerateSourcemap(), IS_INLINE_ENABLED, shouldBeTranslateAsUnitTestClass());
+            return new LibrarySourcesConfigWithCaching(project, moduleId, ecmaVersion, shouldGenerateSourceMap(), IS_INLINE_ENABLED, shouldBeTranslateAsUnitTestClass());
         }
         else {
-            return new LibrarySourcesConfig(project, moduleId, librariesWithJsStdlib(libraries), ecmaVersion, shouldGenerateSourcemap(), IS_INLINE_ENABLED);
+            return new LibrarySourcesConfig(project, moduleId, librariesWithJsStdlib(libraries), ecmaVersion, shouldGenerateSourceMap(), IS_INLINE_ENABLED);
         }
     }
 

js/js.tests/test/org/jetbrains/k2js/test/MultipleFilesTranslationTest.java

@@ -18,8 +18,8 @@ package org.jetbrains.k2js.test;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.facade.MainCallParameters;
 import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker;
+import org.jetbrains.kotlin.js.facade.MainCallParameters;
 
 import java.util.List;
 

js/js.tests/test/org/jetbrains/k2js/test/MultipleModulesTranslationTest.kt

@@ -17,17 +17,14 @@
 package org.jetbrains.k2js.test
 
 import org.jetbrains.k2js.config.EcmaVersion
-import org.jetbrains.k2js.facade.MainCallParameters
-import org.jetbrains.k2js.test.BasicTest
+import org.jetbrains.kotlin.js.facade.MainCallParameters
 import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker
 
 import java.io.File
 import java.util.ArrayList
 
 import org.jetbrains.k2js.test.utils.JsTestUtils.getAllFilesInDir
-import java.util.HashMap
 import java.util.LinkedHashMap
-import java.util.Collections
 
 public abstract class MultipleModulesTranslationTest(main: String) : BasicTest(main) {
 

js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationTest.java

@@ -19,9 +19,9 @@ package org.jetbrains.k2js.test;
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.facade.MainCallParameters;
 import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker;
 import org.jetbrains.k2js.test.rhino.RhinoSystemOutputChecker;
+import org.jetbrains.kotlin.js.facade.MainCallParameters;
 
 import static org.jetbrains.k2js.test.utils.JsTestUtils.readFile;
 

js/js.tests/test/org/jetbrains/k2js/test/SourceMapTest.java

@@ -32,7 +32,7 @@ public final class SourceMapTest extends SingleFileTranslationTest {
     }
 
     @Override
-    protected boolean shouldGenerateSourcemap() {
+    protected boolean shouldGenerateSourceMap() {
         return true;
     }
 

js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoFunctionResultChecker.java

@@ -18,7 +18,7 @@ package org.jetbrains.k2js.test.rhino;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.k2js.translate.context.Namer;
+import org.jetbrains.kotlin.js.translate.context.Namer;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
 

js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoSystemOutputChecker.java

@@ -17,7 +17,7 @@
 package org.jetbrains.k2js.test.rhino;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.facade.K2JSTranslator;
+import org.jetbrains.kotlin.js.facade.K2JSTranslator;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
 

js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java

@@ -22,7 +22,7 @@ import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.facade.K2JSTranslator;
+import org.jetbrains.kotlin.js.facade.K2JSTranslator;
 import org.mozilla.javascript.*;
 
 import java.io.File;
@@ -302,4 +302,4 @@ public final class RhinoUtils {
 
         return OPTIMIZATION_DEFAULT;
     }
-}
+}

js/js.tests/test/org/jetbrains/k2js/test/semantics/CharTest.java

@@ -16,9 +16,7 @@
 
 package org.jetbrains.k2js.test.semantics;
 
-import org.jetbrains.k2js.facade.exceptions.TranslationInternalException;
 import org.jetbrains.k2js.test.SingleFileTranslationTest;
-import org.junit.Assert;
 
 public final class CharTest extends SingleFileTranslationTest {
     public CharTest() {

js/js.tests/test/org/jetbrains/k2js/test/semantics/ExamplesTest.java

@@ -19,7 +19,7 @@ package org.jetbrains.k2js.test.semantics;
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.k2js.test.SingleFileTranslationTest;
-import org.jetbrains.k2js.translate.context.Namer;
+import org.jetbrains.kotlin.js.translate.context.Namer;
 
 @SuppressWarnings("JUnitTestCaseWithNoTests")
 public final class ExamplesTest extends SingleFileTranslationTest {

js/js.tests/test/org/jetbrains/k2js/test/semantics/JsUnitTestBase.java

@@ -20,13 +20,16 @@ import com.google.common.collect.Lists;
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.facade.MainCallParameters;
 import org.jetbrains.k2js.test.MultipleFilesTranslationTest;
-import org.jetbrains.k2js.test.utils.JsUnitTestReporter;
 import org.jetbrains.k2js.test.rhino.RhinoSystemOutputChecker;
 import org.jetbrains.k2js.test.rhino.RhinoUtils;
+import org.jetbrains.k2js.test.utils.JsUnitTestReporter;
+import org.jetbrains.kotlin.js.facade.MainCallParameters;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public abstract class JsUnitTestBase extends MultipleFilesTranslationTest {
 
@@ -48,7 +51,7 @@ public abstract class JsUnitTestBase extends MultipleFilesTranslationTest {
     @NotNull
     @Override
     protected List<String> additionalJsFiles(@NotNull EcmaVersion ecmaVersion) {
-        ArrayList<String> result = Lists.newArrayList(super.additionalJsFiles(ecmaVersion));
+        List<String> result = Lists.newArrayList(super.additionalJsFiles(ecmaVersion));
         result.add(JS_TESTS_JS);
         return result;
     }

js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java

@@ -16,7 +16,7 @@
 
 package org.jetbrains.k2js.test.semantics;
 
-import org.jetbrains.k2js.translate.context.Namer;
+import org.jetbrains.kotlin.js.translate.context.Namer;
 import org.mozilla.javascript.JavaScriptException;
 
 /**
@@ -36,8 +36,7 @@ public final class MiscTest extends AbstractExpressionTest {
         fooBoxTest();
     }
 
-
-    public void testSafecallComputesExpressionOnlyOnce() throws Exception {
+    public void testSafeCallComputesExpressionOnlyOnce() throws Exception {
         fooBoxTest();
     }
 
@@ -171,6 +170,7 @@ public final class MiscTest extends AbstractExpressionTest {
             fail();
         }
         catch (JavaScriptException e) {
+            // ignore
         }
     }
 

js/js.tests/test/org/jetbrains/k2js/test/semantics/NumberTest.java

@@ -16,8 +16,8 @@
 
 package org.jetbrains.k2js.test.semantics;
 
-import org.jetbrains.k2js.facade.exceptions.TranslationInternalException;
 import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.facade.exceptions.TranslationInternalException;
 import org.junit.Assert;
 
 public final class NumberTest extends SingleFileTranslationTest {

js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTest.java

@@ -18,9 +18,9 @@ package org.jetbrains.k2js.test.semantics;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.facade.MainCallParameters;
 import org.jetbrains.k2js.test.SingleFileTranslationTest;
 import org.jetbrains.k2js.test.rhino.RhinoFunctionNativeObjectResultChecker;
+import org.jetbrains.kotlin.js.facade.MainCallParameters;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestBase.java

@@ -20,9 +20,9 @@ import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.facade.MainCallParameters;
 import org.jetbrains.k2js.test.SingleFileTranslationTest;
 import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
+import org.jetbrains.kotlin.js.facade.MainCallParameters;
 
 import java.io.File;
 import java.util.List;

js/js.translator/src/org/jetbrains/k2js/translate/LabelGenerator.java

@@ -1,30 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.k2js.translate;
-
-public final class LabelGenerator {
-    private int nameCounter;
-    private final char prefix;
-
-    public LabelGenerator(char prefix) {
-        this.prefix = prefix;
-    }
-
-    public String generate() {
-        return prefix + Integer.toString(nameCounter++, 36);
-    }
-}

js/js.translator/src/org/jetbrains/kotlin/js/facade/FacadeUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.facade;
+package org.jetbrains.kotlin.js.facade;
 
 import org.jetbrains.annotations.NotNull;
 

js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.facade;
+package org.jetbrains.kotlin.js.facade;
 
 import com.google.common.base.Predicates;
 import com.google.dart.compiler.backend.js.ast.JsNode;
@@ -40,14 +40,14 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
 import org.jetbrains.jet.utils.fileUtils.FileUtilsPackage;
-import org.jetbrains.js.compiler.JsSourceGenerationVisitor;
-import org.jetbrains.js.compiler.sourcemap.SourceMap3Builder;
-import org.jetbrains.js.compiler.sourcemap.SourceMapBuilder;
 import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS;
 import org.jetbrains.k2js.config.Config;
-import org.jetbrains.k2js.facade.exceptions.TranslationException;
-import org.jetbrains.k2js.translate.general.Translation;
+import org.jetbrains.kotlin.js.facade.exceptions.TranslationException;
 import org.jetbrains.kotlin.js.inline.JsInliner;
+import org.jetbrains.kotlin.js.sourceMap.JsSourceGenerationVisitor;
+import org.jetbrains.kotlin.js.sourceMap.SourceMap3Builder;
+import org.jetbrains.kotlin.js.sourceMap.SourceMapBuilder;
+import org.jetbrains.kotlin.js.translate.general.Translation;
 
 import java.io.File;
 import java.io.IOException;
@@ -56,7 +56,7 @@ import java.util.List;
 
 import static org.jetbrains.jet.lang.diagnostics.DiagnosticUtils.hasError;
 import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
-import static org.jetbrains.k2js.facade.FacadeUtils.parseString;
+import static org.jetbrains.kotlin.js.facade.FacadeUtils.parseString;
 
 /**
  * An entry point of translator.

js/js.translator/src/org/jetbrains/kotlin/js/facade/MainCallParameters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.facade;
+package org.jetbrains.kotlin.js.facade;
 
 import org.jetbrains.annotations.NotNull;
 

js/js.translator/src/org/jetbrains/kotlin/js/facade/SourceMapBuilderConsumer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.facade;
+package org.jetbrains.kotlin.js.facade;
 
 import com.intellij.openapi.editor.Document;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.PairConsumer;
-import org.jetbrains.js.compiler.sourcemap.SourceMapBuilder;
+import org.jetbrains.kotlin.js.sourceMap.SourceMapBuilder;
 
 class SourceMapBuilderConsumer implements PairConsumer<SourceMapBuilder, Object> {
     @Override

js/js.translator/src/org/jetbrains/kotlin/js/facade/Status.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.facade
+package org.jetbrains.kotlin.js.facade
 
 import kotlin.platform.platformStatic
 
@@ -39,4 +39,4 @@ public class Status<out T> private (private val _result: T, private val type: St
         Fail
         Success
     }
-}
+}

js/js.translator/src/org/jetbrains/kotlin/js/facade/exceptions/MainFunctionNotFoundException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.facade.exceptions;
+package org.jetbrains.kotlin.js.facade.exceptions;
 
 import org.jetbrains.annotations.NotNull;
 

js/js.translator/src/org/jetbrains/kotlin/js/facade/exceptions/TranslationException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.facade.exceptions;
+package org.jetbrains.kotlin.js.facade.exceptions;
 
 import org.jetbrains.annotations.NotNull;
 

js/js.translator/src/org/jetbrains/kotlin/js/facade/exceptions/TranslationInternalException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.facade.exceptions;
+package org.jetbrains.kotlin.js.facade.exceptions;
 
 import org.jetbrains.annotations.NotNull;
 

js/js.translator/src/org/jetbrains/kotlin/js/facade/exceptions/UnsupportedFeatureException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.facade.exceptions;
+package org.jetbrains.kotlin.js.facade.exceptions;
 
 import org.jetbrains.annotations.NotNull;
 

js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/JsSourceGenerationVisitor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.js.compiler;
+package org.jetbrains.kotlin.js.sourceMap;
 
 import com.google.dart.compiler.backend.js.JsToStringGenerationVisitor;
 import com.google.dart.compiler.backend.js.ast.*;
 import com.google.dart.compiler.util.TextOutput;
 import com.intellij.util.SmartList;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.js.compiler.sourcemap.SourceMapBuilder;
 
 import java.util.List;
 

js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/SourceMap3Builder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.js.compiler.sourcemap;
+package org.jetbrains.kotlin.js.sourceMap;
 
 import com.google.dart.compiler.common.SourceInfo;
 import com.google.dart.compiler.util.TextOutput;

js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/SourceMapBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.js.compiler.sourcemap;
+package org.jetbrains.kotlin.js.sourceMap;
 
 import java.io.File;
 

js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,28 +14,20 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.callTranslator
+package org.jetbrains.kotlin.js.translate.callTranslator
 
 import com.google.dart.compiler.backend.js.ast.JsExpression
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
 import org.jetbrains.jet.lang.descriptors.CallableDescriptor
-import org.jetbrains.k2js.translate.context.TranslationContext
+import org.jetbrains.kotlin.js.translate.context.TranslationContext
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue
-import org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getReceiverParameterForReceiver
+import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getReceiverParameterForReceiver
 import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind.*
-import org.jetbrains.k2js.translate.utils.AnnotationsUtils
-import org.jetbrains.jet.lang.psi.JetSuperExpression
-import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver
-import org.jetbrains.jet.lang.descriptors.PropertyDescriptor
-import org.jetbrains.jet.lang.descriptors.VariableDescriptor
-import com.google.dart.compiler.backend.js.ast.JsName
 import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils
-import com.google.dart.compiler.backend.js.ast.JsNameRef
-import org.jetbrains.k2js.translate.utils.JsAstUtils
-import org.jetbrains.k2js.translate.context.Namer
-import org.jetbrains.k2js.translate.reference.CallArgumentTranslator
-import org.jetbrains.k2js.translate.utils.TranslationUtils
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
+import org.jetbrains.kotlin.js.translate.reference.CallArgumentTranslator
+import org.jetbrains.kotlin.js.translate.utils.TranslationUtils
 import com.google.dart.compiler.backend.js.ast.JsLiteral
 import com.google.dart.compiler.backend.js.ast.JsConditional
 import com.google.dart.compiler.backend.js.ast.JsBlock
@@ -172,4 +164,4 @@ private fun TranslationContext.createCallInfo(resolvedCall: ResolvedCall<out Cal
             }
         }
     };
-}
+}

js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfoExtensions.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,22 +14,7 @@
  * limitations under the License.
  */
 
-/*
- * Copyright 2010-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.k2js.translate.callTranslator
+package org.jetbrains.kotlin.js.translate.callTranslator
 
 import org.jetbrains.jet.lang.descriptors.CallableDescriptor
 import org.jetbrains.k2js.translate.utils.AnnotationsUtils
@@ -38,13 +23,9 @@ import org.jetbrains.jet.lang.psi.JetSuperExpression
 import com.google.dart.compiler.backend.js.ast.JsExpression
 import org.jetbrains.jet.lang.descriptors.VariableDescriptor
 import com.google.dart.compiler.backend.js.ast.JsName
-import org.jetbrains.k2js.translate.context.Namer
-import com.google.dart.compiler.backend.js.ast.JsNameRef
-import org.jetbrains.k2js.translate.utils.JsAstUtils
-import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind.*
-import com.google.dart.compiler.backend.js.ast.JsLiteral
-import org.jetbrains.k2js.translate.utils.TranslationUtils
-import org.jetbrains.k2js.translate.context.TranslationContext
+import org.jetbrains.kotlin.js.translate.context.Namer
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
+import org.jetbrains.kotlin.js.translate.context.TranslationContext
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor
 import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension
 
@@ -102,4 +83,4 @@ fun TranslationContext.aliasOrValue(callableDescriptor: CallableDescriptor, valu
     } else {
         return value(callableDescriptor)
     }
-}
+}

js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.callTranslator
+package org.jetbrains.kotlin.js.translate.callTranslator
 
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
@@ -22,11 +22,11 @@ import org.jetbrains.jet.lang.descriptors.CallableDescriptor
 import com.google.dart.compiler.backend.js.ast.JsExpression
 import org.jetbrains.jet.lang.descriptors.VariableDescriptor
 import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall
-import org.jetbrains.k2js.translate.context.TranslationContext
+import org.jetbrains.kotlin.js.translate.context.TranslationContext
 import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind.*
 import org.jetbrains.k2js.translate.utils.AnnotationsUtils
-import org.jetbrains.k2js.translate.reference.CallArgumentTranslator
-import org.jetbrains.k2js.translate.general.Translation
+import org.jetbrains.kotlin.js.translate.reference.CallArgumentTranslator
+import org.jetbrains.kotlin.js.translate.general.Translation
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue
 import org.jetbrains.jet.lang.resolve.calls.CallResolverUtil

js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,30 +14,30 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.callTranslator
+package org.jetbrains.kotlin.js.translate.callTranslator
 
 import com.google.dart.compiler.backend.js.ast.JsExpression
 import com.google.dart.compiler.backend.js.ast.JsNameRef
 import com.google.dart.compiler.backend.js.ast.JsInvocation
 import java.util.ArrayList
-import org.jetbrains.k2js.translate.context.Namer
+import org.jetbrains.kotlin.js.translate.context.Namer
 import org.jetbrains.jet.lang.descriptors.CallableDescriptor
 import com.google.dart.compiler.backend.js.ast.JsNew
 import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
 import com.google.dart.compiler.backend.js.ast.JsLiteral
 import com.google.dart.compiler.backend.js.ast.JsName
-import org.jetbrains.k2js.translate.context.TranslationContext
-import org.jetbrains.k2js.translate.reference.CallArgumentTranslator
+import org.jetbrains.kotlin.js.translate.context.TranslationContext
+import org.jetbrains.kotlin.js.translate.reference.CallArgumentTranslator
 import org.jetbrains.jet.lang.descriptors.Visibilities
 import com.intellij.util.SmartList
 import com.google.dart.compiler.backend.js.ast.JsArrayAccess
-import org.jetbrains.k2js.translate.utils.JsAstUtils
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
 import org.jetbrains.k2js.translate.utils.AnnotationsUtils
 import org.jetbrains.k2js.PredefinedAnnotation
 import org.jetbrains.jet.lang.resolve.calls.tasks.isDynamic
 import org.jetbrains.jet.lang.psi.Call
-import org.jetbrains.k2js.translate.operation.OperatorTable
+import org.jetbrains.kotlin.js.translate.operation.OperatorTable
 import com.google.dart.compiler.backend.js.ast.JsBinaryOperation
 import org.jetbrains.jet.lang.psi.JetPrefixExpression
 import com.google.dart.compiler.backend.js.ast.JsPrefixOperation
@@ -46,7 +46,7 @@ import com.google.dart.compiler.backend.js.ast.JsPostfixOperation
 import org.jetbrains.jet.lang.psi.JetBinaryExpression
 import org.jetbrains.jet.lexer.JetTokens
 import org.jetbrains.jet.lang.psi.JetOperationExpression
-import org.jetbrains.k2js.translate.utils.PsiUtils
+import org.jetbrains.kotlin.js.translate.utils.PsiUtils
 
 public fun addReceiverToArgs(receiver: JsExpression, arguments: List<JsExpression>): List<JsExpression> {
     if (arguments.isEmpty())

js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/VarialbeCallCases.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.callTranslator
+package org.jetbrains.kotlin.js.translate.callTranslator
 
 import com.google.dart.compiler.backend.js.ast.JsExpression
 import com.google.dart.compiler.backend.js.ast.JsNameRef
@@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.descriptors.CallableDescriptor
 import java.util.Collections
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor
 import org.jetbrains.jet.lang.resolve.BindingContextUtils.isVarCapturedInClosure
-import org.jetbrains.k2js.translate.context.Namer.getCapturedVarAccessor
+import org.jetbrains.kotlin.js.translate.context.Namer.getCapturedVarAccessor
 
 
 object NativeVariableAccessCase : VariableAccessCase {

js/js.translator/src/org/jetbrains/kotlin/js/translate/context/AliasingContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.context;
+package org.jetbrains.kotlin.js.translate.context;
 
 import com.google.dart.compiler.backend.js.ast.JsExpression;
 import gnu.trove.THashMap;

js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DefinitionPlace.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.context
+package org.jetbrains.kotlin.js.translate.context
 
 import com.google.dart.compiler.backend.js.ast.JsExpression
 import com.google.dart.compiler.backend.js.ast.JsPropertyInitializer

js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DynamicContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.context;
+package org.jetbrains.kotlin.js.translate.context;
 
 import com.google.dart.compiler.backend.js.ast.*;
 import org.jetbrains.annotations.NotNull;
@@ -87,4 +87,4 @@ public final class DynamicContext {
     public JsBlock jsBlock() {
         return currentBlock;
     }
-}
+}

js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.context;
+package org.jetbrains.kotlin.js.translate.context;
 
 import com.google.dart.compiler.backend.js.ast.*;
 import org.jetbrains.annotations.NotNull;
@@ -25,10 +25,10 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.plugin.JetLanguage;
 
 import static com.google.dart.compiler.backend.js.ast.AstPackage.JsObjectScope;
-import static org.jetbrains.k2js.translate.utils.ManglingUtils.getStableMangledNameForDescriptor;
+import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getStableMangledNameForDescriptor;
 
 /**
- * Encapuslates different types of constants and naming conventions.
+ * Encapsulates different types of constants and naming conventions.
  */
 public final class Namer {
     public static final String KOTLIN_NAME = JetLanguage.NAME;

js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StandardClasses.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.context;
+package org.jetbrains.kotlin.js.translate.context;
 
 import com.google.common.collect.Maps;
 import com.google.dart.compiler.backend.js.ast.JsName;
@@ -32,7 +32,7 @@ import static com.google.dart.compiler.backend.js.ast.AstPackage.JsObjectScope;
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName;
 
 /**
- * Provides a mechanism to bind some of the kotlin/java declations with library implementations.
+ * Provides a mechanism to bind some of the Kotlin/Java declarations with library implementations.
  * Makes sense only for those declaration that cannot be annotated. (Use library annotation in this case)
  */
 public final class StandardClasses {

js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.context;
+package org.jetbrains.kotlin.js.translate.context;
 
 import com.google.common.collect.Maps;
 import com.google.dart.compiler.backend.js.ast.*;
@@ -32,10 +32,10 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.k2js.config.Config;
 import org.jetbrains.k2js.config.EcmaVersion;
 import org.jetbrains.k2js.config.LibrarySourcesConfig;
-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.JsAstUtils;
+import org.jetbrains.kotlin.js.translate.context.generator.Generator;
+import org.jetbrains.kotlin.js.translate.context.generator.Rule;
+import org.jetbrains.kotlin.js.translate.intrinsic.Intrinsics;
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils;
 
 import java.util.Map;
 
@@ -43,9 +43,9 @@ import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorT
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isExtension;
 import static org.jetbrains.k2js.config.LibrarySourcesConfig.BUILTINS_JS_MODULE_NAME;
 import static org.jetbrains.k2js.translate.utils.AnnotationsUtils.*;
-import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.*;
-import static org.jetbrains.k2js.translate.utils.ManglingUtils.getMangledName;
-import static org.jetbrains.k2js.translate.utils.ManglingUtils.getSuggestedName;
+import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.*;
+import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getMangledName;
+import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getSuggestedName;
 
 /**
  * Aggregates all the static parts of the context.

js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TemporaryConstVariable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.context;
+package org.jetbrains.kotlin.js.translate.context;
 
 import com.google.dart.compiler.backend.js.ast.JsExpression;
 import com.google.dart.compiler.backend.js.ast.JsName;

js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TemporaryVariable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.context;
+package org.jetbrains.kotlin.js.translate.context;
 
 import com.google.dart.compiler.backend.js.ast.JsExpression;
 import com.google.dart.compiler.backend.js.ast.JsName;
 import com.google.dart.compiler.backend.js.ast.JsNameRef;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.k2js.translate.utils.JsAstUtils;
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils;
 
 public class TemporaryVariable {
 
@@ -54,4 +54,4 @@ public class TemporaryVariable {
         assert assignmentExpression != null;
         return assignmentExpression;
     }
-}
+}

js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.context;
+package org.jetbrains.kotlin.js.translate.context;
 
 import com.google.dart.compiler.backend.js.ast.*;
 import com.intellij.psi.PsiElement;
@@ -28,17 +28,16 @@ import org.jetbrains.jet.lang.diagnostics.DiagnosticSink;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.reflect.ReflectionTypes;
 import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.jet.lang.resolve.BindingTraceContext;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.k2js.config.Config;
-import org.jetbrains.k2js.translate.intrinsic.Intrinsics;
-import org.jetbrains.k2js.translate.utils.TranslationUtils;
+import org.jetbrains.kotlin.js.translate.intrinsic.Intrinsics;
+import org.jetbrains.kotlin.js.translate.utils.TranslationUtils;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.jetbrains.k2js.translate.context.ContextPackage.getNameForCapturedDescriptor;
-import static org.jetbrains.k2js.translate.utils.BindingUtils.getDescriptorForElement;
+import static org.jetbrains.kotlin.js.translate.context.ContextPackage.getNameForCapturedDescriptor;
+import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getDescriptorForElement;
 
 /**
  * All the info about the state of the translation process.

js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.context
+package org.jetbrains.kotlin.js.translate.context
 
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.resolve.DescriptorUtils.isAncestor
 import com.google.dart.compiler.backend.js.ast.JsName
-import org.jetbrains.k2js.translate.utils.ManglingUtils.getSuggestedName
+import org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getSuggestedName
 import com.google.dart.compiler.backend.js.ast.JsFunctionScope
 
 private val CAPTURED_RECEIVER_NAME_PREFIX : String = "this$"

js/js.translator/src/org/jetbrains/kotlin/js/translate/context/generator/Generator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.context.generator;
+package org.jetbrains.kotlin.js.translate.context.generator;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;

js/js.translator/src/org/jetbrains/kotlin/js/translate/context/generator/Rule.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.context.generator;
+package org.jetbrains.kotlin.js.translate.context.generator;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 
 public interface Rule<V> {
-
     @Nullable
     V apply(@NotNull DeclarationDescriptor descriptor);
 }

js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.declaration;
+package org.jetbrains.kotlin.js.translate.declaration;
 
 import com.google.dart.compiler.backend.js.ast.*;
 import com.intellij.util.SmartList;
@@ -29,27 +29,28 @@ import org.jetbrains.jet.lang.psi.JetParameter;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.TypeConstructor;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
-import org.jetbrains.k2js.translate.context.DefinitionPlace;
-import org.jetbrains.k2js.translate.context.Namer;
-import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.declaration.propertyTranslator.PropertyTranslatorPackage;
-import org.jetbrains.k2js.translate.expression.ExpressionPackage;
-import org.jetbrains.k2js.translate.general.AbstractTranslator;
-import org.jetbrains.k2js.translate.initializer.ClassInitializerTranslator;
-import org.jetbrains.k2js.translate.utils.JsAstUtils;
-import org.jetbrains.k2js.translate.utils.UtilsPackage;
+import org.jetbrains.kotlin.js.translate.context.DefinitionPlace;
+import org.jetbrains.kotlin.js.translate.context.Namer;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.declaration.propertyTranslator.PropertyTranslatorPackage;
+import org.jetbrains.kotlin.js.translate.expression.ExpressionPackage;
+import org.jetbrains.kotlin.js.translate.general.AbstractTranslator;
+import org.jetbrains.kotlin.js.translate.initializer.ClassInitializerTranslator;
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils;
+import org.jetbrains.kotlin.js.translate.utils.UtilsPackage;
 
 import java.util.*;
 
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*;
 import static org.jetbrains.jet.lang.types.TypeUtils.topologicallySortSuperclassesAndRecordAllInstances;
-import static org.jetbrains.k2js.translate.reference.ReferenceTranslator.translateAsFQReference;
-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.JsDescriptorUtils.*;
-import static org.jetbrains.k2js.translate.utils.PsiUtils.getPrimaryConstructorParameters;
-import static org.jetbrains.k2js.translate.utils.TranslationUtils.simpleReturnFunction;
-import static org.jetbrains.k2js.translate.utils.UtilsPackage.*;
+import static org.jetbrains.kotlin.js.translate.reference.ReferenceTranslator.translateAsFQReference;
+import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getClassDescriptor;
+import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getPropertyDescriptorForConstructorParameter;
+import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getReceiverParameterForDeclaration;
+import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getSupertypesWithoutFakes;
+import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getPrimaryConstructorParameters;
+import static org.jetbrains.kotlin.js.translate.utils.TranslationUtils.simpleReturnFunction;
+import static org.jetbrains.kotlin.js.translate.utils.UtilsPackage.generateDelegateCall;
 
 /**
  * Generates a definition of a single class.

js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.declaration;
+package org.jetbrains.kotlin.js.translate.declaration;
 
 import com.google.dart.compiler.backend.js.ast.JsExpression;
 import com.google.dart.compiler.backend.js.ast.JsFunction;
@@ -28,20 +28,20 @@ import org.jetbrains.jet.lang.descriptors.Modality;
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.types.JetType;
-import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.declaration.propertyTranslator.PropertyTranslatorPackage;
-import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.translate.general.TranslatorVisitor;
-import org.jetbrains.k2js.translate.initializer.ClassInitializerTranslator;
-import org.jetbrains.k2js.translate.utils.BindingUtils;
-import org.jetbrains.k2js.translate.utils.TranslationUtils;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.declaration.propertyTranslator.PropertyTranslatorPackage;
+import org.jetbrains.kotlin.js.translate.general.Translation;
+import org.jetbrains.kotlin.js.translate.general.TranslatorVisitor;
+import org.jetbrains.kotlin.js.translate.initializer.ClassInitializerTranslator;
+import org.jetbrains.kotlin.js.translate.utils.BindingUtils;
+import org.jetbrains.kotlin.js.translate.utils.TranslationUtils;
 
 import java.util.List;
 
-import static org.jetbrains.k2js.translate.initializer.InitializerUtils.createClassObjectInitializer;
-import static org.jetbrains.k2js.translate.utils.BindingUtils.getClassDescriptor;
-import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptor;
-import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getSupertypesWithoutFakes;
+import static org.jetbrains.kotlin.js.translate.initializer.InitializerUtils.createClassObjectInitializer;
+import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getClassDescriptor;
+import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getFunctionDescriptor;
+import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getSupertypesWithoutFakes;
 
 public class DeclarationBodyVisitor extends TranslatorVisitor<Void> {
     @KotlinSignature("val result: MutableList<JsPropertyInitializer>")

js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DefineInvocation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.declaration;
+package org.jetbrains.kotlin.js.translate.declaration;
 
 import com.google.dart.compiler.backend.js.ast.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.resolve.name.FqName;
-import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.utils.JsAstUtils;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils;
 
 import java.util.AbstractList;
 import java.util.List;
@@ -75,6 +75,7 @@ public class DefineInvocation {
     @NotNull
     public List<JsExpression> asList() {
         return new AbstractList<JsExpression>() { // because initializer is mutable
+            @NotNull
             @Override
             public JsExpression get(int index) {
                 switch (index) {

js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,28 +14,26 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.declaration
+package org.jetbrains.kotlin.js.translate.declaration
 
 
 import com.google.dart.compiler.backend.js.ast.*
-import com.intellij.util.SmartList
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.psi.*
-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.general.Translation
-import org.jetbrains.k2js.translate.utils.BindingUtils
-import org.jetbrains.k2js.translate.utils.JsAstUtils
-import org.jetbrains.k2js.translate.utils.JsDescriptorUtils
-import org.jetbrains.k2js.translate.utils.TranslationUtils.*
+import org.jetbrains.kotlin.js.translate.context.Namer
+import org.jetbrains.kotlin.js.translate.context.TranslationContext
+import org.jetbrains.kotlin.js.translate.general.AbstractTranslator
+import org.jetbrains.kotlin.js.translate.general.Translation
+import org.jetbrains.kotlin.js.translate.utils.BindingUtils
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
+import org.jetbrains.kotlin.js.translate.utils.TranslationUtils.*
 
 import org.jetbrains.jet.lang.resolve.DescriptorUtils
 import org.jetbrains.jet.backend.common.CodegenUtil
 import java.util.HashMap
-import org.jetbrains.k2js.translate.declaration.propertyTranslator.addGetterAndSetter
-import org.jetbrains.k2js.translate.utils.ManglingUtils.getMangledMemberNameForExplicitDelegation
-import org.jetbrains.k2js.translate.utils.generateDelegateCall
+import org.jetbrains.kotlin.js.translate.declaration.propertyTranslator.addGetterAndSetter
+import org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getMangledMemberNameForExplicitDelegation
+import org.jetbrains.kotlin.js.translate.utils.generateDelegateCall
 import org.jetbrains.jet.backend.common.CodegenUtilKt
 
 public class DelegationTranslator(

js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclaration.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.k2js.translate.declaration
+package org.jetbrains.kotlin.js.translate.declaration
 
 import com.google.dart.compiler.backend.js.ast.JsPropertyInitializer
-import org.jetbrains.k2js.translate.initializer.InitializerVisitor
-import org.jetbrains.k2js.translate.utils.JsAstUtils
-import org.jetbrains.k2js.translate.context.TranslationContext
+import org.jetbrains.kotlin.js.translate.initializer.InitializerVisitor
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
+import org.jetbrains.kotlin.js.translate.context.TranslationContext
 import org.jetbrains.jet.lang.psi.JetClassInitializer
-import org.jetbrains.k2js.translate.general.Translation
+import org.jetbrains.kotlin.js.translate.general.Translation
 import org.jetbrains.jet.lang.psi.JetProperty
-import org.jetbrains.k2js.translate.initializer.InitializerUtils
+import org.jetbrains.kotlin.js.translate.initializer.InitializerUtils
 import org.jetbrains.jet.lang.psi.JetObjectDeclaration
 import org.jetbrains.jet.lang.psi.JetClass
 import com.google.dart.compiler.backend.js.ast.JsFunction
-import org.jetbrains.k2js.translate.utils.BindingUtils.*
-import org.jetbrains.k2js.translate.initializer.InitializerUtils.*
+import org.jetbrains.kotlin.js.translate.utils.BindingUtils.*
+import org.jetbrains.kotlin.js.translate.initializer.InitializerUtils.*
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor
 import com.intellij.util.SmartList
 

js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.declaration;
+package org.jetbrains.kotlin.js.translate.declaration;
 
 import com.google.dart.compiler.backend.js.ast.*;
 import org.jetbrains.annotations.NotNull;
@@ -23,9 +23,9 @@ import org.jetbrains.jet.backend.common.DataClassMethodGenerator;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.JetClassOrObject;
 import org.jetbrains.jet.lang.psi.JetParameter;
-import org.jetbrains.k2js.translate.context.Namer;
-import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.utils.JsAstUtils;
+import org.jetbrains.kotlin.js.translate.context.Namer;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils;
 
 import java.util.ArrayList;
 import java.util.List;

js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageDeclarationTranslator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.declaration;
+package org.jetbrains.kotlin.js.translate.declaration;
 
 import com.google.dart.compiler.backend.js.ast.*;
 import gnu.trove.THashMap;
@@ -24,9 +24,9 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingContextUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
-import org.jetbrains.k2js.translate.context.Namer;
-import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.general.AbstractTranslator;
+import org.jetbrains.kotlin.js.translate.context.Namer;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.general.AbstractTranslator;
 
 import java.util.*;
 

js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageTranslator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.declaration;
+package org.jetbrains.kotlin.js.translate.declaration;
 
 import com.google.dart.compiler.backend.js.ast.*;
 import com.intellij.util.SmartList;
@@ -24,11 +24,11 @@ import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.name.FqName;
-import org.jetbrains.k2js.translate.context.DefinitionPlace;
-import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.general.AbstractTranslator;
 import org.jetbrains.k2js.translate.utils.AnnotationsUtils;
-import org.jetbrains.k2js.translate.utils.BindingUtils;
+import org.jetbrains.kotlin.js.translate.context.DefinitionPlace;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.general.AbstractTranslator;
+import org.jetbrains.kotlin.js.translate.utils.BindingUtils;
 
 import java.util.List;
 import java.util.Map;

js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.declaration.propertyTranslator
+package org.jetbrains.kotlin.js.translate.declaration.propertyTranslator
 
 import com.google.dart.compiler.backend.js.ast.*
 import com.intellij.util.SmartList
@@ -22,15 +22,14 @@ import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.psi.JetProperty
 import org.jetbrains.jet.lang.psi.JetPropertyAccessor
 import org.jetbrains.jet.lang.resolve.BindingContext
-import org.jetbrains.k2js.translate.callTranslator.CallTranslator
-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.JsDescriptorUtils
-
-import org.jetbrains.k2js.translate.context.Namer.*
-import org.jetbrains.k2js.translate.utils.ast.*
-import org.jetbrains.k2js.translate.utils.TranslationUtils.*
+import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator
+import org.jetbrains.kotlin.js.translate.context.TranslationContext
+import org.jetbrains.kotlin.js.translate.general.AbstractTranslator
+import org.jetbrains.kotlin.js.translate.general.Translation
+import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils
+import org.jetbrains.kotlin.js.translate.context.Namer.*
+import org.jetbrains.kotlin.js.translate.utils.ast.*
+import org.jetbrains.kotlin.js.translate.utils.TranslationUtils.*
 import org.jetbrains.jet.lang.resolve.DescriptorUtils.isExtension
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall
 import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension

js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,24 +14,22 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.expression
+package org.jetbrains.kotlin.js.translate.expression
 
 import com.google.dart.compiler.backend.js.ast.*
 import org.jetbrains.jet.lang.psi.JetCatchClause
-import org.jetbrains.jet.lang.psi.JetExpression
 import org.jetbrains.jet.lang.psi.JetTypeReference
 import org.jetbrains.jet.lang.resolve.BindingContext
 import org.jetbrains.jet.lang.resolve.BindingContextUtils.getNotNull
 import org.jetbrains.jet.lang.resolve.DescriptorUtils
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
-import org.jetbrains.k2js.translate.context.TranslationContext
-import org.jetbrains.k2js.translate.general.AbstractTranslator
-import org.jetbrains.k2js.translate.general.Translation.patternTranslator
-import org.jetbrains.k2js.translate.general.Translation.translateAsStatementAndMergeInBlockIfNeeded
-import org.jetbrains.k2js.translate.utils.JsAstUtils.convertToBlock
-import org.jetbrains.k2js.translate.utils.TranslationUtils
-import java.util.Collections
-import org.jetbrains.k2js.translate.utils.JsAstUtils
+import org.jetbrains.kotlin.js.translate.context.TranslationContext
+import org.jetbrains.kotlin.js.translate.general.AbstractTranslator
+import org.jetbrains.kotlin.js.translate.general.Translation.patternTranslator
+import org.jetbrains.kotlin.js.translate.general.Translation.translateAsStatementAndMergeInBlockIfNeeded
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.convertToBlock
+import org.jetbrains.kotlin.js.translate.utils.TranslationUtils
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
 
 class CatchTranslator(
         val catches: List<JetCatchClause>,
@@ -122,4 +120,4 @@ class CatchTranslator(
 
             return jetTypeName == throwableClassName
         }
-}
+}

js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.expression;
+package org.jetbrains.kotlin.js.translate.expression;
 
 import com.google.dart.compiler.backend.js.ast.*;
 import com.google.dart.compiler.backend.js.ast.metadata.MetadataPackage;
@@ -33,31 +33,31 @@ import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.TypeUtils;
 import org.jetbrains.jet.lang.types.lang.InlineUtil;
 import org.jetbrains.jet.lexer.JetTokens;
-import org.jetbrains.k2js.translate.context.TemporaryVariable;
-import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.declaration.ClassTranslator;
-import org.jetbrains.k2js.translate.expression.loopTranslator.LoopTranslatorPackage;
-import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.translate.general.TranslatorVisitor;
-import org.jetbrains.k2js.translate.operation.BinaryOperationTranslator;
-import org.jetbrains.k2js.translate.operation.UnaryOperationTranslator;
-import org.jetbrains.k2js.translate.reference.*;
-import org.jetbrains.k2js.translate.utils.JsAstUtils;
-import org.jetbrains.k2js.translate.utils.TranslationUtils;
+import org.jetbrains.kotlin.js.translate.context.TemporaryVariable;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.declaration.ClassTranslator;
+import org.jetbrains.kotlin.js.translate.expression.loopTranslator.LoopTranslatorPackage;
+import org.jetbrains.kotlin.js.translate.general.Translation;
+import org.jetbrains.kotlin.js.translate.general.TranslatorVisitor;
+import org.jetbrains.kotlin.js.translate.operation.BinaryOperationTranslator;
+import org.jetbrains.kotlin.js.translate.operation.UnaryOperationTranslator;
+import org.jetbrains.kotlin.js.translate.reference.*;
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils;
+import org.jetbrains.kotlin.js.translate.utils.TranslationUtils;
 
 import java.util.List;
 
 import static org.jetbrains.jet.lang.resolve.BindingContextUtils.isVarCapturedInClosure;
-import static org.jetbrains.k2js.translate.context.Namer.getCapturedVarAccessor;
-import static org.jetbrains.k2js.translate.general.Translation.translateAsExpression;
-import static org.jetbrains.k2js.translate.reference.CallExpressionTranslator.shouldBeInlined;
-import static org.jetbrains.k2js.translate.reference.ReferenceTranslator.translateAsFQReference;
-import static org.jetbrains.k2js.translate.utils.BindingUtils.*;
-import static org.jetbrains.k2js.translate.utils.ErrorReportingUtils.message;
-import static org.jetbrains.k2js.translate.utils.JsAstUtils.convertToStatement;
-import static org.jetbrains.k2js.translate.utils.JsAstUtils.newVar;
-import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getReceiverParameterForDeclaration;
-import static org.jetbrains.k2js.translate.utils.TranslationUtils.translateInitializerForProperty;
+import static org.jetbrains.kotlin.js.translate.context.Namer.getCapturedVarAccessor;
+import static org.jetbrains.kotlin.js.translate.general.Translation.translateAsExpression;
+import static org.jetbrains.kotlin.js.translate.reference.CallExpressionTranslator.shouldBeInlined;
+import static org.jetbrains.kotlin.js.translate.reference.ReferenceTranslator.translateAsFQReference;
+import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.*;
+import static org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils.message;
+import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.convertToStatement;
+import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.newVar;
+import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getReceiverParameterForDeclaration;
+import static org.jetbrains.kotlin.js.translate.utils.TranslationUtils.translateInitializerForProperty;
 
 public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
     @Override

js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.expression;
+package org.jetbrains.kotlin.js.translate.expression;
 
 
 import com.google.dart.compiler.backend.js.ast.JsFunction;
@@ -32,19 +32,19 @@ import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
 import org.jetbrains.jet.lang.psi.JetDeclarationWithBody;
 import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
-import org.jetbrains.k2js.translate.context.AliasingContext;
-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.TranslationUtils;
+import org.jetbrains.kotlin.js.translate.context.AliasingContext;
+import org.jetbrains.kotlin.js.translate.context.Namer;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.general.AbstractTranslator;
+import org.jetbrains.kotlin.js.translate.utils.TranslationUtils;
 
 import java.util.Collections;
 import java.util.List;
 
-import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptor;
-import static org.jetbrains.k2js.translate.utils.ErrorReportingUtils.message;
-import static org.jetbrains.k2js.translate.utils.FunctionBodyTranslator.translateFunctionBody;
-import static org.jetbrains.k2js.translate.utils.JsAstUtils.setParameters;
+import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getFunctionDescriptor;
+import static org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils.message;
+import static org.jetbrains.kotlin.js.translate.utils.FunctionBodyTranslator.translateFunctionBody;
+import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.setParameters;
 
 public final class FunctionTranslator extends AbstractTranslator {
     @NotNull

js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.expression
+package org.jetbrains.kotlin.js.translate.expression
 
 import com.google.dart.compiler.backend.js.ast.*
 import com.google.dart.compiler.backend.js.ast.metadata.staticRef
@@ -22,14 +22,14 @@ import com.google.dart.compiler.backend.js.ast.metadata.isLocal
 import org.jetbrains.jet.lang.descriptors.CallableDescriptor
 import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor
 import org.jetbrains.jet.lang.psi.JetDeclarationWithBody
-import org.jetbrains.k2js.translate.context.*
-import org.jetbrains.k2js.translate.general.AbstractTranslator
-import org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptor
-import org.jetbrains.k2js.translate.utils.FunctionBodyTranslator.translateFunctionBody
-import org.jetbrains.k2js.translate.utils.TranslationUtils.simpleReturnFunction
+import org.jetbrains.kotlin.js.translate.context.*
+import org.jetbrains.kotlin.js.translate.general.AbstractTranslator
+import org.jetbrains.kotlin.js.translate.utils.BindingUtils.getFunctionDescriptor
+import org.jetbrains.kotlin.js.translate.utils.FunctionBodyTranslator.translateFunctionBody
+import org.jetbrains.kotlin.js.translate.utils.TranslationUtils.simpleReturnFunction
 import org.jetbrains.jet.lang.descriptors.MemberDescriptor
 import org.jetbrains.jet.lang.descriptors.Visibilities
-import org.jetbrains.k2js.translate.utils.JsAstUtils
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
 import org.jetbrains.kotlin.js.inline.util.getInnerFunction
 import org.jetbrains.jet.lang.types.lang.InlineUtil
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor

js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.expression.loopTranslator
+package org.jetbrains.kotlin.js.translate.expression.loopTranslator
 
 import com.google.dart.compiler.backend.js.ast.*
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
@@ -22,17 +22,17 @@ import org.jetbrains.jet.lang.psi.*
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall
 import org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassDescriptorForType
 import org.jetbrains.jet.lexer.JetTokens
-import org.jetbrains.k2js.translate.callTranslator.CallTranslator
-import org.jetbrains.k2js.translate.context.TemporaryVariable
-import org.jetbrains.k2js.translate.context.TranslationContext
-import org.jetbrains.k2js.translate.expression.MultiDeclarationTranslator
-import org.jetbrains.k2js.translate.general.Translation
-import org.jetbrains.k2js.translate.intrinsic.functions.factories.CompositeFIF
-import org.jetbrains.k2js.translate.utils.BindingUtils.*
-import org.jetbrains.k2js.translate.utils.JsAstUtils.*
-import org.jetbrains.k2js.translate.utils.PsiUtils.*
-import org.jetbrains.k2js.translate.utils.TemporariesUtils.temporariesInitialization
-import org.jetbrains.k2js.translate.utils.TranslationUtils
+import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator
+import org.jetbrains.kotlin.js.translate.context.TemporaryVariable
+import org.jetbrains.kotlin.js.translate.context.TranslationContext
+import org.jetbrains.kotlin.js.translate.expression.MultiDeclarationTranslator
+import org.jetbrains.kotlin.js.translate.general.Translation
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.factories.CompositeFIF
+import org.jetbrains.kotlin.js.translate.utils.BindingUtils.*
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.*
+import org.jetbrains.kotlin.js.translate.utils.PsiUtils.*
+import org.jetbrains.kotlin.js.translate.utils.TemporariesUtils.temporariesInitialization
+import org.jetbrains.kotlin.js.translate.utils.TranslationUtils
 
 public fun createWhile(doWhile: Boolean, expression: JetWhileExpressionBase, context: TranslationContext): JsNode {
     val conditionExpression = expression.getCondition() ?:
@@ -238,4 +238,4 @@ public fun translateForExpression(expression: JetForExpression, context: Transla
         else ->
             translateForOverIterator()
     }
-}
+}

js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/MultiDeclarationTranslator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.expression;
+package org.jetbrains.kotlin.js.translate.expression;
 
 import com.google.dart.compiler.backend.js.ast.JsExpression;
 import com.google.dart.compiler.backend.js.ast.JsName;
@@ -29,9 +29,9 @@ import org.jetbrains.jet.lang.psi.JetMultiDeclarationEntry;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingContextUtils;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
-import org.jetbrains.k2js.translate.callTranslator.CallTranslator;
-import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.general.AbstractTranslator;
+import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.general.AbstractTranslator;
 
 import java.util.ArrayList;
 import java.util.List;

js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.expression;
+package org.jetbrains.kotlin.js.translate.expression;
 
 import com.google.dart.compiler.backend.js.ast.JsExpression;
 import com.google.dart.compiler.backend.js.ast.JsInvocation;
@@ -26,17 +26,17 @@ import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.psi.JetIsExpression;
 import org.jetbrains.jet.lang.psi.JetTypeReference;
 import org.jetbrains.jet.lang.resolve.name.Name;
-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.intrinsic.functions.patterns.NamePredicate;
-import org.jetbrains.k2js.translate.utils.BindingUtils;
-import org.jetbrains.k2js.translate.utils.JsAstUtils;
-import org.jetbrains.k2js.translate.utils.TranslationUtils;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.general.AbstractTranslator;
+import org.jetbrains.kotlin.js.translate.general.Translation;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate;
+import org.jetbrains.kotlin.js.translate.utils.BindingUtils;
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils;
+import org.jetbrains.kotlin.js.translate.utils.TranslationUtils;
 
-import static org.jetbrains.k2js.translate.utils.BindingUtils.getTypeByReference;
-import static org.jetbrains.k2js.translate.utils.JsAstUtils.*;
-import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getNameIfStandardType;
+import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getTypeByReference;
+import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.*;
+import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getNameIfStandardType;
 
 public final class PatternTranslator extends AbstractTranslator {
 

js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/StringTemplateTranslator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.expression;
+package org.jetbrains.kotlin.js.translate.expression;
 
 import com.google.dart.compiler.backend.js.ast.JsExpression;
 import com.google.dart.compiler.backend.js.ast.JsInvocation;
@@ -26,17 +26,17 @@ import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.JetType;
-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.intrinsic.functions.factories.TopLevelFIF;
-import org.jetbrains.k2js.translate.intrinsic.functions.patterns.NamePredicate;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.general.AbstractTranslator;
+import org.jetbrains.kotlin.js.translate.general.Translation;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.factories.TopLevelFIF;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate;
 
 import java.util.Collections;
 
-import static org.jetbrains.k2js.translate.utils.ErrorReportingUtils.message;
-import static org.jetbrains.k2js.translate.utils.JsAstUtils.sum;
-import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getNameIfStandardType;
+import static org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils.message;
+import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.sum;
+import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getNameIfStandardType;
 
 public final class StringTemplateTranslator extends AbstractTranslator {
     private final JetStringTemplateEntry[] expressionEntries;

js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/TryTranslator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.expression
+package org.jetbrains.kotlin.js.translate.expression
 
 import com.google.dart.compiler.backend.js.ast.*
 import org.jetbrains.jet.lang.psi.JetTryExpression
 import org.jetbrains.jet.lang.psi.JetExpression
-import org.jetbrains.jet.lang.psi.JetCatchClause
-import org.jetbrains.k2js.translate.context.TranslationContext
-import org.jetbrains.k2js.translate.general.AbstractTranslator
-import org.jetbrains.k2js.translate.general.Translation.translateAsStatementAndMergeInBlockIfNeeded
-import org.jetbrains.k2js.translate.utils.JsAstUtils.convertToBlock
+import org.jetbrains.kotlin.js.translate.context.TranslationContext
+import org.jetbrains.kotlin.js.translate.general.AbstractTranslator
+import org.jetbrains.kotlin.js.translate.general.Translation.translateAsStatementAndMergeInBlockIfNeeded
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.convertToBlock
 
 public class TryTranslator(
         val expression: JetTryExpression,

js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.expression;
+package org.jetbrains.kotlin.js.translate.expression;
 
 import com.google.dart.compiler.backend.js.ast.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.*;
-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.utils.JsAstUtils;
-import org.jetbrains.k2js.translate.utils.TranslationUtils;
+import org.jetbrains.kotlin.js.translate.context.TemporaryVariable;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.general.AbstractTranslator;
+import org.jetbrains.kotlin.js.translate.general.Translation;
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils;
+import org.jetbrains.kotlin.js.translate.utils.TranslationUtils;
 
-import static org.jetbrains.k2js.translate.utils.JsAstUtils.negated;
+import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.negated;
 
 public final class WhenTranslator extends AbstractTranslator {
     @Nullable

js/js.translator/src/org/jetbrains/kotlin/js/translate/general/AbstractTranslator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.general;
+package org.jetbrains.kotlin.js.translate.general;
 
 import com.google.dart.compiler.backend.js.ast.JsProgram;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.k2js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
 
 public abstract class AbstractTranslator {
 

js/js.translator/src/org/jetbrains/kotlin/js/translate/general/JetTestFunctionDetector.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.general;
+package org.jetbrains.kotlin.js.translate.general;
 
 import com.google.common.collect.Lists;
 import com.intellij.util.Function;
@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.types.JetType;
-import org.jetbrains.k2js.translate.utils.BindingUtils;
+import org.jetbrains.kotlin.js.translate.utils.BindingUtils;
 
 import java.util.Collection;
 import java.util.List;

js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.general;
+package org.jetbrains.kotlin.js.translate.general;
 
 import com.google.dart.compiler.backend.js.ast.*;
 import org.jetbrains.annotations.NotNull;
@@ -29,32 +29,35 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage;
 import org.jetbrains.jet.plugin.MainFunctionDetector;
 import org.jetbrains.k2js.config.Config;
-import org.jetbrains.k2js.facade.MainCallParameters;
-import org.jetbrains.k2js.facade.exceptions.*;
-import org.jetbrains.k2js.translate.callTranslator.CallTranslator;
-import org.jetbrains.k2js.translate.context.Namer;
-import org.jetbrains.k2js.translate.context.StaticContext;
-import org.jetbrains.k2js.translate.context.TemporaryVariable;
-import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.declaration.PackageDeclarationTranslator;
-import org.jetbrains.k2js.translate.expression.ExpressionVisitor;
-import org.jetbrains.k2js.translate.expression.FunctionTranslator;
-import org.jetbrains.k2js.translate.expression.PatternTranslator;
-import org.jetbrains.k2js.translate.test.JSRhinoUnitTester;
-import org.jetbrains.k2js.translate.test.JSTestGenerator;
-import org.jetbrains.k2js.translate.test.JSTester;
-import org.jetbrains.k2js.translate.test.QUnitTester;
-import org.jetbrains.k2js.translate.utils.JsAstUtils;
-import org.jetbrains.k2js.translate.utils.mutator.AssignToExpressionMutator;
+import org.jetbrains.kotlin.js.facade.MainCallParameters;
+import org.jetbrains.kotlin.js.facade.exceptions.MainFunctionNotFoundException;
+import org.jetbrains.kotlin.js.facade.exceptions.TranslationException;
+import org.jetbrains.kotlin.js.facade.exceptions.TranslationInternalException;
+import org.jetbrains.kotlin.js.facade.exceptions.UnsupportedFeatureException;
+import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator;
+import org.jetbrains.kotlin.js.translate.context.Namer;
+import org.jetbrains.kotlin.js.translate.context.StaticContext;
+import org.jetbrains.kotlin.js.translate.context.TemporaryVariable;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.declaration.PackageDeclarationTranslator;
+import org.jetbrains.kotlin.js.translate.expression.ExpressionVisitor;
+import org.jetbrains.kotlin.js.translate.expression.FunctionTranslator;
+import org.jetbrains.kotlin.js.translate.expression.PatternTranslator;
+import org.jetbrains.kotlin.js.translate.test.JSRhinoUnitTester;
+import org.jetbrains.kotlin.js.translate.test.JSTestGenerator;
+import org.jetbrains.kotlin.js.translate.test.JSTester;
+import org.jetbrains.kotlin.js.translate.test.QUnitTester;
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils;
+import org.jetbrains.kotlin.js.translate.utils.mutator.AssignToExpressionMutator;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptor;
-import static org.jetbrains.k2js.translate.utils.JsAstUtils.convertToStatement;
-import static org.jetbrains.k2js.translate.utils.JsAstUtils.toStringLiteralList;
-import static org.jetbrains.k2js.translate.utils.mutator.LastExpressionMutator.mutateLastExpression;
+import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getFunctionDescriptor;
+import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.convertToStatement;
+import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.toStringLiteralList;
+import static org.jetbrains.kotlin.js.translate.utils.mutator.LastExpressionMutator.mutateLastExpression;
 
 /**
  * This class provides a interface which all translators use to interact with each other.

js/js.translator/src/org/jetbrains/kotlin/js/translate/general/TranslatorVisitor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.general;
+package org.jetbrains.kotlin.js.translate.general;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.k2js.translate.context.TranslationContext;
+import org.jetbrains.jet.lang.psi.JetDeclaration;
+import org.jetbrains.jet.lang.psi.JetDeclarationContainer;
+import org.jetbrains.jet.lang.psi.JetElement;
+import org.jetbrains.jet.lang.psi.JetVisitor;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
 
 /**
  * This class is a base class for all visitors.

js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.initializer;
+package org.jetbrains.kotlin.js.translate.initializer;
 
 import com.google.dart.compiler.backend.js.ast.*;
 import com.intellij.util.SmartList;
@@ -31,20 +31,20 @@ import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lexer.JetTokens;
-import org.jetbrains.k2js.translate.context.Namer;
-import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.declaration.DelegationTranslator;
-import org.jetbrains.k2js.translate.general.AbstractTranslator;
-import org.jetbrains.k2js.translate.reference.CallArgumentTranslator;
+import org.jetbrains.kotlin.js.translate.context.Namer;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.declaration.DelegationTranslator;
+import org.jetbrains.kotlin.js.translate.general.AbstractTranslator;
+import org.jetbrains.kotlin.js.translate.reference.CallArgumentTranslator;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassDescriptorForType;
-import static org.jetbrains.k2js.translate.utils.BindingUtils.*;
-import static org.jetbrains.k2js.translate.utils.FunctionBodyTranslator.setDefaultValueForArguments;
-import static org.jetbrains.k2js.translate.utils.PsiUtils.getPrimaryConstructorParameters;
+import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.*;
+import static org.jetbrains.kotlin.js.translate.utils.FunctionBodyTranslator.setDefaultValueForArguments;
+import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getPrimaryConstructorParameters;
 
 public final class ClassInitializerTranslator extends AbstractTranslator {
     @NotNull

js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,26 +14,27 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.initializer;
+package org.jetbrains.kotlin.js.translate.initializer;
 
 import com.google.dart.compiler.backend.js.ast.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.descriptors.*;
+import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
+import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.psi.JetObjectDeclaration;
 import org.jetbrains.jet.lang.psi.JetProperty;
-import org.jetbrains.k2js.translate.context.Namer;
-import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.declaration.ClassTranslator;
-import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.translate.utils.JsAstUtils;
+import org.jetbrains.kotlin.js.translate.context.Namer;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.declaration.ClassTranslator;
+import org.jetbrains.kotlin.js.translate.general.Translation;
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils;
 
 import java.util.List;
 
-import static org.jetbrains.k2js.translate.utils.BindingUtils.getClassDescriptor;
-import static org.jetbrains.k2js.translate.utils.JsAstUtils.assignment;
-import static org.jetbrains.k2js.translate.utils.TranslationUtils.assignmentToBackingField;
+import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getClassDescriptor;
+import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.assignment;
+import static org.jetbrains.kotlin.js.translate.utils.TranslationUtils.assignmentToBackingField;
 
 public final class InitializerUtils {
     private InitializerUtils() {
@@ -73,4 +74,4 @@ public final class InitializerUtils {
         JsStringLiteral classObjectInitStr = context.program().getStringLiteral(Namer.getNameForClassObjectInitializer());
         return new JsPropertyInitializer(classObjectInitStr, value);
     }
-}
+}

js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.initializer;
+package org.jetbrains.kotlin.js.translate.initializer;
 
 import com.google.dart.compiler.backend.js.ast.JsStatement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.translate.general.TranslatorVisitor;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.general.Translation;
+import org.jetbrains.kotlin.js.translate.general.TranslatorVisitor;
 
 import java.util.List;
 
-import static org.jetbrains.k2js.translate.general.Translation.translateAsStatementAndMergeInBlockIfNeeded;
-import static org.jetbrains.k2js.translate.initializer.InitializerUtils.generateInitializerForDelegate;
-import static org.jetbrains.k2js.translate.initializer.InitializerUtils.generateInitializerForProperty;
-import static org.jetbrains.k2js.translate.utils.BindingUtils.getPropertyDescriptor;
+import static org.jetbrains.kotlin.js.translate.general.Translation.translateAsStatementAndMergeInBlockIfNeeded;
+import static org.jetbrains.kotlin.js.translate.initializer.InitializerUtils.generateInitializerForDelegate;
+import static org.jetbrains.kotlin.js.translate.initializer.InitializerUtils.generateInitializerForProperty;
+import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getPropertyDescriptor;
 
 public final class InitializerVisitor extends TranslatorVisitor<Void> {
     private final List<JsStatement> result;

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/Intrinsics.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic;
+package org.jetbrains.kotlin.js.translate.intrinsic;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.translate.intrinsic.functions.FunctionIntrinsics;
-import org.jetbrains.k2js.translate.intrinsic.operation.BinaryOperationIntrinsics;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.FunctionIntrinsics;
+import org.jetbrains.kotlin.js.translate.intrinsic.operation.BinaryOperationIntrinsics;
 
 /**
  * Provides mechanism to substitute method calls /w native constructs directly.

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/FunctionIntrinsics.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.functions;
+package org.jetbrains.kotlin.js.translate.intrinsic.functions;
 
 import com.google.common.collect.Lists;
 import gnu.trove.THashMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
-import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic;
-import org.jetbrains.k2js.translate.intrinsic.functions.factories.*;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.factories.*;
 
 import java.util.List;
 import java.util.Map;

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/BuiltInFunctionIntrinsic.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.functions.basic;
+package org.jetbrains.kotlin.js.translate.intrinsic.functions.basic;
 
 import com.google.dart.compiler.backend.js.ast.JsExpression;
 import com.google.dart.compiler.backend.js.ast.JsInvocation;
 import com.google.dart.compiler.backend.js.ast.JsNameRef;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.k2js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
 
 import java.util.List;
 
@@ -36,9 +36,12 @@ public final class BuiltInFunctionIntrinsic extends FunctionIntrinsic {
 
     @NotNull
     @Override
-    public JsExpression apply(@Nullable JsExpression receiver, @NotNull List<JsExpression> arguments,
-                              @NotNull TranslationContext context) {
+    public JsExpression apply(
+            @Nullable JsExpression receiver,
+            @NotNull List<JsExpression> arguments,
+            @NotNull TranslationContext context
+    ) {
         assert receiver != null;
         return new JsInvocation(new JsNameRef(functionName, receiver), arguments);
     }
-}
+}

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/BuiltInPropertyIntrinsic.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.functions.basic;
+package org.jetbrains.kotlin.js.translate.intrinsic.functions.basic;
 
 import com.google.dart.compiler.backend.js.ast.JsExpression;
 import com.google.dart.compiler.backend.js.ast.JsNameRef;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.k2js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
 
 import java.util.List;
 
@@ -42,4 +42,4 @@ public final class BuiltInPropertyIntrinsic extends FunctionIntrinsic {
         assert arguments.isEmpty() : "Properties can't have arguments.";
         return new JsNameRef(propertyName, receiver);
     }
-}
+}

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/FunctionIntrinsic.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.functions.basic;
+package org.jetbrains.kotlin.js.translate.intrinsic.functions.basic;
 
 import com.google.dart.compiler.backend.js.ast.JsExpression;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.k2js.translate.callTranslator.CallInfo;
-import org.jetbrains.k2js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.callTranslator.CallInfo;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
 
 import java.util.List;
 

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ArrayFIF.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.functions.factories;
+package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories;
 
 import com.google.common.collect.Lists;
 import com.google.dart.compiler.backend.js.ast.JsArrayAccess;
@@ -23,36 +23,24 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.lang.PrimitiveType;
-import org.jetbrains.k2js.translate.context.Namer;
-import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic;
-import org.jetbrains.k2js.translate.intrinsic.functions.patterns.DescriptorPredicate;
-import org.jetbrains.k2js.translate.intrinsic.functions.patterns.NamePredicate;
+import org.jetbrains.kotlin.js.translate.context.Namer;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.DescriptorPredicate;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate;
 
 import java.util.List;
 
 import static com.intellij.openapi.util.text.StringUtil.decapitalize;
-import static org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern;
-import static org.jetbrains.k2js.translate.utils.JsAstUtils.assignment;
+import static org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern;
+import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.assignment;
 
 public final class ArrayFIF extends CompositeFIF {
-
-    @NotNull
     private static final NamePredicate NUMBER_ARRAY;
-
-    @NotNull
     private static final NamePredicate CHAR_ARRAY;
-
-    @NotNull
     private static final NamePredicate BOOLEAN_ARRAY;
-
-    @NotNull
     private static final NamePredicate LONG_ARRAY;
-
-    @NotNull
     private static final NamePredicate ARRAYS;
-
-    @NotNull
     private static final DescriptorPredicate ARRAY_FACTORY_METHODS;
 
     static {

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/CompositeFIF.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.functions.factories;
+package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
@@ -24,10 +24,10 @@ import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
-import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.intrinsic.functions.basic.BuiltInPropertyIntrinsic;
-import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic;
-import org.jetbrains.k2js.translate.utils.JsAstUtils;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.BuiltInPropertyIntrinsic;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic;
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils;
 
 import java.util.List;
 

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/FunctionIntrinsicFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.functions.factories;
+package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
-import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic;
 
 public interface FunctionIntrinsicFactory {
     @Nullable

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/KotlinFunctionIntrinsic.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.functions.factories;
+package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories;
 
 import com.google.dart.compiler.backend.js.ast.JsExpression;
 import com.google.dart.compiler.backend.js.ast.JsInvocation;
 import com.google.dart.compiler.backend.js.ast.JsNameRef;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.k2js.translate.context.Namer;
-import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic;
-import org.jetbrains.k2js.translate.utils.TranslationUtils;
+import org.jetbrains.kotlin.js.translate.context.Namer;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic;
+import org.jetbrains.kotlin.js.translate.utils.TranslationUtils;
 
 import java.util.List;
 

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/LongOperationFIF.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.functions.factories
+package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories
 
 import com.google.dart.compiler.backend.js.ast.*
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
-import org.jetbrains.k2js.translate.context.Namer
-import org.jetbrains.k2js.translate.context.TranslationContext
-import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic
-import org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern
-import org.jetbrains.k2js.translate.utils.ID
-import org.jetbrains.k2js.translate.utils.JsAstUtils.*
+import org.jetbrains.kotlin.js.translate.context.Namer
+import org.jetbrains.kotlin.js.translate.context.TranslationContext
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern
+import org.jetbrains.kotlin.js.translate.utils.ID
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.*
 
 // TODO Move to FunctionCallCases
 public object LongOperationFIF : FunctionIntrinsicFactory {
@@ -103,4 +103,4 @@ public object LongOperationFIF : FunctionIntrinsicFactory {
                null
        }
     }
-}
+}

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.functions.factories
+package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories
 
 import com.google.common.base.Predicates
 import com.google.dart.compiler.backend.js.ast.JsExpression
-import org.jetbrains.k2js.translate.context.TranslationContext
-import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic
-import org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern
-import org.jetbrains.k2js.translate.utils.ID
-import org.jetbrains.k2js.translate.utils.JsAstUtils.*
+import org.jetbrains.kotlin.js.translate.context.TranslationContext
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern
+import org.jetbrains.kotlin.js.translate.utils.ID
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.*
 
 public object NumberAndCharConversionFIF : CompositeFIF() {
     val USE_AS_IS = Predicates.or(

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.functions.factories;
+package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -28,17 +28,17 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
 import org.jetbrains.jet.lexer.JetToken;
-import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic;
-import org.jetbrains.k2js.translate.intrinsic.functions.patterns.DescriptorPredicate;
-import org.jetbrains.k2js.translate.intrinsic.functions.patterns.NamePredicate;
-import org.jetbrains.k2js.translate.operation.OperatorTable;
-import org.jetbrains.k2js.translate.utils.JsAstUtils;
-import org.jetbrains.k2js.translate.utils.JsDescriptorUtils;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.DescriptorPredicate;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate;
+import org.jetbrains.kotlin.js.translate.operation.OperatorTable;
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils;
+import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils;
 
 import java.util.List;
 
-import static org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern;
+import static org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern;
 
 public enum PrimitiveBinaryOperationFIF implements FunctionIntrinsicFactory {
     INSTANCE;

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.functions.factories;
+package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -25,18 +25,18 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
 import org.jetbrains.jet.lexer.JetToken;
-import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic;
-import org.jetbrains.k2js.translate.intrinsic.functions.patterns.DescriptorPredicate;
-import org.jetbrains.k2js.translate.intrinsic.functions.patterns.NamePredicate;
-import org.jetbrains.k2js.translate.operation.OperatorTable;
-import org.jetbrains.k2js.translate.utils.JsAstUtils;
-import org.jetbrains.k2js.translate.utils.JsDescriptorUtils;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.DescriptorPredicate;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate;
+import org.jetbrains.kotlin.js.translate.operation.OperatorTable;
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils;
+import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils;
 
 import java.util.List;
 
-import static org.jetbrains.k2js.translate.intrinsic.functions.patterns.NamePredicate.PRIMITIVE_NUMBERS;
-import static org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern;
+import static org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate.PRIMITIVE_NUMBERS;
+import static org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern;
 
 public enum PrimitiveUnaryOperationFIF implements FunctionIntrinsicFactory {
 

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/StringOperationFIF.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.functions.factories;
+package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.translate.intrinsic.functions.basic.BuiltInFunctionIntrinsic;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.BuiltInFunctionIntrinsic;
 
-import static org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern;
+import static org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern;
 
 public final class StringOperationFIF extends CompositeFIF {
     @NotNull

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.functions.factories;
+package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories;
 
 import com.google.dart.compiler.backend.js.ast.*;
 import org.jetbrains.annotations.NotNull;
@@ -31,21 +31,21 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.lang.types.lang.PrimitiveType;
-import org.jetbrains.k2js.translate.callTranslator.CallInfo;
-import org.jetbrains.k2js.translate.context.Namer;
-import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic;
-import org.jetbrains.k2js.translate.intrinsic.functions.patterns.DescriptorPredicate;
-import org.jetbrains.k2js.translate.intrinsic.functions.patterns.NamePredicate;
 import org.jetbrains.k2js.translate.utils.AnnotationsUtils;
-import org.jetbrains.k2js.translate.utils.BindingUtils;
-import org.jetbrains.k2js.translate.utils.JsDescriptorUtils;
+import org.jetbrains.kotlin.js.translate.callTranslator.CallInfo;
+import org.jetbrains.kotlin.js.translate.context.Namer;
+import org.jetbrains.kotlin.js.translate.context.TranslationContext;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.DescriptorPredicate;
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate;
+import org.jetbrains.kotlin.js.translate.utils.BindingUtils;
+import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils;
 
 import java.util.List;
 
-import static org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic.CallParametersAwareFunctionIntrinsic;
-import static org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern;
-import static org.jetbrains.k2js.translate.utils.ManglingUtils.getStableMangledNameForDescriptor;
+import static org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic.CallParametersAwareFunctionIntrinsic;
+import static org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern;
+import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getStableMangledNameForDescriptor;
 
 public final class TopLevelFIF extends CompositeFIF {
     public static final DescriptorPredicate EQUALS_IN_ANY = pattern("kotlin", "Any", "equals");

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/DescriptorPredicate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.functions.patterns;
+package org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns;
 
 import com.google.common.base.Predicate;
 import org.jetbrains.annotations.Nullable;

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/NamePredicate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.functions.patterns;
+package org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/PatternBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.functions.patterns;
+package org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns;
 
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
@@ -23,9 +23,9 @@ import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.OverrideResolver;
 import org.jetbrains.jet.lang.resolve.name.Name;
-import org.jetbrains.k2js.translate.context.Namer;
-import org.jetbrains.k2js.translate.utils.JsDescriptorUtils;
-import org.jetbrains.k2js.translate.utils.TranslationUtils;
+import org.jetbrains.kotlin.js.translate.context.Namer;
+import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils;
+import org.jetbrains.kotlin.js.translate.utils.TranslationUtils;
 
 import java.util.Arrays;
 import java.util.List;

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/CompareToBOIF.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.operation
+package org.jetbrains.kotlin.js.translate.intrinsic.operation
 
 import com.google.common.collect.ImmutableSet
 import com.google.dart.compiler.backend.js.ast.*
@@ -22,12 +22,12 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
 import org.jetbrains.jet.lang.psi.JetBinaryExpression
 import org.jetbrains.jet.lang.types.expressions.OperatorConventions
 import org.jetbrains.jet.lexer.JetToken
-import org.jetbrains.k2js.translate.context.TranslationContext
-import org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern
-import org.jetbrains.k2js.translate.operation.OperatorTable
-import org.jetbrains.k2js.translate.utils.JsAstUtils
-import org.jetbrains.k2js.translate.utils.JsDescriptorUtils
-import org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken
+import org.jetbrains.kotlin.js.translate.context.TranslationContext
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern
+import org.jetbrains.kotlin.js.translate.operation.OperatorTable
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
+import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils
+import org.jetbrains.kotlin.js.translate.utils.PsiUtils.getOperationToken
 import org.jetbrains.jet.lang.resolve.calls.tasks.isDynamic
 
 

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/EqualsBOIF.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,26 +14,26 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.operation
+package org.jetbrains.kotlin.js.translate.intrinsic.operation
 
 import com.google.dart.compiler.backend.js.ast.*
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
 import org.jetbrains.jet.lang.psi.JetBinaryExpression
 import org.jetbrains.jet.lang.types.expressions.OperatorConventions
-import org.jetbrains.k2js.translate.context.TranslationContext
-import org.jetbrains.k2js.translate.intrinsic.functions.factories.TopLevelFIF
-import org.jetbrains.k2js.translate.intrinsic.functions.patterns.NamePredicate
-import org.jetbrains.k2js.translate.utils.JsAstUtils
-import org.jetbrains.k2js.translate.utils.JsDescriptorUtils
-import org.jetbrains.k2js.translate.utils.TranslationUtils
+import org.jetbrains.kotlin.js.translate.context.TranslationContext
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.factories.TopLevelFIF
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
+import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils
+import org.jetbrains.kotlin.js.translate.utils.TranslationUtils
 
 import java.util.Arrays
 
-import org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken
+import org.jetbrains.kotlin.js.translate.utils.PsiUtils.getOperationToken
 import org.jetbrains.jet.lexer.JetToken
 import org.jetbrains.jet.lexer.JetTokens
 import com.google.common.collect.ImmutableSet
-import org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern
 import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.jet.lang.types.isDynamic
 

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/LongCompareToBOIF.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.operation
+package org.jetbrains.kotlin.js.translate.intrinsic.operation
 
 import com.google.common.collect.ImmutableSet
 import com.google.dart.compiler.backend.js.ast.*
@@ -22,14 +22,14 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
 import org.jetbrains.jet.lang.psi.JetBinaryExpression
 import org.jetbrains.jet.lang.types.expressions.OperatorConventions
 import org.jetbrains.jet.lexer.JetToken
-import org.jetbrains.k2js.translate.context.Namer
-import org.jetbrains.k2js.translate.context.TranslationContext
-import org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern
-import org.jetbrains.k2js.translate.operation.OperatorTable
-import org.jetbrains.k2js.translate.utils.ID
-import org.jetbrains.k2js.translate.utils.JsAstUtils.*
-import org.jetbrains.k2js.translate.utils.JsDescriptorUtils
-import org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken
+import org.jetbrains.kotlin.js.translate.context.Namer
+import org.jetbrains.kotlin.js.translate.context.TranslationContext
+import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern
+import org.jetbrains.kotlin.js.translate.operation.OperatorTable
+import org.jetbrains.kotlin.js.translate.utils.ID
+import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.*
+import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils
+import org.jetbrains.kotlin.js.translate.utils.PsiUtils.getOperationToken
 
 public object LongCompareToBOIF : BinaryOperationIntrinsicFactory {
 

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/binaryOperationIntrinsics.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.translate.intrinsic.operation
+package org.jetbrains.kotlin.js.translate.intrinsic.operation
 
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
 import org.jetbrains.jet.lang.psi.JetBinaryExpression
 import org.jetbrains.jet.lexer.JetToken
-import org.jetbrains.k2js.translate.context.TranslationContext
+import org.jetbrains.kotlin.js.translate.context.TranslationContext
 
-import org.jetbrains.k2js.translate.utils.BindingUtils.getCallableDescriptorForOperationExpression
-import org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken
+import org.jetbrains.kotlin.js.translate.utils.BindingUtils.getCallableDescriptorForOperationExpression
+import org.jetbrains.kotlin.js.translate.utils.PsiUtils.getOperationToken
 import gnu.trove.THashMap
 import com.google.dart.compiler.backend.js.ast.JsExpression
 import com.google.common.collect.ImmutableSet