From 4a449bcfe661d5e2f1065d409a444561d84b6274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81rmin=20Zavada?= Date: Fri, 5 Aug 2022 12:03:37 +0200 Subject: [PATCH] #123 Extracted Composite metamodel from Statechart metamodel --- .../.classpath | 12 + .../.gitignore | 2 + .../hu.bme.mit.gamma.composite.model/.project | 34 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 9 + .../META-INF/MANIFEST.MF | 21 + .../build.properties | 11 + .../model/composite.ecore | 15 +- .../model/composite.genmodel | 185 + .../model/interface.ecore | 4 +- .../plugin.properties | 4 + .../plugin.xml | 25 + .../hu.bme.mit.gamma.composite.model/pom.xml | 15 + .../src-gen/.gitignore | 4 + .../META-INF/MANIFEST.MF | 1 + .../model/genmodel.ecore | 38 +- .../META-INF/MANIFEST.MF | 1 + .../model/property.ecore | 4 +- .../model/property.genmodel | 2 +- .../META-INF/MANIFEST.MF | 11 +- .../model/contract.ecore | 4 +- .../model/phase.ecore | 8 +- .../model/statechart.aird | 4227 +++++++++-------- .../model/statechart.ecore | 62 +- .../model/statechart.genmodel | 191 +- .../plugin.xml | 17 - .../META-INF/MANIFEST.MF | 5 +- .../model/trace.ecore | 10 +- .../model/trace.genmodel | 2 +- .../model/traceability.ecore | 16 +- .../model/traceability.genmodel | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../model/scenario.ecore | 8 +- .../model/scenario.genmodel | 2 +- .../META-INF/MANIFEST.MF | 1 + .../mit/gamma/setup/GenerateAllModels.mwe2 | 1 + .../cleaners/models/CleanCompositeModel.mwe2 | 30 + .../models/GenerateCompositeModel.mwe2 | 36 + 38 files changed, 2616 insertions(+), 2408 deletions(-) create mode 100644 plugins/core/hu.bme.mit.gamma.composite.model/.classpath create mode 100644 plugins/core/hu.bme.mit.gamma.composite.model/.gitignore create mode 100644 plugins/core/hu.bme.mit.gamma.composite.model/.project create mode 100644 plugins/core/hu.bme.mit.gamma.composite.model/.settings/org.eclipse.core.resources.prefs create mode 100644 plugins/core/hu.bme.mit.gamma.composite.model/.settings/org.eclipse.jdt.core.prefs create mode 100644 plugins/core/hu.bme.mit.gamma.composite.model/META-INF/MANIFEST.MF create mode 100644 plugins/core/hu.bme.mit.gamma.composite.model/build.properties rename plugins/core/{hu.bme.mit.gamma.statechart.model => hu.bme.mit.gamma.composite.model}/model/composite.ecore (91%) create mode 100644 plugins/core/hu.bme.mit.gamma.composite.model/model/composite.genmodel rename plugins/core/{hu.bme.mit.gamma.statechart.model => hu.bme.mit.gamma.composite.model}/model/interface.ecore (98%) create mode 100644 plugins/core/hu.bme.mit.gamma.composite.model/plugin.properties create mode 100644 plugins/core/hu.bme.mit.gamma.composite.model/plugin.xml create mode 100644 plugins/core/hu.bme.mit.gamma.composite.model/pom.xml create mode 100644 plugins/core/hu.bme.mit.gamma.composite.model/src-gen/.gitignore create mode 100644 plugins/setup/hu.bme.mit.gamma.setup/src/hu/bme/mit/gamma/setup/cleaners/models/CleanCompositeModel.mwe2 create mode 100644 plugins/setup/hu.bme.mit.gamma.setup/src/hu/bme/mit/gamma/setup/generators/models/GenerateCompositeModel.mwe2 diff --git a/plugins/core/hu.bme.mit.gamma.composite.model/.classpath b/plugins/core/hu.bme.mit.gamma.composite.model/.classpath new file mode 100644 index 000000000..bbfe5b0e6 --- /dev/null +++ b/plugins/core/hu.bme.mit.gamma.composite.model/.classpath @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/plugins/core/hu.bme.mit.gamma.composite.model/.gitignore b/plugins/core/hu.bme.mit.gamma.composite.model/.gitignore new file mode 100644 index 000000000..81325b3d8 --- /dev/null +++ b/plugins/core/hu.bme.mit.gamma.composite.model/.gitignore @@ -0,0 +1,2 @@ +/bin/ + diff --git a/plugins/core/hu.bme.mit.gamma.composite.model/.project b/plugins/core/hu.bme.mit.gamma.composite.model/.project new file mode 100644 index 000000000..6e77dc258 --- /dev/null +++ b/plugins/core/hu.bme.mit.gamma.composite.model/.project @@ -0,0 +1,34 @@ + + + hu.bme.mit.gamma.composite.model + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + org.eclipse.xtext.ui.shared.xtextNature + + diff --git a/plugins/core/hu.bme.mit.gamma.composite.model/.settings/org.eclipse.core.resources.prefs b/plugins/core/hu.bme.mit.gamma.composite.model/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/plugins/core/hu.bme.mit.gamma.composite.model/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/plugins/core/hu.bme.mit.gamma.composite.model/.settings/org.eclipse.jdt.core.prefs b/plugins/core/hu.bme.mit.gamma.composite.model/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..c9545f06a --- /dev/null +++ b/plugins/core/hu.bme.mit.gamma.composite.model/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/plugins/core/hu.bme.mit.gamma.composite.model/META-INF/MANIFEST.MF b/plugins/core/hu.bme.mit.gamma.composite.model/META-INF/MANIFEST.MF new file mode 100644 index 000000000..76baf5d10 --- /dev/null +++ b/plugins/core/hu.bme.mit.gamma.composite.model/META-INF/MANIFEST.MF @@ -0,0 +1,21 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Gamma Composite Metamodel +Bundle-SymbolicName: hu.bme.mit.gamma.composite.model;singleton:=true +Bundle-Version: 2.7.0.qualifier +Bundle-ClassPath: . +Bundle-Vendor: BME-FTSRG +Bundle-Localization: plugin +Require-Bundle: org.eclipse.core.runtime, + org.eclipse.emf.ecore;visibility:=reexport, + hu.bme.mit.gamma.action.model;visibility:=reexport, + hu.bme.mit.gamma.expression.model;visibility:=reexport +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Export-Package: hu.bme.mit.gamma.composite.composite, + hu.bme.mit.gamma.composite.composite.impl, + hu.bme.mit.gamma.composite.composite.util, + hu.bme.mit.gamma.composite.interface_, + hu.bme.mit.gamma.composite.interface_.impl, + hu.bme.mit.gamma.composite.interface_.util +Automatic-Module-Name: hu.bme.mit.gamma.composite.model diff --git a/plugins/core/hu.bme.mit.gamma.composite.model/build.properties b/plugins/core/hu.bme.mit.gamma.composite.model/build.properties new file mode 100644 index 000000000..7f0c2ffc6 --- /dev/null +++ b/plugins/core/hu.bme.mit.gamma.composite.model/build.properties @@ -0,0 +1,11 @@ +# + +bin.includes = .,\ + model/,\ + META-INF/,\ + plugin.xml,\ + plugin.properties +jars.compile.order = . +source.. = src-gen/,\ + src/ +output.. = bin/ diff --git a/plugins/core/hu.bme.mit.gamma.statechart.model/model/composite.ecore b/plugins/core/hu.bme.mit.gamma.composite.model/model/composite.ecore similarity index 91% rename from plugins/core/hu.bme.mit.gamma.statechart.model/model/composite.ecore rename to plugins/core/hu.bme.mit.gamma.composite.model/model/composite.ecore index 3470ed7f3..bf3907005 100644 --- a/plugins/core/hu.bme.mit.gamma.statechart.model/model/composite.ecore +++ b/plugins/core/hu.bme.mit.gamma.composite.model/model/composite.ecore @@ -1,7 +1,7 @@ + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="composite" nsURI="http://www.mit.bme.hu/gamma/composite/Model/Composite" + nsPrefix="hu.bme.mit.gamma.composite.composite"> @@ -113,12 +113,6 @@ - - - - - - - diff --git a/plugins/core/hu.bme.mit.gamma.composite.model/model/composite.genmodel b/plugins/core/hu.bme.mit.gamma.composite.model/model/composite.genmodel new file mode 100644 index 000000000..174fbf043 --- /dev/null +++ b/plugins/core/hu.bme.mit.gamma.composite.model/model/composite.genmodel @@ -0,0 +1,185 @@ + + + composite.ecore + interface.ecore + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/core/hu.bme.mit.gamma.statechart.model/model/interface.ecore b/plugins/core/hu.bme.mit.gamma.composite.model/model/interface.ecore similarity index 98% rename from plugins/core/hu.bme.mit.gamma.statechart.model/model/interface.ecore rename to plugins/core/hu.bme.mit.gamma.composite.model/model/interface.ecore index 240544af3..3272ff5a8 100644 --- a/plugins/core/hu.bme.mit.gamma.statechart.model/model/interface.ecore +++ b/plugins/core/hu.bme.mit.gamma.composite.model/model/interface.ecore @@ -1,7 +1,7 @@ + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="interface" nsURI="http://www.mit.bme.hu/gamma/composite/Model/Interface" + nsPrefix="hu.bme.mit.gamma.composite.interface"> diff --git a/plugins/core/hu.bme.mit.gamma.composite.model/plugin.properties b/plugins/core/hu.bme.mit.gamma.composite.model/plugin.properties new file mode 100644 index 000000000..1bdc9dfd4 --- /dev/null +++ b/plugins/core/hu.bme.mit.gamma.composite.model/plugin.properties @@ -0,0 +1,4 @@ +# + +pluginName = Gamma Composite Model +providerName = www.example.org diff --git a/plugins/core/hu.bme.mit.gamma.composite.model/plugin.xml b/plugins/core/hu.bme.mit.gamma.composite.model/plugin.xml new file mode 100644 index 000000000..42aed800e --- /dev/null +++ b/plugins/core/hu.bme.mit.gamma.composite.model/plugin.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + diff --git a/plugins/core/hu.bme.mit.gamma.composite.model/pom.xml b/plugins/core/hu.bme.mit.gamma.composite.model/pom.xml new file mode 100644 index 000000000..b3acf4036 --- /dev/null +++ b/plugins/core/hu.bme.mit.gamma.composite.model/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + + hu.bme.mit + hu.bme.mit.gamma + 0.0.1-SNAPSHOT + ../../ + + hu.bme.mit + hu.bme.mit.gamma.composite.model + 2.3.1-SNAPSHOT + eclipse-plugin + diff --git a/plugins/core/hu.bme.mit.gamma.composite.model/src-gen/.gitignore b/plugins/core/hu.bme.mit.gamma.composite.model/src-gen/.gitignore new file mode 100644 index 000000000..86d0cb272 --- /dev/null +++ b/plugins/core/hu.bme.mit.gamma.composite.model/src-gen/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore \ No newline at end of file diff --git a/plugins/core/hu.bme.mit.gamma.genmodel.model/META-INF/MANIFEST.MF b/plugins/core/hu.bme.mit.gamma.genmodel.model/META-INF/MANIFEST.MF index da13ebaec..af121d770 100644 --- a/plugins/core/hu.bme.mit.gamma.genmodel.model/META-INF/MANIFEST.MF +++ b/plugins/core/hu.bme.mit.gamma.genmodel.model/META-INF/MANIFEST.MF @@ -15,6 +15,7 @@ Export-Package: hu.bme.mit.gamma.genmodel.derivedfeatures, Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, hu.bme.mit.gamma.expression.model;visibility:=reexport, + hu.bme.mit.gamma.composite.model;visibility:=reexport, hu.bme.mit.gamma.statechart.model;visibility:=reexport, hu.bme.mit.gamma.property.model;visibility:=reexport, hu.bme.mit.gamma.scenario.model;visibility:=reexport, diff --git a/plugins/core/hu.bme.mit.gamma.genmodel.model/model/genmodel.ecore b/plugins/core/hu.bme.mit.gamma.genmodel.model/model/genmodel.ecore index db492f4fd..77bf90d1b 100644 --- a/plugins/core/hu.bme.mit.gamma.genmodel.model/model/genmodel.ecore +++ b/plugins/core/hu.bme.mit.gamma.genmodel.model/model/genmodel.ecore @@ -5,7 +5,7 @@ + eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/interface.ecore#//Package"/> + eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/interface.ecore#//Component"/> + eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/interface.ecore#//Interface"/> @@ -75,7 +75,7 @@ + eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/interface.ecore#//Event"/> @@ -104,10 +104,10 @@ @@ -121,16 +121,16 @@ @@ -144,15 +144,15 @@ eType="#//AsynchronousInstanceConstraint" containment="true"/> - - - + eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/interface.ecore#//Component"/> @@ -226,18 +226,18 @@ diff --git a/plugins/core/hu.bme.mit.gamma.property.model/META-INF/MANIFEST.MF b/plugins/core/hu.bme.mit.gamma.property.model/META-INF/MANIFEST.MF index 4bf8b6b5c..7fb780159 100644 --- a/plugins/core/hu.bme.mit.gamma.property.model/META-INF/MANIFEST.MF +++ b/plugins/core/hu.bme.mit.gamma.property.model/META-INF/MANIFEST.MF @@ -16,6 +16,7 @@ Export-Package: hu.bme.mit.gamma.property.derivedfeatures, Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport, hu.bme.mit.gamma.action.model;visibility:=reexport, hu.bme.mit.gamma.expression.model;visibility:=reexport, + hu.bme.mit.gamma.composite.model;visibility:=reexport, hu.bme.mit.gamma.statechart.model;visibility:=reexport, org.eclipse.core.runtime Bundle-ActivationPolicy: lazy diff --git a/plugins/core/hu.bme.mit.gamma.property.model/model/property.ecore b/plugins/core/hu.bme.mit.gamma.property.model/model/property.ecore index 392d1d7cc..cfe78f8ff 100644 --- a/plugins/core/hu.bme.mit.gamma.property.model/model/property.ecore +++ b/plugins/core/hu.bme.mit.gamma.property.model/model/property.ecore @@ -3,9 +3,9 @@ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" nsURI="http://www.mit.bme.hu/gamma/property/Model" nsPrefix="hu.bme.mit.gamma.property"> + eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/interface.ecore#//Package"/> + eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/interface.ecore#//Component"/> diff --git a/plugins/core/hu.bme.mit.gamma.property.model/model/property.genmodel b/plugins/core/hu.bme.mit.gamma.property.model/model/property.genmodel index 3115a3d6f..13195b639 100644 --- a/plugins/core/hu.bme.mit.gamma.property.model/model/property.genmodel +++ b/plugins/core/hu.bme.mit.gamma.property.model/model/property.genmodel @@ -5,7 +5,7 @@ editDirectory="/hu.bme.mit.gamma.property.model.edit/src-gen" editorDirectory="/hu.bme.mit.gamma.property.model.editor/src-gen" modelPluginID="hu.bme.mit.gamma.property.model" modelName="Property" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" - copyrightFields="false" usedGenPackages="../../hu.bme.mit.gamma.expression.model/model/expression.genmodel#//model ../../hu.bme.mit.gamma.statechart.model/model/statechart.genmodel#//interface" + copyrightFields="false" usedGenPackages="../../hu.bme.mit.gamma.composite.model/model/composite.genmodel#//interface ../../hu.bme.mit.gamma.expression.model/model/expression.genmodel#//model" operationReflection="true" importOrganizing="true"> property.ecore diff --git a/plugins/core/hu.bme.mit.gamma.statechart.model/META-INF/MANIFEST.MF b/plugins/core/hu.bme.mit.gamma.statechart.model/META-INF/MANIFEST.MF index 647fd6a67..e92d0839c 100644 --- a/plugins/core/hu.bme.mit.gamma.statechart.model/META-INF/MANIFEST.MF +++ b/plugins/core/hu.bme.mit.gamma.statechart.model/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Gamma Statechart/Composite Language Metamodel +Bundle-Name: Gamma Statechart Language Metamodel Bundle-SymbolicName: hu.bme.mit.gamma.statechart.model;singleton:=true Bundle-Version: 2.7.0.qualifier Bundle-ClassPath: . @@ -9,18 +9,13 @@ Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, hu.bme.mit.gamma.action.model;visibility:=reexport, + hu.bme.mit.gamma.composite.model;visibility:=reexport, hu.bme.mit.gamma.expression.model;visibility:=reexport Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: hu.bme.mit.gamma.statechart.composite, - hu.bme.mit.gamma.statechart.composite.impl, - hu.bme.mit.gamma.statechart.composite.util, - hu.bme.mit.gamma.statechart.contract, +Export-Package: hu.bme.mit.gamma.statechart.contract, hu.bme.mit.gamma.statechart.contract.impl, hu.bme.mit.gamma.statechart.contract.util, - hu.bme.mit.gamma.statechart.interface_, - hu.bme.mit.gamma.statechart.interface_.impl, - hu.bme.mit.gamma.statechart.interface_.util, hu.bme.mit.gamma.statechart.phase, hu.bme.mit.gamma.statechart.phase.impl, hu.bme.mit.gamma.statechart.phase.util, diff --git a/plugins/core/hu.bme.mit.gamma.statechart.model/model/contract.ecore b/plugins/core/hu.bme.mit.gamma.statechart.model/model/contract.ecore index 2d3f6c96a..32ad9c6bd 100644 --- a/plugins/core/hu.bme.mit.gamma.statechart.model/model/contract.ecore +++ b/plugins/core/hu.bme.mit.gamma.statechart.model/model/contract.ecore @@ -10,14 +10,14 @@
+ eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/interface.ecore#//Component"/>
+ eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/interface.ecore#//Component"/> diff --git a/plugins/core/hu.bme.mit.gamma.statechart.model/model/phase.ecore b/plugins/core/hu.bme.mit.gamma.statechart.model/model/phase.ecore index 61fb637f2..e7724a51b 100644 --- a/plugins/core/hu.bme.mit.gamma.statechart.model/model/phase.ecore +++ b/plugins/core/hu.bme.mit.gamma.statechart.model/model/phase.ecore @@ -8,9 +8,11 @@ + eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/composite.ecore#//ComponentInstance" + containment="true"/> + eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/composite.ecore#//PortBinding" + containment="true"/> + eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/composite.ecore#//ComponentInstance"/> diff --git a/plugins/core/hu.bme.mit.gamma.statechart.model/model/statechart.aird b/plugins/core/hu.bme.mit.gamma.statechart.model/model/statechart.aird index 65255b1fb..63cc9dd03 100644 --- a/plugins/core/hu.bme.mit.gamma.statechart.model/model/statechart.aird +++ b/plugins/core/hu.bme.mit.gamma.statechart.model/model/statechart.aird @@ -1,6 +1,6 @@ - - + + statechart.ecore http://www.eclipse.org/emf/2002/Ecore platform:/resource/hu.bme.mit.gamma.constraint.model/model/constraint.ecore @@ -12,62 +12,67 @@ platform:/resource/hu.bme.mit.gamma.action.model/model/action.genmodel platform:/resource/hu.bme.mit.gamma.expression.model/model/expression.ecore platform:/resource/hu.bme.mit.gamma.expression.model/model/expression.genmodel - + platform:/resource/hu.bme.mit.gamma.composite.model/model/composite.ecore + platform:/resource/hu.bme.mit.gamma.composite.model/model/interface.ecore + contract.ecore + phase.ecore + platform:/resource/hu.bme.mit.gamma.composite.model/model/composite.genmodel + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + bold @@ -111,7 +116,7 @@ - + @@ -531,6 +536,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -563,38 +632,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -627,21 +664,21 @@ - - - + + + - - + + - - + + - - - - - + + + + + @@ -659,22 +696,6 @@ - - - - - - - - - - - - - - - - @@ -691,6 +712,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -707,6 +792,22 @@ + + + + + + + + + + + + + + + + @@ -739,69 +840,53 @@ - - - + + + - - + + - - + + - - - - - + + + + + - - - + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + - - - + + + - - + + - - + + - - - - - + + + + + @@ -819,53 +904,37 @@ - - - - - - - - - - - - - - - - - - - + + + - - + + - - + + - - - - - + + + + + - - - + + + - - + + - - + + - - - - - + + + + + @@ -883,53 +952,53 @@ - - - + + + - - + + - - + + - - - - - + + + + + - - - + + + - - + + - - + + - - - - - + + + + + - - - + + + - - + + - - + + - - - - - + + + + + @@ -979,70 +1048,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1059,1168 +1064,1168 @@ - - - + + + - - + + - - + + - - - - - + + + + + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + italic - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + labelSize - + labelSize - + - + - + italic - + - + - + - + italic - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor foregroundColor - + - + - + - - + + labelSize bold - + labelSize - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + labelSize bold - + labelSize - + - - + + labelSize bold - + labelSize - + - - + + labelSize bold - + labelSize - + - - + + labelSize bold - + labelSize - + - - + + labelSize bold - + labelSize - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + labelSize - + labelSize - + - - + + labelSize bold - + labelSize - + - - + + labelSize bold - + labelSize - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor foregroundColor - + - + italic - + - + italic - + - + italic - + - + - + - + - + - + - + - + - + - + bold - + - + bold - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + italic - + - + italic - + - + - + italic - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + - + bold - + - - + + bold - + - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + - + bold - + - - + + bold - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + - + - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + italic - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + italic - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + foregroundColor - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + italic - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + italic - + - + italic - + - + - + italic - + - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + bold - + - + - - + + bold - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + italic - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + italic - + - + italic - + - + - + italic - + - + - + - + italic - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + italic - + - + italic - + - + italic - + - + italic - + - + italic - + - + - + - + - + labelSize - + labelSize - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + - - + + labelSize - + labelSize - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor foregroundColor - + - + - + - - + + labelSize bold - + labelSize - + - + - + labelSize - + labelSize - + - + - + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + bold - + - + - - - + + + @@ -2238,7 +2243,7 @@ - + @@ -2414,6 +2419,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2430,6 +2467,22 @@ + + + + + + + + + + + + + + + + @@ -2462,21 +2515,21 @@ - - - + + + - - + + - - + + - - - - - + + + + + @@ -2574,496 +2627,448 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor foregroundColor - + - + italic - + - + italic - + - + italic - + - + - + - + - + - + bold - + - + bold - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + italic - + - + - + - + - + - + - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - - + + labelSize - + labelSize - + - + - + labelSize - + labelSize - + - + - + labelSize - + labelSize - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - - + + labelSize - + labelSize - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - - + + + @@ -3085,7 +3090,7 @@ - + @@ -3169,6 +3174,22 @@ + + + + + + + + + + + + + + + + @@ -3201,209 +3222,193 @@ - - - - - - - - - - - - - - - - - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor - + - + - + - + - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor - + - + - + - + - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor foregroundColor - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor - + - + - + - + - + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize bold - + labelSize - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + - + - + - - - + + + @@ -3438,7 +3443,7 @@ - + @@ -3706,22 +3711,6 @@ - - - - - - - - - - - - - - - - @@ -3758,17 +3747,48 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - + + + + + @@ -3802,6 +3822,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3818,54 +3868,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3914,6 +3916,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3946,22 +4012,6 @@ - - - - - - - - - - - - - - - - @@ -3978,51 +4028,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4057,651 +4062,651 @@ - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + - - + + labelSize bold - + labelSize - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + - + italic - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + - - + + labelSize bold - + labelSize - + - - + + labelSize bold - + labelSize - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + italic - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + - + - + - + - + - + - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - - + + bold - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + bold - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + bold - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - - + + bold - + - + - - + + bold - + - + - - + + bold - + - + - - + + bold - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + bold - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + italic - + - + - - - + + + @@ -4724,7 +4729,7 @@ - + @@ -4812,121 +4817,121 @@ - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor foregroundColor - + - + - + - - + + labelSize bold - + labelSize - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor foregroundColor - + - + - + - - + + labelSize bold - + labelSize - + - + - + labelSize - + labelSize - + - - - + + + bold @@ -4964,7 +4969,7 @@ - + @@ -5062,14 +5067,46 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + @@ -5103,22 +5140,6 @@ - - - - - - - - - - - - - - - - @@ -5167,21 +5188,21 @@ - - - + + + - - + + - - + + - - - - - + + + + + @@ -5199,22 +5220,6 @@ - - - - - - - - - - - - - - - - @@ -5233,45 +5238,45 @@ - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + foregroundColor backgroundColor italic - + - + italic - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor foregroundColor italic @@ -5279,261 +5284,261 @@ - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor - + - - + + labelSize - + labelSize - + - + - + italic - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor foregroundColor italic - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor - + - - + + labelSize bold - + labelSize - + - - + + labelSize bold - + labelSize - + - - + + labelSize bold - + labelSize - + - - + + labelSize bold - + labelSize - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor - + - - + + labelSize - + labelSize - + - - + + labelSize bold - + labelSize - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + foregroundColor backgroundColor - + - - + + bold - + - - + + labelSize bold - + labelSize - + - - + + labelSize bold - + labelSize - + - - - + + + bold @@ -5561,7 +5566,7 @@ - + @@ -5718,6 +5723,22 @@ + + + + + + + + + + + + + + + + @@ -5734,53 +5755,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + - - + + - - - - - + + + + + @@ -5798,6 +5787,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5814,21 +5835,21 @@ - - - + + + - - + + - - + + - - - - - + + + + + @@ -5862,22 +5883,6 @@ - - - - - - - - - - - - - - - - @@ -5896,418 +5901,418 @@ - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + - + - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + italic - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor foregroundColor - + - + italic - + - + - + - + - + - + bold - + - + - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + italic - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + italic - + - - + + labelSize - + labelSize - + - - + + bold - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + italic - + - + - + italic - + - + - + - + italic - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + - + - + - - + + labelSize - + labelSize - + - + - + labelSize - + labelSize - + - - - + + + bold @@ -6365,7 +6370,7 @@ - + @@ -6505,17 +6510,65 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - + + + + + @@ -6549,38 +6602,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6629,359 +6650,343 @@ - - - - - - - - - - - - - - - - - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + labelSize - + labelSize - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + italic - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + - + - + - + bold - + - - + + bold - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + - + bold - + - - + + bold - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + - + - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + italic - + - + - + italic - + - + - + - + italic - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + - - + + labelSize - + labelSize - - - + + + labelSize bold - + labelSize - + - - - + + + - + - - - + + + bold @@ -7009,7 +7014,7 @@ - + @@ -7167,6 +7172,22 @@ + + + + + + + + + + + + + + + + @@ -7183,21 +7204,21 @@ - - - + + + - - + + - - + + - - - - - + + + + + @@ -7215,22 +7236,6 @@ - - - - - - - - - - - - - - - - @@ -7247,21 +7252,21 @@ - - - + + + - - + + - - + + - - - - - + + + + + @@ -7281,386 +7286,386 @@ - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + italic - + - + italic - + - + - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + italic - + - + italic - + - + bold - + - + bold - + - + - + - + bold - + - + - + italic - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + italic - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + foregroundColor - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + italic - + - + italic - + - + - + italic - + - + - - + + labelSize - + labelSize - + - - + + bold - + - + - + - + italic - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + italic - + - + italic - + - + italic - + - + italic - + - + italic - + - + - + - + - + - + - + labelSize - + labelSize - + - - - + + + bold @@ -7704,7 +7709,7 @@ - + @@ -7959,117 +7964,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + - - + + - - - - - + + + + + - - - + + + - - + + - - + + - - - - - + + + + + @@ -8087,53 +8012,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + - - + + - - - - - + + + + + @@ -8151,22 +8044,6 @@ - - - - - - - - - - - - - - - - @@ -8183,6 +8060,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8199,6 +8108,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8215,6 +8156,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8231,6 +8204,22 @@ + + + + + + + + + + + + + + + + @@ -8247,6 +8236,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8279,22 +8300,6 @@ - - - - - - - - - - - - - - - - @@ -8329,761 +8334,761 @@ - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor foregroundColor - + - - + + italic - + - - + + italic - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + bold - + - - + + bold - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor - + - - + + italic - + - - + + bold - + - - + + bold - + - - + + - + - + - + italic - + - + - + - + italic - + - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor foregroundColor italic - + - - + + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + foregroundColor backgroundColor italic - + - - + + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor - + - - + + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + foregroundColor backgroundColor - + - - + + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor foregroundColor italic - + - - + + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor - + - - + + italic - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + bold - + - + - - + + bold - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor - + - - + + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + backgroundColor - + - - + + italic - + - + - + italic - + - + - + - + italic - + - + - + - + labelSize - + labelSize - + - - + + bold - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - - + + italic - + - - + + - + - - + + - + - - + + labelSize - + labelSize - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + - + - - + + labelSize bold - + labelSize - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + - + - - + + labelSize bold - + labelSize - + - - + + - + labelSize - + labelSize - + diff --git a/plugins/core/hu.bme.mit.gamma.statechart.model/model/statechart.ecore b/plugins/core/hu.bme.mit.gamma.statechart.model/model/statechart.ecore index 870594151..668816d40 100644 --- a/plugins/core/hu.bme.mit.gamma.statechart.model/model/statechart.ecore +++ b/plugins/core/hu.bme.mit.gamma.statechart.model/model/statechart.ecore @@ -3,7 +3,7 @@ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="statechart" nsURI="http://www.mit.bme.hu/gamma/statechart/Model/Statechart" nsPrefix="hu.bme.mit.gamma.statechart"> + eSuperTypes="../../hu.bme.mit.gamma.composite.model/model/interface.ecore#//Component #//CompositeElement"> @@ -20,8 +20,19 @@ - - + + + + + + + + + @@ -42,7 +53,7 @@ - + @@ -72,10 +83,10 @@ - + - @@ -86,43 +97,45 @@ eType="#//TransitionAnnotation" containment="true"/> - - + + - - - + + - - - + + + - - + + - + + eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/interface.ecore#//Trigger" + containment="true"/> + eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/interface.ecore#//Trigger" + containment="true"/> - + @@ -132,7 +145,8 @@ + eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/interface.ecore#//Trigger" + containment="true"/> @@ -142,13 +156,13 @@ - + - + + eSuperTypes="../../hu.bme.mit.gamma.composite.model/model/interface.ecore#//ComponentAnnotation"/> diff --git a/plugins/core/hu.bme.mit.gamma.statechart.model/model/statechart.genmodel b/plugins/core/hu.bme.mit.gamma.statechart.model/model/statechart.genmodel index d163c2a0f..98b6f8e20 100644 --- a/plugins/core/hu.bme.mit.gamma.statechart.model/model/statechart.genmodel +++ b/plugins/core/hu.bme.mit.gamma.statechart.model/model/statechart.genmodel @@ -5,115 +5,11 @@ modelName="Statechart" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false" editPluginID="hu.bme.mit.gamma.statechart.model.edit" editorPluginID="hu.bme.mit.gamma.statechart.model.editor" - usedGenPackages="../../hu.bme.mit.gamma.action.model/model/action.genmodel#//model ../../hu.bme.mit.gamma.expression.model/model/expression.genmodel#//model" + usedGenPackages="../../hu.bme.mit.gamma.action.model/model/action.genmodel#//model ../../hu.bme.mit.gamma.composite.model/model/composite.genmodel#//composite ../../hu.bme.mit.gamma.composite.model/model/composite.genmodel#//interface ../../hu.bme.mit.gamma.expression.model/model/expression.genmodel#//model" operationReflection="true" importOrganizing="true"> - composite.ecore contract.ecore - interface.ecore phase.ecore statechart.ecore - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -150,84 +46,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -289,6 +107,13 @@ + + + + + + + diff --git a/plugins/core/hu.bme.mit.gamma.statechart.model/plugin.xml b/plugins/core/hu.bme.mit.gamma.statechart.model/plugin.xml index a4d6b82c0..fd4bdc883 100644 --- a/plugins/core/hu.bme.mit.gamma.statechart.model/plugin.xml +++ b/plugins/core/hu.bme.mit.gamma.statechart.model/plugin.xml @@ -6,15 +6,6 @@ - - - - - - - - - - - - + eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/interface.ecore#//Component"/> + + eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/composite.ecore#//AsynchronousComponentInstance"/> - + diff --git a/plugins/core/hu.bme.mit.gamma.trace.model/model/trace.genmodel b/plugins/core/hu.bme.mit.gamma.trace.model/model/trace.genmodel index 50f6d7ddc..de7d97efc 100644 --- a/plugins/core/hu.bme.mit.gamma.trace.model/model/trace.genmodel +++ b/plugins/core/hu.bme.mit.gamma.trace.model/model/trace.genmodel @@ -5,7 +5,7 @@ modelName="Trace" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false" editPluginID="hu.bme.mit.gamma.trace.model.edit" editorPluginID="hu.bme.mit.gamma.trace.model.editor" - usedGenPackages="../../hu.bme.mit.gamma.action.model/model/action.genmodel#//model ../../hu.bme.mit.gamma.expression.model/model/expression.genmodel#//model ../../hu.bme.mit.gamma.statechart.model/model/statechart.genmodel#//composite ../../hu.bme.mit.gamma.statechart.model/model/statechart.genmodel#//interface ../../hu.bme.mit.gamma.statechart.model/model/statechart.genmodel#//statechart" + usedGenPackages="../../hu.bme.mit.gamma.action.model/model/action.genmodel#//model ../../hu.bme.mit.gamma.expression.model/model/expression.genmodel#//model ../../hu.bme.mit.gamma.statechart.model/model/statechart.genmodel#//statechart ../../hu.bme.mit.gamma.composite.model/model/composite.genmodel#//interface ../../hu.bme.mit.gamma.composite.model/model/composite.genmodel#//composite" operationReflection="true" importOrganizing="true"> trace.ecore - + @@ -18,17 +18,17 @@ - + - + - + @@ -38,16 +38,16 @@ - - + + - + - + diff --git a/plugins/core/hu.bme.mit.gamma.uppaal.transformation.traceability/model/traceability.genmodel b/plugins/core/hu.bme.mit.gamma.uppaal.transformation.traceability/model/traceability.genmodel index ca067533c..ad7cb5925 100644 --- a/plugins/core/hu.bme.mit.gamma.uppaal.transformation.traceability/model/traceability.genmodel +++ b/plugins/core/hu.bme.mit.gamma.uppaal.transformation.traceability/model/traceability.genmodel @@ -5,7 +5,7 @@ editorDirectory="/hu.bme.mit.gamma.uppaal.transformation.traceability.editor/src-gen" modelPluginID="hu.bme.mit.gamma.uppaal.transformation.traceability" modelName="Traceability" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore" - complianceLevel="8.0" copyrightFields="false" usedGenPackages="../../hu.bme.mit.gamma.expression.model/model/expression.genmodel#//model ../../hu.bme.mit.gamma.statechart.model/model/statechart.genmodel#//composite ../../hu.bme.mit.gamma.statechart.model/model/statechart.genmodel#//interface ../../de.uni_paderborn.uppaal/model/uppaal.genmodel#//uppaal" + complianceLevel="8.0" copyrightFields="false" usedGenPackages="../../hu.bme.mit.gamma.composite.model/model/composite.genmodel#//composite ../../hu.bme.mit.gamma.composite.model/model/composite.genmodel#//interface ../../hu.bme.mit.gamma.expression.model/model/expression.genmodel#//model ../../de.uni_paderborn.uppaal/model/uppaal.genmodel#//uppaal" operationReflection="true" importOrganizing="true"> traceability.ecore + eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/interface.ecore#//Component"/> + eType="ecore:EClass ../../hu.bme.mit.gamma.composite.model/model/interface.ecore#//Package"/> - - + + diff --git a/plugins/scenario/hu.bme.mit.gamma.scenario.model/model/scenario.genmodel b/plugins/scenario/hu.bme.mit.gamma.scenario.model/model/scenario.genmodel index 78f3b65b6..17ddb7b9d 100644 --- a/plugins/scenario/hu.bme.mit.gamma.scenario.model/model/scenario.genmodel +++ b/plugins/scenario/hu.bme.mit.gamma.scenario.model/model/scenario.genmodel @@ -3,7 +3,7 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/hu.bme.mit.gamma.scenario.model/src-gen" modelPluginID="hu.bme.mit.gamma.scenario.model" modelName="Scenario" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false" - language="" usedGenPackages="../../hu.bme.mit.gamma.expression.model/model/expression.genmodel#//model ../../hu.bme.mit.gamma.statechart.model/model/statechart.genmodel#//interface ../../hu.bme.mit.gamma.action.model/model/action.genmodel#//model" + language="" usedGenPackages="../../hu.bme.mit.gamma.action.model/model/action.genmodel#//model ../../hu.bme.mit.gamma.composite.model/model/composite.genmodel#//interface ../../hu.bme.mit.gamma.expression.model/model/expression.genmodel#//model" operationReflection="true" importOrganizing="true"> scenario.ecore