avoid using helpers on Member hierarchy

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignature.java b/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignature.java
index 128a0d739bd00976dcca586707b78a9ca5d807c0..2649cf1fa345057efb0688269e4d44c85af931e9 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignature.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignature.java
@@ -165,10 +165,6 @@ public class JoinPointSignature implements ResolvedMember {
        public boolean isPublic() {
                return realMember.isPublic();
        }
-
-       public boolean isProtected() {
-               return realMember.isProtected();
-       }
        
        public boolean isDefault() {
                return realMember.isDefault();

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignatureIterator.java b/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignatureIterator.java
index 1597989eda27d344c8412314a901418a9953e67b..50332c1c01296a922e00354cc8ad20fb96929faf 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignatureIterator.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignatureIterator.java
@@ -163,7 +163,7 @@ public class JoinPointSignatureIterator implements Iterator<JoinPointSignature>
                if (signaturesOfMember.getKind() == Member.FIELD) {
                        return false;
                }
-               if (signaturesOfMember.isStatic()) {
+               if (Modifier.isStatic(signaturesOfMember.getModifiers())) {
                        return false;
                }
                return true;

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Member.java b/org.aspectj.matcher/src/org/aspectj/weaver/Member.java
index 7425ab2ce1feabdfa6cc44a2e2037941db65a8b4..de84dd4162776dc6de8da063b3a99fd04f33ca34 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/Member.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/Member.java
@@ -21,6 +21,7 @@ import java.util.Collection;
 public interface Member extends Comparable {
 
        public static final Member[] NONE = new Member[0];
+       
        public static final MemberKind METHOD = new MemberKind("METHOD", 1);
        public static final MemberKind FIELD = new MemberKind("FIELD", 2);
        public static final MemberKind CONSTRUCTOR = new MemberKind("CONSTRUCTOR", 3);

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/MemberImpl.java b/org.aspectj.matcher/src/org/aspectj/weaver/MemberImpl.java
index e10174a2655fd416625da7bc8989e911795c070f..3dfc3c3a00e7573cf2c03e3a9f1bcfe60405cc7f 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/MemberImpl.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/MemberImpl.java
@@ -437,7 +437,7 @@ public class MemberImpl implements Member {
                        // this is wrong if the member doesn't exist, but that doesn't
                        // matter
                        ret.add(myType);
-               } else if (isStatic() || kind == FIELD) {
+               } else if (Modifier.isStatic(modifiers) || kind == FIELD) {
                        walkUpStatic(ret, myType);
                } else {
                        walkUp(ret, myType);

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMember.java b/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMember.java
index 37c9edbffafa5d840c32088db1ca92c0d7b92732..f49ef4845db15b8ff4eae55b9464d55302965ed5 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMember.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMember.java
@@ -94,8 +94,6 @@ public interface ResolvedMember extends Member, AnnotatedElement, TypeVariableDe
 
        public boolean isPublic();
 
-       public boolean isProtected();
-
        public boolean isDefault();
 
        public boolean isVisible(ResolvedType fromType);

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java b/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java
index 712e6f30babb243eba1ecbcbdd01967f05e630c0..330e2792030e725ec1f9bd58624c68a7a89cad87 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java
@@ -152,7 +152,7 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Anno
                if (aMember.getKind() == Member.FIELD) {
                        return false;
                }
-               if (aMember.isStatic()) {
+               if (Modifier.isStatic(aMember.getModifiers())) {
                        return false;
                }
                return true;
@@ -621,10 +621,6 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Anno
                return Modifier.isPublic(modifiers);
        }
 
-       public boolean isProtected() {
-               return Modifier.isProtected(modifiers);
-       }
-
        public boolean isDefault() {
                int mods = getModifiers();
                return !(Modifier.isPublic(mods) || Modifier.isProtected(mods) || Modifier.isPrivate(mods));