pull up as abstract by default: remove javadoc comments influence

This commit is contained in:
Anna Kozlova
2014-12-05 19:21:42 +01:00
parent f7316391ce
commit ed02e2eed8
@@ -151,11 +151,12 @@ public class PullUpDialog extends PullUpDialogBase<MemberInfoStorage, MemberInfo
boolean hasJavadoc = false;
for (MemberInfo info : myMemberInfos) {
final PsiMember member = info.getMember();
if (myMemberInfoModel.isAbstractEnabled(info) && member instanceof PsiDocCommentOwner) {
if (myMemberInfoModel.isAbstractEnabled(info)) {
info.setToAbstract(myMemberInfoModel.isAbstractWhenDisabled(info));
if (((PsiDocCommentOwner)member).getDocComment() != null) {
if (!hasJavadoc &&
member instanceof PsiDocCommentOwner &&
((PsiDocCommentOwner)member).getDocComment() != null) {
hasJavadoc = true;
break;
}
}
}