move PsiShortNamesCache to java-indexing

java/java-indexing-impl/src/com/intellij/psi/impl/PsiShortNamesCacheImpl.java

@@ -15,7 +15,7 @@
  */
 package com.intellij.psi.impl;
 
-import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.progress.ProgressIndicatorProvider;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.java.stubs.index.JavaFieldNameIndex;
@@ -42,7 +42,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
-class PsiShortNamesCacheImpl extends PsiShortNamesCache {
+public class PsiShortNamesCacheImpl extends PsiShortNamesCache {
   private final PsiManagerEx myManager;
 
   public PsiShortNamesCacheImpl(PsiManagerEx manager) {
@@ -225,7 +225,7 @@ class PsiShortNamesCacheImpl extends PsiShortNamesCache {
     });
 
     for (T member : members) {
-      ProgressManager.checkCanceled();
+      ProgressIndicatorProvider.checkCanceled();
 
       if (!scope.contains(member.getContainingFile().getVirtualFile())) continue;
       if (!set.add(member)) continue;

platform/core-impl/src/com/intellij/core/CoreApplicationEnvironment.java

@@ -258,6 +258,7 @@ public class CoreApplicationEnvironment {
     });
   }
 
+
   public static <T> void registerExtensionPoint(final ExtensionsArea area, final ExtensionPointName<T> extensionPointName,
                                                    final Class<? extends T> aClass) {
     final String name = extensionPointName.getName();

platform/core-impl/src/com/intellij/core/CoreProjectEnvironment.java

@@ -20,10 +20,12 @@ import com.intellij.mock.MockFileIndexFacade;
 import com.intellij.mock.MockProject;
 import com.intellij.mock.MockResolveScopeManager;
 import com.intellij.openapi.Disposable;
+import com.intellij.openapi.extensions.ExtensionPoint;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.roots.FileIndexFacade;
+import com.intellij.openapi.util.Disposer;
 import com.intellij.psi.PsiFileFactory;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.impl.*;
@@ -96,6 +98,18 @@ public class CoreProjectEnvironment {
     CoreApplicationEnvironment.registerExtensionPoint(Extensions.getArea(myProject), extensionPointName, aClass);
   }
 
+  protected <T> void addProjectExtension(final ExtensionPointName<T> name, final T extension) {
+    final ExtensionPoint<T> extensionPoint = Extensions.getArea(myProject).getExtensionPoint(name);
+    extensionPoint.registerExtension(extension);
+    Disposer.register(myParentDisposable, new Disposable() {
+      @Override
+      public void dispose() {
+        extensionPoint.unregisterExtension(extension);
+      }
+    });
+  }
+
+
   public <T> void registerProjectComponent(final Class<T> interfaceClass, final T implementation) {
     CoreApplicationEnvironment.registerComponentInstance(myProject.getPicoContainer(), interfaceClass, implementation);
   }

plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java

@@ -16,7 +16,6 @@
 package com.intellij.uiDesigner;
 
 import com.intellij.codeInsight.CodeInsightUtil;
-import com.intellij.icons.AllIcons;
 import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;