last batch of dependencies to core-api/impl

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/actions/AddAction.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/actions/AddAction.java
index 0fbfcbf82aa753b27c4b43c19fc24460833e4cf8..536b4b10887d91ba553612f0bb446c3f60c499e7 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/actions/AddAction.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/actions/AddAction.java
@@ -16,9 +16,7 @@
 package com.intellij.debugger.ui.breakpoints.actions;
 
 import com.intellij.debugger.ui.breakpoints.BreakpointPanel;
-import com.intellij.CommonBundle;
 import com.intellij.ide.IdeBundle;
-import com.intellij.idea.ActionsBundle;
 
 import javax.swing.*;
 import java.awt.event.KeyEvent;

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java b/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java
index 9af9238d127ed3302ee01a51a988473e7da99d62..f8fbc82bedf450481325c86e16bda58848622ee3 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java
@@ -1,6 +1,5 @@
 package com.intellij.codeInsight.completion;
 
-import com.intellij.codeInsight.AutoPopupController;
 import com.intellij.codeInsight.generation.GenerateMembersUtil;
 import com.intellij.codeInsight.generation.OverrideImplementUtil;
 import com.intellij.codeInsight.generation.PsiGenerationInfo;

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java
index 908fe2f9af0a00472aa8b669e8495be049b5067d..cf12f2517f9e6e09a85e1cbf0912a5344fa966b4 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java
@@ -21,7 +21,6 @@ import com.intellij.codeInsight.ExpectedTypesProvider;
 import com.intellij.codeInsight.daemon.QuickFixBundle;
 import com.intellij.codeInsight.template.Template;
 import com.intellij.codeInsight.template.TemplateBuilderImpl;
-import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.Result;
 import com.intellij.openapi.command.CommandProcessor;

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalFromUsageFix.java
index 4fb20f799ad93138768132938e84b4cdbd28bb46..cfaa35d6e4061e35f7537e099cdd1316113581b6 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalFromUsageFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalFromUsageFix.java
@@ -21,7 +21,6 @@ import com.intellij.codeInsight.intention.impl.TypeExpression;
 import com.intellij.codeInsight.template.Template;
 import com.intellij.codeInsight.template.TemplateBuilderImpl;
 import com.intellij.codeInsight.template.TemplateEditingAdapter;
-import com.intellij.codeInsight.template.TemplateManager;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodParameterFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodParameterFix.java
index f31f7406534a8f49f1d0cc2328768962c4e7a212..620dab3eb2d56802871e8608fcda8506af592877 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodParameterFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodParameterFix.java
@@ -18,7 +18,6 @@ package com.intellij.codeInsight.daemon.impl.quickfix;
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.codeInsight.daemon.QuickFixBundle;
 import com.intellij.codeInspection.LocalQuickFixAndIntentionActionOnPsiElement;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.undo.UndoUtil;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;

diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java
index b5b40fc52bf663213dab07c01117f2ecf3a2cf9c..5a867f141fa5a40476fd4ec9b08c0a30b38b6cdd 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java
@@ -16,7 +16,6 @@
 package com.intellij.codeInsight.generation;
 
 import com.intellij.CommonBundle;
-import com.intellij.codeInsight.AnnotationUtil;
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.codeInsight.NullableNotNullManager;
 import com.intellij.codeInsight.daemon.ImplicitUsageProvider;

diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java
index f0c54cb3275c6fa18b5476300933b3a249c43fc7..a1e91dc00a12a8e5b6c489cace66a2d7734dd02c 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java
@@ -26,7 +26,6 @@ import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.psi.controlFlow.*;
 import com.intellij.psi.javadoc.PsiDocComment;
 import com.intellij.psi.scope.processor.VariablesProcessor;
 import com.intellij.psi.scope.util.PsiScopesUtil;

diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHandler.java
index df2044595d4b75608598d5766dd9317c518d35ff..16e7126c1432724e4c5a66972d7fb9123859f929 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHandler.java
@@ -19,8 +19,6 @@ import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.codeInsight.CodeInsightSettings;
 import com.intellij.codeInsight.generation.ui.GenerateEqualsWizard;
 import com.intellij.codeInsight.hint.HintManager;
