From: Erlend Kristiansen <erlenkr@ifi.uio.no>
Date: Wed, 2 Apr 2014 18:30:10 +0000 (+0200)
Subject: CallToProtectedOrDefaultMethodChecker: renaming
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=322d337d980760c5401f0a105c9a46010bab40bc;p=ifi-stolz-refaktor.git

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 49ada091..102a24a7 100644
--- 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 1dc8e495..1915cb1e 100644
--- 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