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

NPE [spleaner]

Browse Source 
(cherry picked from commit 208497260296552be3c919b495ed17b281b785eb)
This commit is contained in:
Roman Shevchenko
2011-05-10 22:16:51 +04:00
parent 64a7c47f0d
commit 016eae4ce8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java
+1 -1
View File
@@ -344,7 +344,7 @@ public class InplaceIntroduceFieldPopup {
@Override
protected void moveOffsetAfter(boolean success) {
if (success) {
if (myLocalVariable == null && myInitializerExpression == null) {
if (myLocalVariable == null && myInitializerExpression == null || myFieldName == null) {
super.moveOffsetAfter(false);
return;
}
java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
+5 -5
View File
@@ -263,12 +263,12 @@ class InplaceIntroduceParameterPopup extends IntroduceParameterSettingsUI {
protected JComponent getComponent() {
if (!myInitialized) {
myInitialized = true;
myWholePanel.add(myCanBeFinal,
myWholePanel.add(myCanBeFinalCb,
new GridBagConstraints(0, myCbReplaceAllOccurences == null ? 2 : 3, 1, 1, 0, 0, GridBagConstraints.NORTHWEST,
GridBagConstraints.NONE, new Insets(0, 5, 2, 5), 0, 0));
if (myHasWriteAccess) {
myCanBeFinal.setSelected(false);
myCanBeFinal.setEnabled(false);
myCanBeFinalCb.setSelected(false);
myCanBeFinalCb.setEnabled(false);
}
}
return myWholePanel;
@@ -304,7 +304,7 @@ class InplaceIntroduceParameterPopup extends IntroduceParameterSettingsUI {
protected void saveSettings(PsiVariable psiVariable) {
final JavaRefactoringSettings settings = JavaRefactoringSettings.getInstance();
InplaceIntroduceParameterPopup.super.saveSettings(settings);
if (myCanBeFinal.isEnabled()) {
if (myCanBeFinalCb.isEnabled()) {
settings.INTRODUCE_PARAMETER_CREATE_FINALS = psiVariable.hasModifierProperty(PsiModifier.FINAL);
}
TypeSelectorManagerImpl.typeSelected(psiVariable.getType(), myDefaultParameterTypePointer.getType());
@@ -323,7 +323,7 @@ class InplaceIntroduceParameterPopup extends IntroduceParameterSettingsUI {
isDeleteLocalVariable = isDeleteLocalVariable();
}
if (!myMethod.isValid() || myLocalVar == null && myExpr == null) {
if (!myMethod.isValid() || myParameterName == null || myLocalVar == null && myExpr == null) {
super.moveOffsetAfter(false);
return;
}