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

fix implementing methods if invoked on class name

Browse Source
This commit is contained in:
Maxim.Medvedev
2012-03-15 12:51:42 +04:00
parent 24482db847
commit b9820ecfb8
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java
+10 -9
View File
@@ -651,28 +651,29 @@ public class OverrideImplementUtil {
Collection<PsiMethodMember> candidates,
boolean copyJavadoc,
boolean insertOverrideWherePossible) {
try{
try {
int offset = editor.getCaretModel().getOffset();
if (aClass.getLBrace() == null) {
PsiClass psiClass = JavaPsiFacade.getInstance(aClass.getProject()).getElementFactory().createClass("X");
aClass.addRangeAfter(psiClass.getLBrace(), psiClass.getRBrace(), aClass.getLastChild());
}
int lbraceOffset = aClass.getLBrace().getTextOffset();
List<PsiGenerationInfo<PsiMethod>> resultMembers;
if (offset <= lbraceOffset || aClass.isEnum()) {
resultMembers = new ArrayList<PsiGenerationInfo<PsiMethod>>();
for (PsiMethodMember candidate : candidates) {
Collection<PsiMethod> prototypes = overrideOrImplementMethod(aClass, candidate.getElement(), candidate.getSubstitutor(),
copyJavadoc, insertOverrideWherePossible);
for (PsiMethod prototype : prototypes) {
Collection<PsiMethod> prototypes =
overrideOrImplementMethod(aClass, candidate.getElement(), candidate.getSubstitutor(), copyJavadoc, insertOverrideWherePossible);
List<PsiGenerationInfo<PsiMethod>> infos = convert2GenerationInfos(prototypes);
for (PsiGenerationInfo<PsiMethod> info : infos) {
PsiElement anchor = getDefaultAnchorToOverrideOrImplement(aClass, candidate.getElement(), candidate.getSubstitutor());
PsiElement result = GenerateMembersUtil.insert(aClass, prototype, anchor, true);
resultMembers.add(createGenerationInfo((PsiMethod)result));
info.insert(aClass, anchor, true);
resultMembers.add(info);
}
}
}
else{
else {
List<PsiGenerationInfo<PsiMethod>> prototypes = overrideOrImplementMethods(aClass, candidates, copyJavadoc, insertOverrideWherePossible);
resultMembers = GenerateMembersUtil.insertMembersAtOffset(aClass.getContainingFile(), offset, prototypes);
}
@@ -681,7 +682,7 @@ public class OverrideImplementUtil {
resultMembers.get(0).positionCaret(editor, true);
}
}
catch(IncorrectOperationException e){
catch (IncorrectOperationException e) {
LOG.error(e);
}
}