diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnTypeFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnTypeFix.java index 5566d086d1fc..dce08333618c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnTypeFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnTypeFix.java @@ -349,7 +349,7 @@ public class MethodReturnTypeFix extends LocalQuickFixAndIntentionActionOnPsiEle new PsiType[]{returnType}, PsiUtil.getLanguageLevel(superClass)); - final TypeMigrationRules rules = new TypeMigrationRules(TypeMigrationLabeler.getElementType(derivedClass)); + final TypeMigrationRules rules = new TypeMigrationRules(); final PsiSubstitutor compoundSubstitutor = TypeConversionUtil.getSuperClassSubstitutor(superClass, derivedClass, PsiSubstitutor.EMPTY).putAll(psiSubstitutor); rules.setMigrationRootType(JavaPsiFacade.getElementFactory(project).createType(baseClass, compoundSubstitutor)); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFromCallFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFromCallFix.java index 06ce5718c2a4..46784f980f5c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFromCallFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFromCallFix.java @@ -71,7 +71,7 @@ public class VariableTypeFromCallFix implements IntentionAction { @Override public void invoke(@NotNull final Project project, final Editor editor, PsiFile file) throws IncorrectOperationException { - final TypeMigrationRules rules = new TypeMigrationRules(TypeMigrationLabeler.getElementType(myVar)); + final TypeMigrationRules rules = new TypeMigrationRules(); rules.setMigrationRootType(myExpressionType); rules.setBoundScope(PsiSearchHelper.SERVICE.getInstance(project).getUseScope(myVar)); diff --git a/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractEnumProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractEnumProcessor.java index 3d75c880378e..5da87125af6d 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractEnumProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractEnumProcessor.java @@ -144,7 +144,7 @@ public class ExtractEnumProcessor { } } - final TypeMigrationRules rules = new TypeMigrationRules(myEnumConstants.get(0).getType()); + final TypeMigrationRules rules = new TypeMigrationRules(); rules.addConversionDescriptor(new EnumTypeConversionRule(myEnumConstants)); rules.setMigrationRootType( JavaPsiFacade.getElementFactory(myProject).createType(myClass)); diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationRules.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationRules.java index 64dd726d62a6..fb8b526611e9 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationRules.java +++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationRules.java @@ -36,12 +36,10 @@ import java.util.LinkedList; public class TypeMigrationRules { private final LinkedList myConversionRules = new LinkedList(); - private final PsiType myRootType; private PsiType myMigrationRootType; private SearchScope mySearchScope; - public TypeMigrationRules(final PsiType root) { - myRootType = root; + public TypeMigrationRules() { myConversionRules.add(new RootTypeConversionRule()); myConversionRules.add(new DisjunctionTypeConversionRule()); ContainerUtil.addAll(myConversionRules, Extensions.getExtensions(TypeConversionRule.EP_NAME)); @@ -51,10 +49,6 @@ public class TypeMigrationRules { myMigrationRootType = migrationRootType; } - public PsiType getRootType() { - return myRootType; - } - public PsiType getMigrationRootType() { return myMigrationRootType; } diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/TypeMigrationDialog.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/TypeMigrationDialog.java index 21145be3859f..e3f246d40873 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/TypeMigrationDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/TypeMigrationDialog.java @@ -208,7 +208,7 @@ public class TypeMigrationDialog extends RefactoringDialog { } if (myRules == null) { - myRules = new TypeMigrationRules(rootType); + myRules = new TypeMigrationRules(); myRules.setMigrationRootType(migrationType); myRules.setBoundScope(myScopeChooserCombo.getSelectedScope()); } diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationVariableTypeFixProvider.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationVariableTypeFixProvider.java index 3dab4314a0c9..00cf2a5f9157 100644 --- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationVariableTypeFixProvider.java +++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationVariableTypeFixProvider.java @@ -71,7 +71,7 @@ public class TypeMigrationVariableTypeFixProvider implements ChangeVariableTypeQ if (!FileModificationService.getInstance().prepareFileForWrite(variable.getContainingFile())) return; try { variable.normalizeDeclaration(); - final TypeMigrationRules rules = new TypeMigrationRules(TypeMigrationLabeler.getElementType(variable)); + final TypeMigrationRules rules = new TypeMigrationRules(); rules.setMigrationRootType(targetType); rules.setBoundScope(GlobalSearchScope.projectScope(project)); TypeMigrationProcessor.runHighlightingTypeMigration(project, editor, rules, variable, optimizeImports); diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/GuavaInspection.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/GuavaInspection.java index fdbcb3a05b1a..f340463203cc 100644 --- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/GuavaInspection.java +++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/GuavaInspection.java @@ -272,7 +272,7 @@ public class GuavaInspection extends BaseJavaLocalInspectionTool { try { final PsiMethodCallExpression expr = (PsiMethodCallExpression)startElement; final boolean isIterableAssignment = isIterable(expr); - final TypeMigrationRules rules = new TypeMigrationRules(myInitialType); + final TypeMigrationRules rules = new TypeMigrationRules(); rules.setMigrationRootType(myTargetType); rules.setBoundScope(GlobalSearchScope.fileScope(file)); final TypeConversionDescriptorBase conversion = @@ -364,7 +364,7 @@ public class GuavaInspection extends BaseJavaLocalInspectionTool { if (!FileModificationService.getInstance().prepareFileForWrite(file)) return; try { PsiMethod method = (PsiMethod)getStartElement(); - final TypeMigrationRules rules = new TypeMigrationRules(TypeMigrationLabeler.getElementType(method)); + final TypeMigrationRules rules = new TypeMigrationRules(); rules.setMigrationRootType(myTargetType); rules.setBoundScope(method.getUseScope()); TypeMigrationProcessor.runHighlightingTypeMigration(project, editor, rules, method, true); diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ChangeClassParametersIntention.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ChangeClassParametersIntention.java index 773586aedbe8..f2cb6c207971 100644 --- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ChangeClassParametersIntention.java +++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ChangeClassParametersIntention.java @@ -115,7 +115,7 @@ public class ChangeClassParametersIntention extends PsiElementBaseIntentionActio classType.getPresentableText())); return; } - final TypeMigrationRules myRules = new TypeMigrationRules(((PsiAnonymousClass)aClass).getBaseClassType()); + final TypeMigrationRules myRules = new TypeMigrationRules(); final PsiSubstitutor substitutor = result.getSubstitutor().put(typeParameter, targetParam); final PsiType targetClassType = elementFactory.createType(baseClass, substitutor); myRules.setMigrationRootType(targetClassType); diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToThreadLocalIntention.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToThreadLocalIntention.java index 05c4afc2548f..4a2cbaf6f1c9 100644 --- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToThreadLocalIntention.java +++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToThreadLocalIntention.java @@ -98,7 +98,7 @@ public class ConvertFieldToThreadLocalIntention extends PsiElementBaseIntentionA final PsiClassType toType = factory.createType(threadLocalClass, factory.createSubstitutor(substitutor)); try { - final TypeMigrationRules rules = new TypeMigrationRules(fromType); + final TypeMigrationRules rules = new TypeMigrationRules(); rules.setMigrationRootType(toType); rules.setBoundScope(GlobalSearchScope.fileScope(element.getContainingFile())); final TypeMigrationLabeler labeler = new TypeMigrationLabeler(rules); diff --git a/java/typeMigration/test/com/intellij/refactoring/ChangeTypeSignatureTest.java b/java/typeMigration/test/com/intellij/refactoring/ChangeTypeSignatureTest.java index 8feae694f7b6..45ef784fa097 100644 --- a/java/typeMigration/test/com/intellij/refactoring/ChangeTypeSignatureTest.java +++ b/java/typeMigration/test/com/intellij/refactoring/ChangeTypeSignatureTest.java @@ -35,7 +35,7 @@ public class ChangeTypeSignatureTest extends LightCodeInsightTestCase { PsiType migrationType = getJavaFacade().getElementFactory().createTypeFromText(migrationTypeText, null); try { - final TypeMigrationRules rules = new TypeMigrationRules(TypeMigrationLabeler.getElementType(parameterList)); + final TypeMigrationRules rules = new TypeMigrationRules(); rules.setMigrationRootType(PsiSubstitutor.EMPTY.put(superClass.getTypeParameters()[0], migrationType).substitute(new PsiImmediateClassType(superClass, PsiSubstitutor.EMPTY))); rules.setBoundScope(GlobalSearchScope.projectScope(getProject())); new TypeMigrationProcessor(getProject(), parameterList, rules).run(); diff --git a/java/typeMigration/test/com/intellij/refactoring/MigrateTypeSignatureTest.java b/java/typeMigration/test/com/intellij/refactoring/MigrateTypeSignatureTest.java index d6c80293f9c0..0e35993f4688 100644 --- a/java/typeMigration/test/com/intellij/refactoring/MigrateTypeSignatureTest.java +++ b/java/typeMigration/test/com/intellij/refactoring/MigrateTypeSignatureTest.java @@ -580,7 +580,7 @@ public class MigrateTypeSignatureTest extends TypeMigrationTestBase { final RulesProvider provider = new RulesProvider() { @Override public TypeMigrationRules provide() throws Exception { - final TypeMigrationRules rules = new TypeMigrationRules(fromType); + final TypeMigrationRules rules = new TypeMigrationRules(); rules.setMigrationRootType(toType); return rules; } diff --git a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java index 7e834323a992..c738822114c5 100644 --- a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java +++ b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java @@ -805,7 +805,7 @@ public class TypeMigrationTest extends TypeMigrationTestBase { start(new RulesProvider() { @Override public TypeMigrationRules provide() { - final TypeMigrationRules rules = new TypeMigrationRules(rootType); + final TypeMigrationRules rules = new TypeMigrationRules(); rules.setMigrationRootType(migrationType); return rules; } @@ -918,7 +918,7 @@ public class TypeMigrationTest extends TypeMigrationTestBase { start(new RulesProvider() { @Override public TypeMigrationRules provide() { - final TypeMigrationRules rules = new TypeMigrationRules(rootType); + final TypeMigrationRules rules = new TypeMigrationRules(); rules.setMigrationRootType(migrationType); return rules; } diff --git a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java index b3fac706ff84..416562fb7e66 100644 --- a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java +++ b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java @@ -59,7 +59,7 @@ public abstract class TypeMigrationTestBase extends MultiFileTestCase { final RulesProvider provider = new RulesProvider() { @Override public TypeMigrationRules provide() throws Exception { - final TypeMigrationRules rules = new TypeMigrationRules(fromType); + final TypeMigrationRules rules = new TypeMigrationRules(); rules.setMigrationRootType(toType); return rules; } @@ -88,7 +88,7 @@ public abstract class TypeMigrationTestBase extends MultiFileTestCase { final RulesProvider provider = new RulesProvider() { @Override public TypeMigrationRules provide() throws Exception { - final TypeMigrationRules rules = new TypeMigrationRules(rootType); + final TypeMigrationRules rules = new TypeMigrationRules(); rules.setMigrationRootType(migrationType); return rules; } @@ -112,7 +112,7 @@ public abstract class TypeMigrationTestBase extends MultiFileTestCase { final RulesProvider provider = new RulesProvider() { @Override public TypeMigrationRules provide() throws Exception { - final TypeMigrationRules rules = new TypeMigrationRules(rootType); + final TypeMigrationRules rules = new TypeMigrationRules(); rules.setMigrationRootType(migrationType); return rules; } @@ -134,7 +134,7 @@ public abstract class TypeMigrationTestBase extends MultiFileTestCase { final RulesProvider provider = new RulesProvider() { @Override public TypeMigrationRules provide() throws Exception { - final TypeMigrationRules rules = new TypeMigrationRules(rootType); + final TypeMigrationRules rules = new TypeMigrationRules(); rules.setMigrationRootType(migrationType); return rules; }