move load on demand policy to RCP plugin

14 files changed, 55 insertions, 75 deletions

diff --git a/plugins/org.eclipse.emf.compare.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.ide/META-INF/MANIFEST.MF
index a1db3cae4..1890695c2 100644
--- a/plugins/org.eclipse.emf.compare.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.ide/META-INF/MANIFEST.MF
@@ -20,7 +20,5 @@ Import-Package: com.google.common.annotations;version="[11.0.0,15.0.0)",
  com.google.common.io;version="[11.0.0,15.0.0)",
  com.google.common.util.concurrent;version="[11.0.0,15.0.0)"
 Export-Package: org.eclipse.emf.compare.ide,
- org.eclipse.emf.compare.ide.internal.policy;x-internal:=true,
  org.eclipse.emf.compare.ide.internal.utils;x-friends:="org.eclipse.emf.compare.ide.ui",
- org.eclipse.emf.compare.ide.policy,
  org.eclipse.emf.compare.ide.utils
diff --git a/plugins/org.eclipse.emf.compare.ide/plugin.xml b/plugins/org.eclipse.emf.compare.ide/plugin.xml
deleted file mode 100644
index 98a701d52..000000000
--- a/plugins/org.eclipse.emf.compare.ide/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-

-<!--

- Copyright (c) 2012, 2013 Obeo.

- All rights reserved. This program and the accompanying materials

- are made available under the terms of the Eclipse Public License v1.0

- which accompanies this distribution, and is available at

- http://www.eclipse.org/legal/epl-v10.html

- 

- Contributors:

-     Obeo - initial API and implementation

--->

-

-<plugin>

-   <extension-point id="loadOnDemandPolicy" name="Load on Demand Policy" schema="schema/loadOnDemandPolicy.exsd"/>

-</plugin>

diff --git a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/EMFCompareIDEPlugin.java b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/EMFCompareIDEPlugin.java
index eb9befe95..708d8dacf 100644
--- a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/EMFCompareIDEPlugin.java
+++ b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/EMFCompareIDEPlugin.java
@@ -10,13 +10,8 @@
  *******************************************************************************/

 package org.eclipse.emf.compare.ide;

 

-import org.eclipse.core.runtime.IExtensionRegistry;

-import org.eclipse.core.runtime.Platform;

 import org.eclipse.core.runtime.Plugin;

 import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.compare.ide.internal.policy.LoadOnDemandPolicyRegistryImpl;

-import org.eclipse.emf.compare.ide.internal.policy.LoadOnDemandPolicyRegistryListener;

-import org.eclipse.emf.compare.ide.policy.ILoadOnDemandPolicy;

 import org.osgi.framework.BundleContext;

 

 /**

@@ -28,18 +23,9 @@ public class EMFCompareIDEPlugin extends Plugin {
 	/** The plug-in ID. */

 	public static final String PLUGIN_ID = "org.eclipse.emf.compare.ide"; //$NON-NLS-1$

 

-	/** The id of the load on demand policy extension point. */

-	public static final String LOAD_ON_DEMAND_POLICY_PPID = "loadOnDemandPolicy"; //$NON-NLS-1$

-

 	/** This plugin's shared instance. */

 	private static EMFCompareIDEPlugin plugin;

 

-	/** The registry that will hold references to all {@link ILoadOnDemandPolicy}. **/

-	private ILoadOnDemandPolicy.Registry loadOnDemandRegistry;

-

-	/** The registry listener that will be used to react to load on demand policy changes. */

-	private LoadOnDemandPolicyRegistryListener loadOnDemandRegistryListener;

