azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore explicit imports of Kotlin function types in Java

Browse Source 
This is a follow-up to 738a84e259 and
d4965a4f3e. Optimize imports in all files
affected in those commits, drop temporary _.kt
This commit is contained in:
Alexander Udalov
2015-05-26 18:36:08 +03:00
parent 58e4ff0502
commit 48b18f18d3
123 changed files with 162 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java
+1 -2
View File
@@ -16,9 +16,8 @@
package org.jetbrains.kotlin.load.java.components;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor;
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java
+2 -3
View File
@@ -16,18 +16,17 @@
package org.jetbrains.kotlin.load.kotlin;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.Function0;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.ClassDescriptor;
import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor;
import org.jetbrains.kotlin.serialization.deserialization.ErrorReporter;
import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.resolve.scopes.JetScope;
import org.jetbrains.kotlin.serialization.PackageData;
import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents;
import org.jetbrains.kotlin.serialization.deserialization.ErrorReporter;
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope;
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil;
core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
+1 -2
View File
@@ -16,9 +16,8 @@
package org.jetbrains.kotlin.builtins;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.functions.BuiltInFictitiousFunctionClassFactory;
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java
+1 -2
View File
@@ -16,8 +16,7 @@
package org.jetbrains.kotlin.descriptors.impl;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.Function0;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.name.Name;
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java
+1 -2
View File
@@ -16,8 +16,7 @@
package org.jetbrains.kotlin.descriptors.impl;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.Function0;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.ReadOnly;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java
+2 -4
View File
@@ -16,10 +16,8 @@
package org.jetbrains.kotlin.descriptors.impl;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.Function0;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.*;
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererBuilder.java
+1 -2
View File
@@ -16,9 +16,8 @@
package org.jetbrains.kotlin.renderer;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.types.JetType;
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java
+1 -2
View File
@@ -16,9 +16,8 @@
package org.jetbrains.kotlin.renderer;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
+1 -2
View File
@@ -16,8 +16,7 @@
package org.jetbrains.kotlin.resolve;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java
+1 -2
View File
@@ -16,11 +16,10 @@
package org.jetbrains.kotlin.resolve;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import kotlin.Unit;
import kotlin.jvm.KotlinSignature;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.*;
core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java
+1 -2
View File
@@ -16,9 +16,8 @@
package org.jetbrains.kotlin.types;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
+1 -2
View File
@@ -16,8 +16,7 @@
package org.jetbrains.kotlin.types;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java
+1 -2
View File
@@ -16,10 +16,9 @@
package org.jetbrains.kotlin.types;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectProperties.java
+1 -2
View File
@@ -16,8 +16,7 @@
package kotlin.reflect.jvm.internal;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.Function0;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
core/util.runtime/src/kotlin/jvm/functions/_.kt
-22
View File
@@ -1,22 +0,0 @@
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package kotlin.jvm.functions
/**
* This is a hack to allow star import from the package [kotlin.jvm.functions] to allow to migrate functional types
*/
public object _
core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java
+2 -4
View File
@@ -16,11 +16,9 @@
package org.jetbrains.kotlin.storage;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.Unit;
import kotlin.jvm.functions.Function0;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.utils.UtilsPackage;