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

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/openapi/src/com/intellij/codeInsight/intention/QuickFixFactory.java
+7 -7
View File
@@ -31,13 +31,13 @@ public abstract class QuickFixFactory {
}
public abstract LocalQuickFixAndIntentionActionOnPsiElement createModifierListFix(@NotNull PsiModifierList modifierList,
@Modifier @NotNull String modifier,
boolean shouldHave,
final boolean showContainingClass);
@PsiModifier.ModifierConstant @NotNull String modifier,
boolean shouldHave,
final boolean showContainingClass);
public abstract LocalQuickFixAndIntentionActionOnPsiElement createModifierListFix(@NotNull PsiModifierListOwner owner,
@Modifier @NotNull String modifier,
boolean shouldHave,
final boolean showContainingClass);
@PsiModifier.ModifierConstant @NotNull String modifier,
boolean shouldHave,
final boolean showContainingClass);
public abstract LocalQuickFixAndIntentionActionOnPsiElement createMethodReturnFix(@NotNull PsiMethod method, @NotNull PsiType toReturn, boolean fixWholeHierarchy);
public abstract LocalQuickFixAndIntentionActionOnPsiElement createAddMethodFix(@NotNull PsiMethod method, @NotNull PsiClass toClass);
@@ -50,7 +50,7 @@ public abstract class QuickFixFactory {
public abstract LocalQuickFixAndIntentionActionOnPsiElement createImplementMethodsFix(@NotNull PsiClass psiElement);
public abstract LocalQuickFixAndIntentionActionOnPsiElement createMethodThrowsFix(@NotNull PsiMethod method, @NotNull PsiClassType exceptionClass, boolean shouldThrow, boolean showContainingClass);
public abstract LocalQuickFixAndIntentionActionOnPsiElement createAddDefaultConstructorFix(@NotNull PsiClass aClass);
public abstract LocalQuickFixAndIntentionActionOnPsiElement createAddConstructorFix(@NotNull PsiClass aClass, @Modifier String modifier);
public abstract LocalQuickFixAndIntentionActionOnPsiElement createAddConstructorFix(@NotNull PsiClass aClass, @PsiModifier.ModifierConstant String modifier);
public abstract LocalQuickFixAndIntentionActionOnPsiElement createMethodParameterTypeFix(@NotNull PsiMethod method, int index, @NotNull PsiType newType, boolean fixWholeHierarchy);
public abstract LocalQuickFixAndIntentionActionOnPsiElement createMakeClassInterfaceFix(@NotNull PsiClass aClass);
public abstract LocalQuickFixAndIntentionActionOnPsiElement createMakeClassInterfaceFix(@NotNull PsiClass aClass, final boolean makeInterface);
java/openapi/src/com/intellij/codeInspection/reference/RefJavaElement.java
+2 -2
View File
@@ -20,7 +20,7 @@
*/
package com.intellij.codeInspection.reference;
import com.intellij.psi.Modifier;
import com.intellij.psi.PsiModifier;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -70,6 +70,6 @@ public interface RefJavaElement extends RefElement {
* @return the modifier, or null if the element does not have any access modifier.
*/
@Nullable
@Modifier
@PsiModifier.ModifierConstant
String getAccessModifier();
}
java/openapi/src/com/intellij/ide/IconUtilEx.java
+2 -2
View File
@@ -28,12 +28,12 @@ import javax.swing.*;
public class IconUtilEx {
public static Icon getIcon(Object object, int flags, Project project) {
public static Icon getIcon(Object object, @Iconable.IconFlags int flags, Project project) {
if (object instanceof PsiElement) {
return ((PsiElement)object).getIcon(flags);
}
if (object instanceof Module) {
return ModuleType.get(((Module)object)).getNodeIcon((flags & Iconable.ICON_FLAG_OPEN) != 0);
return ModuleType.get((Module)object).getNodeIcon((flags & Iconable.ICON_FLAG_OPEN) != 0);
}
if (object instanceof VirtualFile) {
VirtualFile file = (VirtualFile)object;
java/openapi/src/com/intellij/psi/JavaCodeFragmentFactory.java
+4 -1
View File
@@ -17,6 +17,7 @@ package com.intellij.psi;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.project.Project;
import org.intellij.lang.annotations.MagicConstant;
import org.jetbrains.annotations.NotNull;
public abstract class JavaCodeFragmentFactory {
@@ -90,7 +91,9 @@ public abstract class JavaCodeFragmentFactory {
* @return the created code fragment.
*/
@NotNull
public abstract PsiTypeCodeFragment createTypeCodeFragment(@NotNull String text, PsiElement context, boolean isPhysical, int flags);
public abstract PsiTypeCodeFragment createTypeCodeFragment(@NotNull String text, PsiElement context, boolean isPhysical,
@MagicConstant(flags = {ALLOW_VOID, ALLOW_ELLIPSIS, ALLOW_DISJUNCTION})
int flags);
/**
* Creates a Java reference code fragment from the text of a Java reference to a
java/openapi/src/com/intellij/psi/util/PsiMatchers.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class PsiMatchers {
private PsiMatchers() {
}
public static PsiMatcherExpression hasModifier(@Modifier final String modifier, final boolean shouldHave) {
public static PsiMatcherExpression hasModifier(@PsiModifier.ModifierConstant final String modifier, final boolean shouldHave) {
return new PsiMatcherExpression() {
@Override
public Boolean match(PsiElement element) {
java/openapi/src/com/intellij/util/VisibilityUtil.java
+11 -11
View File
@@ -45,12 +45,12 @@ public class VisibilityUtil {
private VisibilityUtil() {
}
public static int compare(@Modifier String v1, @Modifier String v2) {
public static int compare(@PsiModifier.ModifierConstant String v1, @PsiModifier.ModifierConstant String v2) {
return ArrayUtil.find(visibilityModifiers, v2) - ArrayUtil.find(visibilityModifiers, v1);
}
@Modifier
public static String getHighestVisibility(@Modifier String v1, @Modifier String v2) {
@PsiModifier.ModifierConstant
public static String getHighestVisibility(@PsiModifier.ModifierConstant String v1, @PsiModifier.ModifierConstant String v2) {
if(v1.equals(v2)) return v1;
if(PsiModifier.PRIVATE.equals(v1)) return v2;
@@ -68,13 +68,13 @@ public class VisibilityUtil {
if(modifier.equals(visibilityModifier)) break;
}
for(;index < visibilityModifiers.length && !PsiUtil.isAccessible(modifierListOwner, place, null); index++) {
@Modifier String modifier = visibilityModifiers[index];
@PsiModifier.ModifierConstant String modifier = visibilityModifiers[index];
PsiUtil.setModifierProperty(modifierListOwner, modifier, true);
}
}
@Modifier
@PsiModifier.ModifierConstant
public static String getPossibleVisibility(final PsiMember psiMethod, final PsiElement place) {
if (PsiUtil.isAccessible(psiMethod, place, null)) return getVisibilityModifier(psiMethod.getModifierList());
if (JavaPsiFacade.getInstance(psiMethod.getProject()).arePackagesTheSame(psiMethod, place)) {
@@ -87,10 +87,10 @@ public class VisibilityUtil {
return PsiModifier.PUBLIC;
}
@Modifier
@PsiModifier.ModifierConstant
public static String getVisibilityModifier(PsiModifierList list) {
if (list == null) return PsiModifier.PACKAGE_LOCAL;
for (@Modifier String modifier : visibilityModifiers) {
for (@PsiModifier.ModifierConstant String modifier : visibilityModifiers) {
if (list.hasModifierProperty(modifier)) {
return modifier;
}
@@ -98,7 +98,7 @@ public class VisibilityUtil {
return PsiModifier.PACKAGE_LOCAL;
}
public static String getVisibilityString(@Modifier String visibilityModifier) {
public static String getVisibilityString(@PsiModifier.ModifierConstant String visibilityModifier) {
if(PsiModifier.PACKAGE_LOCAL.equals(visibilityModifier)) {
return "";
}
@@ -119,11 +119,11 @@ public class VisibilityUtil {
return toPresentableText(PsiModifier.PACKAGE_LOCAL);
}
public static String toPresentableText(@Modifier String modifier) {
public static String toPresentableText(@PsiModifier.ModifierConstant String modifier) {
return PsiBundle.visibilityPresentation(modifier);
}
public static void fixVisibility(UsageInfo[] usageInfos, PsiMember member, final String newVisibility) {
public static void fixVisibility(UsageInfo[] usageInfos, PsiMember member, @PsiModifier.ModifierConstant String newVisibility) {
if (newVisibility == null) return;
if (ESCALATE_VISIBILITY.equals(newVisibility)) {
for (UsageInfo info : usageInfos) {
@@ -137,7 +137,7 @@ public class VisibilityUtil {
}
}
public static void setVisibility(PsiModifierList modifierList, @Modifier String newVisibility) throws IncorrectOperationException {
public static void setVisibility(PsiModifierList modifierList, @PsiModifier.ModifierConstant String newVisibility) throws IncorrectOperationException {
modifierList.setModifierProperty(PsiModifier.PRIVATE, false);
modifierList.setModifierProperty(PsiModifier.PUBLIC, false);
modifierList.setModifierProperty(PsiModifier.PROTECTED, false);