Bug 537467 - Fix regression in ot.RenameVirtualMethodInClassTests after

changes in JDT/UI

2 files changed, 23 insertions, 0 deletions

diff --git a/plugins/org.eclipse.objectteams.otdt.refactoring/plugin.xml b/plugins/org.eclipse.objectteams.otdt.refactoring/plugin.xml
index fa0f24c65..ae96a9c1a 100644
--- a/plugins/org.eclipse.objectteams.otdt.refactoring/plugin.xml
+++ b/plugins/org.eclipse.objectteams.otdt.refactoring/plugin.xml
@@ -129,6 +129,11 @@
                class="org.eclipse.objectteams.otdt.internal.refactoring.adaptor.ReorgAdaptor"
                icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
          </team>
+         <team
+               activation="ALL_THREADS"
+               class="org.eclipse.objectteams.otdt.internal.refactoring.adaptor.RenameAdaptor"
+               icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
+         </team>
       </aspectBinding>
       <aspectBinding
             icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/calloutbinding_obj.gif">
diff --git a/plugins/org.eclipse.objectteams.otdt.refactoring/src/org/eclipse/objectteams/otdt/internal/refactoring/adaptor/RenameAdaptor.java b/plugins/org.eclipse.objectteams.otdt.refactoring/src/org/eclipse/objectteams/otdt/internal/refactoring/adaptor/RenameAdaptor.java
index 0a19d0b9c..fec302cc3 100644
--- a/plugins/org.eclipse.objectteams.otdt.refactoring/src/org/eclipse/objectteams/otdt/internal/refactoring/adaptor/RenameAdaptor.java
+++ b/plugins/org.eclipse.objectteams.otdt.refactoring/src/org/eclipse/objectteams/otdt/internal/refactoring/adaptor/RenameAdaptor.java
@@ -31,6 +31,7 @@ import org.eclipse.jdt.core.Flags;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IImportDeclaration;
 import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IMember;
 import org.eclipse.jdt.core.IMethod;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
@@ -73,6 +74,7 @@ import base org.eclipse.jdt.internal.corext.refactoring.rename.RenameAnalyzeUtil
 import base org.eclipse.jdt.internal.corext.refactoring.rename.RenamePackageProcessor.ImportsManager;
 import base org.eclipse.jdt.internal.corext.refactoring.rename.RenamePackageProcessor.PackageRenamer;
 import base org.eclipse.jdt.internal.corext.refactoring.rename.RenamePackageProcessor.ImportsManager.ImportChange;
+import base org.eclipse.jdt.internal.corext.util.JavaModelUtil;
 
 /**
  * @author stephan
@@ -279,6 +281,22 @@ public team class RenameAdaptor
 		IMethod getMethod() 		      -> IMethod getMethod();
 	}
 	
+	@SuppressWarnings("decapsulation") // base class is final
+	protected class JMUtil playedBy JavaModelUtil {
+
+		isVisibleInHierarchy <- replace isVisibleInHierarchy;
+
+		@SuppressWarnings("basecall")
+		static callin boolean isVisibleInHierarchy(IMember member, IPackageFragment pack) throws JavaModelException {
+			if (Flags.isPrivate(member.getFlags())) {
+				IType declaringType = member.getDeclaringType();
+				if (OTModelManager.isRole(declaringType) && pack.equals(declaringType.getPackageFragment()))
+					return true;
+			}
+			return base.isVisibleInHierarchy(member, pack);
+		}
+	}
+	
 	/** Detect when trying to rename a team package. */
 	protected class RenamePackage playedBy RenamePackageProcessor {