Cleanup for Bug 321411 - [hierarchy] Replace OTTypeHierarchy with adapting the original TypeHierarchy
(remove old cruft and apply new style hierarchy query)
diff --git a/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/callinmarkers/CallinMarkerCreator2.java b/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/callinmarkers/CallinMarkerCreator2.java
index ba860c9..bbccc5f 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/callinmarkers/CallinMarkerCreator2.java
+++ b/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/callinmarkers/CallinMarkerCreator2.java
@@ -343,13 +343,10 @@
collectedRoleTypes.addAll(value);
for (IType member : value) {
if (submon.isCanceled()) return null;
- if (member.exists()) {
- IOTType otType = OTModelManager.getOTElement(member);
- if (otType != null) {
- IType[] subtypes = otType.newOTTypeHierarchy(submon).getAllSubtypes(otType);
- for (IType subtype : subtypes)
- collectedRoleTypes.add(subtype);
- }
+ if (member.exists() && OTModelManager.isRole(member)) {
+ IType[] subtypes = member.newTypeHierarchy(submon).getAllSubtypes(member);
+ for (IType subtype : subtypes)
+ collectedRoleTypes.add(subtype);
}
submon.worked(1);
}
diff --git a/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/wizards/typecreation/RoleCreator.java b/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/wizards/typecreation/RoleCreator.java
index f982fae..0373fc3 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/wizards/typecreation/RoleCreator.java
+++ b/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/wizards/typecreation/RoleCreator.java
@@ -21,16 +21,9 @@
package org.eclipse.objectteams.otdt.internal.ui.wizards.typecreation;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
-import org.eclipse.objectteams.otdt.core.IOTType;
-import org.eclipse.objectteams.otdt.core.IRoleType;
-import org.eclipse.objectteams.otdt.core.OTModelManager;
import org.eclipse.objectteams.otdt.ui.OTDTUIPluginConstants;
@@ -85,15 +78,5 @@
"The role class " + getTypeInfo().getTypeName() + " must have an enclosing team.", //$NON-NLS-1$ //$NON-NLS-2$
null));
}
- }
-
- protected ITypeHierarchy createSuperTypeHierarchy(IType type,
- IProgressMonitor monitor) throws JavaModelException
- {
- IOTType otType = OTModelManager.getOTElement(type);
- if (otType instanceof IRoleType)
- return otType.newSuperOTTypeHierarchy(monitor);
-
- return super.createSuperTypeHierarchy(type, monitor);
- }
+ }
}
diff --git a/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/wizards/typecreation/TeamCreator.java b/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/wizards/typecreation/TeamCreator.java
index c5f9d22..7facb56 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/wizards/typecreation/TeamCreator.java
+++ b/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/wizards/typecreation/TeamCreator.java
@@ -20,12 +20,6 @@
**********************************************************************/
package org.eclipse.objectteams.otdt.internal.ui.wizards.typecreation;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.objectteams.otdt.core.IOTType;
-import org.eclipse.objectteams.otdt.core.OTModelManager;
import org.eclipse.objectteams.otdt.core.compiler.IOTConstants;
@@ -45,14 +39,4 @@
{
return String.valueOf(IOTConstants.STR_ORG_OBJECTTEAMS_TEAM);
}
-
- protected ITypeHierarchy createSuperTypeHierarchy(IType type,
- IProgressMonitor monitor) throws JavaModelException
- {
- IOTType otType = OTModelManager.getOTElement(type);
- if (otType != null)
- return otType.newSuperOTTypeHierarchy(monitor);
-
- return super.createSuperTypeHierarchy(type, monitor);
- }
}
diff --git a/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/wizards/typecreation/TypeCreator.java b/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/wizards/typecreation/TypeCreator.java
index ecca971..c5ea053 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/wizards/typecreation/TypeCreator.java
+++ b/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/wizards/typecreation/TypeCreator.java
@@ -34,7 +34,6 @@
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.ToolFactory;
@@ -79,12 +78,12 @@
import org.eclipse.jface.text.templates.TemplateBuffer;
import org.eclipse.jface.text.templates.TemplateException;
import org.eclipse.jface.text.templates.TemplateVariable;
+import org.eclipse.objectteams.otdt.core.compiler.IOTConstants;
+import org.eclipse.objectteams.otdt.ui.OTDTUIPluginConstants;
import org.eclipse.text.edits.DeleteEdit;
import org.eclipse.text.edits.MalformedTreeException;
import org.eclipse.text.edits.MultiTextEdit;
import org.eclipse.text.edits.TextEdit;
-import org.eclipse.objectteams.otdt.core.compiler.IOTConstants;
-import org.eclipse.objectteams.otdt.ui.OTDTUIPluginConstants;
/**
* Individual method copied from {@link org.eclipse.jdt.internal.corext.codemanipulation.StubUtility#getCompilationUnitContent(ICompilationUnit, String, String, String, String)}
@@ -867,11 +866,6 @@
}
}
- protected ITypeHierarchy createSuperTypeHierarchy(IType type, IProgressMonitor monitor) throws JavaModelException
- {
- return type.newSupertypeHierarchy(monitor);
- }
-
/**
* Copied from NewTypeWizardPage.createInheritedMethods
* doXYZ Parameters replaced by is-Methods in _typeInfo