Rename package jet -> kotlin in injector-generator

org.jetbrains.jet.di -> org.jetbrains.kotlin.generators.di

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/ConstructorCall.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.jet.di;
+package org.jetbrains.kotlin.generators.di;
 
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
@@ -69,6 +69,7 @@ public class ConstructorCall implements Expression {
     }
 
     @NotNull
+    @Override
     public DiType getType() {
         return new DiType(constructor.getDeclaringClass());
     }

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/Dependencies.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.jet.di;
+package org.jetbrains.kotlin.generators.di;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Lists;
@@ -22,13 +22,14 @@ import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import org.jetbrains.annotations.NotNull;
 
+import javax.inject.Inject;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
 import java.util.*;
 
-import static org.jetbrains.jet.di.InjectorGeneratorUtil.var;
+import static org.jetbrains.kotlin.generators.di.InjectorGeneratorUtil.var;
 
 public class Dependencies {
 
@@ -69,14 +70,16 @@ public class Dependencies {
         List<Method> declaredMethods = Lists.newArrayList(typeToInitialize.getClazz().getDeclaredMethods());
         Collections.sort(declaredMethods, new Comparator<Method>() {
             @Override
-            public int compare(Method o1, Method o2) {
+            public int compare(@NotNull Method o1, @NotNull Method o2) {
                 return o1.getName().compareTo(o2.getName());
             }
         });
         for (Method method : declaredMethods) {
-            if (method.getAnnotation(javax.inject.Inject.class) == null
+            if (method.getAnnotation(Inject.class) == null
                 || !method.getName().startsWith("set")
-                || method.getParameterTypes().length != 1) continue;
+                || method.getParameterTypes().length != 1) {
+                continue;
+            }
 
             Type parameterType = method.getGenericParameterTypes()[0];
 
@@ -245,6 +248,7 @@ public class Dependencies {
         };
 
         @NotNull
+        @SuppressWarnings("unchecked")
         public static <T> ImmutableStack<T> empty() {
             return EMPTY;
         }

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/DependencyInjectorGenerator.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.jet.di;
+package org.jetbrains.kotlin.generators.di;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -32,7 +32,7 @@ import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.*;
 
-import static org.jetbrains.jet.di.InjectorGeneratorUtil.var;
+import static org.jetbrains.kotlin.generators.di.InjectorGeneratorUtil.var;
 
 public class DependencyInjectorGenerator {
 

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/DiType.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.jet.di;
+package org.jetbrains.kotlin.generators.di;
 
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/Expression.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.jet.di;
+package org.jetbrains.kotlin.generators.di;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/FactoryMethod.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.jet.di;
+package org.jetbrains.kotlin.generators.di;
 
 import org.jetbrains.annotations.NotNull;
 

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/Field.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.jet.di;
+package org.jetbrains.kotlin.generators.di;
 
 import com.google.common.collect.Lists;
 import com.intellij.openapi.util.text.StringUtil;
@@ -27,7 +27,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import static org.jetbrains.jet.di.InjectorGeneratorUtil.var;
+import static org.jetbrains.kotlin.generators.di.InjectorGeneratorUtil.var;
 
 class Field {
 

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/GeneratorsFileUtil.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.jet.di;
+package org.jetbrains.kotlin.generators.di;
 
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
@@ -48,17 +48,17 @@ public class GeneratorsFileUtil {
             return;
         }
 
-        boolean useTmpfile = !SystemInfo.isWindows;
+        boolean useTempFile = !SystemInfo.isWindows;
 
-        File tmpfile = useTmpfile ? new File(file.getName() + ".tmp") : file;
+        File tempFile = useTempFile ? new File(file.getName() + ".tmp") : file;
 
-        FileUtil.writeToFile(tmpfile, newText);
+        FileUtil.writeToFile(tempFile, newText);
-        System.out.println("File written: " + tmpfile.getAbsolutePath());
+        System.out.println("File written: " + tempFile.getAbsolutePath());
-        if (useTmpfile) {
+        if (useTempFile) {
-            if (!tmpfile.renameTo(file)) {
+            if (!tempFile.renameTo(file)) {
-                throw new RuntimeException("failed to rename " + tmpfile + " to " + file);
+                throw new RuntimeException("failed to rename " + tempFile + " to " + file);
             }
-            System.out.println("Renamed " + tmpfile + " to " + file);
+            System.out.println("Renamed " + tempFile + " to " + file);
         }
         System.out.println();
     }

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/GetSingleton.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.jet.di;
+package org.jetbrains.kotlin.generators.di;
 
 import org.jetbrains.annotations.NotNull;
 

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/GivenExpression.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.jet.di;
+package org.jetbrains.kotlin.generators.di;
 
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
@@ -62,6 +62,7 @@ public class GivenExpression implements Expression {
         return "given<" + expression + ">";
     }
 
+    @Override
     public DiType getType() {
         return null;
     }

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/ImportManager.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.jet.di;
+package org.jetbrains.kotlin.generators.di;
 
 import com.google.common.collect.Maps;
 import org.jetbrains.annotations.NotNull;

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/InjectionLogicGenerator.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.jet.di;
+package org.jetbrains.kotlin.generators.di;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.utils.DFS;

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/InjectorGeneratorFacade.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.jet.di
+package org.jetbrains.kotlin.generators.di
 
 public fun generator(
         targetSourceRoot: String,

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/InjectorGeneratorUtil.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.jet.di;
+package org.jetbrains.kotlin.generators.di;
 
 import com.google.common.collect.Lists;
 import com.intellij.openapi.util.text.StringUtil;

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/InstantiateType.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.jet.di;
+package org.jetbrains.kotlin.generators.di;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -32,6 +32,7 @@ public class InstantiateType implements Expression {
         this(new DiType(theClass));
     }
 
+    @Override
     @NotNull
     public DiType getType() {
         return type;

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/MethodCall.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,10 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.di
+package org.jetbrains.kotlin.generators.di
 
 import java.lang.reflect.Method
-import org.jetbrains.jet.lang.types.JetType
 
 public class MethodCall(
         val receiver: Field,
@@ -30,5 +29,4 @@ public class MethodCall(
     override fun getTypesToImport() = listOf<DiType>()
 
     override fun getType(): DiType = DiType.fromReflectionType(method.getGenericReturnType())
-
 }

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/Parameter.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.jet.di;
+package org.jetbrains.kotlin.generators.di;
 
 class Parameter {
     private final DiType type;

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/ParameterExpression.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.jet.di;
+package org.jetbrains.kotlin.generators.di;
 
 import org.jetbrains.annotations.NotNull;
 

generators/injector-generator/src/org/jetbrains/kotlin/generators/di/SetterDependency.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.jet.di;
+package org.jetbrains.kotlin.generators.di;
 
 class SetterDependency {
     private final Field dependent;

generators/src/org/jetbrains/jet/generators/evaluate/GenerateOperationsMap.kt

@@ -16,9 +16,9 @@
 
 package org.jetbrains.jet.generators.evaluate
 
-import org.jetbrains.jet.di.GeneratorsFileUtil
 import java.io.File
 import com.intellij.openapi.util.io.FileUtil
+import org.jetbrains.kotlin.generators.di.GeneratorsFileUtil
 import org.jetbrains.jet.utils.Printer
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor

generators/src/org/jetbrains/jet/generators/frontend/GenerateKeywordStrings.java

@@ -19,10 +19,10 @@ package org.jetbrains.jet.generators.frontend;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.di.GeneratorsFileUtil;
 import org.jetbrains.jet.lexer.JetKeywordToken;
 import org.jetbrains.jet.lexer.JetTokens;
 import org.jetbrains.jet.utils.Printer;
+import org.jetbrains.kotlin.generators.di.GeneratorsFileUtil;
 
 import java.io.File;
 import java.io.IOException;

generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.kt

@@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder
 import org.jetbrains.jet.lang.resolve.lazy.ResolveSession
 import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory
 import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices
-import org.jetbrains.jet.di.*
+import org.jetbrains.kotlin.generators.di.*
 import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents
 import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils
 import org.jetbrains.jet.lang.resolve.calls.CallResolver

generators/src/org/jetbrains/jet/generators/tests/generateTestDataForReservedWords.kt

@@ -19,7 +19,7 @@ package org.jetbrains.jet.generators.tests.reservedWords
 import java.io.File
 import org.jetbrains.jet.renderer.KeywordStringsGenerated
 import com.google.dart.compiler.backend.js.ast.JsFunctionScope
-import org.jetbrains.jet.di.GeneratorsFileUtil.writeFileIfContentChanged
+import org.jetbrains.kotlin.generators.di.GeneratorsFileUtil.writeFileIfContentChanged
 
 val commonCases: CaseBuilder.(String, String) -> Unit = { (testByName, testByRef) ->
     case("val", "val $KEYWORD_MARKER: Int", " = 0", testByName)

generators/src/org/jetbrains/jet/generators/tests/generator/TestGenerator.java

@@ -24,8 +24,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
 import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.di.GeneratorsFileUtil;
 import org.jetbrains.jet.utils.Printer;
+import org.jetbrains.kotlin.generators.di.GeneratorsFileUtil;
 
 import java.io.File;
 import java.io.IOException;

generators/tests/org/jetbrains/jet/generators/injectors/GenerateInjectorsTest.java

@@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-import org.jetbrains.jet.di.DependencyInjectorGenerator;
+import org.jetbrains.kotlin.generators.di.DependencyInjectorGenerator;
 import org.junit.Assert;
 
 import java.io.IOException;