Examples updated

haslab · Mar 21, 2013 · 1a7a517 · 1a7a517
1 parent 856a558
commit 1a7a517
Show file tree

Hide file tree

Showing 17 changed files with 4 additions and 161 deletions.
diff --git a/examples/HSM2NHSM/HStateMachine.xmi b/examples/HSM2NHSM/HStateMachine.xmi
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<hsm:StateMachine
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:hsm="HSM"
-    xsi:schemaLocation="HSM HSM.ecore#HSM">
-  <states name="Child"
-      owner="//@states.2"/>
+<hsm:StateMachine xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:hsm="HSM" xsi:schemaLocation="HSM HSM.ecore#HSM">
+  <states xsi:type="hsm:CompositeState" name="A"/>
+  <states name="Child" owner="//@states.0"/>
   <states name="B"/>
-  <states xsi:type="hsm:CompositeState"
-      name="A"/>
-  <transitions
-      source="//@states.0"
-      target="//@states.1"/>
 </hsm:StateMachine>
diff --git a/examples/HSM2NHSM/HStateMachineN.xmi b/examples/HSM2NHSM/HStateMachineN.xmi
@@ -7,9 +7,6 @@
     xsi:schemaLocation="HSM HSM.ecore#HSM">
   <states name="A"/>
   <states name="B"/>
-  <transitions
-      source="//@states.1"
-      target="//@states.0"/>
   <transitions
       source="//@states.0"
       target="//@states.1"/>

diff --git a/examples/HSM2NHSM/NHSM.ecore b/examples/HSM2NHSM/NHSM.ecore
diff --git a/examples/HSM2NHSM/NHStateMachine.xmi b/examples/HSM2NHSM/NHStateMachine.xmi
diff --git a/examples/HSM2NHSM/check.sh b/examples/HSM2NHSM/check.sh
diff --git a/examples/HSM2NHSM/enforce.sh b/examples/HSM2NHSM/enforce.sh
diff --git a/examples/NonTopEnforce/TwoLayerMM.ecore b/examples/NonTopEnforce/TwoLayerMM.ecore
diff --git a/examples/NonTopEnforce/enforce.sh b/examples/NonTopEnforce/enforce.sh
diff --git a/examples/UML2RDBMS/2PersistentPackage.xmi b/examples/UML2RDBMS/2PersistentPackage.xmi
diff --git a/examples/UML2RDBMS/2PersistentScheme.xmi b/examples/UML2RDBMS/2PersistentScheme.xmi
diff --git a/examples/UML2RDBMS/PackageEmpty.xmi b/examples/UML2RDBMS/PackageEmpty.xmi
diff --git a/examples/UML2RDBMS/PackageExample.xmi b/examples/UML2RDBMS/PackageExample.xmi
diff --git a/examples/UML2RDBMS/SchemeExample.xmi b/examples/UML2RDBMS/SchemeExample.xmi
diff --git a/examples/UML2RDBMS/check.sh b/examples/UML2RDBMS/check.sh
diff --git a/examples/UML2RDBMS/enforce b/examples/UML2RDBMS/enforce
@@ -1 +1 @@
-java -jar ../../echo.jar -enforce uml -q UML2RDBMS.qvtr -m UML.ecore RDBMS.ecore -i 1PersistentPackage.xmi 1PersistentScheme.xmi
+java -jar ../../echo.jar -enforce hm -q HSM2NHSM.qvtr -m HSM.ecore -i HStateMachine.xmi HStateMachineN.xmi
diff --git a/examples/UML2RDBMS/enforce.sh b/examples/UML2RDBMS/enforce.sh
diff --git a/examples/UML2RDBMS/run.sh b/examples/UML2RDBMS/run.sh
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		java -jar ../../echo.jar -enforce uml -q UML2RDBMS.qvtr -m UML.ecore RDBMS.ecore -i 1PersistentPackage.xmi 1PersistentScheme.xmi
		java -jar ../../echo.jar -enforce hm -q HSM2NHSM.qvtr -m HSM.ecore -i HStateMachine.xmi HStateMachineN.xmi