Partially revert "Fix project source to overcome bootstrap problem"

Adjust code to new generic signatures generated by Kotlin compiler
This reverts commit 0fd2484bc9.
This commit is contained in:
Denis Zharkov
2015-12-03 15:19:21 +03:00
parent a19708693b
commit 9c73502bdc
11 changed files with 29 additions and 29 deletions
@@ -90,7 +90,7 @@ public class CallBasedArgumentGenerator extends ArgumentGenerator {
}
@Override
protected void reorderArgumentsIfNeeded(@NotNull List actualArgsWithDeclIndex) {
protected void reorderArgumentsIfNeeded(@NotNull List<ArgumentAndDeclIndex> actualArgsWithDeclIndex) {
callGenerator.reorderArgumentsIfNeeded(actualArgsWithDeclIndex, valueParameterTypes);
}
}
@@ -1559,7 +1559,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
}
@Override
protected void reorderArgumentsIfNeeded(@NotNull List args) {
protected void reorderArgumentsIfNeeded(@NotNull List<ArgumentAndDeclIndex> args) {
}
}
@@ -778,7 +778,7 @@ public class InlineCodegen extends CallGenerator {
@Override
public void reorderArgumentsIfNeeded(
@NotNull List actualArgsWithDeclIndex, @NotNull List valueParameterTypes
@NotNull List<ArgumentAndDeclIndex> actualArgsWithDeclIndex, @NotNull List<? extends Type> valueParameterTypes
) {
}
@@ -157,7 +157,7 @@ public class TabledDescriptorRenderer {
@NotNull
public Renderer<KotlinType> getTypeRenderer() {
return (Renderer<KotlinType>) Renderers.RENDER_TYPE;
return Renderers.RENDER_TYPE;
}
protected void renderText(TextRenderer textRenderer, StringBuilder result) {
@@ -160,8 +160,8 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext {
@NotNull
@Override
public Collection getSubPackagesOf(
@NotNull FqName fqName, @NotNull Function1 nameFilter
public Collection<FqName> getSubPackagesOf(
@NotNull FqName fqName, @NotNull Function1<? super Name, Boolean> nameFilter
) {
LazyPackageDescriptor packageDescriptor = getPackageFragment(fqName);
if (packageDescriptor == null) {