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

ea-26321

Browse Source
This commit is contained in:
Alexey Kudravtsev
2011-03-25 11:09:56 +03:00
parent af572b3a95
commit 97a99dbbc6
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java
+4 -1
View File
@@ -139,7 +139,10 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
// do not introduce assignment in chanined constructor
if (HighlightControlFlowUtil.getChainedConstructors(constructor) == null) {
AssignFieldFromParameterAction.addFieldAssignmentStatement(project, getField(), parameter, editor);
PsiField field = getField();
if (field != null) {
AssignFieldFromParameterAction.addFieldAssignmentStatement(project, field, parameter, editor);
}
}
return true;
}
java/java-impl/src/com/intellij/codeInsight/intention/impl/AssignFieldFromParameterAction.java
+4 -4
View File
@@ -87,10 +87,10 @@ public class AssignFieldFromParameterAction extends BaseIntentionAction {
}
}
public static void addFieldAssignmentStatement(final Project project,
final PsiField field,
final PsiParameter parameter,
final Editor editor) throws IncorrectOperationException {
public static void addFieldAssignmentStatement(@NotNull Project project,
@NotNull PsiField field,
@NotNull PsiParameter parameter,
@NotNull Editor editor) throws IncorrectOperationException {
final PsiMethod method = (PsiMethod)parameter.getDeclarationScope();
PsiCodeBlock methodBody = method.getBody();
if (methodBody == null) return;