From 22e0345d85eb6267904caacfcc06ce5197f4be52 Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Sun, 3 Nov 2024 17:35:22 +0100 Subject: [PATCH] Rename controllers with prefix for better file ordering --- .../control/{SpinController.java => ControllerSpin.java} | 4 ++-- .../{TemperatureController.java => ControllerTemp.java} | 4 ++-- .../control/{WaterController.java => ControllerWater.java} | 4 ++-- wash/src/wash/control/Wash.java | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) rename wash/src/wash/control/{SpinController.java => ControllerSpin.java} (93%) rename wash/src/wash/control/{TemperatureController.java => ControllerTemp.java} (94%) rename wash/src/wash/control/{WaterController.java => ControllerWater.java} (95%) diff --git a/wash/src/wash/control/SpinController.java b/wash/src/wash/control/ControllerSpin.java similarity index 93% rename from wash/src/wash/control/SpinController.java rename to wash/src/wash/control/ControllerSpin.java index 64ec2e6..1db00cc 100644 --- a/wash/src/wash/control/SpinController.java +++ b/wash/src/wash/control/ControllerSpin.java @@ -4,12 +4,12 @@ import actor.ActorThread; import wash.io.WashingIO; import wash.control.WashingMessage.Order; -public final class SpinController extends ActorThread { +public final class ControllerSpin extends ActorThread { private WashingIO io; private Spin spin = new Spin(); private WashingMessage m; - public SpinController(WashingIO io) { + public ControllerSpin(WashingIO io) { this.io = io; } diff --git a/wash/src/wash/control/TemperatureController.java b/wash/src/wash/control/ControllerTemp.java similarity index 94% rename from wash/src/wash/control/TemperatureController.java rename to wash/src/wash/control/ControllerTemp.java index cbda2d9..90355b6 100644 --- a/wash/src/wash/control/TemperatureController.java +++ b/wash/src/wash/control/ControllerTemp.java @@ -4,12 +4,12 @@ import actor.ActorThread; import wash.io.WashingIO; import wash.control.WashingMessage.Order; -public final class TemperatureController extends ActorThread { +public final class ControllerTemp extends ActorThread { private WashingIO io; private Heater heater; private WashingMessage m; - public TemperatureController(WashingIO io) { + public ControllerTemp(WashingIO io) { this.io = io; heater = new Heater(40); } diff --git a/wash/src/wash/control/WaterController.java b/wash/src/wash/control/ControllerWater.java similarity index 95% rename from wash/src/wash/control/WaterController.java rename to wash/src/wash/control/ControllerWater.java index 36b9696..8dafdef 100644 --- a/wash/src/wash/control/WaterController.java +++ b/wash/src/wash/control/ControllerWater.java @@ -3,13 +3,13 @@ package wash.control; import actor.ActorThread; import wash.io.WashingIO; -public class WaterController extends ActorThread { +public class ControllerWater extends ActorThread { WashingMessage.Order o; WashingMessage m; WashingIO io; - public WaterController(WashingIO io) { + public ControllerWater(WashingIO io) { this.io = io; } diff --git a/wash/src/wash/control/Wash.java b/wash/src/wash/control/Wash.java index 3e3ee2a..4c29e4a 100644 --- a/wash/src/wash/control/Wash.java +++ b/wash/src/wash/control/Wash.java @@ -12,9 +12,9 @@ public class Wash { WashingIO io = sim.startSimulation(); - ActorThread temp = new TemperatureController(io); - ActorThread water = new WaterController(io); - ActorThread spin = new SpinController(io); + ActorThread temp = new ControllerTemp(io); + ActorThread water = new ControllerWater(io); + ActorThread spin = new ControllerSpin(io); temp.start(); water.start();