-

 	/**

 	 * {@inheritDoc}

 	 * 

@@ -50,15 +36,6 @@ public class EMFCompareIDEPlugin extends Plugin {
 		plugin = this;

 		super.start(context);

 

-		final IExtensionRegistry registry = Platform.getExtensionRegistry();

-

-		this.loadOnDemandRegistry = new LoadOnDemandPolicyRegistryImpl();

-		this.loadOnDemandRegistryListener = new LoadOnDemandPolicyRegistryListener(loadOnDemandRegistry,

-				PLUGIN_ID, LOAD_ON_DEMAND_POLICY_PPID, getLog());

-

-		registry.addListener(loadOnDemandRegistryListener, PLUGIN_ID + '.' + LOAD_ON_DEMAND_POLICY_PPID);

-		loadOnDemandRegistryListener.readRegistry(registry);

-

 	}

 

 	/**

@@ -70,9 +47,6 @@ public class EMFCompareIDEPlugin extends Plugin {
 	public void stop(BundleContext context) throws Exception {

 		super.stop(context);

 		plugin = null;

-

-		final IExtensionRegistry registry = Platform.getExtensionRegistry();

-		registry.removeListener(loadOnDemandRegistryListener);

 	}

 

 	/**

@@ -88,15 +62,6 @@ public class EMFCompareIDEPlugin extends Plugin {
 	}

 

 	/**

-	 * Returns the registry of load on demand policies.

-	 * 

-	 * @return the registry of load on demand policies.

-	 */

-	public ILoadOnDemandPolicy.Registry getLoadOnDemandPolicyRegistry() {

-		return loadOnDemandRegistry;

-	}

-

-	/**

 	 * Returns the shared instance.

 	 * 

 	 * @return the shared instance

diff --git a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/NotLoadingResourceSet.java b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/NotLoadingResourceSet.java
index 8f87e6ce1..f93a3679c 100644
--- a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/NotLoadingResourceSet.java
+++ b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/NotLoadingResourceSet.java
@@ -29,9 +29,9 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.common.util.URI;

 import org.eclipse.emf.common.util.WrappedException;

-import org.eclipse.emf.compare.ide.EMFCompareIDEPlugin;

-import org.eclipse.emf.compare.ide.policy.ILoadOnDemandPolicy;

 import org.eclipse.emf.compare.ide.utils.StorageTraversal;

+import org.eclipse.emf.compare.rcp.EMFCompareRCPPlugin;

+import org.eclipse.emf.compare.rcp.policy.ILoadOnDemandPolicy;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.InternalEObject;

 import org.eclipse.emf.ecore.resource.Resource;

@@ -74,7 +74,7 @@ public final class NotLoadingResourceSet extends ResourceSetImpl {
 	 */

 	@Override

 	public Resource getResource(URI uri, boolean loadOnDemand) {

-		ILoadOnDemandPolicy.Registry registry = EMFCompareIDEPlugin.getDefault()

+		ILoadOnDemandPolicy.Registry registry = EMFCompareRCPPlugin.getDefault()

 				.getLoadOnDemandPolicyRegistry();

 		if (registry.hasAnyAuthorizingPolicy(uri)) {

 			return super.getResource(uri, true);

diff --git a/plugins/org.eclipse.emf.compare.rcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.rcp/META-INF/MANIFEST.MF
index 4b887d34f..e893c5b74 100644
--- a/plugins/org.eclipse.emf.compare.rcp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.rcp/META-INF/MANIFEST.MF
@@ -14,4 +14,7 @@ Export-Package: org.eclipse.emf.compare.rcp,
  org.eclipse.emf.compare.rcp.extension,
  org.eclipse.emf.compare.rcp.internal;x-internal:=true,
  org.eclipse.emf.compare.rcp.internal.merger;x-internal:=true,
- org.eclipse.emf.compare.rcp.internal.postprocessor;x-internal:=true
+ org.eclipse.emf.compare.rcp.internal.policy;x-internal:=true,
+ org.eclipse.emf.compare.rcp.internal.postprocessor;x-internal:=true,
+ org.eclipse.emf.compare.rcp.policy
+Import-Package: com.google.common.collect;version="[11.0.0,15.0.0)"
diff --git a/plugins/org.eclipse.emf.compare.rcp/plugin.xml b/plugins/org.eclipse.emf.compare.rcp/plugin.xml
index b0e84ff83..a5276bd25 100644
--- a/plugins/org.eclipse.emf.compare.rcp/plugin.xml
+++ b/plugins/org.eclipse.emf.compare.rcp/plugin.xml
@@ -15,6 +15,7 @@
 <plugin>

    <extension-point id="postProcessor" name="Post Processor" schema="schema/postProcessor.exsd"/>

    <extension-point id="merger" name="Merger" schema="schema/merger.exsd"/>

+   <extension-point id="loadOnDemandPolicy" name="Load on Demand Policy" schema="schema/loadOnDemandPolicy.exsd"/>

    

    <extension point="org.eclipse.emf.ecore.generated_package">

       <package

diff --git a/plugins/org.eclipse.emf.compare.ide/schema/loadOnDemandPolicy.exsd b/plugins/org.eclipse.emf.compare.rcp/schema/loadOnDemandPolicy.exsd
index ab55b4274..ab55b4274 100644
--- a/plugins/org.eclipse.emf.compare.ide/schema/loadOnDemandPolicy.exsd
+++ b/plugins/org.eclipse.emf.compare.rcp/schema/loadOnDemandPolicy.exsd
diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/EMFCompareRCPPlugin.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/EMFCompareRCPPlugin.java
index fc5a53c2d..655d844d2 100644
--- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/EMFCompareRCPPlugin.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/EMFCompareRCPPlugin.java
@@ -18,7 +18,10 @@ import org.eclipse.emf.compare.merge.IMerger;
 import org.eclipse.emf.compare.postprocessor.PostProcessorRegistryImpl;
 import org.eclipse.emf.compare.rcp.extension.AbstractRegistryEventListener;
 import org.eclipse.emf.compare.rcp.internal.merger.MergerExtensionRegistryListener;
+import org.eclipse.emf.compare.rcp.internal.policy.LoadOnDemandPolicyRegistryImpl;
+import org.eclipse.emf.compare.rcp.internal.policy.LoadOnDemandPolicyRegistryListener;
 import org.eclipse.emf.compare.rcp.internal.postprocessor.PostProcessorRegistryListener;
+import org.eclipse.emf.compare.rcp.policy.ILoadOnDemandPolicy;
 import org.osgi.framework.BundleContext;
 
 /**
@@ -31,6 +34,9 @@ public class EMFCompareRCPPlugin extends Plugin {
 
 	public static final String POST_PROCESSOR_PPID = "postProcessor"; //$NON-NLS-1$
 
+	/** The id of the load on demand policy extension point. */
+	public static final String LOAD_ON_DEMAND_POLICY_PPID = "loadOnDemandPolicy"; //$NON-NLS-1$
+
 	/** The id of the merger extension point. */
 	public static final String MERGER_PPID = "merger"; //$NON-NLS-1$
 
@@ -41,6 +47,12 @@ public class EMFCompareRCPPlugin extends Plugin {
 
 	private AbstractRegistryEventListener mergerRegistryListener;
 
+	/** The registry that will hold references to all {@link ILoadOnDemandPolicy}. **/
+	private ILoadOnDemandPolicy.Registry loadOnDemandRegistry;
+
+	/** The registry listener that will be used to react to load on demand policy changes. */
+	private LoadOnDemandPolicyRegistryListener loadOnDemandRegistryListener;
+
 	/**
 	 * The registry that will hold references to all post processors.
 	 */
@@ -70,6 +82,12 @@ public class EMFCompareRCPPlugin extends Plugin {
 				getLog(), postProcessorRegistry);
 		registry.addListener(postProcessorRegistryListener, PLUGIN_ID + '.' + POST_PROCESSOR_PPID);
 		postProcessorRegistryListener.readRegistry(registry);
+
+		loadOnDemandRegistry = new LoadOnDemandPolicyRegistryImpl();
+		loadOnDemandRegistryListener = new LoadOnDemandPolicyRegistryListener(loadOnDemandRegistry,
+				PLUGIN_ID, LOAD_ON_DEMAND_POLICY_PPID, getLog());
+		registry.addListener(loadOnDemandRegistryListener, PLUGIN_ID + '.' + LOAD_ON_DEMAND_POLICY_PPID);
+		loadOnDemandRegistryListener.readRegistry(registry);
 	}
 
 	/*
@@ -82,6 +100,10 @@ public class EMFCompareRCPPlugin extends Plugin {
 
 		final IExtensionRegistry registry = Platform.getExtensionRegistry();
 
+		registry.removeListener(loadOnDemandRegistryListener);
+		loadOnDemandRegistryListener = null;
+		loadOnDemandRegistry = null;
+
 		registry.removeListener(postProcessorRegistryListener);
 		postProcessorRegistryListener = null;
 		postProcessorRegistry = null;
@@ -111,6 +133,15 @@ public class EMFCompareRCPPlugin extends Plugin {
 	}
 
 	/**
+	 * Returns the registry of load on demand policies.
+	 * 
+	 * @return the registry of load on demand policies.
+	 */
+	public ILoadOnDemandPolicy.Registry getLoadOnDemandPolicyRegistry() {
+		return loadOnDemandRegistry;
+	}
+
+	/**
 	 * Log the given message with the given severity to the logger of this plugin.
 	 * 
 	 * @param severity
diff --git a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/policy/LoadOnDemandPolicyRegistryImpl.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/policy/LoadOnDemandPolicyRegistryImpl.java
index 4675191e2..c36fbc173 100644
--- a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/policy/LoadOnDemandPolicyRegistryImpl.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/policy/LoadOnDemandPolicyRegistryImpl.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.ide.internal.policy;

+package org.eclipse.emf.compare.rcp.internal.policy;

 

 import static com.google.common.collect.Lists.newArrayList;

 

@@ -17,7 +17,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

 

 import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.compare.ide.policy.ILoadOnDemandPolicy;

+import org.eclipse.emf.compare.rcp.policy.ILoadOnDemandPolicy;

 

 /**

  * A default implementation that uses a map internally.

@@ -39,7 +39,7 @@ public class LoadOnDemandPolicyRegistryImpl implements ILoadOnDemandPolicy.Regis
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.ide.policy.ILoadOnDemandPolicy.Registry#hasAnyAuthorizingPolicy(org.eclipse.emf.common.util.URI)

+	 * @see org.eclipse.emf.compare.rcp.policy.ILoadOnDemandPolicy.Registry#hasAnyAuthorizingPolicy(org.eclipse.emf.common.util.URI)

 	 */

 	public boolean hasAnyAuthorizingPolicy(URI uri) {

 		for (ILoadOnDemandPolicy policy : getPolicies()) {

@@ -53,7 +53,7 @@ public class LoadOnDemandPolicyRegistryImpl implements ILoadOnDemandPolicy.Regis
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.ide.policy.ILoadOnDemandPolicy.Registry#getPolicies()

+	 * @see org.eclipse.emf.compare.rcp.policy.ILoadOnDemandPolicy.Registry#getPolicies()

 	 */

 	public List<ILoadOnDemandPolicy> getPolicies() {

 		return newArrayList(map.values());

@@ -62,7 +62,7 @@ public class LoadOnDemandPolicyRegistryImpl implements ILoadOnDemandPolicy.Regis
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.ide.policy.ILoadOnDemandPolicy.Registry#addPolicy(org.eclipse.emf.compare.ide.policy.ILoadOnDemandPolicy)

+	 * @see org.eclipse.emf.compare.rcp.policy.ILoadOnDemandPolicy.Registry#addPolicy(org.eclipse.emf.compare.rcp.policy.ILoadOnDemandPolicy)

 	 */

 	public ILoadOnDemandPolicy addPolicy(ILoadOnDemandPolicy policy) {

 		return map.put(policy.getClass().getName(), policy);

@@ -71,7 +71,7 @@ public class LoadOnDemandPolicyRegistryImpl implements ILoadOnDemandPolicy.Regis
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.ide.policy.ILoadOnDemandPolicy.Registry#removePolicy(java.lang.String)

+	 * @see org.eclipse.emf.compare.rcp.policy.ILoadOnDemandPolicy.Registry#removePolicy(java.lang.String)

 	 */

 	public ILoadOnDemandPolicy removePolicy(String className) {

 		return map.remove(className);

@@ -80,7 +80,7 @@ public class LoadOnDemandPolicyRegistryImpl implements ILoadOnDemandPolicy.Regis
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.ide.policy.ILoadOnDemandPolicy.Registry#clear()

+	 * @see org.eclipse.emf.compare.rcp.policy.ILoadOnDemandPolicy.Registry#clear()

 	 */

 	public void clear() {

 		map.clear();

diff --git a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/policy/LoadOnDemandPolicyRegistryListener.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/policy/LoadOnDemandPolicyRegistryListener.java
index 253bbc857..21aed8bad 100644
--- a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/policy/LoadOnDemandPolicyRegistryListener.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/policy/LoadOnDemandPolicyRegistryListener.java
@@ -8,16 +8,15 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.ide.internal.policy;

+package org.eclipse.emf.compare.rcp.internal.policy;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IConfigurationElement;

 import org.eclipse.core.runtime.ILog;

 import org.eclipse.core.runtime.IStatus;

-import org.eclipse.emf.compare.ide.EMFCompareIDEPlugin;

-import org.eclipse.emf.compare.ide.policy.ILoadOnDemandPolicy;

-import org.eclipse.emf.compare.ide.policy.ILoadOnDemandPolicy.Registry;

 import org.eclipse.emf.compare.rcp.extension.AbstractRegistryEventListener;

+import org.eclipse.emf.compare.rcp.policy.ILoadOnDemandPolicy;

+import org.eclipse.emf.compare.rcp.policy.ILoadOnDemandPolicy.Registry;

 

 /**

  * A listener for load on demand policy extension point.

@@ -81,8 +80,8 @@ public class LoadOnDemandPolicyRegistryListener extends AbstractRegistryEventLis
 			ILoadOnDemandPolicy policy = (ILoadOnDemandPolicy)element.createExecutableExtension(ATT_CLASS);

 			ILoadOnDemandPolicy previous = registry.addPolicy(policy);

 			if (previous != null) {

-				EMFCompareIDEPlugin.getDefault().log(IStatus.WARNING,

-						"The factory '" + policy.getClass().getName() + "' is registered twice.");

+				log(IStatus.WARNING, element, "The factory '" + policy.getClass().getName()

+						+ "' is registered twice.");

 			}

 		} catch (CoreException e) {

 			log(IStatus.ERROR, element, e.getMessage());

diff --git a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/policy/ILoadOnDemandPolicy.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/policy/ILoadOnDemandPolicy.java
index 80943a0d9..f742c0f00 100644
--- a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/policy/ILoadOnDemandPolicy.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/policy/ILoadOnDemandPolicy.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.ide.policy;

+package org.eclipse.emf.compare.rcp.policy;

 

 import java.util.List;

 

diff --git a/plugins/org.eclipse.emf.compare.uml2.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2.ide/META-INF/MANIFEST.MF
index c14581a3d..4f2de97dc 100644
--- a/plugins/org.eclipse.emf.compare.uml2.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.uml2.ide/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.compare.uml2.ide;singleton:=true
 Bundle-Version: 2.1.0.qualifier
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.compare.ide;bundle-version="3.0.0",
+ org.eclipse.emf.compare.rcp;bundle-version="2.1.0",
  org.eclipse.emf.ecore,
  org.eclipse.uml2.uml;bundle-version="4.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.compare.uml2.ide/plugin.xml b/plugins/org.eclipse.emf.compare.uml2.ide/plugin.xml
index ad0fde7a6..25a2bee41 100644
--- a/plugins/org.eclipse.emf.compare.uml2.ide/plugin.xml
+++ b/plugins/org.eclipse.emf.compare.uml2.ide/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension
-         point="org.eclipse.emf.compare.ide.loadOnDemandPolicy">
+         point="org.eclipse.emf.compare.rcp.loadOnDemandPolicy">
       <policy
             class="org.eclipse.emf.compare.uml2.ide.internal.policy.UMLLoadOnDemandPolicy">
       </policy>
diff --git a/plugins/org.eclipse.emf.compare.uml2.ide/src/org/eclipse/emf/compare/uml2/ide/internal/policy/UMLLoadOnDemandPolicy.java b/plugins/org.eclipse.emf.compare.uml2.ide/src/org/eclipse/emf/compare/uml2/ide/internal/policy/UMLLoadOnDemandPolicy.java
index 205b1bc9c..ab86b6d3f 100644
--- a/plugins/org.eclipse.emf.compare.uml2.ide/src/org/eclipse/emf/compare/uml2/ide/internal/policy/UMLLoadOnDemandPolicy.java
+++ b/plugins/org.eclipse.emf.compare.uml2.ide/src/org/eclipse/emf/compare/uml2/ide/internal/policy/UMLLoadOnDemandPolicy.java
@@ -14,7 +14,7 @@ import java.util.Collection;
 import java.util.Map;
 
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.compare.ide.policy.ILoadOnDemandPolicy;
+import org.eclipse.emf.compare.rcp.policy.ILoadOnDemandPolicy;
 import org.eclipse.uml2.uml.UMLPlugin;
 
 /**