diff --git a/src/configuration/SimulationConfigurationSingleton.java b/src/configuration/SimulationConfigurationSingleton.java new file mode 100644 index 0000000..a7e0976 --- /dev/null +++ b/src/configuration/SimulationConfigurationSingleton.java @@ -0,0 +1,2 @@ +package configuration;public class SingletonConfigurationSingleton { +} diff --git a/src/model/metadata/BuildingMetadata.java b/src/metadata/BuildingMetadata.java similarity index 96% rename from src/model/metadata/BuildingMetadata.java rename to src/metadata/BuildingMetadata.java index 417373a..4eac8ea 100644 --- a/src/model/metadata/BuildingMetadata.java +++ b/src/metadata/BuildingMetadata.java @@ -1,6 +1,6 @@ package model.metadata; -import model.BuildingState; +import simulation.BuildingState; import java.util.Map; import java.util.Objects; diff --git a/src/model/metadata/FactoryInput.java b/src/metadata/FactoryInput.java similarity index 96% rename from src/model/metadata/FactoryInput.java rename to src/metadata/FactoryInput.java index 3a25cdd..d8562e4 100644 --- a/src/model/metadata/FactoryInput.java +++ b/src/metadata/FactoryInput.java @@ -1,6 +1,6 @@ package model.metadata; -import model.ComponentType; +import simulation.ComponentType; import java.util.Objects; diff --git a/src/model/metadata/FactoryMetadata.java b/src/metadata/FactoryMetadata.java similarity index 98% rename from src/model/metadata/FactoryMetadata.java rename to src/metadata/FactoryMetadata.java index ac121bb..ba104fd 100644 --- a/src/model/metadata/FactoryMetadata.java +++ b/src/metadata/FactoryMetadata.java @@ -1,6 +1,6 @@ package model.metadata; -import model.BuildingState; +import simulation.BuildingState; import java.util.Collection; import java.util.Map; diff --git a/src/model/metadata/FactoryOutput.java b/src/metadata/FactoryOutput.java similarity index 95% rename from src/model/metadata/FactoryOutput.java rename to src/metadata/FactoryOutput.java index e5f6cbc..fddb8b2 100644 --- a/src/model/metadata/FactoryOutput.java +++ b/src/metadata/FactoryOutput.java @@ -1,6 +1,6 @@ package model.metadata; -import model.ComponentType; +import simulation.ComponentType; import java.util.Objects; diff --git a/src/model/metadata/WarehouseInput.java b/src/metadata/WarehouseInput.java similarity index 96% rename from src/model/metadata/WarehouseInput.java rename to src/metadata/WarehouseInput.java index e6a4b73..7f23603 100644 --- a/src/model/metadata/WarehouseInput.java +++ b/src/metadata/WarehouseInput.java @@ -1,6 +1,6 @@ package model.metadata; -import model.ComponentType; +import simulation.ComponentType; import java.util.Objects; diff --git a/src/model/metadata/WarehouseMetadata.java b/src/metadata/WarehouseMetadata.java similarity index 96% rename from src/model/metadata/WarehouseMetadata.java rename to src/metadata/WarehouseMetadata.java index fbd803d..956bbe7 100644 --- a/src/model/metadata/WarehouseMetadata.java +++ b/src/metadata/WarehouseMetadata.java @@ -1,6 +1,6 @@ package model.metadata; -import model.BuildingState; +import simulation.BuildingState; import java.util.Map; import java.util.Objects; diff --git a/src/ressources/E0%.png b/src/ressources/E0%.png new file mode 100644 index 0000000..ea9a5e5 Binary files /dev/null and b/src/ressources/E0%.png differ diff --git a/src/ressources/E100%.png b/src/ressources/E100%.png new file mode 100644 index 0000000..8b049e3 Binary files /dev/null and b/src/ressources/E100%.png differ diff --git a/src/ressources/E33%.png b/src/ressources/E33%.png new file mode 100644 index 0000000..9597de2 Binary files /dev/null and b/src/ressources/E33%.png differ diff --git a/src/ressources/E66%.png b/src/ressources/E66%.png new file mode 100644 index 0000000..43d5fa0 Binary files /dev/null and b/src/ressources/E66%.png differ diff --git a/src/ressources/UA0%.png b/src/ressources/UA0%.png new file mode 100644 index 0000000..e86feae Binary files /dev/null and b/src/ressources/UA0%.png differ diff --git a/src/ressources/UA100%.png b/src/ressources/UA100%.png new file mode 100644 index 0000000..b9e4881 Binary files /dev/null and b/src/ressources/UA100%.png differ diff --git a/src/ressources/UA33%.png b/src/ressources/UA33%.png new file mode 100644 index 0000000..f9f0445 Binary files /dev/null and b/src/ressources/UA33%.png differ diff --git a/src/ressources/UA66%.png b/src/ressources/UA66%.png new file mode 100644 index 0000000..84f986f Binary files /dev/null and b/src/ressources/UA66%.png differ diff --git a/src/ressources/UM0%.png b/src/ressources/UM0%.png new file mode 100644 index 0000000..7ed9611 Binary files /dev/null and b/src/ressources/UM0%.png differ diff --git a/src/ressources/UM100%.png b/src/ressources/UM100%.png new file mode 100644 index 0000000..6f0ff74 Binary files /dev/null and b/src/ressources/UM100%.png differ diff --git a/src/ressources/UM33%.png b/src/ressources/UM33%.png new file mode 100644 index 0000000..68ee064 Binary files /dev/null and b/src/ressources/UM33%.png differ diff --git a/src/ressources/UM66%.png b/src/ressources/UM66%.png new file mode 100644 index 0000000..ff8a73a Binary files /dev/null and b/src/ressources/UM66%.png differ diff --git a/src/ressources/UMP0%.png b/src/ressources/UMP0%.png new file mode 100644 index 0000000..103f239 Binary files /dev/null and b/src/ressources/UMP0%.png differ diff --git a/src/ressources/UMP100%.png b/src/ressources/UMP100%.png new file mode 100644 index 0000000..b0f0ced Binary files /dev/null and b/src/ressources/UMP100%.png differ diff --git a/src/ressources/UMP33%.png b/src/ressources/UMP33%.png new file mode 100644 index 0000000..427fdbb Binary files /dev/null and b/src/ressources/UMP33%.png differ diff --git a/src/ressources/UMP66%.png b/src/ressources/UMP66%.png new file mode 100644 index 0000000..6f589e8 Binary files /dev/null and b/src/ressources/UMP66%.png differ diff --git a/src/ressources/UT0%.png b/src/ressources/UT0%.png new file mode 100644 index 0000000..1f2d30d Binary files /dev/null and b/src/ressources/UT0%.png differ diff --git a/src/ressources/UT100%.png b/src/ressources/UT100%.png new file mode 100644 index 0000000..5e3ceb3 Binary files /dev/null and b/src/ressources/UT100%.png differ diff --git a/src/ressources/UT33%.png b/src/ressources/UT33%.png new file mode 100644 index 0000000..42ed105 Binary files /dev/null and b/src/ressources/UT33%.png differ diff --git a/src/ressources/UT66%.png b/src/ressources/UT66%.png new file mode 100644 index 0000000..cef2ff6 Binary files /dev/null and b/src/ressources/UT66%.png differ diff --git a/src/ressources/aile.png b/src/ressources/aile.png new file mode 100644 index 0000000..1d1b9e4 Binary files /dev/null and b/src/ressources/aile.png differ diff --git a/src/ressources/avion.png b/src/ressources/avion.png new file mode 100644 index 0000000..ec160a2 Binary files /dev/null and b/src/ressources/avion.png differ diff --git a/src/ressources/configuration.xml b/src/ressources/configuration.xml new file mode 100644 index 0000000..c28ef8b --- /dev/null +++ b/src/ressources/configuration.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + 100 + + + + + + + + + + + 50 + + + + + + + + + + + 75 + + + + + + + + + + + + 110 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ressources/metal.png b/src/ressources/metal.png new file mode 100644 index 0000000..6f0325e Binary files /dev/null and b/src/ressources/metal.png differ diff --git a/src/ressources/moteur.png b/src/ressources/moteur.png new file mode 100644 index 0000000..74fc4eb Binary files /dev/null and b/src/ressources/moteur.png differ diff --git a/src/model/Building.java b/src/simulation/Building.java similarity index 100% rename from src/model/Building.java rename to src/simulation/Building.java diff --git a/src/model/BuildingState.java b/src/simulation/BuildingState.java similarity index 100% rename from src/model/BuildingState.java rename to src/simulation/BuildingState.java diff --git a/src/model/Component.java b/src/simulation/Component.java similarity index 100% rename from src/model/Component.java rename to src/simulation/Component.java diff --git a/src/model/ComponentRoute.java b/src/simulation/ComponentRoute.java similarity index 100% rename from src/model/ComponentRoute.java rename to src/simulation/ComponentRoute.java diff --git a/src/model/ComponentType.java b/src/simulation/ComponentType.java similarity index 100% rename from src/model/ComponentType.java rename to src/simulation/ComponentType.java diff --git a/src/model/Factory.java b/src/simulation/Factory.java similarity index 100% rename from src/model/Factory.java rename to src/simulation/Factory.java diff --git a/src/model/Route.java b/src/simulation/Route.java similarity index 100% rename from src/model/Route.java rename to src/simulation/Route.java diff --git a/src/model/Warehouse.java b/src/simulation/Warehouse.java similarity index 100% rename from src/model/Warehouse.java rename to src/simulation/Warehouse.java diff --git a/src/simulation/WarehouseObserver.java b/src/simulation/WarehouseObserver.java new file mode 100644 index 0000000..566d591 --- /dev/null +++ b/src/simulation/WarehouseObserver.java @@ -0,0 +1,2 @@ +package simulation;public interface WarehouseObserver { +} diff --git a/src/simulation/WarehouseSubject.java b/src/simulation/WarehouseSubject.java new file mode 100644 index 0000000..5ce127e --- /dev/null +++ b/src/simulation/WarehouseSubject.java @@ -0,0 +1,2 @@ +package simulation;public class WarehouseSubject { +}