465659: [All Diagrams] Update the Diagram Reconciler to migrate from

Papyrus 1.0 to Papyrus 1.1
https://bugs.eclipse.org/bugs/show_bug.cgi?id=465659

- Fix the Association and Dependency migration for Class and Component
Diagram

2 files changed, 6 insertions, 9 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconcilier.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconcilier.java
index b4c233a954e..eb00662a608 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconcilier.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconcilier.java
@@ -33,8 +33,8 @@ import org.eclipse.papyrus.infra.gmfdiag.common.commands.InsertFloatingLabelFrom
 import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassFloatingNameEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationFloatingNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassFloatingNameEditPart;

@@ -48,8 +48,8 @@ import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart;
 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeFloatingNameEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeFloatingNameEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyFloatingNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationFloatingNameEditPart;

@@ -105,13 +105,13 @@ public class ClassReconcilier extends DiagramReconciler {
 		Map<String, String> map = new HashMap<String, String>();

 		map.put(String.valueOf(ClassEditPart.VISUAL_ID), String.valueOf(ClassFloatingNameEditPart.VISUAL_ID));

 		map.put(String.valueOf(AssociationClassEditPart.VISUAL_ID), String.valueOf(AssociationClassFloatingNameEditPart.VISUAL_ID));

-		map.put(String.valueOf(AssociationEditPart.VISUAL_ID), String.valueOf(AssociationFloatingNameEditPart.VISUAL_ID));

+		map.put(String.valueOf(AssociationNodeEditPart.VISUAL_ID), String.valueOf(AssociationFloatingNameEditPart.VISUAL_ID));

 		map.put(String.valueOf(ClassEditPartCN.VISUAL_ID), String.valueOf(ClassFloatingNameEditPartCN.VISUAL_ID));

 		map.put(String.valueOf(ComponentEditPart.VISUAL_ID), String.valueOf(ComponentFloatingNameEditPart.VISUAL_ID));

 		map.put(String.valueOf(ComponentEditPartCN.VISUAL_ID), String.valueOf(ComponentFloatingNameEditPartCN.VISUAL_ID));

 		map.put(String.valueOf(DataTypeEditPart.VISUAL_ID), String.valueOf(DataTypeFloatingNameEditPart.VISUAL_ID));

 		map.put(String.valueOf(DataTypeEditPartCN.VISUAL_ID), String.valueOf(DataTypeFloatingNameEditPartCN.VISUAL_ID));

-		map.put(String.valueOf(DependencyEditPart.VISUAL_ID), String.valueOf(DependencyFloatingNameEditPart.VISUAL_ID));

+		map.put(String.valueOf(DependencyNodeEditPart.VISUAL_ID), String.valueOf(DependencyFloatingNameEditPart.VISUAL_ID));

 		map.put(String.valueOf(EnumerationEditPart.VISUAL_ID), String.valueOf(EnumerationFloatingNameEditPart.VISUAL_ID));

 		map.put(String.valueOf(EnumerationEditPartCN.VISUAL_ID), String.valueOf(EnumerationFloatingNameEditPartCN.VISUAL_ID));

 		map.put(String.valueOf(InformationItemEditPart.VISUAL_ID), String.valueOf(InformationItemFloatingNameEditPart.VISUAL_ID));

@@ -135,7 +135,7 @@ public class ClassReconcilier extends DiagramReconciler {
 		TreeIterator<EObject> allContentIterator = diagram.eAllContents();

 

 		while (allContentIterator.hasNext()) {

-			EObject eObject = (EObject) allContentIterator.next();

+			EObject eObject = allContentIterator.next();

 

 			if (eObject instanceof View) {

 				if (((View) eObject).getType().equals(CONTAINMENT_LINK_AFFIXEDNODE_OLD_VISUAL_ID)) {

@@ -161,7 +161,7 @@ public class ClassReconcilier extends DiagramReconciler {
 			TreeIterator<EObject> allContentIterator = diagram.eAllContents();

 

 			while (allContentIterator.hasNext()) {

-				EObject eObject = (EObject) allContentIterator.next();

+				EObject eObject = allContentIterator.next();

 

 				if (eObject instanceof Edge) {

 					if (((Edge) eObject).getType().equals(CONTAINMENT_LINK_OLD_VISUAL_ID)) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconcilier.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconcilier.java
index d00b2091ba5..cef985ebb23 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconcilier.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconcilier.java
@@ -25,8 +25,6 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentFloatingLabelEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentFloatingLabelEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentFloatingLabelEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyFloatingLabelEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeFloatingLabelEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPart;

@@ -67,7 +65,6 @@ public class ComponentReconcilier extends DiagramReconciler {
 		map.put(String.valueOf(ComponentEditPart.VISUAL_ID), String.valueOf(ComponentFloatingLabelEditPart.VISUAL_ID));

 		map.put(String.valueOf(ComponentEditPartCN.VISUAL_ID), String.valueOf(ComponentFloatingLabelEditPartCN.VISUAL_ID));

 		map.put(String.valueOf(ComponentEditPartPCN.VISUAL_ID), String.valueOf(ComponentFloatingLabelEditPartPCN.VISUAL_ID));

-		map.put(String.valueOf(DependencyEditPart.VISUAL_ID), String.valueOf(DependencyFloatingLabelEditPart.VISUAL_ID));

 		map.put(String.valueOf(DependencyNodeEditPart.VISUAL_ID), String.valueOf(DependencyNodeFloatingLabelEditPart.VISUAL_ID));

 		map.put(String.valueOf(InterfaceEditPart.VISUAL_ID), String.valueOf(InterfaceFloatingLabelEditPart.VISUAL_ID));

 		map.put(String.valueOf(InterfaceEditPartPCN.VISUAL_ID), String.valueOf(InterfaceFloatingLabelEditPartPCN.VISUAL_ID));