-import com.intellij.ide.DataManager;
-import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
@@ -33,7 +31,6 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collections;
 import java.util.List;
 
 /**

diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/PsiGenerationInfo.java b/java/java-impl/src/com/intellij/codeInsight/generation/PsiGenerationInfo.java
index 97e1ef33bf3f826d1b5ae2f65c74321a2690523a..221b87d426f13fc99beac4aab95fd3971fe82923 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/generation/PsiGenerationInfo.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/PsiGenerationInfo.java
@@ -16,11 +16,8 @@
 package com.intellij.codeInsight.generation;
 
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.codeStyle.JavaCodeStyleManager;
-import com.intellij.psi.impl.source.PostprocessReformattingAspect;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithNotInstanceofSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithNotInstanceofSurrounder.java
index c505e220a619093a8911a363602cba78254cfe62..17083a7d30c36abaa446daad56140ef22103f0c5 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithNotInstanceofSurrounder.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithNotInstanceofSurrounder.java
@@ -23,7 +23,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.refactoring.introduceVariable.IntroduceVariableBase;
 import com.intellij.util.IncorrectOperationException;
 
 class JavaWithNotInstanceofSurrounder extends JavaExpressionSurrounder{

diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithRunnableSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithRunnableSurrounder.java
index a40e612f80e896cd41e13ef9acd8610558b43803..8b775079679fd8ef676e0199e490de41d3d325a4 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithRunnableSurrounder.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithRunnableSurrounder.java
@@ -17,9 +17,7 @@
 package com.intellij.codeInsight.generation.surroundWith;
 
 import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.RangeMarker;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.TextRange;
@@ -28,9 +26,7 @@ import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.codeStyle.JavaCodeStyleManager;
 import com.intellij.psi.search.LocalSearchScope;
 import com.intellij.psi.search.searches.ReferencesSearch;
-import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
-import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler;
 import com.intellij.refactoring.rename.inplace.VariableInplaceRenamer;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;

diff --git a/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java
index 6a2e805ab3ebff85db5b9ba5b06690e81338cf7d..c8486e3dfd5eb10ab2733300b7779b8ca0b95b60 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java
@@ -24,7 +24,6 @@ import com.intellij.lang.parameterInfo.*;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.psi.*;
 import com.intellij.psi.infos.CandidateInfo;
-import com.intellij.psi.infos.ClassCandidateInfo;
 import com.intellij.psi.infos.MethodCandidateInfo;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.MethodSignatureUtil;

diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java
index 645d5b0b29fc7e3c0c83767401098dc5ec06d42a..2fc5c34bfc04e3ece6c627abafd08eacd72247ef 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java
@@ -25,7 +25,6 @@ import com.intellij.openapi.editor.colors.EditorColors;
 import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;

diff --git a/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaTryUnwrapper.java b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaTryUnwrapper.java
index 85cf8089611f560541fe8f30fa76d77fa5c0f635..6308052b0fcc156ddf9efbc6beb059155ce95c3b 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaTryUnwrapper.java
+++ b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaTryUnwrapper.java
@@ -17,8 +17,6 @@ package com.intellij.codeInsight.unwrap;
 
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiResourceList;
-import com.intellij.psi.PsiResourceVariable;
 import com.intellij.psi.PsiTryStatement;
 import com.intellij.util.IncorrectOperationException;
 

diff --git a/java/java-impl/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java b/java/java-impl/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java
index 8eade8a4df2b4f00bbcfbd8388481a4da6da6d96..0b74461b4f784cc22f5a6f9c9fa05e0126c756a4 100644 (file)
--- a/java/java-impl/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java
+++ b/java/java-impl/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java
@@ -19,7 +19,6 @@ import com.intellij.ide.IdeBundle;
 import com.intellij.ide.util.treeView.smartTree.Group;
 import com.intellij.ide.util.treeView.smartTree.TreeElement;
 import com.intellij.navigation.ItemPresentation;
-import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.SmartPointerManager;

diff --git a/java/java-impl/src/com/intellij/ide/util/JavaDeleteTypeDescriptionProvider.java b/java/java-impl/src/com/intellij/ide/util/JavaDeleteTypeDescriptionProvider.java
index 0d570bf6a826cca9552f1b8664907153924703b7..18d9a94130dc3d03c4d6bad5aac6f60078bfc712 100644 (file)
--- a/java/java-impl/src/com/intellij/ide/util/JavaDeleteTypeDescriptionProvider.java
+++ b/java/java-impl/src/com/intellij/ide/util/JavaDeleteTypeDescriptionProvider.java
@@ -17,7 +17,6 @@ package com.intellij.ide.util;
 
 import com.intellij.ide.IdeBundle;
 import com.intellij.psi.*;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.NotNull;
 
 /**

diff --git a/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java b/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java
index b5ef7b810442202ed39ba460d2a82e19292a4fe1..328ff6a4a9c200a607062c96893cab4faa7481bf 100644 (file)
--- a/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java
+++ b/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java
@@ -34,7 +34,6 @@ import com.intellij.openapi.module.ModuleUtil;
 import com.intellij.openapi.project.IndexNotReadyException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.*;
-import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.JarFileSystem;

diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PsiPackageReference.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PsiPackageReference.java
index 00cfb57c88474eb066991ab11b17b55894fe43b6..890d18735628004bee688e8b7321b312f7ec09cd 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PsiPackageReference.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PsiPackageReference.java
@@ -20,12 +20,8 @@ import com.intellij.codeInsight.daemon.EmptyResolveMessageProvider;
 import com.intellij.codeInsight.daemon.JavaErrorMessages;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
-import com.intellij.util.ArrayUtil;
-import com.intellij.util.Function;
 import com.intellij.util.IncorrectOperationException;
-import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 

diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java
index 424c0bff6964d9782a9f3a1909cd369041ebc6f9..a6a2d833da203dadf966f15e2567b8f4b0891436 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java
@@ -20,7 +20,6 @@
  */
 package com.intellij.refactoring.extractMethodObject;
 
