From b1727090086f4a2c30f97c5e3d9f14f7adebb935 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 7 Oct 2014 23:24:20 +0400 Subject: [PATCH] Refactoring: move file --- .../jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java | 2 +- .../jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java | 2 +- .../src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java | 2 +- .../org/jetbrains/jet/plugin/{ => util}/ProjectRootsUtil.java | 2 +- idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java | 2 +- .../jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java | 2 +- .../jet/plugin/hierarchy/calls/KotlinCallHierarchyProvider.java | 2 +- .../jet/plugin/highlighter/DeclarationHintSupport.java | 2 +- .../jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java | 2 +- .../jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java | 2 +- idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt | 2 +- .../jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java | 2 +- .../jetbrains/jet/plugin/run/JetRunConfigurationProducer.java | 2 +- .../jet/plugin/run/JetTestNgConfigurationProducer.java | 2 +- .../plugin/search/ideaExtensions/KotlinReferencesSearcher.java | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) rename idea/idea-analysis/src/org/jetbrains/jet/plugin/{ => util}/ProjectRootsUtil.java (98%) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java index e7e9243d5e4..c3856448af1 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.psi.JetCodeFragment; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.plugin.ProjectRootsUtil; +import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java index 69f23eaec97..5dd18268d7f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.psi.JetDeclaration; import org.jetbrains.jet.lang.psi.JetElement; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.Diagnostics; -import org.jetbrains.jet.plugin.ProjectRootsUtil; +import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.project.TargetPlatform; import org.jetbrains.jet.plugin.project.TargetPlatformDetector; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java index 18eb0cb5142..58f451e6186 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java @@ -45,7 +45,7 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.Diagnostics; -import org.jetbrains.jet.plugin.ProjectRootsUtil; +import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.quickfix.JetIntentionActionsFactory; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/ProjectRootsUtil.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.java similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/ProjectRootsUtil.java rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.java index 18ee5d554fb..d761b6f14d0 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/ProjectRootsUtil.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin; +package org.jetbrains.jet.plugin.util; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.roots.ProjectFileIndex; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java index 636f8f4fc4b..2ff21696dfd 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetNamedFunction; import org.jetbrains.jet.lang.psi.JetProperty; import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; -import org.jetbrains.jet.plugin.ProjectRootsUtil; +import org.jetbrains.jet.plugin.util.ProjectRootsUtil; public class HierarchyUtils { public static final Function1 IS_CALL_HIERARCHY_ELEMENT = new Function1() { diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java index 8108d09eb0e..6a62a600d25 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java @@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.psi.JetClassOrObject; import org.jetbrains.jet.lang.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.plugin.ProjectRootsUtil; +import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.libraries.JetSourceNavigationHelper; import org.jetbrains.jet.plugin.stubindex.JetClassShortNameIndex; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyProvider.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyProvider.java index 414376fbdd9..cab34854ae9 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyProvider.java @@ -28,7 +28,7 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.ProjectRootsUtil; +import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.hierarchy.HierarchyUtils; public class KotlinCallHierarchyProvider implements HierarchyProvider { diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java b/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java index aafb1825d38..c17f72e2524 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java @@ -43,7 +43,7 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetNamedDeclaration; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.JetLanguage; -import org.jetbrains.jet.plugin.ProjectRootsUtil; +import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.util.LongRunningReadTask; import org.jetbrains.jet.renderer.DescriptorRenderer; diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java index 06a8e68168b..fb4d1c8feed 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java @@ -41,7 +41,7 @@ import org.jetbrains.jet.lang.descriptors.Modality; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; import org.jetbrains.jet.lexer.JetTokens; -import org.jetbrains.jet.plugin.ProjectRootsUtil; +import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.highlighter.markers.MarkersPackage; import org.jetbrains.jet.plugin.highlighter.markers.ResolveWithParentsResult; import org.jetbrains.jet.plugin.highlighter.markers.SuperDeclarationMarkerNavigationHandler; diff --git a/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java b/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java index c3358435413..4cd5d59c3fe 100644 --- a/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java +++ b/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java @@ -45,7 +45,7 @@ import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.codegen.state.Progress; import org.jetbrains.jet.lang.diagnostics.DiagnosticHolder; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.plugin.ProjectRootsUtil; +import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.util.InfinitePeriodicalTask; import org.jetbrains.jet.plugin.util.LongRunningReadTask; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt index f0c165e0b01..163e228779a 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt @@ -48,7 +48,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import com.intellij.openapi.module.ModuleUtilCore -import org.jetbrains.jet.plugin.ProjectRootsUtil +import org.jetbrains.jet.plugin.util.ProjectRootsUtil import org.jetbrains.jet.asJava.unwrapped import org.jetbrains.jet.plugin.search.searchScopeForSourceElementDependencies diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java b/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java index de72ade4f6d..49628c780d4 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java @@ -33,7 +33,7 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.asJava.LightClassUtil; import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.plugin.ProjectRootsUtil; +import org.jetbrains.jet.plugin.util.ProjectRootsUtil; public class JetJUnitConfigurationProducer extends RuntimeConfigurationProducer { private JetElement myElement; diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java index f69a3730191..0fdf676a3d0 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java @@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.MainFunctionDetector; -import org.jetbrains.jet.plugin.ProjectRootsUtil; +import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.project.ProjectStructureUtil; import org.jetbrains.jet.plugin.project.ResolveSessionForBodies; diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetTestNgConfigurationProducer.java b/idea/src/org/jetbrains/jet/plugin/run/JetTestNgConfigurationProducer.java index 98d713b0213..17e6c3c9f45 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetTestNgConfigurationProducer.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetTestNgConfigurationProducer.java @@ -34,7 +34,7 @@ import com.theoryinpractice.testng.util.TestNGUtil; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.asJava.LightClassUtil; import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.plugin.ProjectRootsUtil; +import org.jetbrains.jet.plugin.util.ProjectRootsUtil; public class JetTestNgConfigurationProducer extends TestNGConfigurationProducer { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java index 185ecef423e..5ed7f9b44a7 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.asJava.AsJavaPackage; import org.jetbrains.jet.asJava.KotlinLightMethod; import org.jetbrains.jet.asJava.LightClassUtil; import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.plugin.ProjectRootsUtil; +import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.search.usagesSearch.*; public class KotlinReferencesSearcher extends QueryExecutorBase {