[Releng] Remove unused dependencies to EMF Facet

10 files changed, 83 insertions, 62 deletions

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF
index d04f87971a5..a41c16b7328 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Export-Package: org.eclipse.papyrus.dsml.validation.generation.ui
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.1",

  org.eclipse.papyrus.dsml.validation.wizard;bundle-version="1.0.0",

  org.eclipse.papyrus.dsml.validation.model;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF
index 847b35d4af2..e6657944925 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF
@@ -1,7 +1,8 @@
 Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.dsml.validation

 Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime

+ org.eclipse.core.runtime,

+ org.eclipse.uml2.uml;bundle-version="5.0.0"

 Bundle-Vendor: %pluginProvider

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.xml
index 7318917a64e..6096a87449d 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.xml
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.xml
@@ -18,4 +18,18 @@
             provider="Eclipse Modeling Project">

       </profile>

    </extension>

+    <extension

+          point="org.eclipse.uml2.uml.dynamic_package">

+       <profile

+             location="pathmap://DSMLValidation_PROFILES/PapyrusValidationRuleDSML.uml#_0"

+             uri="pathmap://DSMLValidation_PROFILES/PapyrusValidationRuleDSML">

+       </profile>

+    </extension>

+    <extension

+          point="org.eclipse.emf.ecore.dynamic_package">

+       <resource

+             location="pathmap://DSMLValidation_PROFILES/PapyrusValidationRuleDSML.uml#_0"

+             uri="pathmap://DSMLValidation_PROFILES/PapyrusValidationRuleDSML">

+       </resource>

+    </extension>

 </plugin>

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/META-INF/MANIFEST.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/META-INF/MANIFEST.MF
index 99851fd2b52..6b679c1d713 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/META-INF/MANIFEST.MF
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/META-INF/MANIFEST.MF
@@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.0.0",

- org.eclipse.emf.facet.infra.browser.uicore,

  org.eclipse.ui.ide;bundle-version="3.9.0",

  org.eclipse.gmf.runtime.notation.edit,

  org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.0"

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.xml
index 201411fb724..120a7ce9d7d 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.xml
@@ -49,7 +49,7 @@
          <adviceBinding

                class="org.eclipse.papyrus.infra.emf.advice.DeletePageAdvice"

                id="org.eclipse.papyrus.infra.emf.deletePageAdvice"

-               inheritance="none"

+               inheritance="all"

                typeId="*">

          </adviceBinding>

          <metamodelType

@@ -75,9 +75,6 @@
          <elementType

                ref="org.eclipse.papyrus.infra.emf.page">

          </elementType>

-      </binding>

-      <binding

-            context="org.eclipse.gmf.runtime.emf.type.core.defaultContext">

          <elementType

                ref="org.eclipse.papyrus.infra.emf.deletePageAdvice">

          </elementType>

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageAdvice.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageAdvice.java
index 21894ef9909..8137e18e621 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageAdvice.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageAdvice.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2013 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

