From 02945514330459ccf696c948ae9a5970decc568b Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 26 Jul 2016 14:34:07 +0300 Subject: [PATCH] Refactor: move OldPackageFacadeClassUtils to 'frontend.jvm' module --- .../kotlin/fileClasses}/OldPackageFacadeClassUtils.java | 2 +- .../org/jetbrains/kotlin/asJava/builder/StubClassBuilder.java | 2 +- .../idea/decompiler/js/KotlinJavaScriptMetaFileDecompiler.kt | 4 ++-- .../stubBuilder/KotlinJavaScriptStubConsistencyTest.kt | 4 ++-- .../KotlinJavaScriptDecompiledTextConsistencyTest.kt | 4 ++-- .../idea/decompiler/textBuilder/TextConsistencyBaseTest.kt | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) rename compiler/{light-classes/src/org/jetbrains/kotlin/asJava => frontend.java/src/org/jetbrains/kotlin/fileClasses}/OldPackageFacadeClassUtils.java (97%) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/OldPackageFacadeClassUtils.java b/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/OldPackageFacadeClassUtils.java similarity index 97% rename from compiler/light-classes/src/org/jetbrains/kotlin/asJava/OldPackageFacadeClassUtils.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/OldPackageFacadeClassUtils.java index 5923e665209..6b0ca67eae2 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/OldPackageFacadeClassUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/OldPackageFacadeClassUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.asJava; +package org.jetbrains.kotlin.fileClasses; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.ClassId; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/StubClassBuilder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/StubClassBuilder.java index ba6d1bcd223..709496f5d10 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/StubClassBuilder.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/StubClassBuilder.java @@ -24,7 +24,7 @@ import com.intellij.psi.stubs.StubElement; import com.intellij.util.containers.Stack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.asJava.OldPackageFacadeClassUtils; +import org.jetbrains.kotlin.fileClasses.OldPackageFacadeClassUtils; import org.jetbrains.kotlin.codegen.AbstractClassBuilder; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.KtFile; diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptMetaFileDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptMetaFileDecompiler.kt index d11b09fd6c7..dd867e3c002 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptMetaFileDecompiler.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptMetaFileDecompiler.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -21,7 +21,7 @@ import com.intellij.psi.FileViewProvider import com.intellij.psi.PsiManager import com.intellij.psi.compiled.ClassFileDecompilers import com.intellij.psi.compiled.ClsStubBuilder -import org.jetbrains.kotlin.asJava.OldPackageFacadeClassUtils +import org.jetbrains.kotlin.fileClasses.OldPackageFacadeClassUtils import org.jetbrains.kotlin.idea.decompiler.KotlinDecompiledFileViewProvider import org.jetbrains.kotlin.idea.decompiler.KtDecompiledFile import org.jetbrains.kotlin.idea.decompiler.textBuilder.DecompiledText diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubConsistencyTest.kt index af7baf659d3..5bef24d221c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubConsistencyTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.kotlin.asJava.OldPackageFacadeClassUtils +import org.jetbrains.kotlin.fileClasses.OldPackageFacadeClassUtils import org.jetbrains.kotlin.idea.decompiler.js.KotlinJavaScriptStubBuilder import org.jetbrains.kotlin.idea.decompiler.js.buildDecompiledTextFromJsMetadata import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt index 2ec2413cb75..bb163417933 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.idea.decompiler.textBuilder import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.kotlin.asJava.OldPackageFacadeClassUtils +import org.jetbrains.kotlin.fileClasses.OldPackageFacadeClassUtils import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt index fbaa3b8c8e2..c39c6a35a3c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.idea.decompiler.textBuilder import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.kotlin.asJava.OldPackageFacadeClassUtils +import org.jetbrains.kotlin.fileClasses.OldPackageFacadeClassUtils import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor