Skip to content
Snippets Groups Projects
Commit 92cb9388 authored by Alberto Debiasi's avatar Alberto Debiasi
Browse files

fixed bugs 

- added missing enumValues in property editor
- removed wrong connection in import


Change-Id: I3d95d2d9c31a946867a296b30fc53a3e5fbc23fd
parent 3ffa0b3d
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 365 additions and 202 deletions
plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generate.xml
+ 36
− 4
View file @ 92cb9388
<?xml version="1.0" encoding="UTF-8"?>
<project default="generate" name="org.polarsys.chess.contracts.transformations">
<property name="ECLIPSE_HOME" value="../../../../../../Tools/eclipse"/>
<property name="ECLIPSE_WORKSPACE" value="../../../../../../../../home/cristofo/workspace"/>
<property name="ECLIPSE_HOME" value="../../../../../.."/>
<property name="ECLIPSE_WORKSPACE" value="../../../../../../workspace"/>
<!-- The classpath with only the dependencies used by the project -->
<path id="org.polarsys.chess.contracts.transformations.libraryclasspath">
......@@ -9,14 +9,17 @@
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar"/>
<pathelement location="${ECLIPSE_WORKSPACE}//.metadata/.plugins/org.eclipse.pde.core/.bundle_pool/plugins/org.eclipse.equinox.transforms.hook_1.1.0.v20131021-1933.jar"/>
<pathelement location="${ECLIPSE_WORKSPACE}//.metadata/.plugins/org.eclipse.pde.core/.bundle_pool/plugins/org.eclipse.equinox.weaving.hook_1.1.200.v20150730-1648.jar"/>
<pathelement location="${ECLIPSE_WORKSPACE}//.metadata/.plugins/org.eclipse.pde.core/.bundle_pool/plugins/org.eclipse.equinox.region_1.3.2.v20170118-1930.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.wst.jsdt.nashorn.extension_1.0.2.v201610280128.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml_5.2.3.v20170227-0935.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar"/>
......@@ -36,7 +39,7 @@
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt_3.105.3.v20170228-0512.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt.win32.win32.x86_64_3.105.3.v20170228-0512.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface_3.12.2.v20170113-2113.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.commands_3.8.1.v20161221-1651.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench_3.108.3.v20170216-1539.jar"/>
......@@ -89,6 +92,35 @@
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.custom.metamodel_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.efacet.metamodel_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.util.emf.catalog_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.uml.tools_2.0.2.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.emf_2.1.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.type.core_1.9.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.custom.core_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.efacet.core_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.efacet.catalog_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.util.emf.core_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.efacet_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.edit.ui_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.edit_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.ui.emf_1.2.1.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.databinding_1.3.0.v20160526-0356.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding.property_1.6.0.v20160427-0852.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.custom.ui_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.query.java.core_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.util.ui_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.sirius_4.0.0.201605311157.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.sirius.ui_4.0.0.201605311157.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.edit_2.9.0.v20160526-0356.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.ui_1.8.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gef_3.11.0.201606061308.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.ui_1.7.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.action_1.7.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services.action_1.7.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services_1.9.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.gef.ui_1.7.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.draw2d.ui_1.9.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.notation_1.8.0.201606071631.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.core_1.7.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.emf.util_3.6.0.v20160606-1156.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.gmfdiag.commands_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.views.modelexplorer_2.1.0.201703080851.jar"/>
......
plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generateErrorModel.xml
+ 36
− 4
View file @ 92cb9388
<?xml version="1.0" encoding="UTF-8"?>
<project default="generateErrorModel" name="org.polarsys.chess.contracts.transformations">
<property name="ECLIPSE_HOME" value="../../../../../../Tools/eclipse"/>
<property name="ECLIPSE_WORKSPACE" value="../../../../../../../../home/cristofo/workspace"/>
<property name="ECLIPSE_HOME" value="../../../../../.."/>
<property name="ECLIPSE_WORKSPACE" value="../../../../../../workspace"/>
<!-- The classpath with only the dependencies used by the project -->
<path id="org.polarsys.chess.contracts.transformations.libraryclasspath">
......@@ -9,14 +9,17 @@
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar"/>
<pathelement location="${ECLIPSE_WORKSPACE}//.metadata/.plugins/org.eclipse.pde.core/.bundle_pool/plugins/org.eclipse.equinox.transforms.hook_1.1.0.v20131021-1933.jar"/>
<pathelement location="${ECLIPSE_WORKSPACE}//.metadata/.plugins/org.eclipse.pde.core/.bundle_pool/plugins/org.eclipse.equinox.weaving.hook_1.1.200.v20150730-1648.jar"/>
<pathelement location="${ECLIPSE_WORKSPACE}//.metadata/.plugins/org.eclipse.pde.core/.bundle_pool/plugins/org.eclipse.equinox.region_1.3.2.v20170118-1930.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.wst.jsdt.nashorn.extension_1.0.2.v201610280128.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml_5.2.3.v20170227-0935.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar"/>
......@@ -36,7 +39,7 @@
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt_3.105.3.v20170228-0512.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt.win32.win32.x86_64_3.105.3.v20170228-0512.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface_3.12.2.v20170113-2113.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.commands_3.8.1.v20161221-1651.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench_3.108.3.v20170216-1539.jar"/>
......@@ -89,6 +92,35 @@
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.custom.metamodel_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.efacet.metamodel_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.util.emf.catalog_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.uml.tools_2.0.2.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.emf_2.1.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.type.core_1.9.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.custom.core_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.efacet.core_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.efacet.catalog_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.util.emf.core_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.efacet_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.edit.ui_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.edit_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.ui.emf_1.2.1.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.databinding_1.3.0.v20160526-0356.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding.property_1.6.0.v20160427-0852.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.custom.ui_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.query.java.core_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.util.ui_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.sirius_4.0.0.201605311157.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.sirius.ui_4.0.0.201605311157.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.edit_2.9.0.v20160526-0356.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.ui_1.8.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gef_3.11.0.201606061308.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.ui_1.7.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.action_1.7.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services.action_1.7.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services_1.9.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.gef.ui_1.7.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.draw2d.ui_1.9.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.notation_1.8.0.201606071631.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.core_1.7.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.emf.util_3.6.0.v20160606-1156.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.gmfdiag.commands_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.views.modelexplorer_2.1.0.201703080851.jar"/>
......
plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generateFaultExtensions.xml
+ 36
− 4
View file @ 92cb9388
<?xml version="1.0" encoding="UTF-8"?>
<project default="generateFaultExtensions" name="org.polarsys.chess.contracts.transformations">
<property name="ECLIPSE_HOME" value="../../../../../../Tools/eclipse"/>
<property name="ECLIPSE_WORKSPACE" value="../../../../../../../../home/cristofo/workspace"/>
<property name="ECLIPSE_HOME" value="../../../../../.."/>
<property name="ECLIPSE_WORKSPACE" value="../../../../../../workspace"/>
<!-- The classpath with only the dependencies used by the project -->
<path id="org.polarsys.chess.contracts.transformations.libraryclasspath">
......@@ -9,14 +9,17 @@
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar"/>
<pathelement location="${ECLIPSE_WORKSPACE}//.metadata/.plugins/org.eclipse.pde.core/.bundle_pool/plugins/org.eclipse.equinox.transforms.hook_1.1.0.v20131021-1933.jar"/>
<pathelement location="${ECLIPSE_WORKSPACE}//.metadata/.plugins/org.eclipse.pde.core/.bundle_pool/plugins/org.eclipse.equinox.weaving.hook_1.1.200.v20150730-1648.jar"/>
<pathelement location="${ECLIPSE_WORKSPACE}//.metadata/.plugins/org.eclipse.pde.core/.bundle_pool/plugins/org.eclipse.equinox.region_1.3.2.v20170118-1930.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.wst.jsdt.nashorn.extension_1.0.2.v201610280128.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml_5.2.3.v20170227-0935.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar"/>
......@@ -36,7 +39,7 @@
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt_3.105.3.v20170228-0512.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt.win32.win32.x86_64_3.105.3.v20170228-0512.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface_3.12.2.v20170113-2113.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.commands_3.8.1.v20161221-1651.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench_3.108.3.v20170216-1539.jar"/>
......@@ -89,6 +92,35 @@
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.custom.metamodel_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.efacet.metamodel_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.util.emf.catalog_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.uml.tools_2.0.2.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.emf_2.1.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.type.core_1.9.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.custom.core_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.efacet.core_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.efacet.catalog_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.util.emf.core_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.efacet_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.edit.ui_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.edit_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.ui.emf_1.2.1.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.databinding_1.3.0.v20160526-0356.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding.property_1.6.0.v20160427-0852.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.custom.ui_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.query.java.core_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.emf.facet.util.ui_1.2.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.sirius_4.0.0.201605311157.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.sirius.ui_4.0.0.201605311157.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.edit_2.9.0.v20160526-0356.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.ui_1.8.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gef_3.11.0.201606061308.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.ui_1.7.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.action_1.7.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services.action_1.7.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services_1.9.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.gef.ui_1.7.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.draw2d.ui_1.9.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.notation_1.8.0.201606071631.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.core_1.7.0.201606071959.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.emf.util_3.6.0.v20160606-1156.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.gmfdiag.commands_2.0.0.201703080851.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.views.modelexplorer_2.1.0.201703080851.jar"/>
......
plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/actions/ImportOSSFileAction.java
+ 63
− 47
View file @ 92cb9388
......@@ -92,7 +92,6 @@ import org.eclipse.papyrus.sysml.portandflows.FlowDirection;
*/
public class ImportOSSFileAction {
private static boolean validateSerializedElements = false;
// The instance of this class
private static ImportOSSFileAction classInstance;
......@@ -144,7 +143,7 @@ public class ImportOSSFileAction {
* @param expression
* the expression defining the function behavior
* @return
* @throws Exception
* @throws Exception
*/
private boolean isFunctionBehavior(Class owner, Expression expression) throws ImportException {
if (expression instanceof FullVariableId) {
......@@ -160,15 +159,15 @@ public class ImportOSSFileAction {
// Retrieve the component instance containing the behavior
final Property behaviorOwner = entityUtil.getUmlComponentInstance(owner, variableOwnerName);
if(behaviorOwner.getType()!=null){
// Get the component type
final String typeName = behaviorOwner.getType().getName();
if (behaviorOwner.getType() != null) {
// Get the component type
final String typeName = behaviorOwner.getType().getName();
// Get the component object containing the definition of the
// port
component = dslTypeToComponent.get(typeName);
}else{
throw new ImportException(variableOwnerName+" has no type");
// Get the component object containing the definition of the
// port
component = dslTypeToComponent.get(typeName);
} else {
throw new ImportException(variableOwnerName + " has no type");
}
}
......@@ -389,7 +388,8 @@ public class ImportOSSFileAction {
// ASSERTION processing
// final Assertion assertion = dslRefInstance.getAssertion();
final String assertionName = assertion.getName();
final String assertionText = ossModelUtil.getExpressionAsString(assertion.getConstraint(), validateSerializedElements);
final String assertionText = ossModelUtil.getExpressionAsString(assertion.getConstraint(),
validateSerializedElements);
// Retrieve the formal property from the owner, if any
// (working on the assertion name)
......@@ -433,9 +433,9 @@ public class ImportOSSFileAction {
String componentInstanceName = ossModelUtil
.getNearestComponentInstanceNameFromFullContractId(refiningContractId);
String[] componentInstanceRange = ossModelUtil
.getNearestComponentInstanceRangeFromFullContractId(refiningContractId,validateSerializedElements);
.getNearestComponentInstanceRangeFromFullContractId(refiningContractId, validateSerializedElements);
String componentInstanceIndex = ossModelUtil
.getNearestComponentInstanceIndexFromFullContractId(refiningContractId,validateSerializedElements);
.getNearestComponentInstanceIndexFromFullContractId(refiningContractId, validateSerializedElements);
String refinementNameOptSuffix = "";
if (!StringArrayUtil.isUndefined(componentInstanceRange)) {
......@@ -507,6 +507,9 @@ public class ImportOSSFileAction {
EList<Constraint> existingDelegationConstraints, HashMap<String, Boolean> mapConnectors,
HashMap<String, Boolean> mapDelegationContraintsToKeep, Class owner) throws ImportException {
boolean isConnectionWithNoArray = false;
boolean isEnumValue=false;
// CONNECTION processing
// final Connection connection = dslRefInstance.getConnection();
final FullVariableId variable = connection.getVariable();
......@@ -515,6 +518,8 @@ public class ImportOSSFileAction {
if (ossModelUtil.isConnectionWithNoArray(variable, constraint, iterCondition)
&& !isFunctionBehavior(owner, variable) && !isFunctionBehavior(owner, constraint)) {
isConnectionWithNoArray=true;
// Details of the connector ends
String variablePortOwner = ossModelUtil.getNearestComponentName(variable);
String variablePortName = ossModelUtil.getVariableIdAsString(variable.getId(),validateSerializedElements);
......@@ -537,16 +542,23 @@ public class ImportOSSFileAction {
Property partWithPortOfConstraint = getPartWithPort((FullVariableId) constraint, owner);
final Class portOwnerOfConstraint = getPortOwner(partWithPortOfConstraint, owner);
if(portOwnerOfConstraint.getOwnedPort(constraintPortName,null)==null){
logger.debug("isEnumValue");
isEnumValue=true;
}else{
Property partWithPortOfVariable = getPartWithPort((FullVariableId) variable, owner);
final Class portOwnerOfVariable = getPortOwner(partWithPortOfVariable, owner);
// Store the new connector
addedElements.add(entityUtil.createUmlConnector(constraintPortName, partWithPortOfConstraint,
portOwnerOfConstraint, variablePortName, partWithPortOfVariable, portOwnerOfVariable, owner));
}
}
} else
}
if(!isConnectionWithNoArray||isEnumValue){
// It could be a delegation constraint, check it
if (isDelegationConstraint(variable, constraint,iterCondition, owner)) {
if (isEnumValue||isDelegationConstraint(variable, constraint,iterCondition, owner)) {
logger.debug("isDelegationConstraint: "+ossModelUtil.getOssElementAsString(connection, validateSerializedElements, true));
Constraint delegationConstraint = null;
// String constraintText =
......@@ -584,21 +596,22 @@ public class ImportOSSFileAction {
addImportError("Found a connection with a ParameterId, don't know how to handle it!");
} else {
// System.out.println("variable: " + variable);
// System.out.println("constraint: " + constraint);
logger.debug("constraint not handled: " + ossModelUtil.getOssElementAsString(connection, validateSerializedElements, true));
addImportError("Found the connetion: " + getTextOfTag(connection) + ", don't know how to handle it!");
}
}
}
private boolean isDelegationConstraint(FullVariableId variable, Expression constraint,IterativeCondition iterCondition, Class owner) throws ImportException {
logger.debug("isDelegationConstraint constraint: "+constraint);
logger.debug("constraint instanceof FullVariableId: "+(constraint instanceof FullVariableId));
return !(constraint instanceof FullVariableId) ||
(ossModelUtil.isVariableWithArray((FullVariableId) constraint)) ||
!(variable instanceof FullVariableId) ||
(ossModelUtil.isVariableWithArray((FullVariableId) variable))||
(isFunctionBehavior(owner, variable) && isFunctionBehavior(owner, constraint)) ||
(iterCondition!=null);
private boolean isDelegationConstraint(FullVariableId variable, Expression constraint,
IterativeCondition iterCondition, Class owner) throws ImportException {
logger.debug("isDelegationConstraint constraint: " + constraint);
logger.debug("constraint instanceof FullVariableId: " + (constraint instanceof FullVariableId));
return !(constraint instanceof FullVariableId)
|| (ossModelUtil.isVariableWithArray((FullVariableId) constraint))
|| !(variable instanceof FullVariableId)
|| (ossModelUtil.isVariableWithArray((FullVariableId) variable))
|| (isFunctionBehavior(owner, variable) && isFunctionBehavior(owner, constraint))
|| (iterCondition != null);
}
private Class getPortOwner(Property partWithPort, Class owner) {
......@@ -637,7 +650,7 @@ public class ImportOSSFileAction {
logger.debug("\tsubcomponent type = " + subType);
String[] mulitplicityBoundaries = ossModelUtil
.getMultiplicityBoundariesFromOssSubComponentType(subComponent.getType(),validateSerializedElements);
.getMultiplicityBoundariesFromOssSubComponentType(subComponent.getType(), validateSerializedElements);
logger.debug("\tsubcomponent multiplicityBoundaries = " + mulitplicityBoundaries[0] + " , "
+ mulitplicityBoundaries[1]);
final Type subComponentType = (Type) dslTypeToComponent.get(subType);
......@@ -927,7 +940,8 @@ public class ImportOSSFileAction {
HashMap<String, Boolean> mapFormalPropertiesToKeep, Class owner) {
final String assertionName = assertion.getName();
final String assertionText = ossModelUtil.getExpressionAsString(assertion.getConstraint(), validateSerializedElements);
final String assertionText = ossModelUtil.getExpressionAsString(assertion.getConstraint(),
validateSerializedElements);
// Retrieve the formal property from the owner, if any
// (working on the assertion name)
......@@ -954,8 +968,10 @@ public class ImportOSSFileAction {
// final Contract dslContract = dslIntInstance.getContract();
final Assumption dslAssumption = dslContract.getAssumption();
final Guarantee dslGuarantee = dslContract.getGuarantee();
final String ossAssumptionText = ossModelUtil.getExpressionAsString(dslAssumption.getConstraint(), validateSerializedElements);
final String ossGuaranteeText = ossModelUtil.getExpressionAsString(dslGuarantee.getConstraint(), validateSerializedElements);
final String ossAssumptionText = ossModelUtil.getExpressionAsString(dslAssumption.getConstraint(),
validateSerializedElements);
final String ossGuaranteeText = ossModelUtil.getExpressionAsString(dslGuarantee.getConstraint(),
validateSerializedElements);
final String contractName = dslContract.getName();
// Retrieve the contract type from the owner, if any
......@@ -1002,7 +1018,7 @@ public class ImportOSSFileAction {
// PORT processing
// final VariableId dslVariableID = ossPort.getId();
final ComplexType ossPortType = ossPort.getType();
String portName = ossModelUtil.getPortName(ossPort,validateSerializedElements);
String portName = ossModelUtil.getPortName(ossPort, validateSerializedElements);
logger.debug("port: " + ossPort);
logger.debug("portName: " + portName);
Type newPortType = ossTypeTranslator.getOrCreateTypeFromOssComplexType(ossPortType, owner.getNearestPackage());
......@@ -1010,7 +1026,8 @@ public class ImportOSSFileAction {
throw new ImportException("Not able to map the requested type for port : " + portName);
// return null; // Create the port anyway, without type
}
String[] newMultiplicityRange = ossModelUtil.getMultiplicityBoundariesFromOssComplexType(ossPortType,validateSerializedElements);
String[] newMultiplicityRange = ossModelUtil.getMultiplicityBoundariesFromOssComplexType(ossPortType,
validateSerializedElements);
// Version that updates the port
// Loop on all the ports to see if it is already existing
org.eclipse.uml2.uml.Port port = entityUtil.getExistingUmlPort(portName, existingPorts);
......@@ -1047,13 +1064,12 @@ public class ImportOSSFileAction {
// Check if there are optional parameters to detect how to handle it
final EList<ComplexType> ossInputTypes = ossParameter.getParameters();
String parameterName = ossModelUtil.getVariableIdAsString(ossParameter.getId(),validateSerializedElements);
String parameterName = ossModelUtil.getVariableIdAsString(ossParameter.getId(), validateSerializedElements);
if (ossInputTypes.size() != 0) {
parseParameterAsUmlFunctionBehaviour(parameterName, ossOutputType, ossInputTypes,
mapFunctionBehaviorsToKeep, owner);
} else {
parseParameterAsUmlStaticPort(parameterName, ossOutputType, existingNonStaticPorts, mapPortsToKeep,
owner);
parseParameterAsUmlStaticPort(parameterName, ossOutputType, existingNonStaticPorts, mapPortsToKeep, owner);
}
}
......@@ -1064,8 +1080,8 @@ public class ImportOSSFileAction {
// Check if the port is already present
// String ossParameterName =
// ossModelUtil.getParameterName(ossParameterId);
final String[] newMultiplicityRange = ossModelUtil
.getMultiplicityBoundariesFromOssComplexType(ossParameterType,validateSerializedElements);
final String[] newMultiplicityRange = ossModelUtil.getMultiplicityBoundariesFromOssComplexType(ossParameterType,
validateSerializedElements);
Type newParameterType = ossTypeTranslator.getOrCreateTypeFromOssComplexType(ossParameterType,
owner.getNearestPackage());
if (newParameterType == null) {
......@@ -1105,12 +1121,13 @@ public class ImportOSSFileAction {
Type newOutputType = ossTypeTranslator.getOrCreateTypeFromOssComplexType(ossOutputType,
owner.getNearestPackage());
final String[] newMultiplicity = ossModelUtil.getMultiplicityBoundariesFromOssComplexType(ossOutputType,validateSerializedElements);
final String[] newMultiplicity = ossModelUtil.getMultiplicityBoundariesFromOssComplexType(ossOutputType,
validateSerializedElements);
EList<Type> newInputTypes = ossTypeTranslator.getOrCreateTypesFromOssComplexTypes(ossInputTypes,
owner.getNearestPackage());
final EList<String[]> newMultiplicities = ossModelUtil
.getMultiplicityBoundariesFromOssComplexTypes(ossInputTypes,validateSerializedElements);
.getMultiplicityBoundariesFromOssComplexTypes(ossInputTypes, validateSerializedElements);
if (newOutputType == null) {
throw new ImportException("Not able to map the requested type for port : " + parameterName);
......@@ -1176,9 +1193,9 @@ public class ImportOSSFileAction {
* @throws Exception
*/
public StringBuffer startParsing(Package pkg, File ossFile) throws Exception {
logger.debug("pkg: "+pkg);
logger.debug("pkg: " + pkg);
OSS ocraOssFile;
sysView = pkg; // Set the given package as working package
......@@ -1235,8 +1252,8 @@ public class ImportOSSFileAction {
// Start a transaction to modify the package content
Resource modelRes = SelectionUtil.getInstance().getSelectedModelResource();
TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(modelRes);
logger.debug("pkg.eResource(): "+pkg.eResource());
logger.debug("pkg.eResource().getResourceSet(): "+pkg.eResource().getResourceSet());
logger.debug("pkg.eResource(): " + pkg.eResource());
logger.debug("pkg.eResource().getResourceSet(): " + pkg.eResource().getResourceSet());
domain.getCommandStack().execute(new RecordingCommand(domain) {
@Override
......@@ -1324,7 +1341,7 @@ public class ImportOSSFileAction {
}
} catch (ImportException e) {
importException = e;
//return;
// return;
}
// Blocks cleanup time, remove blocks no more needed
......@@ -1340,8 +1357,7 @@ public class ImportOSSFileAction {
// System.out.println("Total time = " +
// (System.currentTimeMillis() - startTime));
}
}
);
});
// addedElements contains all the elements that have been added or
// modified
......
plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/services/ResultsGeneratorService.java
+ 1
− 1
View file @ 92cb9388
......@@ -295,7 +295,7 @@ public class ResultsGeneratorService {
* @return the name of the corresponding EMFTA file
*/
private String getEmftaFile(String fullPath) {
String emftaFile = fullPath.substring(fullPath.lastIndexOf("/") + 1, fullPath.length());
String emftaFile = fullPath.substring(fullPath.lastIndexOf(File.separator) + 1, fullPath.length());
return emftaFile + ".emfta";
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent