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

Minor: remove obsolete JAVA_ROOT

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-08-08 17:06:27 +04:00
parent aacd9b243e
commit a5a493d145
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.kt
-4
View File
@@ -39,10 +39,6 @@ public class JavaDescriptorResolver(public val packageFragmentProvider: LazyJava
public fun getPackageFragment(javaClass: JavaClass): PackageFragmentDescriptor? { public fun getPackageFragment(javaClass: JavaClass): PackageFragmentDescriptor? {
return packageFragmentProvider.getPackageFragment(javaClass) return packageFragmentProvider.getPackageFragment(javaClass)
} }
class object {
public val JAVA_ROOT: Name = Name.special("<java_root>")
}
} }
public fun JavaDescriptorResolver.resolveMethod(method: JavaMethod): FunctionDescriptor? { public fun JavaDescriptorResolver.resolveMethod(method: JavaMethod): FunctionDescriptor? {
idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java
-5
View File
@@ -180,11 +180,6 @@ public class ImportInsertHelper {
} }
public static boolean needImport(@NotNull ImportPath importPath, @NotNull JetFile file, List<JetImportDirective> importDirectives) { public static boolean needImport(@NotNull ImportPath importPath, @NotNull JetFile file, List<JetImportDirective> 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)) { if (isImportedByDefault(importPath, file)) {
return false; return false;
} }