MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-08-25 17:07:05 +07:00
Code Issues Packages Projects Releases Wiki Activity

restore JavaMethodDescriptor.getReturnTypeText() method so it can be overridden by change signature detector

Browse Source
This commit is contained in:
Kirill.Safonov
2010-09-10 16:33:06 +04:00
parent d222c127b7
commit 47489a7f2c
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureDialog.java
+3 -3
View File
@@ -212,9 +212,9 @@ public class JavaChangeSignatureDialog extends ChangeSignatureDialogBase<Paramet
@Override
protected PsiCodeFragment createReturnTypeCodeFragment() {
final PsiTypeElement typeElement = myMethod.getMethod().getReturnTypeElement();
String text = typeElement != null ? typeElement.getText() : "";
return JavaPsiFacade.getInstance(myProject).getElementFactory().createTypeCodeFragment(text, myMethod.getMethod(), true, true);
String returnTypeText = StringUtil.notNullize(myMethod.getReturnTypeText());
return JavaPsiFacade.getInstance(myProject).getElementFactory()
.createTypeCodeFragment(returnTypeText, myMethod.getMethod(), true, true);
}
@Override
java/java-impl/src/com/intellij/refactoring/changeSignature/JavaMethodDescriptor.java
+8
View File
@@ -18,7 +18,9 @@ package com.intellij.refactoring.changeSignature;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiParameter;
import com.intellij.psi.PsiTypeElement;
import com.intellij.util.VisibilityUtil;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
@@ -69,6 +71,12 @@ public class JavaMethodDescriptor implements MethodDescriptor<ParameterInfoImpl>
return myMethod.getParameterList().getParametersCount();
}
@Nullable
public String getReturnTypeText() {
final PsiTypeElement typeElement = myMethod.getReturnTypeElement();
return typeElement != null ? typeElement.getText() : null;
}
@Override
public boolean canChangeVisibility() {
PsiClass containingClass = myMethod.getContainingClass();