CallToProtectedOrDefaultMethodChecker: renaming

diff --git a/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/analyzers/CallToProtectedOrDefaultMethodChecker.java b/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/analyzers/CallToProtectedOrPackagePrivateMethodChecker.java
similarity index 82%
rename from software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/analyzers/CallToProtectedOrDefaultMethodChecker.java
rename to software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/analyzers/CallToProtectedOrPackagePrivateMethodChecker.java
index 49ada0915bcb13f264ce87ad90c50a727e2f5bab..102a24a71fce2f7907bf9707fe3649e60ac48b34 100644 (file)
--- a/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/analyzers/CallToProtectedOrDefaultMethodChecker.java
+++ b/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/analyzers/CallToProtectedOrPackagePrivateMethodChecker.java
@@ -11,9 +11,9 @@ import org.eclipse.jdt.core.dom.MethodInvocation;
 import org.eclipse.jdt.core.dom.Modifier;
 
 // TODO: file bug report
-public class CallToProtectedOrDefaultMethodChecker extends PropertyCollector implements Checker {
+public class CallToProtectedOrPackagePrivateMethodChecker extends PropertyCollector implements Checker {
 
-       public CallToProtectedOrDefaultMethodChecker(CompilationUnitTextSelection selection) {
+       public CallToProtectedOrPackagePrivateMethodChecker(CompilationUnitTextSelection selection) {
                super(selection);
        }
        
@@ -32,10 +32,10 @@ public class CallToProtectedOrDefaultMethodChecker extends PropertyCollector imp
                IMethodBinding methodBinding = node.resolveMethodBinding();
                assert methodBinding != null;
                int modifiers = methodBinding.getModifiers();
-               return !Modifier.isFinal(modifiers) && (Modifier.isProtected(modifiers) || isDefault(modifiers));
+               return !Modifier.isFinal(modifiers) && (Modifier.isProtected(modifiers) || isPackagePrivate(modifiers));
        }
 
-       private boolean isDefault(int modifiers) {
+       private boolean isPackagePrivate(int modifiers) {
                return !(Modifier.isPrivate(modifiers) || Modifier.isProtected(modifiers) || Modifier.isPublic(modifiers));
        }
 

diff --git a/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/analyzers/LegalStatementsChecker.java b/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/analyzers/LegalStatementsChecker.java
index 1dc8e495d0fd5760eba8b149a66140291249e758..1915cb1e91044f2094bba52907855393256cf22e 100644 (file)
--- a/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/analyzers/LegalStatementsChecker.java
+++ b/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/analyzers/LegalStatementsChecker.java
@@ -13,7 +13,7 @@ public class LegalStatementsChecker {
 
        public LegalStatementsChecker(CompilationUnitTextSelection selection) {
                checkers = new LinkedList<Checker>();
-               checkers.add(new CallToProtectedOrDefaultMethodChecker(selection));
+               checkers.add(new CallToProtectedOrPackagePrivateMethodChecker(selection));
                checkers.add(new UseOfNonStaticInnerClassChecker(selection));
                checkers.add(new EnclosingInstanceReferenceChecker(selection));
                // TODO: check out org.eclipse.jdt.internal.corext.refactoring.structure.MoveInstanceMethodProcessor.RecursiveCallFinder