From 080df59ef1bc8185b704b1d4eae602c1735c8ce3 Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Wed, 11 Jul 2012 10:10:20 +0200 Subject: [PATCH] Move PsiFormatUtilBase to core-api and PsiFormatUtil to java-psi-api --- .../highlighting/JavaHighlightUsagesDescriptionProvider.java | 1 - .../ide/structureView/impl/java/PsiFieldTreeElement.java | 1 - .../util/JavaRefactoringElementDescriptionProvider.java | 1 - .../com/intellij/usageView/JavaUsageViewDescriptionProvider.java | 1 - .../src/com/intellij/psi/util/ClassUtil.java | 0 .../src/com/intellij/psi/util/PsiExpressionTrimRenderer.java | 0 .../src/com/intellij/psi/util/PsiFormatUtil.java | 0 .../src/com/intellij/psi/util/PsiFormatUtilBase.java | 0 ...BeforeClassOrAfterClassIsPublicStaticVoidNoArgInspection.java | 1 - 9 files changed, 5 deletions(-) rename java/{openapi => java-psi-api}/src/com/intellij/psi/util/ClassUtil.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/util/PsiExpressionTrimRenderer.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/util/PsiFormatUtil.java (100%) rename platform/{platform-api => core-api}/src/com/intellij/psi/util/PsiFormatUtilBase.java (100%) diff --git a/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaHighlightUsagesDescriptionProvider.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaHighlightUsagesDescriptionProvider.java index b0cafc83a24c..8463eaa2ca3b 100644 --- a/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaHighlightUsagesDescriptionProvider.java +++ b/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaHighlightUsagesDescriptionProvider.java @@ -18,7 +18,6 @@ package com.intellij.codeInsight.highlighting; import com.intellij.psi.*; import com.intellij.psi.util.PsiFormatUtil; import com.intellij.lang.LangBundle; -import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.NotNull; /** diff --git a/java/java-impl/src/com/intellij/ide/structureView/impl/java/PsiFieldTreeElement.java b/java/java-impl/src/com/intellij/ide/structureView/impl/java/PsiFieldTreeElement.java index 6961b7c25e9e..e358b074cf92 100644 --- a/java/java-impl/src/com/intellij/ide/structureView/impl/java/PsiFieldTreeElement.java +++ b/java/java-impl/src/com/intellij/ide/structureView/impl/java/PsiFieldTreeElement.java @@ -17,7 +17,6 @@ package com.intellij.ide.structureView.impl.java; import com.intellij.ide.structureView.StructureViewTreeElement; import com.intellij.ide.util.treeView.smartTree.SortableTreeElement; -import com.intellij.navigation.ItemPresentation; import com.intellij.psi.PsiField; import com.intellij.psi.PsiSubstitutor; import com.intellij.psi.util.PsiFormatUtil; diff --git a/java/java-impl/src/com/intellij/refactoring/util/JavaRefactoringElementDescriptionProvider.java b/java/java-impl/src/com/intellij/refactoring/util/JavaRefactoringElementDescriptionProvider.java index c1e37c756df6..b00049414739 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/JavaRefactoringElementDescriptionProvider.java +++ b/java/java-impl/src/com/intellij/refactoring/util/JavaRefactoringElementDescriptionProvider.java @@ -19,7 +19,6 @@ import com.intellij.psi.*; import com.intellij.psi.util.PsiFormatUtil; import com.intellij.refactoring.RefactoringBundle; import com.intellij.usageView.UsageViewUtil; -import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.NotNull; public class JavaRefactoringElementDescriptionProvider implements ElementDescriptionProvider { diff --git a/java/java-impl/src/com/intellij/usageView/JavaUsageViewDescriptionProvider.java b/java/java-impl/src/com/intellij/usageView/JavaUsageViewDescriptionProvider.java index e8784bb30394..c31d9a5f5aaf 100644 --- a/java/java-impl/src/com/intellij/usageView/JavaUsageViewDescriptionProvider.java +++ b/java/java-impl/src/com/intellij/usageView/JavaUsageViewDescriptionProvider.java @@ -18,7 +18,6 @@ package com.intellij.usageView; import com.intellij.psi.*; import com.intellij.psi.util.PsiFormatUtil; import com.intellij.lang.LangBundle; -import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.NotNull; /** diff --git a/java/openapi/src/com/intellij/psi/util/ClassUtil.java b/java/java-psi-api/src/com/intellij/psi/util/ClassUtil.java similarity index 100% rename from java/openapi/src/com/intellij/psi/util/ClassUtil.java rename to java/java-psi-api/src/com/intellij/psi/util/ClassUtil.java diff --git a/java/openapi/src/com/intellij/psi/util/PsiExpressionTrimRenderer.java b/java/java-psi-api/src/com/intellij/psi/util/PsiExpressionTrimRenderer.java similarity index 100% rename from java/openapi/src/com/intellij/psi/util/PsiExpressionTrimRenderer.java rename to java/java-psi-api/src/com/intellij/psi/util/PsiExpressionTrimRenderer.java diff --git a/java/openapi/src/com/intellij/psi/util/PsiFormatUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiFormatUtil.java similarity index 100% rename from java/openapi/src/com/intellij/psi/util/PsiFormatUtil.java rename to java/java-psi-api/src/com/intellij/psi/util/PsiFormatUtil.java diff --git a/platform/platform-api/src/com/intellij/psi/util/PsiFormatUtilBase.java b/platform/core-api/src/com/intellij/psi/util/PsiFormatUtilBase.java similarity index 100% rename from platform/platform-api/src/com/intellij/psi/util/PsiFormatUtilBase.java rename to platform/core-api/src/com/intellij/psi/util/PsiFormatUtilBase.java diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/BeforeClassOrAfterClassIsPublicStaticVoidNoArgInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/BeforeClassOrAfterClassIsPublicStaticVoidNoArgInspection.java index 9be4121844e2..51e38860938f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/BeforeClassOrAfterClassIsPublicStaticVoidNoArgInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/BeforeClassOrAfterClassIsPublicStaticVoidNoArgInspection.java @@ -16,7 +16,6 @@ package com.siyeh.ig.junit; import com.intellij.codeInspection.ProblemDescriptor; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil;