From ad35260a968a836ef3320277ed0b9d13759e4a1b Mon Sep 17 00:00:00 2001 From: Thomas Woehlke Date: Tue, 10 Mar 2020 18:52:34 +0100 Subject: [PATCH] devops --- .../SimulatedEvolutionApplication.java | 8 ++++---- .../evolution/config/GuiConfig.java | 2 +- .../evolution/config/GuiConfigColors.java | 2 +- .../evolution/config/GuiConfigDefault.java | 2 +- .../evolution/config/LifeCycleConfig.java | 2 +- .../config/LifeCycleConfigDefault.java | 2 +- .../evolution/config/StatisticsConfig.java | 2 +- .../config/StatisticsConfigDefault.java | 2 +- .../evolution/config/WorldConfig.java | 4 ++-- .../evolution/config/WorldConfigDefault.java | 2 +- .../evolution/config/WorldMapFoodConfig.java | 2 +- .../config/WorldMapFoodConfigDefault.java | 2 +- .../control/ControllerThreadDesktop.java | 4 ++-- .../evolution/control/ObjectRegistry.java | 20 +++++++++---------- .../simulation/evolution/model/Cell.java | 8 ++++---- .../simulation/evolution/model/CellCore.java | 3 +-- .../simulation/evolution/model/LifeCycle.java | 6 ++---- .../evolution/model/LifeCycleCount.java | 4 +--- .../model/LifeCycleCountContainer.java | 4 ++-- .../evolution/model/LifeCycleStatus.java | 4 ++-- .../evolution/model/Orientation.java | 2 +- .../simulation/evolution/model/Point.java | 2 +- .../simulation/evolution/model/World.java | 6 ++---- .../evolution/model/WorldMapFood.java | 6 +++--- .../evolution/view/PanelButtons.java | 11 +++++----- .../evolution/view/PanelCopyright.java | 4 ++-- .../evolution/view/PanelLifeCycleStatus.java | 8 ++++---- .../evolution/view/PanelSubtitle.java | 4 ++-- .../view/SimulatedEvolutionFrame.java | 6 +++--- .../evolution/view/WorldCanvas.java | 14 ++++++------- .../simulation/evolution/AppTest.java | 2 +- 31 files changed, 71 insertions(+), 79 deletions(-) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/SimulatedEvolutionApplication.java (80%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/config/GuiConfig.java (93%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/config/GuiConfigColors.java (84%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/config/GuiConfigDefault.java (90%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/config/LifeCycleConfig.java (58%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/config/LifeCycleConfigDefault.java (90%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/config/StatisticsConfig.java (82%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/config/StatisticsConfigDefault.java (67%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/config/WorldConfig.java (86%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/config/WorldConfigDefault.java (81%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/config/WorldMapFoodConfig.java (95%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/config/WorldMapFoodConfigDefault.java (87%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/control/ControllerThreadDesktop.java (95%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/control/ObjectRegistry.java (80%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/model/Cell.java (93%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/model/CellCore.java (97%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/model/LifeCycle.java (94%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/model/LifeCycleCount.java (95%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/model/LifeCycleCountContainer.java (88%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/model/LifeCycleStatus.java (81%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/model/Orientation.java (90%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/model/Point.java (97%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/model/World.java (94%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/model/WorldMapFood.java (92%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/view/PanelButtons.java (82%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/view/PanelCopyright.java (76%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/view/PanelLifeCycleStatus.java (89%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/view/PanelSubtitle.java (73%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/view/SimulatedEvolutionFrame.java (90%) rename src/main/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/view/WorldCanvas.java (81%) rename src/test/java/org/woehlke/{ => computer/kurzweil}/simulation/evolution/AppTest.java (80%) diff --git a/src/main/java/org/woehlke/simulation/evolution/SimulatedEvolutionApplication.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/SimulatedEvolutionApplication.java similarity index 80% rename from src/main/java/org/woehlke/simulation/evolution/SimulatedEvolutionApplication.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/SimulatedEvolutionApplication.java index 600e140..ab0518e 100644 --- a/src/main/java/org/woehlke/simulation/evolution/SimulatedEvolutionApplication.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/SimulatedEvolutionApplication.java @@ -1,9 +1,9 @@ -package org.woehlke.simulation.evolution; +package org.woehlke.computer.kurzweil.simulation.evolution; -import static org.woehlke.simulation.evolution.config.GuiConfigDefault.TITLE; +import static org.woehlke.computer.kurzweil.simulation.evolution.config.GuiConfigDefault.TITLE; -import org.woehlke.simulation.evolution.control.ObjectRegistry; -import org.woehlke.simulation.evolution.view.SimulatedEvolutionFrame; +import org.woehlke.computer.kurzweil.simulation.evolution.control.ObjectRegistry; +import org.woehlke.computer.kurzweil.simulation.evolution.view.SimulatedEvolutionFrame; /** * Class with main Method for Starting the Desktop Application. diff --git a/src/main/java/org/woehlke/simulation/evolution/config/GuiConfig.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/GuiConfig.java similarity index 93% rename from src/main/java/org/woehlke/simulation/evolution/config/GuiConfig.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/GuiConfig.java index b7ac9fe..18101bb 100644 --- a/src/main/java/org/woehlke/simulation/evolution/config/GuiConfig.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/GuiConfig.java @@ -1,4 +1,4 @@ -package org.woehlke.simulation.evolution.config; +package org.woehlke.computer.kurzweil.simulation.evolution.config; /** * TODO write doc. diff --git a/src/main/java/org/woehlke/simulation/evolution/config/GuiConfigColors.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/GuiConfigColors.java similarity index 84% rename from src/main/java/org/woehlke/simulation/evolution/config/GuiConfigColors.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/GuiConfigColors.java index 55cb845..bcbfd24 100644 --- a/src/main/java/org/woehlke/simulation/evolution/config/GuiConfigColors.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/GuiConfigColors.java @@ -1,4 +1,4 @@ -package org.woehlke.simulation.evolution.config; +package org.woehlke.computer.kurzweil.simulation.evolution.config; import java.awt.Color; diff --git a/src/main/java/org/woehlke/simulation/evolution/config/GuiConfigDefault.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/GuiConfigDefault.java similarity index 90% rename from src/main/java/org/woehlke/simulation/evolution/config/GuiConfigDefault.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/GuiConfigDefault.java index 62b89ce..5880264 100644 --- a/src/main/java/org/woehlke/simulation/evolution/config/GuiConfigDefault.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/GuiConfigDefault.java @@ -1,4 +1,4 @@ -package org.woehlke.simulation.evolution.config; +package org.woehlke.computer.kurzweil.simulation.evolution.config; /** * TODO write doc. diff --git a/src/main/java/org/woehlke/simulation/evolution/config/LifeCycleConfig.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/LifeCycleConfig.java similarity index 58% rename from src/main/java/org/woehlke/simulation/evolution/config/LifeCycleConfig.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/LifeCycleConfig.java index 575337c..673eb96 100644 --- a/src/main/java/org/woehlke/simulation/evolution/config/LifeCycleConfig.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/LifeCycleConfig.java @@ -1,4 +1,4 @@ -package org.woehlke.simulation.evolution.config; +package org.woehlke.computer.kurzweil.simulation.evolution.config; /** * TODO write doc. diff --git a/src/main/java/org/woehlke/simulation/evolution/config/LifeCycleConfigDefault.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/LifeCycleConfigDefault.java similarity index 90% rename from src/main/java/org/woehlke/simulation/evolution/config/LifeCycleConfigDefault.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/LifeCycleConfigDefault.java index 503498d..3b18349 100644 --- a/src/main/java/org/woehlke/simulation/evolution/config/LifeCycleConfigDefault.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/LifeCycleConfigDefault.java @@ -1,4 +1,4 @@ -package org.woehlke.simulation.evolution.config; +package org.woehlke.computer.kurzweil.simulation.evolution.config; /** * TODO write doc. diff --git a/src/main/java/org/woehlke/simulation/evolution/config/StatisticsConfig.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/StatisticsConfig.java similarity index 82% rename from src/main/java/org/woehlke/simulation/evolution/config/StatisticsConfig.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/StatisticsConfig.java index 5ba9ecb..63ccd75 100644 --- a/src/main/java/org/woehlke/simulation/evolution/config/StatisticsConfig.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/StatisticsConfig.java @@ -1,4 +1,4 @@ -package org.woehlke.simulation.evolution.config; +package org.woehlke.computer.kurzweil.simulation.evolution.config; /** * TODO write doc. diff --git a/src/main/java/org/woehlke/simulation/evolution/config/StatisticsConfigDefault.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/StatisticsConfigDefault.java similarity index 67% rename from src/main/java/org/woehlke/simulation/evolution/config/StatisticsConfigDefault.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/StatisticsConfigDefault.java index 96627e6..428bb6a 100644 --- a/src/main/java/org/woehlke/simulation/evolution/config/StatisticsConfigDefault.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/StatisticsConfigDefault.java @@ -1,4 +1,4 @@ -package org.woehlke.simulation.evolution.config; +package org.woehlke.computer.kurzweil.simulation.evolution.config; /** * TODO write doc. diff --git a/src/main/java/org/woehlke/simulation/evolution/config/WorldConfig.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/WorldConfig.java similarity index 86% rename from src/main/java/org/woehlke/simulation/evolution/config/WorldConfig.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/WorldConfig.java index 91e95ca..16a05b5 100644 --- a/src/main/java/org/woehlke/simulation/evolution/config/WorldConfig.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/WorldConfig.java @@ -1,6 +1,6 @@ -package org.woehlke.simulation.evolution.config; +package org.woehlke.computer.kurzweil.simulation.evolution.config; -import org.woehlke.simulation.evolution.model.Point; +import org.woehlke.computer.kurzweil.simulation.evolution.model.Point; import java.beans.Transient; diff --git a/src/main/java/org/woehlke/simulation/evolution/config/WorldConfigDefault.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/WorldConfigDefault.java similarity index 81% rename from src/main/java/org/woehlke/simulation/evolution/config/WorldConfigDefault.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/WorldConfigDefault.java index c4d3f40..0c5ffb2 100644 --- a/src/main/java/org/woehlke/simulation/evolution/config/WorldConfigDefault.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/WorldConfigDefault.java @@ -1,4 +1,4 @@ -package org.woehlke.simulation.evolution.config; +package org.woehlke.computer.kurzweil.simulation.evolution.config; /** * TODO write doc. diff --git a/src/main/java/org/woehlke/simulation/evolution/config/WorldMapFoodConfig.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/WorldMapFoodConfig.java similarity index 95% rename from src/main/java/org/woehlke/simulation/evolution/config/WorldMapFoodConfig.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/WorldMapFoodConfig.java index 1f61a6c..4314b64 100644 --- a/src/main/java/org/woehlke/simulation/evolution/config/WorldMapFoodConfig.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/WorldMapFoodConfig.java @@ -1,4 +1,4 @@ -package org.woehlke.simulation.evolution.config; +package org.woehlke.computer.kurzweil.simulation.evolution.config; /** * TODO write doc. diff --git a/src/main/java/org/woehlke/simulation/evolution/config/WorldMapFoodConfigDefault.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/WorldMapFoodConfigDefault.java similarity index 87% rename from src/main/java/org/woehlke/simulation/evolution/config/WorldMapFoodConfigDefault.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/WorldMapFoodConfigDefault.java index a706066..72c9001 100644 --- a/src/main/java/org/woehlke/simulation/evolution/config/WorldMapFoodConfigDefault.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/config/WorldMapFoodConfigDefault.java @@ -1,4 +1,4 @@ -package org.woehlke.simulation.evolution.config; +package org.woehlke.computer.kurzweil.simulation.evolution.config; /** * TODO write doc. diff --git a/src/main/java/org/woehlke/simulation/evolution/control/ControllerThreadDesktop.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/control/ControllerThreadDesktop.java similarity index 95% rename from src/main/java/org/woehlke/simulation/evolution/control/ControllerThreadDesktop.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/control/ControllerThreadDesktop.java index 6f77637..905d192 100644 --- a/src/main/java/org/woehlke/simulation/evolution/control/ControllerThreadDesktop.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/control/ControllerThreadDesktop.java @@ -1,6 +1,6 @@ -package org.woehlke.simulation.evolution.control; +package org.woehlke.computer.kurzweil.simulation.evolution.control; -import org.woehlke.simulation.evolution.config.GuiConfigDefault; +import org.woehlke.computer.kurzweil.simulation.evolution.config.GuiConfigDefault; import java.awt.Frame; import java.awt.event.WindowEvent; diff --git a/src/main/java/org/woehlke/simulation/evolution/control/ObjectRegistry.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/control/ObjectRegistry.java similarity index 80% rename from src/main/java/org/woehlke/simulation/evolution/control/ObjectRegistry.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/control/ObjectRegistry.java index 65675b1..5576dd1 100644 --- a/src/main/java/org/woehlke/simulation/evolution/control/ObjectRegistry.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/control/ObjectRegistry.java @@ -1,13 +1,13 @@ -package org.woehlke.simulation.evolution.control; - -import org.woehlke.simulation.evolution.config.GuiConfig; -import org.woehlke.simulation.evolution.config.StatisticsConfig; -import org.woehlke.simulation.evolution.config.WorldConfig; -import org.woehlke.simulation.evolution.config.WorldMapFoodConfig; -import org.woehlke.simulation.evolution.model.LifeCycleCountContainer; -import org.woehlke.simulation.evolution.model.World; -import org.woehlke.simulation.evolution.model.WorldMapFood; -import org.woehlke.simulation.evolution.view.*; +package org.woehlke.computer.kurzweil.simulation.evolution.control; + +import org.woehlke.computer.kurzweil.simulation.evolution.config.GuiConfig; +import org.woehlke.computer.kurzweil.simulation.evolution.config.StatisticsConfig; +import org.woehlke.computer.kurzweil.simulation.evolution.config.WorldConfig; +import org.woehlke.computer.kurzweil.simulation.evolution.config.WorldMapFoodConfig; +import org.woehlke.computer.kurzweil.simulation.evolution.model.LifeCycleCountContainer; +import org.woehlke.computer.kurzweil.simulation.evolution.model.World; +import org.woehlke.computer.kurzweil.simulation.evolution.model.WorldMapFood; +import org.woehlke.computer.kurzweil.simulation.evolution.view.*; import java.util.Date; import java.util.Random; diff --git a/src/main/java/org/woehlke/simulation/evolution/model/Cell.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/Cell.java similarity index 93% rename from src/main/java/org/woehlke/simulation/evolution/model/Cell.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/Cell.java index 35f3a9c..73f9b1a 100644 --- a/src/main/java/org/woehlke/simulation/evolution/model/Cell.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/Cell.java @@ -1,4 +1,4 @@ -package org.woehlke.simulation.evolution.model; +package org.woehlke.computer.kurzweil.simulation.evolution.model; import java.util.Random; @@ -13,9 +13,9 @@ * @author Thomas Woehlke * Date: 04.02.2006 * Time: 19:06:43 - * @see org.woehlke.simulation.evolution.model.CellCore - * @see org.woehlke.simulation.evolution.model.LifeCycle - * @see org.woehlke.simulation.evolution.model.LifeCycleStatus + * @see org.woehlke.computer.kurzweil.simulation.evolution.model.CellCore + * @see org.woehlke.computer.kurzweil.simulation.evolution.model.LifeCycle + * @see org.woehlke.computer.kurzweil.simulation.evolution.model.LifeCycleStatus *

* © 2006 - 2008 Thomas Woehlke. * http://thomas-woehlke.de/p/simulated-evolution/ diff --git a/src/main/java/org/woehlke/simulation/evolution/model/CellCore.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/CellCore.java similarity index 97% rename from src/main/java/org/woehlke/simulation/evolution/model/CellCore.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/CellCore.java index 5020f59..e27bfaa 100644 --- a/src/main/java/org/woehlke/simulation/evolution/model/CellCore.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/CellCore.java @@ -1,6 +1,5 @@ -package org.woehlke.simulation.evolution.model; +package org.woehlke.computer.kurzweil.simulation.evolution.model; -import java.io.Serializable; import java.util.List; import java.util.Random; import java.util.ArrayList; diff --git a/src/main/java/org/woehlke/simulation/evolution/model/LifeCycle.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/LifeCycle.java similarity index 94% rename from src/main/java/org/woehlke/simulation/evolution/model/LifeCycle.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/LifeCycle.java index 73e82e9..fa0e4cf 100644 --- a/src/main/java/org/woehlke/simulation/evolution/model/LifeCycle.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/LifeCycle.java @@ -1,8 +1,6 @@ -package org.woehlke.simulation.evolution.model; +package org.woehlke.computer.kurzweil.simulation.evolution.model; -import org.woehlke.simulation.evolution.config.LifeCycleConfigDefault; - -import java.io.Serializable; +import org.woehlke.computer.kurzweil.simulation.evolution.config.LifeCycleConfigDefault; /** * State of the Cell which monitors age and getting enough food. diff --git a/src/main/java/org/woehlke/simulation/evolution/model/LifeCycleCount.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/LifeCycleCount.java similarity index 95% rename from src/main/java/org/woehlke/simulation/evolution/model/LifeCycleCount.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/LifeCycleCount.java index 4d6c944..be0302e 100644 --- a/src/main/java/org/woehlke/simulation/evolution/model/LifeCycleCount.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/LifeCycleCount.java @@ -1,6 +1,4 @@ -package org.woehlke.simulation.evolution.model; - -import org.woehlke.simulation.evolution.model.LifeCycleStatus; +package org.woehlke.computer.kurzweil.simulation.evolution.model; /** * TODO write doc. diff --git a/src/main/java/org/woehlke/simulation/evolution/model/LifeCycleCountContainer.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/LifeCycleCountContainer.java similarity index 88% rename from src/main/java/org/woehlke/simulation/evolution/model/LifeCycleCountContainer.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/LifeCycleCountContainer.java index 6462001..263956d 100644 --- a/src/main/java/org/woehlke/simulation/evolution/model/LifeCycleCountContainer.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/LifeCycleCountContainer.java @@ -1,6 +1,6 @@ -package org.woehlke.simulation.evolution.model; +package org.woehlke.computer.kurzweil.simulation.evolution.model; -import org.woehlke.simulation.evolution.control.ObjectRegistry; +import org.woehlke.computer.kurzweil.simulation.evolution.control.ObjectRegistry; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/src/main/java/org/woehlke/simulation/evolution/model/LifeCycleStatus.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/LifeCycleStatus.java similarity index 81% rename from src/main/java/org/woehlke/simulation/evolution/model/LifeCycleStatus.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/LifeCycleStatus.java index e03a1bb..41ddd7d 100644 --- a/src/main/java/org/woehlke/simulation/evolution/model/LifeCycleStatus.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/LifeCycleStatus.java @@ -1,8 +1,8 @@ -package org.woehlke.simulation.evolution.model; +package org.woehlke.computer.kurzweil.simulation.evolution.model; import java.awt.Color; -import static org.woehlke.simulation.evolution.config.GuiConfigColors.*; +import static org.woehlke.computer.kurzweil.simulation.evolution.config.GuiConfigColors.*; /** * The Status of the Cell's LifeCycle. diff --git a/src/main/java/org/woehlke/simulation/evolution/model/Orientation.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/Orientation.java similarity index 90% rename from src/main/java/org/woehlke/simulation/evolution/model/Orientation.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/Orientation.java index 0bcfaf1..a83f19e 100644 --- a/src/main/java/org/woehlke/simulation/evolution/model/Orientation.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/Orientation.java @@ -1,4 +1,4 @@ -package org.woehlke.simulation.evolution.model; +package org.woehlke.computer.kurzweil.simulation.evolution.model; /** * Orientation defines the new position after next move. diff --git a/src/main/java/org/woehlke/simulation/evolution/model/Point.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/Point.java similarity index 97% rename from src/main/java/org/woehlke/simulation/evolution/model/Point.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/Point.java index 066f259..0abce26 100644 --- a/src/main/java/org/woehlke/simulation/evolution/model/Point.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/Point.java @@ -1,4 +1,4 @@ -package org.woehlke.simulation.evolution.model; +package org.woehlke.computer.kurzweil.simulation.evolution.model; /** * A Point is used to define the Position of Cell or as a Vector for defining Dimensions. diff --git a/src/main/java/org/woehlke/simulation/evolution/model/World.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/World.java similarity index 94% rename from src/main/java/org/woehlke/simulation/evolution/model/World.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/World.java index c90aa09..4c3ecf9 100644 --- a/src/main/java/org/woehlke/simulation/evolution/model/World.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/World.java @@ -1,12 +1,10 @@ -package org.woehlke.simulation.evolution.model; +package org.woehlke.computer.kurzweil.simulation.evolution.model; -import org.woehlke.simulation.evolution.control.ObjectRegistry; +import org.woehlke.computer.kurzweil.simulation.evolution.control.ObjectRegistry; import java.util.ArrayList; -import java.util.Date; import java.util.List; -import java.util.Random; /** * The World contains Water, Cells and Food. diff --git a/src/main/java/org/woehlke/simulation/evolution/model/WorldMapFood.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/WorldMapFood.java similarity index 92% rename from src/main/java/org/woehlke/simulation/evolution/model/WorldMapFood.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/WorldMapFood.java index 23eddfd..7ca6a18 100644 --- a/src/main/java/org/woehlke/simulation/evolution/model/WorldMapFood.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/model/WorldMapFood.java @@ -1,7 +1,7 @@ -package org.woehlke.simulation.evolution.model; +package org.woehlke.computer.kurzweil.simulation.evolution.model; -import org.woehlke.simulation.evolution.config.WorldMapFoodConfigDefault; -import org.woehlke.simulation.evolution.control.ObjectRegistry; +import org.woehlke.computer.kurzweil.simulation.evolution.config.WorldMapFoodConfigDefault; +import org.woehlke.computer.kurzweil.simulation.evolution.control.ObjectRegistry; /** diff --git a/src/main/java/org/woehlke/simulation/evolution/view/PanelButtons.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/view/PanelButtons.java similarity index 82% rename from src/main/java/org/woehlke/simulation/evolution/view/PanelButtons.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/view/PanelButtons.java index 41b5d35..3421fda 100644 --- a/src/main/java/org/woehlke/simulation/evolution/view/PanelButtons.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/view/PanelButtons.java @@ -1,7 +1,6 @@ -package org.woehlke.simulation.evolution.view; +package org.woehlke.computer.kurzweil.simulation.evolution.view; -import org.woehlke.simulation.evolution.control.ControllerThreadDesktop; -import org.woehlke.simulation.evolution.control.ObjectRegistry; +import org.woehlke.computer.kurzweil.simulation.evolution.control.ObjectRegistry; import javax.swing.JButton; import javax.swing.JCheckBox; @@ -12,9 +11,9 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import static org.woehlke.simulation.evolution.config.GuiConfigDefault.BUTTON_FOOD_DECREASE; -import static org.woehlke.simulation.evolution.config.GuiConfigDefault.BUTTON_FOOD_INCREASE; -import static org.woehlke.simulation.evolution.config.GuiConfigDefault.BUTTON_TOGGLE_GARDEN_OF_EDEN; +import static org.woehlke.computer.kurzweil.simulation.evolution.config.GuiConfigDefault.BUTTON_FOOD_DECREASE; +import static org.woehlke.computer.kurzweil.simulation.evolution.config.GuiConfigDefault.BUTTON_FOOD_INCREASE; +import static org.woehlke.computer.kurzweil.simulation.evolution.config.GuiConfigDefault.BUTTON_TOGGLE_GARDEN_OF_EDEN; /** * TODO write doc. diff --git a/src/main/java/org/woehlke/simulation/evolution/view/PanelCopyright.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/view/PanelCopyright.java similarity index 76% rename from src/main/java/org/woehlke/simulation/evolution/view/PanelCopyright.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/view/PanelCopyright.java index df86b30..ff47639 100644 --- a/src/main/java/org/woehlke/simulation/evolution/view/PanelCopyright.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/view/PanelCopyright.java @@ -1,6 +1,6 @@ -package org.woehlke.simulation.evolution.view; +package org.woehlke.computer.kurzweil.simulation.evolution.view; -import org.woehlke.simulation.evolution.control.ObjectRegistry; +import org.woehlke.computer.kurzweil.simulation.evolution.control.ObjectRegistry; import javax.swing.JLabel; import javax.swing.JPanel; diff --git a/src/main/java/org/woehlke/simulation/evolution/view/PanelLifeCycleStatus.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/view/PanelLifeCycleStatus.java similarity index 89% rename from src/main/java/org/woehlke/simulation/evolution/view/PanelLifeCycleStatus.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/view/PanelLifeCycleStatus.java index bcbca6a..0a0328c 100644 --- a/src/main/java/org/woehlke/simulation/evolution/view/PanelLifeCycleStatus.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/view/PanelLifeCycleStatus.java @@ -1,14 +1,14 @@ -package org.woehlke.simulation.evolution.view; +package org.woehlke.computer.kurzweil.simulation.evolution.view; -import org.woehlke.simulation.evolution.control.ObjectRegistry; -import org.woehlke.simulation.evolution.model.LifeCycleCount; +import org.woehlke.computer.kurzweil.simulation.evolution.control.ObjectRegistry; +import org.woehlke.computer.kurzweil.simulation.evolution.model.LifeCycleCount; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; import java.awt.*; -import static org.woehlke.simulation.evolution.config.GuiConfigColors.*; +import static org.woehlke.computer.kurzweil.simulation.evolution.config.GuiConfigColors.*; /** * TODO write doc. diff --git a/src/main/java/org/woehlke/simulation/evolution/view/PanelSubtitle.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/view/PanelSubtitle.java similarity index 73% rename from src/main/java/org/woehlke/simulation/evolution/view/PanelSubtitle.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/view/PanelSubtitle.java index 7ac464a..6a80193 100644 --- a/src/main/java/org/woehlke/simulation/evolution/view/PanelSubtitle.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/view/PanelSubtitle.java @@ -1,6 +1,6 @@ -package org.woehlke.simulation.evolution.view; +package org.woehlke.computer.kurzweil.simulation.evolution.view; -import org.woehlke.simulation.evolution.control.ObjectRegistry; +import org.woehlke.computer.kurzweil.simulation.evolution.control.ObjectRegistry; import javax.swing.JLabel; import javax.swing.JPanel; diff --git a/src/main/java/org/woehlke/simulation/evolution/view/SimulatedEvolutionFrame.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/view/SimulatedEvolutionFrame.java similarity index 90% rename from src/main/java/org/woehlke/simulation/evolution/view/SimulatedEvolutionFrame.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/view/SimulatedEvolutionFrame.java index 96e5334..69e2701 100644 --- a/src/main/java/org/woehlke/simulation/evolution/view/SimulatedEvolutionFrame.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/view/SimulatedEvolutionFrame.java @@ -1,7 +1,7 @@ -package org.woehlke.simulation.evolution.view; +package org.woehlke.computer.kurzweil.simulation.evolution.view; -import org.woehlke.simulation.evolution.config.GuiConfigDefault; -import org.woehlke.simulation.evolution.control.ObjectRegistry; +import org.woehlke.computer.kurzweil.simulation.evolution.config.GuiConfigDefault; +import org.woehlke.computer.kurzweil.simulation.evolution.control.ObjectRegistry; import javax.swing.BoxLayout; import javax.swing.JFrame; diff --git a/src/main/java/org/woehlke/simulation/evolution/view/WorldCanvas.java b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/view/WorldCanvas.java similarity index 81% rename from src/main/java/org/woehlke/simulation/evolution/view/WorldCanvas.java rename to src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/view/WorldCanvas.java index f7e816b..53f2301 100644 --- a/src/main/java/org/woehlke/simulation/evolution/view/WorldCanvas.java +++ b/src/main/java/org/woehlke/computer/kurzweil/simulation/evolution/view/WorldCanvas.java @@ -1,9 +1,9 @@ -package org.woehlke.simulation.evolution.view; +package org.woehlke.computer.kurzweil.simulation.evolution.view; -import org.woehlke.simulation.evolution.config.GuiConfigDefault; -import org.woehlke.simulation.evolution.control.ObjectRegistry; -import org.woehlke.simulation.evolution.model.Cell; -import org.woehlke.simulation.evolution.model.Point; +import org.woehlke.computer.kurzweil.simulation.evolution.config.GuiConfigDefault; +import org.woehlke.computer.kurzweil.simulation.evolution.control.ObjectRegistry; +import org.woehlke.computer.kurzweil.simulation.evolution.model.Cell; +import org.woehlke.computer.kurzweil.simulation.evolution.model.Point; import javax.swing.JComponent; import java.awt.Dimension; @@ -11,8 +11,8 @@ import java.io.Serializable; import java.util.List; -import static org.woehlke.simulation.evolution.config.GuiConfigColors.COLOR_FOOD; -import static org.woehlke.simulation.evolution.config.GuiConfigColors.COLOR_WATER; +import static org.woehlke.computer.kurzweil.simulation.evolution.config.GuiConfigColors.COLOR_FOOD; +import static org.woehlke.computer.kurzweil.simulation.evolution.config.GuiConfigColors.COLOR_WATER; /** diff --git a/src/test/java/org/woehlke/simulation/evolution/AppTest.java b/src/test/java/org/woehlke/computer/kurzweil/simulation/evolution/AppTest.java similarity index 80% rename from src/test/java/org/woehlke/simulation/evolution/AppTest.java rename to src/test/java/org/woehlke/computer/kurzweil/simulation/evolution/AppTest.java index 25929bd..316b890 100644 --- a/src/test/java/org/woehlke/simulation/evolution/AppTest.java +++ b/src/test/java/org/woehlke/computer/kurzweil/simulation/evolution/AppTest.java @@ -1,4 +1,4 @@ -package org.woehlke.simulation.evolution; +package org.woehlke.computer.kurzweil.simulation.evolution; import org.junit.Assert; import org.junit.Test;