-import com.intellij.codeInsight.AnnotationUtil;
 import com.intellij.codeInsight.NullableNotNullManager;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;

diff --git a/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java
index b0e6d235a1c4a1e6ef7f1f0f411921f1f950f783..bbb294d36d2e2d058c5c0b0314040a3687be2da6 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.refactoring.inheritanceToDelegation;
 
-import com.intellij.codeInsight.AnnotationUtil;
 import com.intellij.codeInsight.NullableNotNullManager;
 import com.intellij.codeInsight.generation.GenerateMembersUtil;
 import com.intellij.find.findUsages.PsiElement2UsageTargetAdapter;

diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
index 70e59c7c776a986bccd2678a813c6e4d39794211..27085667596dc820a11e1c499f42dd4441cc1a70 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
@@ -27,7 +27,6 @@ package com.intellij.refactoring.introduceField;
 import com.intellij.codeInsight.AnnotationUtil;
 import com.intellij.codeInsight.ChangeContextUtil;
 import com.intellij.codeInsight.TestFrameworks;
-import com.intellij.codeInsight.TestFrameworksImpl;
 import com.intellij.codeInsight.highlighting.HighlightManager;
 import com.intellij.codeInsight.lookup.LookupManager;
 import com.intellij.codeInsight.navigation.NavigationUtil;

diff --git a/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java b/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java
index ddcffa0a622a36319301a986e6a1c459d30f5047..9e224433f9d10642e96ddd38cab5bb5958405f28 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java
+++ b/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java
@@ -15,9 +15,6 @@
  */
 package com.intellij.refactoring.rename;
 
-import com.intellij.codeInsight.completion.JavaCompletionUtil;
-import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.codeInsight.lookup.LookupItemUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.JavaCodeStyleManager;

diff --git a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
index 152fc16309555460e01b6b648f70b57ef51a967f..610bcdf579d0e5e0e0ed85119e9b58a9a6d50dd4 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
@@ -37,7 +37,6 @@ import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.codeStyle.JavaCodeStyleManager;
 import com.intellij.psi.codeStyle.VariableKind;
 import com.intellij.psi.controlFlow.ControlFlowUtil;

diff --git a/platform/lang-api/src/com/intellij/codeInsight/CodeInsightBundle.java b/platform/core-api/src/com/intellij/codeInsight/CodeInsightBundle.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/codeInsight/CodeInsightBundle.java
rename to platform/core-api/src/com/intellij/codeInsight/CodeInsightBundle.java

diff --git a/platform/platform-api/src/com/intellij/ide/IdeBundle.java b/platform/core-api/src/com/intellij/ide/IdeBundle.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/ide/IdeBundle.java
rename to platform/core-api/src/com/intellij/ide/IdeBundle.java

diff --git a/platform/lang-api/src/com/intellij/lexer/DocCommentLexer.java b/platform/core-api/src/com/intellij/lexer/DocCommentLexer.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/lexer/DocCommentLexer.java
rename to platform/core-api/src/com/intellij/lexer/DocCommentLexer.java

