From 3cd487809a1c2ce2726cb8a7889a42a68f2fa72e Mon Sep 17 00:00:00 2001 From: anna Date: Thu, 24 Mar 2011 12:28:15 +0100 Subject: [PATCH] setup visibility before starting template --- .../introduceField/InplaceIntroduceConstantPopup.java | 4 ++++ .../introduceField/InplaceIntroduceFieldPopup.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java index 987c40445702..dfa6615c6b6e 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java @@ -220,6 +220,10 @@ public class InplaceIntroduceConstantPopup { PsiField field = elementFactory.createFieldFromText(psiType.getCanonicalText() + " " + (myConstantName != null ? myConstantName : names[0]) + " = " + myExprText + ";", myParentClass); PsiUtil.setModifierProperty(field, PsiModifier.FINAL, true); PsiUtil.setModifierProperty(field, PsiModifier.STATIC, true); + final String visibility = myVisibilityPanel.getVisibility(); + if (visibility != null) { + PsiUtil.setModifierProperty(field, visibility, true); + } field = BaseExpressionToFieldHandler.ConvertToFieldRunnable.appendField(myExpr, myParentClass, myParentClass, myAnchorElementIfAll, field); return field; } diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java index c5bb407d8646..7e2f140c9820 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java @@ -197,6 +197,10 @@ public class InplaceIntroduceFieldPopup { PsiField field = elementFactory.createField(myFieldName != null ? myFieldName : names[0], defaultType); field = (PsiField)myParentClass.add(field); PsiUtil.setModifierProperty(field, PsiModifier.FINAL, myIntroduceFieldPanel.isDeclareFinal()); + final String visibility = myIntroduceFieldPanel.getFieldVisibility(); + if (visibility != null) { + PsiUtil.setModifierProperty(field, visibility, true); + } return field; } });