366527: [All diagram][refactoring] update papyrus to UML2.4

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

3 files changed, 50 insertions, 58 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MessageDeleteReorientCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MessageDeleteReorientCommand.java
index 7979bd83726..5b9292f0815 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MessageDeleteReorientCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MessageDeleteReorientCommand.java
@@ -14,7 +14,6 @@
 package org.eclipse.papyrus.uml.service.types.command;

 

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

-import org.eclipse.uml2.uml.DestructionEvent;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.Lifeline;

 

@@ -41,11 +40,11 @@ public class MessageDeleteReorientCommand extends MessageAbstractReorientCommand
 	 */

 	@Override

 	protected boolean canReorientTarget() {

-

-		// Verify possible type of new target

-		if(!((getNewTarget() instanceof DestructionEvent) || (getNewTarget() instanceof Lifeline))) {

-			return false;

-		}

+//FIXME : change for UML 2.4

+//		// Verify possible type of new target

+//		if(!((getNewTarget() instanceof DestructionEvent) || (getNewTarget() instanceof Lifeline))) {

+//			return false;

+//		}

 

 		// Ensure the message owner is an interaction

 		if(!(getLink().eContainer() instanceof Interaction)) {

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DestructionEventHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DestructionEventHelperAdvice.java
index 584820da9fc..db27181f6c0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DestructionEventHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DestructionEventHelperAdvice.java
@@ -13,18 +13,9 @@
  *****************************************************************************/

 package org.eclipse.papyrus.uml.service.types.helper.advice;

 

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature.Setting;

 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.papyrus.infra.core.utils.PapyrusEcoreUtils;

-import org.eclipse.uml2.uml.DestructionEvent;

-import org.eclipse.uml2.uml.OccurrenceSpecification;

 

 /**

  * Helper advice for all {@link DestructionEvent} elements.

@@ -36,26 +27,27 @@ public class DestructionEventHelperAdvice extends AbstractEditHelperAdvice {
 	 */

 	@Override

 	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {

-

-		List<EObject> dependentsToDestroy = new ArrayList<EObject>();

-

-		DestructionEvent de = (DestructionEvent)request.getElementToDestroy();

-

-		Collection<Setting> usages = PapyrusEcoreUtils.getUsages(de);

-

-		// remove the associated OccurrenceSpecification

-		// if it is not used by another element.

-		for(Setting usage : usages) {

-			EObject os = usage.getEObject();

-			if(os instanceof OccurrenceSpecification && PapyrusEcoreUtils.isOnlyUsage(os, de)) {

-				dependentsToDestroy.add(os);

-			}

-		}

-

-		// return command to destroy dependents

-		if(!dependentsToDestroy.isEmpty()) {

-			return request.getDestroyDependentsCommand(dependentsToDestroy);

-		}

+		//FIXME : change for UML 2.4

+//

+//		List<EObject> dependentsToDestroy = new ArrayList<EObject>();

+//

+//		DestructionEvent de = (DestructionEvent)request.getElementToDestroy();

+//

+//		Collection<Setting> usages = PapyrusEcoreUtils.getUsages(de);

+//

+//		// remove the associated OccurrenceSpecification

+//		// if it is not used by another element.

+//		for(Setting usage : usages) {

+//			EObject os = usage.getEObject();

+//			if(os instanceof OccurrenceSpecification && PapyrusEcoreUtils.isOnlyUsage(os, de)) {

+//				dependentsToDestroy.add(os);

+//			}

+//		}

+//

+//		// return command to destroy dependents

+//		if(!dependentsToDestroy.isEmpty()) {

+//			return request.getDestroyDependentsCommand(dependentsToDestroy);

+//		}

 

 		return null;

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/OccurrenceSpecificationHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/OccurrenceSpecificationHelperAdvice.java
index 84d9f6243ab..b7b55cfe9ee 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/OccurrenceSpecificationHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/OccurrenceSpecificationHelperAdvice.java
@@ -49,29 +49,30 @@ public class OccurrenceSpecificationHelperAdvice extends AbstractEditHelperAdvic
 	 */

 	@Override

 	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {

-		List<EObject> dependentsToDestroy = new ArrayList<EObject>();

-

-		OccurrenceSpecification os = (OccurrenceSpecification)request.getElementToDestroy();

-		Event event = os.getEvent();

-

-		// Delete referenced event if it is not referenced itself by another element.

-		if((event != null) && (PapyrusEcoreUtils.isOnlyUsage(event, os))) {

-			dependentsToDestroy.add(event);

-		}

-

-		// delete linked time elements

-		dependentsToDestroy.addAll(TimeObservationHelper.getTimeObservations(os));

-		dependentsToDestroy.addAll(TimeConstraintHelper.getTimeConstraintsOn(os));

-		dependentsToDestroy.addAll(DurationObservationHelper.getDurationObservationsOn(os));

-		dependentsToDestroy.addAll(DurationConstraintHelper.getDurationConstraintsOn(os));

-

-		// delete linked general ordering

-		dependentsToDestroy.addAll(os.getToBefores());

-		dependentsToDestroy.addAll(os.getToAfters());

-

-		if(!dependentsToDestroy.isEmpty()) {

-			return request.getDestroyDependentsCommand(dependentsToDestroy);

-		}

+		//FIXME : change for UML 2.4

+//		List<EObject> dependentsToDestroy = new ArrayList<EObject>();

+//

+//		OccurrenceSpecification os = (OccurrenceSpecification)request.getElementToDestroy();

+//		Event event = os.getEvent();

+//

+//		// Delete referenced event if it is not referenced itself by another element.

+//		if((event != null) && (PapyrusEcoreUtils.isOnlyUsage(event, os))) {

+//			dependentsToDestroy.add(event);

+//		}

+//

+//		// delete linked time elements

+//		dependentsToDestroy.addAll(TimeObservationHelper.getTimeObservations(os));

+//		dependentsToDestroy.addAll(TimeConstraintHelper.getTimeConstraintsOn(os));

+//		dependentsToDestroy.addAll(DurationObservationHelper.getDurationObservationsOn(os));

+//		dependentsToDestroy.addAll(DurationConstraintHelper.getDurationConstraintsOn(os));

+//

+//		// delete linked general ordering

+//		dependentsToDestroy.addAll(os.getToBefores());

+//		dependentsToDestroy.addAll(os.getToAfters());

+//

+//		if(!dependentsToDestroy.isEmpty()) {

+//			return request.getDestroyDependentsCommand(dependentsToDestroy);

+//		}

 

 		return null;

 	}