diff --git a/platform/lang-api/src/com/intellij/lexer/DocCommentTokenTypes.java b/platform/core-api/src/com/intellij/lexer/DocCommentTokenTypes.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/lexer/DocCommentTokenTypes.java
rename to platform/core-api/src/com/intellij/lexer/DocCommentTokenTypes.java

diff --git a/platform/lang-api/src/com/intellij/lexer/_JavaDocLexer.java b/platform/core-api/src/com/intellij/lexer/_JavaDocLexer.java
similarity index 99%
rename from platform/lang-api/src/com/intellij/lexer/_JavaDocLexer.java
rename to platform/core-api/src/com/intellij/lexer/_JavaDocLexer.java
index 41485efc5462901838878770e82cecb599846146..a71465141765c47afe9e5b16dcbe44e329832a10 100644 (file)
--- a/platform/lang-api/src/com/intellij/lexer/_JavaDocLexer.java
+++ b/platform/core-api/src/com/intellij/lexer/_JavaDocLexer.java
@@ -20,7 +20,6 @@
 package com.intellij.lexer;
 
 import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.*;
 
 
 /**

diff --git a/platform/lang-api/src/com/intellij/psi/ElementManipulator.java b/platform/core-api/src/com/intellij/psi/ElementManipulator.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/ElementManipulator.java
rename to platform/core-api/src/com/intellij/psi/ElementManipulator.java

diff --git a/platform/lang-api/src/com/intellij/psi/ElementManipulators.java b/platform/core-api/src/com/intellij/psi/ElementManipulators.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/ElementManipulators.java
rename to platform/core-api/src/com/intellij/psi/ElementManipulators.java

diff --git a/platform/lang-api/src/com/intellij/psi/LiteralTextEscaper.java b/platform/core-api/src/com/intellij/psi/LiteralTextEscaper.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/LiteralTextEscaper.java
rename to platform/core-api/src/com/intellij/psi/LiteralTextEscaper.java

diff --git a/platform/lang-api/src/com/intellij/psi/PsiLanguageInjectionHost.java b/platform/core-api/src/com/intellij/psi/PsiLanguageInjectionHost.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/PsiLanguageInjectionHost.java
rename to platform/core-api/src/com/intellij/psi/PsiLanguageInjectionHost.java

diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleManager.java b/platform/core-api/src/com/intellij/psi/codeStyle/CodeStyleManager.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleManager.java
rename to platform/core-api/src/com/intellij/psi/codeStyle/CodeStyleManager.java

diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/SuggestedNameInfo.java b/platform/core-api/src/com/intellij/psi/codeStyle/SuggestedNameInfo.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/codeStyle/SuggestedNameInfo.java
rename to platform/core-api/src/com/intellij/psi/codeStyle/SuggestedNameInfo.java

diff --git a/platform/lang-api/src/com/intellij/psi/search/searches/ExtensibleQueryFactory.java b/platform/core-api/src/com/intellij/psi/search/searches/ExtensibleQueryFactory.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/searches/ExtensibleQueryFactory.java
rename to platform/core-api/src/com/intellij/psi/search/searches/ExtensibleQueryFactory.java

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/meta/MetaRegistry.java b/platform/core-impl/src/com/intellij/psi/impl/meta/MetaRegistry.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/impl/meta/MetaRegistry.java
rename to platform/core-impl/src/com/intellij/psi/impl/meta/MetaRegistry.java

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiPolyVariantCachingReference.java b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiPolyVariantCachingReference.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiPolyVariantCachingReference.java
rename to platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiPolyVariantCachingReference.java

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/ICodeFragmentElementType.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/ICodeFragmentElementType.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/impl/source/tree/ICodeFragmentElementType.java
rename to platform/core-impl/src/com/intellij/psi/impl/source/tree/ICodeFragmentElementType.java

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java
index 68ac5f8bbc007da6fde17596ab53d6ad728ad3a7..881d921add7eb5cfbfc1b7876560c59b1227fc56 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java
@@ -40,7 +40,6 @@ import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vcs.FileStatusManager;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
-import com.intellij.psi.presentation.java.SymbolPresentationUtil;
 import com.intellij.psi.util.PsiUtilBase;
 import com.intellij.ui.IdeBorderFactory;
 import com.intellij.ui.SideBorder;

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoImplementationHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoImplementationHandler.java
index 3a249dfb557c2e90a2f131816bcf717e32567d25..14be963ab4bbde81fa3e81496bebffbc6c68349d 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoImplementationHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoImplementationHandler.java
@@ -31,7 +31,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Map;
 
 public class GotoImplementationHandler extends GotoTargetHandler {

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java
index 2c3465efcbe323b096d58962eac2dde03874be3f..12061a4c4f763758ce01c4e1eeee93327deafd39 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java
@@ -20,7 +20,6 @@ import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
 import com.intellij.codeInsight.template.EverywhereContextType;
 import com.intellij.codeInsight.template.TemplateContextType;
-import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.command.CommandProcessor;
@@ -33,7 +32,6 @@ import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
-import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.wm.IdeFocusManager;

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/macro/LineNumberMacro.java b/platform/lang-impl/src/com/intellij/codeInsight/template/macro/LineNumberMacro.java
index 68fe270b8681164ee15c48fa82979f6917c6610d..0512b11a8d3d4870122e397b8f3f5ea5b1b1f8b6 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/macro/LineNumberMacro.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/macro/LineNumberMacro.java
@@ -17,7 +17,6 @@
 package com.intellij.codeInsight.template.macro;
 
 import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.codeInsight.lookup.LookupItem;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.template.*;
 import org.jetbrains.annotations.NotNull;

diff --git a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java
index 47f15379502e57fe17bb8002ccb2043992196720..5cbca1b7df638b077f4cd823eb4710c944bde951 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java
+++ b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java
@@ -26,7 +26,6 @@ import com.intellij.ide.projectView.ProjectViewNodeDecorator;
 import com.intellij.ide.projectView.impl.AbstractProjectViewPane;
 import com.intellij.ide.projectView.impl.ModuleGroup;
 import com.intellij.ide.projectView.impl.ProjectViewPane;
-import com.intellij.ide.projectView.impl.ProjectViewTree;
 import com.intellij.ide.scopeView.nodes.BasePsiNode;
 import com.intellij.ide.ui.customization.CustomizationUtil;
 import com.intellij.ide.util.DeleteHandler;

diff --git a/platform/lang-impl/src/com/intellij/ide/todo/nodes/TodoDirNode.java b/platform/lang-impl/src/com/intellij/ide/todo/nodes/TodoDirNode.java
index c4400404a8d6f48e6f6dfa5d6bf75b6010885463..68641cee839cabb37c735d5e8e990c02232182d5 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/todo/nodes/TodoDirNode.java
+++ b/platform/lang-impl/src/com/intellij/ide/todo/nodes/TodoDirNode.java
@@ -41,7 +41,6 @@ import com.intellij.ui.HighlightedRegion;
 import com.intellij.usageView.UsageTreeColors;
 import com.intellij.usageView.UsageTreeColorsScheme;
 
-import javax.swing.*;
 import java.awt.*;
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameDialog.java b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameDialog.java
index 0a9214d694fd65674b3617d4d1ad8931c4596c62..9fe0c0f3f2606bc0e8f025e2bce8107a9bd86964 100644 (file)
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameDialog.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameDialog.java
@@ -23,8 +23,6 @@ import com.intellij.openapi.fileTypes.FileTypes;
 import com.intellij.openapi.help.HelpManager;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Condition;
-import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.codeStyle.SuggestedNameInfo;
@@ -33,7 +31,6 @@ import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory;
 import com.intellij.refactoring.ui.NameSuggestionsField;
 import com.intellij.refactoring.ui.RefactoringDialog;
 import com.intellij.refactoring.util.TextOccurrencesUtil;
-import com.intellij.ui.IdeBorderFactory;
 import com.intellij.ui.NonFocusableCheckBox;
 import com.intellij.usageView.UsageViewUtil;
 import com.intellij.util.ArrayUtil;

diff --git a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java
index f0ee2a828588a64f516046caf1ce8017d8d0a99b..81b18e654de40a5d46ff92d9cb1ae769872775ea 100644 (file)
--- a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java
@@ -26,7 +26,6 @@ import com.intellij.psi.PsiElement;
 import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.refactoring.RefactoringSettings;
 import com.intellij.refactoring.util.TextOccurrencesUtil;
-import com.intellij.ui.IdeBorderFactory;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;

diff --git a/platform/platform-api/src/com/intellij/ide/highlighter/ModuleFileType.java b/platform/platform-api/src/com/intellij/ide/highlighter/ModuleFileType.java
index 6860c3519ddaf2985b3dcd685f997d5d7f08e967..3219149fce4c9626835561a9c179251783e7d2b4 100644 (file)
--- a/platform/platform-api/src/com/intellij/ide/highlighter/ModuleFileType.java
+++ b/platform/platform-api/src/com/intellij/ide/highlighter/ModuleFileType.java
@@ -16,7 +16,6 @@
 package com.intellij.ide.highlighter;
 
 import com.intellij.ide.IdeBundle;
-import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.openapi.vfs.VirtualFile;

diff --git a/platform/platform-api/src/com/intellij/ide/highlighter/ProjectFileType.java b/platform/platform-api/src/com/intellij/ide/highlighter/ProjectFileType.java
index 4fdc799cd4d18824e2490a55cbd34b92f73de877..0d2fea455b3360ab27e5124ad1f95150f5be8e10 100644 (file)
--- a/platform/platform-api/src/com/intellij/ide/highlighter/ProjectFileType.java
+++ b/platform/platform-api/src/com/intellij/ide/highlighter/ProjectFileType.java
@@ -16,7 +16,6 @@
 package com.intellij.ide.highlighter;
 
 import com.intellij.ide.IdeBundle;
-import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.openapi.vfs.VirtualFile;

diff --git a/platform/platform-api/src/com/intellij/ide/highlighter/WorkspaceFileType.java b/platform/platform-api/src/com/intellij/ide/highlighter/WorkspaceFileType.java
index f862445871b0534c6d7780362e88786bad975965..9bd8dc42ebec5f6319ed2eaac248cc308a446ad1 100644 (file)
--- a/platform/platform-api/src/com/intellij/ide/highlighter/WorkspaceFileType.java
+++ b/platform/platform-api/src/com/intellij/ide/highlighter/WorkspaceFileType.java
@@ -16,7 +16,6 @@
 package com.intellij.ide.highlighter;
 
 import com.intellij.ide.IdeBundle;
-import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.openapi.vfs.VirtualFile;

diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CloseEditorAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CloseEditorAction.java
index 81d83dcc3ab598b31467196dfbc81a65eb269e9e..566510548b23bdd4c1a49d9a8cd7f45098650222 100644 (file)
--- a/platform/platform-impl/src/com/intellij/ide/actions/CloseEditorAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/CloseEditorAction.java
@@ -19,7 +19,6 @@ package com.intellij.ide.actions;
 import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.fileEditor.FileEditorManager;
-import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx;
 import com.intellij.openapi.fileEditor.impl.EditorWindow;
 import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl;
 import com.intellij.openapi.project.DumbAware;

diff --git a/platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java b/platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java
index 6d544958982a66eeb4aaafbc4f20b6c1c80963d9..bdce587f46dc535028f74beca5043118b93035d3 100644 (file)
--- a/platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java
@@ -22,7 +22,6 @@ import com.intellij.openapi.fileEditor.impl.EditorWindow;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.wm.ToolWindowManager;
 import com.intellij.ui.content.Content;
 import com.intellij.ui.content.ContentManager;
 import com.intellij.ui.content.ContentManagerUtil;

diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java
index 1cb0b02c2a16016f612ced24aafbfc4cb871f96c..f90e9a1f9eb36bfe8837938dc30c459ccea0d00c 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java
@@ -29,7 +29,6 @@ import com.intellij.openapi.components.ExportableApplicationComponent;
 import com.intellij.openapi.components.RoamingType;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.options.BaseSchemeProcessor;
-import com.intellij.openapi.options.Scheme;
 import com.intellij.openapi.options.SchemesManager;
 import com.intellij.openapi.options.SchemesManagerFactory;
 import com.intellij.openapi.project.Project;

diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/DefaultLanguageInjector.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/DefaultLanguageInjector.java
index 08ccbbb1c9016a83533887b122b7c96259beb607..56ae14f3c58132995813cba9779229651db53997 100644 (file)
--- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/DefaultLanguageInjector.java
+++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/DefaultLanguageInjector.java
@@ -19,13 +19,10 @@ package org.intellij.plugins.intelliLang.inject;
 import com.intellij.lang.Language;
 import com.intellij.lang.injection.MultiHostInjector;
 import com.intellij.lang.injection.MultiHostRegistrar;
-import com.intellij.openapi.extensions.Extensions;
-import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.util.Trinity;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiLanguageInjectionHost;
-import com.intellij.util.containers.ContainerUtil;
 import org.intellij.plugins.intelliLang.Configuration;
 import org.intellij.plugins.intelliLang.inject.config.BaseInjection;
 import org.jetbrains.annotations.NotNull;
@@ -33,7 +30,6 @@ import org.jetbrains.annotations.NotNull;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Set;
 
 public final class DefaultLanguageInjector implements MultiHostInjector {
 

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionProvider.java
index 192942440d950e7aa8a9b5e63e13cfa201d9e492..50cac8e338910d57c17de2eff343f8526377699d 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionProvider.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionProvider.java
@@ -15,7 +15,6 @@
  */
 package org.jetbrains.plugins.groovy.refactoring;
 
-import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiType;
 import com.intellij.psi.codeStyle.JavaCodeStyleManager;
@@ -27,7 +26,6 @@ import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable;
 
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Set;
 
 /**

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyAnonymousUnwrapper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyAnonymousUnwrapper.java
index 0da4e87a5b7f2f200a7db80ec2170a97fc0bc39c..c85bfffef08e7c83f31c490f904b880602d5a9cd 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyAnonymousUnwrapper.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyAnonymousUnwrapper.java
@@ -16,7 +16,6 @@
 package org.jetbrains.plugins.groovy.unwrap;
 
 import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.codeInsight.unwrap.JavaUnwrapper;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyBracesUnwrapper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyBracesUnwrapper.java
index 9ea9d49e9e0433ae54d0e59fa878eeb41cb6e415..f633871b31748f587d00923b7a006fb0d96cf3ec 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyBracesUnwrapper.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyBracesUnwrapper.java
@@ -16,19 +16,11 @@
 package org.jetbrains.plugins.groovy.unwrap;
 
 import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.codeInsight.unwrap.JavaUnwrapper;
 import com.intellij.psi.*;
 import com.intellij.util.IncorrectOperationException;
-import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFileBase;
-import org.jetbrains.plugins.groovy.lang.psi.api.formatter.GrControlStatement;
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrBlockStatement;
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrCatchClause;
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrIfStatement;
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrTryCatchStatement;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrOpenBlock;
-import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil;
 
 public class GroovyBracesUnwrapper extends GroovyUnwrapper {
   public GroovyBracesUnwrapper() {

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyCatchRemover.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyCatchRemover.java
index 5892563a3a51a5cd876f1807e72fefec9ed1abf4..240b699a6b4c148ed6f25ed73714cb172c1ce2d6 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyCatchRemover.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyCatchRemover.java
@@ -16,10 +16,7 @@
 package org.jetbrains.plugins.groovy.unwrap;
 
 import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.codeInsight.unwrap.JavaUnwrapper;
-import com.intellij.psi.PsiCatchSection;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiTryStatement;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrCatchClause;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrTryCatchStatement;

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyConditionalUnwrapper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyConditionalUnwrapper.java
index 35d26e89102ae0518dc12469d853f6bb8c0f61de..4f6e1616136149223ff7af8f513bc49afca1953f 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyConditionalUnwrapper.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyConditionalUnwrapper.java
@@ -3,7 +3,6 @@ package org.jetbrains.plugins.groovy.unwrap;
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.IncorrectOperationException;
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrConditionalExpression;
 
 import java.util.List;

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyForUnwrapper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyForUnwrapper.java
index d376883f8ff4fd3d7339c43a03b55a9e60193ba0..b700c9e7cea608cf670e5c93b11ce72a65f58bc1 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyForUnwrapper.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyForUnwrapper.java
@@ -16,7 +16,6 @@
 package org.jetbrains.plugins.groovy.unwrap;
 
 import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.codeInsight.unwrap.JavaUnwrapper;
 import com.intellij.psi.*;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrForStatement;

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyIfUnwrapper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyIfUnwrapper.java
index ccc386ca7dd6e7c7a3c901970090bb45d8dac2b8..1fc36a34a8b10b77bfaf891de31eaa28a0056d78 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyIfUnwrapper.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyIfUnwrapper.java
@@ -16,11 +16,7 @@
 package org.jetbrains.plugins.groovy.unwrap;
 
 import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.codeInsight.unwrap.JavaUnwrapper;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiIfStatement;
-import com.intellij.psi.PsiStatement;
-import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrIfStatement;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrStatement;

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovySynchronizedUnwrapper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovySynchronizedUnwrapper.java
index a61c3e3524293855f284dc5a0bffb88f87b9154a..85b3c7d2b6be08d0b51592f76e48e2c06aae9cf9 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovySynchronizedUnwrapper.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovySynchronizedUnwrapper.java
@@ -16,10 +16,7 @@
 package org.jetbrains.plugins.groovy.unwrap;
 
 import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.codeInsight.unwrap.JavaUnwrapper;
-import com.intellij.psi.PsiCodeBlock;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiSynchronizedStatement;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrSynchronizedStatement;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrOpenBlock;

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyTryUnwrapper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyTryUnwrapper.java
index 1df5cc300ef196e35899a93b795be2233a50b6a4..39a687c4b215a8e3433ac60810a57941b6c22fe6 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyTryUnwrapper.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyTryUnwrapper.java
@@ -16,9 +16,7 @@
 package org.jetbrains.plugins.groovy.unwrap;
 
 import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.codeInsight.unwrap.JavaUnwrapper;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiTryStatement;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrFinallyClause;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrTryCatchStatement;

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyWhileUnwrapper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyWhileUnwrapper.java
index 403d9089f9a92b6065c75c438dbee4bdf723bb3d..8b1523f292c31d4c3d0453eb8616603db1d38318 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyWhileUnwrapper.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/unwrap/GroovyWhileUnwrapper.java
@@ -16,16 +16,10 @@
 package org.jetbrains.plugins.groovy.unwrap;
 
 import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.psi.PsiDoWhileStatement;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiLoopStatement;
-import com.intellij.psi.PsiStatement;
-import com.intellij.psi.impl.source.tree.java.PsiWhileStatementImpl;
 import com.intellij.util.IncorrectOperationException;
-import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrStatement;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrWhileStatement;
-import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil;
 
 public class GroovyWhileUnwrapper extends GroovyUnwrapper {
   public GroovyWhileUnwrapper() {

diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeJspHandlerProvider.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeJspHandlerProvider.java
index 2c30e4476e70f8c20eb72a767041df1d2f0fe633..1553ec50decbc8d404b67ec758df77b3b0241262 100644 (file)
--- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeJspHandlerProvider.java
+++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeJspHandlerProvider.java
@@ -22,7 +22,6 @@ import com.intellij.lang.properties.psi.PropertiesFile;
 import com.intellij.lang.properties.psi.PropertyCreationHandler;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
 import com.intellij.psi.jsp.JspFile;

diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/DictionarySuggestionProvider.java b/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/DictionarySuggestionProvider.java
index 5706013057d88e07f2e9e25be9dcb66a9414e67c..08978686773c4118d97926d34262e6eda7114c98 100644 (file)
--- a/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/DictionarySuggestionProvider.java
+++ b/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/DictionarySuggestionProvider.java
@@ -15,14 +15,12 @@
  */
 package com.intellij.spellchecker.quickfixes;
 
-import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNamedElement;
 import com.intellij.psi.codeStyle.SuggestedNameInfo;
 import com.intellij.refactoring.rename.NameSuggestionProvider;
 import com.intellij.spellchecker.SpellCheckerManager;
 
-import java.util.Collection;
 import java.util.Set;
 import java.util.TreeSet;
 

diff --git a/xml/dom-impl/src/com/intellij/util/xml/DomNameSuggestionProvider.java b/xml/dom-impl/src/com/intellij/util/xml/DomNameSuggestionProvider.java
index 503b7e006828febe9d0f7605dfd3fdf8d9a9339b..b322d8fc37b8cdbf5a5c586aa9d6691ba062c6a1 100644 (file)
--- a/xml/dom-impl/src/com/intellij/util/xml/DomNameSuggestionProvider.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/DomNameSuggestionProvider.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.util.xml;
 
-import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.codeStyle.SuggestedNameInfo;
 import com.intellij.psi.meta.PsiMetaData;
@@ -24,7 +23,6 @@ import com.intellij.refactoring.rename.NameSuggestionProvider;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collection;
 import java.util.Set;
 
 /**

diff --git a/xml/impl/src/com/intellij/xml/DefaultXmlExtension.java b/xml/impl/src/com/intellij/xml/DefaultXmlExtension.java
index 4ee48b8b94f4d4166020169f5b7ac1319c262e75..5eb23b67699f6db88cb54973084b0890c28adb69 100644 (file)
--- a/xml/impl/src/com/intellij/xml/DefaultXmlExtension.java
+++ b/xml/impl/src/com/intellij/xml/DefaultXmlExtension.java
@@ -26,7 +26,6 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.XmlElementFactory;
-import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.impl.source.xml.SchemaPrefix;
 import com.intellij.psi.impl.source.xml.TagNameReference;
 import com.intellij.psi.xml.*;