move away from using helper methods on Member

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignature.java b/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignature.java
index 7ccf5211ae98efc6435920b74d04c0cf27aa59fb..128a0d739bd00976dcca586707b78a9ca5d807c0 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignature.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignature.java
@@ -280,10 +280,6 @@ public class JoinPointSignature implements ResolvedMember {
                return realMember.isStatic();
        }
 
-       public boolean isPrivate() {
-               return realMember.isPrivate();
-       }
-
        public boolean canBeParameterized() {
                return realMember.canBeParameterized();
        }

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Member.java b/org.aspectj.matcher/src/org/aspectj/weaver/Member.java
index f36650f4ac90e57822cc2d381b7a73431c389513..7425ab2ce1feabdfa6cc44a2e2037941db65a8b4 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/Member.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/Member.java
@@ -72,8 +72,6 @@ public interface Member extends Comparable {
 
        public boolean isStatic();
 
-       public boolean isPrivate();
-
        /**
         * Returns true iff the member is generic (NOT parameterized)
         */

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java b/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java
index d83689a63dc03eb8a1a773d151d1b88a91d30803..712e6f30babb243eba1ecbcbdd01967f05e630c0 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java
@@ -626,7 +626,8 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Anno
        }
 
        public boolean isDefault() {
-               return !(isPublic() || isProtected() || isPrivate());
+               int mods = getModifiers();
+               return !(Modifier.isPublic(mods) || Modifier.isProtected(mods) || Modifier.isPrivate(mods));
        }
 
        public boolean isVisible(ResolvedType fromType) {

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedType.java b/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedType.java
index e8ccefa656c7cb56699a9b314202e1f45f0e626c..c6b2b15b886c238cc049709c2ca5dbbf91c9af41 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedType.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedType.java
@@ -1893,7 +1893,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl
                        return false;
                }
                // now have to test that itdMember is visible from targetType
-               if (itdMember.isPrivate()) {
+               if (Modifier.isPrivate(itdMember.getModifiers())) {
                        return false;
                }
                if (itdMember.isPublic()) {

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ReferencePointcut.java b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ReferencePointcut.java
index de58787b56c46ce132f005b419c241390e5faddd..d9369b9a93d661d1d00644aa8453150a7d7663d0 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ReferencePointcut.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ReferencePointcut.java
@@ -296,7 +296,7 @@ public class ReferencePointcut extends Pointcut {
                                declaringType = searchStart;
                        }
                        pointcutDec = declaringType.findPointcut(name);
-                       boolean foundMatchingPointcut = (pointcutDec != null && pointcutDec.isPrivate());
+                       boolean foundMatchingPointcut = (pointcutDec != null && Modifier.isPrivate(pointcutDec.getModifiers()));
                        if (!foundMatchingPointcut) {
                                pointcutDec = searchStart.findPointcut(name);
                                if (pointcutDec == null) {