415371: [CDO] Let a ScopeEntry be created with an externally-provided ServicesRegistry.

https://bugs.eclipse.org/bugs/show_bug.cgi?id=415371

1 files changed, 10 insertions, 5 deletions

diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeEntry.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeEntry.java
index 8ea82e4ca06..51e3ccdfbd3 100644
--- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeEntry.java
+++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeEntry.java
@@ -71,7 +71,7 @@ public class ScopeEntry {
 
 
 	public ScopeEntry(URI resourceURI) {
-		this(resourceURI, null);
+		this(resourceURI, (IServiceRegistryTracker) null);
 	}
 
 	public ScopeEntry(URI resourceURI, IServiceRegistryTracker serviceRegistryTracker) {
@@ -83,6 +83,15 @@ public class ScopeEntry {
 		this.servicesRegistry = getServicesRegistry();
 	}
 
+	public ScopeEntry(URI resourceURI, ServicesRegistry servicesRegistry) {
+		super();
+		
+		this.serviceRegistryTracker = null;
+		this.resourceURI = resourceURI;
+		this.servicesRegistry = servicesRegistry;
+		this.modelSet = getModelSet();
+	}
+
 	private Collection<IEditorPart> getEditors() {
 		Collection<IEditorPart> results = new HashSet<IEditorPart>();
 		IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
@@ -149,10 +158,6 @@ public class ScopeEntry {
 		return modelSet;
 	}
 
-	public void setModelSet(ModelSet modelSet) {
-		this.modelSet = modelSet;
-	}
-
 	private IEditorPart editorOnResource() {
 		Collection<IEditorPart> editors = getEditors();