From 77be31c1495155aa141ca903512ba32994aa43bc Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 2 Jan 2015 19:30:32 +0300 Subject: [PATCH] Move injector-generator under generators --- .idea/artifacts/InjectorGenerator.xml | 2 +- .idea/modules.xml | 2 +- .../kotlin/android/tests/CodegenTestsOnAndroidGenerator.java | 2 +- .../injector-generator}/copyright.txt | 0 .../injector-generator}/injector-generator.iml | 0 .../src/org/jetbrains/jet/di/ConstructorCall.java | 0 .../src/org/jetbrains/jet/di/Dependencies.java | 0 .../src/org/jetbrains/jet/di/DependencyInjectorGenerator.java | 2 +- .../injector-generator}/src/org/jetbrains/jet/di/DiType.java | 0 .../src/org/jetbrains/jet/di/Expression.java | 0 .../src/org/jetbrains/jet/di/FactoryMethod.java | 0 .../injector-generator}/src/org/jetbrains/jet/di/Field.java | 0 .../src/org/jetbrains/jet/di/GeneratorsFileUtil.java | 0 .../src/org/jetbrains/jet/di/GetSingleton.java | 0 .../src/org/jetbrains/jet/di/GivenExpression.java | 0 .../src/org/jetbrains/jet/di/ImportManager.java | 0 .../src/org/jetbrains/jet/di/InjectionLogicGenerator.java | 0 .../src/org/jetbrains/jet/di/InjectorGeneratorFacade.kt | 0 .../src/org/jetbrains/jet/di/InjectorGeneratorUtil.java | 0 .../src/org/jetbrains/jet/di/InstantiateType.java | 0 .../src/org/jetbrains/jet/di/MethodCall.kt | 0 .../src/org/jetbrains/jet/di/Parameter.java | 0 .../src/org/jetbrains/jet/di/ParameterExpression.java | 0 .../src/org/jetbrains/jet/di/SetterDependency.java | 0 .../org/jetbrains/jet/generators/builtins/generateBuiltIns.kt | 2 +- .../jet/generators/evaluate/GenerateOperationsMap.kt | 4 ++-- .../jet/generators/frontend/GenerateKeywordStrings.java | 2 +- .../jet/generators/tests/generator/TestGenerator.java | 2 +- 28 files changed, 9 insertions(+), 9 deletions(-) rename {injector-generator => generators/injector-generator}/copyright.txt (100%) rename {injector-generator => generators/injector-generator}/injector-generator.iml (100%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/ConstructorCall.java (100%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/Dependencies.java (100%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java (99%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/DiType.java (100%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/Expression.java (100%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/FactoryMethod.java (100%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/Field.java (100%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/GeneratorsFileUtil.java (100%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/GetSingleton.java (100%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/GivenExpression.java (100%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/ImportManager.java (100%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/InjectionLogicGenerator.java (100%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/InjectorGeneratorFacade.kt (100%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/InjectorGeneratorUtil.java (100%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/InstantiateType.java (100%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/MethodCall.kt (100%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/Parameter.java (100%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/ParameterExpression.java (100%) rename {injector-generator => generators/injector-generator}/src/org/jetbrains/jet/di/SetterDependency.java (100%) diff --git a/.idea/artifacts/InjectorGenerator.xml b/.idea/artifacts/InjectorGenerator.xml index d928b42c9f5..c5d01c89714 100644 --- a/.idea/artifacts/InjectorGenerator.xml +++ b/.idea/artifacts/InjectorGenerator.xml @@ -3,7 +3,7 @@ $PROJECT_DIR$/out/artifacts/internal/ - + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index f664b09aef5..4041c5811dc 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -27,7 +27,7 @@ - + diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java index b7331d88775..d0409576554 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java @@ -92,7 +92,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { StringBuilder out = new StringBuilder(); Printer p = new Printer(out); - p.print(FileUtil.loadFile(new File("injector-generator/copyright.txt"))); + p.print(FileUtil.loadFile(new File("generators/injector-generator/copyright.txt"))); p.println("package " + testClassPackage + ";"); p.println(); p.println("import ", baseTestClassPackage, ".", baseTestClassName, ";"); diff --git a/injector-generator/copyright.txt b/generators/injector-generator/copyright.txt similarity index 100% rename from injector-generator/copyright.txt rename to generators/injector-generator/copyright.txt diff --git a/injector-generator/injector-generator.iml b/generators/injector-generator/injector-generator.iml similarity index 100% rename from injector-generator/injector-generator.iml rename to generators/injector-generator/injector-generator.iml diff --git a/injector-generator/src/org/jetbrains/jet/di/ConstructorCall.java b/generators/injector-generator/src/org/jetbrains/jet/di/ConstructorCall.java similarity index 100% rename from injector-generator/src/org/jetbrains/jet/di/ConstructorCall.java rename to generators/injector-generator/src/org/jetbrains/jet/di/ConstructorCall.java diff --git a/injector-generator/src/org/jetbrains/jet/di/Dependencies.java b/generators/injector-generator/src/org/jetbrains/jet/di/Dependencies.java similarity index 100% rename from injector-generator/src/org/jetbrains/jet/di/Dependencies.java rename to generators/injector-generator/src/org/jetbrains/jet/di/Dependencies.java diff --git a/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java b/generators/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java similarity index 99% rename from injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java rename to generators/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java index 7e9167d6e01..715f0d1d633 100644 --- a/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java +++ b/generators/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java @@ -130,7 +130,7 @@ public class DependencyInjectorGenerator { } private static void generatePreamble(String injectorPackageName, Printer p) throws IOException { - String copyright = "injector-generator/copyright.txt"; + String copyright = "generators/injector-generator/copyright.txt"; p.println(FileUtil.loadFile(new File(copyright))); p.println("package " + injectorPackageName + ";"); diff --git a/injector-generator/src/org/jetbrains/jet/di/DiType.java b/generators/injector-generator/src/org/jetbrains/jet/di/DiType.java similarity index 100% rename from injector-generator/src/org/jetbrains/jet/di/DiType.java rename to generators/injector-generator/src/org/jetbrains/jet/di/DiType.java diff --git a/injector-generator/src/org/jetbrains/jet/di/Expression.java b/generators/injector-generator/src/org/jetbrains/jet/di/Expression.java similarity index 100% rename from injector-generator/src/org/jetbrains/jet/di/Expression.java rename to generators/injector-generator/src/org/jetbrains/jet/di/Expression.java diff --git a/injector-generator/src/org/jetbrains/jet/di/FactoryMethod.java b/generators/injector-generator/src/org/jetbrains/jet/di/FactoryMethod.java similarity index 100% rename from injector-generator/src/org/jetbrains/jet/di/FactoryMethod.java rename to generators/injector-generator/src/org/jetbrains/jet/di/FactoryMethod.java diff --git a/injector-generator/src/org/jetbrains/jet/di/Field.java b/generators/injector-generator/src/org/jetbrains/jet/di/Field.java similarity index 100% rename from injector-generator/src/org/jetbrains/jet/di/Field.java rename to generators/injector-generator/src/org/jetbrains/jet/di/Field.java diff --git a/injector-generator/src/org/jetbrains/jet/di/GeneratorsFileUtil.java b/generators/injector-generator/src/org/jetbrains/jet/di/GeneratorsFileUtil.java similarity index 100% rename from injector-generator/src/org/jetbrains/jet/di/GeneratorsFileUtil.java rename to generators/injector-generator/src/org/jetbrains/jet/di/GeneratorsFileUtil.java diff --git a/injector-generator/src/org/jetbrains/jet/di/GetSingleton.java b/generators/injector-generator/src/org/jetbrains/jet/di/GetSingleton.java similarity index 100% rename from injector-generator/src/org/jetbrains/jet/di/GetSingleton.java rename to generators/injector-generator/src/org/jetbrains/jet/di/GetSingleton.java diff --git a/injector-generator/src/org/jetbrains/jet/di/GivenExpression.java b/generators/injector-generator/src/org/jetbrains/jet/di/GivenExpression.java similarity index 100% rename from injector-generator/src/org/jetbrains/jet/di/GivenExpression.java rename to generators/injector-generator/src/org/jetbrains/jet/di/GivenExpression.java diff --git a/injector-generator/src/org/jetbrains/jet/di/ImportManager.java b/generators/injector-generator/src/org/jetbrains/jet/di/ImportManager.java similarity index 100% rename from injector-generator/src/org/jetbrains/jet/di/ImportManager.java rename to generators/injector-generator/src/org/jetbrains/jet/di/ImportManager.java diff --git a/injector-generator/src/org/jetbrains/jet/di/InjectionLogicGenerator.java b/generators/injector-generator/src/org/jetbrains/jet/di/InjectionLogicGenerator.java similarity index 100% rename from injector-generator/src/org/jetbrains/jet/di/InjectionLogicGenerator.java rename to generators/injector-generator/src/org/jetbrains/jet/di/InjectionLogicGenerator.java diff --git a/injector-generator/src/org/jetbrains/jet/di/InjectorGeneratorFacade.kt b/generators/injector-generator/src/org/jetbrains/jet/di/InjectorGeneratorFacade.kt similarity index 100% rename from injector-generator/src/org/jetbrains/jet/di/InjectorGeneratorFacade.kt rename to generators/injector-generator/src/org/jetbrains/jet/di/InjectorGeneratorFacade.kt diff --git a/injector-generator/src/org/jetbrains/jet/di/InjectorGeneratorUtil.java b/generators/injector-generator/src/org/jetbrains/jet/di/InjectorGeneratorUtil.java similarity index 100% rename from injector-generator/src/org/jetbrains/jet/di/InjectorGeneratorUtil.java rename to generators/injector-generator/src/org/jetbrains/jet/di/InjectorGeneratorUtil.java diff --git a/injector-generator/src/org/jetbrains/jet/di/InstantiateType.java b/generators/injector-generator/src/org/jetbrains/jet/di/InstantiateType.java similarity index 100% rename from injector-generator/src/org/jetbrains/jet/di/InstantiateType.java rename to generators/injector-generator/src/org/jetbrains/jet/di/InstantiateType.java diff --git a/injector-generator/src/org/jetbrains/jet/di/MethodCall.kt b/generators/injector-generator/src/org/jetbrains/jet/di/MethodCall.kt similarity index 100% rename from injector-generator/src/org/jetbrains/jet/di/MethodCall.kt rename to generators/injector-generator/src/org/jetbrains/jet/di/MethodCall.kt diff --git a/injector-generator/src/org/jetbrains/jet/di/Parameter.java b/generators/injector-generator/src/org/jetbrains/jet/di/Parameter.java similarity index 100% rename from injector-generator/src/org/jetbrains/jet/di/Parameter.java rename to generators/injector-generator/src/org/jetbrains/jet/di/Parameter.java diff --git a/injector-generator/src/org/jetbrains/jet/di/ParameterExpression.java b/generators/injector-generator/src/org/jetbrains/jet/di/ParameterExpression.java similarity index 100% rename from injector-generator/src/org/jetbrains/jet/di/ParameterExpression.java rename to generators/injector-generator/src/org/jetbrains/jet/di/ParameterExpression.java diff --git a/injector-generator/src/org/jetbrains/jet/di/SetterDependency.java b/generators/injector-generator/src/org/jetbrains/jet/di/SetterDependency.java similarity index 100% rename from injector-generator/src/org/jetbrains/jet/di/SetterDependency.java rename to generators/injector-generator/src/org/jetbrains/jet/di/SetterDependency.java diff --git a/generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt b/generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt index ae5d506cf84..518617e94ab 100644 --- a/generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt +++ b/generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt @@ -40,7 +40,7 @@ abstract class BuiltInsSourceGenerator(val out: PrintWriter) { protected open fun getPackage(): String = "kotlin" final fun generate() { - out.println(File("injector-generator/copyright.txt").readText()) + out.println(File("generators/injector-generator/copyright.txt").readText()) // Don't include generator class name in the message: these are built-in sources, // and we don't want to scare users with any internal information about our project out.println("// Auto-generated file. DO NOT EDIT!") diff --git a/generators/src/org/jetbrains/jet/generators/evaluate/GenerateOperationsMap.kt b/generators/src/org/jetbrains/jet/generators/evaluate/GenerateOperationsMap.kt index 7c0b29e5f65..39fdc6c4ff1 100644 --- a/generators/src/org/jetbrains/jet/generators/evaluate/GenerateOperationsMap.kt +++ b/generators/src/org/jetbrains/jet/generators/evaluate/GenerateOperationsMap.kt @@ -36,7 +36,7 @@ fun main(args: Array) { fun generate(): String { val sb = StringBuilder() val p = Printer(sb) - p.println(FileUtil.loadFile(File("injector-generator/copyright.txt"))) + p.println(FileUtil.loadFile(File("generators/injector-generator/copyright.txt"))) p.println("package org.jetbrains.jet.lang.evaluate") p.println() p.println("import java.math.BigInteger") @@ -61,7 +61,7 @@ fun generate(): String { for (function in functions) { val parametersTypes = function.getParametersTypes() - when (parametersTypes.size) { + when (parametersTypes.size()) { 1 -> unaryOperationsMap.add(function.getName().asString() to parametersTypes) 2 -> binaryOperationsMap.add(function.getName().asString() to parametersTypes) else -> throw IllegalStateException("Couldn't add following method from builtins to operations map: ${function.getName()} in class ${descriptor.getName()}") diff --git a/generators/src/org/jetbrains/jet/generators/frontend/GenerateKeywordStrings.java b/generators/src/org/jetbrains/jet/generators/frontend/GenerateKeywordStrings.java index a02d23c8cb9..6fb9ca53943 100644 --- a/generators/src/org/jetbrains/jet/generators/frontend/GenerateKeywordStrings.java +++ b/generators/src/org/jetbrains/jet/generators/frontend/GenerateKeywordStrings.java @@ -38,7 +38,7 @@ public class GenerateKeywordStrings { StringBuilder sb = new StringBuilder(); Printer p = new Printer(sb); - p.println(FileUtil.loadFile(new File("injector-generator/copyright.txt"))); + p.println(FileUtil.loadFile(new File("generators/injector-generator/copyright.txt"))); p.println("package org.jetbrains.jet.renderer;"); p.println(); p.println("import java.util.Arrays;"); diff --git a/generators/src/org/jetbrains/jet/generators/tests/generator/TestGenerator.java b/generators/src/org/jetbrains/jet/generators/tests/generator/TestGenerator.java index ea36529fdbb..04814805eae 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/generator/TestGenerator.java +++ b/generators/src/org/jetbrains/jet/generators/tests/generator/TestGenerator.java @@ -76,7 +76,7 @@ public class TestGenerator { StringBuilder out = new StringBuilder(); Printer p = new Printer(out); - p.println(FileUtil.loadFile(new File("injector-generator/copyright.txt"))); + p.println(FileUtil.loadFile(new File("generators/injector-generator/copyright.txt"))); p.println("package ", suiteClassPackage, ";"); p.println(); p.println("import com.intellij.testFramework.TestDataPath;");