diff options
Diffstat (limited to 'plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse')
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/OnDemandLoadingModelSetServiceFactory.java | 68 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Activator.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/Activator.java) | 2 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ControledResourceAdapter.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/ControledResourceAdapter.java) | 8 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingManager.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/HistoryRoutingManager.java) | 10 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingUtils.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/HistoryRoutingUtils.java) | 14 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategy.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/ILoadingStrategy.java) | 4 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategyExtension.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/ILoadingStrategyExtension.java) | 4 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IProxyManager.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/IProxyManager.java) | 2 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IStrategyChooser.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/IStrategyChooser.java) | 2 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Messages.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/Messages.java) | 4 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSet.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/OnDemandLoadingModelSet.java) | 16 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSetServiceFactory.java | 68 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorFactory.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/editor/UnloadResourcesEditorFactory.java) | 10 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorModel.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/editor/UnloadResourcesEditorModel.java) | 16 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/impl/ProxyManager.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/impl/ProxyManager.java) | 28 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/messages.properties) | 0 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/AskUserStrategy.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/strategies/AskUserStrategy.java) | 26 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/LoadAllResources.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/strategies/LoadAllResources.java) | 6 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/LoadControlledResources.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/strategies/LoadControlledResources.java) | 14 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/LoadCurrentResource.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/strategies/LoadCurrentResource.java) | 6 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/Messages.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/strategies/Messages.java) | 4 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/messages.properties (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/strategies/messages.properties) | 0 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/util/LoadingTester.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/util/LoadingTester.java) | 6 | ||||
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/util/LoadingUtils.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/util/LoadingUtils.java) | 26 |
24 files changed, 172 insertions, 172 deletions
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/OnDemandLoadingModelSetServiceFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/OnDemandLoadingModelSetServiceFactory.java deleted file mode 100644 index fa81e6c9d50..00000000000 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/OnDemandLoadingModelSetServiceFactory.java +++ /dev/null @@ -1,68 +0,0 @@ -/**
- *
- */
-package org.eclipse.papyrus.core.resourceloading;
-
-import org.eclipse.papyrus.controlmode.history.HistoryModel;
-import org.eclipse.papyrus.controlmode.history.utils.HistoryUtils;
-import org.eclipse.papyrus.controlmode.mm.history.ControledResource;
-import org.eclipse.papyrus.controlmode.mm.history.historyFactory;
-import org.eclipse.papyrus.core.services.IServiceFactory;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
-import org.eclipse.papyrus.core.utils.DiResourceSet;
-import org.eclipse.papyrus.resource.ModelSet;
-
-
-/**
- * A service starting the ModelSet
- *
- * @author cedric dumoulin
- *
- */
-public class OnDemandLoadingModelSetServiceFactory implements IServiceFactory {
-
- /** The ModelSet */
- private ModelSet service;
-
- /**
- *
- * @see org.eclipse.papyrus.core.services.IService#init(org.eclipse.papyrus.core.services.ServicesRegistry)
- *
- * @param servicesRegistry
- * @throws ServiceException
- */
- public void init(ServicesRegistry servicesRegistry) throws ServiceException {
- }
-
- /**
- *
- * @see org.eclipse.papyrus.core.services.IService#startService()
- *
- * @throws ServiceException
- */
- public void startService() throws ServiceException {
-
- }
-
- /**
- *
- * @see org.eclipse.papyrus.core.services.IService#disposeService()
- *
- * @throws ServiceException
- */
- public void disposeService() throws ServiceException {
- if(service != null)
- service.unload();
- }
-
- /**
- * Create the service served by this factory.
- */
- public Object createServiceInstance() {
- // Create the appropriate service.
- service = new OnDemandLoadingModelSet();
- return service;
- }
-
-}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Activator.java index c69d4678d6e..bcd7027f39b 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/Activator.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Activator.java @@ -1,4 +1,4 @@ -package org.eclipse.papyrus.core.resourceloading;
+package org.eclipse.papyrus.infra.services.resourceloading;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/ControledResourceAdapter.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ControledResourceAdapter.java index b0071e2c06f..2f99c83eb2e 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/ControledResourceAdapter.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ControledResourceAdapter.java @@ -9,7 +9,7 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading;
+package org.eclipse.papyrus.infra.services.resourceloading;
import java.util.Collections;
import java.util.HashMap;
@@ -26,9 +26,9 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.controlmode.mm.history.ControledResource;
-import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
/**
* This adapter maintains a map linking url and the corresponding ControledResource
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/HistoryRoutingManager.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingManager.java index 284fce4a354..d7dd6f5bc2f 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/HistoryRoutingManager.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingManager.java @@ -9,7 +9,7 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading;
+package org.eclipse.papyrus.infra.services.resourceloading;
import java.util.List;
@@ -17,10 +17,10 @@ import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.controlmode.history.HistoryModel;
-import org.eclipse.papyrus.controlmode.history.utils.HistoryUtils;
-import org.eclipse.papyrus.controlmode.mm.history.ControledResource;
-import org.eclipse.papyrus.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel;
+import org.eclipse.papyrus.infra.services.controlmode.history.utils.HistoryUtils;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
/**
* This manager navigates in the history to access to controlled resources
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/HistoryRoutingUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingUtils.java index 0d5ab1ccd31..ee8c742a6fe 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/HistoryRoutingUtils.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingUtils.java @@ -9,7 +9,7 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading;
+package org.eclipse.papyrus.infra.services.resourceloading;
import java.util.HashSet;
import java.util.List;
@@ -17,12 +17,12 @@ import java.util.Set; import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.controlmode.history.HistoryModel;
-import org.eclipse.papyrus.controlmode.history.utils.HistoryUtils;
-import org.eclipse.papyrus.controlmode.mm.history.ControledResource;
-import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.resource.sasheditor.SashModel;
-import org.eclipse.papyrus.resource.sasheditor.SashModelUtils;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModelUtils;
+import org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel;
+import org.eclipse.papyrus.infra.services.controlmode.history.utils.HistoryUtils;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
/**
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/ILoadingStrategy.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategy.java index 9ca66491fd7..318b89fee94 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/ILoadingStrategy.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategy.java @@ -11,10 +11,10 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading;
+package org.eclipse.papyrus.infra.services.resourceloading;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
/**
* The Interface ILoadingStrategy that manages several strategies to load the model
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/ILoadingStrategyExtension.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategyExtension.java index 234d048e09c..3559fdf227d 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/ILoadingStrategyExtension.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategyExtension.java @@ -11,10 +11,10 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading;
+package org.eclipse.papyrus.infra.services.resourceloading;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
/**
* The Interface ILoadingStrategyExtension.
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/IProxyManager.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IProxyManager.java index ce5eeb00340..74b359609ea 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/IProxyManager.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IProxyManager.java @@ -9,7 +9,7 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading;
+package org.eclipse.papyrus.infra.services.resourceloading;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/IStrategyChooser.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IStrategyChooser.java index 3bf1814f34d..4ed3c9a0388 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/IStrategyChooser.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IStrategyChooser.java @@ -11,7 +11,7 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading;
+package org.eclipse.papyrus.infra.services.resourceloading;
/**
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/Messages.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Messages.java index 0c592e3af0f..d7ac519fc33 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/Messages.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Messages.java @@ -11,7 +11,7 @@ * Vincent Hemery (Atos) vincent.hemery@atos.net - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading;
+package org.eclipse.papyrus.infra.services.resourceloading;
import org.eclipse.osgi.util.NLS;
@@ -22,7 +22,7 @@ import org.eclipse.osgi.util.NLS; */
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.papyrus.core.resourceloading.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.resourceloading.messages"; //$NON-NLS-1$
/** Error message */
public static String LoadingUtils_ErrorMessage;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/OnDemandLoadingModelSet.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSet.java index f4a5c1a8782..f08d4c9185a 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/OnDemandLoadingModelSet.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSet.java @@ -1,20 +1,20 @@ /**
*
*/
-package org.eclipse.papyrus.core.resourceloading;
+package org.eclipse.papyrus.infra.services.resourceloading;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.core.resourceloading.impl.ProxyManager;
-import org.eclipse.papyrus.core.utils.DiResourceSet;
-import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.resource.ModelsReader;
-import org.eclipse.papyrus.resource.notation.NotationUtils;
-import org.eclipse.papyrus.resource.sasheditor.SashModelUtils;
-import org.eclipse.papyrus.resource.uml.UmlUtils;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelsReader;
+import org.eclipse.papyrus.infra.core.resource.notation.NotationUtils;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModelUtils;
+import org.eclipse.papyrus.infra.core.resource.uml.UmlUtils;
+import org.eclipse.papyrus.infra.core.utils.DiResourceSet;
+import org.eclipse.papyrus.infra.services.resourceloading.impl.ProxyManager;
/**
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSetServiceFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSetServiceFactory.java new file mode 100644 index 00000000000..20b97bd4f7b --- /dev/null +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSetServiceFactory.java @@ -0,0 +1,68 @@ +/**
+ *
+ */
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.IServiceFactory;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.DiResourceSet;
+import org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel;
+import org.eclipse.papyrus.infra.services.controlmode.history.utils.HistoryUtils;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyFactory;
+
+
+/**
+ * A service starting the ModelSet
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class OnDemandLoadingModelSetServiceFactory implements IServiceFactory {
+
+ /** The ModelSet */
+ private ModelSet service;
+
+ /**
+ *
+ * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
+ *
+ * @param servicesRegistry
+ * @throws ServiceException
+ */
+ public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+ }
+
+ /**
+ *
+ * @see org.eclipse.papyrus.infra.core.services.IService#startService()
+ *
+ * @throws ServiceException
+ */
+ public void startService() throws ServiceException {
+
+ }
+
+ /**
+ *
+ * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()
+ *
+ * @throws ServiceException
+ */
+ public void disposeService() throws ServiceException {
+ if(service != null)
+ service.unload();
+ }
+
+ /**
+ * Create the service served by this factory.
+ */
+ public Object createServiceInstance() {
+ // Create the appropriate service.
+ service = new OnDemandLoadingModelSet();
+ return service;
+ }
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/editor/UnloadResourcesEditorFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorFactory.java index 933f6bc54f2..3f9a6e7f9d7 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/editor/UnloadResourcesEditorFactory.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorFactory.java @@ -1,12 +1,12 @@ -package org.eclipse.papyrus.core.resourceloading.editor;
+package org.eclipse.papyrus.infra.services.resourceloading.editor;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.papyrus.core.extension.diagrameditor.EditorDescriptor;
-import org.eclipse.papyrus.core.extension.diagrameditor.IPluggableEditorFactory;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.extension.diagrameditor.EditorDescriptor;
+import org.eclipse.papyrus.infra.core.extension.diagrameditor.IPluggableEditorFactory;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
public class UnloadResourcesEditorFactory implements IPluggableEditorFactory {
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/editor/UnloadResourcesEditorModel.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorModel.java index 01fef7bfb05..c83b38fc413 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/editor/UnloadResourcesEditorModel.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorModel.java @@ -1,10 +1,10 @@ -package org.eclipse.papyrus.core.resourceloading.editor;
+package org.eclipse.papyrus.infra.services.resourceloading.editor;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel;
-import org.eclipse.papyrus.ui.toolbox.notification.builders.NotificationBuilder;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
@@ -39,7 +39,7 @@ public class UnloadResourcesEditorModel implements IEditorModel { }
/**
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageModel#getTabTitle()
+ * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getTabTitle()
*
* @return
*/
@@ -48,7 +48,7 @@ public class UnloadResourcesEditorModel implements IEditorModel { }
/**
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageModel#getTabIcon()
+ * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getTabIcon()
*
* @return
*/
@@ -57,7 +57,7 @@ public class UnloadResourcesEditorModel implements IEditorModel { }
/**
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageModel#getRawModel()
+ * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getRawModel()
*
* @return
*/
@@ -67,7 +67,7 @@ public class UnloadResourcesEditorModel implements IEditorModel { }
/**
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel#createIEditorPart()
+ * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#createIEditorPart()
*
* @return
* @throws PartInitException
@@ -77,7 +77,7 @@ public class UnloadResourcesEditorModel implements IEditorModel { }
/**
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel#getActionBarContributor()
+ * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#getActionBarContributor()
*
* @return
*/
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/impl/ProxyManager.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/impl/ProxyManager.java index 01d4211dbc3..02b0e530004 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/impl/ProxyManager.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/impl/ProxyManager.java @@ -11,7 +11,7 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading.impl;
+package org.eclipse.papyrus.infra.services.resourceloading.impl;
import java.util.HashMap;
import java.util.HashSet;
@@ -27,14 +27,14 @@ import org.eclipse.emf.common.CommonPlugin; import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.core.Activator;
-import org.eclipse.papyrus.core.resourceloading.HistoryRoutingManager;
-import org.eclipse.papyrus.core.resourceloading.ILoadingStrategy;
-import org.eclipse.papyrus.core.resourceloading.ILoadingStrategyExtension;
-import org.eclipse.papyrus.core.resourceloading.IProxyManager;
-import org.eclipse.papyrus.core.resourceloading.IStrategyChooser;
-import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.core.Activator;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.services.resourceloading.HistoryRoutingManager;
+import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy;
+import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategyExtension;
+import org.eclipse.papyrus.infra.services.resourceloading.IProxyManager;
+import org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser;
/**
* The Class ProxyManager that manages the proxy resolving according to a specific strategy.
@@ -44,7 +44,7 @@ public class ProxyManager implements IProxyManager { // === Manage strategies
/** extension point ID for loading strategy */
- private static final String LOADING_STRATEGY_EXTENSION_POINT_ID = "org.eclipse.papyrus.core.resourceloading.loadingStrategy";
+ private static final String LOADING_STRATEGY_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.resourceloading.loadingStrategy";
/** element ID for the loading strategy element */
private static final String LOADING_STRATEGY_ELEMENT_ID = "loadingStrategy";
@@ -61,7 +61,7 @@ public class ProxyManager implements IProxyManager { // ==== Manage strategy extensions (for UML profile)
/** extension point ID for strategy extensions */
- private static final String STRATEGY_EXTENDER_EXTENSION_POINT_ID = "org.eclipse.papyrus.core.resourceloading.loadingStrategyExtender";
+ private static final String STRATEGY_EXTENDER_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.resourceloading.loadingStrategyExtender";
/** element ID for the loading strategy extension element */
private static final String STRATEGY_EXTENDER_ELEMENT_ID = "strategyExtender";
@@ -72,7 +72,7 @@ public class ProxyManager implements IProxyManager { // === Manage strategy chooser extension
/** extension point ID for strategy chooser extension */
- private static final String STRATEGY_CHOOSER_EXTENSION_POINT_ID = "org.eclipse.papyrus.core.resourceloading.currentStrategyChooser";
+ private static final String STRATEGY_CHOOSER_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.resourceloading.currentStrategyChooser";
/** attribute ID for the implementation of the strategy chooser extension used in preferences */
private static final String STRATEGY_CHOOSER_CHOOSER_ATTRIBUTE = "chooser";
@@ -102,7 +102,7 @@ public class ProxyManager implements IProxyManager { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.core.resourceloading.IProxyManager#loadResource(URI)
+ * @see org.eclipse.papyrus.infra.services.resourceloading.IProxyManager#loadResource(URI)
*/
public boolean loadResource(URI uri) {
boolean result = availableStrategies.get(getCurrentStrategy()).loadResource(modelSet, uri);
@@ -275,7 +275,7 @@ public class ProxyManager implements IProxyManager { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.core.resourceloading.IProxyManager#dispose()
+ * @see org.eclipse.papyrus.infra.services.resourceloading.IProxyManager#dispose()
*/
public void dispose() {
routeManager.unload();
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/messages.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties index f22195b08d8..f22195b08d8 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/messages.properties +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/strategies/AskUserStrategy.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/AskUserStrategy.java index 3f3b7993ba1..c4bb17a4c0e 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/strategies/AskUserStrategy.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/AskUserStrategy.java @@ -9,7 +9,7 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading.strategies;
+package org.eclipse.papyrus.infra.services.resourceloading.strategies;
import java.util.HashMap;
import java.util.HashSet;
@@ -23,17 +23,17 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor;
-import org.eclipse.papyrus.core.resourceloading.ILoadingStrategy;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;
-import org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngr;
-import org.eclipse.papyrus.ui.toolbox.notification.INotification;
-import org.eclipse.papyrus.ui.toolbox.notification.NotificationRunnable;
-import org.eclipse.papyrus.ui.toolbox.notification.Type;
-import org.eclipse.papyrus.ui.toolbox.notification.builders.IContext;
-import org.eclipse.papyrus.ui.toolbox.notification.builders.NotificationBuilder;
+import org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngr;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.IContext;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;
import org.eclipse.swt.SWT;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IEditorReference;
@@ -92,7 +92,7 @@ public class AskUserStrategy implements ILoadingStrategy { private static final URI NoForAllURI = URI.createURI(Messages.AskUserStrategy_NO_FOR_ALL_URI);
/**
- * @see org.eclipse.papyrus.core.resourceloading.ILoadingStrategy#loadResource(org.eclipse.papyrus.resource.ModelSet,
+ * @see org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy#loadResource(org.eclipse.papyrus.infra.core.resource.ModelSet,
* org.eclipse.emf.common.util.URI)
*
* @param modelSet
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/strategies/LoadAllResources.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/LoadAllResources.java index 23546e3eccf..475dd2e3b7f 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/strategies/LoadAllResources.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/LoadAllResources.java @@ -11,11 +11,11 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading.strategies;
+package org.eclipse.papyrus.infra.services.resourceloading.strategies;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.core.resourceloading.ILoadingStrategy;
-import org.eclipse.papyrus.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy;
/**
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/strategies/LoadControlledResources.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/LoadControlledResources.java index 60f74a6c747..f47c51b516d 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/strategies/LoadControlledResources.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/LoadControlledResources.java @@ -11,17 +11,17 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading.strategies;
+package org.eclipse.papyrus.infra.services.resourceloading.strategies;
import java.util.Set;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.controlmode.history.HistoryModel;
-import org.eclipse.papyrus.controlmode.history.utils.HistoryUtils;
-import org.eclipse.papyrus.core.resourceloading.HistoryRoutingUtils;
-import org.eclipse.papyrus.core.resourceloading.ILoadingStrategy;
-import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.resource.sasheditor.SashModelUtils;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModelUtils;
+import org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel;
+import org.eclipse.papyrus.infra.services.controlmode.history.utils.HistoryUtils;
+import org.eclipse.papyrus.infra.services.resourceloading.HistoryRoutingUtils;
+import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy;
public class LoadControlledResources implements ILoadingStrategy {
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/strategies/LoadCurrentResource.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/LoadCurrentResource.java index 160572c1cd6..e7ff17b2a8a 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/strategies/LoadCurrentResource.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/LoadCurrentResource.java @@ -11,11 +11,11 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading.strategies;
+package org.eclipse.papyrus.infra.services.resourceloading.strategies;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.core.resourceloading.ILoadingStrategy;
-import org.eclipse.papyrus.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy;
public class LoadCurrentResource implements ILoadingStrategy {
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/strategies/Messages.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/Messages.java index ce141f8a428..f67582807da 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/strategies/Messages.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/Messages.java @@ -1,10 +1,10 @@ -package org.eclipse.papyrus.core.resourceloading.strategies;
+package org.eclipse.papyrus.infra.services.resourceloading.strategies;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.papyrus.core.resourceloading.strategies.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.resourceloading.strategies.messages"; //$NON-NLS-1$
public static String AskUserStrategy_0;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/strategies/messages.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/messages.properties index 0d70f650ff3..0d70f650ff3 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/strategies/messages.properties +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/messages.properties diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/util/LoadingTester.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/util/LoadingTester.java index 8de65f81e0a..755898687f8 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/util/LoadingTester.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/util/LoadingTester.java @@ -11,7 +11,7 @@ * Vincent Hemery (Atos) vincent.hemery@atos.net - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading.util;
+package org.eclipse.papyrus.infra.services.resourceloading.util;
import java.util.Iterator;
@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil; import org.eclipse.gmf.runtime.notation.Edge;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.resource.notation.NotationUtils;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.notation.NotationUtils;
/**
* This class provides test to perform on resources to know their loading status.
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/util/LoadingUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/util/LoadingUtils.java index 740a7309d68..66795f80efe 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/util/LoadingUtils.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/util/LoadingUtils.java @@ -11,7 +11,7 @@ * Vincent Hemery (Atos) vincent.hemery@atos.net - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading.util;
+package org.eclipse.papyrus.infra.services.resourceloading.util;
import java.util.ArrayList;
import java.util.HashSet;
@@ -32,18 +32,18 @@ import org.eclipse.gef.GraphicalEditPart; import org.eclipse.gef.util.EditPartUtilities;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor;
-import org.eclipse.papyrus.core.resourceloading.Activator;
-import org.eclipse.papyrus.core.resourceloading.Messages;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.resource.notation.NotationModel;
-import org.eclipse.papyrus.resource.sasheditor.DiModel;
-import org.eclipse.papyrus.resource.uml.UmlModel;
-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;
-import org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngr;
-import org.eclipse.papyrus.ui.toolbox.notification.Type;
-import org.eclipse.papyrus.ui.toolbox.notification.builders.NotificationBuilder;
+import org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.notation.NotationModel;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
+import org.eclipse.papyrus.infra.core.resource.uml.UmlModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngr;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.resourceloading.Activator;
+import org.eclipse.papyrus.infra.services.resourceloading.Messages;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbench;
|