Remove warnings

Author: zarechenskiy

kotlin-eclipse-core/src/org/jetbrains/kotlin/core/model/KotlinAnalysisProjectCache.kt

@@ -45,7 +45,7 @@ public object KotlinAnalysisProjectCache : IResourceChangeListener {
     public fun getAnalysisResult(javaProject: IJavaProject): AnalysisResult {
         val project = javaProject.getProject()
         return synchronized(project) {
-            val analysisResult = cachedAnalysisResults.getOrElse(project) {
+            val analysisResult = cachedAnalysisResults.get(project) ?: run {
                 val kotlinEnvironment = KotlinEnvironment.getEnvironment(javaProject)
                 EclipseAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(
                     javaProject, 

kotlin-eclipse-core/src/org/jetbrains/kotlin/core/model/KotlinNature.kt

@@ -36,8 +36,8 @@ import org.eclipse.core.resources.ResourcesPlugin
 
 public class KotlinNature: IProjectNature {
     companion object {
-        public val KOTLIN_NATURE: String = "org.jetbrains.kotlin.core.kotlinNature"
-        public val KOTLIN_BUILDER: String = "org.jetbrains.kotlin.ui.kotlinBuilder"
+        @JvmField val KOTLIN_NATURE: String = "org.jetbrains.kotlin.core.kotlinNature"
+        @JvmField val KOTLIN_BUILDER: String = "org.jetbrains.kotlin.ui.kotlinBuilder"
 
         @JvmStatic
         fun hasKotlinNature(project: IProject) : Boolean {

kotlin-eclipse-core/src/org/jetbrains/kotlin/core/resolve/BuiltInsReferenceResolver.java

@@ -24,8 +24,6 @@
 import java.util.List;
 import java.util.Set;
 
-import kotlin.CollectionsKt;
-
 import org.eclipse.jdt.core.IJavaProject;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -73,6 +71,8 @@
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.io.URLUtil;
 
+import kotlin.collections.CollectionsKt;
+
 public class BuiltInsReferenceResolver {
     private static final String RUNTIME_SRC_DIR = "jar:file:"+ ProjectUtils.buildLibPath("kotlin-runtime-sources")+ "!/kotlin";
 
@@ -204,7 +204,7 @@ private DeclarationDescriptor findCurrentDescriptorForMember(@NotNull MemberDesc
             descriptors = ((ClassDescriptor) containingDeclaration).getConstructors();
         }
         else {
-            descriptors = memberScope.getContributedDescriptors(DescriptorKindFilter.ALL, MemberScope.ALL_NAME_FILTER);
+            descriptors = memberScope.getContributedDescriptors(DescriptorKindFilter.ALL, MemberScope.Companion.getALL_NAME_FILTER());
         }
         for (DeclarationDescriptor member : descriptors) {
             if (renderedOriginal.equals(DescriptorRenderer.Companion.getFQ_NAMES_IN_TYPES().render(member))) {

kotlin-eclipse-core/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaAnnotationArgument.kt

@@ -34,7 +34,7 @@ public abstract class EclipseJavaAnnotationArgument<T : IBinding>(javaElement: T
 			return when (value) {
 				is IAnnotationBinding -> EclipseJavaAnnotationAsAnnotationArgument(value, name)
 				is IVariableBinding -> EclipseJavaReferenceAnnotationArgument(value)
-				is Array<*> -> EclipseJavaArrayAnnotationArgument(value as Array<Any>, name, javaProject) 
+				is Array<*> -> EclipseJavaArrayAnnotationArgument(value, name, javaProject) 
 				is Class<*> -> EclipseJavaClassObjectAnnotationArgument(value, name, javaProject)
 				is String -> EclipseJavaLiteralAnnotationArgument(value, name)
 				else -> throw IllegalArgumentException("Wrong annotation argument: $value")

kotlin-eclipse-core/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaArrayAnnotationArgument.kt

@@ -23,10 +23,10 @@ import org.jetbrains.kotlin.name.Name
 import com.google.common.collect.Lists
 
 public class EclipseJavaArrayAnnotationArgument(
-		private val arguments: Array<Any>, 
+		private val arguments: Array<*>, 
 		override val name: Name, 
 		private val javaProject: IJavaProject) : JavaArrayAnnotationArgument {
 	override public fun getElements(): List<JavaAnnotationArgument> {
-		return arguments.map { EclipseJavaAnnotationArgument.create(it, name, javaProject) }
+		return arguments.map { EclipseJavaAnnotationArgument.create(it!!, name, javaProject) }
 	}
 }

kotlin-eclipse-core/src/org/jetbrains/kotlin/core/utils/ProjectUtils.java

@@ -24,9 +24,6 @@
 import java.util.List;
 import java.util.Set;
 
-import kotlin.ArraysKt;
-import kotlin.jvm.functions.Function1;
-
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -55,6 +52,9 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
+import kotlin.collections.ArraysKt;
+import kotlin.jvm.functions.Function1;
+
 public class ProjectUtils {
 
     private static final String LIB_FOLDER = "lib";

kotlin-eclipse-ui-test/build.properties

@@ -17,5 +17,4 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
-               plugin.xml
+               .

kotlin-eclipse-ui-test/src/org/jetbrains/kotlin/ui/tests/editors/completion/KotlinBasicCompletionTestCase.java

@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Set;
 
-import kotlin.CollectionsKt;
+import kotlin.collections.CollectionsKt;
 
 import org.eclipse.jdt.internal.ui.JavaPlugin;
 import org.eclipse.jdt.ui.PreferenceConstants;

kotlin-eclipse-ui/src/org/jetbrains/kotlin/eclipse/ui/utils/EditorUtil.java

@@ -39,7 +39,7 @@ public class EditorUtil {
 
     @Nullable
     public static IFile getFile(@NotNull IEditorPart editor) {
-        return (IFile) editor.getEditorInput().getAdapter(IFile.class);
+        return editor.getEditorInput().getAdapter(IFile.class);
     }
 
     @NotNull

kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/debug/KotlinRunToLineAdapter.kt

@@ -49,7 +49,7 @@ public class KotlinRunToLineAdapter : IRunToLineTarget {
         if (file == null) throw CoreException(createErrorStatus("Missing file for $editor"))
 
         if (target is IAdaptable) {
-            val debugTarget = target.getAdapter(IDebugTarget::class.java) as? IDebugTarget
+            val debugTarget = target.getAdapter(IDebugTarget::class.java)
             if (debugTarget == null) return
 
             val lineNumber = (selection as ITextSelection).getStartLine() + 1