@@ -14,16 +14,17 @@ package org.eclipse.papyrus.infra.emf.advice;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 

 /**

  * An EditHelperAdvice which applies to all Papyrus page identifiers (i.e. Tables, Diagrams, ...)

  * When a page identifier object is deleted, the associated page is removed

- * 

+ *

  * This advice is used when an Object containing a page is deleted

- * 

+ *

  * @author Camille Letavernier

- * 

+ *

  */

 public class DeletePageAdvice extends AbstractEditHelperAdvice {

 

@@ -37,4 +38,13 @@ public class DeletePageAdvice extends AbstractEditHelperAdvice {
 		return RemovePageHelper.getRemovePageCommand(request.getEditingDomain(), objectToDestroy);

 	}

 

+	@Override

+	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {

+		final EObject objectToDestroy = request.getElementToDestroy();

+		if(objectToDestroy == null) {

+			return null;

+		}

+		return RemovePageHelper.getRemovePageCommand(request.getEditingDomain(), objectToDestroy);

+	}

+

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramEditHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramEditHelper.java
index 96a332820f5..5a69eaa862b 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramEditHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramEditHelper.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 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

@@ -26,62 +26,50 @@ import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

 

 /**

  * Represents an Edit Helper for GMF Diagrams

+ *

  * @author Laurent Wouters

  */

-public class DiagramEditHelper implements IEditHelper {

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper#canEdit(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)

-	 */

-	public boolean canEdit(IEditCommandRequest req) {

-		return false;

-	}

+public class DiagramEditHelper extends AbstractEditHelper {

 

-	/* (non-Javadoc)

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper#getEditCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)

-	 */

-	public ICommand getEditCommand(final IEditCommandRequest req) {

-		if (req instanceof DestroyElementRequest) {

-			DestroyElementRequest r = (DestroyElementRequest)req;

-			return getDestroyDiagramCommand((Diagram)r.getElementToDestroy());

-		} else if (req instanceof SetRequest) {

-			SetRequest r = (SetRequest)req;

-			return GetSimpleSetCommand(r.getElementToEdit(), r.getFeature(), r.getValue());

-		} else if (req instanceof CreateElementRequest) {

-			CreateElementRequest r = (CreateElementRequest)req;

-			EObject container = r.getContainer();

-			if (container instanceof Diagram)

-				return getCreateCommand((Diagram)container, r.getContainmentFeature(), r.getElementType());

+	@Override

+	protected ICommand getCreateCommand(CreateElementRequest req) {

+		EObject container = req.getContainer();

+		if(container instanceof Diagram) {

+			return getCreateCommand((Diagram)container, req.getContainmentFeature(), req.getElementType());

 		}

 		return null;

 	}

 

-	/* (non-Javadoc)

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper#getContainedValues(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EReference)

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper#getContainedValues(org.eclipse.emf.ecore.EObject,

+	 * org.eclipse.emf.ecore.EReference)

 	 */

+	@Override

 	public List getContainedValues(EObject eContainer, EReference feature) {

 		throw new UnsupportedOperationException();

 	}

-	

+

 	/**

 	 * Gets the command for destroying the given diagram

-	 * @param diagram The diagram to destroy

+	 *

+	 * @param diagram

+	 *        The diagram to destroy

 	 * @return The appropriate command

 	 */

 	private ICommand getDestroyDiagramCommand(final Diagram diagram) {

 		final Resource resource = diagram.eResource();

 		return new AbstractCommand("Destroy diagram") {

+

 			@Override

 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

 				resource.getContents().remove(diagram);

@@ -101,18 +89,23 @@ public class DiagramEditHelper implements IEditHelper {
 			}

 		};

 	}

-	

+

 	/**

 	 * Gets the command for setting a property of a view

-	 * @param object The object to modify

-	 * @param feature The feature to modify

-	 * @param newValue The new value for the feature

+	 *

+	 * @param object

+	 *        The object to modify

+	 * @param feature

+	 *        The feature to modify

+	 * @param newValue

+	 *        The new value for the feature

 	 * @return The appropriate command

 	 */

 	private ICommand GetSimpleSetCommand(final EObject object, final EStructuralFeature feature, final Object newValue) {

 		return new AbstractCommand("Edit property") {

+

 			private Object oldValue;

-			

+

 			@Override

 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

 				oldValue = object.eGet(feature);

@@ -133,29 +126,37 @@ public class DiagramEditHelper implements IEditHelper {
 			}

 		};

 	}

-	

-	

+

+

 	/**

 	 * Gets the command for the creation of an element in a diagram

-	 * @param diagram The diagram to change

-	 * @param reference The containment feature

-	 * @param type The type of the element to be created

+	 *

+	 * @param diagram

+	 *        The diagram to change

+	 * @param reference

+	 *        The containment feature

+	 * @param type

+	 *        The type of the element to be created

 	 * @return The appropriate command

 	 */

 	private ICommand getCreateCommand(final Diagram diagram, final EReference reference, final IElementType type) {

 		return new AbstractCommand("Create element") {

+

 			private EObject newElement;

+

 			private ModelAddData data;

-			

+

 			@Override

 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

 				data = PolicyChecker.getCurrent().getChildAddData(diagram, diagram.getElement().eClass(), type.getEClass());

-				if (!data.isPermitted())

+				if(!data.isPermitted()) {

 					return CommandResult.newErrorCommandResult("The current active viewpoint policy prevents the addition of this element to the view");

+				}

 				newElement = type.getEClass().getEPackage().getEFactoryInstance().create(type.getEClass());

-				if (data.isPathDefined()) {

-					if (!data.execute(diagram.getElement(), newElement))

+				if(data.isPathDefined()) {

+					if(!data.execute(diagram.getElement(), newElement)) {

 						return CommandResult.newErrorCommandResult("Failed to follow the path");

+					}

 				} else {

 					diagram.getElement().eSet(reference, newElement);

 				}

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.classpath b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.classpath
index 2d1a4302f04..7441b7f8c5f 100644
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.classpath
+++ b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.classpath
@@ -2,6 +2,6 @@
 <classpath>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry excluding="org/eclipse/papyrus/eclipse/project/editors/interfaces/IEMFFacetProjectEditor.java|org/eclipse/papyrus/eclipse/project/editors/project/EMFFacetProjectEditor.java" kind="src" path="src"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF
index 9e17e261a52..986aa259168 100644
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources,

  org.eclipse.jdt.core,

  org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

- org.eclipse.emf.facet.infra.facet,

- org.eclipse.pde.ui;bundle-version="3.6.100"

+ org.eclipse.pde.ui;bundle-version="3.6.100",

+ org.eclipse.emf.ecore;bundle-version="2.10.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF
index b8f138e9477..a732bcc8b92 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF
@@ -3,11 +3,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.eclipse.emf.common,

  org.eclipse.emf.ecore,

- org.eclipse.emf.facet.infra.common.core,

  org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0"

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0",

+ org.eclipse.core.resources;bundle-version="3.9.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier