move *PresentationProvider to java-psi-impl

java/java-psi-impl/src/com/intellij/psi/presentation/java/PackagePresentationProvider.java

@@ -15,15 +15,38 @@
  */
 package com.intellij.psi.presentation.java;
 
-import com.intellij.ide.projectView.PresentationData;
+import com.intellij.navigation.ColoredItemPresentation;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.ItemPresentationProvider;
+import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.psi.PsiPackage;
 import com.intellij.util.PlatformIcons;
 
+import javax.swing.*;
+
 public class PackagePresentationProvider implements ItemPresentationProvider<PsiPackage> {
   @Override
   public ItemPresentation getPresentation(final PsiPackage aPackage) {
-    return new PresentationData(aPackage.getName(), aPackage.getQualifiedName(), PlatformIcons.PACKAGE_OPEN_ICON, PlatformIcons.PACKAGE_ICON, null);
+    return new ColoredItemPresentation() {
+      @Override
+      public TextAttributesKey getTextAttributesKey() {
+        return null;
+      }
+
+      @Override
+      public String getPresentableText() {
+        return aPackage.getName();
+      }
+
+      @Override
+      public String getLocationString() {
+        return aPackage.getQualifiedName();
+      }
+
+      @Override
+      public Icon getIcon(boolean open) {
+        return open ? PlatformIcons.PACKAGE_OPEN_ICON : PlatformIcons.PACKAGE_ICON;
+      }
+    };
   }
 }

java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/FixAllAnnotatorQuickfixTest.java

@@ -22,7 +22,6 @@ package com.intellij.codeInsight.daemon.quickFix;
 
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInspection.*;
-import com.intellij.codeInspection.dataFlow.DataFlowInspection;
 import com.intellij.lang.Language;
 import com.intellij.lang.LanguageAnnotators;
 import com.intellij.lang.annotation.Annotation;

plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrFieldImpl.java

@@ -15,7 +15,6 @@
  */
 package org.jetbrains.plugins.groovy.lang.psi.impl.statements;
 
-import com.google.common.collect.Maps;
 import com.intellij.lang.ASTNode;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.psi.*;