[all] Rename functions with name getUUID to getID

see #1045 Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Dec 17, 2020 · 105dcb5 · 105dcb5
1 parent d44f073
commit 105dcb5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/...s/io-sarl-demos-fireworks/src/main/sarl/io/sarl/demos/fireworks/agents/LaunchingArea.sarl b/...s/io-sarl-demos-fireworks/src/main/sarl/io/sarl/demos/fireworks/agents/LaunchingArea.sarl
@@ -76,7 +76,7 @@ agent LaunchingArea {
 	 */
 	on AppExit [hasMemberAgent && !exited] {
 		exited = true
-		innerContext.defaultSpace.emit(ID, new AppExit)
+		innerContext.defaultSpace.emit(this.ID, new AppExit)
 	}
 
 	/** Initialization step without GUI.
@@ -112,7 +112,7 @@ agent LaunchingArea {
 	/** Transmit Freeze signal.
 	 */
 	on Freeze [!occurrence.isFromMe] {
-		innerContext.defaultSpace.emit(ID, occurrence)
+		innerContext.defaultSpace.emit(this.ID, occurrence)
 	}
 
 	/*
@@ -121,8 +121,8 @@ agent LaunchingArea {
 	on MemberJoined [occurrence.inInnerDefaultSpace && memberAgentCount == rocketsQuantity] {
 		info("Area is Ready: All rockets are here")
 		var evt = new Launch
-		evt.source = new Address(innerContext.defaultSpace.spaceID, ID);
-		innerContext.defaultSpace.emit(ID, evt)
+		evt.source = new Address(innerContext.defaultSpace.spaceID, this.ID);
+		innerContext.defaultSpace.emit(this.ID, evt)
 	}
 
 }
diff --git a/...projects/io-sarl-demos-fireworks/src/main/sarl/io/sarl/demos/fireworks/agents/Rocket.sarl b/...projects/io-sarl-demos-fireworks/src/main/sarl/io/sarl/demos/fireworks/agents/Rocket.sarl
@@ -80,7 +80,7 @@ agent Rocket {
 		frozen = true
 		exited = true
 		move.cancel
-		innerContext.defaultSpace.emit(ID, new AppExit)
+		innerContext.defaultSpace.emit(this.ID, new AppExit)
 	}
 
 	/* Freeze itself.
@@ -158,7 +158,7 @@ agent Rocket {
 	/** Emit a FireReady signal when all fire are created.
 	 */
 	on MemberJoined [!occurrence.agentID.isMe && hasMemberAgent && memberAgentCount == fireQuantity] {
-		innerContext.defaultSpace.emit(ID, new FireReady)
+		innerContext.defaultSpace.emit(this.ID, new FireReady)
 	}
 
 }
diff --git a/.../io-sarl-demos-fireworks/src/main/sarl/io/sarl/demos/fireworks/agents/RocketLauncher.sarl b/.../io-sarl-demos-fireworks/src/main/sarl/io/sarl/demos/fireworks/agents/RocketLauncher.sarl
@@ -61,7 +61,7 @@ agent RocketLauncher {
 	 */
 	on AppExit [hasMemberAgent && !exited] {
 		exited = true
-		innerContext.defaultSpace.emit(ID, new AppExit)
+		innerContext.defaultSpace.emit(this.ID, new AppExit)
 	}
 
 	/** Initialization step invoked with parameters.
@@ -102,7 +102,7 @@ agent RocketLauncher {
 	/** Transmit a Freeze signal.
 	 */
 	on Freeze [!occurrence.isFromMe] {
-		innerContext.defaultSpace.emit(ID, occurrence)
+		innerContext.defaultSpace.emit(this.ID, occurrence)
 	}
 
 	/** Launch a new rocket when the previous is destroyed.

diff --git a/...plugin/projects/io-sarl-demos-gameoflife/src/main/sarl/io/sarl/demos/gameoflife/Boot.sarl b/...plugin/projects/io-sarl-demos-gameoflife/src/main/sarl/io/sarl/demos/gameoflife/Boot.sarl
@@ -69,7 +69,7 @@ agent Boot {
 
 	on Initialize {
 		gui = GUI.GUI
-		controller = new Controller(defaultSpace, ID)
+		controller = new Controller(defaultSpace, this.ID)
 		gui.addGUIListener(controller)
 		controller.addControllerListener(gui)
 
@@ -174,7 +174,7 @@ agent Boot {
 			numberOfAgent = occurrence.width * occurrence.height + 1
 			emit(new GameIsDead)
 			info(Locale.getString("AGENTS", numberOfAgent))
-			spawnInContextWithID(Environment, environmentUUID, defaultContext, width, height, gui, ID)
+			spawnInContextWithID(Environment, environmentUUID, defaultContext, width, height, gui, this.ID)
 		} finally {
 			lock.unlock
 		}