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

some methods annotated by MagicConstant annotations

Browse Source
This commit is contained in:
Alexey Kudravtsev
2012-01-12 16:41:33 +04:00
parent a87146dc5b
commit d8f813215a
118 changed files with 510 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+6 -7
View File
@@ -1,4 +1,3 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
*
@@ -232,7 +231,7 @@ public class HighlightUtil {
Set<String> incompatibles = incompatibleModifiersHash.get(modifier);
if (incompatibles == null) return null;
for (@Modifier String incompatible : incompatibles) {
for (@PsiModifier.ModifierConstant String incompatible : incompatibles) {
if (modifierList.hasModifierProperty(incompatible)) {
return incompatible;
}
@@ -271,7 +270,7 @@ public class HighlightUtil {
JavaPsiFacade facade = JavaPsiFacade.getInstance(project);
PsiModifierList modifierListCopy = facade.getElementFactory().createFieldFromText("int a;", null).getModifierList();
modifierListCopy.setModifierProperty(PsiModifier.STATIC, modifierList.hasModifierProperty(PsiModifier.STATIC));
@Modifier String minModifier = PsiModifier.PACKAGE_LOCAL;
String minModifier = PsiModifier.PACKAGE_LOCAL;
if (refElement.hasModifierProperty(PsiModifier.PACKAGE_LOCAL)) {
minModifier = PsiModifier.PROTECTED;
}
@@ -280,7 +279,7 @@ public class HighlightUtil {
}
String[] modifiers = {PsiModifier.PACKAGE_LOCAL, PsiModifier.PROTECTED, PsiModifier.PUBLIC,};
for (int i = ArrayUtil.indexOf(modifiers, minModifier); i < modifiers.length; i++) {
@Modifier String modifier = modifiers[i];
@PsiModifier.ModifierConstant String modifier = modifiers[i];
modifierListCopy.setModifierProperty(modifier, true);
if (facade.getResolveHelper().isAccessible(refElement, modifierListCopy, place, accessObjectClass, fileResolveScope)) {
IntentionAction fix = QUICK_FIX_FACTORY.createModifierListFix(refElement, modifier, true, true);
@@ -761,7 +760,7 @@ public class HighlightUtil {
@Nullable
static HighlightInfo checkIllegalModifierCombination(PsiKeyword keyword, PsiModifierList modifierList) {
@Modifier String modifier = keyword.getText();
@PsiModifier.ModifierConstant String modifier = keyword.getText();
String incompatible = getIncompatibleModifier(modifier, modifierList);
HighlightInfo highlightInfo = null;
@@ -803,7 +802,7 @@ public class HighlightUtil {
PsiElement modifierOwner = modifierList.getParent();
if (modifierOwner == null) return null;
if (PsiUtilCore.hasErrorElementChild(modifierOwner)) return null;
@Modifier String modifier = keyword.getText();
@PsiModifier.ModifierConstant String modifier = keyword.getText();
final Map<String, Set<String>> incompatibleModifierMap = getIncompatibleModifierMap(modifierList);
if (incompatibleModifierMap == null) return null;
Set<String> incompatibles = incompatibleModifierMap.get(modifier);
@@ -1796,7 +1795,7 @@ public class HighlightUtil {
if (thisExpression.getQualifier() != null) {
resolvedName = referencedClass == null
? null
: PsiFormatUtil.formatClass(referencedClass, PsiFormatUtilBase.SHOW_CONTAINING_CLASS | PsiFormatUtilBase.SHOW_NAME) + ".this";
: PsiFormatUtil.formatClass(referencedClass, PsiFormatUtilBase.SHOW_NAME) + ".this";
}
else {
resolvedName = "this";
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java
+1
View File
@@ -157,6 +157,7 @@ public abstract class CreateFromUsageBaseFix extends BaseIntentionAction {
VisibilityUtil.setVisibility(list, getVisibility(parentClass, targetClass));
}
@PsiModifier.ModifierConstant
protected String getVisibility(PsiClass parentClass, PsiClass targetClass) {
if (parentClass != null && (parentClass.equals(targetClass) || PsiTreeUtil.isAncestor(targetClass, parentClass, true))) {
return PsiModifier.PRIVATE;
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnTypeFix.java
+1 -1
View File
@@ -281,7 +281,7 @@ public class MethodReturnTypeFix extends LocalQuickFixAndIntentionActionOnPsiEle
private final UsageVisitor myUsageVisitor;
private UsagesAwareChangeSignatureProcessor(final Project project, final PsiMethod method, final boolean generateDelegate,
@Modifier final String newVisibility, final String newName, final PsiType newType,
@PsiModifier.ModifierConstant final String newVisibility, final String newName, final PsiType newType,
@NotNull final ParameterInfoImpl[] parameterInfo, final UsageVisitor usageVisitor) {
super(project, method, generateDelegate, newVisibility, newName, newType, parameterInfo);
myUsageVisitor = usageVisitor;
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java
+3 -3
View File
@@ -43,13 +43,13 @@ import java.util.List;
public class ModifierFix extends LocalQuickFixAndIntentionActionOnPsiElement {
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.ModifierFix");
@Modifier private final String myModifier;
@PsiModifier.ModifierConstant private final String myModifier;
private final boolean myShouldHave;
private final boolean myShowContainingClass;
private final String myName;
private final SmartPsiElementPointer<PsiVariable> myVariable;
public ModifierFix(PsiModifierList modifierList, @Modifier @NotNull String modifier, boolean shouldHave, boolean showContainingClass) {
public ModifierFix(PsiModifierList modifierList, @PsiModifier.ModifierConstant @NotNull String modifier, boolean shouldHave, boolean showContainingClass) {
super(modifierList);
myModifier = modifier;
myShouldHave = shouldHave;
@@ -58,7 +58,7 @@ public class ModifierFix extends LocalQuickFixAndIntentionActionOnPsiElement {
myVariable = null;
}
public ModifierFix(@NotNull PsiModifierListOwner owner, @Modifier @NotNull String modifier, boolean shouldHave, boolean showContainingClass) {
public ModifierFix(@NotNull PsiModifierListOwner owner, @PsiModifier.ModifierConstant @NotNull String modifier, boolean shouldHave, boolean showContainingClass) {
super(owner.getModifierList());
myModifier = modifier;
myShouldHave = shouldHave;
java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java
+3 -3
View File
@@ -216,7 +216,7 @@ public class GenerateConstructorHandler extends GenerateMembersHandlerBase {
PsiMethod constructor = factory.createConstructor();
constructor.setName(aClass.getName());
@Modifier String modifier = getConstructorModifier(aClass);
String modifier = getConstructorModifier(aClass);
if (modifier != null) {
PsiUtil.setModifierProperty(constructor, modifier, true);
}
@@ -296,9 +296,9 @@ public class GenerateConstructorHandler extends GenerateMembersHandlerBase {
return constructor;
}
@Modifier
@PsiModifier.ModifierConstant
public static String getConstructorModifier(final PsiClass aClass) {
@Modifier String modifier = PsiModifier.PUBLIC;
String modifier = PsiModifier.PUBLIC;
if (aClass.hasModifierProperty(PsiModifier.ABSTRACT) && !aClass.isEnum()) {
modifier = PsiModifier.PROTECTED;
java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java
+2 -12
View File
@@ -15,9 +15,9 @@
*/
package com.intellij.codeInsight.hint.api.impls;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.CodeInsightSettings;
import com.intellij.codeInsight.ExternalAnnotationsManager;
import com.intellij.codeInsight.completion.JavaCompletionUtil;
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
import com.intellij.codeInsight.lookup.LookupElement;
@@ -401,18 +401,8 @@ public class MethodParameterInfoHandler implements ParameterInfoHandlerWithTabAc
}
private static void appendModifierList(@NotNull StringBuilder buffer, @NotNull PsiModifierListOwner owner) {
final PsiModifierList list = owner.getModifierList();
PsiAnnotation[] annotations = PsiAnnotation.EMPTY_ARRAY;
int lastSize = buffer.length();
if (list != null) {
annotations = list.getAnnotations();
}
final PsiAnnotation[] externalAnnotations = ExternalAnnotationsManager.getInstance(owner.getProject()).findExternalAnnotations(owner);
if (externalAnnotations != null) {
annotations = ArrayUtil.mergeArrays(annotations, externalAnnotations, PsiAnnotation.ARRAY_FACTORY);
}
for (PsiAnnotation a : annotations) {
for (PsiAnnotation a : AnnotationUtil.getAllAnnotations(owner, false, null)) {
if (lastSize != buffer.length()) buffer.append(" ");
final PsiJavaCodeReferenceElement element = a.getNameReferenceElement();
if (element != null) buffer.append("@").append(element.getReferenceName());
java/java-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java
+18 -15
View File
@@ -176,7 +176,7 @@ public class VisibilityInspection extends GlobalJavaInspectionTool {
RefClass refClass = (RefClass) refElement.getOwner();
if (refClass.isInterface()) return null;
}
@Modifier String access = getPossibleAccess(refElement);
String access = getPossibleAccess(refElement);
if (access != refElement.getAccessModifier() && access != null) {
final PsiElement element = refElement.getElement();
final PsiElement nameIdentifier = element != null ? HighlightUsagesHandler.getNameIdentifier(element) : null;
@@ -196,11 +196,11 @@ public class VisibilityInspection extends GlobalJavaInspectionTool {
}
@Nullable
@Modifier
@PsiModifier.ModifierConstant
public String getPossibleAccess(@Nullable RefJavaElement refElement) {
if (refElement == null) return null;
@Modifier String curAccess = refElement.getAccessModifier();
@Modifier String weakestAccess = PsiModifier.PRIVATE;
String curAccess = refElement.getAccessModifier();
String weakestAccess = PsiModifier.PRIVATE;
if (isTopLevelClass(refElement) || isCalledOnSubClasses(refElement)) {
weakestAccess = PsiModifier.PACKAGE_LOCAL;
@@ -213,11 +213,12 @@ public class VisibilityInspection extends GlobalJavaInspectionTool {
if (curAccess == weakestAccess) return curAccess;
while (true) {
@Modifier String weakerAccess = getWeakerAccess(curAccess, refElement);
String weakerAccess = getWeakerAccess(curAccess, refElement);
if (weakerAccess == null || RefJavaUtil.getInstance().compareAccess(weakerAccess, weakestAccess) < 0) break;
if (isAccessible(refElement, weakerAccess)) {
curAccess = weakerAccess;
} else {
}
else {
break;
}
}
@@ -238,20 +239,22 @@ public class VisibilityInspection extends GlobalJavaInspectionTool {
}
@Nullable
@Modifier
private String getWeakerAccess(String curAccess, RefElement refElement) {
@PsiModifier.ModifierConstant
private String getWeakerAccess(@PsiModifier.ModifierConstant String curAccess, RefElement refElement) {
if (curAccess == PsiModifier.PUBLIC) {
return isTopLevelClass(refElement) ? PsiModifier.PACKAGE_LOCAL : PsiModifier.PROTECTED;
} else if (curAccess == PsiModifier.PROTECTED) {
}
if (curAccess == PsiModifier.PROTECTED) {
return SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS ? PsiModifier.PACKAGE_LOCAL : PsiModifier.PRIVATE;
} else if (curAccess == PsiModifier.PACKAGE_LOCAL) {
}
if (curAccess == PsiModifier.PACKAGE_LOCAL) {
return PsiModifier.PRIVATE;
}
return null;
}
private boolean isAccessible(RefJavaElement to, String accessModifier) {
private boolean isAccessible(RefJavaElement to, @PsiModifier.ModifierConstant String accessModifier) {
for (RefElement refElement : to.getInReferences()) {
if (!isAccessibleFrom(refElement, to, accessModifier)) return false;
@@ -260,7 +263,7 @@ public class VisibilityInspection extends GlobalJavaInspectionTool {
if (to instanceof RefMethod) {
RefMethod refMethod = (RefMethod) to;
if (refMethod.isAbstract() && (refMethod.getDerivedMethods().size() == 0 || refMethod.getAccessModifier() == PsiModifier.PRIVATE)) return false;
if (refMethod.isAbstract() && (refMethod.getDerivedMethods().isEmpty() || refMethod.getAccessModifier() == PsiModifier.PRIVATE)) return false;
for (RefMethod refOverride : refMethod.getDerivedMethods()) {
if (!isAccessibleFrom(refOverride, to, accessModifier)) return false;
@@ -299,7 +302,7 @@ public class VisibilityInspection extends GlobalJavaInspectionTool {
return true;
}
private static int getAccessLevel(String access) {
private static int getAccessLevel(@PsiModifier.ModifierConstant String access) {
if (access == PsiModifier.PRIVATE) return 1;
if (access == PsiModifier.PACKAGE_LOCAL) return 2;
if (access == PsiModifier.PROTECTED) return 3;
@@ -490,9 +493,9 @@ public class VisibilityInspection extends GlobalJavaInspectionTool {
private static class AcceptSuggestedAccess implements LocalQuickFix{
private final RefManager myManager;
@Modifier private final String myHint;
@PsiModifier.ModifierConstant private final String myHint;
private AcceptSuggestedAccess(final RefManager manager, @Modifier String hint) {
private AcceptSuggestedAccess(final RefManager manager, @PsiModifier.ModifierConstant String hint) {
myManager = manager;
myHint = hint;
}
java/java-impl/src/com/intellij/ide/JavaFileIconPatcher.java
+2 -2
View File
@@ -18,13 +18,13 @@ package com.intellij.ide;
import com.intellij.lang.StdLanguages;
import com.intellij.openapi.compiler.CompilerManager;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.FileIndexUtil;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Iconable;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.ui.LayeredIcon;
@@ -51,7 +51,7 @@ public class JavaFileIconPatcher implements FileIconPatcher {
return icon;
}
private static Icon replaceIcon(VirtualFile file, int flags, Project project, Icon baseIcon) {
private static Icon replaceIcon(VirtualFile file, @Iconable.IconFlags int flags, Project project, Icon baseIcon) {
FileType fileType = file.getFileType();
if (fileType == StdFileTypes.JAVA && !FileIndexUtil.isJavaSourceFile(project, file)) {
return PlatformIcons.JAVA_OUTSIDE_SOURCE_ICON;
java/java-impl/src/com/intellij/ide/util/MethodCellRenderer.java
+5 -3
View File
@@ -17,18 +17,20 @@ package com.intellij.ide.util;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiFormatUtil;
import com.intellij.psi.util.PsiFormatUtilBase;
import javax.swing.*;
public class MethodCellRenderer extends PsiElementListCellRenderer<PsiMethod>{
private final boolean myShowMethodNames;
private final PsiClassListCellRenderer myClassListCellRenderer = new PsiClassListCellRenderer();
@PsiFormatUtil.FormatMethodOptions
private final int myOptions;
public MethodCellRenderer(boolean showMethodNames) {
this(showMethodNames, PsiFormatUtil.SHOW_NAME | PsiFormatUtil.SHOW_PARAMETERS);
this(showMethodNames, PsiFormatUtilBase.SHOW_NAME | PsiFormatUtilBase.SHOW_PARAMETERS);
}
public MethodCellRenderer(boolean showMethodNames, int options) {
public MethodCellRenderer(boolean showMethodNames, @PsiFormatUtil.FormatMethodOptions int options) {
myShowMethodNames = showMethodNames;
myOptions = options;
}
@@ -37,7 +39,7 @@ public class MethodCellRenderer extends PsiElementListCellRenderer<PsiMethod>{
final PsiNamedElement container = fetchContainer(element);
String text = container instanceof PsiClass ? myClassListCellRenderer.getElementText((PsiClass)container) : container.getName();
if (myShowMethodNames) {
text += "."+PsiFormatUtil.formatMethod(element, PsiSubstitutor.EMPTY, myOptions, PsiFormatUtil.SHOW_TYPE);
text += "."+PsiFormatUtil.formatMethod(element, PsiSubstitutor.EMPTY, myOptions, PsiFormatUtilBase.SHOW_TYPE);
}
return text;
}
java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
+12 -12
View File
@@ -465,11 +465,11 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
}
ASTNode lbraceCandidate = leftNode.getTreePrev();
return (lbraceCandidate != null && lbraceCandidate.getElementType() == JavaTokenType.LBRACE) ? 0 : 1;
return lbraceCandidate != null && lbraceCandidate.getElementType() == JavaTokenType.LBRACE ? 0 : 1;
}
private int getLinesAroundMethod() {
boolean useInterfaceMethodSpacing = !isClass(myParent) || (isAbstractMethod(myChild1) && isAbstractMethod(myChild2));
boolean useInterfaceMethodSpacing = !isClass(myParent) || isAbstractMethod(myChild1) && isAbstractMethod(myChild2);
return useInterfaceMethodSpacing ? mySettings.BLANK_LINES_AROUND_METHOD_IN_INTERFACE : mySettings.BLANK_LINES_AROUND_METHOD;
}
@@ -628,8 +628,8 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
if (putRightChildOnNewLine) {
processOnNewLineCondition(true);
} else {
boolean useSpace = (myRole2 == ChildRole.CATCH_SECTION && mySettings.SPACE_BEFORE_CATCH_KEYWORD)
|| (myRole2 == ChildRole.FINALLY_KEYWORD && mySettings.SPACE_BEFORE_FINALLY_KEYWORD);
boolean useSpace = myRole2 == ChildRole.CATCH_SECTION && mySettings.SPACE_BEFORE_CATCH_KEYWORD
|| myRole2 == ChildRole.FINALLY_KEYWORD && mySettings.SPACE_BEFORE_FINALLY_KEYWORD;
createSpaceProperty(useSpace, false, 0);
}
return;
@@ -655,8 +655,8 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
else if (myRole1 == ChildRole.LPARENTH || myRole2 == ChildRole.RPARENTH) {
createSpaceInCode(mySettings.SPACE_WITHIN_FOR_PARENTHESES);
}
else if ((myRole1 == ChildRole.FOR_ITERATION_PARAMETER && myRole2 == ChildRole.COLON) ||
(myRole1 == ChildRole.COLON && myRole2 == ChildRole.FOR_ITERATED_VALUE))
else if (myRole1 == ChildRole.FOR_ITERATION_PARAMETER && myRole2 == ChildRole.COLON ||
myRole1 == ChildRole.COLON && myRole2 == ChildRole.FOR_ITERATED_VALUE)
{
createSpaceInCode(true);
}
@@ -713,7 +713,7 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
}
else if ((myRole1 == ChildRoleBase.NONE && !lhsStatement) || (myRole2 == ChildRoleBase.NONE && !rhsStatement)) {
else if (myRole1 == ChildRoleBase.NONE && !lhsStatement || myRole2 == ChildRoleBase.NONE && !rhsStatement) {
final IElementType firstElementType = myChild1.getElementType();
if (
firstElementType == JavaTokenType.END_OF_LINE_COMMENT
@@ -767,7 +767,7 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
int minSpaces = 0;
int minLineFeeds = 1;
PsiElement psi = myChild1.getPsi();
if (mySettings.KEEP_MULTIPLE_EXPRESSIONS_IN_ONE_LINE || (psi != null && PsiTreeUtil.hasErrorElements(psi))) {
if (mySettings.KEEP_MULTIPLE_EXPRESSIONS_IN_ONE_LINE || psi != null && PsiTreeUtil.hasErrorElements(psi)) {
minSpaces = 1;
minLineFeeds = 0;
}
@@ -866,7 +866,7 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
}
private Spacing getSpaceBeforeLBrace(final boolean spaceBeforeLbrace,
int braceStyle,
@CommonCodeStyleSettings.BraceStyleConstant int braceStyle,
@Nullable TextRange dependantRange,
boolean keepOneLine,
boolean useParentBlockAsDependencyAllTheTime)
@@ -1258,9 +1258,9 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
}
@Override public void visitReferenceParameterList(PsiReferenceParameterList list) {
if ((myRole1 == ChildRole.LT_IN_TYPE_LIST && myRole2 == ChildRole.TYPE_IN_REFERENCE_PARAMETER_LIST)
|| (myRole1 == ChildRole.LT_IN_TYPE_LIST && myRole2 == ChildRole.GT_IN_TYPE_LIST)
|| (myRole1 == ChildRole.TYPE_IN_REFERENCE_PARAMETER_LIST && myRole2 == ChildRole.COMMA))
if (myRole1 == ChildRole.LT_IN_TYPE_LIST && myRole2 == ChildRole.TYPE_IN_REFERENCE_PARAMETER_LIST
|| myRole1 == ChildRole.LT_IN_TYPE_LIST && myRole2 == ChildRole.GT_IN_TYPE_LIST
|| myRole1 == ChildRole.TYPE_IN_REFERENCE_PARAMETER_LIST && myRole2 == ChildRole.COMMA)
{
createSpaceInCode(false);
}
java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java
+4 -4
View File
@@ -50,7 +50,7 @@ public class ChangeSignatureProcessor extends ChangeSignatureProcessorBase {
public ChangeSignatureProcessor(Project project,
PsiMethod method,
final boolean generateDelegate,
@Modifier String newVisibility,
@PsiModifier.ModifierConstant String newVisibility,
String newName,
PsiType newType,
@NotNull ParameterInfoImpl[] parameterInfo) {
@@ -62,7 +62,7 @@ public class ChangeSignatureProcessor extends ChangeSignatureProcessorBase {
public ChangeSignatureProcessor(Project project,
PsiMethod method,
final boolean generateDelegate,
String newVisibility,
@PsiModifier.ModifierConstant String newVisibility,
String newName,
PsiType newType,
ParameterInfoImpl[] parameterInfo,
@@ -75,7 +75,7 @@ public class ChangeSignatureProcessor extends ChangeSignatureProcessorBase {
public ChangeSignatureProcessor(Project project,
PsiMethod method,
boolean generateDelegate,
@Modifier String newVisibility,
@PsiModifier.ModifierConstant String newVisibility,
String newName,
CanonicalTypes.Type newType,
@NotNull ParameterInfoImpl[] parameterInfo,
@@ -93,7 +93,7 @@ public class ChangeSignatureProcessor extends ChangeSignatureProcessorBase {
private static JavaChangeInfo generateChangeInfo(PsiMethod method,
boolean generateDelegate,
@Modifier String newVisibility,
@PsiModifier.ModifierConstant String newVisibility,
String newName,
CanonicalTypes.Type newType,
@NotNull ParameterInfoImpl[] parameterInfo,
java/java-impl/src/com/intellij/refactoring/changeSignature/DetectedJavaChangeInfo.java
+1 -1
View File
@@ -43,7 +43,7 @@ class DetectedJavaChangeInfo extends JavaChangeInfoImpl {
private PsiMethod mySuperMethod;
private String[] myModifiers;
DetectedJavaChangeInfo(String newVisibility,
DetectedJavaChangeInfo(@PsiModifier.ModifierConstant String newVisibility,
PsiMethod method,
CanonicalTypes.Type newType,
@NotNull ParameterInfoImpl[] newParms,
java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeInfo.java
+1 -1
View File
@@ -38,7 +38,7 @@ public interface JavaChangeInfo extends ChangeInfo {
@NotNull
JavaParameterInfo[] getNewParameters();
@Modifier
@PsiModifier.ModifierConstant
String getNewVisibility();
@NotNull
java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeInfoImpl.java
+4 -4
View File
@@ -35,7 +35,7 @@ import java.util.*;
class JavaChangeInfoImpl implements JavaChangeInfo {
private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.changeSignature.JavaChangeInfoImpl");
@Modifier
@PsiModifier.ModifierConstant
final String newVisibility;
private PsiMethod method;
String oldName;
@@ -71,7 +71,7 @@ class JavaChangeInfoImpl implements JavaChangeInfo {
/**
* @param newExceptions null if not changed
*/
public JavaChangeInfoImpl(@Modifier String newVisibility,
public JavaChangeInfoImpl(@PsiModifier.ModifierConstant String newVisibility,
PsiMethod method,
String newName,
CanonicalTypes.Type newType,
@@ -88,7 +88,7 @@ class JavaChangeInfoImpl implements JavaChangeInfo {
* @param newExceptions null if not changed
* @param oldName
*/
public JavaChangeInfoImpl(String newVisibility,
public JavaChangeInfoImpl(@PsiModifier.ModifierConstant String newVisibility,
PsiMethod method,
String newName,
CanonicalTypes.Type newType,
@@ -222,7 +222,7 @@ class JavaChangeInfoImpl implements JavaChangeInfo {
return newParms;
}
@Modifier
@PsiModifier.ModifierConstant
public String getNewVisibility() {
return newVisibility;
}
java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDescriptor.java
+3 -3
View File
@@ -20,9 +20,9 @@
*/
package com.intellij.refactoring.encapsulateFields;
import com.intellij.psi.Modifier;
import com.intellij.psi.PsiField;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiModifier;
import org.jetbrains.annotations.Nullable;
public interface EncapsulateFieldsDescriptor {
@@ -44,10 +44,10 @@ public interface EncapsulateFieldsDescriptor {
boolean isToUseAccessorsWhenAccessible();
@Modifier
@PsiModifier.ModifierConstant
String getFieldsVisibility();
@Modifier
@PsiModifier.ModifierConstant
String getAccessorsVisibility();
int getJavadocPolicy();
java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java
+2 -2
View File
@@ -210,7 +210,7 @@ public class EncapsulateFieldsDialog extends RefactoringDialog implements Encaps
return myCbUseAccessorsWhenAccessible.isSelected();
}
@Modifier
@PsiModifier.ModifierConstant
public String getFieldsVisibility() {
if (myRbFieldPrivate.isSelected()) {
return PsiModifier.PRIVATE;
@@ -234,7 +234,7 @@ public class EncapsulateFieldsDialog extends RefactoringDialog implements Encaps
return "#com.intellij.refactoring.encapsulateFields.EncalpsulateFieldsDialog";
}
@Modifier
@PsiModifier.ModifierConstant
public String getAccessorsVisibility() {
if (myRbAccessorPublic.isSelected()) {
return PsiModifier.PUBLIC;
java/java-impl/src/com/intellij/refactoring/extractMethod/AbstractExtractDialog.java
+2
View File
@@ -22,6 +22,7 @@ package com.intellij.refactoring.extractMethod;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.psi.PsiModifier;
import com.intellij.refactoring.util.ParameterTablePanel;
public abstract class AbstractExtractDialog extends DialogWrapper {
@@ -34,6 +35,7 @@ public abstract class AbstractExtractDialog extends DialogWrapper {
public abstract ParameterTablePanel.VariableData[] getChosenParameters();
@PsiModifier.ModifierConstant
public abstract String getVisibility();
public abstract boolean isMakeStatic();
java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
+5 -8
View File
@@ -55,10 +55,7 @@ import com.intellij.psi.search.PsiElementProcessor;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.PsiFormatUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.PsiUtilBase;
import com.intellij.psi.util.*;
import com.intellij.refactoring.HelpID;
import com.intellij.refactoring.RefactoringBundle;
import com.intellij.refactoring.extractMethodObject.ExtractMethodObjectHandler;
@@ -128,7 +125,7 @@ public class ExtractMethodProcessor implements MatchProvider {
protected boolean myIsChainedConstructor;
private DuplicatesFinder myDuplicatesFinder;
private List<Match> myDuplicates;
@Modifier private String myMethodVisibility = PsiModifier.PRIVATE;
@PsiModifier.ModifierConstant private String myMethodVisibility = PsiModifier.PRIVATE;
protected boolean myGenerateConditionalExit;
private PsiStatement myFirstExitStatementCopy;
private PsiMethod myExtractedMethod;
@@ -185,7 +182,7 @@ public class ExtractMethodProcessor implements MatchProvider {
}
}
return PsiUtilBase.toPsiElementArray(result);
return PsiUtilCore.toPsiElementArray(result);
}
/**
@@ -524,12 +521,12 @@ public class ExtractMethodProcessor implements MatchProvider {
}
}
if (myExpression != null) {
myDuplicatesFinder = new DuplicatesFinder(PsiUtilBase.toPsiElementArray(elements), myInputVariables.copy(),
myDuplicatesFinder = new DuplicatesFinder(PsiUtilCore.toPsiElementArray(elements), myInputVariables.copy(),
new ArrayList<PsiVariable>());
myDuplicates = myDuplicatesFinder.findDuplicates(myTargetClass);
}
else if (elements.size() > 0){
myDuplicatesFinder = new DuplicatesFinder(PsiUtilBase.toPsiElementArray(elements), myInputVariables.copy(),
myDuplicatesFinder = new DuplicatesFinder(PsiUtilCore.toPsiElementArray(elements), myInputVariables.copy(),
myOutputVariable != null ? new VariableReturnValue(myOutputVariable) : null,
Arrays.asList(myOutputVariables));
myDuplicates = myDuplicatesFinder.findDuplicates(myTargetClass);
java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java
+3 -3
View File
@@ -807,7 +807,7 @@ public class InheritanceToDelegationProcessor extends BaseRefactoringProcessor {
final MethodSignature signature = myMethod.getSignature(substitutor);
PsiMethod outerMethod = MethodSignatureUtil.findMethodBySignature(myClass, signature, false);
if (outerMethod == null) {
@Modifier String visibility = checkOuterClassAbstractMethod(signature);
String visibility = checkOuterClassAbstractMethod(signature);
PsiMethod newOuterMethod = (PsiMethod)myClass.add(myMethod);
PsiUtil.setModifierProperty(newOuterMethod, visibility, true);
final PsiDocComment docComment = newOuterMethod.getDocComment();
@@ -862,9 +862,9 @@ public class InheritanceToDelegationProcessor extends BaseRefactoringProcessor {
* @param methodSignature
* @return Visibility
*/
@Modifier
@PsiModifier.ModifierConstant
private String checkOuterClassAbstractMethod(MethodSignature methodSignature) {
@Modifier String visibility = PsiModifier.PROTECTED;
String visibility = PsiModifier.PROTECTED;
for (PsiMethod method : myDelegatedMethods) {
MethodSignature otherSignature = method.getSignature(getSuperSubstitutor(method.getContainingClass()));
java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldDialog.java
+1 -1
View File
@@ -101,7 +101,7 @@ class IntroduceFieldDialog extends DialogWrapper {
return myCentralPanel.getInitializerPlace();
}
@Modifier
@PsiModifier.ModifierConstant
public String getFieldVisibility() {
return myCentralPanel.getFieldVisibility();
}
java/java-impl/src/com/intellij/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryProcessor.java
+2 -1
View File
@@ -283,7 +283,8 @@ public class ReplaceConstructorWithFactoryProcessor extends BaseRefactoringProce
return (PsiMethod)CodeStyleManager.getInstance(myProject).reformat(factoryMethod);
}
@Modifier private String getDefaultFactoryVisibility() {
@PsiModifier.ModifierConstant
private String getDefaultFactoryVisibility() {
final PsiModifierList modifierList;
if (myConstructor != null) {
modifierList = myConstructor.getModifierList();
java/java-impl/src/com/intellij/refactoring/util/RefactoringConflictsUtil.java
+1 -1
View File
@@ -71,7 +71,7 @@ public class RefactoringConflictsUtil {
}
public static void checkAccessibilityConflicts(@NotNull PsiMember member,
@Nullable String newVisibility,
@PsiModifier.ModifierConstant @Nullable String newVisibility,
@Nullable PsiClass targetClass,
@NotNull Set<PsiMember> membersToMove,
@NotNull MultiMap<PsiElement, String> conflicts) {