Commit 71002f0a authored by Depasse Arthur's avatar Depasse Arthur

merge conflict

parents 66474db5 54c57961
No preview for this file type
This diff is collapsed.
Capture interface.JPG

244 KB | W: | H:

Capture interface.JPG

186 KB | W: | H:

Capture interface.JPG
Capture interface.JPG
Capture interface.JPG
Capture interface.JPG
  • 2-up
  • Swipe
  • Onion skin
This diff is collapsed.
......@@ -20,7 +20,7 @@
</style>
</edgeMappings>
<toolSections name="New">
<ownedTools xsi:type="tool:NodeCreationDescription" name="stateCreator" label="New State" forceRefresh="true" nodeMappings="//@ownedViewpoints[name='FSMViewpoint']/@ownedRepresentations[name='FSMDiagram']/@defaultLayer/@nodeMappings[name='StateNode']" iconPath="\fr.supelec.plong9.fsm.edit\icons\full\obj16\State.gif">
<ownedTools xsi:type="tool:NodeCreationDescription" name="stateCreator" label="New State" forceRefresh="true" nodeMappings="//@ownedViewpoints[name='FSMViewpoint']/@ownedRepresentations[name='FSMDiagram']/@defaultLayer/@nodeMappings[name='StateNode']" iconPath="/fr.supelec.plong9.fsm.edit/icons/full/obj16/State.gif">
<variable name="container"/>
<viewVariable name="containerView"/>
<initialOperation>
......@@ -29,7 +29,7 @@
</firstModelOperations>
</initialOperation>
</ownedTools>
<ownedTools xsi:type="tool:EdgeCreationDescription" name="transitionCreator" label="New Transition" edgeMappings="//@ownedViewpoints[name='FSMViewpoint']/@ownedRepresentations[name='FSMDiagram']/@defaultLayer/@edgeMappings[name='TransitionEdge']" iconPath="\fr.supelec.plong9.fsm.edit\icons\full\obj16\Transition.gif">
<ownedTools xsi:type="tool:EdgeCreationDescription" name="transitionCreator" label="New Transition" edgeMappings="//@ownedViewpoints[name='FSMViewpoint']/@ownedRepresentations[name='FSMDiagram']/@defaultLayer/@edgeMappings[name='TransitionEdge']" iconPath="/fr.supelec.plong9.fsm.edit/icons/full/obj16/Transition.gif">
<sourceVariable name="source"/>
<targetVariable name="target"/>
<sourceViewVariable name="sourceView"/>
......@@ -44,31 +44,32 @@
</firstModelOperations>
</initialOperation>
</ownedTools>
<ownedTools xsi:type="tool_1:ToolDescription" name="NewEvent" label="New Event" iconPath="\fr.supelec.plong9.fsm.edit\icons\full\obj16\Event.gif">
<ownedTools xsi:type="tool_1:ToolDescription" name="NewEvent" label="New Event" iconPath="/fr.supelec.plong9.fsm.edit/icons/full/obj16/Event.gif">
<element name="element"/>
<elementView name="elementView"/>
<initialOperation>
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
<subModelOperations xsi:type="tool_1:CreateInstance" typeName="fsm::Event" referenceName="ownedEvents"/>
</firstModelOperations>
<firstModelOperations xsi:type="tool_1:CreateInstance" typeName="fsm::Event" referenceName="ownedEvents"/>
</initialOperation>
</ownedTools>
<ownedTools xsi:type="tool_1:ToolDescription" name="NewAction" label="New Action" iconPath="\fr.supelec.plong9.fsm.edit\icons\full\obj16\Action.gif">
<ownedTools xsi:type="tool_1:ToolDescription" name="NewAction" label="New Action" iconPath="/fr.supelec.plong9.fsm.edit/icons/full/obj16/Action.gif">
<element name="element"/>
<elementView name="elementView"/>
<initialOperation>
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
<subModelOperations xsi:type="tool_1:CreateInstance" typeName="fsm::Action" referenceName="ownedActions"/>
</firstModelOperations>
<firstModelOperations xsi:type="tool_1:CreateInstance" typeName="fsm::Action" referenceName="ownedActions"/>
</initialOperation>
</ownedTools>
<ownedTools xsi:type="tool_1:ToolDescription" name="NewGuard" label="New Guard" forceRefresh="true" iconPath="\fr.supelec.plong9.fsm.edit\icons\full\obj16\Guard.gif">
<ownedTools xsi:type="tool_1:ToolDescription" name="NewGuard" label="New Guard" forceRefresh="true" iconPath="/fr.supelec.plong9.fsm.edit/icons/full/obj16/Guard.gif">
<element name="element"/>
<elementView name="elementView"/>
<initialOperation>
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
<subModelOperations xsi:type="tool_1:CreateInstance" typeName="fsm::Guard" referenceName="ownedGuards"/>
</firstModelOperations>
<firstModelOperations xsi:type="tool_1:CreateInstance" typeName="fsm::Guard" referenceName="ownedGuards"/>
</initialOperation>
</ownedTools>
<ownedTools xsi:type="tool_1:ToolDescription" name="NewMessage" label="New Message" forceRefresh="true">
<element name="element"/>
<elementView name="elementView"/>
<initialOperation>
<firstModelOperations xsi:type="tool_1:CreateInstance" typeName="fsm::Message" referenceName="ownedMessages"/>
</initialOperation>
</ownedTools>
</toolSections>
......
<?xml version="1.0" encoding="ASCII"?>
<fsm:FSM xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:fsm="http://fr.supelec.plong9.fsm" name="TicTacToe Server" initialState="//@ownedStates.0" finalState="//@ownedStates.4" isServer="true">
<ownedStates name="Attente Nom J1">
<outgoingTransitions name="" actions="//@ownedActions.0" event="//@ownedEvents.0" target="//@ownedStates.1"/>
<outgoingTransitions name="Nom J1" actions="//@ownedActions.0" event="//@ownedEvents.0" target="//@ownedStates.1"/>
</ownedStates>
<ownedStates name="Attente Nom J2" incomingTransitions="//@ownedStates.0/@outgoingTransitions.0 //@ownedStates.1/@outgoingTransitions.0">
<outgoingTransitions actions="//@ownedActions.2" guard="//@ownedGuards.1" event="//@ownedEvents.1" target="//@ownedStates.1"/>
<outgoingTransitions actions="//@ownedActions.1" guard="//@ownedGuards.0" event="//@ownedEvents.1" target="//@ownedStates.2"/>
<ownedStates name="Attente Nom J2" incomingTransitions="//@ownedStates.0/@outgoingTransitions.0 //@ownedStates.1/@outgoingTransitions.1">
<outgoingTransitions name="Nom J2" actions="//@ownedActions.1" guard="//@ownedGuards.0" event="//@ownedEvents.1" target="//@ownedStates.2"/>
<outgoingTransitions name="Refus Nom J2" guard="//@ownedGuards.0" event="//@ownedEvents.1" target="//@ownedStates.1" InverseGuard="true"/>
</ownedStates>
<ownedStates name="Attente Jeu J1" incomingTransitions="//@ownedStates.1/@outgoingTransitions.1 //@ownedStates.2/@outgoingTransitions.0 //@ownedStates.3/@outgoingTransitions.1">
<outgoingTransitions actions="//@ownedActions.6" guard="//@ownedGuards.3" event="//@ownedEvents.2" target="//@ownedStates.2"/>
<outgoingTransitions actions="//@ownedActions.5" guard="//@ownedGuards.2" event="//@ownedEvents.2" target="//@ownedStates.3"/>
<outgoingTransitions actions="//@ownedActions.3" guard="//@ownedGuards.4" event="//@ownedEvents.2" target="//@ownedStates.4"/>
<ownedStates name="Attente Jeu J1" incomingTransitions="//@ownedStates.1/@outgoingTransitions.0 //@ownedStates.2/@outgoingTransitions.0 //@ownedStates.3/@outgoingTransitions.1">
<outgoingTransitions name="Refus Coup J1" actions="//@ownedActions.6" guard="//@ownedGuards.1" event="//@ownedEvents.2" target="//@ownedStates.2" InverseGuard="true"/>
<outgoingTransitions name="Coup J1" actions="//@ownedActions.5" guard="//@ownedGuards.1" event="//@ownedEvents.2" target="//@ownedStates.3"/>
<outgoingTransitions name="Victoire J1" actions="//@ownedActions.3" guard="//@ownedGuards.2" event="//@ownedEvents.2" target="//@ownedStates.4"/>
</ownedStates>
<ownedStates name="Attente Jeu J2" incomingTransitions="//@ownedStates.2/@outgoingTransitions.1 //@ownedStates.3/@outgoingTransitions.0">
<outgoingTransitions actions="//@ownedActions.6" guard="//@ownedGuards.3" event="//@ownedEvents.3" target="//@ownedStates.3"/>
<outgoingTransitions actions="//@ownedActions.5" guard="//@ownedGuards.2" event="//@ownedEvents.3" target="//@ownedStates.2"/>
<outgoingTransitions actions="//@ownedActions.4" guard="//@ownedGuards.4" event="//@ownedEvents.3" target="//@ownedStates.4"/>
<outgoingTransitions name="Refus Coup J2" actions="//@ownedActions.6" guard="//@ownedGuards.1" event="//@ownedEvents.3" target="//@ownedStates.3" InverseGuard="true"/>
<outgoingTransitions name="Coup J2" actions="//@ownedActions.5" guard="//@ownedGuards.1" event="//@ownedEvents.3" target="//@ownedStates.2"/>
<outgoingTransitions name="Victoire J2" actions="//@ownedActions.4" guard="//@ownedGuards.2" event="//@ownedEvents.3" target="//@ownedStates.4"/>
</ownedStates>
<ownedStates name="Fin Partie" incomingTransitions="//@ownedStates.2/@outgoingTransitions.2 //@ownedStates.3/@outgoingTransitions.2"/>
<ownedEvents name="Message J1"/>
......@@ -30,9 +30,7 @@
<ownedActions name="Mise &#xe0; Jour Plateau"/>
<ownedActions name="Refus Coup"/>
<ownedGuards name="Nom J2 Valide"/>
<ownedGuards name="Nom J2 Invalide"/>
<ownedGuards name="Coup Valide"/>
<ownedGuards name="Coup Invalide"/>
<ownedGuards name="Coup Gagnant"/>
<ownedMessages event="//@ownedEvents.0" name="Nom J1"/>
<ownedMessages event="//@ownedEvents.1" name="Nom J2"/>
......
Markdown is supported
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