From c3e33d3babb34f6948200b9a06fa428edf675d15 Mon Sep 17 00:00:00 2001 From: Ansgar Radermacher Date: Mon, 4 Nov 2013 11:39:39 +0100 Subject: - 420980 - [diagram conversion] Old DI2 to DI diagram conversion does not work any more --- .../META-INF/MANIFEST.MF | 4 + .../model/di2.ecore | 48 ++-- .../model/di2.genmodel | 257 ++++++++++----------- .../org.eclipse.papyrus.conversion.di2/plugin.xml | 15 +- .../conversion/di2/impl/Di2PackageImpl.java | 29 ++- .../META-INF/MANIFEST.MF | 3 +- 6 files changed, 177 insertions(+), 179 deletions(-) diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/META-INF/MANIFEST.MF b/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/META-INF/MANIFEST.MF index d120d3f5623..8443b2db054 100644 --- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/META-INF/MANIFEST.MF +++ b/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/META-INF/MANIFEST.MF @@ -6,11 +6,15 @@ Bundle-Version: 0.8.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %pluginProvider Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Export-Package: org.eclipse.papyrus.conversion.di2, org.eclipse.papyrus.conversion.di2.impl, org.eclipse.papyrus.conversion.di2.util Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, + org.eclipse.emf.ecore.xmi;visibility:=reexport, + org.eclipse.uml2.types;visibility:=reexport, org.eclipse.gef, org.eclipse.uml2.uml +Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2.ecore b/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2.ecore index d6c8bfbdfff..cebea7ea7c3 100644 --- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2.ecore +++ b/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2.ecore @@ -1,22 +1,20 @@ - +
- +
- + - +
@@ -24,24 +22,24 @@ - + - - - - - + + eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"/> - - + + @@ -122,38 +120,38 @@ - + - + - + - + - + - + - - + + + upperBound="-1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"/> diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2.genmodel b/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2.genmodel index 6248c35221c..a5b082c3462 100644 --- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2.genmodel +++ b/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2.genmodel @@ -1,132 +1,125 @@ - - - di2.ecore - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + di2.ecore + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/plugin.xml b/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/plugin.xml index 68282929b3d..ca7c3c3889a 100644 --- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/plugin.xml +++ b/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/plugin.xml @@ -9,13 +9,12 @@ --> - - - - - + + + + diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Di2PackageImpl.java b/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Di2PackageImpl.java index ad6aa3da191..4241fa8b7d0 100644 --- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Di2PackageImpl.java +++ b/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Di2PackageImpl.java @@ -9,7 +9,6 @@ package org.eclipse.papyrus.conversion.di2.impl; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; - import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; @@ -18,9 +17,7 @@ import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EcorePackage; - import org.eclipse.emf.ecore.impl.EPackageImpl; - import org.eclipse.papyrus.conversion.di2.CoreSemanticModelBridge; import org.eclipse.papyrus.conversion.di2.Di2Factory; import org.eclipse.papyrus.conversion.di2.Di2Package; @@ -32,15 +29,10 @@ import org.eclipse.papyrus.conversion.di2.GraphConnector; import org.eclipse.papyrus.conversion.di2.GraphEdge; import org.eclipse.papyrus.conversion.di2.GraphElement; import org.eclipse.papyrus.conversion.di2.GraphNode; -import org.eclipse.papyrus.conversion.di2.GraphicPrimitive; -import org.eclipse.papyrus.conversion.di2.Image; import org.eclipse.papyrus.conversion.di2.LeafElement; import org.eclipse.papyrus.conversion.di2.PapyrusKeyEnumeration; import org.eclipse.papyrus.conversion.di2.Polilyne; -import org.eclipse.papyrus.conversion.di2.Property; import org.eclipse.papyrus.conversion.di2.Reference; -import org.eclipse.papyrus.conversion.di2.SemanticModelBridge; -import org.eclipse.papyrus.conversion.di2.SimpleSemanticModelElement; import org.eclipse.papyrus.conversion.di2.TextElement; import org.eclipse.papyrus.conversion.di2.Uml1SemanticModelBridge; import org.eclipse.uml2.uml.UMLPackage; @@ -1202,15 +1194,18 @@ public class Di2PackageImpl extends EPackageImpl implements Di2Package { initEReference(getDiagramElement_Property(), this.getProperty(), null, "property", null, 0, -1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + /* initEAttribute(getDiagramElement_IsVisible(), theUMLPackage.getBoolean(), "isVisible", null, 0, 1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + */ initEReference(getDiagramElement_Reference(), this.getReference(), null, "reference", null, 0, -1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getDiagramElement_Container(), this.getGraphElement(), this.getGraphElement_Contained(), "container", null, 0, 1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + /* initEAttribute(getDiagramElement_FontFamily(), theUMLPackage.getString(), "fontFamily", "", 0, 1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1223,6 +1218,7 @@ public class Di2PackageImpl extends EPackageImpl implements Di2Package { initEAttribute(getDiagramElement_LineThickness(), theUMLPackage.getInteger(), "lineThickness", "1", 0, 1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + */ initEAttribute(getDiagramElement_FontColor(), this.getRGB(), "fontColor", null, 0, 1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getDiagramElement_ForegroundColor(), this.getRGB(), "foregroundColor", null, 0, 1, @@ -1233,9 +1229,11 @@ public class Di2PackageImpl extends EPackageImpl implements Di2Package { !IS_DERIVED, IS_ORDERED); initEAttribute(getDiagramElement_BorderColor(), this.getRGB(), "borderColor", null, 0, 1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + /* initEAttribute(getDiagramElement_Translucent(), theUMLPackage.getBoolean(), "translucent", null, 0, 1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + */ initEReference(getDiagramElement_SemanticParent(), this.getDiagramElement(), this .getDiagramElement_SemanticChild(), "semanticParent", null, 0, 1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, @@ -1247,13 +1245,14 @@ public class Di2PackageImpl extends EPackageImpl implements Di2Package { EOperation op = addEOperation(diagramElementEClass, this.getProperty(), "getProperty", 0, 1, IS_UNIQUE, IS_ORDERED); + /* addEParameter(op, theUMLPackage.getString(), "key", 0, 1, IS_UNIQUE, IS_ORDERED); op = addEOperation(diagramElementEClass, this.getString(), "getPropertyValue", 0, 1, IS_UNIQUE, IS_ORDERED); addEParameter(op, theUMLPackage.getString(), "key", 0, 1, IS_UNIQUE, IS_ORDERED); addEOperation(diagramElementEClass, theUMLPackage.getString(), "getEditpartName", 0, 1, IS_UNIQUE, IS_ORDERED); - + */ initEClass(graphElementEClass, GraphElement.class, "GraphElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getGraphElement_Contained(), this.getDiagramElement(), this.getDiagramElement_Container(), @@ -1273,6 +1272,7 @@ public class Di2PackageImpl extends EPackageImpl implements Di2Package { initEClass(referenceEClass, Reference.class, "Reference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + /* initEAttribute(getReference_IsIndividualRepresentation(), theUMLPackage.getBoolean(), "isIndividualRepresentation", null, 0, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1285,7 +1285,7 @@ public class Di2PackageImpl extends EPackageImpl implements Di2Package { !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getProperty_Value(), theUMLPackage.getString(), "value", null, 0, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - + */ initEClass(graphEdgeEClass, GraphEdge.class, "GraphEdge", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getGraphEdge_Anchor(), this.getGraphConnector(), this.getGraphConnector_GraphEdge(), "anchor", @@ -1339,6 +1339,7 @@ public class Di2PackageImpl extends EPackageImpl implements Di2Package { initEReference(getDiagram_Owner(), this.getSemanticModelBridge(), null, "owner", null, 1, 1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + /* initEAttribute(getDiagram_Name(), theUMLPackage.getString(), "name", null, 0, 1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getDiagram_Zoom(), this.getDouble(), "zoom", null, 0, 1, Diagram.class, !IS_TRANSIENT, @@ -1365,7 +1366,8 @@ public class Di2PackageImpl extends EPackageImpl implements Di2Package { initEAttribute(getSimpleSemanticModelElement_Typeinfo(), theUMLPackage.getString(), "typeinfo", null, 0, 1, SimpleSemanticModelElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - + */ + initEClass(uml1SemanticModelBridgeEClass, Uml1SemanticModelBridge.class, "Uml1SemanticModelBridge", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getUml1SemanticModelBridge_Element(), theUMLPackage.getElement(), null, "element", null, 0, 1, @@ -1380,6 +1382,7 @@ public class Di2PackageImpl extends EPackageImpl implements Di2Package { initEClass(textElementEClass, TextElement.class, "TextElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + /* initEAttribute(getTextElement_Text(), theUMLPackage.getString(), "text", null, 0, 1, TextElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1391,12 +1394,14 @@ public class Di2PackageImpl extends EPackageImpl implements Di2Package { initEClass(graphicPrimitiveEClass, GraphicPrimitive.class, "GraphicPrimitive", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - + */ initEClass(polilyneEClass, Polilyne.class, "Polilyne", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getPolilyne_Waypoints(), this.getPoint(), "waypoints", null, 2, -1, Polilyne.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + /* initEAttribute(getPolilyne_Closed(), theUMLPackage.getBoolean(), "closed", null, 2, -1, Polilyne.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + */ initEClass(ellipseEClass, Ellipse.class, "Ellipse", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getEllipse_Center(), this.getPoint(), "center", null, 0, 1, Ellipse.class, !IS_TRANSIENT, diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/META-INF/MANIFEST.MF b/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/META-INF/MANIFEST.MF index 784ca22b671..bad2bb38a43 100644 --- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/META-INF/MANIFEST.MF +++ b/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/META-INF/MANIFEST.MF @@ -12,10 +12,9 @@ Require-Bundle: org.eclipse.m2m.qvt.oml;bundle-version="3.0.0", org.eclipse.m2m.qvt.oml.runtime;bundle-version="2.1.0", org.eclipse.uml2.uml;bundle-version="3.1.0", org.eclipse.gmf.runtime.notation;bundle-version="1.4.0", - org.eclipse.papyrus.diagram.clazz, org.eclipse.m2m.qvt.oml.emf.util;bundle-version="2.0.100", org.eclipse.papyrus.conversion.di2, - org.eclipse.papyrus.doc;bundle-version="0.8.0" + org.eclipse.papyrus.uml.diagram.clazz;bundle-version="0.10.1" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Import-Package: junit.framework, -- cgit v1.2.3