type migration: make part of platform

.idea/modules.xml

@@ -185,7 +185,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/testng/testng.iml" filepath="$PROJECT_DIR$/plugins/testng/testng.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/testng_rt/testng_rt.iml" filepath="$PROJECT_DIR$/plugins/testng_rt/testng_rt.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/platform/testFramework/bootstrap/tests_bootstrap.iml" filepath="$PROJECT_DIR$/platform/testFramework/bootstrap/tests_bootstrap.iml" group="platform" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/typeMigration/typeMigration.iml" filepath="$PROJECT_DIR$/plugins/typeMigration/typeMigration.iml" />
+      <module fileurl="file://$PROJECT_DIR$/java/typeMigration/typeMigration.iml" filepath="$PROJECT_DIR$/java/typeMigration/typeMigration.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/ui-designer/ui-designer.iml" filepath="$PROJECT_DIR$/plugins/ui-designer/ui-designer.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/ui-designer-core/ui-designer-core.iml" filepath="$PROJECT_DIR$/plugins/ui-designer-core/ui-designer-core.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/ui-designer/jps-plugin/ui-designer-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/ui-designer/jps-plugin/ui-designer-jps-plugin.iml" group="plugins" />

build/scripts/layouts.gant

@@ -82,6 +82,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
     "remote-servers-java-impl",
     "testFramework",
     "tests_bootstrap",
+    "typeMigration",
     "ui-designer-core",
     "structuralsearch-java"
   ].flatten()
@@ -257,7 +258,7 @@ public def layoutCommunityPlugins(String home) {
   }
 
   dir("plugins") {
-    def simplePlugins = ["commander", "copyright", "java-i18n", "hg4idea", "github", "typeMigration"] //, "tasks-time-tracking"]
+    def simplePlugins = ["commander", "copyright", "java-i18n", "hg4idea", "github"] //, "tasks-time-tracking"]
 
     simplePlugins.each {
       layoutPlugin it

java/typeMigration/src/META-INF/TypeMigration.xml

@@ -1,20 +1,5 @@
 <idea-plugin>
-  <name>Type Migration</name>
-  <description>
-      <![CDATA[
-      This plugin adds the type migration refactoring.
-      The following features are available:
-      <ul>
-      <li>Dedicated Refactoring Dialog. (Refactor | Type Migration)</li>
-      <li>Ability to review type migration results. (Refactor | Migration | Preview)</li>
-      <li>Ability to automatically change a member type or data flow dependent type entries.</li>
-      <li>Ability to convert variable or method return type between arrays and collections.</li>
-      </ul>
-      ]]>
-  </description>
-  <vendor>JetBrains</vendor>
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <codeInsight.changeVariableTypeQuickFixProvider
         implementation="com.intellij.refactoring.typeMigration.TypeMigrationVariableTypeFixProvider"/>
     <conversion.rule implementation="com.intellij.refactoring.typeMigration.rules.ListArrayConversionRule"/>

java/typeMigration/test/com/intellij/codeInsight/ConvertToAtomicIntentionTest.java

@@ -1,7 +1,7 @@
 package com.intellij.codeInsight;
 
 import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
-import com.intellij.openapi.application.PluginPathManager;
+import com.intellij.testFramework.PlatformTestUtil;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -21,7 +21,7 @@ public class ConvertToAtomicIntentionTest extends LightQuickFixParameterizedTest
   @NotNull
   @Override
   protected String getTestDataPath() {
-    return PluginPathManager.getPluginHomePath("typeMigration") + "/testData";
+    return PlatformTestUtil.getCommunityPath() + "/java/typeMigration/testData";
   }
 
   public void test() throws Exception {

java/typeMigration/test/com/intellij/codeInsight/ConvertToThreadLocalIntentionTest.java

@@ -1,7 +1,7 @@
 package com.intellij.codeInsight;
 
 import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
-import com.intellij.openapi.application.PluginPathManager;
+import com.intellij.testFramework.PlatformTestUtil;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -21,7 +21,7 @@ public class ConvertToThreadLocalIntentionTest extends LightQuickFixParameterize
   @NotNull
   @Override
   protected String getTestDataPath() {
-    return PluginPathManager.getPluginHomePath("typeMigration") + "/testData";
+    return PlatformTestUtil.getCommunityPath() + "/java/typeMigration/testData";
   }
 
   public void test() throws Exception {

java/typeMigration/test/com/intellij/refactoring/ChangeTypeSignatureTest.java

@@ -4,7 +4,6 @@
  */
 package com.intellij.refactoring;
 
-import com.intellij.openapi.application.PluginPathManager;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.source.PsiImmediateClassType;
 import com.intellij.psi.search.GlobalSearchScope;
@@ -13,13 +12,14 @@ import com.intellij.refactoring.typeMigration.TypeMigrationLabeler;
 import com.intellij.refactoring.typeMigration.TypeMigrationProcessor;
 import com.intellij.refactoring.typeMigration.TypeMigrationRules;
 import com.intellij.testFramework.LightCodeInsightTestCase;
+import com.intellij.testFramework.PlatformTestUtil;
 import org.jetbrains.annotations.NotNull;
 
 public class ChangeTypeSignatureTest extends LightCodeInsightTestCase {
   @NotNull
   @Override
   protected String getTestDataPath() {
-    return PluginPathManager.getPluginHomePath("typeMigration") + "/testData";
+    return PlatformTestUtil.getCommunityPath() + "/java/typeMigration/testData";
   }
 
   private void doTest(boolean success, String migrationTypeText) throws Exception {

java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java

@@ -1,6 +1,5 @@
 package com.intellij.refactoring;
 
-import com.intellij.openapi.application.PluginPathManager;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.project.Project;
@@ -15,6 +14,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.LocalSearchScope;
 import com.intellij.refactoring.typeMigration.TypeMigrationProcessor;
 import com.intellij.refactoring.typeMigration.TypeMigrationRules;
+import com.intellij.testFramework.PlatformTestUtil;
 import com.intellij.usageView.UsageInfo;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -30,7 +30,7 @@ import java.io.PrintWriter;
 public abstract class TypeMigrationTestBase extends MultiFileTestCase {
   @Override
   protected String getTestDataPath() {
-    return PluginPathManager.getPluginHomePath("typeMigration") + "/testData";
+    return PlatformTestUtil.getCommunityPath() + "/java/typeMigration/testData";
   }
 
   protected void doTestFieldType(@NonNls String fieldName, PsiType fromType, PsiType toType) {