From 0fd2484bc9da3fab7b5d6f7c040dbbd5c4336834 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 25 Nov 2015 23:03:50 +0300 Subject: [PATCH] Fix project source to overcome bootstrap problem --- .../codegen/CallBasedArgumentGenerator.java | 2 +- .../codegen/ImplementationBodyCodegen.java | 2 +- .../kotlin/codegen/inline/InlineCodegen.java | 2 +- .../rendering/TabledDescriptorRenderer.java | 2 +- .../kotlin/resolve/lazy/ResolveSession.java | 4 ++-- .../EnumEntrySyntheticClassDescriptor.java | 4 ++-- .../jetbrains/kotlin/types/ErrorUtils.java | 12 +++++----- .../storage/LockBasedStorageManager.java | 22 +++++++++---------- .../HtmlTabledDescriptorRenderer.java | 2 +- .../internal/KotlinBytecodeToolWindow.java | 2 +- .../MoveKotlinTopLevelDeclarationsDialog.java | 4 ++-- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java index c81b2b73798..2ff98ad1c7f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java @@ -90,7 +90,7 @@ public class CallBasedArgumentGenerator extends ArgumentGenerator { } @Override - protected void reorderArgumentsIfNeeded(@NotNull List actualArgsWithDeclIndex) { + protected void reorderArgumentsIfNeeded(@NotNull List actualArgsWithDeclIndex) { callGenerator.reorderArgumentsIfNeeded(actualArgsWithDeclIndex, valueParameterTypes); } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index 1c4d61a0ae8..0fcd27360ac 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -1559,7 +1559,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } @Override - protected void reorderArgumentsIfNeeded(@NotNull List args) { + protected void reorderArgumentsIfNeeded(@NotNull List args) { } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java index 7aff321879c..f15068e1cb5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java @@ -778,7 +778,7 @@ public class InlineCodegen extends CallGenerator { @Override public void reorderArgumentsIfNeeded( - @NotNull List actualArgsWithDeclIndex, @NotNull List valueParameterTypes + @NotNull List actualArgsWithDeclIndex, @NotNull List valueParameterTypes ) { } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/TabledDescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/TabledDescriptorRenderer.java index 431dee923fa..09da5a3e1dc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/TabledDescriptorRenderer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/TabledDescriptorRenderer.java @@ -157,7 +157,7 @@ public class TabledDescriptorRenderer { @NotNull public Renderer getTypeRenderer() { - return Renderers.RENDER_TYPE; + return (Renderer) Renderers.RENDER_TYPE; } protected void renderText(TextRenderer textRenderer, StringBuilder result) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java index 928df7c3143..a3c550ffbab 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java @@ -160,8 +160,8 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext { @NotNull @Override - public Collection getSubPackagesOf( - @NotNull FqName fqName, @NotNull Function1 nameFilter + public Collection getSubPackagesOf( + @NotNull FqName fqName, @NotNull Function1 nameFilter ) { LazyPackageDescriptor packageDescriptor = getPackageFragment(fqName); if (packageDescriptor == null) { diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java index ecd2f78b8b7..149355f4532 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java @@ -262,9 +262,9 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase { @NotNull @Override - public Collection getContributedDescriptors( + public Collection getContributedDescriptors( @NotNull DescriptorKindFilter kindFilter, - @NotNull Function1 nameFilter + @NotNull Function1 nameFilter ) { return allDescriptors.invoke(); } diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java index 0ebce7a7c8d..686817e988f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java @@ -77,8 +77,8 @@ public class ErrorUtils { @NotNull @Override - public Collection getSubPackagesOf( - @NotNull FqName fqName, @NotNull Function1 nameFilter + public Collection getSubPackagesOf( + @NotNull FqName fqName, @NotNull Function1 nameFilter ) { return emptyList(); } @@ -193,8 +193,8 @@ public class ErrorUtils { @NotNull @Override - public Collection getContributedDescriptors( - @NotNull DescriptorKindFilter kindFilter, @NotNull Function1 nameFilter + public Collection getContributedDescriptors( + @NotNull DescriptorKindFilter kindFilter, @NotNull Function1 nameFilter ) { return Collections.emptyList(); } @@ -244,8 +244,8 @@ public class ErrorUtils { @NotNull @Override - public Collection getContributedDescriptors( - @NotNull DescriptorKindFilter kindFilter, @NotNull Function1 nameFilter + public Collection getContributedDescriptors( + @NotNull DescriptorKindFilter kindFilter, @NotNull Function1 nameFilter ) { throw new IllegalStateException(); } diff --git a/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java b/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java index c1aef61ddee..69c0769b57f 100644 --- a/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java +++ b/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java @@ -151,15 +151,15 @@ public class LockBasedStorageManager implements StorageManager { @NotNull @Override - public NotNullLazyValue createLazyValueWithPostCompute( - @NotNull Function0 computable, - final Function1 onRecursiveCall, - @NotNull final Function1 postCompute + public NotNullLazyValue createLazyValueWithPostCompute( + @NotNull Function0 computable, + final Function1 onRecursiveCall, + @NotNull final Function1 postCompute ) { - return new LockBasedNotNullLazyValue(computable) { + return new LockBasedNotNullLazyValue(computable) { @NotNull @Override - protected RecursionDetectedResult recursionDetected(boolean firstTime) { + protected RecursionDetectedResult recursionDetected(boolean firstTime) { if (onRecursiveCall == null) { return super.recursionDetected(firstTime); } @@ -167,7 +167,7 @@ public class LockBasedStorageManager implements StorageManager { } @Override - protected void postCompute(@NotNull T value) { + protected void postCompute(@NotNull Object value) { postCompute.invoke(value); } }; @@ -193,12 +193,12 @@ public class LockBasedStorageManager implements StorageManager { @NotNull @Override - public NullableLazyValue createNullableLazyValueWithPostCompute( - @NotNull Function0 computable, @NotNull final Function1 postCompute + public NullableLazyValue createNullableLazyValueWithPostCompute( + @NotNull Function0 computable, @NotNull final Function1 postCompute ) { - return new LockBasedLazyValue(computable) { + return new LockBasedLazyValue(computable) { @Override - protected void postCompute(@Nullable T value) { + protected void postCompute(@Nullable Object value) { postCompute.invoke(value); } }; diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java index 1be6402d8c5..adfb54d8e0b 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java @@ -44,7 +44,7 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer { @NotNull @Override public Renderer getTypeRenderer() { - return IdeRenderers.HTML_RENDER_TYPE; + return (Renderer) IdeRenderers.HTML_RENDER_TYPE; } @Override diff --git a/idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java index 6cd1b465080..ec079937626 100644 --- a/idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java +++ b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java @@ -197,7 +197,7 @@ public class KotlinBytecodeToolWindow extends JPanel implements Disposable { BindingContext bindingContextForFile = resolutionFacade.analyzeFullyAndGetResult(Collections.singletonList(jetFile)).getBindingContext(); - kotlin.Pair> result = DebuggerUtils.INSTANCE.analyzeInlinedFunctions( + kotlin.Pair> result = (kotlin.Pair) DebuggerUtils.INSTANCE.analyzeInlinedFunctions( resolutionFacade, bindingContextForFile, jetFile, !enableInline ); diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java index 1db00421fac..b19b86f7a4a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java @@ -390,7 +390,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { } private boolean isFullFileMove() { - Map> fileToElements = CollectionsKt.groupBy( + Map> fileToElements = (Map) CollectionsKt.groupBy( getSelectedElementsToMove(), new Function1() { @Override @@ -399,7 +399,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { } } ); - for (Map.Entry> entry : fileToElements.entrySet()) { + for (Map.Entry> entry : fileToElements.entrySet()) { if (entry.getKey().getDeclarations().size() != entry.getValue().size()) return false; } return true;