MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEADEV-26

Browse Source
This commit is contained in:
Eugene Vigdorchik
2005-03-19 19:02:26 +03:00
parent 90b1294dc7
commit eed994b8a3
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java
+4 -7
View File
@@ -591,13 +591,10 @@ public class ChangeSignatureProcessor extends BaseRefactoringProcessor {
}
private PsiParameter createNewParameter(ParameterInfo newParm,
PsiSubstitutor substitutor,
PsiMethod methodToInsertTo) throws IncorrectOperationException {
PsiSubstitutor substitutor) throws IncorrectOperationException {
final PsiElementFactory factory = PsiManager.getInstance(myProject).getElementFactory();
final PsiParameter newParameter = factory.createParameterFromText("X " + newParm.getName(), methodToInsertTo);
final PsiType type = substitutor.substitute(newParm.createType(myChangeInfo.getMethod().getParameterList()));
newParameter.getTypeElement().replace(factory.createTypeElement(type));
return newParameter;
return factory.createParameter(newParm.getName(), type);
}
protected String getCommandName() {
@@ -891,7 +888,7 @@ public class ChangeSignatureProcessor extends BaseRefactoringProcessor {
final ParameterInfo[] primaryNewParms = myChangeInfo.newParms;
PsiSubstitutor substitutor = baseMethod == null ? PsiSubstitutor.EMPTY : calculateSubstitutor(caller, baseMethod);
for (int i = 0; i < primaryNewParms.length; i++) {
if (primaryNewParms[i].oldParameterIndex < 0) newParameters.add(createNewParameter(primaryNewParms[i], substitutor, caller));
if (primaryNewParms[i].oldParameterIndex < 0) newParameters.add(createNewParameter(primaryNewParms[i], substitutor));
}
PsiParameter[] arrayed = newParameters.toArray(new PsiParameter[newParameters.size()]);
boolean[] toRemoveParm = new boolean[arrayed.length];
@@ -988,7 +985,7 @@ public class ChangeSignatureProcessor extends BaseRefactoringProcessor {
parameter.getTypeElement().replace(factory.createTypeElement(newType));
}
} else {
newParms[i] = createNewParameter(info, substitutor, method);
newParms[i] = createNewParameter(info, substitutor);
}
}