Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnsgar Radermacher2013-11-04 10:39:39 +0000
committerAnsgar Radermacher2013-11-04 13:26:30 +0000
commitc3e33d3babb34f6948200b9a06fa428edf675d15 (patch)
treece2d50575cf740841a0903cd38c78f61e3bcf1c2 /extraplugins
parentc0f19f0c854be570842fed27a0554a0bf381629b (diff)
downloadorg.eclipse.papyrus-c3e33d3babb34f6948200b9a06fa428edf675d15.tar.gz
org.eclipse.papyrus-c3e33d3babb34f6948200b9a06fa428edf675d15.tar.xz
org.eclipse.papyrus-c3e33d3babb34f6948200b9a06fa428edf675d15.zip
- 420980 - [diagram conversion] Old DI2 to DI diagram conversion does not work any more
Diffstat (limited to 'extraplugins')
-rw-r--r--extraplugins/conversion/org.eclipse.papyrus.conversion.di2/META-INF/MANIFEST.MF4
-rw-r--r--extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2.ecore48
-rw-r--r--extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2.genmodel257
-rw-r--r--extraplugins/conversion/org.eclipse.papyrus.conversion.di2/plugin.xml15
-rw-r--r--extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Di2PackageImpl.java29
-rw-r--r--extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/META-INF/MANIFEST.MF3
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 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage 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" name="di2"
- nsURI="http://www.papyrusuml.org" nsPrefix="di2">
+<ecore:EPackage 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" name="di2" nsURI="http://www.papyrusuml.org" nsPrefix="di2">
<eClassifiers xsi:type="ecore:EClass" name="DiagramElement">
<eOperations name="getProperty" eType="#//Property">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="body" value="java.util.Iterator it = getProperty().iterator();&#xD;&#xA;while (it.hasNext()) {&#xD;&#xA;&#x9;Property element = (Property) it.next();&#xD;&#xA;&#x9;if(key.equals(element.getKey())) {&#xD;&#xA;&#x9;&#x9;return element;&#xD;&#xA;&#x9;}&#xD;&#xA;}&#xD;&#xA;return null;"/>
</eAnnotations>
- <eParameters name="key" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//String"/>
+ <eParameters name="key" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
</eOperations>
<eOperations name="getPropertyValue" eType="#//String">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="body" value=" if(this.getProperty(key)!=null){&#xD;&#xA;&#x9;return this.getProperty(key).getValue();}&#xD;&#xA;return null;&#xD;&#xA;&#x9;"/>
</eAnnotations>
- <eParameters name="key" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//String"/>
+ <eParameters name="key" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
</eOperations>
- <eOperations name="getEditpartName" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//String">
+ <eOperations name="getEditpartName" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="body" value="return this.getPropertyValue(com.cea.papyrus.diagraminterchange2.di2.PapyrusKeyEnumeration.PAPYRUSEDITPART.getLiteral());"/>
<details key="documentation" value="it is used to obtain the name of the good editpart"/>
@@ -24,24 +22,24 @@
</eOperations>
<eStructuralFeatures xsi:type="ecore:EReference" name="property" upperBound="-1"
eType="#//Property" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="isVisible" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Boolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="isVisible" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="reference" upperBound="-1"
eType="#//Reference"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="container" eType="#//GraphElement"
eOpposite="#//GraphElement/contained"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontFamily" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//String"
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontFamily" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"
defaultValueLiteral=""/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontSize" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Integer"
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontSize" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
defaultValueLiteral="10"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineStyle" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//String"
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineStyle" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"
defaultValueLiteral=""/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineThickness" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Integer"
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineThickness" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
defaultValueLiteral="1"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="fontColor" eType="#//RGB"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="foregroundColor" eType="#//RGB"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="backgroundColor" eType="#//RGB"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="borderColor" eType="#//RGB"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="translucent" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Boolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="translucent" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="semanticParent" eType="#//DiagramElement"
eOpposite="#//DiagramElement/semanticChild"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="semanticChild" upperBound="-1"
@@ -60,13 +58,13 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Reference" eSuperTypes="#//DiagramElement">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="isIndividualRepresentation"
- eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Boolean"/>
+ eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="referenced" lowerBound="1"
eType="#//DiagramElement"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Property">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//String"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="GraphEdge" eSuperTypes="#//GraphElement">
<eOperations name="getAnchorSource" eType="#//GraphElement">
@@ -122,38 +120,38 @@
<eClassifiers xsi:type="ecore:EClass" name="Diagram" eSuperTypes="#//GraphNode">
<eStructuralFeatures xsi:type="ecore:EReference" name="owner" lowerBound="1" eType="#//SemanticModelBridge"
containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="zoom" eType="#//Double"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="viewport" eType="#//Point"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="diagramLink" upperBound="-1"
eType="#//DiagramLink"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="SemanticModelBridge">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="presentation" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="presentation" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="graphElement" eType="#//GraphElement"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="SimpleSemanticModelElement" eSuperTypes="#//SemanticModelBridge">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeinfo" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeinfo" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Uml1SemanticModelBridge" eSuperTypes="#//SemanticModelBridge">
- <eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Element"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Element"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CoreSemanticModelBridge" eSuperTypes="#//SemanticModelBridge"/>
<eClassifiers xsi:type="ecore:EClass" name="LeafElement" eSuperTypes="#//DiagramElement"/>
<eClassifiers xsi:type="ecore:EClass" name="TextElement" eSuperTypes="#//LeafElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="text" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="text" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Image" eSuperTypes="#//LeafElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="uri" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//String"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="mimeType" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="uri" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="mimeType" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="GraphicPrimitive" eSuperTypes="#//LeafElement"/>
<eClassifiers xsi:type="ecore:EClass" name="Polilyne" eSuperTypes="#//GraphicPrimitive">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="waypoints" lowerBound="2"
upperBound="-1" eType="#//Point"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="closed" lowerBound="2"
- upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Boolean"/>
+ upperBound="-1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Ellipse" eSuperTypes="#//GraphicPrimitive">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="center" eType="#//Point"/>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/com.cea.papyrus.diagraminterchange2/src"
- modelPluginID="com.cea.papyrus.diagraminterchange2" modelName="Di2" importerID="org.eclipse.emf.importer.ecore"
- complianceLevel="5.0" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">
- <foreignModel>di2.ecore</foreignModel>
- <genPackages prefix="Di2" basePackage="com.cea.papyrus.diagraminterchange2" disposableProviderFactory="true"
- ecorePackage="di2.ecore#/">
- <genEnums typeSafeEnumCompatible="false" ecoreEnum="di2.ecore#//TypeDiagram">
- <genEnumLiterals ecoreEnumLiteral="di2.ecore#//TypeDiagram/ClassDiagram"/>
- <genEnumLiterals ecoreEnumLiteral="di2.ecore#//TypeDiagram/CompositeStructureDiagram"/>
- <genEnumLiterals ecoreEnumLiteral="di2.ecore#//TypeDiagram/ComponentDiagram"/>
- <genEnumLiterals ecoreEnumLiteral="di2.ecore#//TypeDiagram/DeploymentDiagram"/>
- <genEnumLiterals ecoreEnumLiteral="di2.ecore#//TypeDiagram/ObjectDiagram"/>
- <genEnumLiterals ecoreEnumLiteral="di2.ecore#//TypeDiagram/PackageDiagram"/>
- <genEnumLiterals ecoreEnumLiteral="di2.ecore#//TypeDiagram/ActivityDiagram"/>
- <genEnumLiterals ecoreEnumLiteral="di2.ecore#//TypeDiagram/SequenceDiagram"/>
- <genEnumLiterals ecoreEnumLiteral="di2.ecore#//TypeDiagram/CommunicationDiagram"/>
- <genEnumLiterals ecoreEnumLiteral="di2.ecore#//TypeDiagram/InteractionOverviewDiagram"/>
- <genEnumLiterals ecoreEnumLiteral="di2.ecore#//TypeDiagram/TimingDiagram"/>
- <genEnumLiterals ecoreEnumLiteral="di2.ecore#//TypeDiagram/UseCaseDiagram"/>
- <genEnumLiterals ecoreEnumLiteral="di2.ecore#//TypeDiagram/StateMachineDiagram"/>
- </genEnums>
- <genDataTypes ecoreDataType="di2.ecore#//Point"/>
- <genDataTypes ecoreDataType="di2.ecore#//Dimension"/>
- <genDataTypes ecoreDataType="di2.ecore#//Double"/>
- <genDataTypes ecoreDataType="di2.ecore#//RGB"/>
- <genClasses ecoreClass="di2.ecore#//DiagramElement">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference di2.ecore#//DiagramElement/property"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/isVisible"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//DiagramElement/reference"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference di2.ecore#//DiagramElement/container"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/fontFamily"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/fontSize"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/lineStyle"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/lineThickness"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/fontColor"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/foregroundColor"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/backgroundColor"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/borderColor"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/translucent"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//DiagramElement/semanticParent"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//DiagramElement/semanticChild"/>
- <genOperations ecoreOperation="di2.ecore#//DiagramElement/getProperty">
- <genParameters ecoreParameter="di2.ecore#//DiagramElement/getProperty/key"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="di2.ecore#//GraphElement">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference di2.ecore#//GraphElement/contained"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference di2.ecore#//GraphElement/link"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference di2.ecore#//GraphElement/semanticModel"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//GraphElement/position"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference di2.ecore#//GraphElement/anchorage"/>
- </genClasses>
- <genClasses ecoreClass="di2.ecore#//Reference">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Reference/isIndividualRepresentation"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//Reference/referenced"/>
- </genClasses>
- <genClasses ecoreClass="di2.ecore#//Property">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Property/key"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Property/value"/>
- </genClasses>
- <genClasses ecoreClass="di2.ecore#//GraphEdge">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//GraphEdge/anchor"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//GraphEdge/waypoints"/>
- <genOperations ecoreOperation="di2.ecore#//GraphEdge/getAnchorSource"/>
- <genOperations ecoreOperation="di2.ecore#//GraphEdge/getAnchorTarget"/>
- <genOperations ecoreOperation="di2.ecore#//GraphEdge/setAnchorSource">
- <genParameters ecoreParameter="di2.ecore#//GraphEdge/setAnchorSource/value"/>
- </genOperations>
- <genOperations ecoreOperation="di2.ecore#//GraphEdge/setAnchorTarget">
- <genParameters ecoreParameter="di2.ecore#//GraphEdge/setAnchorTarget/value"/>
- </genOperations>
- <genOperations ecoreOperation="di2.ecore#//GraphEdge/initConnectors"/>
- </genClasses>
- <genClasses ecoreClass="di2.ecore#//GraphConnector">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//GraphConnector/position"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//GraphConnector/graphEdge"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference di2.ecore#//GraphConnector/graphElement"/>
- </genClasses>
- <genClasses ecoreClass="di2.ecore#//GraphNode">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//GraphNode/size"/>
- </genClasses>
- <genClasses ecoreClass="di2.ecore#//DiagramLink">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//DiagramLink/diagram"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramLink/zoom"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramLink/viewport"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//DiagramLink/graphElement"/>
- </genClasses>
- <genClasses ecoreClass="di2.ecore#//Diagram">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference di2.ecore#//Diagram/owner"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Diagram/name"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Diagram/zoom"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Diagram/viewport"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//Diagram/diagramLink"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Diagram/type"/>
- </genClasses>
- <genClasses ecoreClass="di2.ecore#//SemanticModelBridge">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//SemanticModelBridge/presentation"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//SemanticModelBridge/graphElement"/>
- </genClasses>
- <genClasses ecoreClass="di2.ecore#//SimpleSemanticModelElement">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//SimpleSemanticModelElement/typeinfo"/>
- </genClasses>
- <genClasses ecoreClass="di2.ecore#//Uml1SemanticModelBridge">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//Uml1SemanticModelBridge/element"/>
- </genClasses>
- <genClasses ecoreClass="di2.ecore#//CoreSemanticModelBridge"/>
- <genClasses ecoreClass="di2.ecore#//LeafElement"/>
- <genClasses ecoreClass="di2.ecore#//TextElement">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//TextElement/text"/>
- </genClasses>
- <genClasses ecoreClass="di2.ecore#//Image">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Image/uri"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Image/mimeType"/>
- </genClasses>
- <genClasses ecoreClass="di2.ecore#//GraphicPrimitive"/>
- <genClasses ecoreClass="di2.ecore#//Polilyne">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Polilyne/waypoints"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Polilyne/closed"/>
- </genClasses>
- <genClasses ecoreClass="di2.ecore#//Ellipse">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Ellipse/center"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Ellipse/radiusX"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Ellipse/radiusY"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Ellipse/rotation"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Ellipse/startAngle"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Ellipse/endAngle"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.conversion.di2/src" modelPluginID="org.eclipse.papyrus.conversion.di2"
+ modelName="Di2" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+ importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"
+ usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml"
+ operationReflection="true" importOrganizing="true">
+ <foreignModel>di2.ecore</foreignModel>
+ <genPackages prefix="Di2" resource="XML" disposableProviderFactory="true" ecorePackage="di2.ecore#/">
+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="di2.ecore#//PapyrusKeyEnumeration">
+ <genEnumLiterals ecoreEnumLiteral="di2.ecore#//PapyrusKeyEnumeration/papyruseditpart"/>
+ </genEnums>
+ <genDataTypes ecoreDataType="di2.ecore#//Point"/>
+ <genDataTypes ecoreDataType="di2.ecore#//Dimension"/>
+ <genDataTypes ecoreDataType="di2.ecore#//Double"/>
+ <genDataTypes ecoreDataType="di2.ecore#//RGB"/>
+ <genDataTypes ecoreDataType="di2.ecore#//String"/>
+ <genClasses ecoreClass="di2.ecore#//DiagramElement">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference di2.ecore#//DiagramElement/property"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/isVisible"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//DiagramElement/reference"/>
+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference di2.ecore#//DiagramElement/container"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/fontFamily"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/fontSize"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/lineStyle"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/lineThickness"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/fontColor"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/foregroundColor"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/backgroundColor"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/borderColor"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramElement/translucent"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//DiagramElement/semanticParent"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//DiagramElement/semanticChild"/>
+ <genOperations ecoreOperation="di2.ecore#//DiagramElement/getProperty">
+ <genParameters ecoreParameter="di2.ecore#//DiagramElement/getProperty/key"/>
+ </genOperations>
+ <genOperations ecoreOperation="di2.ecore#//DiagramElement/getPropertyValue">
+ <genParameters ecoreParameter="di2.ecore#//DiagramElement/getPropertyValue/key"/>
+ </genOperations>
+ <genOperations ecoreOperation="di2.ecore#//DiagramElement/getEditpartName"/>
+ </genClasses>
+ <genClasses ecoreClass="di2.ecore#//GraphElement">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference di2.ecore#//GraphElement/contained"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference di2.ecore#//GraphElement/link"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference di2.ecore#//GraphElement/semanticModel"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//GraphElement/position"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference di2.ecore#//GraphElement/anchorage"/>
+ </genClasses>
+ <genClasses ecoreClass="di2.ecore#//Reference">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Reference/isIndividualRepresentation"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//Reference/referenced"/>
+ </genClasses>
+ <genClasses ecoreClass="di2.ecore#//Property">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Property/key"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Property/value"/>
+ </genClasses>
+ <genClasses ecoreClass="di2.ecore#//GraphEdge">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//GraphEdge/anchor"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//GraphEdge/waypoints"/>
+ <genOperations ecoreOperation="di2.ecore#//GraphEdge/getAnchorSource"/>
+ <genOperations ecoreOperation="di2.ecore#//GraphEdge/getAnchorTarget"/>
+ <genOperations ecoreOperation="di2.ecore#//GraphEdge/setAnchorSource">
+ <genParameters ecoreParameter="di2.ecore#//GraphEdge/setAnchorSource/value"/>
+ </genOperations>
+ <genOperations ecoreOperation="di2.ecore#//GraphEdge/setAnchorTarget">
+ <genParameters ecoreParameter="di2.ecore#//GraphEdge/setAnchorTarget/value"/>
+ </genOperations>
+ <genOperations ecoreOperation="di2.ecore#//GraphEdge/initConnectors"/>
+ </genClasses>
+ <genClasses ecoreClass="di2.ecore#//GraphConnector">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//GraphConnector/position"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//GraphConnector/graphEdge"/>
+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference di2.ecore#//GraphConnector/graphElement"/>
+ </genClasses>
+ <genClasses ecoreClass="di2.ecore#//GraphNode">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//GraphNode/size"/>
+ </genClasses>
+ <genClasses ecoreClass="di2.ecore#//DiagramLink">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//DiagramLink/diagram"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramLink/zoom"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//DiagramLink/viewport"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//DiagramLink/graphElement"/>
+ </genClasses>
+ <genClasses ecoreClass="di2.ecore#//Diagram">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference di2.ecore#//Diagram/owner"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Diagram/name"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Diagram/zoom"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Diagram/viewport"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//Diagram/diagramLink"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Diagram/type"/>
+ </genClasses>
+ <genClasses ecoreClass="di2.ecore#//SemanticModelBridge">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//SemanticModelBridge/presentation"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//SemanticModelBridge/graphElement"/>
+ </genClasses>
+ <genClasses ecoreClass="di2.ecore#//SimpleSemanticModelElement">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//SimpleSemanticModelElement/typeinfo"/>
+ </genClasses>
+ <genClasses ecoreClass="di2.ecore#//Uml1SemanticModelBridge">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference di2.ecore#//Uml1SemanticModelBridge/element"/>
+ </genClasses>
+ <genClasses ecoreClass="di2.ecore#//CoreSemanticModelBridge"/>
+ <genClasses ecoreClass="di2.ecore#//LeafElement"/>
+ <genClasses ecoreClass="di2.ecore#//TextElement">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//TextElement/text"/>
+ </genClasses>
+ <genClasses ecoreClass="di2.ecore#//Image">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Image/uri"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Image/mimeType"/>
+ </genClasses>
+ <genClasses ecoreClass="di2.ecore#//GraphicPrimitive"/>
+ <genClasses ecoreClass="di2.ecore#//Polilyne">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Polilyne/waypoints"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Polilyne/closed"/>
+ </genClasses>
+ <genClasses ecoreClass="di2.ecore#//Ellipse">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Ellipse/center"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Ellipse/radiusX"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Ellipse/radiusY"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Ellipse/rotation"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Ellipse/startAngle"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute di2.ecore#//Ellipse/endAngle"/>
+ </genClasses>
+ </genPackages>
+</genmodel:GenModel>
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 @@
-->
<plugin>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri = "null"
- class = "org.eclipse.papyrus.conversion.di2.Di2Package"
- genModel = "model/di2.genmodel" />
- </extension>
-
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated di2 -->
+ <package
+ uri="http://www.papyrusuml.org"
+ class="org.eclipse.papyrus.conversion.di2.Di2Package"
+ genModel="model/di2.genmodel"/>
+ </extension>
</plugin>
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,

Back to the top