Replacing references of ReqIF10Editor with IReqIfEditor references.
diff --git a/org.eclipse.rmf.reqif10.csv.importer/src/org/eclipse/rmf/reqif10/csv/importer/ui/wizards/CSVImportWizard.java b/org.eclipse.rmf.reqif10.csv.importer/src/org/eclipse/rmf/reqif10/csv/importer/ui/wizards/CSVImportWizard.java
index 27cc9d1..156730d 100644
--- a/org.eclipse.rmf.reqif10.csv.importer/src/org/eclipse/rmf/reqif10/csv/importer/ui/wizards/CSVImportWizard.java
+++ b/org.eclipse.rmf.reqif10.csv.importer/src/org/eclipse/rmf/reqif10/csv/importer/ui/wizards/CSVImportWizard.java
@@ -34,7 +34,7 @@
 import org.eclipse.rmf.reqif10.csv.importer.ui.wizards.pages.CSVMappingWizardPage;

 import org.eclipse.rmf.reqif10.csv.importer.utils.Importer;

 import org.eclipse.rmf.reqif10.csv.importer.utils.Utils;

-import org.eclipse.rmf.reqif10.pror.editor.presentation.Reqif10Editor;

+import org.eclipse.rmf.reqif10.pror.editor.IReqifEditor;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IEditorReference;

 import org.eclipse.ui.IImportWizard;

@@ -118,7 +118,7 @@
 				.getEditorReferences();

 		for (IEditorReference editorReference : editorReferences) {

 			IEditorPart editorPart = editorReference.getEditor(false);

-			if (editorPart instanceof Reqif10Editor) {

+			if (editorPart instanceof IReqifEditor) {

 				try {

 					uriMap.put(EditUIUtil.getURI(editorReference

 							.getEditorInput()),

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/IReqifEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/IReqifEditor.java
index 6eb45f0..95dfaed 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/IReqifEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/IReqifEditor.java
@@ -10,13 +10,23 @@
  ******************************************************************************/
 package org.eclipse.rmf.reqif10.pror.editor;
 
+import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.rmf.reqif10.ReqIF;
+import org.eclipse.ui.IEditorPart;
 
 /**
  * This interface must be implemented by all editors for ReqIF files.
  * 
  * @author jastram
  */
-public interface IReqifEditor extends IEditingDomainProvider {
+public interface IReqifEditor extends IEditorPart, IEditingDomainProvider, ISelectionProvider {
 
+	public ReqIF getReqif();
+	
+	public AdapterFactory getAdapterFactory();
+	
+	public EditingDomainActionBarContributor getActionBarContributor();
 }
diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/ISpecificationEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/ISpecificationEditor.java
index ae26eed..1239ad0 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/ISpecificationEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/ISpecificationEditor.java
@@ -15,6 +15,6 @@
  * 
  * @author jastram
  */
-public interface ISpecificationEditor extends IReqifEditor {
+public interface ISpecificationEditor /* extends IReqifEditor */ {
 
 }
diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/DatatypeConfigurationActionDelegate.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/DatatypeConfigurationActionDelegate.java
index dfa0342..5182504 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/DatatypeConfigurationActionDelegate.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/DatatypeConfigurationActionDelegate.java
@@ -17,7 +17,7 @@
 import org.eclipse.jface.viewers.ViewerFilter;

 import org.eclipse.rmf.reqif10.ReqIF;

 import org.eclipse.rmf.reqif10.ReqIFToolExtension;

-import org.eclipse.rmf.reqif10.pror.editor.presentation.Reqif10Editor;

+import org.eclipse.rmf.reqif10.pror.editor.IReqifEditor;

 import org.eclipse.rmf.reqif10.pror.editor.presentation.SpecificationEditor;

 import org.eclipse.rmf.reqif10.pror.provider.VirtualSpecObjectItemProvider;

 import org.eclipse.rmf.reqif10.pror.provider.VirtualSpecRelationGroupItemProvider;

@@ -29,14 +29,14 @@
 public class DatatypeConfigurationActionDelegate implements

 		IEditorActionDelegate {

 

-	private Reqif10Editor editor;

+	private IReqifEditor editor;

 

 	/**

 	 * Retrieves the {@link EditingDomain} from the Editor if present.

 	 */

 	public void setActiveEditor(IAction action, IEditorPart editor) {

-		if (editor instanceof Reqif10Editor) {

-			this.editor = (Reqif10Editor) editor;

+		if (editor instanceof IReqifEditor) {

+			this.editor = (IReqifEditor) editor;

 		} else if (editor instanceof SpecificationEditor) {

 			this.editor = ((SpecificationEditor) editor).getReqifEditor();

 		} else {

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/GeneralConfigurationActionDelegate.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/GeneralConfigurationActionDelegate.java
index ea6b7d8..9517ad3 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/GeneralConfigurationActionDelegate.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/GeneralConfigurationActionDelegate.java
@@ -20,7 +20,7 @@
 import org.eclipse.rmf.reqif10.pror.configuration.LabelConfiguration;

 import org.eclipse.rmf.reqif10.pror.configuration.ProrGeneralConfiguration;

 import org.eclipse.rmf.reqif10.pror.configuration.ProrToolExtension;

-import org.eclipse.rmf.reqif10.pror.editor.presentation.Reqif10Editor;

+import org.eclipse.rmf.reqif10.pror.editor.IReqifEditor;

 import org.eclipse.rmf.reqif10.pror.editor.presentation.SpecificationEditor;

 import org.eclipse.rmf.reqif10.pror.util.ConfigurationUtil;

 import org.eclipse.ui.IEditorActionDelegate;

@@ -29,14 +29,14 @@
 public class GeneralConfigurationActionDelegate implements

 		IEditorActionDelegate {

 

-	private Reqif10Editor editor;

+	private IReqifEditor editor;

 

 	/**

 	 * Retrieves the {@link EditingDomain} from the Editor if present.

 	 */

 	public void setActiveEditor(IAction action, IEditorPart editor) {

-		if (editor instanceof Reqif10Editor) {

-			this.editor = (Reqif10Editor) editor;

+		if (editor instanceof IReqifEditor) {

+			this.editor = (IReqifEditor) editor;

 		} else if (editor instanceof SpecificationEditor) {

 			this.editor = ((SpecificationEditor) editor).getReqifEditor();

 		} else {

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/PresentationConfigurationActionDelegate.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/PresentationConfigurationActionDelegate.java
index c06093b..c0f4c66 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/PresentationConfigurationActionDelegate.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/PresentationConfigurationActionDelegate.java
@@ -27,7 +27,7 @@
 import org.eclipse.rmf.reqif10.pror.configuration.ProrToolExtension;

 import org.eclipse.rmf.reqif10.pror.configuration.provider.ProrPresentationConfigurationsItemProvider;

 import org.eclipse.rmf.reqif10.pror.edit.presentation.service.PresentationInterface;

-import org.eclipse.rmf.reqif10.pror.editor.presentation.Reqif10Editor;

+import org.eclipse.rmf.reqif10.pror.editor.IReqifEditor;

 import org.eclipse.rmf.reqif10.pror.editor.presentation.SpecificationEditor;

 import org.eclipse.rmf.reqif10.pror.editor.presentation.service.PresentationServiceManager;

 import org.eclipse.rmf.reqif10.pror.util.ConfigurationUtil;

@@ -38,14 +38,14 @@
 public class PresentationConfigurationActionDelegate implements

 		IEditorActionDelegate {

 

-	private Reqif10Editor editor;

+	private IReqifEditor editor;

 

 	/**

 	 * Retrieves the {@link EditingDomain} from the Editor if present.

 	 */

 	public void setActiveEditor(IAction action, IEditorPart editor) {

-		if (editor instanceof Reqif10Editor) {

-			this.editor = (Reqif10Editor) editor;

+		if (editor instanceof IReqifEditor) {

+			this.editor = (IReqifEditor) editor;

 		} else if (editor instanceof SpecificationEditor) {

 			this.editor = ((SpecificationEditor) editor).getReqifEditor();

 		} else {

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/SubtreeDialog.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/SubtreeDialog.java
index 287df31..5f873c4 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/SubtreeDialog.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/SubtreeDialog.java
@@ -45,8 +45,8 @@
 import org.eclipse.jface.viewers.TreeViewer;

 import org.eclipse.jface.viewers.ViewerFilter;

 import org.eclipse.rmf.reqif10.Specification;

+import org.eclipse.rmf.reqif10.pror.editor.IReqifEditor;

 import org.eclipse.rmf.reqif10.pror.editor.presentation.ProrAdapterFactoryContentProvider;

-import org.eclipse.rmf.reqif10.pror.editor.presentation.Reqif10Editor;

 import org.eclipse.rmf.reqif10.pror.editor.propertiesview.ProrPropertySheetPage;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.dnd.DND;

@@ -92,9 +92,9 @@
 	private final List<ViewerFilter> filters = new ArrayList<ViewerFilter>();

 	private final AdapterFactory adapterFactory;

 	private final EditingDomain editingDomain;

-	private final Reqif10Editor reqifEditor;

+	private final IReqifEditor reqifEditor;

 

-	protected SubtreeDialog(Reqif10Editor reqifEditor, EObject input, String title,

+	protected SubtreeDialog(IReqifEditor reqifEditor, EObject input, String title,

 			String helpContext) {

 		super(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());

 		this.reqifEditor = reqifEditor;

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10Editor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10Editor.java
index 7440bef..1f25350 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10Editor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10Editor.java
@@ -86,7 +86,6 @@
 import org.eclipse.jface.viewers.IDoubleClickListener;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.ListViewer;

 import org.eclipse.jface.viewers.SelectionChangedEvent;

@@ -158,7 +157,7 @@
  * @generated

  */

 public class Reqif10Editor extends MultiPageEditorPart implements

-		IReqifEditor, ISelectionProvider, IMenuListener,

+		IReqifEditor, IMenuListener,

 		IViewerProvider, IGotoMarker {

 

 	/**

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ReqifMainForm.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ReqifMainForm.java
index d88eff0..2aaddd2 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ReqifMainForm.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ReqifMainForm.java
@@ -32,6 +32,7 @@
 import org.eclipse.rmf.reqif10.ReqIFContent;
 import org.eclipse.rmf.reqif10.ReqIFHeader;
 import org.eclipse.rmf.reqif10.Specification;
+import org.eclipse.rmf.reqif10.pror.editor.IReqifEditor;
 import org.eclipse.rmf.reqif10.pror.provider.ReqIFContentItemProvider;
 import org.eclipse.rmf.reqif10.pror.provider.VirtualSpecificationsItemProvider;
 import org.eclipse.rmf.reqif10.pror.util.ProrUtil;
@@ -67,13 +68,13 @@
 
 	private final ReqIF reqif;
 
-	private final Reqif10Editor reqifEditor;
+	private final IReqifEditor reqifEditor;
 
 	private ComposedAdapterFactory getAdapterFactory() {
 		return (ComposedAdapterFactory) reqifEditor.getAdapterFactory();
 	}
 
-	public ReqifMainForm(Composite parent, Reqif10Editor rifEditor) {
+	public ReqifMainForm(Composite parent, IReqifEditor rifEditor) {
 
 		this.reqifEditor = rifEditor;
 		this.reqif = rifEditor.getReqif();
diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ReqifSpecificationEditorInput.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ReqifSpecificationEditorInput.java
index 8ed4c3a..3deb0d1 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ReqifSpecificationEditorInput.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ReqifSpecificationEditorInput.java
@@ -13,6 +13,7 @@
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.rmf.reqif10.Specification;

+import org.eclipse.rmf.reqif10.pror.editor.IReqifEditor;

 import org.eclipse.rmf.reqif10.pror.util.ProrUtil;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IPersistableElement;

@@ -25,16 +26,16 @@
 

 

 	private final Specification spec;

-	private final Reqif10Editor rifEditor;

+	private final IReqifEditor reqifEditor;

 

-	public ReqifSpecificationEditorInput(Reqif10Editor rifEditor,

+	public ReqifSpecificationEditorInput(IReqifEditor rifEditor,

 			Specification spec) {

-		this.rifEditor = rifEditor;

+		this.reqifEditor = rifEditor;

 		this.spec = spec;

 	}

 

-	public Reqif10Editor getReqifEditor() {

-		return rifEditor;

+	public IReqifEditor getReqifEditor() {

+		return reqifEditor;

 	}

 

 	public Specification getSpec() {

@@ -67,7 +68,7 @@
 	 * @see org.eclipse.ui.IEditorInput#getName()

 	 */

 	public String getName() {

-		ItemProviderAdapter ip = ProrUtil.getItemProvider(rifEditor.getAdapterFactory(), spec);

+		ItemProviderAdapter ip = ProrUtil.getItemProvider(reqifEditor.getAdapterFactory(), spec);

 		return ip.getText(spec);

 	}

 

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/SpecificationEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/SpecificationEditor.java
index 4fce579..4e851b3 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/SpecificationEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/SpecificationEditor.java
@@ -19,12 +19,10 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.command.CommandStack;
 import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
 import org.eclipse.jface.action.IMenuListener;
@@ -108,7 +106,7 @@
 		}
 
 		// Extracting Info from the input
-		reqifEditor = ((ReqifSpecificationEditorInput) input).getReqifEditor();
+		reqifEditor = (Reqif10Editor) ((ReqifSpecificationEditorInput) input).getReqifEditor();
 		specification = ((ReqifSpecificationEditorInput) input).getSpec();
 
 		reqifActionBarContributor = (Reqif10ActionBarContributor) site
diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/util/ProrEditorUtil.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/util/ProrEditorUtil.java
index 41733bc..6ade6bb 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/util/ProrEditorUtil.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/util/ProrEditorUtil.java
@@ -38,7 +38,7 @@
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;

 import org.eclipse.rmf.reqif10.pror.configuration.ProrSpecViewConfiguration;

 import org.eclipse.rmf.reqif10.pror.configuration.UnifiedColumn;

-import org.eclipse.rmf.reqif10.pror.editor.presentation.Reqif10Editor;

+import org.eclipse.rmf.reqif10.pror.editor.IReqifEditor;

 import org.eclipse.rmf.reqif10.pror.editor.presentation.ReqifSpecificationEditorInput;

 import org.eclipse.rmf.reqif10.pror.editor.presentation.SpecificationEditor;

 import org.eclipse.rmf.reqif10.pror.editor.presentation.service.IProrCellRenderer;

@@ -220,9 +220,9 @@
 	}

 	

 	/**

-	 * Attempts to find the {@link Reqif10Editor} or {@link SpecificationEditor}

+	 * Attempts to find the {@link IReqifEditor} or {@link SpecificationEditor}

 	 * for the given EObject by walking up the parent hierarchy to the enclosing

-	 * {@link ReqIF} or {@link Specification}. If the {@link Reqif10Editor} is

+	 * {@link ReqIF} or {@link Specification}. If the {@link IReqifEditor} is

 	 * found for a Specification, the corresponding editor will be opened.

 	 * 

 	 * @return the Editor or null if none found.

@@ -257,8 +257,8 @@
 					return specEditor;

 				}

 			}

-			if (editor instanceof Reqif10Editor) {

-				Reqif10Editor reqifEditor = (Reqif10Editor) editor;

+			if (editor instanceof IReqifEditor) {

+				IReqifEditor reqifEditor = (IReqifEditor) editor;

 				if (reqifEditor.getReqif().equals(reqif)) {

 					

 					// Case 2: We found the right Reqif10Editor

diff --git a/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/ReqIFSearchPage.java b/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/ReqIFSearchPage.java
index 9c594b5..33ba457 100644
--- a/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/ReqIFSearchPage.java
+++ b/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/ReqIFSearchPage.java
@@ -19,7 +19,7 @@
 import org.eclipse.jface.dialogs.DialogPage;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.rmf.reqif10.ReqIF;
-import org.eclipse.rmf.reqif10.pror.editor.presentation.Reqif10Editor;
+import org.eclipse.rmf.reqif10.pror.editor.IReqifEditor;
 import org.eclipse.rmf.reqif10.pror.editor.presentation.SpecificationEditor;
 import org.eclipse.rmf.reqif10.search.filter.IFilter;
 import org.eclipse.rmf.reqif10.search.filter.SimpleCompoundFilter;
@@ -206,11 +206,11 @@
 	 * 
 	 * @return the active ReqIF or null if none found.
 	 */
-	private Reqif10Editor getReqifEditor() {
+	private IReqifEditor getReqifEditor() {
 		IEditorPart editor = PlatformUI.getWorkbench()
 				.getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-		if (editor instanceof Reqif10Editor) {
-			return (Reqif10Editor) editor;
+		if (editor instanceof IReqifEditor) {
+			return (IReqifEditor) editor;
 		}
 		if (editor instanceof SpecificationEditor) {
 			return ((SpecificationEditor) editor).getReqifEditor();
@@ -294,11 +294,11 @@
 			@Override
 			public void partClosed(IWorkbenchPartReference partRef) {
 				IWorkbenchPart part = partRef.getPart(false);
-				if (!(part instanceof Reqif10Editor)) {
+				if (!(part instanceof IReqifEditor)) {
 					return;
 				}
 
-				ReqIF closingReqif = ((Reqif10Editor) part).getReqif();
+				ReqIF closingReqif = ((IReqifEditor) part).getReqif();
 
 				ISearchResult searchResult = getSearchView()
 						.getCurrentSearchResult();
diff --git a/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/ui/ReqIFSearchPage.java b/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/ui/ReqIFSearchPage.java
index 0a8d700..89284fe 100644
--- a/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/ui/ReqIFSearchPage.java
+++ b/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/ui/ReqIFSearchPage.java
@@ -41,6 +41,7 @@
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;

 import org.eclipse.jface.operation.IRunnableWithProgress;

 import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.rmf.reqif10.pror.editor.IReqifEditor;

 import org.eclipse.rmf.reqif10.pror.editor.presentation.Reqif10Editor;

 import org.eclipse.rmf.reqif10.search.criteria.Criteria;

 import org.eclipse.rmf.reqif10.search.edit.util.ReqIFEditSearcher;

@@ -175,7 +176,7 @@
 						.getEditorReferences();

 				for (IEditorReference editorReference : editorReferences) {

 					IEditorPart editorPart = editorReference.getEditor(false);

-					if (editorPart instanceof Reqif10Editor) {

+					if (editorPart instanceof IReqifEditor) {

 						try {

 							uriMap.put(EditUIUtil.getURI(editorReference

 									.getEditorInput()),