diff options
Diffstat (limited to 'java/java-impl/src')
20 files changed, 804 insertions, 545 deletions
diff --git a/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java b/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java index c3f9778677cc..fda11fd67b11 100644 --- a/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java +++ b/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java @@ -395,12 +395,11 @@ public class ExternalAnnotationsManagerImpl extends ReadableExternalAnnotationsM continue; } final String externalName = getExternalName(listOwner, false); - final String oldExternalName = getNormalizedExternalName(listOwner); final List<XmlTag> tagsToProcess = new ArrayList<XmlTag>(); for (XmlTag tag : rootTag.getSubTags()) { String className = StringUtil.unescapeXml(tag.getAttributeValue("name")); - if (!Comparing.strEqual(className, externalName) && !Comparing.strEqual(className, oldExternalName)) { + if (!Comparing.strEqual(className, externalName)) { continue; } for (XmlTag annotationTag : tag.getSubTags()) { diff --git a/java/java-impl/src/com/intellij/codeInsight/TargetElementUtil.java b/java/java-impl/src/com/intellij/codeInsight/TargetElementUtil.java index 8e9b0b2ae484..f1ce89e76de1 100644 --- a/java/java-impl/src/com/intellij/codeInsight/TargetElementUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/TargetElementUtil.java @@ -307,7 +307,7 @@ public class TargetElementUtil extends TargetElementUtilBase { if (referenceExpression != null && element instanceof PsiMethod) { final PsiClass[] memberClass = getMemberClass(referenceExpression, element); if (memberClass != null && memberClass.length == 1) { - return CachedValuesManager.getManager(element.getProject()).getCachedValue(referenceExpression, new CachedValueProvider<SearchScope>() { + return CachedValuesManager.getCachedValue(referenceExpression, new CachedValueProvider<SearchScope>() { @Nullable @Override public Result<SearchScope> compute() { diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java index 26b9fdb52086..151619aac383 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java @@ -35,6 +35,7 @@ import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.text.StringUtil; import com.intellij.patterns.ElementPattern; import com.intellij.patterns.PatternCondition; +import com.intellij.patterns.PsiJavaElementPattern; import com.intellij.patterns.PsiNameValuePairPattern; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; @@ -78,6 +79,8 @@ public class JavaCompletionContributor extends CompletionContributor { public static final ElementPattern<PsiElement> ANNOTATION_NAME = psiElement(). withParents(PsiJavaCodeReferenceElement.class, PsiAnnotation.class).afterLeaf("@"); + private static final PsiJavaElementPattern.Capture<PsiElement> UNEXPECTED_REFERENCE_AFTER_DOT = + psiElement().afterLeaf(".").insideStarting(psiExpressionStatement()); private static JavaCompletionData getCompletionData(LanguageLevel level) { final Set<Map.Entry<LanguageLevel, JavaCompletionData>> entries = ourCompletionData.entrySet(); @@ -203,7 +206,7 @@ public class JavaCompletionContributor extends CompletionContributor { return; } - if (AFTER_NUMBER_LITERAL.accepts(position)) { + if (AFTER_NUMBER_LITERAL.accepts(position) || UNEXPECTED_REFERENCE_AFTER_DOT.accepts(position)) { _result.stopHere(); return; } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java index d995a9e3d475..fc0baa591c30 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java @@ -15,6 +15,7 @@ */ package com.intellij.codeInsight.completion; +import com.intellij.codeInsight.TailType; import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler; import com.intellij.codeInsight.lookup.*; import com.intellij.codeInsight.template.impl.TemplateManagerImpl; @@ -121,10 +122,10 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor { addLookupItems(set, suggestedNameInfo, matcher, project, suggestedNames); if (!hasStartMatches(set, matcher)) { if (type.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) && matcher.prefixMatches("object")) { - set.add(LookupElementBuilder.create("object")); + set.add(withInsertHandler(suggestedNameInfo, LookupElementBuilder.create("object"))); } if (type.equalsToText(CommonClassNames.JAVA_LANG_STRING) && matcher.prefixMatches("string")) { - set.add(LookupElementBuilder.create("string")); + set.add(withInsertHandler(suggestedNameInfo, LookupElementBuilder.create("string"))); } } @@ -422,14 +423,23 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor { LookupElement element = PrioritizedLookupElement.withPriority(LookupElementBuilder.create(name).withAutoCompletionPolicy(AutoCompletionPolicy.GIVE_CHANCE_TO_OVERWRITE), -i); if (callback != null) { - element = LookupElementDecorator.withInsertHandler(element, new InsertHandler<LookupElementDecorator<LookupElement>>() { - @Override - public void handleInsert(InsertionContext context, LookupElementDecorator<LookupElement> item) { - callback.nameChosen(item.getLookupString()); - } - }); + element = withInsertHandler(callback, element); } lookupElements.add(element); } } + + private static LookupElementDecorator<LookupElement> withInsertHandler(final SuggestedNameInfo callback, LookupElement element) { + return LookupElementDecorator.withInsertHandler(element, new InsertHandler<LookupElementDecorator<LookupElement>>() { + @Override + public void handleInsert(InsertionContext context, LookupElementDecorator<LookupElement> item) { + TailType tailType = LookupItem.getDefaultTailType(context.getCompletionChar()); + if (tailType != null) { + context.setAddCompletionChar(false); + tailType.processTail(context.getEditor(), context.getTailOffset()); + } + callback.nameChosen(item.getLookupString()); + } + }); + } } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/SameSignatureCallParametersProvider.java b/java/java-impl/src/com/intellij/codeInsight/completion/SameSignatureCallParametersProvider.java index 0cd697b6eb31..d3f0b2e62782 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/SameSignatureCallParametersProvider.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/SameSignatureCallParametersProvider.java @@ -34,9 +34,8 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.ArrayList; -import java.util.List; import java.util.Map; +import java.util.Set; import static com.intellij.patterns.PlatformPatterns.psiElement; @@ -55,7 +54,7 @@ class SameSignatureCallParametersProvider extends CompletionProvider<CompletionP @NotNull CompletionResultSet result) { final PsiCall methodCall = PsiTreeUtil.getParentOfType(parameters.getPosition(), PsiCall.class); assert methodCall != null; - List<Pair<PsiMethod, PsiSubstitutor>> candidates = getCallCandidates(methodCall); + Set<Pair<PsiMethod, PsiSubstitutor>> candidates = getCallCandidates(methodCall); PsiMethod container = PsiTreeUtil.getParentOfType(methodCall, PsiMethod.class); while (container != null) { @@ -93,8 +92,8 @@ class SameSignatureCallParametersProvider extends CompletionProvider<CompletionP return TailTypeDecorator.withTail(element, ExpectedTypesProvider.getFinalCallParameterTailType(call, invoked.getReturnType(), invoked)); } - private static List<Pair<PsiMethod, PsiSubstitutor>> getCallCandidates(PsiCall expression) { - List<Pair<PsiMethod, PsiSubstitutor>> candidates = new ArrayList<Pair<PsiMethod, PsiSubstitutor>>(); + private static Set<Pair<PsiMethod, PsiSubstitutor>> getCallCandidates(PsiCall expression) { + Set<Pair<PsiMethod, PsiSubstitutor>> candidates = ContainerUtil.newLinkedHashSet(); JavaResolveResult[] results; if (expression instanceof PsiMethodCallExpression) { results = ((PsiMethodCallExpression)expression).getMethodExpression().multiResolve(false); @@ -108,7 +107,7 @@ class SameSignatureCallParametersProvider extends CompletionProvider<CompletionP final PsiClass psiClass = ((PsiMethod)element).getContainingClass(); if (psiClass != null) { for (Pair<PsiMethod, PsiSubstitutor> overload : psiClass.findMethodsAndTheirSubstitutorsByName(((PsiMethod)element).getName(), true)) { - candidates.add(overload); + candidates.add(Pair.create(overload.first, candidate.getSubstitutor().putAll(overload.second))); } break; } diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java index 97629fbaff71..446a1f1662af 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java @@ -407,11 +407,11 @@ public class PostHighlightingPass extends TextEditorHighlightingPass { @NotNull PsiIdentifier identifier, @NotNull ProgressIndicator progress, @NotNull GlobalUsageHelper helper) { + if (HighlightUtil.isSerializationImplicitlyUsedField(field)) { + return null; + } if (field.hasModifierProperty(PsiModifier.PRIVATE)) { if (!myRefCountHolder.isReferenced(field) && !isImplicitUsage(field, progress)) { - if (HighlightUtil.isSerializationImplicitlyUsedField(field)) { - return null; - } String message = JavaErrorMessages.message("private.field.is.not.used", identifier.getText()); HighlightInfo highlightInfo = suggestionsToMakeFieldUsed(field, identifier, message); diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java index 228d3f712934..4d53c2c97f9d 100644 --- a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java @@ -69,6 +69,7 @@ public class JavaSmartEnterProcessor extends SmartEnterProcessor { fixers.add(new MissingForeachBodyFixer()); fixers.add(new ParameterListFixer()); fixers.add(new MissingMethodBodyFixer()); + fixers.add(new MissingClassBodyFixer()); fixers.add(new MissingReturnExpressionFixer()); fixers.add(new MissingThrowExpressionFixer()); fixers.add(new ParenthesizedFixer()); diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingClassBodyFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingClassBodyFixer.java new file mode 100644 index 000000000000..1a5876191cb6 --- /dev/null +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingClassBodyFixer.java @@ -0,0 +1,21 @@ +package com.intellij.codeInsight.editorActions.smartEnter; + +import com.intellij.openapi.editor.Editor; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiElement; +import com.intellij.util.IncorrectOperationException; + +/** + * @author peter + */ +public class MissingClassBodyFixer implements Fixer { + @Override + public void apply(Editor editor, JavaSmartEnterProcessor processor, PsiElement psiElement) throws IncorrectOperationException { + if (!(psiElement instanceof PsiClass)) return; + PsiClass psiClass = (PsiClass) psiElement; + + if (psiClass.getLBrace() == null) { + editor.getDocument().insertString(psiClass.getTextRange().getEndOffset(), " {\n}"); + } + } +} diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/ui/GenerateEqualsWizard.java b/java/java-impl/src/com/intellij/codeInsight/generation/ui/GenerateEqualsWizard.java index d76caeda89c4..85e9674fc2bb 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/ui/GenerateEqualsWizard.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/ui/GenerateEqualsWizard.java @@ -32,7 +32,6 @@ import com.intellij.refactoring.util.classMembers.MemberInfo; import com.intellij.ui.NonFocusableCheckBox; import com.intellij.util.containers.HashMap; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.event.ActionEvent; @@ -341,11 +340,5 @@ public class GenerateEqualsWizard extends AbstractGenerateEqualsWizard<PsiClass, public JComponent getComponent() { return myPanel; } - - @Override - @Nullable - public Icon getIcon() { - return null; - } } } diff --git a/java/java-impl/src/com/intellij/codeInspection/dataFlow/EditContractIntention.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/EditContractIntention.java new file mode 100644 index 000000000000..2f856b99f5ea --- /dev/null +++ b/java/java-impl/src/com/intellij/codeInspection/dataFlow/EditContractIntention.java @@ -0,0 +1,123 @@ +/* + * Copyright 2000-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.codeInspection.dataFlow; + +import com.intellij.codeInsight.AnnotationUtil; +import com.intellij.codeInsight.ExternalAnnotationsManager; +import com.intellij.codeInsight.intention.AddAnnotationPsiFix; +import com.intellij.codeInsight.intention.impl.BaseIntentionAction; +import com.intellij.openapi.application.AccessToken; +import com.intellij.openapi.application.WriteAction; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.ui.InputValidatorEx; +import com.intellij.openapi.ui.Messages; +import com.intellij.psi.*; +import com.intellij.psi.codeStyle.CodeStyleSettingsManager; +import com.intellij.psi.util.PsiUtil; +import com.intellij.util.IncorrectOperationException; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.generate.tostring.util.StringUtil; + +/** + * @author peter + */ +public class EditContractIntention extends BaseIntentionAction { + + @NotNull + @Override + public String getFamilyName() { + return "Edit method contract"; + } + + @Nullable + private static PsiMethod getTargetMethod(@NotNull Project project, Editor editor, PsiFile file) { + PsiElement element = file.findElementAt(editor.getCaretModel().getOffset()); + if (element == null) return null; + if (!PsiUtil.isLanguageLevel5OrHigher(element)) return null; + if (!element.getManager().isInProject(element) || CodeStyleSettingsManager.getSettings(project).USE_EXTERNAL_ANNOTATIONS) { + final PsiModifierListOwner owner = AddAnnotationPsiFix.getContainer(element); + if (owner instanceof PsiMethod) { + return (PsiMethod)owner; + } + } + return null; + } + + + @Override + public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) { + final PsiMethod method = getTargetMethod(project, editor, file); + if (method != null) { + boolean hasContract = ControlFlowAnalyzer.findContractAnnotation(method) != null; + setText(hasContract ? "Edit method contract" : "Add method contract"); + return true; + } + return false; + } + + @Override + public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException { + final PsiMethod method = getTargetMethod(project, editor, file); + assert method != null; + PsiAnnotation existingAnno = ControlFlowAnalyzer.findContractAnnotation(method); + String oldContract = existingAnno != null ? AnnotationUtil.getStringAttributeValue(existingAnno, null) : null; + String prompt = + "<html>Please specify the contract text<p>" + + "Example: <code>_, null -> false</code><br>" + + "<small>See intention action description for more details</small></html>"; + String newContract = Messages.showInputDialog(project, prompt, "Edit Method Contract", null, oldContract, new InputValidatorEx() { + @Nullable + @Override + public String getErrorText(String inputString) { + if (StringUtil.isEmpty(inputString)) return null; + + return DataFlowInspectionBase.checkContract(method, inputString); + } + + @Override + public boolean checkInput(String inputString) { + return getErrorText(inputString) == null; + } + + @Override + public boolean canClose(String inputString) { + return checkInput(inputString); + } + }); + if (newContract == null) return; + + AccessToken token = WriteAction.start(); + try { + ExternalAnnotationsManager manager = ExternalAnnotationsManager.getInstance(project); + manager.deannotate(method, ControlFlowAnalyzer.ORG_JETBRAINS_ANNOTATIONS_CONTRACT); + if (StringUtil.isNotEmpty(newContract)) { + PsiAnnotation mockAnno = JavaPsiFacade.getElementFactory(project).createAnnotationFromText("@Foo(\"" + newContract + "\")", null); + manager.annotateExternally(method, ControlFlowAnalyzer.ORG_JETBRAINS_ANNOTATIONS_CONTRACT, file, + mockAnno.getParameterList().getAttributes()); + } + } + finally { + token.finish(); + } + } + + @Override + public boolean startInWriteAction() { + return false; + } +} diff --git a/java/java-impl/src/com/intellij/openapi/roots/LibraryDependencyScopeSuggester.java b/java/java-impl/src/com/intellij/openapi/roots/LibraryDependencyScopeSuggester.java index 1cc0795255d9..66075d9332c3 100644 --- a/java/java-impl/src/com/intellij/openapi/roots/LibraryDependencyScopeSuggester.java +++ b/java/java-impl/src/com/intellij/openapi/roots/LibraryDependencyScopeSuggester.java @@ -28,4 +28,15 @@ public abstract class LibraryDependencyScopeSuggester { @Nullable public abstract DependencyScope getDefaultDependencyScope(@NotNull Library library); + + @NotNull + public static DependencyScope getDefaultScope(@NotNull Library library) { + for (LibraryDependencyScopeSuggester suggester : EP_NAME.getExtensions()) { + DependencyScope scope = suggester.getDefaultDependencyScope(library); + if (scope != null) { + return scope; + } + } + return DependencyScope.COMPILE; + } } diff --git a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDescriptor.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDescriptor.java deleted file mode 100644 index 8f1162e34bc0..000000000000 --- a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDescriptor.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2000-2009 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * User: anna - * Date: 23-Oct-2009 - */ -package com.intellij.refactoring.encapsulateFields; - -import com.intellij.psi.PsiField; -import com.intellij.psi.PsiMethod; -import com.intellij.psi.PsiModifier; -import org.jetbrains.annotations.Nullable; - -public interface EncapsulateFieldsDescriptor { - PsiField[] getSelectedFields(); - - String[] getGetterNames(); - - String[] getSetterNames(); - - @Nullable - PsiMethod[] getGetterPrototypes(); - - @Nullable - PsiMethod[] getSetterPrototypes(); - - boolean isToEncapsulateGet(); - - boolean isToEncapsulateSet(); - - boolean isToUseAccessorsWhenAccessible(); - - @PsiModifier.ModifierConstant - String getFieldsVisibility(); - - @PsiModifier.ModifierConstant - String getAccessorsVisibility(); - - int getJavadocPolicy(); -} diff --git a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java index e8d41e0efa8c..8c4f926900f5 100644 --- a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,15 +15,14 @@ */ package com.intellij.refactoring.encapsulateFields; -import com.intellij.codeInsight.generation.GenerateMembersUtil; import com.intellij.icons.AllIcons; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Iconable; import com.intellij.psi.*; -import com.intellij.psi.util.PropertyUtil; import com.intellij.psi.util.PsiFormatUtil; +import com.intellij.psi.util.PsiFormatUtilBase; import com.intellij.refactoring.HelpID; import com.intellij.refactoring.JavaRefactoringSettings; import com.intellij.refactoring.RefactoringBundle; @@ -32,10 +31,9 @@ import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.refactoring.util.RefactoringMessageUtil; import com.intellij.ui.*; +import com.intellij.ui.table.JBTable; import com.intellij.util.IconUtil; -import com.intellij.util.IncorrectOperationException; import com.intellij.util.ui.EmptyIcon; -import com.intellij.util.ui.Table; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; @@ -50,15 +48,17 @@ import java.awt.event.*; import java.util.Set; public class EncapsulateFieldsDialog extends RefactoringDialog implements EncapsulateFieldsDescriptor { - private static final Logger LOG = Logger.getInstance( - "#com.intellij.refactoring.encapsulateFields.EncapsulateFieldsDialog" - ); + private static final Logger LOG = Logger.getInstance(EncapsulateFieldsDialog.class); + + private static final String REFACTORING_NAME = RefactoringBundle.message("encapsulate.fields.title"); private static final int CHECKED_COLUMN = 0; private static final int FIELD_COLUMN = 1; private static final int GETTER_COLUMN = 2; private static final int SETTER_COLUMN = 3; + private final EncapsulateFieldHelper myHelper; + private final Project myProject; private final PsiClass myClass; @@ -85,7 +85,6 @@ public class EncapsulateFieldsDialog extends RefactoringDialog implements Encaps private final JRadioButton myRbAccessorProtected = new JRadioButton(); private final JRadioButton myRbAccessorPrivate = new JRadioButton(); private final JRadioButton myRbAccessorPackageLocal = new JRadioButton(); - private static final String REFACTORING_NAME = RefactoringBundle.message("encapsulate.fields.title"); private DocCommentPanel myJavadocPolicy; { @@ -100,10 +99,11 @@ public class EncapsulateFieldsDialog extends RefactoringDialog implements Encaps myRbFieldProtected.setFocusable(false); } - public EncapsulateFieldsDialog(Project project, PsiClass aClass, final Set preselectedFields) { + public EncapsulateFieldsDialog(Project project, PsiClass aClass, final Set preselectedFields, EncapsulateFieldHelper helper) { super(project, true); myProject = project; myClass = aClass; + myHelper = helper; String title = REFACTORING_NAME; String qName = myClass.getQualifiedName(); @@ -112,7 +112,7 @@ public class EncapsulateFieldsDialog extends RefactoringDialog implements Encaps } setTitle(title); - myFields = myClass.getFields(); + myFields = myHelper.getApplicableFields(myClass); myFieldNames = new String[myFields.length]; myCheckedMarks = new boolean[myFields.length]; myFinalMarks = new boolean[myFields.length]; @@ -126,69 +126,36 @@ public class EncapsulateFieldsDialog extends RefactoringDialog implements Encaps myFinalMarks[idx] = field.hasModifierProperty(PsiModifier.FINAL); myFieldNames[idx] = PsiFormatUtil.formatVariable(field, - PsiFormatUtil.SHOW_NAME | PsiFormatUtil.SHOW_TYPE | PsiFormatUtil.TYPE_AFTER, + PsiFormatUtilBase.SHOW_NAME | PsiFormatUtilBase.SHOW_TYPE | PsiFormatUtilBase.TYPE_AFTER, PsiSubstitutor.EMPTY ); - myGetterNames[idx] = PropertyUtil.suggestGetterName(myProject, field); - mySetterNames[idx] = PropertyUtil.suggestSetterName(myProject, field); - myGetterPrototypes[idx] = generateMethodPrototype(field, myGetterNames[idx], true); - mySetterPrototypes[idx] = generateMethodPrototype(field, mySetterNames[idx], false); + myGetterNames[idx] = myHelper.suggestGetterName(field); + mySetterNames[idx] = myHelper.suggestSetterName(field); + myGetterPrototypes[idx] = myHelper.generateMethodPrototype(field, myGetterNames[idx], true); + mySetterPrototypes[idx] = myHelper.generateMethodPrototype(field, mySetterNames[idx], false); } init(); } - public PsiField[] getSelectedFields() { - int[] rows = getCheckedRows(); - PsiField[] selectedFields = new PsiField[rows.length]; - for (int idx = 0; idx < rows.length; idx++) { - selectedFields[idx] = myFields[rows[idx]]; - } - return selectedFields; - } - - public String[] getGetterNames() { + public FieldDescriptor[] getSelectedFields() { int[] rows = getCheckedRows(); - String[] selectedGetters = new String[rows.length]; - for (int idx = 0; idx < rows.length; idx++) { - selectedGetters[idx] = myGetterNames[rows[idx]]; - } - return selectedGetters; - } + FieldDescriptor[] descriptors = new FieldDescriptor[rows.length]; - public String[] getSetterNames() { - int[] rows = getCheckedRows(); - String[] selectedSetters = new String[rows.length]; for (int idx = 0; idx < rows.length; idx++) { - selectedSetters[idx] = mySetterNames[rows[idx]]; - } - return selectedSetters; - } - - public PsiMethod[] getGetterPrototypes() { - if (isToEncapsulateGet()) { - int[] rows = getCheckedRows(); - PsiMethod[] selectedGetters = new PsiMethod[rows.length]; - for (int idx = 0; idx < rows.length; idx++) { - selectedGetters[idx] = myGetterPrototypes[rows[idx]]; - } - return selectedGetters; - } else { - return null; - } - } - - public PsiMethod[] getSetterPrototypes() { - if (isToEncapsulateSet()) { - int[] rows = getCheckedRows(); - PsiMethod[] selectedSetters = new PsiMethod[rows.length]; - for (int idx = 0; idx < rows.length; idx++) { - selectedSetters[idx] = mySetterPrototypes[rows[idx]]; - } - return selectedSetters; - } else { - return null; + descriptors[idx] = new FieldDescriptorImpl( + myFields[rows[idx]], + myGetterNames[rows[idx]], + mySetterNames[rows[idx]], + isToEncapsulateGet() + ? myGetterPrototypes[rows[idx]] + : null, + isToEncapsulateSet() + ? mySetterPrototypes[rows[idx]] + : null + ); } + return descriptors; } public boolean isToEncapsulateGet() { @@ -227,12 +194,17 @@ public class EncapsulateFieldsDialog extends RefactoringDialog implements Encaps return myJavadocPolicy.getPolicy(); } + @Override + public PsiClass getTargetClass() { + return myClass; + } + protected String getDimensionServiceKey() { return "#com.intellij.refactoring.encapsulateFields.EncalpsulateFieldsDialog"; } @PsiModifier.ModifierConstant -public String getAccessorsVisibility() { + public String getAccessorsVisibility() { if (myRbAccessorPublic.isSelected()) { return PsiModifier.PUBLIC; } else if (myRbAccessorProtected.isSelected()) { @@ -376,7 +348,7 @@ public String getAccessorsVisibility() { private JComponent createTable() { myTableModel = new MyTableModel(); - myTable = new Table(myTableModel); + myTable = new JBTable(myTableModel); myTable.setSurrendersFocusOnKeystroke(true); MyTableRenderer renderer = new MyTableRenderer(); TableColumnModel columnModel = myTable.getColumnModel(); @@ -508,21 +480,6 @@ public String getAccessorsVisibility() { return getCheckedRows().length > 0; } - private PsiMethod generateMethodPrototype(PsiField field, String methodName, boolean isGetter) { - PsiMethod prototype = isGetter - ? GenerateMembersUtil.generateGetterPrototype(field) - : GenerateMembersUtil.generateSetterPrototype(field); - try { - PsiElementFactory factory = JavaPsiFacade.getInstance(field.getProject()).getElementFactory(); - PsiIdentifier identifier = factory.createIdentifier(methodName); - prototype.getNameIdentifier().replace(identifier); - //prototype.getModifierList().setModifierProperty(getAccessorsVisibility(), true); - return prototype; - } catch (IncorrectOperationException e) { - return null; - } - } - private int[] getCheckedRows() { int count = 0; for (boolean checkedMark : myCheckedMarks) { @@ -611,12 +568,12 @@ public String getAccessorsVisibility() { switch (columnIndex) { case GETTER_COLUMN: myGetterNames[rowIndex] = name; - myGetterPrototypes[rowIndex] = generateMethodPrototype(field, name, true); + myGetterPrototypes[rowIndex] = myHelper.generateMethodPrototype(field, name, true); break; case SETTER_COLUMN: mySetterNames[rowIndex] = name; - mySetterPrototypes[rowIndex] = generateMethodPrototype(field, name, false); + mySetterPrototypes[rowIndex] = myHelper.generateMethodPrototype(field, name, false); break; default: @@ -639,8 +596,8 @@ public String getAccessorsVisibility() { case FIELD_COLUMN: { Icon icon = field.getIcon(Iconable.ICON_FLAG_VISIBILITY); - MyTableRenderer.this.setIcon(icon); - MyTableRenderer.this.setDisabledIcon(icon); + setIcon(icon); + setDisabledIcon(icon); configureColors(isSelected, table, hasFocus, row, column); break; } @@ -670,21 +627,21 @@ public String getAccessorsVisibility() { } } } else { - MyTableRenderer.this.setForeground(JBColor.RED); + setForeground(JBColor.RED); } RowIcon icon = new RowIcon(2); icon.setIcon(methodIcon, 0); icon.setIcon(overrideIcon, 1); - MyTableRenderer.this.setIcon(icon); - MyTableRenderer.this.setDisabledIcon(icon); + setIcon(icon); + setDisabledIcon(icon); break; } default: { - MyTableRenderer.this.setIcon(null); - MyTableRenderer.this.setDisabledIcon(null); + setIcon(null); + setDisabledIcon(null); } } boolean enabled = myCheckedMarks[row]; diff --git a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsHandler.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsHandler.java index 925c63147d85..8e618ed988bb 100644 --- a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -96,7 +96,8 @@ public class EncapsulateFieldsHandler implements RefactoringActionHandler { preselectedFields.add(field); } else { - String message = RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("fields.to.be.refactored.should.belong.to.the.same.class")); + String message = RefactoringBundle.getCannotRefactorMessage( + RefactoringBundle.message("fields.to.be.refactored.should.belong.to.the.same.class")); Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); CommonRefactoringUtil.showErrorHint(project, editor, message, REFACTORING_NAME, HelpID.ENCAPSULATE_FIELDS); return; @@ -108,12 +109,14 @@ public class EncapsulateFieldsHandler implements RefactoringActionHandler { LOG.assertTrue(aClass != null); final PsiField[] fields = aClass.getFields(); if (fields.length == 0) { - CommonRefactoringUtil.showErrorHint(project, PlatformDataKeys.EDITOR.getData(dataContext), "Class has no fields to encapsulate", REFACTORING_NAME, HelpID.ENCAPSULATE_FIELDS); + CommonRefactoringUtil.showErrorHint(project, PlatformDataKeys.EDITOR.getData(dataContext), "Class has no fields to encapsulate", + REFACTORING_NAME, HelpID.ENCAPSULATE_FIELDS); return; } if (aClass.isInterface()) { - String message = RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("encapsulate.fields.refactoring.cannot.be.applied.to.interface")); + String message = RefactoringBundle.getCannotRefactorMessage( + RefactoringBundle.message("encapsulate.fields.refactoring.cannot.be.applied.to.interface")); Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); CommonRefactoringUtil.showErrorHint(project, editor, message, REFACTORING_NAME, HelpID.ENCAPSULATE_FIELDS); return; @@ -121,10 +124,15 @@ public class EncapsulateFieldsHandler implements RefactoringActionHandler { if (!CommonRefactoringUtil.checkReadOnlyStatus(project, aClass)) return; - EncapsulateFieldsDialog dialog = new EncapsulateFieldsDialog( - project, - aClass, - preselectedFields); + EncapsulateFieldsDialog dialog = createDialog(project, aClass, preselectedFields); dialog.show(); } + + protected EncapsulateFieldsDialog createDialog(Project project, PsiClass aClass, HashSet<PsiField> preselectedFields) { + return new EncapsulateFieldsDialog( + project, + aClass, + preselectedFields, + new JavaEncapsulateFieldHelper()); + } }
\ No newline at end of file diff --git a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java index fc87374b6ad3..986f98b5fc39 100644 --- a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java @@ -1,6 +1,6 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,17 +20,11 @@ import com.intellij.lang.findUsages.DescriptiveNameUtil; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Ref; -import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; -import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.javadoc.PsiDocComment; import com.intellij.psi.search.searches.ClassInheritorsSearch; import com.intellij.psi.search.searches.ReferencesSearch; -import com.intellij.psi.tree.IElementType; -import com.intellij.psi.util.InheritanceUtil; -import com.intellij.psi.util.PsiFormatUtil; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; +import com.intellij.psi.util.*; import com.intellij.refactoring.BaseRefactoringProcessor; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.util.CommonRefactoringUtil; @@ -41,12 +35,10 @@ import com.intellij.usageView.UsageInfo; import com.intellij.usageView.UsageViewDescriptor; import com.intellij.usageView.UsageViewUtil; import com.intellij.util.IncorrectOperationException; -import com.intellij.util.VisibilityUtil; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashMap; import com.intellij.util.containers.MultiMap; -import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.util.*; @@ -56,7 +48,7 @@ public class EncapsulateFieldsProcessor extends BaseRefactoringProcessor { private PsiClass myClass; @NotNull private final EncapsulateFieldsDescriptor myDescriptor; - private final PsiField[] myFields; + private final FieldDescriptor[] myFieldDescriptors; private HashMap<String,PsiMethod> myNameToGetter; private HashMap<String,PsiMethod> myNameToSetter; @@ -64,14 +56,26 @@ public class EncapsulateFieldsProcessor extends BaseRefactoringProcessor { public EncapsulateFieldsProcessor(Project project, @NotNull EncapsulateFieldsDescriptor descriptor) { super(project); myDescriptor = descriptor; - myFields = myDescriptor.getSelectedFields(); - myClass = myFields[0].getContainingClass(); + myFieldDescriptors = descriptor.getSelectedFields(); + myClass = descriptor.getTargetClass(); + } + + public static void setNewFieldVisibility(PsiField field, EncapsulateFieldsDescriptor descriptor) { + try { + if (descriptor.getFieldsVisibility() != null) { + field.normalizeDeclaration(); + PsiUtil.setModifierProperty(field, descriptor.getFieldsVisibility(), true); + } + } + catch (IncorrectOperationException e) { + LOG.error(e); + } } @NotNull protected UsageViewDescriptor createUsageViewDescriptor(UsageInfo[] usages) { - PsiField[] fields = new PsiField[myFields.length]; - System.arraycopy(myFields, 0, fields, 0, myFields.length); + FieldDescriptor[] fields = new FieldDescriptor[myFieldDescriptors.length]; + System.arraycopy(myFieldDescriptors, 0, fields, 0, myFieldDescriptors.length); return new EncapsulateFieldsViewDescriptor(fields); } @@ -82,28 +86,27 @@ public class EncapsulateFieldsProcessor extends BaseRefactoringProcessor { protected boolean preprocessUsages(Ref<UsageInfo[]> refUsages) { final MultiMap<PsiElement, String> conflicts = new MultiMap<PsiElement, String>(); - final PsiMethod[] getterPrototypes = myDescriptor.getGetterPrototypes(); - final PsiMethod[] setterPrototypes = myDescriptor.getSetterPrototypes(); - - checkExistingMethods(getterPrototypes, conflicts, true); - checkExistingMethods(setterPrototypes, conflicts, false); + checkExistingMethods(conflicts, true); + checkExistingMethods(conflicts, false); final Collection<PsiClass> classes = ClassInheritorsSearch.search(myClass).findAll(); - for (int i = 0; i < myFields.length; i++) { - final PsiField field = myFields[i]; + for (FieldDescriptor fieldDescriptor : myFieldDescriptors) { final Set<PsiMethod> setters = new HashSet<PsiMethod>(); final Set<PsiMethod> getters = new HashSet<PsiMethod>(); for (PsiClass aClass : classes) { - final PsiMethod getterOverrider = getterPrototypes != null ? aClass.findMethodBySignature(getterPrototypes[i], false) : null; + final PsiMethod getterOverrider = + myDescriptor.isToEncapsulateGet() ? aClass.findMethodBySignature(fieldDescriptor.getGetterPrototype(), false) : null; if (getterOverrider != null) { getters.add(getterOverrider); } - final PsiMethod setterOverrider = setterPrototypes != null ? aClass.findMethodBySignature(setterPrototypes[i], false) : null; + final PsiMethod setterOverrider = + myDescriptor.isToEncapsulateSet() ? aClass.findMethodBySignature(fieldDescriptor.getSetterPrototype(), false) : null; if (setterOverrider != null) { setters.add(setterOverrider); } } if (!getters.isEmpty() || !setters.isEmpty()) { + final PsiField field = fieldDescriptor.getField(); for (PsiReference reference : ReferencesSearch.search(field)) { final PsiElement place = reference.getElement(); LOG.assertTrue(place instanceof PsiReferenceExpression); @@ -132,9 +135,19 @@ public class EncapsulateFieldsProcessor extends BaseRefactoringProcessor { return showConflicts(conflicts, refUsages.get()); } - private void checkExistingMethods(PsiMethod[] prototypes, MultiMap<PsiElement, String> conflicts, boolean isGetter) { - if(prototypes == null) return; - for (PsiMethod prototype : prototypes) { + private void checkExistingMethods(MultiMap<PsiElement, String> conflicts, boolean isGetter) { + if (isGetter) { + if (!myDescriptor.isToEncapsulateGet()) return; + } + else { + if (!myDescriptor.isToEncapsulateSet()) return; + } + + for (FieldDescriptor descriptor : myFieldDescriptors) { + PsiMethod prototype = isGetter + ? descriptor.getGetterPrototype() + : descriptor.getSetterPrototype(); + final PsiType prototypeReturnType = prototype.getReturnType(); PsiMethod existing = myClass.findMethodBySignature(prototype, true); if (existing != null) { @@ -142,8 +155,8 @@ public class EncapsulateFieldsProcessor extends BaseRefactoringProcessor { if (!RefactoringUtil.equivalentTypes(prototypeReturnType, returnType, myClass.getManager())) { final String descr = PsiFormatUtil.formatMethod(existing, PsiSubstitutor.EMPTY, - PsiFormatUtil.SHOW_NAME | PsiFormatUtil.SHOW_PARAMETERS | PsiFormatUtil.SHOW_TYPE, - PsiFormatUtil.SHOW_TYPE + PsiFormatUtilBase.SHOW_NAME | PsiFormatUtilBase.SHOW_PARAMETERS | PsiFormatUtilBase.SHOW_TYPE, + PsiFormatUtilBase.SHOW_TYPE ); String message = isGetter ? RefactoringBundle.message("encapsulate.fields.getter.exists", CommonRefactoringUtil.htmlEmphasize(descr), @@ -181,144 +194,112 @@ public class EncapsulateFieldsProcessor extends BaseRefactoringProcessor { } @NotNull protected UsageInfo[] findUsages() { - boolean findGet = myDescriptor.isToEncapsulateGet(); - boolean findSet = myDescriptor.isToEncapsulateSet(); - PsiModifierList newModifierList = null; - final JavaPsiFacade facade = JavaPsiFacade.getInstance(myProject); - if (!myDescriptor.isToUseAccessorsWhenAccessible()){ - PsiElementFactory factory = facade.getElementFactory(); - try{ - PsiField field = factory.createField("a", PsiType.INT); - setNewFieldVisibility(field); - newModifierList = field.getModifierList(); - } - catch(IncorrectOperationException e){ - LOG.error(e); - } - } - PsiMethod[] getterPrototypes = myDescriptor.getGetterPrototypes(); - PsiMethod[] setterPrototypes = myDescriptor.getSetterPrototypes(); - ArrayList<UsageInfo> array = new ArrayList<UsageInfo>(); - PsiField[] fields = myFields; - for(int i = 0; i < fields.length; i++){ - PsiField field = fields[i]; - for (final PsiReference reference : ReferencesSearch.search(field)) { - if (!(reference instanceof PsiReferenceExpression)) continue; - PsiReferenceExpression ref = (PsiReferenceExpression)reference; - // [Jeka] to avoid recursion in the field's accessors - if (findGet && isUsedInExistingAccessor(getterPrototypes[i], ref)) continue; - if (findSet && isUsedInExistingAccessor(setterPrototypes[i], ref)) continue; - if (!findGet) { - if (!PsiUtil.isAccessedForWriting(ref)) continue; + ArrayList<EncapsulateFieldUsageInfo> array = ContainerUtil.newArrayList(); + for (FieldDescriptor fieldDescriptor : myFieldDescriptors) { + for (final PsiReference reference : ReferencesSearch.search(fieldDescriptor.getField())) { + final PsiElement element = reference.getElement(); + if (element == null) continue; + + final EncapsulateFieldHelper helper = EncapsulateFieldHelper.getHelper(element.getLanguage()); + EncapsulateFieldUsageInfo usageInfo = helper.createUsage(myDescriptor, fieldDescriptor, reference); + if (usageInfo != null) { + array.add(usageInfo); } - if (!findSet || field.hasModifierProperty(PsiModifier.FINAL)) { - if (!PsiUtil.isAccessedForReading(ref)) continue; - } - if (!myDescriptor.isToUseAccessorsWhenAccessible()) { - PsiClass accessObjectClass = null; - PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - accessObjectClass = (PsiClass)PsiUtil.getAccessObjectClass(qualifier).getElement(); - } - if (facade.getResolveHelper() - .isAccessible(field, newModifierList, ref, accessObjectClass, null)) { - continue; - } - } - UsageInfo usageInfo = new MyUsageInfo(ref, i); - array.add(usageInfo); } } - MyUsageInfo[] usageInfos = array.toArray(new MyUsageInfo[array.size()]); + EncapsulateFieldUsageInfo[] usageInfos = array.toArray(new EncapsulateFieldUsageInfo[array.size()]); return UsageViewUtil.removeDuplicatedUsages(usageInfos); } protected void refreshElements(PsiElement[] elements) { - LOG.assertTrue(elements.length == myFields.length); + LOG.assertTrue(elements.length == myFieldDescriptors.length); for (int idx = 0; idx < elements.length; idx++) { PsiElement element = elements[idx]; LOG.assertTrue(element instanceof PsiField); - myFields[idx] = (PsiField)element; + myFieldDescriptors[idx].refreshField((PsiField)element); } - myClass = myFields[0].getContainingClass(); + myClass = myFieldDescriptors[0].getField().getContainingClass(); } protected void performRefactoring(UsageInfo[] usages) { - // change visibility of fields - if (myDescriptor.getFieldsVisibility() != null){ - // "as is" - for (PsiField field : myFields) { - setNewFieldVisibility(field); - } + updateFieldVisibility(); + generateAccessors(); + processUsagesPerFile(usages); + } + + private void updateFieldVisibility() { + if (myDescriptor.getFieldsVisibility() == null) return; + + for (FieldDescriptor descriptor : myFieldDescriptors) { + setNewFieldVisibility(descriptor.getField(), myDescriptor); } + } + private void generateAccessors() { // generate accessors myNameToGetter = new HashMap<String, PsiMethod>(); myNameToSetter = new HashMap<String, PsiMethod>(); - for(int i = 0; i < myFields.length; i++){ + + for (FieldDescriptor fieldDescriptor : myFieldDescriptors) { final DocCommentPolicy<PsiDocComment> commentPolicy = new DocCommentPolicy<PsiDocComment>(myDescriptor.getJavadocPolicy()); - PsiField field = myFields[i]; + + PsiField field = fieldDescriptor.getField(); final PsiDocComment docComment = field.getDocComment(); - if (myDescriptor.isToEncapsulateGet()){ - PsiMethod[] prototypes = myDescriptor.getGetterPrototypes(); - assert prototypes != null; - final PsiMethod getter = addOrChangeAccessor(prototypes[i], myNameToGetter); + if (myDescriptor.isToEncapsulateGet()) { + final PsiMethod prototype = fieldDescriptor.getGetterPrototype(); + assert prototype != null; + final PsiMethod getter = addOrChangeAccessor(prototype, myNameToGetter); if (docComment != null) { final PsiDocComment getterJavadoc = (PsiDocComment)getter.addBefore(docComment, getter.getFirstChild()); commentPolicy.processNewJavaDoc(getterJavadoc); } } - if (myDescriptor.isToEncapsulateSet() && !field.hasModifierProperty(PsiModifier.FINAL)){ - PsiMethod[] prototypes = myDescriptor.getSetterPrototypes(); - assert prototypes != null; - addOrChangeAccessor(prototypes[i], myNameToSetter); + if (myDescriptor.isToEncapsulateSet() && !field.hasModifierProperty(PsiModifier.FINAL)) { + PsiMethod prototype = fieldDescriptor.getSetterPrototype(); + assert prototype != null; + addOrChangeAccessor(prototype, myNameToSetter); } if (docComment != null) { commentPolicy.processOldJavaDoc(docComment); } } + } - Map<PsiFile, List<MyUsageInfo>> usagesInFiles = new HashMap<PsiFile, List<MyUsageInfo>>(); + private void processUsagesPerFile(UsageInfo[] usages) { + Map<PsiFile, List<EncapsulateFieldUsageInfo>> usagesInFiles = new HashMap<PsiFile, List<EncapsulateFieldUsageInfo>>(); for (UsageInfo usage : usages) { PsiElement element = usage.getElement(); if (element == null) continue; final PsiFile file = element.getContainingFile(); - List<MyUsageInfo> usagesInFile = usagesInFiles.get(file); + List<EncapsulateFieldUsageInfo> usagesInFile = usagesInFiles.get(file); if (usagesInFile == null) { - usagesInFile = new ArrayList<MyUsageInfo>(); + usagesInFile = new ArrayList<EncapsulateFieldUsageInfo>(); usagesInFiles.put(file, usagesInFile); } - usagesInFile.add(((MyUsageInfo)usage)); + usagesInFile.add(((EncapsulateFieldUsageInfo)usage)); } - for (List<MyUsageInfo> usageInfos : usagesInFiles.values()) { + for (List<EncapsulateFieldUsageInfo> usageInfos : usagesInFiles.values()) { //this is to avoid elements to become invalid as a result of processUsage - final MyUsageInfo[] infos = usageInfos.toArray(new MyUsageInfo[usageInfos.size()]); + final EncapsulateFieldUsageInfo[] infos = usageInfos.toArray(new EncapsulateFieldUsageInfo[usageInfos.size()]); CommonRefactoringUtil.sortDepthFirstRightLeftOrder(infos); - for (MyUsageInfo info : infos) { - processUsage(info); + for (EncapsulateFieldUsageInfo info : infos) { + EncapsulateFieldHelper helper = EncapsulateFieldHelper.getHelper(info.getElement().getLanguage()); + helper.processUsage(info, + myDescriptor, + myNameToSetter.get(info.getFieldDescriptor().getSetterName()), + myNameToGetter.get(info.getFieldDescriptor().getGetterName()) + ); } } } - private void setNewFieldVisibility(PsiField field) { - try{ - if (myDescriptor.getFieldsVisibility() != null){ - field.normalizeDeclaration(); - PsiUtil.setModifierProperty(field, myDescriptor.getFieldsVisibility(), true); - } - } - catch(IncorrectOperationException e){ - LOG.error(e); - } - } - private PsiMethod addOrChangeAccessor(PsiMethod prototype, HashMap<String,PsiMethod> nameToAncestor) { PsiMethod existing = myClass.findMethodBySignature(prototype, false); PsiMethod result = existing; @@ -338,239 +319,4 @@ public class EncapsulateFieldsProcessor extends BaseRefactoringProcessor { } return null; } - - private boolean isUsedInExistingAccessor(PsiMethod prototype, PsiElement element) { - PsiMethod existingAccessor = myClass.findMethodBySignature(prototype, false); - if (existingAccessor != null) { - PsiElement parent = element; - while (parent != null) { - if (existingAccessor.equals(parent)) return true; - parent = parent.getParent(); - } - } - return false; - } - - private void processUsage(MyUsageInfo usage) { - PsiField field = myFields[usage.fieldIndex]; - boolean processGet = myDescriptor.isToEncapsulateGet(); - boolean processSet = myDescriptor.isToEncapsulateSet() && !field.hasModifierProperty(PsiModifier.FINAL); - if (!processGet && !processSet) return; - PsiElementFactory factory = JavaPsiFacade.getInstance(myProject).getElementFactory(); - - try{ - final PsiReferenceExpression expr = (PsiReferenceExpression)usage.getElement(); - if (expr == null) return; - final PsiElement parent = expr.getParent(); - if (parent instanceof PsiAssignmentExpression && expr.equals(((PsiAssignmentExpression)parent).getLExpression())){ - PsiAssignmentExpression assignment = (PsiAssignmentExpression)parent; - if (assignment.getRExpression() == null) return; - PsiJavaToken opSign = assignment.getOperationSign(); - IElementType opType = opSign.getTokenType(); - if (opType == JavaTokenType.EQ) { - { - if (!processSet) return; - final int fieldIndex = usage.fieldIndex; - final PsiExpression setterArgument = assignment.getRExpression(); - - PsiMethodCallExpression methodCall = createSetterCall(fieldIndex, setterArgument, expr); - - if (methodCall != null) { - assignment.replace(methodCall); - } - //TODO: check if value is used!!! - } - } - else if (opType == JavaTokenType.ASTERISKEQ || opType == JavaTokenType.DIVEQ || opType == JavaTokenType.PERCEQ || - opType == JavaTokenType.PLUSEQ || - opType == JavaTokenType.MINUSEQ || - opType == JavaTokenType.LTLTEQ || - opType == JavaTokenType.GTGTEQ || - opType == JavaTokenType.GTGTGTEQ || - opType == JavaTokenType.ANDEQ || - opType == JavaTokenType.OREQ || - opType == JavaTokenType.XOREQ) { - { - // Q: side effects of qualifier??! - - String opName = opSign.getText(); - LOG.assertTrue(StringUtil.endsWithChar(opName, '=')); - opName = opName.substring(0, opName.length() - 1); - - PsiExpression getExpr = expr; - if (processGet) { - final int fieldIndex = usage.fieldIndex; - final PsiMethodCallExpression getterCall = createGetterCall(fieldIndex, expr); - if (getterCall != null) { - getExpr = getterCall; - } - } - - @NonNls String text = "a" + opName + "b"; - PsiBinaryExpression binExpr = (PsiBinaryExpression)factory.createExpressionFromText(text, expr); - binExpr = (PsiBinaryExpression)CodeStyleManager.getInstance(myProject).reformat(binExpr); - binExpr.getLOperand().replace(getExpr); - binExpr.getROperand().replace(assignment.getRExpression()); - - PsiExpression setExpr; - if (processSet) { - setExpr = createSetterCall(usage.fieldIndex, binExpr, expr); - } - else { - text = "a = b"; - PsiAssignmentExpression assignment1 = (PsiAssignmentExpression)factory.createExpressionFromText(text, null); - assignment1 = (PsiAssignmentExpression)CodeStyleManager.getInstance(myProject).reformat(assignment1); - assignment1.getLExpression().replace(expr); - assignment1.getRExpression().replace(binExpr); - setExpr = assignment1; - } - - assignment.replace(setExpr); - //TODO: check if value is used!!! - } - } - } - else if (RefactoringUtil.isPlusPlusOrMinusMinus(parent)){ - IElementType sign; - if (parent instanceof PsiPrefixExpression){ - sign = ((PsiPrefixExpression)parent).getOperationTokenType(); - } - else{ - sign = ((PsiPostfixExpression)parent).getOperationTokenType(); - } - - PsiExpression getExpr = expr; - if (processGet){ - final int fieldIndex = usage.fieldIndex; - final PsiMethodCallExpression getterCall = createGetterCall(fieldIndex, expr); - if(getterCall != null) { - getExpr = getterCall; - } - } - - @NonNls String text; - if (sign == JavaTokenType.PLUSPLUS){ - text = "a+1"; - } - else{ - text = "a-1"; - } - PsiBinaryExpression binExpr = (PsiBinaryExpression)factory.createExpressionFromText(text, null); - binExpr = (PsiBinaryExpression)CodeStyleManager.getInstance(myProject).reformat(binExpr); - binExpr.getLOperand().replace(getExpr); - - PsiExpression setExpr; - if (processSet){ - final int fieldIndex = usage.fieldIndex; - setExpr = createSetterCall(fieldIndex, binExpr, expr); - } - else{ - text = "a = b"; - PsiAssignmentExpression assignment = (PsiAssignmentExpression)factory.createExpressionFromText(text, null); - assignment = (PsiAssignmentExpression)CodeStyleManager.getInstance(myProject).reformat(assignment); - assignment.getLExpression().replace(expr); - assignment.getRExpression().replace(binExpr); - setExpr = assignment; - } - parent.replace(setExpr); - } - else{ - if (!processGet) return; - PsiMethodCallExpression methodCall = createGetterCall(usage.fieldIndex, expr); - - if (methodCall != null) { - expr.replace(methodCall); - } - } - } - catch(IncorrectOperationException e){ - LOG.error(e); - } - } - - private PsiMethodCallExpression createSetterCall(final int fieldIndex, final PsiExpression setterArgument, PsiReferenceExpression expr) throws IncorrectOperationException { - String[] setterNames = myDescriptor.getSetterNames(); - PsiElementFactory factory = JavaPsiFacade.getInstance(expr.getProject()).getElementFactory(); - final String setterName = setterNames[fieldIndex]; - @NonNls String text = setterName + "(a)"; - PsiExpression qualifier = expr.getQualifierExpression(); - if (qualifier != null){ - text = "q." + text; - } - PsiMethodCallExpression methodCall = (PsiMethodCallExpression)factory.createExpressionFromText(text, expr); - methodCall = (PsiMethodCallExpression)CodeStyleManager.getInstance(myProject).reformat(methodCall); - - methodCall.getArgumentList().getExpressions()[0].replace(setterArgument); - if (qualifier != null){ - methodCall.getMethodExpression().getQualifierExpression().replace(qualifier); - } - final PsiMethod targetMethod = myNameToSetter.get(setterName); - methodCall = checkMethodResolvable(methodCall, targetMethod, expr); - if (methodCall == null) { - VisibilityUtil.escalateVisibility(myFields[fieldIndex], expr); - } - return methodCall; - } - - @Nullable - private PsiMethodCallExpression createGetterCall(final int fieldIndex, PsiReferenceExpression expr) - throws IncorrectOperationException { - String[] getterNames = myDescriptor.getGetterNames(); - PsiElementFactory factory = JavaPsiFacade.getInstance(expr.getProject()).getElementFactory(); - final String getterName = getterNames[fieldIndex]; - @NonNls String text = getterName + "()"; - PsiExpression qualifier = expr.getQualifierExpression(); - if (qualifier != null){ - text = "q." + text; - } - PsiMethodCallExpression methodCall = (PsiMethodCallExpression)factory.createExpressionFromText(text, expr); - methodCall = (PsiMethodCallExpression)CodeStyleManager.getInstance(myProject).reformat(methodCall); - - if (qualifier != null){ - methodCall.getMethodExpression().getQualifierExpression().replace(qualifier); - } - - final PsiMethod targetMethod = myNameToGetter.get(getterName); - methodCall = checkMethodResolvable(methodCall, targetMethod, expr); - if(methodCall == null) { - VisibilityUtil.escalateVisibility(myFields[fieldIndex], expr); - } - return methodCall; - } - - @Nullable - private PsiMethodCallExpression checkMethodResolvable(PsiMethodCallExpression methodCall, final PsiMethod targetMethod, PsiReferenceExpression context) throws IncorrectOperationException { - PsiElementFactory factory = JavaPsiFacade.getInstance(targetMethod.getProject()).getElementFactory(); - final PsiElement resolved = methodCall.getMethodExpression().resolve(); - if (resolved != targetMethod) { - PsiClass containingClass; - if (resolved instanceof PsiMethod) { - containingClass = ((PsiMethod) resolved).getContainingClass(); - } else if (resolved instanceof PsiClass) { - containingClass = (PsiClass)resolved; - } - else { - return null; - } - if(containingClass != null && containingClass.isInheritor(myClass, false)) { - final PsiExpression newMethodExpression = - factory.createExpressionFromText("super." + targetMethod.getName(), context); - methodCall.getMethodExpression().replace(newMethodExpression); - } else { - methodCall = null; - } - } - return methodCall; - } - - - - private static class MyUsageInfo extends UsageInfo { - public final int fieldIndex; - - public MyUsageInfo(PsiJavaCodeReferenceElement ref, int fieldIndex) { - super(ref); - this.fieldIndex = fieldIndex; - } - } } diff --git a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsViewDescriptor.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsViewDescriptor.java index ac5629cb6f1d..550068938de2 100644 --- a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsViewDescriptor.java +++ b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsViewDescriptor.java @@ -1,6 +1,6 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,8 +26,11 @@ import org.jetbrains.annotations.NotNull; class EncapsulateFieldsViewDescriptor implements UsageViewDescriptor { private final PsiField[] myFields; - public EncapsulateFieldsViewDescriptor(PsiField[] fields) { - myFields = fields; + public EncapsulateFieldsViewDescriptor(FieldDescriptor[] descriptors) { + myFields = new PsiField[descriptors.length]; + for (int i = 0; i < descriptors.length; i++) { + myFields[i] = descriptors[i].getField(); + } } public String getProcessedElementsHeader() { diff --git a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/FieldDescriptorImpl.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/FieldDescriptorImpl.java new file mode 100644 index 000000000000..28488c06e511 --- /dev/null +++ b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/FieldDescriptorImpl.java @@ -0,0 +1,79 @@ +/* + * Copyright 2000-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.refactoring.encapsulateFields; + +import com.intellij.psi.PsiField; +import com.intellij.psi.PsiMethod; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * @author Max Medvedev + */ +public class FieldDescriptorImpl implements FieldDescriptor { + private PsiField myField; + private final String myGetterName; + private final String mySetterName; + private final PsiMethod myGetterPrototype; + private final PsiMethod mySetterPrototype; + + public FieldDescriptorImpl(@NotNull PsiField field, + @NotNull String getterName, + @NotNull String setterName, + @Nullable PsiMethod getterPrototype, + @Nullable PsiMethod setterPrototype) { + myField = field; + myGetterName = getterName; + mySetterName = setterName; + myGetterPrototype = getterPrototype; + mySetterPrototype = setterPrototype; + } + + @NotNull + @Override + public PsiField getField() { + return myField; + } + + @NotNull + @Override + public String getGetterName() { + return myGetterName; + } + + @NotNull + @Override + public String getSetterName() { + return mySetterName; + } + + @Nullable + @Override + public PsiMethod getGetterPrototype() { + return myGetterPrototype; + } + + @Nullable + @Override + public PsiMethod getSetterPrototype() { + return mySetterPrototype; + } + + @Override + public void refreshField(@NotNull PsiField newField) { + myField = newField; + } +} diff --git a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/JavaEncapsulateFieldHelper.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/JavaEncapsulateFieldHelper.java new file mode 100644 index 000000000000..2d45a929edd1 --- /dev/null +++ b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/JavaEncapsulateFieldHelper.java @@ -0,0 +1,346 @@ +/* + * Copyright 2000-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.refactoring.encapsulateFields; + +import com.intellij.codeInsight.generation.GenerateMembersUtil; +import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.util.text.StringUtil; +import com.intellij.psi.*; +import com.intellij.psi.tree.IElementType; +import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PsiUtil; +import com.intellij.refactoring.util.RefactoringUtil; +import com.intellij.util.IncorrectOperationException; +import com.intellij.util.VisibilityUtil; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * @author Max Medvedev + */ +public class JavaEncapsulateFieldHelper extends EncapsulateFieldHelper { + private static final Logger LOG = Logger.getInstance(JavaEncapsulateFieldHelper.class); + + @Nullable + public EncapsulateFieldUsageInfo createUsage(@NotNull EncapsulateFieldsDescriptor descriptor, + @NotNull FieldDescriptor fieldDescriptor, + @NotNull PsiReference reference) { + if (!(reference instanceof PsiReferenceExpression)) return null; + + boolean findSet = descriptor.isToEncapsulateSet(); + boolean findGet = descriptor.isToEncapsulateGet(); + PsiReferenceExpression ref = (PsiReferenceExpression)reference; + // [Jeka] to avoid recursion in the field's accessors + if (findGet && isUsedInExistingAccessor(descriptor.getTargetClass(), fieldDescriptor.getGetterPrototype(), ref)) return null; + if (findSet && isUsedInExistingAccessor(descriptor.getTargetClass(), fieldDescriptor.getSetterPrototype(), ref)) return null; + if (!findGet) { + if (!PsiUtil.isAccessedForWriting(ref)) return null; + } + if (!findSet || fieldDescriptor.getField().hasModifierProperty(PsiModifier.FINAL)) { + if (!PsiUtil.isAccessedForReading(ref)) return null; + } + if (!descriptor.isToUseAccessorsWhenAccessible()) { + PsiModifierList newModifierList = createNewModifierList(descriptor); + + PsiClass accessObjectClass = null; + PsiExpression qualifier = ref.getQualifierExpression(); + if (qualifier != null) { + accessObjectClass = (PsiClass)PsiUtil.getAccessObjectClass(qualifier).getElement(); + } + final PsiResolveHelper helper = JavaPsiFacade.getInstance(((PsiReferenceExpression)reference).getProject()).getResolveHelper(); + if (helper.isAccessible(fieldDescriptor.getField(), newModifierList, ref, accessObjectClass, null)) { + return null; + } + } + return new EncapsulateFieldUsageInfo(ref, fieldDescriptor); + } + + public static PsiModifierList createNewModifierList(EncapsulateFieldsDescriptor descriptor) { + PsiModifierList newModifierList = null; + PsiElementFactory factory = JavaPsiFacade.getInstance(descriptor.getTargetClass().getProject()).getElementFactory(); + try { + PsiField field = factory.createField("a", PsiType.INT); + EncapsulateFieldsProcessor.setNewFieldVisibility(field, descriptor); + newModifierList = field.getModifierList(); + } + catch (IncorrectOperationException e) { + LOG.error(e); + } + return newModifierList; + } + + public static boolean isUsedInExistingAccessor(PsiClass aClass, PsiMethod prototype, PsiElement element) { + PsiMethod existingAccessor = aClass.findMethodBySignature(prototype, false); + if (existingAccessor != null) { + PsiElement parent = element; + while (parent != null) { + if (existingAccessor.equals(parent)) return true; + parent = parent.getParent(); + } + } + return false; + } + + public boolean processUsage(@NotNull EncapsulateFieldUsageInfo usage, + @NotNull EncapsulateFieldsDescriptor descriptor, + PsiMethod setter, + PsiMethod getter) { + final PsiElement element = usage.getElement(); + if (!(element instanceof PsiReferenceExpression)) return false; + + final FieldDescriptor fieldDescriptor = usage.getFieldDescriptor(); + PsiField field = fieldDescriptor.getField(); + boolean processGet = descriptor.isToEncapsulateGet(); + boolean processSet = descriptor.isToEncapsulateSet() && !field.hasModifierProperty(PsiModifier.FINAL); + if (!processGet && !processSet) return true; + PsiElementFactory factory = JavaPsiFacade.getInstance(descriptor.getTargetClass().getProject()).getElementFactory(); + + try{ + final PsiReferenceExpression expr = (PsiReferenceExpression)element; + final PsiElement parent = expr.getParent(); + if (parent instanceof PsiAssignmentExpression && expr.equals(((PsiAssignmentExpression)parent).getLExpression())){ + PsiAssignmentExpression assignment = (PsiAssignmentExpression)parent; + if (assignment.getRExpression() == null) return true; + PsiJavaToken opSign = assignment.getOperationSign(); + IElementType opType = opSign.getTokenType(); + if (opType == JavaTokenType.EQ) { + { + if (!processSet) return true; + final PsiExpression setterArgument = assignment.getRExpression(); + + PsiMethodCallExpression methodCall = createSetterCall(fieldDescriptor, setterArgument, expr, descriptor.getTargetClass(), setter); + + if (methodCall != null) { + assignment.replace(methodCall); + } + //TODO: check if value is used!!! + } + } + else if (opType == JavaTokenType.ASTERISKEQ || opType == JavaTokenType.DIVEQ || opType == JavaTokenType.PERCEQ || + opType == JavaTokenType.PLUSEQ || + opType == JavaTokenType.MINUSEQ || + opType == JavaTokenType.LTLTEQ || + opType == JavaTokenType.GTGTEQ || + opType == JavaTokenType.GTGTGTEQ || + opType == JavaTokenType.ANDEQ || + opType == JavaTokenType.OREQ || + opType == JavaTokenType.XOREQ) { + { + // Q: side effects of qualifier??! + + String opName = opSign.getText(); + LOG.assertTrue(StringUtil.endsWithChar(opName, '=')); + opName = opName.substring(0, opName.length() - 1); + + PsiExpression getExpr = expr; + if (processGet) { + final PsiMethodCallExpression getterCall = createGetterCall(fieldDescriptor, expr, descriptor.getTargetClass(), getter); + if (getterCall != null) { + getExpr = getterCall; + } + } + + @NonNls String text = "a" + opName + "b"; + PsiBinaryExpression binExpr = (PsiBinaryExpression)factory.createExpressionFromText(text, expr); + binExpr.getLOperand().replace(getExpr); + binExpr.getROperand().replace(assignment.getRExpression()); + + PsiExpression setExpr; + if (processSet) { + setExpr = createSetterCall(fieldDescriptor, binExpr, expr, descriptor.getTargetClass(), setter); + } + else { + text = "a = b"; + PsiAssignmentExpression assignment1 = (PsiAssignmentExpression)factory.createExpressionFromText(text, null); + assignment1.getLExpression().replace(expr); + assignment1.getRExpression().replace(binExpr); + setExpr = assignment1; + } + + assignment.replace(setExpr); + //TODO: check if value is used!!! + } + } + } + else if (RefactoringUtil.isPlusPlusOrMinusMinus(parent)){ + IElementType sign; + if (parent instanceof PsiPrefixExpression){ + sign = ((PsiPrefixExpression)parent).getOperationTokenType(); + } + else{ + sign = ((PsiPostfixExpression)parent).getOperationTokenType(); + } + + PsiExpression getExpr = expr; + if (processGet){ + final PsiMethodCallExpression getterCall = createGetterCall(fieldDescriptor, expr, descriptor.getTargetClass(), getter); + if (getterCall != null) { + getExpr = getterCall; + } + } + + @NonNls String text; + if (sign == JavaTokenType.PLUSPLUS){ + text = "a+1"; + } + else{ + text = "a-1"; + } + PsiBinaryExpression binExpr = (PsiBinaryExpression)factory.createExpressionFromText(text, null); + binExpr.getLOperand().replace(getExpr); + + PsiExpression setExpr; + if (processSet){ + setExpr = createSetterCall(fieldDescriptor, binExpr, expr, descriptor.getTargetClass(), setter); + } + else { + text = "a = b"; + PsiAssignmentExpression assignment = (PsiAssignmentExpression)factory.createExpressionFromText(text, null); + assignment.getLExpression().replace(expr); + assignment.getRExpression().replace(binExpr); + setExpr = assignment; + } + parent.replace(setExpr); + } + else{ + if (!processGet) return true; + PsiMethodCallExpression methodCall = createGetterCall(fieldDescriptor, expr, descriptor.getTargetClass(), getter); + + if (methodCall != null) { + expr.replace(methodCall); + } + } + } + catch(IncorrectOperationException e){ + LOG.error(e); + } + return true; + } + + private static PsiMethodCallExpression createSetterCall(FieldDescriptor fieldDescriptor, + PsiExpression setterArgument, + PsiReferenceExpression expr, + PsiClass aClass, + PsiMethod setter) throws IncorrectOperationException { + PsiElementFactory factory = JavaPsiFacade.getInstance(expr.getProject()).getElementFactory(); + final String setterName = fieldDescriptor.getSetterName(); + @NonNls String text = setterName + "(a)"; + PsiExpression qualifier = expr.getQualifierExpression(); + if (qualifier != null){ + text = "q." + text; + } + PsiMethodCallExpression methodCall = (PsiMethodCallExpression)factory.createExpressionFromText(text, expr); + + methodCall.getArgumentList().getExpressions()[0].replace(setterArgument); + if (qualifier != null){ + methodCall.getMethodExpression().getQualifierExpression().replace(qualifier); + } + methodCall = checkMethodResolvable(methodCall, setter, expr, aClass); + if (methodCall == null) { + VisibilityUtil.escalateVisibility(fieldDescriptor.getField(), expr); + } + return methodCall; + } + + @Nullable + private static PsiMethodCallExpression createGetterCall(FieldDescriptor fieldDescriptor, + PsiReferenceExpression expr, + PsiClass aClass, + PsiMethod getter) throws IncorrectOperationException { + PsiElementFactory factory = JavaPsiFacade.getInstance(expr.getProject()).getElementFactory(); + final String getterName = fieldDescriptor.getGetterName(); + @NonNls String text = getterName + "()"; + PsiExpression qualifier = expr.getQualifierExpression(); + if (qualifier != null) { + text = "q." + text; + } + PsiMethodCallExpression methodCall = (PsiMethodCallExpression)factory.createExpressionFromText(text, expr); + + if (qualifier != null) { + methodCall.getMethodExpression().getQualifierExpression().replace(qualifier); + } + + methodCall = checkMethodResolvable(methodCall, getter, expr, aClass); + if (methodCall == null) { + VisibilityUtil.escalateVisibility(fieldDescriptor.getField(), expr); + } + return methodCall; + } + + @Nullable + private static PsiMethodCallExpression checkMethodResolvable(PsiMethodCallExpression methodCall, + PsiMethod targetMethod, + PsiReferenceExpression context, + PsiClass aClass) throws IncorrectOperationException { + PsiElementFactory factory = JavaPsiFacade.getInstance(targetMethod.getProject()).getElementFactory(); + final PsiElement resolved = methodCall.getMethodExpression().resolve(); + if (resolved != targetMethod) { + PsiClass containingClass; + if (resolved instanceof PsiMethod) { + containingClass = ((PsiMethod)resolved).getContainingClass(); + } + else if (resolved instanceof PsiClass) { + containingClass = (PsiClass)resolved; + } + else { + return null; + } + if (containingClass != null && containingClass.isInheritor(aClass, false)) { + final PsiExpression newMethodExpression = + factory.createExpressionFromText("super." + targetMethod.getName(), context); + methodCall.getMethodExpression().replace(newMethodExpression); + } + else { + methodCall = null; + } + } + return methodCall; + } + + @NotNull + @Override + public PsiField[] getApplicableFields(@NotNull PsiClass aClass) { + return aClass.getFields(); + } + + @Override + @NotNull + public String suggestSetterName(@NotNull PsiField field) { + return PropertyUtil.suggestSetterName(field.getProject(), field); + } + + @Override + @NotNull + public String suggestGetterName(@NotNull PsiField field) { + return PropertyUtil.suggestGetterName(field.getProject(), field); + } + + @Override + @Nullable + public PsiMethod generateMethodPrototype(@NotNull PsiField field, @NotNull String methodName, boolean isGetter) { + PsiMethod prototype = isGetter + ? GenerateMembersUtil.generateGetterPrototype(field) + : GenerateMembersUtil.generateSetterPrototype(field); + try { + prototype.setName(methodName); + return prototype; + } + catch (IncorrectOperationException e) { + return null; + } + } +} diff --git a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java index 7a11a69e2d82..ea230e3517ce 100644 --- a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java +++ b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java @@ -236,7 +236,7 @@ public class PullUpHelper extends BaseRefactoringProcessor{ if (myIsTargetInterface || info.isToAbstract()) { ChangeContextUtil.clearContextInfo(method); - if (!info.isToAbstract() && !method.hasModifierProperty(PsiModifier.ABSTRACT)) { + if (!info.isToAbstract() && !method.hasModifierProperty(PsiModifier.ABSTRACT) && PsiUtil.isLanguageLevel8OrHigher(myTargetSuperClass)) { //pull as default RefactoringUtil.makeMethodDefault(methodCopy); isOriginalMethodAbstract = true; diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java index 8a88e1c19626..5a086c7a7f2f 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java @@ -159,14 +159,20 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor { @NotNull protected UsageInfo[] findUsages() { - List<UsageInfo> allUsages = new ArrayList<UsageInfo>(); + final List<UsageInfo> allUsages = new ArrayList<UsageInfo>(); + final List<UsageInfo> usagesToSkip = new ArrayList<UsageInfo>(); MultiMap<PsiElement, String> conflicts = new MultiMap<PsiElement, String>(); for (PsiElement element : myElementsToMove) { String newName = getNewQName(element); if (newName == null) continue; final UsageInfo[] usages = MoveClassesOrPackagesUtil.findUsages(element, mySearchInComments, mySearchInNonJavaFiles, newName); - allUsages.addAll(new ArrayList<UsageInfo>(Arrays.asList(usages))); + final ArrayList<UsageInfo> infos = new ArrayList<UsageInfo>(Arrays.asList(usages)); + allUsages.addAll(infos); + if (Comparing.strEqual(newName, getOldQName(element))) { + usagesToSkip.addAll(infos); + } + if (element instanceof PsiPackage) { for (PsiDirectory directory : ((PsiPackage)element).getDirectories()) { final UsageInfo[] dirUsages = MoveClassesOrPackagesUtil.findUsages(directory, mySearchInComments, @@ -186,6 +192,7 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor { } } + allUsages.removeAll(usagesToSkip); return UsageViewUtil.removeDuplicatedUsages(allUsages.toArray(new UsageInfo[allUsages.size()])); } @@ -411,23 +418,30 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor { @Nullable private String getNewQName(PsiElement element) { final String qualifiedName = myTargetPackage.getQualifiedName(); - final String newQName; - final String oldQName; if (element instanceof PsiClass) { - newQName = StringUtil.getQualifiedName(qualifiedName, ((PsiClass)element).getName()); - oldQName = ((PsiClass)element).getQualifiedName(); + return StringUtil.getQualifiedName(qualifiedName, ((PsiClass)element).getName()); + } + else if (element instanceof PsiPackage) { + return StringUtil.getQualifiedName(qualifiedName, ((PsiPackage)element).getName()); + } + else { + LOG.assertTrue(false); + return null; + } + } + + @Nullable + private String getOldQName(PsiElement element) { + if (element instanceof PsiClass) { + return ((PsiClass)element).getQualifiedName(); } else if (element instanceof PsiPackage) { - newQName = StringUtil.getQualifiedName(qualifiedName, ((PsiPackage)element).getName()); - oldQName = ((PsiPackage)element).getQualifiedName(); + return ((PsiPackage)element).getQualifiedName(); } else { LOG.assertTrue(false); - newQName = null; - oldQName = null; + return null; } - if (Comparing.strEqual(newQName, oldQName)) return null; - return newQName; } protected void refreshElements(PsiElement[] elements) { |