From 07a25a7757ccdc9000c12ce1cfce6ba882290308 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 30 Jan 2013 18:49:03 +0400 Subject: [PATCH] Removed newline after copyrights in generated injectors. --- .../jetbrains/jet/di/InjectorForJvmCodegen.java | 1 - .../jet/di/InjectorForJavaDescriptorResolver.java | 1 - .../jet/di/InjectorForJavaSemanticServices.java | 1 - .../jet/di/InjectorForTopDownAnalyzerForJvm.java | 1 - .../jetbrains/jet/di/InjectorForBodyResolve.java | 1 - .../jetbrains/jet/di/InjectorForLazyResolve.java | 1 - .../org/jetbrains/jet/di/InjectorForMacros.java | 1 - .../jet/di/InjectorForTopDownAnalyzerBasic.java | 1 - compiler/testData/builtin-classes.txt | 14 +++++++------- .../org/jetbrains/jet/di/InjectorForTests.java | 1 - .../jet/di/DependencyInjectorGenerator.java | 1 - .../jet/di/InjectorForTopDownAnalyzerForJs.java | 1 - 12 files changed, 7 insertions(+), 18 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java b/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java index 3b3bbaaf00d..b0c2fd78faa 100644 --- a/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java @@ -14,7 +14,6 @@ * limitations under the License. */ - package org.jetbrains.jet.di; import org.jetbrains.jet.codegen.state.JetTypeMapper; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java index e8bdf029ccb..dc52473dd14 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java @@ -14,7 +14,6 @@ * limitations under the License. */ - package org.jetbrains.jet.di; import com.intellij.openapi.project.Project; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java index a3029f5352f..85d4250efc5 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java @@ -14,7 +14,6 @@ * limitations under the License. */ - package org.jetbrains.jet.di; import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java index 2592d077166..053e075cbc9 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -14,7 +14,6 @@ * limitations under the License. */ - package org.jetbrains.jet.di; import org.jetbrains.jet.lang.resolve.TopDownAnalyzer; diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java index 00ab0db8c09..f173a5820eb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java @@ -14,7 +14,6 @@ * limitations under the License. */ - package org.jetbrains.jet.di; import org.jetbrains.jet.lang.resolve.BodyResolver; diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java index da3327bb00f..1e7945b5077 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java @@ -14,7 +14,6 @@ * limitations under the License. */ - package org.jetbrains.jet.di; import com.intellij.openapi.project.Project; diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java index e5efa1f6cd9..caa9a6e703d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java @@ -14,7 +14,6 @@ * limitations under the License. */ - package org.jetbrains.jet.di; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java index bbd9cc8cc91..35d0b537a9e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java @@ -14,7 +14,6 @@ * limitations under the License. */ - package org.jetbrains.jet.di; import org.jetbrains.jet.lang.resolve.TopDownAnalyzer; diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt index 67f81cedf0d..f4eb9bb9521 100644 --- a/compiler/testData/builtin-classes.txt +++ b/compiler/testData/builtin-classes.txt @@ -144,7 +144,7 @@ public final class ByteRange : jet.Range, jet.Progression { public open override /*2*/ val end : jet.Byte public open override /*1*/ val increment : jet.Int public open override /*2*/ val start : jet.Byte - public open override /*1*/ fun contains(/*0*/ elem : jet.Byte) : jet.Boolean + public open override /*1*/ fun contains(/*0*/ item : jet.Byte) : jet.Boolean public open override /*1*/ fun iterator() : jet.ByteIterator public class object { @@ -238,7 +238,7 @@ public final class CharRange : jet.Range, jet.Progression { public open override /*2*/ val end : jet.Char public open override /*1*/ val increment : jet.Int public open override /*2*/ val start : jet.Char - public open override /*1*/ fun contains(/*0*/ elem : jet.Char) : jet.Boolean + public open override /*1*/ fun contains(/*0*/ item : jet.Char) : jet.Boolean public open override /*1*/ fun iterator() : jet.CharIterator public class object { @@ -363,7 +363,7 @@ public final class DoubleRange : jet.Range, jet.Progression { @@ -588,7 +588,7 @@ public final class FloatRange : jet.Range, jet.Progression public open override /*2*/ val end : jet.Float public open override /*1*/ val increment : jet.Float public open override /*2*/ val start : jet.Float - public open override /*1*/ fun contains(/*0*/ elem : jet.Float) : jet.Boolean + public open override /*1*/ fun contains(/*0*/ item : jet.Float) : jet.Boolean public open override /*1*/ fun iterator() : jet.FloatIterator public class object { @@ -819,7 +819,7 @@ public final class IntRange : jet.Range, jet.Progression { public open override /*2*/ val end : jet.Int public open override /*1*/ val increment : jet.Int public open override /*2*/ val start : jet.Int - public open override /*1*/ fun contains(/*0*/ elem : jet.Int) : jet.Boolean + public open override /*1*/ fun contains(/*0*/ item : jet.Int) : jet.Boolean public open override /*1*/ fun iterator() : jet.IntIterator public class object { @@ -966,7 +966,7 @@ public final class LongRange : jet.Range, jet.Progression { public open override /*2*/ val end : jet.Long public open override /*1*/ val increment : jet.Long public open override /*2*/ val start : jet.Long - public open override /*1*/ fun contains(/*0*/ elem : jet.Long) : jet.Boolean + public open override /*1*/ fun contains(/*0*/ item : jet.Long) : jet.Boolean public open override /*1*/ fun iterator() : jet.LongIterator public class object { @@ -1239,7 +1239,7 @@ public final class ShortRange : jet.Range, jet.Progression public open override /*2*/ val end : jet.Short public open override /*1*/ val increment : jet.Int public open override /*2*/ val start : jet.Short - public open override /*1*/ fun contains(/*0*/ elem : jet.Short) : jet.Boolean + public open override /*1*/ fun contains(/*0*/ item : jet.Short) : jet.Boolean public open override /*1*/ fun iterator() : jet.ShortIterator public class object { diff --git a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java index 765e4b65d13..3d786069964 100644 --- a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java +++ b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java @@ -14,7 +14,6 @@ * limitations under the License. */ - package org.jetbrains.jet.di; import org.jetbrains.jet.lang.resolve.DescriptorResolver; diff --git a/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java b/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java index a9b8990199a..be7856ff80d 100644 --- a/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java +++ b/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java @@ -91,7 +91,6 @@ public class DependencyInjectorGenerator { String copyright = "injector-generator/copyright.txt"; out.println(FileUtil.loadFile(new File(copyright))); - out.println(); out.println("package " + injectorPackageName + ";"); out.println(); diff --git a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java index 7d872a4d7c0..0b0cca2f060 100644 --- a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java @@ -14,7 +14,6 @@ * limitations under the License. */ - package org.jetbrains.jet.di; import org.jetbrains.jet.lang.resolve.TopDownAnalyzer;