Replaced overriding getText() with invocation of setText() in SpecifyTypeExplicitlyAction.

This commit is contained in:
Evgeny Gerashchenko
2012-05-03 17:32:21 +04:00
parent 40e8227502
commit e17fa4a7cb
@@ -47,7 +47,6 @@ import java.util.Collections;
*/ */
public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction { public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
private JetType targetType; private JetType targetType;
private boolean isFunction;
private boolean disabledForError; private boolean disabledForError;
@@ -59,17 +58,6 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
this.disabledForError = disabledForError; this.disabledForError = disabledForError;
} }
@NotNull
@Override
public String getText() {
if (isFunction) {
return JetBundle.message("specify.type.explicitly.add.return.type.action.name");
}
else {
return targetType == null ? JetBundle.message("specify.type.explicitly.remove.action.name") : JetBundle.message("specify.type.explicitly.add.action.name");
}
}
@NotNull @NotNull
@Override @Override
public String getFamilyName() { public String getFamilyName() {
@@ -97,15 +85,18 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
@Override @Override
public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) { public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) {
if (element.getParent() instanceof JetProperty && !PsiTreeUtil.isAncestor(((JetProperty) element.getParent()).getInitializer(), element, false)) { if (element.getParent() instanceof JetProperty && !PsiTreeUtil.isAncestor(((JetProperty) element.getParent()).getInitializer(), element, false)) {
isFunction = false;
if (((JetProperty)element.getParent()).getPropertyTypeRef() != null) { if (((JetProperty)element.getParent()).getPropertyTypeRef() != null) {
targetType = null; targetType = null;
setText(JetBundle.message("specify.type.explicitly.remove.action.name"));
return true; return true;
} }
else {
setText(JetBundle.message("specify.type.explicitly.add.action.name"));
}
} }
else if (element.getParent() instanceof JetNamedFunction && ((JetNamedFunction) element.getParent()).getReturnTypeRef() == null else if (element.getParent() instanceof JetNamedFunction && ((JetNamedFunction) element.getParent()).getReturnTypeRef() == null
&& !((JetNamedFunction) element.getParent()).hasBlockBody()) { && !((JetNamedFunction) element.getParent()).hasBlockBody()) {
isFunction = true; setText(JetBundle.message("specify.type.explicitly.add.return.type.action.name"));
} }
else { else {
return false; return false;