diff --git a/modeling/ebook_reader_01.xml b/modeling/ebook_reader_01.xml index e4255fdbde21d3e5a2651656d91f6fc60cdf0115..c8a1313c0f5ee70c08132176c89d12414a865816 100644 --- a/modeling/ebook_reader_01.xml +++ b/modeling/ebook_reader_01.xml @@ -461,7 +461,7 @@ ones in memory (for example, the three last!) <AutomaticDrawing data="true" /> </CONNECTOR><SUBCOMPONENT type="-1" id="2806" > <father id="2808" num="0" /> -<cdparam x="195" y="1334" /> +<cdparam x="273" y="1333" /> <sizeparam width="200" height="96" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" /> diff --git a/src/avatartranslator/AvatarStateMachine.java b/src/avatartranslator/AvatarStateMachine.java index ac7b469f22adac37756eae5ea335c50f91a5df7d..b9a825fb7df43f59b2ddcb87491b66d58ed20f13 100644 --- a/src/avatartranslator/AvatarStateMachine.java +++ b/src/avatartranslator/AvatarStateMachine.java @@ -55,6 +55,8 @@ public class AvatarStateMachine extends AvatarElement { protected LinkedList<AvatarStateMachineElement> elements; protected AvatarStartState startState; + + private static int ID_ELT = 0; public AvatarStateMachine(String _name, Object _referenceObject) { @@ -605,8 +607,9 @@ public class AvatarStateMachine extends AvatarElement { TraceManager.addDev("-> Timer modification"); - AvatarState myState = new AvatarState("statefortransition", _at.getReferenceObject()); - AvatarTransition at2 = new AvatarTransition("transitionfortransition", _at.getReferenceObject()); + AvatarState myState = new AvatarState("statefortransition__" + ID_ELT, _at.getReferenceObject()); + AvatarTransition at2 = new AvatarTransition("transitionfortransition__" + ID_ELT, _at.getReferenceObject()); + ID_ELT ++; AvatarTransition at1 = (AvatarTransition)(next.getNext(0)); next.removeAllNexts(); @@ -619,8 +622,8 @@ public class AvatarStateMachine extends AvatarElement { return; } else { - AvatarState myState = new AvatarState("statefortransition", _at.getReferenceObject()); - AvatarTransition at = new AvatarTransition("transitionfortransition", _at.getReferenceObject()); + AvatarState myState = new AvatarState("statefortransition__" + ID_ELT, _at.getReferenceObject()); + AvatarTransition at = new AvatarTransition("transitionfortransition__", _at.getReferenceObject()); at.addNext(_at.getNext(0)); _at.removeAllNexts(); _at.addNext(myState);