diff options
| author | cletavernie | 2011-11-09 16:05:21 +0000 |
|---|---|---|
| committer | cletavernie | 2011-11-09 16:05:21 +0000 |
| commit | f860ac488f517747a1d69c92be2e6541d03e1afc (patch) | |
| tree | 57e584df5c0eff5f52fac81d4f774c237c0a0ae3 /plugins/infra/services | |
| parent | be2557ad19fcc35afd6af6932cd0dece13d29c4b (diff) | |
| download | org.eclipse.papyrus-f860ac488f517747a1d69c92be2e6541d03e1afc.tar.gz org.eclipse.papyrus-f860ac488f517747a1d69c92be2e6541d03e1afc.tar.xz org.eclipse.papyrus-f860ac488f517747a1d69c92be2e6541d03e1afc.zip | |
362162: [Architecture - Refactoring] The plug-ins should be renamed to match their layer's qualified name
https://bugs.eclipse.org/bugs/show_bug.cgi?id=362162
Diffstat (limited to 'plugins/infra/services')
116 files changed, 596 insertions, 588 deletions
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF index 8af3fdaf9d1..2c0b7c79866 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.controlmode.history,
- org.eclipse.papyrus.controlmode.history.utils,
- org.eclipse.papyrus.controlmode.mm.history,
- org.eclipse.papyrus.controlmode.mm.history.impl,
- org.eclipse.papyrus.controlmode.mm.history.util
+Export-Package: org.eclipse.papyrus.infra.services.controlmode.history,
+ org.eclipse.papyrus.infra.services.controlmode.history.utils,
+ org.eclipse.papyrus.infra.services.controlmode.mm.history,
+ org.eclipse.papyrus.infra.services.controlmode.mm.history.impl,
+ org.eclipse.papyrus.infra.services.controlmode.mm.history.util
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.papyrus.infra.core;bundle-version="0.9.0"
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/history.genmodel b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/history.genmodel index fba8354160f..69ff4eecddf 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/history.genmodel +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/history.genmodel @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel" modelDirectory="/org.eclipse.papyrus.controlmode.history/src"
- modelPluginID="org.eclipse.papyrus.controlmode.history" modelName="History" importerID="org.eclipse.uml2.uml.ecore.importer"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel" modelDirectory="/org.eclipse.papyrus.infra.services.controlmode.history/src"
+ modelPluginID="org.eclipse.papyrus.infra.services.controlmode.history" modelName="History" importerID="org.eclipse.uml2.uml.ecore.importer"
complianceLevel="6.0" copyrightFields="false">
<genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
<details key="ECORE_TAGGED_VALUES" value="PROCESS"/>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/plugin.xml index 294ed2edbc7..37c9dfd6541 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/plugin.xml +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/plugin.xml @@ -13,13 +13,13 @@ <extension point="org.eclipse.emf.ecore.generated_package">
<package
uri="http://www.eclipse.org/papyrus/0.7.0/controlmode"
- class="org.eclipse.papyrus.controlmode.mm.history.historyPackage"
+ class="org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage"
genModel="model/history.genmodel"/>
</extension>
<extension
- point="org.eclipse.papyrus.core.model">
+ point="org.eclipse.papyrus.infra.core.model">
<model
- classname="org.eclipse.papyrus.controlmode.history.HistoryModel"
+ classname="org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel"
description="Model for History">
</model>
</extension>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/history/HistoryModel.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/history/HistoryModel.java index fcb63e5e9e5..943ded823a3 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/history/HistoryModel.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/history/HistoryModel.java @@ -1,13 +1,13 @@ /**
*
*/
-package org.eclipse.papyrus.controlmode.history;
+package org.eclipse.papyrus.infra.services.controlmode.history;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.controlmode.mm.history.ControledResource;
-import org.eclipse.papyrus.resource.AbstractModelWithSharedResource;
-import org.eclipse.papyrus.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
/**
@@ -29,12 +29,12 @@ public class HistoryModel extends AbstractModelWithSharedResource<ControledResou /**
* Model ID.
*/
- public static final String MODEL_ID = "org.eclipse.papyrus.controlmode.history.HistoryModel"; //$NON-NLS-1$
+ public static final String MODEL_ID = "org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel"; //$NON-NLS-1$
/**
* Identifier used to retrieve the model from the ModelManager
*
- * @see org.eclipse.papyrus.resource.AbstractBaseModel#getIdentifier()
+ * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()
*
* @return
*/
@@ -46,7 +46,7 @@ public class HistoryModel extends AbstractModelWithSharedResource<ControledResou /**
* Get the extension used for TraceModel resources
*
- * @see org.eclipse.papyrus.resource.AbstractBaseModel#getModelFileExtension()
+ * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()
*
* @return
*/
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/history/utils/HistoryUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/history/utils/HistoryUtils.java index 80c2fce0d4b..322572d6fd6 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/history/utils/HistoryUtils.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/history/utils/HistoryUtils.java @@ -1,7 +1,7 @@ /**
*
*/
-package org.eclipse.papyrus.controlmode.history.utils;
+package org.eclipse.papyrus.infra.services.controlmode.history.utils;
import java.util.Collections;
import java.util.LinkedList;
@@ -10,13 +10,13 @@ import java.util.List; 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.mm.history.ControledResource;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
-import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.resource.ModelUtils;
-import org.eclipse.papyrus.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelUtils;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
/**
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/mm/history/ControledResource.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/ControledResource.java index 8aebce39fb3..1fc90355b9c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/mm/history/ControledResource.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/ControledResource.java @@ -4,7 +4,7 @@ *
* $Id$
*/
-package org.eclipse.papyrus.controlmode.mm.history;
+package org.eclipse.papyrus.infra.services.controlmode.mm.history;
import org.eclipse.emf.common.util.EList;
@@ -24,13 +24,13 @@ import org.eclipse.emf.ecore.EObject; * <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.controlmode.mm.history.ControledResource#getChildren <em>Children</em>}</li>
- * <li>{@link org.eclipse.papyrus.controlmode.mm.history.ControledResource#getParent <em>Parent</em>}</li>
- * <li>{@link org.eclipse.papyrus.controlmode.mm.history.ControledResource#getResourceURL <em>Resource URL</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getChildren <em>Children</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getParent <em>Parent</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getResourceURL <em>Resource URL</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.controlmode.mm.history.historyPackage#getControledResource()
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage#getControledResource()
* @model
* @generated
*/
@@ -38,8 +38,8 @@ public interface ControledResource extends EObject { /**
* Returns the value of the '<em><b>Children</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.papyrus.controlmode.mm.history.ControledResource}.
- * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.controlmode.mm.history.ControledResource#getParent <em>Parent</em>}'.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource}.
+ * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getParent <em>Parent</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Children</em>' containment reference list isn't clear, there really should be more of a description here...
@@ -47,8 +47,8 @@ public interface ControledResource extends EObject { * <!-- end-user-doc -->
*
* @return the value of the '<em>Children</em>' containment reference list.
- * @see org.eclipse.papyrus.controlmode.mm.history.historyPackage#getControledResource_Children()
- * @see org.eclipse.papyrus.controlmode.mm.history.ControledResource#getParent
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage#getControledResource_Children()
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getParent
* @model opposite="parent" containment="true" ordered="false"
* @generated
*/
@@ -56,7 +56,7 @@ public interface ControledResource extends EObject { /**
* Returns the value of the '<em><b>Parent</b></em>' container reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.controlmode.mm.history.ControledResource#getChildren <em>Children</em>}'.
+ * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getChildren <em>Children</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Parent</em>' container reference isn't clear, there really should be more of a description here...
@@ -65,15 +65,15 @@ public interface ControledResource extends EObject { *
* @return the value of the '<em>Parent</em>' container reference.
* @see #setParent(ControledResource)
- * @see org.eclipse.papyrus.controlmode.mm.history.historyPackage#getControledResource_Parent()
- * @see org.eclipse.papyrus.controlmode.mm.history.ControledResource#getChildren
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage#getControledResource_Parent()
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getChildren
* @model opposite="children" transient="false" ordered="false"
* @generated
*/
ControledResource getParent();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.controlmode.mm.history.ControledResource#getParent <em>Parent</em>}' container reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getParent <em>Parent</em>}' container reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -94,14 +94,14 @@ public interface ControledResource extends EObject { *
* @return the value of the '<em>Resource URL</em>' attribute.
* @see #setResourceURL(String)
- * @see org.eclipse.papyrus.controlmode.mm.history.historyPackage#getControledResource_ResourceURL()
- * @model unique="false" dataType="org.eclipse.papyrus.controlmode.mm.history.String" required="true" ordered="false"
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage#getControledResource_ResourceURL()
+ * @model unique="false" dataType="org.eclipse.papyrus.infra.services.controlmode.mm.history.String" required="true" ordered="false"
* @generated
*/
String getResourceURL();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.controlmode.mm.history.ControledResource#getResourceURL <em>Resource URL</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getResourceURL <em>Resource URL</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/mm/history/historyFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/historyFactory.java index 3455654c7a9..0e182240e2b 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/mm/history/historyFactory.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/historyFactory.java @@ -4,7 +4,7 @@ *
* $Id$
*/
-package org.eclipse.papyrus.controlmode.mm.history;
+package org.eclipse.papyrus.infra.services.controlmode.mm.history;
import org.eclipse.emf.ecore.EFactory;
@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EFactory; * It provides a create method for each non-abstract class of the model.
* <!-- end-user-doc -->
*
- * @see org.eclipse.papyrus.controlmode.mm.history.historyPackage
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage
* @generated
*/
public interface historyFactory extends EFactory {
@@ -26,7 +26,7 @@ public interface historyFactory extends EFactory { *
* @generated
*/
- historyFactory eINSTANCE = org.eclipse.papyrus.controlmode.mm.history.impl.historyFactoryImpl.init();
+ historyFactory eINSTANCE = org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.historyFactoryImpl.init();
/**
* Returns a new object of class '<em>Controled Resource</em>'.
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/mm/history/historyPackage.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/historyPackage.java index 5182781df77..85891a95d88 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/mm/history/historyPackage.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/historyPackage.java @@ -4,7 +4,7 @@ *
* $Id$
*/
-package org.eclipse.papyrus.controlmode.mm.history;
+package org.eclipse.papyrus.infra.services.controlmode.mm.history;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EReference; * </ul>
* <!-- end-user-doc -->
*
- * @see org.eclipse.papyrus.controlmode.mm.history.historyFactory
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyFactory
* @model kind="package"
* @generated
*/
@@ -64,15 +64,15 @@ public interface historyPackage extends EPackage { *
* @generated
*/
- historyPackage eINSTANCE = org.eclipse.papyrus.controlmode.mm.history.impl.historyPackageImpl.init();
+ historyPackage eINSTANCE = org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.historyPackageImpl.init();
/**
- * The meta object id for the '{@link org.eclipse.papyrus.controlmode.mm.history.impl.ControledResourceImpl <em>Controled Resource</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl <em>Controled Resource</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @see org.eclipse.papyrus.controlmode.mm.history.impl.ControledResourceImpl
- * @see org.eclipse.papyrus.controlmode.mm.history.impl.historyPackageImpl#getControledResource()
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.historyPackageImpl#getControledResource()
* @generated
*/
int CONTROLED_RESOURCE = 0;
@@ -123,57 +123,57 @@ public interface historyPackage extends EPackage { * <!-- end-user-doc -->
*
* @see java.lang.String
- * @see org.eclipse.papyrus.controlmode.mm.history.impl.historyPackageImpl#getString()
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.historyPackageImpl#getString()
* @generated
*/
int STRING = 1;
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.controlmode.mm.history.ControledResource <em>Controled Resource</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource <em>Controled Resource</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @return the meta object for class '<em>Controled Resource</em>'.
- * @see org.eclipse.papyrus.controlmode.mm.history.ControledResource
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource
* @generated
*/
EClass getControledResource();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.controlmode.mm.history.ControledResource#getChildren
+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getChildren
* <em>Children</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @return the meta object for the containment reference list '<em>Children</em>'.
- * @see org.eclipse.papyrus.controlmode.mm.history.ControledResource#getChildren()
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getChildren()
* @see #getControledResource()
* @generated
*/
EReference getControledResource_Children();
/**
- * Returns the meta object for the container reference '{@link org.eclipse.papyrus.controlmode.mm.history.ControledResource#getParent
+ * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getParent
* <em>Parent</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @return the meta object for the container reference '<em>Parent</em>'.
- * @see org.eclipse.papyrus.controlmode.mm.history.ControledResource#getParent()
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getParent()
* @see #getControledResource()
* @generated
*/
EReference getControledResource_Parent();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.controlmode.mm.history.ControledResource#getResourceURL
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getResourceURL
* <em>Resource URL</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @return the meta object for the attribute '<em>Resource URL</em>'.
- * @see org.eclipse.papyrus.controlmode.mm.history.ControledResource#getResourceURL()
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getResourceURL()
* @see #getControledResource()
* @generated
*/
@@ -217,13 +217,13 @@ public interface historyPackage extends EPackage { interface Literals {
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.controlmode.mm.history.impl.ControledResourceImpl <em>Controled Resource</em>}'
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl <em>Controled Resource</em>}'
* class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @see org.eclipse.papyrus.controlmode.mm.history.impl.ControledResourceImpl
- * @see org.eclipse.papyrus.controlmode.mm.history.impl.historyPackageImpl#getControledResource()
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.historyPackageImpl#getControledResource()
* @generated
*/
EClass CONTROLED_RESOURCE = eINSTANCE.getControledResource();
@@ -261,7 +261,7 @@ public interface historyPackage extends EPackage { * <!-- end-user-doc -->
*
* @see java.lang.String
- * @see org.eclipse.papyrus.controlmode.mm.history.impl.historyPackageImpl#getString()
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.historyPackageImpl#getString()
* @generated
*/
EDataType STRING = eINSTANCE.getString();
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/mm/history/impl/ControledResourceImpl.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/impl/ControledResourceImpl.java index 56ba5670a5a..0e2afc4248f 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/mm/history/impl/ControledResourceImpl.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/impl/ControledResourceImpl.java @@ -4,7 +4,7 @@ *
* $Id$
*/
-package org.eclipse.papyrus.controlmode.mm.history.impl;
+package org.eclipse.papyrus.infra.services.controlmode.mm.history.impl;
import java.util.Collection;
@@ -23,8 +23,8 @@ import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList; import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.controlmode.mm.history.ControledResource;
-import org.eclipse.papyrus.controlmode.mm.history.historyPackage;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage;
/**
* <!-- begin-user-doc -->
@@ -33,9 +33,9 @@ import org.eclipse.papyrus.controlmode.mm.history.historyPackage; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.controlmode.mm.history.impl.ControledResourceImpl#getChildren <em>Children</em>}</li>
- * <li>{@link org.eclipse.papyrus.controlmode.mm.history.impl.ControledResourceImpl#getParent <em>Parent</em>}</li>
- * <li>{@link org.eclipse.papyrus.controlmode.mm.history.impl.ControledResourceImpl#getResourceURL <em>Resource URL</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl#getChildren <em>Children</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl#getParent <em>Parent</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl#getResourceURL <em>Resource URL</em>}</li>
* </ul>
* </p>
*
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/mm/history/impl/historyFactoryImpl.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/impl/historyFactoryImpl.java index b448cfc55f8..d5c0762b48d 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/mm/history/impl/historyFactoryImpl.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/impl/historyFactoryImpl.java @@ -4,7 +4,7 @@ *
* $Id$
*/
-package org.eclipse.papyrus.controlmode.mm.history.impl;
+package org.eclipse.papyrus.infra.services.controlmode.mm.history.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
@@ -15,7 +15,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.controlmode.mm.history.*;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.*;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/mm/history/impl/historyPackageImpl.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/impl/historyPackageImpl.java index 56ee2d7666f..1292258603c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/mm/history/impl/historyPackageImpl.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/impl/historyPackageImpl.java @@ -4,7 +4,7 @@ *
* $Id$
*/
-package org.eclipse.papyrus.controlmode.mm.history.impl;
+package org.eclipse.papyrus.infra.services.controlmode.mm.history.impl;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -14,9 +14,9 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.papyrus.controlmode.mm.history.ControledResource;
-import org.eclipse.papyrus.controlmode.mm.history.historyFactory;
-import org.eclipse.papyrus.controlmode.mm.history.historyPackage;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyFactory;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage;
/**
* <!-- begin-user-doc -->
@@ -52,7 +52,7 @@ public class historyPackageImpl extends EPackageImpl implements historyPackage { * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.papyrus.controlmode.mm.history.historyPackage#eNS_URI
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage#eNS_URI
* @see #init()
* @generated
*/
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/mm/history/util/historyAdapterFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/util/historyAdapterFactory.java index dd0ba5eef1b..969e96f6478 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/mm/history/util/historyAdapterFactory.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/util/historyAdapterFactory.java @@ -4,7 +4,7 @@ *
* $Id$
*/
-package org.eclipse.papyrus.controlmode.mm.history.util;
+package org.eclipse.papyrus.infra.services.controlmode.mm.history.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
@@ -13,7 +13,7 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.controlmode.mm.history.*;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.*;
/**
* <!-- begin-user-doc -->
@@ -21,7 +21,7 @@ import org.eclipse.papyrus.controlmode.mm.history.*; * It provides an adapter <code>createXXX</code> method for each class of the model.
* <!-- end-user-doc -->
*
- * @see org.eclipse.papyrus.controlmode.mm.history.historyPackage
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage
* @generated
*/
public class historyAdapterFactory extends AdapterFactoryImpl {
@@ -105,7 +105,7 @@ public class historyAdapterFactory extends AdapterFactoryImpl { /**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.controlmode.mm.history.ControledResource <em>Controled Resource</em>}
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource <em>Controled Resource</em>}
* '.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
@@ -113,7 +113,7 @@ public class historyAdapterFactory extends AdapterFactoryImpl { * <!-- end-user-doc -->
*
* @return the new adapter.
- * @see org.eclipse.papyrus.controlmode.mm.history.ControledResource
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource
* @generated
*/
public Adapter createControledResourceAdapter() {
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/mm/history/util/historySwitch.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/util/historySwitch.java index 74c4bebd344..cf1bec27e8b 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/controlmode/mm/history/util/historySwitch.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/util/historySwitch.java @@ -4,14 +4,14 @@ *
* $Id$
*/
-package org.eclipse.papyrus.controlmode.mm.history.util;
+package org.eclipse.papyrus.infra.services.controlmode.mm.history.util;
import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.controlmode.mm.history.*;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.*;
/**
* <!-- begin-user-doc -->
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.controlmode.mm.history.*; * which is the result of the switch.
* <!-- end-user-doc -->
*
- * @see org.eclipse.papyrus.controlmode.mm.history.historyPackage
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage
* @generated
*/
public class historySwitch<T> {
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF index 69a95f3fe03..636c2dce1d2 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF @@ -10,16 +10,16 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="0.9.0",
org.eclipse.papyrus.infra.services.resourceloading;bundle-version="0.9.0",
org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="0.9.0"
-Export-Package: org.eclipse.papyrus.controlmode,
- org.eclipse.papyrus.controlmode.action,
- org.eclipse.papyrus.controlmode.commands,
- org.eclipse.papyrus.controlmode.ui
+Export-Package: org.eclipse.papyrus.infra.services.controlmode,
+ org.eclipse.papyrus.infra.services.controlmode.action,
+ org.eclipse.papyrus.infra.services.controlmode.commands,
+ org.eclipse.papyrus.infra.services.controlmode.ui
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.controlmode.ControlModePlugin
+Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.ControlModePlugin
Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.xml index f925d0caa4f..9f52620988a 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.xml +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
- <extension-point id="org.eclipse.papyrus.controlmode.customControlCommand" name="customControlCommand" schema="schema/customControlCommand.exsd"/>
+ <extension-point id="org.eclipse.papyrus.infra.services.controlmode.customControlCommand" name="customControlCommand" schema="schema/customControlCommand.exsd"/>
<extension
point="org.eclipse.papyrus.views.modelexplorer.actionHandler">
<customAction
- actionHandler="org.eclipse.papyrus.controlmode.action.CollaborativeActionsFactory"
+ actionHandler="org.eclipse.papyrus.infra.services.controlmode.action.CollaborativeActionsFactory"
actionId="org.eclipse.papyrus.controlmode.action.collaborativeActions"
afterAction="org.eclipse.papyrus.views.modelexplorer.factory.defaultEMFActions"
needSeparator="false">
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/schema/customControlCommand.exsd b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/schema/customControlCommand.exsd index f50a1e8bb0f..a84def31ea0 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/schema/customControlCommand.exsd +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/schema/customControlCommand.exsd @@ -1,9 +1,9 @@ <?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.controlmode" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.papyrus.infra.services.controlmode" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.eclipse.papyrus.controlmode" id="customControlCommand" name="Custom Control Command"/>
+ <meta.schema plugin="org.eclipse.papyrus.infra.services.controlmode" id="customControlCommand" name="Custom Control Command"/>
</appinfo>
<documentation>
An extension point to define custom control action executed with the default Papyrus control or uncontrol action.
@@ -57,7 +57,7 @@ </documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.controlmode.commands.IControlCommand"/>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.controlmode.commands.IControlCommand"/>
</appinfo>
</annotation>
</attribute>
@@ -72,7 +72,7 @@ </documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.controlmode.commands.IUncontrolCommand"/>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.controlmode.commands.IUncontrolCommand"/>
</appinfo>
</annotation>
</attribute>
@@ -87,7 +87,7 @@ </documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.controlmode.commands.IControlCondition"/>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.controlmode.commands.IControlCondition"/>
</appinfo>
</annotation>
</attribute>
@@ -117,9 +117,9 @@ <meta.section type="apiinfo"/>
</appinfo>
<documentation>
- The class must implement the interface org.eclipse.papyrus.controlmode.commands.IControlCommand to specify control command.
+ The class must implement the interface org.eclipse.papyrus.infra.services.controlmode.commands.IControlCommand to specify control command.
-The class must implement the interface org.eclipse.papyrus.controlmode.commands.IUncontrolCommand to specify uncontrol command.
+The class must implement the interface org.eclipse.papyrus.infra.services.controlmode.commands.IUncontrolCommand to specify uncontrol command.
</documentation>
</annotation>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/ControlModePlugin.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/ControlModePlugin.java index ea3a65ce232..4c313c2219a 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/ControlModePlugin.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/ControlModePlugin.java @@ -11,7 +11,7 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.controlmode;
+package org.eclipse.papyrus.infra.services.controlmode;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext; public class ControlModePlugin extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.controlmode";
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.controlmode";
// The shared instance
private static ControlModePlugin plugin;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/action/CollaborativeActionsFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/action/CollaborativeActionsFactory.java index db2fb0fc2a8..6c68822eb38 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/action/CollaborativeActionsFactory.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/action/CollaborativeActionsFactory.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 Atos Origin.
*
- *
+ *
* 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
@@ -11,7 +11,7 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.controlmode.action;
+package org.eclipse.papyrus.infra.services.controlmode.action;
import java.util.ArrayList;
import java.util.Iterator;
@@ -106,7 +106,7 @@ public class CollaborativeActionsFactory implements IActionHandlerFactory { ArrayList array = new ArrayList();
Iterator iterator = structuredSelection.iterator();
while(iterator.hasNext()) {
- Object object = (Object)iterator.next();
+ Object object = iterator.next();
if(NavigatorUtils.resolveSemanticObject(object) != null) {
array.add(NavigatorUtils.resolveSemanticObject(object));
}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/action/PapyrusControlAction.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/action/PapyrusControlAction.java index 5834821aff7..80f098ae870 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/action/PapyrusControlAction.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/action/PapyrusControlAction.java @@ -11,7 +11,7 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.controlmode.action;
+package org.eclipse.papyrus.infra.services.controlmode.action;
import java.util.LinkedList;
import java.util.List;
@@ -39,19 +39,19 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.window.Window;
import org.eclipse.papyrus.commands.CheckedOperationHistory;
-import org.eclipse.papyrus.controlmode.commands.ControlCommand;
-import org.eclipse.papyrus.controlmode.commands.IControlCondition;
-import org.eclipse.papyrus.core.utils.EditorUtils;
-import org.eclipse.papyrus.resource.AbstractBaseModel;
-import org.eclipse.papyrus.resource.IModel;
-import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.resource.ModelUtils;
-import org.eclipse.papyrus.resource.notation.NotationModel;
-import org.eclipse.papyrus.resource.uml.UmlModel;
-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.resource.AbstractBaseModel;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelUtils;
+import org.eclipse.papyrus.infra.core.resource.notation.NotationModel;
+import org.eclipse.papyrus.infra.core.resource.uml.UmlModel;
+import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.services.controlmode.commands.ControlCommand;
+import org.eclipse.papyrus.infra.services.controlmode.commands.IControlCondition;
+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.widgets.Display;
import org.eclipse.ui.PlatformUI;
@@ -61,7 +61,7 @@ import org.eclipse.ui.PlatformUI; public class PapyrusControlAction extends ControlAction {
/** extension point ID for custom control command */
- private static final String CONTROL_CONDITION_EXTENSION_POINT_ID = "org.eclipse.papyrus.controlmode.customControlCommand";
+ private static final String CONTROL_CONDITION_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.controlmode.customControlCommand";
/** attribute ID for the custom command class. */
private static final String CONTROL_CONDITION_ATTRIBUTE_EXTENSION_POINT = "controlCondition";
@@ -218,7 +218,7 @@ public class PapyrusControlAction extends ControlAction { * @return the controlled resource
*/
private Resource getControlledResource() {
- org.eclipse.papyrus.controlmode.ui.ControlResourceDialog dialog = new org.eclipse.papyrus.controlmode.ui.ControlResourceDialog(Display.getDefault().getActiveShell(), getEditingDomain(), eObject.eResource(), getElementName(eObject));
+ org.eclipse.papyrus.infra.services.controlmode.ui.ControlResourceDialog dialog = new org.eclipse.papyrus.infra.services.controlmode.ui.ControlResourceDialog(Display.getDefault().getActiveShell(), getEditingDomain(), eObject.eResource(), getElementName(eObject));
int returnCode = dialog.open();
Resource resource = null;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/action/PapyrusUncontrolAction.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/action/PapyrusUncontrolAction.java index 19cfa39d410..5f4380db826 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/action/PapyrusUncontrolAction.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/action/PapyrusUncontrolAction.java @@ -11,7 +11,7 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.controlmode.action;
+package org.eclipse.papyrus.infra.services.controlmode.action;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IAdaptable;
@@ -26,14 +26,14 @@ import org.eclipse.emf.edit.ui.action.CommandActionHandler; import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.commands.CheckedOperationHistory;
-import org.eclipse.papyrus.controlmode.commands.UncontrolCommand;
-import org.eclipse.papyrus.core.utils.EditorUtils;
-import org.eclipse.papyrus.resource.AbstractBaseModel;
-import org.eclipse.papyrus.resource.IModel;
-import org.eclipse.papyrus.resource.ModelUtils;
-import org.eclipse.papyrus.resource.uml.UmlModel;
-import org.eclipse.papyrus.ui.toolbox.notification.Type;
-import org.eclipse.papyrus.ui.toolbox.notification.builders.NotificationBuilder;
+import org.eclipse.papyrus.infra.core.resource.AbstractBaseModel;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.resource.ModelUtils;
+import org.eclipse.papyrus.infra.core.resource.uml.UmlModel;
+import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.services.controlmode.commands.UncontrolCommand;
+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.PlatformUI;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/commands/ControlCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/ControlCommand.java index ac809849bea..a495d4494f7 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/commands/ControlCommand.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/ControlCommand.java @@ -11,7 +11,7 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.controlmode.commands;
+package org.eclipse.papyrus.infra.services.controlmode.commands;
import java.util.Collection;
import java.util.Collections;
@@ -46,28 +46,28 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCo import org.eclipse.gmf.runtime.emf.commands.core.command.EditingDomainUndoContext;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.controlmode.commands.IControlCommand.STATE_CONTROL;
-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.controlmode.mm.history.historyPackage;
-import org.eclipse.papyrus.core.modelsetquery.ModelSetQuery;
-import org.eclipse.papyrus.core.utils.EditorUtils;
-import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.resource.notation.NotationModel;
-import org.eclipse.papyrus.resource.notation.NotationUtils;
-import org.eclipse.papyrus.resource.sasheditor.DiModel;
-import org.eclipse.papyrus.resource.sasheditor.SashModelUtils;
-import org.eclipse.papyrus.resource.uml.UmlUtils;
-import org.eclipse.papyrus.sashwindows.di.PageRef;
-import org.eclipse.papyrus.sashwindows.di.SashWindowsMngr;
-import org.eclipse.papyrus.sashwindows.di.exception.SashEditorException;
-import org.eclipse.papyrus.sashwindows.di.util.DiUtils;
-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.modelsetquery.ModelSetQuery;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.notation.NotationModel;
+import org.eclipse.papyrus.infra.core.resource.notation.NotationUtils;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModelUtils;
+import org.eclipse.papyrus.infra.core.resource.uml.UmlUtils;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
+import org.eclipse.papyrus.infra.core.sashwindows.di.exception.SashEditorException;
+import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
+import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.services.controlmode.commands.IControlCommand.STATE_CONTROL;
+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;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage;
+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.widgets.Display;
import org.eclipse.ui.PlatformUI;
@@ -77,7 +77,7 @@ import org.eclipse.ui.PlatformUI; public class ControlCommand extends AbstractTransactionalCommand {
/** extension point ID for custom control command */
- private static final String CONTROL_EXTENSION_POINT_ID = "org.eclipse.papyrus.controlmode.customControlCommand";
+ private static final String CONTROL_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.controlmode.customControlCommand";
/** attribute ID for the custom command class. */
private static final String CONTROL_CMD_ATTRIBUTE_EXTENSION_POINT = "controlCommand";
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/commands/IControlCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/IControlCommand.java index 715475d7c36..d72af88f8d8 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/commands/IControlCommand.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/IControlCommand.java @@ -11,7 +11,7 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.controlmode.commands;
+package org.eclipse.papyrus.infra.services.controlmode.commands;
import org.eclipse.emf.common.command.CompoundCommand;
import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/commands/IControlCondition.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/IControlCondition.java index b84a5a6e114..51e4db93455 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/commands/IControlCondition.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/IControlCondition.java @@ -11,7 +11,7 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.controlmode.commands;
+package org.eclipse.papyrus.infra.services.controlmode.commands;
import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/commands/IUncontrolCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/IUncontrolCommand.java index c3eb54aa7a9..0f58fe957f5 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/commands/IUncontrolCommand.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/IUncontrolCommand.java @@ -11,7 +11,7 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.controlmode.commands;
+package org.eclipse.papyrus.infra.services.controlmode.commands;
import org.eclipse.emf.common.command.CompoundCommand;
import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/commands/UncontrolCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/UncontrolCommand.java index 145e0e6439a..e20d289c664 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/commands/UncontrolCommand.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/UncontrolCommand.java @@ -11,7 +11,7 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.controlmode.commands;
+package org.eclipse.papyrus.infra.services.controlmode.commands;
import java.util.ArrayList;
import java.util.Collection;
@@ -53,17 +53,17 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.EditingDomainUndoContex import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.controlmode.commands.IUncontrolCommand.STATE_CONTROL;
-import org.eclipse.papyrus.controlmode.history.utils.HistoryUtils;
-import org.eclipse.papyrus.controlmode.mm.history.ControledResource;
-import org.eclipse.papyrus.controlmode.mm.history.historyPackage;
-import org.eclipse.papyrus.core.utils.EditorUtils;
-import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.resource.notation.NotationModel;
-import org.eclipse.papyrus.resource.notation.NotationUtils;
-import org.eclipse.papyrus.resource.sasheditor.DiModel;
-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.notation.NotationModel;
+import org.eclipse.papyrus.infra.core.resource.notation.NotationUtils;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
+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.EditorUtils;
+import org.eclipse.papyrus.infra.services.controlmode.commands.IUncontrolCommand.STATE_CONTROL;
+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.historyPackage;
import org.eclipse.ui.PlatformUI;
/**
@@ -73,7 +73,7 @@ import org.eclipse.ui.PlatformUI; public class UncontrolCommand extends AbstractTransactionalCommand {
/** extension point ID for custom control command */
- private static final String CONTROL_EXTENSION_POINT_ID = "org.eclipse.papyrus.controlmode.customControlCommand";
+ private static final String CONTROL_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.controlmode.customControlCommand";
/** attribute ID for the custom command class. */
private static final String UNCONTROL_CMD_ATTRIBUTE_EXTENSION_POINT = "uncontrolCommand";
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/ui/ControlResourceDialog.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/ui/ControlResourceDialog.java index a596e3155a5..9cb9749ca1c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/controlmode/ui/ControlResourceDialog.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/ui/ControlResourceDialog.java @@ -7,7 +7,7 @@ * Contributors: Jacques Lescot (Anyware Technologies) - initial API and
* implementation
******************************************************************************/
-package org.eclipse.papyrus.controlmode.ui;
+package org.eclipse.papyrus.infra.services.controlmode.ui;
import java.io.IOException;
import java.io.InputStream;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF index 3285fc2e8fa..c89d6cbdba8 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.decoration,
- org.eclipse.papyrus.decoration.util
+Export-Package: org.eclipse.papyrus.infra.services.decoration,
+ org.eclipse.papyrus.infra.services.decoration.util
Bundle-ActivationPolicy: lazy
Bundle-Name: %pluginName
Bundle-Localization: plugin
@@ -11,11 +11,11 @@ Require-Bundle: org.eclipse.ui, Bundle-Vendor: %providerName
Bundle-Version: 0.9.0.qualifier
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.decoration.Activator
+Bundle-Activator: org.eclipse.papyrus.infra.services.decoration.Activator
Bundle-SymbolicName: org.eclipse.papyrus.infra.services.decoration;singleton:=true
Import-Package: org.apache.commons.lang;version="2.4.0",
org.eclipse.core.resources,
org.eclipse.emf.facet.infra.browser.uicore.internal.model,
- org.eclipse.papyrus.core.editorsfactory,
- org.eclipse.papyrus.log
+ org.eclipse.papyrus.infra.core.editorsfactory,
+ org.eclipse.papyrus.infra.core.log
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.xml index a701ec30616..568a0d2f0e1 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.xml +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.xml @@ -2,9 +2,9 @@ <?eclipse version="3.4"?>
<plugin>
<extension
- point="org.eclipse.papyrus.core.service">
+ point="org.eclipse.papyrus.infra.core.service">
<service
- classname="org.eclipse.papyrus.decoration.DecorationService"
+ classname="org.eclipse.papyrus.infra.services.decoration.DecorationService"
priority="1"
useClassTypeAsKey="true"
startKind="lazy">
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/decoration/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/Activator.java index c14cb6718f4..cb9549e1a62 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/decoration/Activator.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/Activator.java @@ -10,9 +10,9 @@ * Contributors:
* Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
*****************************************************************************/
-package org.eclipse.papyrus.decoration;
+package org.eclipse.papyrus.infra.services.decoration;
-import org.eclipse.papyrus.log.LogHelper;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/decoration/DecorationService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/DecorationService.java index a4066072af2..c304c5c82ad 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/decoration/DecorationService.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/DecorationService.java @@ -10,7 +10,7 @@ * Contributors:
* Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
*****************************************************************************/
-package org.eclipse.papyrus.decoration;
+package org.eclipse.papyrus.infra.services.decoration;
import java.util.HashMap;
import java.util.Map;
@@ -19,11 +19,11 @@ import java.util.Observer; import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
-import org.eclipse.papyrus.decoration.util.Decoration;
-import org.eclipse.papyrus.decoration.util.DecorationUtils;
-import org.eclipse.papyrus.decoration.util.IDecoration;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.services.decoration.util.Decoration;
+import org.eclipse.papyrus.infra.services.decoration.util.DecorationUtils;
+import org.eclipse.papyrus.infra.services.decoration.util.IDecoration;
// TODO: Auto-generated Javadoc
@@ -46,7 +46,7 @@ public class DecorationService extends Observable implements IDecorationService * the services registry
* @throws ServiceException
* the service exception
- * @see org.eclipse.papyrus.core.services.IService#init(org.eclipse.papyrus.core.services.ServicesRegistry)
+ * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
*/
public void init(ServicesRegistry servicesRegistry) throws ServiceException {
@@ -65,7 +65,7 @@ public class DecorationService extends Observable implements IDecorationService *
* @throws ServiceException
* the service exception
- * @see org.eclipse.papyrus.decoration.IDecorationService#startService()
+ * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#startService()
*/
public void startService() throws ServiceException {
@@ -78,7 +78,7 @@ public class DecorationService extends Observable implements IDecorationService *
* @throws ServiceException
* the service exception
- * @see org.eclipse.papyrus.decoration.IDecorationService#disposeService()
+ * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#disposeService()
*/
public void disposeService() throws ServiceException {
@@ -92,7 +92,7 @@ public class DecorationService extends Observable implements IDecorationService *
* @param decorationService
* the decoration service
- * @see org.eclipse.papyrus.decoration.IDecorationService#notifyListeners(org.eclipse.papyrus.decoration.DecorationService)
+ * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#notifyListeners(org.eclipse.papyrus.infra.services.decoration.DecorationService)
*/
public void notifyListeners(DecorationService decorationService) {
@@ -135,7 +135,7 @@ public class DecorationService extends Observable implements IDecorationService *
* @param o
* the o
- * @see org.eclipse.papyrus.decoration.IDecorationService#addListener(java.util.Observer)
+ * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#addListener(java.util.Observer)
*/
public synchronized void addListener(Observer o) {
@@ -147,7 +147,7 @@ public class DecorationService extends Observable implements IDecorationService *
* @param o
* the o
- * @see org.eclipse.papyrus.decoration.IDecorationService#deleteListener(java.util.Observer)
+ * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#deleteListener(java.util.Observer)
*/
public synchronized void deleteListener(Observer o) {
@@ -159,7 +159,7 @@ public class DecorationService extends Observable implements IDecorationService *
* @param id
* the id
- * @see org.eclipse.papyrus.decoration.IDecorationService#removeDecoration(java.lang.String)
+ * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#removeDecoration(java.lang.String)
*/
public void removeDecoration(String id) {
@@ -181,7 +181,7 @@ public class DecorationService extends Observable implements IDecorationService * the severity
* @param message
* the message
- * @see org.eclipse.papyrus.decoration.IDecorationService#addDecoration(java.lang.String, org.eclipse.emf.ecore.EObject, int, java.lang.String)
+ * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#addDecoration(java.lang.String, org.eclipse.emf.ecore.EObject, int, java.lang.String)
*/
public void addDecoration(String id, EObject element, int severity, String message) {
@@ -206,7 +206,7 @@ public class DecorationService extends Observable implements IDecorationService * the decoration
* @param message
* the message
- * @see org.eclipse.papyrus.decoration.IDecorationService#addDecoration(java.lang.String, org.eclipse.emf.ecore.EObject,
+ * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#addDecoration(java.lang.String, org.eclipse.emf.ecore.EObject,
* org.eclipse.jface.resource.ImageDescriptor, java.lang.String)
*/
@@ -226,7 +226,7 @@ public class DecorationService extends Observable implements IDecorationService * @param navigateToParents
* the navigate to parents
* @return the decoration
- * @see org.eclipse.papyrus.decoration.IDecorationService#getDecoration(java.lang.Object, boolean)
+ * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#getDecoration(java.lang.Object, boolean)
*/
public IDecoration getDecoration(Object element, boolean navigateToParents) {
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/decoration/IDecorationService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/IDecorationService.java index 947107c8fa7..42144357580 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/decoration/IDecorationService.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/IDecorationService.java @@ -10,15 +10,15 @@ * Contributors:
* Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
*****************************************************************************/
-package org.eclipse.papyrus.decoration;
+package org.eclipse.papyrus.infra.services.decoration;
import java.util.Observer;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.core.services.IService;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.decoration.util.IDecoration;
+import org.eclipse.papyrus.infra.core.services.IService;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.decoration.util.IDecoration;
// TODO: Auto-generated Javadoc
@@ -28,7 +28,7 @@ import org.eclipse.papyrus.decoration.util.IDecoration; public interface IDecorationService extends IService {
/**
- * @see org.eclipse.papyrus.core.services.IService#startService()
+ * @see org.eclipse.papyrus.infra.core.services.IService#startService()
*
* @throws ServiceException
*/
@@ -36,7 +36,7 @@ public interface IDecorationService extends IService { void startService() throws ServiceException;
/**
- * @see org.eclipse.papyrus.core.services.IService#disposeService()
+ * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()
*
* @throws ServiceException
*/
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/decoration/util/Decoration.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/Decoration.java index 2aa0c03e917..4984af0fdcd 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/decoration/util/Decoration.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/Decoration.java @@ -10,7 +10,7 @@ * Contributors:
* Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
*****************************************************************************/
-package org.eclipse.papyrus.decoration.util;
+package org.eclipse.papyrus.infra.services.decoration.util;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -124,7 +124,7 @@ public class Decoration implements IDecoration { * Gets the severity.
*
* @return the severity
- * @see org.eclipse.papyrus.decoration.util.IDecoration#getSeverity()
+ * @see org.eclipse.papyrus.infra.services.decoration.util.IDecoration#getSeverity()
*/
public int getSeverity() {
@@ -136,7 +136,7 @@ public class Decoration implements IDecoration { * Sets the severity.
*
* @param severity the new severity
- * @see org.eclipse.papyrus.decoration.util.IDecoration#setSeverity(int)
+ * @see org.eclipse.papyrus.infra.services.decoration.util.IDecoration#setSeverity(int)
*/
public void setSeverity(int severity) {
@@ -148,7 +148,7 @@ public class Decoration implements IDecoration { * Gets the message.
*
* @return the message
- * @see org.eclipse.papyrus.decoration.util.IDecoration#getMessage()
+ * @see org.eclipse.papyrus.infra.services.decoration.util.IDecoration#getMessage()
*/
public String getMessage() {
@@ -160,7 +160,7 @@ public class Decoration implements IDecoration { * Sets the message.
*
* @param message the new message
- * @see org.eclipse.papyrus.decoration.util.IDecoration#setMessage(java.lang.String)
+ * @see org.eclipse.papyrus.infra.services.decoration.util.IDecoration#setMessage(java.lang.String)
*/
public void setMessage(String message) {
@@ -192,7 +192,7 @@ public class Decoration implements IDecoration { * Gets the decoration image.
*
* @return the decoration image
- * @see org.eclipse.papyrus.decoration.util.IDecoration#getDecorationImage()
+ * @see org.eclipse.papyrus.infra.services.decoration.util.IDecoration#getDecorationImage()
*/
public ImageDescriptor getDecorationImage() {
@@ -203,7 +203,7 @@ public class Decoration implements IDecoration { * Sets the decoration image.
*
* @param decorationImage the new decoration image
- * @see org.eclipse.papyrus.decoration.util.IDecoration#setDecorationImage(org.eclipse.jface.resource.ImageDescriptor)
+ * @see org.eclipse.papyrus.infra.services.decoration.util.IDecoration#setDecorationImage(org.eclipse.jface.resource.ImageDescriptor)
*/
public void setDecorationImage(ImageDescriptor decorationImage) {
@@ -216,7 +216,7 @@ public class Decoration implements IDecoration { * Gets the position.
*
* @return the position
- * @see org.eclipse.papyrus.decoration.util.IDecoration#getPosition()
+ * @see org.eclipse.papyrus.infra.services.decoration.util.IDecoration#getPosition()
*/
public PreferedPosition getPosition() {
@@ -229,7 +229,7 @@ public class Decoration implements IDecoration { * Sets the position.
*
* @param position the new position
- * @see org.eclipse.papyrus.decoration.util.IDecoration#setPosition(org.eclipse.papyrus.decoration.util.Decoration.PreferedPosition)
+ * @see org.eclipse.papyrus.infra.services.decoration.util.IDecoration#setPosition(org.eclipse.papyrus.infra.services.decoration.util.Decoration.PreferedPosition)
*/
public void setPosition(PreferedPosition position) {
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/decoration/util/DecorationUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationUtils.java index 2779f1d53ee..75ac4a47d4d 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/decoration/util/DecorationUtils.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationUtils.java @@ -10,7 +10,7 @@ * Contributors: * Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr *****************************************************************************/ -package org.eclipse.papyrus.decoration.util; +package org.eclipse.papyrus.infra.services.decoration.util; import java.util.Iterator; import java.util.List; @@ -22,8 +22,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.facet.infra.browser.uicore.internal.model.LinkItem; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.decoration.Activator; -import org.eclipse.papyrus.decoration.DecorationService; +import org.eclipse.papyrus.infra.services.decoration.Activator; +import org.eclipse.papyrus.infra.services.decoration.DecorationService; // TODO: Auto-generated Javadoc diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/decoration/util/IDecoration.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/IDecoration.java index bb434e7f1a2..48b69805e0c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/decoration/util/IDecoration.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/IDecoration.java @@ -10,10 +10,10 @@ * Contributors:
* Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
*****************************************************************************/
-package org.eclipse.papyrus.decoration.util;
+package org.eclipse.papyrus.infra.services.decoration.util;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.decoration.util.Decoration.PreferedPosition;
+import org.eclipse.papyrus.infra.services.decoration.util.Decoration.PreferedPosition;
// TODO: Auto-generated Javadoc
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF index 7a11d9757c9..09d7137b9f1 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF @@ -5,18 +5,18 @@ Require-Bundle: org.eclipse.ui, org.eclipse.emf;bundle-version="2.6.0",
org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
org.eclipse.papyrus.infra.core.log;bundle-version="0.9.0"
-Export-Package: org.eclipse.papyrus.service.edit,
- org.eclipse.papyrus.service.edit.commands,
- org.eclipse.papyrus.service.edit.messages,
- org.eclipse.papyrus.service.edit.service,
- org.eclipse.papyrus.service.edit.utils
+Export-Package: org.eclipse.papyrus.infra.services.edit,
+ org.eclipse.papyrus.infra.services.edit.commands,
+ org.eclipse.papyrus.infra.services.edit.messages,
+ org.eclipse.papyrus.infra.services.edit.service,
+ org.eclipse.papyrus.infra.services.edit.utils
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.service.edit.Activator
+Bundle-Activator: org.eclipse.papyrus.infra.services.edit.Activator
Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.xml index 36f98044b03..0f0508591ef 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.xml +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.xml @@ -8,8 +8,8 @@ This context can only be used explicitely as its matcher always return false ( in order
to avoid undesired activation and possible side effects)
-->
- <clientContext id="org.eclipse.papyrus.service.edit.TypeContext">
- <matcher class="org.eclipse.papyrus.service.edit.matcher.NoContextEnablementMatcher"/>
+ <clientContext id="org.eclipse.papyrus.infra.services.edit.TypeContext">
+ <matcher class="org.eclipse.papyrus.infra.services.edit.matcher.NoContextEnablementMatcher"/>
</clientContext>
</extension>
@@ -35,7 +35,7 @@ <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
<!-- Bindings declaration -->
- <binding context="org.eclipse.papyrus.service.edit.TypeContext">
+ <binding context="org.eclipse.papyrus.infra.services.edit.TypeContext">
<!-- ElementType that deals with View deletion when their related model element is deleted -->
<elementType ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
@@ -46,11 +46,11 @@ </extension>
<!-- Declaration of the IElementEditServiceProvider (Papyrus wrapper to the Extensible type framework) -->
-<extension point="org.eclipse.papyrus.core.service">
+<extension point="org.eclipse.papyrus.infra.core.service">
<serviceFactory
- id="org.eclipse.papyrus.service.edit.service.IElementEditServiceProvider"
- classname="org.eclipse.papyrus.service.edit.internal.ElementEditServiceProviderFactory"
+ id="org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider"
+ classname="org.eclipse.papyrus.infra.services.edit.internal.ElementEditServiceProviderFactory"
priority="1" startKind="startup">
</serviceFactory>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/Activator.java index 7519f8f2bd8..6884befb8b4 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/Activator.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/Activator.java @@ -12,9 +12,9 @@ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.service.edit;
+package org.eclipse.papyrus.infra.services.edit;
-import org.eclipse.papyrus.log.LogHelper;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/commands/AbstractConfigureCommandFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/AbstractConfigureCommandFactory.java index f74647cd09e..18ea32c858c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/commands/AbstractConfigureCommandFactory.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/AbstractConfigureCommandFactory.java @@ -11,7 +11,7 @@ * CEA LIST - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.service.edit.commands;
+package org.eclipse.papyrus.infra.services.edit.commands;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IAdaptable;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/commands/ConfigureFeatureCommandFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/ConfigureFeatureCommandFactory.java index d4886328386..784ee948bee 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/commands/ConfigureFeatureCommandFactory.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/ConfigureFeatureCommandFactory.java @@ -11,7 +11,7 @@ * CEA LIST - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.service.edit.commands;
+package org.eclipse.papyrus.infra.services.edit.commands;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IAdaptable;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/commands/ConfigureFeatureListCommandFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/ConfigureFeatureListCommandFactory.java index 94b8fc7af36..bf1cf70958e 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/commands/ConfigureFeatureListCommandFactory.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/ConfigureFeatureListCommandFactory.java @@ -11,7 +11,7 @@ * CEA LIST - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.service.edit.commands;
+package org.eclipse.papyrus.infra.services.edit.commands;
import java.util.Map;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/commands/IConfigureCommandFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/IConfigureCommandFactory.java index a1869bd6cf8..d6ee63da9ac 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/commands/IConfigureCommandFactory.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/IConfigureCommandFactory.java @@ -11,7 +11,7 @@ * CEA LIST - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.service.edit.commands;
+package org.eclipse.papyrus.infra.services.edit.commands;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/context/TypeContext.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/context/TypeContext.java index 61d0709cd36..e7891ba2447 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/context/TypeContext.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/context/TypeContext.java @@ -13,14 +13,14 @@ * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.service.edit.context;
+package org.eclipse.papyrus.infra.services.edit.context;
import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.service.edit.messages.Messages;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.messages.Messages;
/**
* <pre>
@@ -35,7 +35,7 @@ import org.eclipse.papyrus.service.edit.messages.Messages; public class TypeContext {
/** The ID of Papyrus {@link IClientContext} (declared in plugin.xml, shall not be modified) */
- private static final String ID = "org.eclipse.papyrus.service.edit.TypeContext"; //$NON-NLS-1$
+ private static final String ID = "org.eclipse.papyrus.infra.services.edit.TypeContext"; //$NON-NLS-1$
/**
* Retrieve Papyrus {@link IClientContext} from its ID.
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/internal/ElementEditService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/ElementEditService.java index 05eddef6a0e..9bf159fdb5d 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/internal/ElementEditService.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/ElementEditService.java @@ -12,20 +12,20 @@ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.service.edit.internal;
+package org.eclipse.papyrus.infra.services.edit.internal;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.service.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
/**
* <pre>
*
* This class implements {@link IElementEditService}.
*
- * @see org.eclipse.papyrus.service.edit.service.IElementEditService
+ * @see org.eclipse.papyrus.infra.services.edit.service.IElementEditService
*
* This class is the service in charge of providing edit command for
* a specific type of element.
@@ -69,7 +69,7 @@ public class ElementEditService implements IElementEditService { * This method directly uses the ElementType framework (through {@link IElementType} api,
* making sure that the Papyrus shared {@link IClientContext} is explicitly set in the request.
*
- * @see org.eclipse.papyrus.service.edit.service.IElementEditService#getEditCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
+ * @see org.eclipse.papyrus.infra.services.edit.service.IElementEditService#getEditCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
*
* @param request the edit request
* @return the edit command corresponding to the edit request
@@ -91,7 +91,7 @@ public class ElementEditService implements IElementEditService { *
* Get the display name of the element type.
*
- * @see org.eclipse.papyrus.service.edit.service.IElementEditService#getDisplayName()
+ * @see org.eclipse.papyrus.infra.services.edit.service.IElementEditService#getDisplayName()
*
* @return the display name of the {@link IElementType} used by current service.
*
@@ -120,7 +120,7 @@ public class ElementEditService implements IElementEditService { *
* Test if current service can provide an edit command in response to the request.
*
- * @see org.eclipse.papyrus.service.edit.service.IElementEditService#canEdit(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
+ * @see org.eclipse.papyrus.infra.services.edit.service.IElementEditService#canEdit(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
*
* @param req the edit request to test
* @return true is this service can provide edit command for the request
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/internal/ElementEditServiceProvider.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/ElementEditServiceProvider.java index 67541e0cabb..55babb4c63a 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/internal/ElementEditServiceProvider.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/ElementEditServiceProvider.java @@ -12,7 +12,7 @@ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.service.edit.internal;
+package org.eclipse.papyrus.infra.services.edit.internal;
import java.util.ArrayList;
import java.util.List;
@@ -24,11 +24,11 @@ import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry; import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.service.edit.context.TypeContext;
-import org.eclipse.papyrus.service.edit.messages.Messages;
-import org.eclipse.papyrus.service.edit.service.IElementEditService;
-import org.eclipse.papyrus.service.edit.service.IElementEditServiceProvider;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.messages.Messages;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider;
/**
* <pre>
@@ -77,7 +77,7 @@ public class ElementEditServiceProvider implements IElementEditServiceProvider { * The {@link IElementType} are registered in separate plug-ins (e.g. oep.uml.service.types for all types
* related to UML metaclasses).
*
- * @see org.eclipse.papyrus.service.edit.service.IElementEditServiceProvider#getEditService(java.lang.Object)
+ * @see org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider#getEditService(java.lang.Object)
*
* @param objectToEdit the object for which this method tries to retrieve an edit service
* @return the {@link IElementEditService} for the passed object
@@ -121,7 +121,7 @@ public class ElementEditServiceProvider implements IElementEditServiceProvider { * This method returns the registered {@link IElementType} (wrapped as {@link IElementEditService}) that may be contained by
* the eContainer parameter for the specific reference parameter.
*
- * @see org.eclipse.papyrus.service.edit.service.IElementEditServiceProvider#getContainedTypeEditServices(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EReference)
+ * @see org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider#getContainedTypeEditServices(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EReference)
*
* @param eContainer
* @param reference
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/internal/ElementEditServiceProviderFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/ElementEditServiceProviderFactory.java index de53dd35696..319f0da82fa 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/internal/ElementEditServiceProviderFactory.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/ElementEditServiceProviderFactory.java @@ -12,12 +12,12 @@ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.service.edit.internal;
+package org.eclipse.papyrus.infra.services.edit.internal;
-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.service.edit.service.IElementEditServiceProvider;
+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.services.edit.service.IElementEditServiceProvider;
/** Papyrus factory that provides ElementEditServiceProvider */
public class ElementEditServiceProviderFactory implements IServiceFactory {
@@ -29,7 +29,7 @@ public class ElementEditServiceProviderFactory implements IServiceFactory { /**
*
- * @see org.eclipse.papyrus.core.services.IService#init(org.eclipse.papyrus.core.services.ServicesRegistry)
+ * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
*
* @param servicesRegistry
* @throws ServiceException
@@ -39,7 +39,7 @@ public class ElementEditServiceProviderFactory implements IServiceFactory { /**
*
- * @see org.eclipse.papyrus.core.services.IService#startService()
+ * @see org.eclipse.papyrus.infra.core.services.IService#startService()
*
* @throws ServiceException
*/
@@ -48,7 +48,7 @@ public class ElementEditServiceProviderFactory implements IServiceFactory { /**
*
- * @see org.eclipse.papyrus.core.services.IService#disposeService()
+ * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()
*
* @throws ServiceException
*/
@@ -57,7 +57,7 @@ public class ElementEditServiceProviderFactory implements IServiceFactory { /**
*
- * @see org.eclipse.papyrus.core.services.IServiceFactory#createServiceInstance()
+ * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()
*
* @return the singleton instance of {@link IElementEditServiceProvider}
* @throws ServiceException
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/matcher/NoContextEnablementMatcher.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/matcher/NoContextEnablementMatcher.java index 5695f138fee..cb17e75aa0d 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/matcher/NoContextEnablementMatcher.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/matcher/NoContextEnablementMatcher.java @@ -12,7 +12,7 @@ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.service.edit.matcher;
+package org.eclipse.papyrus.infra.services.edit.matcher;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/messages/Messages.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/messages/Messages.java index ef3c998c3f1..001c7af2596 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/messages/Messages.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/messages/Messages.java @@ -11,7 +11,7 @@ * CEA LIST - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.service.edit.messages;
+package org.eclipse.papyrus.infra.services.edit.messages;
import org.eclipse.osgi.util.NLS;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/service/ElementEditServiceUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/ElementEditServiceUtils.java index 700c6ab7363..30d4cf3969f 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/service/ElementEditServiceUtils.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/ElementEditServiceUtils.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2010 CEA LIST.
*
- *
+ *
* 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
@@ -12,15 +12,13 @@ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.service.edit.service;
+package org.eclipse.papyrus.infra.services.edit.service;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.utils.ServiceUtils;
-import org.eclipse.papyrus.service.edit.Activator;
-import org.eclipse.papyrus.service.edit.internal.ElementEditServiceProvider;
-import org.eclipse.papyrus.service.edit.messages.Messages;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.Activator;
+import org.eclipse.papyrus.infra.services.edit.internal.ElementEditServiceProvider;
+import org.eclipse.papyrus.infra.services.edit.messages.Messages;
/**
* <pre>
@@ -33,12 +31,12 @@ public class ElementEditServiceUtils { /**
* <pre>
- * Try to retrieve an edit service for the object in parameter
+ * Try to retrieve an edit service for the object in parameter
* (EObject or EClass expected).
*
* Current implementation directly use {@link IElementEditServiceProvider} instance
- * rather than using Papyrus {@link ServiceUtils} which requires Papyrus to be
- * the active editor.
+ * rather than using Papyrus {@link ServiceUtils} which requires Papyrus to be
+ * the active editor.
*
* @param objectToEdit
* @return the edit service or null
@@ -69,7 +67,7 @@ public class ElementEditServiceUtils { /**
* <pre>
* Get the edit service provider (using {@link ElementTypeRegistry} instead of
- * {@link ServiceUtils}). Note that {@link ServiceUtils} would return the same instance
+ * {@link ServiceUtils}). Note that {@link ServiceUtils} would return the same instance
* anyway.
*
* @return the service provider
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/service/IElementEditService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/IElementEditService.java index 3cddb464a75..d3bbcdb98ec 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/service/IElementEditService.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/IElementEditService.java @@ -12,7 +12,7 @@ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.service.edit.service;
+package org.eclipse.papyrus.infra.services.edit.service;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/service/IElementEditServiceProvider.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/IElementEditServiceProvider.java index 9384e374098..31fa834ec12 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/service/IElementEditServiceProvider.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/IElementEditServiceProvider.java @@ -12,15 +12,13 @@ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.service.edit.service;
+package org.eclipse.papyrus.infra.services.edit.service;
import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.service.edit.internal.ElementEditServiceProvider;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
/**
* <pre>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/utils/ElementTypeValidator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/ElementTypeValidator.java index c034e8cbbe7..5e6f9a7b79e 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/utils/ElementTypeValidator.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/ElementTypeValidator.java @@ -11,7 +11,7 @@ * CEA LIST - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.service.edit.utils;
+package org.eclipse.papyrus.infra.services.edit.utils;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -19,8 +19,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.service.edit.Activator;
-import org.eclipse.papyrus.service.edit.messages.Messages;
+import org.eclipse.papyrus.infra.services.edit.Activator;
+import org.eclipse.papyrus.infra.services.edit.messages.Messages;
import org.eclipse.ui.dialogs.ISelectionStatusValidator;
/**
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/utils/GMFCommandUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/GMFCommandUtils.java index da1fce68610..6b04b51d655 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/utils/GMFCommandUtils.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/GMFCommandUtils.java @@ -11,7 +11,7 @@ * CEA LIST - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.service.edit.utils;
+package org.eclipse.papyrus.infra.services.edit.utils;
import java.util.ArrayList;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF index 734382b52f6..b9cfe2fc94b 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.papyrus.infra.core;bundle-version="0.9.0"
-Export-Package: org.eclipse.papyrus.markerlistener
+Export-Package: org.eclipse.papyrus.infra.services.markerlistener
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.markerlistener.Activator
+Bundle-Activator: org.eclipse.papyrus.infra.services.markerlistener.Activator
Bundle-SymbolicName: org.eclipse.papyrus.infra.services.markerlistener;singleton:=true
-Import-Package: org.eclipse.papyrus.decoration,
- org.eclipse.papyrus.diagram.common.util
+Import-Package: org.eclipse.papyrus.uml.diagram.common.util,
+ org.eclipse.papyrus.infra.services.decoration
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.xml index bed824127d1..31f7212df65 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.xml +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.xml @@ -2,9 +2,9 @@ <?eclipse version="3.4"?>
<plugin>
<extension
- point="org.eclipse.papyrus.core.service">
+ point="org.eclipse.papyrus.infra.core.service">
<service
- classname="org.eclipse.papyrus.markerlistener.MarkersMonitorService"
+ classname="org.eclipse.papyrus.infra.services.markerlistener.MarkersMonitorService"
priority="1"
startKind="startup">
</service>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/markerlistener/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/Activator.java index a2cd67779b0..8bd2333a16e 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/markerlistener/Activator.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/Activator.java @@ -10,9 +10,9 @@ * Contributors:
* Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
*****************************************************************************/
-package org.eclipse.papyrus.markerlistener;
+package org.eclipse.papyrus.infra.services.markerlistener;
-import org.eclipse.papyrus.log.LogHelper;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/markerlistener/MarkersMonitorService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/MarkersMonitorService.java index 758290eb80d..c3a9d0377e9 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/markerlistener/MarkersMonitorService.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/MarkersMonitorService.java @@ -10,7 +10,7 @@ * Contributors:
* Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
*****************************************************************************/
-package org.eclipse.papyrus.markerlistener;
+package org.eclipse.papyrus.infra.services.markerlistener;
import java.util.Map;
@@ -24,12 +24,12 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.common.ui.resources.FileChangeManager;
import org.eclipse.gmf.runtime.common.ui.resources.IFileObserver;
-import org.eclipse.papyrus.core.services.IService;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
-import org.eclipse.papyrus.core.utils.ServiceUtils;
-import org.eclipse.papyrus.decoration.DecorationService;
-import org.eclipse.papyrus.markerlistener.util.MarkerListenerUtils;
+import org.eclipse.papyrus.infra.core.services.IService;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.services.decoration.DecorationService;
+import org.eclipse.papyrus.infra.services.markerlistener.util.MarkerListenerUtils;
// TODO: Auto-generated Javadoc
@@ -76,7 +76,7 @@ public class MarkersMonitorService implements IService { }
/**
- * @see org.eclipse.papyrus.core.services.IService#init(org.eclipse.papyrus.core.services.ServicesRegistry)
+ * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
*
* @param servicesRegistry
* @throws ServiceException
@@ -94,7 +94,7 @@ public class MarkersMonitorService implements IService { }
/**
- * @see org.eclipse.papyrus.core.services.IService#startService()
+ * @see org.eclipse.papyrus.infra.core.services.IService#startService()
*
* @throws ServiceException
*/
@@ -107,7 +107,7 @@ public class MarkersMonitorService implements IService { }
/**
- * @see org.eclipse.papyrus.core.services.IService#disposeService()
+ * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()
*
* @throws ServiceException
*/
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/markerlistener/util/MarkerListenerUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/util/MarkerListenerUtils.java index 4da25f59b67..ed45b959cdb 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/markerlistener/util/MarkerListenerUtils.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/util/MarkerListenerUtils.java @@ -10,7 +10,7 @@ * Contributors:
* Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
*****************************************************************************/
-package org.eclipse.papyrus.markerlistener.util;
+package org.eclipse.papyrus.infra.services.markerlistener.util;
import java.util.Map;
import java.util.MissingResourceException;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF index a044b95acd8..a352f6976cf 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF @@ -5,14 +5,14 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="0.9.0",
org.eclipse.papyrus.infra.core;bundle-version="0.9.0",
org.eclipse.papyrus.infra.services.resourceloading;bundle-version="0.9.0"
-Export-Package: org.eclipse.papyrus.core.resourceloading.preferences
+Export-Package: org.eclipse.papyrus.infra.services.resourceloading.preferences
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.core.resourceloading.preferences
+Bundle-Activator: org.eclipse.papyrus.infra.services.resourceloading.preferences
.CorePlugin
Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading.preferences;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/plugin.xml index f2c87e99fbd..c223c4ede4f 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/plugin.xml +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/plugin.xml @@ -4,22 +4,22 @@ <extension
point="org.eclipse.core.runtime.preferences">
<initializer
- class="org.eclipse.papyrus.core.resourceloading.preferences.CorePreferenceInitializer">
+ class="org.eclipse.papyrus.infra.services.resourceloading.preferences.CorePreferenceInitializer">
</initializer>
</extension>
<extension
point="org.eclipse.ui.preferencePages">
<page
- category="org.eclipse.papyrus.preferences.generalcategory"
- class="org.eclipse.papyrus.core.resourceloading.preferences.LoadingStrategyPreferencePage"
- id="org.eclipse.papyrus.core.resourceloading.preferences.ModelLoadingPreferencePage"
+ category="org.eclipse.papyrus.infra.gmfdiag.preferences.generalcategory"
+ class="org.eclipse.papyrus.infra.services.resourceloading.preferences.LoadingStrategyPreferencePage"
+ id="org.eclipse.papyrus.infra.services.resourceloading.preferences.ModelLoadingPreferencePage"
name="Model loading">
</page>
</extension>
<extension
- point="org.eclipse.papyrus.core.resourceloading.currentStrategyChooser">
+ point="org.eclipse.papyrus.infra.services.resourceloading.currentStrategyChooser">
<CurrentStrategyChooser
- chooser="org.eclipse.papyrus.core.resourceloading.preferences.StrategyChooser">
+ chooser="org.eclipse.papyrus.infra.services.resourceloading.preferences.StrategyChooser">
</CurrentStrategyChooser>
</extension>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/core/resourceloading/preferences/CorePlugin.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/CorePlugin.java index f0a6b08563b..a798ba9050e 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/core/resourceloading/preferences/CorePlugin.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/CorePlugin.java @@ -11,7 +11,7 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading.preferences;
+package org.eclipse.papyrus.infra.services.resourceloading.preferences;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/core/resourceloading/preferences/CorePreferenceInitializer.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/CorePreferenceInitializer.java index 50e1efe3687..9b9933e4dac 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/core/resourceloading/preferences/CorePreferenceInitializer.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/CorePreferenceInitializer.java @@ -11,7 +11,7 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading.preferences;
+package org.eclipse.papyrus.infra.services.resourceloading.preferences;
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.jface.preference.IPreferenceStore;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/core/resourceloading/preferences/ICorePreferenceConstants.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/ICorePreferenceConstants.java index be4211fa7a2..3858295bfd6 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/core/resourceloading/preferences/ICorePreferenceConstants.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/ICorePreferenceConstants.java @@ -11,7 +11,7 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading.preferences;
+package org.eclipse.papyrus.infra.services.resourceloading.preferences;
/**
* Defines specific preference constants for papyrus core.
@@ -23,5 +23,5 @@ public interface ICorePreferenceConstants { /**
* the preference to define the model loading strategy.
*/
- public static final String PREF_CORE_DEFINE_LOADING_STRATEGY = "org.eclipse.papyrus.core.resourceloading.preferences.loadingStrategy"; //$NON-NLS-1$
+ public static final String PREF_CORE_DEFINE_LOADING_STRATEGY = "org.eclipse.papyrus.infra.services.resourceloading.preferences.loadingStrategy"; //$NON-NLS-1$
}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/core/resourceloading/preferences/LoadinStrategyGroup.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/LoadinStrategyGroup.java index 7c3dbaa445f..051da3897c4 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/core/resourceloading/preferences/LoadinStrategyGroup.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/LoadinStrategyGroup.java @@ -11,14 +11,14 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading.preferences;
+package org.eclipse.papyrus.infra.services.resourceloading.preferences;
import java.util.Map;
import org.eclipse.jface.dialogs.DialogPage;
import org.eclipse.jface.preference.RadioGroupFieldEditor;
-import org.eclipse.papyrus.core.resourceloading.impl.ProxyManager;
-import org.eclipse.papyrus.preferences.ui.AbstractGroup;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup;
+import org.eclipse.papyrus.infra.services.resourceloading.impl.ProxyManager;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/core/resourceloading/preferences/LoadingStrategyPreferencePage.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/LoadingStrategyPreferencePage.java index 2c08a436c5c..c1eed07c46e 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/core/resourceloading/preferences/LoadingStrategyPreferencePage.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/LoadingStrategyPreferencePage.java @@ -11,10 +11,10 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading.preferences;
+package org.eclipse.papyrus.infra.services.resourceloading.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
import org.eclipse.swt.widgets.Composite;
public class LoadingStrategyPreferencePage extends AbstractPapyrusNodePreferencePage {
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/core/resourceloading/preferences/StrategyChooser.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/StrategyChooser.java index 80cd57e1b06..3dd9f94c54f 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/core/resourceloading/preferences/StrategyChooser.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/StrategyChooser.java @@ -11,10 +11,10 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.core.resourceloading.preferences;
+package org.eclipse.papyrus.infra.services.resourceloading.preferences;
-import org.eclipse.papyrus.core.resourceloading.IStrategyChooser;
-import org.eclipse.papyrus.preferences.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;
+import org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser;
/**
@@ -32,7 +32,7 @@ public class StrategyChooser implements IStrategyChooser { }
/**
- * @see org.eclipse.papyrus.core.resourceloading.IStrategyChooser#getCurrentStrategy()
+ * @see org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser#getCurrentStrategy()
*/
public int getCurrentStrategy() {
if(currentStrategy == -1) {
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF index 6f783a7a9f0..eb530391b13 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF @@ -3,17 +3,17 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="0.9.0", org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="0.9.0",
org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="0.9.0",
org.eclipse.core.expressions
-Export-Package: org.eclipse.papyrus.core.resourceloading,
- org.eclipse.papyrus.core.resourceloading.impl,
- org.eclipse.papyrus.core.resourceloading.strategies,
- org.eclipse.papyrus.core.resourceloading.util
+Export-Package: org.eclipse.papyrus.infra.services.resourceloading,
+ org.eclipse.papyrus.infra.services.resourceloading.impl,
+ org.eclipse.papyrus.infra.services.resourceloading.strategies,
+ org.eclipse.papyrus.infra.services.resourceloading.util
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.core.resourceloading.Activator
+Bundle-Activator: org.eclipse.papyrus.infra.services.resourceloading.Activator
Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/build.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/build.properties index 3107779d56a..d95dda596c4 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/build.properties +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/build.properties @@ -1,7 +1,19 @@ #
#Mon Sep 12 09:29:40 CEST 2011
-bin.includes=META-INF/,.,plugin.xml,schema/,plugin.properties,about.html,src/org/eclipse/papyrus/core/resourceloading/messages.properties
+bin.includes = META-INF/,\
+ .,\
+ plugin.xml,\
+ schema/,\
+ plugin.properties,\
+ about.html,\
+ src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties
output..=bin/
-src.includes=META-INF/,.,plugin.xml,schema/,plugin.properties,about.html,src/org/eclipse/papyrus/core/resourceloading/messages.properties
+src.includes = META-INF/,\
+ .,\
+ plugin.xml,\
+ schema/,\
+ plugin.properties,\
+ about.html,\
+ src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties
source..=src/
bin..=bin/
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.xml index 546cb141577..39607970bfb 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.xml +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.xml @@ -5,42 +5,42 @@ <extension-point id="loadingStrategyExtender" name="loadingStrategyExtender" schema="schema/loadingStrategyExtender.exsd"/>
<extension-point id="currentStrategyChooser" name="Current Strategy Chooser" schema="schema/currentStrategyChooser.exsd"/>
<extension
- point="org.eclipse.papyrus.core.service">
+ point="org.eclipse.papyrus.infra.core.service">
<serviceFactory
- classname="org.eclipse.papyrus.core.resourceloading.OnDemandLoadingModelSetServiceFactory"
+ classname="org.eclipse.papyrus.infra.services.resourceloading.OnDemandLoadingModelSetServiceFactory"
description="The service loading Models - Overload the original service."
- id="org.eclipse.papyrus.resource.ModelSet"
+ id="org.eclipse.papyrus.infra.core.resource.ModelSet"
priority="5"
startKind="startup">
</serviceFactory>
</extension>
<extension
- point="org.eclipse.papyrus.core.resourceloading.loadingStrategy">
+ point="org.eclipse.papyrus.infra.services.resourceloading.loadingStrategy">
<loadingStrategy
description="Load all the needed resources"
id="0"
- strategy="org.eclipse.papyrus.core.resourceloading.strategies.LoadAllResources">
+ strategy="org.eclipse.papyrus.infra.services.resourceloading.strategies.LoadAllResources">
</loadingStrategy>
<loadingStrategy
description="Load the additional resources (profile and pathmap). Submodels can be loaded manually by right-clicking in Model Explorer view."
id="1"
- strategy="org.eclipse.papyrus.core.resourceloading.strategies.LoadCurrentResource">
+ strategy="org.eclipse.papyrus.infra.services.resourceloading.strategies.LoadCurrentResource">
</loadingStrategy>
<loadingStrategy
description="Load the additional resources (profile and pathmap) and the needed submodels"
id="2"
- strategy="org.eclipse.papyrus.core.resourceloading.strategies.LoadControlledResources">
+ strategy="org.eclipse.papyrus.infra.services.resourceloading.strategies.LoadControlledResources">
</loadingStrategy>
<loadingStrategy
description="Ask the user if a resource has to be loaded"
id="3"
- strategy="org.eclipse.papyrus.core.resourceloading.strategies.AskUserStrategy">
+ strategy="org.eclipse.papyrus.infra.services.resourceloading.strategies.AskUserStrategy">
</loadingStrategy>
</extension>
<extension
- point="org.eclipse.papyrus.core.papyrusDiagram">
+ point="org.eclipse.papyrus.infra.core.papyrusDiagram">
<editorDiagram
- factoryClass="org.eclipse.papyrus.core.resourceloading.editor.UnloadResourcesEditorFactory">
+ factoryClass="org.eclipse.papyrus.infra.services.resourceloading.editor.UnloadResourcesEditorFactory">
</editorDiagram>
</extension>
@@ -48,9 +48,9 @@ point="org.eclipse.core.expressions.propertyTesters">
<!-- the property tester is used to enable/disable handlers for loading/unloading a resource -->
<propertyTester
- class="org.eclipse.papyrus.core.resourceloading.util.LoadingTester"
- id="org.eclipse.papyrus.core.resourceloading.tester"
- namespace="org.eclipse.papyrus.core.resourceloading.tester"
+ class="org.eclipse.papyrus.infra.services.resourceloading.util.LoadingTester"
+ id="org.eclipse.papyrus.infra.core.resourceloading.tester"
+ namespace="org.eclipse.papyrus.infra.core.resourceloading.tester"
properties="isAllLoaded, isAllNotLoaded"
type="org.eclipse.jface.viewers.IStructuredSelection">
</propertyTester>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/currentStrategyChooser.exsd b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/currentStrategyChooser.exsd index e2b30057a46..c1e2d9a4e5c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/currentStrategyChooser.exsd +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/currentStrategyChooser.exsd @@ -1,9 +1,9 @@ <?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.core.resourceloading" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.papyrus.infra.services.resourceloading" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.eclipse.papyrus.core.resourceloading" id="currentStrategyChooser" name="Current Strategy Chooser"/>
+ <meta.schema plugin="org.eclipse.papyrus.infra.services.resourceloading" id="currentStrategyChooser" name="Current Strategy Chooser"/>
</appinfo>
<documentation>
Extension point that provides the current loading strategy to the proxy manager.
@@ -56,7 +56,7 @@ Proxy manager load the resource if needed, according to the current strategy </documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.core.resourceloading.IStrategyChooser"/>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser"/>
</appinfo>
</annotation>
</attribute>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategy.exsd b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategy.exsd index 252f23bda1e..fa340fcd1f7 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategy.exsd +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategy.exsd @@ -1,9 +1,9 @@ <?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
- <meta.schema plugin="org.eclipse.papyrus.core" id="loadingStrategy" name="Model Loading Strategy"/>
+ <meta.schema plugin="org.eclipse.papyrus.infra.core" id="loadingStrategy" name="Model Loading Strategy"/>
</appInfo>
<documentation>
Extension point to load the model and resolve objects according to a specified strategy.
@@ -69,7 +69,7 @@ </documentation>
<appInfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.core.resourceloading.ILoadingStrategy"/>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy"/>
</appInfo>
</annotation>
</attribute>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategyExtender.exsd b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategyExtender.exsd index 58277581199..dedf6445961 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategyExtender.exsd +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategyExtender.exsd @@ -1,9 +1,9 @@ <?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
- <meta.schema plugin="org.eclipse.papyrus.core" id="loadingStrategyExtender" name="loadingStrategyExtender"/>
+ <meta.schema plugin="org.eclipse.papyrus.infra.core" id="loadingStrategyExtender" name="loadingStrategyExtender"/>
</appInfo>
<documentation>
Extension point that enables to extend the current loading strategy with a specific behavior
@@ -62,7 +62,7 @@ </documentation>
<appInfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.core.resourceloading.ILoadingStrategyExtension"/>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategyExtension"/>
</appInfo>
</annotation>
</attribute>
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;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF index 7448a741b09..54ac393b78d 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF @@ -9,13 +9,13 @@ Require-Bundle: org.eclipse.ui, org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.0.100",
org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0",
org.eclipse.papyrus.infra.core;bundle-version="0.9.0"
-Export-Package: org.eclipse.papyrus.validation
+Export-Package: org.eclipse.papyrus.infra.services.validation
Bundle-Vendor: %pluginProvider
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.validation.Activator
+Bundle-Activator: org.eclipse.papyrus.infra.services.validation.Activator
Bundle-SymbolicName: org.eclipse.papyrus.infra.services.validation;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/plugin.xml index 513824f68c0..8a964de71a8 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/plugin.xml +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/plugin.xml @@ -5,32 +5,32 @@ <extension point="org.eclipse.ui.preferencePages"> <page - category="org.eclipse.papyrus.preferences.generalcategory" - class="org.eclipse.papyrus.validation.preferences.PreferencePage" - id="org.eclipse.papyrus.preferences.validation" + category="org.eclipse.papyrus.infra.gmfdiag.preferences.generalcategory" + class="org.eclipse.papyrus.infra.services.validation.preferences.PreferencePage" + id="org.eclipse.papyrus.infra.gmfdiag.preferences.validation" name="Validation preferences"> </page> </extension> <extension point="org.eclipse.core.runtime.preferences"> <initializer - class="org.eclipse.papyrus.validation.preferences.Initializer"> + class="org.eclipse.papyrus.infra.services.validation.preferences.Initializer"> </initializer> </extension> <extension point="org.eclipse.ui.menus"> <menuContribution allPopups="false" - locationURI="popup:org.eclipse.papyrus.modelexplorer.modelexplorer.popup"> + locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup"> <menu icon="icons/etool16/validate.gif" - id="org.eclipse.papyrus.modelexplorer.popup.validation" + id="org.eclipse.papyrus.views.modelexplorer.popup.validation" label="Validation"> </menu> </menuContribution> <menuContribution allPopups="true" - locationURI="popup:org.eclipse.papyrus.modelexplorer.popup.validation"> + locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popup.validation"> <command commandId="org.eclipse.papyrus.validation.ValidateModelCommand" icon="icons/etool16/validate.gif" @@ -75,42 +75,42 @@ point="org.eclipse.ui.commands"> <command categoryId="org.eclipse.papyrus.editor.category" - defaultHandler="org.eclipse.papyrus.validation.handler.ValidateModelHandler" + defaultHandler="org.eclipse.papyrus.infra.services.validation.handler.ValidateModelHandler" description="ValidateModel" id="org.eclipse.papyrus.validation.ValidateModelCommand" name="ValidateModel"> </command> <command categoryId="org.eclipse.papyrus.editor.category" - defaultHandler="org.eclipse.papyrus.validation.handler.ValidateSubtreeHandler" + defaultHandler="org.eclipse.papyrus.infra.services.validation.handler.ValidateSubtreeHandler" description="ValidateSubtree" id="org.eclipse.papyrus.validation.ValidateSubtreeCommand" name="ValidateSubtree"> </command> <command categoryId="org.eclipse.papyrus.editor.category" - defaultHandler="org.eclipse.papyrus.validation.handler.SelectAndValidateSubtreeHandler" + defaultHandler="org.eclipse.papyrus.infra.services.validation.handler.SelectAndValidateSubtreeHandler" description="SelectAndValidate" id="org.eclipse.papyrus.validation.SelectAndValidateSubtreeCommand" name="SelectAndValidate"> </command> <command categoryId="org.eclipse.papyrus.editor.category" - defaultHandler="org.eclipse.papyrus.validation.handler.SelectAndValidateModelHandler" + defaultHandler="org.eclipse.papyrus.infra.services.validation.handler.SelectAndValidateModelHandler" description="SelectAndValidate" id="org.eclipse.papyrus.validation.SelectAndValidateModelCommand" name="SelectAndValidate"> </command> <command categoryId="org.eclipse.papyrus.editor.category" - defaultHandler="org.eclipse.papyrus.validation.handler.ValidateDelMarkersFromModelHandler" + defaultHandler="org.eclipse.papyrus.infra.services.validation.handler.ValidateDelMarkersFromModelHandler" description="ValidateDelMarkersFromModel" id="org.eclipse.papyrus.validation.ValidateDelMarkersFromModelCommand" name="ValidateDelMarkersFromModel"> </command> <command categoryId="org.eclipse.papyrus.editor.category" - defaultHandler="org.eclipse.papyrus.validation.handler.ValidateDelMarkersFromSubtreeHandler" + defaultHandler="org.eclipse.papyrus.infra.services.validation.handler.ValidateDelMarkersFromSubtreeHandler" description="ValidateDelMarkersFromSubtree" id="org.eclipse.papyrus.validation.ValidateDelMarkersFromSubtreeCommand" name="ValidateDelMarkersFromSubtree"> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/Activator.java index ed3f9f984bc..881659a8f0b 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/Activator.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/Activator.java @@ -10,9 +10,9 @@ * Contributors: * Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr *****************************************************************************/ -package org.eclipse.papyrus.validation; +package org.eclipse.papyrus.infra.services.validation; -import org.eclipse.papyrus.log.LogHelper; +import org.eclipse.papyrus.infra.core.log.LogHelper; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/ValidationTool.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/ValidationTool.java index 2d9f7607c1e..f57b0e091f5 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/ValidationTool.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/ValidationTool.java @@ -12,7 +12,7 @@ * *****************************************************************************/ -package org.eclipse.papyrus.validation; +package org.eclipse.papyrus.infra.services.validation; import java.util.List; @@ -30,8 +30,8 @@ import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.facet.infra.browser.uicore.internal.model.LinkItem; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.validation.preferences.PreferencePage; -import org.eclipse.papyrus.validation.preferences.PreferencePage.MarkChildren; +import org.eclipse.papyrus.infra.services.validation.preferences.PreferencePage; +import org.eclipse.papyrus.infra.services.validation.preferences.PreferencePage.MarkChildren; public class ValidationTool { diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/ValidationUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/ValidationUtils.java index 504316b8b73..cc0881407d6 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/ValidationUtils.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/ValidationUtils.java @@ -12,7 +12,7 @@ * *****************************************************************************/ -package org.eclipse.papyrus.validation; +package org.eclipse.papyrus.infra.services.validation; import java.util.Map; import java.util.MissingResourceException; diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/commands/AbstractValidateCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/AbstractValidateCommand.java index 03eaad716a2..33aaf852736 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/commands/AbstractValidateCommand.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/AbstractValidateCommand.java @@ -11,7 +11,7 @@ * Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - Initial API and implementation * *****************************************************************************/ -package org.eclipse.papyrus.validation.commands; +package org.eclipse.papyrus.infra.services.validation.commands; import java.lang.reflect.InvocationTargetException; import java.util.Collections; @@ -36,7 +36,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.papyrus.validation.ValidationTool; +import org.eclipse.papyrus.infra.services.validation.ValidationTool; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/commands/SelectAndValidateModelCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/SelectAndValidateModelCommand.java index b3869ca487f..29c2422fc09 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/commands/SelectAndValidateModelCommand.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/SelectAndValidateModelCommand.java @@ -12,7 +12,7 @@ * *****************************************************************************/ -package org.eclipse.papyrus.validation.commands; +package org.eclipse.papyrus.infra.services.validation.commands; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IAdaptable; diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/commands/SelectAndValidateSubtreeCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/SelectAndValidateSubtreeCommand.java index 53877118c94..149faa13819 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/commands/SelectAndValidateSubtreeCommand.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/SelectAndValidateSubtreeCommand.java @@ -12,7 +12,7 @@ * *****************************************************************************/ -package org.eclipse.papyrus.validation.commands; +package org.eclipse.papyrus.infra.services.validation.commands; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IAdaptable; diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/commands/ValidateDelMarkersFromModelCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateDelMarkersFromModelCommand.java index aae20f513ea..d46b9b0286e 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/commands/ValidateDelMarkersFromModelCommand.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateDelMarkersFromModelCommand.java @@ -12,7 +12,7 @@ * *****************************************************************************/ -package org.eclipse.papyrus.validation.commands; +package org.eclipse.papyrus.infra.services.validation.commands; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IAdaptable; diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/commands/ValidateDelMarkersFromSubtreeCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateDelMarkersFromSubtreeCommand.java index 8e306c446ee..a7fd5030e76 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/commands/ValidateDelMarkersFromSubtreeCommand.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateDelMarkersFromSubtreeCommand.java @@ -12,7 +12,7 @@ * *****************************************************************************/ -package org.eclipse.papyrus.validation.commands; +package org.eclipse.papyrus.infra.services.validation.commands; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IAdaptable; @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.transaction.util.TransactionUtil; import org.eclipse.gmf.runtime.common.core.command.CommandResult; -import org.eclipse.papyrus.validation.ValidationTool; +import org.eclipse.papyrus.infra.services.validation.ValidationTool; public class ValidateDelMarkersFromSubtreeCommand extends AbstractValidateCommand { diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/commands/ValidateModelCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateModelCommand.java index d5fac8472d8..b8e26c8e0bc 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/commands/ValidateModelCommand.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateModelCommand.java @@ -12,7 +12,7 @@ * *****************************************************************************/ -package org.eclipse.papyrus.validation.commands; +package org.eclipse.papyrus.infra.services.validation.commands; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IAdaptable; diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/commands/ValidateSubtreeCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateSubtreeCommand.java index a0ed99b5dd1..a2a7d05ce39 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/commands/ValidateSubtreeCommand.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateSubtreeCommand.java @@ -12,7 +12,7 @@ * *****************************************************************************/ -package org.eclipse.papyrus.validation.commands; +package org.eclipse.papyrus.infra.services.validation.commands; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IAdaptable; diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/handler/AbstractCommandHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/AbstractCommandHandler.java index 97e42f49540..835fdfdf82e 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/handler/AbstractCommandHandler.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/AbstractCommandHandler.java @@ -12,7 +12,7 @@ * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
* Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr
*****************************************************************************/
-package org.eclipse.papyrus.validation.handler;
+package org.eclipse.papyrus.infra.services.validation.handler;
import java.util.ArrayList;
import java.util.List;
@@ -26,10 +26,10 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.utils.BusinessModelResolver;
-import org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers;
-import org.eclipse.papyrus.validation.Activator;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.utils.BusinessModelResolver;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;
+import org.eclipse.papyrus.infra.services.validation.Activator;
import org.eclipse.ui.PlatformUI;
/**
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/handler/SelectAndValidateModelHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateModelHandler.java index 3b0e4c9e1f6..ac4c2fd04ef 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/handler/SelectAndValidateModelHandler.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateModelHandler.java @@ -12,12 +12,12 @@ * *****************************************************************************/ -package org.eclipse.papyrus.validation.handler; +package org.eclipse.papyrus.infra.services.validation.handler; import org.eclipse.emf.common.command.Command; -import org.eclipse.papyrus.core.utils.GMFtoEMFCommandWrapper; -import org.eclipse.papyrus.validation.commands.SelectAndValidateModelCommand; -import org.eclipse.papyrus.validation.handler.AbstractCommandHandler; +import org.eclipse.papyrus.infra.core.utils.GMFtoEMFCommandWrapper; +import org.eclipse.papyrus.infra.services.validation.commands.SelectAndValidateModelCommand; +import org.eclipse.papyrus.infra.services.validation.handler.AbstractCommandHandler; /** * Action used for pasting either a model element or a shape (i.e. the model element represented diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/handler/SelectAndValidateSubtreeHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateSubtreeHandler.java index f5382df155b..a00ead7727c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/handler/SelectAndValidateSubtreeHandler.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateSubtreeHandler.java @@ -12,12 +12,12 @@ * *****************************************************************************/ -package org.eclipse.papyrus.validation.handler; +package org.eclipse.papyrus.infra.services.validation.handler; import org.eclipse.emf.common.command.Command; -import org.eclipse.papyrus.core.utils.GMFtoEMFCommandWrapper; -import org.eclipse.papyrus.validation.commands.SelectAndValidateSubtreeCommand; -import org.eclipse.papyrus.validation.handler.AbstractCommandHandler; +import org.eclipse.papyrus.infra.core.utils.GMFtoEMFCommandWrapper; +import org.eclipse.papyrus.infra.services.validation.commands.SelectAndValidateSubtreeCommand; +import org.eclipse.papyrus.infra.services.validation.handler.AbstractCommandHandler; /** * Action used for pasting either a model element or a shape (i.e. the model element represented diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/handler/ValidateDelMarkersFromModelHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromModelHandler.java index 18c74a59540..80d3118236e 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/handler/ValidateDelMarkersFromModelHandler.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromModelHandler.java @@ -12,11 +12,11 @@ * *****************************************************************************/ -package org.eclipse.papyrus.validation.handler; +package org.eclipse.papyrus.infra.services.validation.handler; import org.eclipse.emf.common.command.Command; -import org.eclipse.papyrus.core.utils.GMFtoEMFCommandWrapper; -import org.eclipse.papyrus.validation.commands.ValidateDelMarkersFromModelCommand; +import org.eclipse.papyrus.infra.core.utils.GMFtoEMFCommandWrapper; +import org.eclipse.papyrus.infra.services.validation.commands.ValidateDelMarkersFromModelCommand; /** * Action used for pasting either a model element or a shape (i.e. the model element represented diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/handler/ValidateDelMarkersFromSubtreeHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromSubtreeHandler.java index 3a19e7915aa..907a41ac4b8 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/handler/ValidateDelMarkersFromSubtreeHandler.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromSubtreeHandler.java @@ -12,11 +12,11 @@ * *****************************************************************************/ -package org.eclipse.papyrus.validation.handler; +package org.eclipse.papyrus.infra.services.validation.handler; import org.eclipse.emf.common.command.Command; -import org.eclipse.papyrus.core.utils.GMFtoEMFCommandWrapper; -import org.eclipse.papyrus.validation.commands.ValidateDelMarkersFromSubtreeCommand; +import org.eclipse.papyrus.infra.core.utils.GMFtoEMFCommandWrapper; +import org.eclipse.papyrus.infra.services.validation.commands.ValidateDelMarkersFromSubtreeCommand; /** * Action used for pasting either a model element or a shape (i.e. the model element represented diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/handler/ValidateModelHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateModelHandler.java index 4f42e3d75f9..96c5e014d52 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/handler/ValidateModelHandler.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateModelHandler.java @@ -12,11 +12,11 @@ * *****************************************************************************/ -package org.eclipse.papyrus.validation.handler; +package org.eclipse.papyrus.infra.services.validation.handler; import org.eclipse.emf.common.command.Command; -import org.eclipse.papyrus.core.utils.GMFtoEMFCommandWrapper; -import org.eclipse.papyrus.validation.commands.ValidateModelCommand; +import org.eclipse.papyrus.infra.core.utils.GMFtoEMFCommandWrapper; +import org.eclipse.papyrus.infra.services.validation.commands.ValidateModelCommand; /** * Action used for pasting either a model element or a shape (i.e. the model element represented diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/handler/ValidateSubtreeHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateSubtreeHandler.java index 2b999fcd50e..4f2bd825aa3 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/handler/ValidateSubtreeHandler.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateSubtreeHandler.java @@ -12,11 +12,11 @@ * *****************************************************************************/ -package org.eclipse.papyrus.validation.handler; +package org.eclipse.papyrus.infra.services.validation.handler; import org.eclipse.emf.common.command.Command; -import org.eclipse.papyrus.core.utils.GMFtoEMFCommandWrapper; -import org.eclipse.papyrus.validation.commands.ValidateSubtreeCommand; +import org.eclipse.papyrus.infra.core.utils.GMFtoEMFCommandWrapper; +import org.eclipse.papyrus.infra.services.validation.commands.ValidateSubtreeCommand; /** * Action used for pasting either a model element or a shape (i.e. the model element represented diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/preferences/Initializer.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/preferences/Initializer.java index 257491935f8..07d5be08012 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/preferences/Initializer.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/preferences/Initializer.java @@ -1,8 +1,8 @@ -package org.eclipse.papyrus.validation.preferences; +package org.eclipse.papyrus.infra.services.validation.preferences; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.validation.Activator; +import org.eclipse.papyrus.infra.services.validation.Activator; public class Initializer extends AbstractPreferenceInitializer { diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/preferences/PreferencePage.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/preferences/PreferencePage.java index 8ca39b07b09..1fd77f5e2e1 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/preferences/PreferencePage.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/preferences/PreferencePage.java @@ -1,23 +1,23 @@ -package org.eclipse.papyrus.validation.preferences; +package org.eclipse.papyrus.infra.services.validation.preferences; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.impl.NotificationImpl; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.RadioGroupFieldEditor; -import org.eclipse.papyrus.core.editor.IMultiDiagramEditor; -import org.eclipse.papyrus.core.services.ServiceException; -import org.eclipse.papyrus.core.services.ServicesRegistry; -import org.eclipse.papyrus.core.utils.EditorUtils; -import org.eclipse.papyrus.resource.ModelSet; -import org.eclipse.papyrus.validation.Activator; +import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor; +import org.eclipse.papyrus.infra.core.resource.ModelSet; +import org.eclipse.papyrus.infra.core.services.ServiceException; +import org.eclipse.papyrus.infra.core.services.ServicesRegistry; +import org.eclipse.papyrus.infra.core.utils.EditorUtils; +import org.eclipse.papyrus.infra.services.validation.Activator; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; public class PreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { - public final static String HIERARCHICAL_MARKERS = "org.eclipse.papyrus.validation.HierarchicalMarkers"; + public final static String HIERARCHICAL_MARKERS = "org.eclipse.papyrus.infra.services.validation.HierarchicalMarkers"; public PreferencePage() { super(GRID); |