X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/JdtFlags.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/JdtFlags.java index a16877f..4f19663 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/JdtFlags.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/JdtFlags.java @@ -13,9 +13,9 @@ package net.sourceforge.phpdt.internal.corext.util; import java.lang.reflect.Modifier; import net.sourceforge.phpdt.core.Flags; -import net.sourceforge.phpdt.core.IJavaElement; +//import net.sourceforge.phpdt.core.IJavaElement; import net.sourceforge.phpdt.core.IMember; -import net.sourceforge.phpdt.core.IType; +//import net.sourceforge.phpdt.core.IType; import net.sourceforge.phpdt.core.JavaModelException; //incastrix //import net.sourceforge.phpdt.internal.corext.Assert; @@ -35,11 +35,11 @@ public class JdtFlags { public static final int VISIBILITY_CODE_INVALID = -1; - public static boolean isAbstract(IMember member) throws JavaModelException { - if (isInterfaceMethod(member)) - return true; - return Flags.isAbstract(member.getFlags()); - } +// public static boolean isAbstract(IMember member) throws JavaModelException { +// if (isInterfaceMethod(member)) +// return true; +// return Flags.isAbstract(member.getFlags()); +// } // public static boolean isAbstract(IMethodBinding member) { // if (isInterfaceMember(member)) @@ -47,27 +47,27 @@ public class JdtFlags { // return Modifier.isAbstract(member.getModifiers()); // } - public static boolean isDeprecated(IMember member) - throws JavaModelException { - return Flags.isDeprecated(member.getFlags()); - } +// public static boolean isDeprecated(IMember member) +// throws JavaModelException { +// return Flags.isDeprecated(member.getFlags()); +// } - public static boolean isFinal(IMember member) throws JavaModelException { - if (isInterfaceField(member)) - return true; - if (isAnonymousType(member)) - return true; - return Flags.isFinal(member.getFlags()); - } +// public static boolean isFinal(IMember member) throws JavaModelException { +// if (isInterfaceField(member)) +// return true; +// if (isAnonymousType(member)) +// return true; +// return Flags.isFinal(member.getFlags()); +// } // public static boolean isNative(IMember member) throws JavaModelException{ // return Flags.isNative(member.getFlags()); // } - public static boolean isPackageVisible(IMember member) - throws JavaModelException { - return (!isPrivate(member) && !isProtected(member) && !isPublic(member)); - } +// public static boolean isPackageVisible(IMember member) +// throws JavaModelException { +// return (!isPrivate(member) && !isProtected(member) && !isPublic(member)); +// } // public static boolean isPackageVisible(BodyDeclaration bodyDeclaration) { // return (! isPrivate(bodyDeclaration) && ! isProtected(bodyDeclaration) && @@ -122,14 +122,14 @@ public class JdtFlags { // return Modifier.isPublic(bodyDeclaration.getModifiers()); // } - public static boolean isStatic(IMember member) throws JavaModelException { - if (isNestedInterface(member)) - return true; - if (member.getElementType() != IJavaElement.METHOD - && isInterfaceMember(member)) - return true; - return Flags.isStatic(member.getFlags()); - } +// public static boolean isStatic(IMember member) throws JavaModelException { +// if (isNestedInterface(member)) +// return true; +// if (member.getElementType() != IJavaElement.METHOD +// && isInterfaceMember(member)) +// return true; +// return Flags.isStatic(member.getFlags()); +// } // public static boolean isStatic(IMethodBinding methodBinding){ // return Modifier.isStatic(methodBinding.getModifiers()); @@ -166,17 +166,17 @@ public class JdtFlags { // return Flags.isVolatile(member.getFlags()); // } - private static boolean isInterfaceMethod(IMember member) - throws JavaModelException { - return member.getElementType() == IJavaElement.METHOD - && isInterfaceMember(member); - } - - private static boolean isInterfaceField(IMember member) - throws JavaModelException { - return member.getElementType() == IJavaElement.FIELD - && isInterfaceMember(member); - } +// private static boolean isInterfaceMethod(IMember member) +// throws JavaModelException { +// return member.getElementType() == IJavaElement.METHOD +// && isInterfaceMember(member); +// } +// +// private static boolean isInterfaceField(IMember member) +// throws JavaModelException { +// return member.getElementType() == IJavaElement.FIELD +// && isInterfaceMember(member); +// } private static boolean isInterfaceMember(IMember member) throws JavaModelException { @@ -202,18 +202,18 @@ public class JdtFlags { // ((TypeDeclaration)bodyDeclaration.getParent()).isInterface(); // } - private static boolean isNestedInterface(IMember member) - throws JavaModelException { - return member.getElementType() == IJavaElement.TYPE - && member.getDeclaringType() != null - && ((IType) member).isInterface(); - } - - private static boolean isAnonymousType(IMember member) - throws JavaModelException { - return member.getElementType() == IJavaElement.TYPE - && ((IType) member).isAnonymous(); - } +// private static boolean isNestedInterface(IMember member) +// throws JavaModelException { +// return member.getElementType() == IJavaElement.TYPE +// && member.getDeclaringType() != null +// && ((IType) member).isInterface(); +// } +// +// private static boolean isAnonymousType(IMember member) +// throws JavaModelException { +// return member.getElementType() == IJavaElement.TYPE +// && ((IType) member).isAnonymous(); +// } public static int getVisibilityCode(IMember member) throws JavaModelException { @@ -297,19 +297,19 @@ public class JdtFlags { } } - public static int getLowerVisibility(int visibility1, int visibility2) { - if (isHigherVisibility(visibility1, visibility2)) - return visibility2; - else - return visibility1; - } - - public static int clearAccessModifiers(int flags) { - return clearFlag(Modifier.PROTECTED | Modifier.PUBLIC - | Modifier.PRIVATE, flags); - } - - public static int clearFlag(int flag, int flags) { - return flags & ~flag; - } +// public static int getLowerVisibility(int visibility1, int visibility2) { +// if (isHigherVisibility(visibility1, visibility2)) +// return visibility2; +// else +// return visibility1; +// } + +// public static int clearAccessModifiers(int flags) { +// return clearFlag(Modifier.PROTECTED | Modifier.PUBLIC +// | Modifier.PRIVATE, flags); +// } + +// public static int clearFlag(int flag, int flags) { +// return flags & ~flag; +// } }