From a5a493d145d5b6e778a85ac7ecfd298c1c8e9a74 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 8 Aug 2014 17:06:27 +0400 Subject: [PATCH] Minor: remove obsolete JAVA_ROOT --- .../jet/lang/resolve/java/JavaDescriptorResolver.kt | 4 ---- .../jetbrains/jet/plugin/quickfix/ImportInsertHelper.java | 5 ----- 2 files changed, 9 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.kt index e845d340df5..00f89cefe5d 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.kt @@ -39,10 +39,6 @@ public class JavaDescriptorResolver(public val packageFragmentProvider: LazyJava public fun getPackageFragment(javaClass: JavaClass): PackageFragmentDescriptor? { return packageFragmentProvider.getPackageFragment(javaClass) } - - class object { - public val JAVA_ROOT: Name = Name.special("") - } } public fun JavaDescriptorResolver.resolveMethod(method: JavaMethod): FunctionDescriptor? { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java index 66ae864dc56..65b4f595cf8 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java @@ -180,11 +180,6 @@ public class ImportInsertHelper { } public static boolean needImport(@NotNull ImportPath importPath, @NotNull JetFile file, List importDirectives) { - if (importPath.fqnPart().firstSegmentIs(JavaDescriptorResolver.JAVA_ROOT)) { - FqName withoutJavaRoot = NamePackage.withoutFirstSegment(importPath.fqnPart()); - importPath = new ImportPath(withoutJavaRoot, importPath.isAllUnder(), importPath.getAlias()); - } - if (isImportedByDefault(importPath, file)) { return false; }