diff --git a/src/main/java/application/Start.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/application/Start.java similarity index 81% rename from src/main/java/application/Start.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/application/Start.java index 7d8f348..092a7f6 100644 --- a/src/main/java/application/Start.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/application/Start.java @@ -1,6 +1,6 @@ -package application; +package de.stevenschwenke.java.javafx.simFX.application; -import ui.javaFX.JavaFxApplication; +import de.stevenschwenke.java.javafx.simFX.ui.javaFX.JavaFxApplication; /** * Entry point for this project. Here, the used UI framework is chosen. The diff --git a/src/main/java/business/UserInterface.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/UserInterface.java similarity index 83% rename from src/main/java/business/UserInterface.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/business/UserInterface.java index 830930e..21d9906 100644 --- a/src/main/java/business/UserInterface.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/UserInterface.java @@ -1,8 +1,8 @@ -package business; +package de.stevenschwenke.java.javafx.simFX.business; -import business.logicalObjects.GameState; -import business.logicalObjects.Interaction; -import business.worldObjects.WorldObject; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.GameState; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.Interaction; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.WorldObject; /** * This interface has to be implemented by all base classes for other user diff --git a/src/main/java/business/logicalObjects/CartesianCoordinate.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/CartesianCoordinate.java similarity index 94% rename from src/main/java/business/logicalObjects/CartesianCoordinate.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/CartesianCoordinate.java index 1c5cbeb..ab80c50 100644 --- a/src/main/java/business/logicalObjects/CartesianCoordinate.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/CartesianCoordinate.java @@ -1,4 +1,4 @@ -package business.logicalObjects; +package de.stevenschwenke.java.javafx.simFX.business.logicalObjects; /** * Represents a point in a 2-dimensional space. diff --git a/src/main/java/business/logicalObjects/GameState.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/GameState.java similarity index 61% rename from src/main/java/business/logicalObjects/GameState.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/GameState.java index a7d8e25..a698707 100644 --- a/src/main/java/business/logicalObjects/GameState.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/GameState.java @@ -1,4 +1,4 @@ -package business.logicalObjects; +package de.stevenschwenke.java.javafx.simFX.business.logicalObjects; /** * States in which the game can be. diff --git a/src/main/java/business/logicalObjects/GameStateManager.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/GameStateManager.java similarity index 73% rename from src/main/java/business/logicalObjects/GameStateManager.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/GameStateManager.java index b7320ea..b1fa9e6 100644 --- a/src/main/java/business/logicalObjects/GameStateManager.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/GameStateManager.java @@ -1,7 +1,7 @@ -package business.logicalObjects; +package de.stevenschwenke.java.javafx.simFX.business.logicalObjects; -import business.worldObjects.Colony; -import business.worldObjects.World; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.Colony; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.World; /** * Class that manages the state of the game. Currently, there are two States: diff --git a/src/main/java/business/logicalObjects/GeographicalLogicProvider.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/GeographicalLogicProvider.java similarity index 85% rename from src/main/java/business/logicalObjects/GeographicalLogicProvider.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/GeographicalLogicProvider.java index e61e41f..860a628 100644 --- a/src/main/java/business/logicalObjects/GeographicalLogicProvider.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/GeographicalLogicProvider.java @@ -1,8 +1,9 @@ -package business.logicalObjects; +package de.stevenschwenke.java.javafx.simFX.business.logicalObjects; import java.util.Set; -import business.worldObjects.Resource; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.Resource; + /** * Provides geographical logic. diff --git a/src/main/java/business/logicalObjects/GroupMembership.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/GroupMembership.java similarity index 63% rename from src/main/java/business/logicalObjects/GroupMembership.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/GroupMembership.java index d91fbac..9d000c8 100644 --- a/src/main/java/business/logicalObjects/GroupMembership.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/GroupMembership.java @@ -1,4 +1,4 @@ -package business.logicalObjects; +package de.stevenschwenke.java.javafx.simFX.business.logicalObjects; /** * To assign an object in the game to a group. diff --git a/src/main/java/business/logicalObjects/Interaction.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/Interaction.java similarity index 66% rename from src/main/java/business/logicalObjects/Interaction.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/Interaction.java index 1b23e60..f400b82 100644 --- a/src/main/java/business/logicalObjects/Interaction.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/Interaction.java @@ -1,8 +1,8 @@ -package business.logicalObjects; +package de.stevenschwenke.java.javafx.simFX.business.logicalObjects; -import business.worldObjects.Colony; -import business.worldObjects.World; -import business.worldObjects.WorldObject; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.Colony; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.World; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.WorldObject; /** * This class holds all UI-relevant interactions between {@link WorldObject}s. diff --git a/src/main/java/business/logicalObjects/PolarCoordinate.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/PolarCoordinate.java similarity index 92% rename from src/main/java/business/logicalObjects/PolarCoordinate.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/PolarCoordinate.java index c64655c..a5797ee 100644 --- a/src/main/java/business/logicalObjects/PolarCoordinate.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/PolarCoordinate.java @@ -1,4 +1,4 @@ -package business.logicalObjects; +package de.stevenschwenke.java.javafx.simFX.business.logicalObjects; /** diff --git a/src/main/java/business/worldObjects/Colony.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/worldObjects/Colony.java similarity index 90% rename from src/main/java/business/worldObjects/Colony.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/business/worldObjects/Colony.java index d82197b..c68bd2d 100644 --- a/src/main/java/business/worldObjects/Colony.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/worldObjects/Colony.java @@ -1,13 +1,14 @@ -package business.worldObjects; +package de.stevenschwenke.java.javafx.simFX.business.worldObjects; import java.util.Timer; import java.util.TimerTask; -import business.logicalObjects.CartesianCoordinate; -import business.logicalObjects.GameStateManager; -import business.logicalObjects.GeographicalLogicProvider; -import business.logicalObjects.GroupMembership; -import business.logicalObjects.Interaction; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.CartesianCoordinate; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.GameStateManager; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.GeographicalLogicProvider; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.GroupMembership; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.Interaction; + /** * Some kind of base or settlement or colony. Don't know yet. diff --git a/src/main/java/business/worldObjects/Resource.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/worldObjects/Resource.java similarity index 71% rename from src/main/java/business/worldObjects/Resource.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/business/worldObjects/Resource.java index 1404b5a..2f1a561 100644 --- a/src/main/java/business/worldObjects/Resource.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/worldObjects/Resource.java @@ -1,6 +1,6 @@ -package business.worldObjects; +package de.stevenschwenke.java.javafx.simFX.business.worldObjects; -import business.logicalObjects.CartesianCoordinate; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.CartesianCoordinate; /** * A resource. diff --git a/src/main/java/business/worldObjects/ResourceSpawner.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/worldObjects/ResourceSpawner.java similarity index 88% rename from src/main/java/business/worldObjects/ResourceSpawner.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/business/worldObjects/ResourceSpawner.java index f3be91c..6e8ce9a 100644 --- a/src/main/java/business/worldObjects/ResourceSpawner.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/worldObjects/ResourceSpawner.java @@ -1,4 +1,4 @@ -package business.worldObjects; +package de.stevenschwenke.java.javafx.simFX.business.worldObjects; import java.util.HashSet; import java.util.Random; @@ -6,8 +6,9 @@ import java.util.Timer; import java.util.TimerTask; -import business.logicalObjects.CartesianCoordinate; -import business.logicalObjects.PolarCoordinate; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.CartesianCoordinate; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.PolarCoordinate; + /** * Let the user spawn {@link Resource}s manually. diff --git a/src/main/java/business/worldObjects/World.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/worldObjects/World.java similarity index 87% rename from src/main/java/business/worldObjects/World.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/business/worldObjects/World.java index b6491e1..ab05c5a 100644 --- a/src/main/java/business/worldObjects/World.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/worldObjects/World.java @@ -1,14 +1,15 @@ -package business.worldObjects; +package de.stevenschwenke.java.javafx.simFX.business.worldObjects; import java.util.HashSet; import java.util.Set; -import business.UserInterface; -import business.logicalObjects.CartesianCoordinate; -import business.logicalObjects.GameState; -import business.logicalObjects.GameStateManager; -import business.logicalObjects.GroupMembership; -import business.logicalObjects.Interaction; +import de.stevenschwenke.java.javafx.simFX.business.UserInterface; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.CartesianCoordinate; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.GameState; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.GameStateManager; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.GroupMembership; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.Interaction; + /** * The world in which the simulation takes place. Singelton. diff --git a/src/main/java/business/worldObjects/WorldObject.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/worldObjects/WorldObject.java similarity index 73% rename from src/main/java/business/worldObjects/WorldObject.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/business/worldObjects/WorldObject.java index fcb960e..08b3d85 100644 --- a/src/main/java/business/worldObjects/WorldObject.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/business/worldObjects/WorldObject.java @@ -1,8 +1,9 @@ -package business.worldObjects; +package de.stevenschwenke.java.javafx.simFX.business.worldObjects; import java.util.TimerTask; -import business.logicalObjects.CartesianCoordinate; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.CartesianCoordinate; + /** * All objects that are meant to be displayed in the user interface have to diff --git a/src/main/java/ui/javaFX/JavaFxApplication.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/JavaFxApplication.java similarity index 88% rename from src/main/java/ui/javaFX/JavaFxApplication.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/JavaFxApplication.java index 59c55a5..ba198a1 100644 --- a/src/main/java/ui/javaFX/JavaFxApplication.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/JavaFxApplication.java @@ -1,8 +1,21 @@ -package ui.javaFX; +package de.stevenschwenke.java.javafx.simFX.ui.javaFX; import java.util.Timer; import java.util.TimerTask; +import de.stevenschwenke.java.javafx.simFX.business.UserInterface; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.GameState; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.Interaction; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.Colony; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.Resource; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.ResourceSpawner; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.World; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.WorldObject; +import de.stevenschwenke.java.javafx.simFX.ui.javaFX.interfaceObjects.RootInfoPane; +import de.stevenschwenke.java.javafx.simFX.ui.javaFX.worldObjects.ColonyFX; +import de.stevenschwenke.java.javafx.simFX.ui.javaFX.worldObjects.ResourceFX; +import de.stevenschwenke.java.javafx.simFX.ui.javaFX.worldObjects.ResourceSpawnerFX; + import javafx.animation.FadeTransition; import javafx.application.Application; import javafx.application.Platform; @@ -20,18 +33,6 @@ import javafx.scene.shape.Line; import javafx.stage.Stage; import javafx.util.Duration; -import ui.javaFX.interfaceObjects.RootInfoPane; -import ui.javaFX.worldObjects.ColonyFX; -import ui.javaFX.worldObjects.ResourceFX; -import ui.javaFX.worldObjects.ResourceSpawnerFX; -import business.UserInterface; -import business.logicalObjects.GameState; -import business.logicalObjects.Interaction; -import business.worldObjects.Colony; -import business.worldObjects.Resource; -import business.worldObjects.ResourceSpawner; -import business.worldObjects.World; -import business.worldObjects.WorldObject; /** * User Interface with JavaFX. This class starts a JavaFX application and diff --git a/src/main/java/ui/javaFX/interfaceObjects/AttackEventHandler.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/interfaceObjects/AttackEventHandler.java similarity index 85% rename from src/main/java/ui/javaFX/interfaceObjects/AttackEventHandler.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/interfaceObjects/AttackEventHandler.java index c0a5e98..eb578e5 100644 --- a/src/main/java/ui/javaFX/interfaceObjects/AttackEventHandler.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/interfaceObjects/AttackEventHandler.java @@ -1,13 +1,13 @@ -package ui.javaFX.interfaceObjects; +package de.stevenschwenke.java.javafx.simFX.ui.javaFX.interfaceObjects; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.Colony; +import de.stevenschwenke.java.javafx.simFX.ui.javaFX.JavaFxApplication; +import de.stevenschwenke.java.javafx.simFX.ui.javaFX.worldObjects.ColonyFX; import javafx.event.ActionEvent; import javafx.event.EventHandler; import javafx.scene.Cursor; import javafx.scene.input.MouseDragEvent; import javafx.scene.input.MouseEvent; -import ui.javaFX.JavaFxApplication; -import ui.javaFX.worldObjects.ColonyFX; -import business.worldObjects.Colony; /** * Event handler for attacking foe colonies. diff --git a/src/main/java/ui/javaFX/interfaceObjects/ColonizeEventHandler.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/interfaceObjects/ColonizeEventHandler.java similarity index 82% rename from src/main/java/ui/javaFX/interfaceObjects/ColonizeEventHandler.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/interfaceObjects/ColonizeEventHandler.java index 39b29f6..1bb22b5 100644 --- a/src/main/java/ui/javaFX/interfaceObjects/ColonizeEventHandler.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/interfaceObjects/ColonizeEventHandler.java @@ -1,12 +1,12 @@ -package ui.javaFX.interfaceObjects; +package de.stevenschwenke.java.javafx.simFX.ui.javaFX.interfaceObjects; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.CartesianCoordinate; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.Colony; +import de.stevenschwenke.java.javafx.simFX.ui.javaFX.JavaFxApplication; import javafx.event.ActionEvent; import javafx.event.EventHandler; import javafx.event.EventTarget; import javafx.scene.input.MouseEvent; -import ui.javaFX.JavaFxApplication; -import business.logicalObjects.CartesianCoordinate; -import business.worldObjects.Colony; /** * Event handler for creating new colonies. diff --git a/src/main/java/ui/javaFX/interfaceObjects/ColonyFXMouseOverPane.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/interfaceObjects/ColonyFXMouseOverPane.java similarity index 94% rename from src/main/java/ui/javaFX/interfaceObjects/ColonyFXMouseOverPane.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/interfaceObjects/ColonyFXMouseOverPane.java index 5deaaa5..f8d4bdc 100644 --- a/src/main/java/ui/javaFX/interfaceObjects/ColonyFXMouseOverPane.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/interfaceObjects/ColonyFXMouseOverPane.java @@ -1,5 +1,8 @@ -package ui.javaFX.interfaceObjects; +package de.stevenschwenke.java.javafx.simFX.ui.javaFX.interfaceObjects; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.Colony; +import de.stevenschwenke.java.javafx.simFX.ui.javaFX.JavaFxApplication; +import de.stevenschwenke.java.javafx.simFX.ui.javaFX.worldObjects.ColonyFX; import javafx.animation.ScaleTransition; import javafx.collections.ObservableList; import javafx.event.ActionEvent; @@ -16,9 +19,6 @@ import javafx.scene.paint.Color; import javafx.scene.shape.Circle; import javafx.util.Duration; -import ui.javaFX.JavaFxApplication; -import ui.javaFX.worldObjects.ColonyFX; -import business.worldObjects.Colony; /** * Pane that opens when hovering over a {@link ColonyFX}. diff --git a/src/main/java/ui/javaFX/interfaceObjects/ResourceSpawnerFXMouseOverPane.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/interfaceObjects/ResourceSpawnerFXMouseOverPane.java similarity index 93% rename from src/main/java/ui/javaFX/interfaceObjects/ResourceSpawnerFXMouseOverPane.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/interfaceObjects/ResourceSpawnerFXMouseOverPane.java index 41c9e80..e99e42a 100644 --- a/src/main/java/ui/javaFX/interfaceObjects/ResourceSpawnerFXMouseOverPane.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/interfaceObjects/ResourceSpawnerFXMouseOverPane.java @@ -1,5 +1,8 @@ -package ui.javaFX.interfaceObjects; +package de.stevenschwenke.java.javafx.simFX.ui.javaFX.interfaceObjects; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.ResourceSpawner; +import de.stevenschwenke.java.javafx.simFX.ui.javaFX.JavaFxApplication; +import de.stevenschwenke.java.javafx.simFX.ui.javaFX.worldObjects.ResourceSpawnerFX; import javafx.animation.ScaleTransition; import javafx.collections.ObservableList; import javafx.event.ActionEvent; @@ -15,9 +18,6 @@ import javafx.scene.layout.ColumnConstraints; import javafx.scene.layout.GridPane; import javafx.util.Duration; -import ui.javaFX.JavaFxApplication; -import ui.javaFX.worldObjects.ResourceSpawnerFX; -import business.worldObjects.ResourceSpawner; /** * Pane that opens when hovering over a {@link ResourceSpawnerFX}. diff --git a/src/main/java/ui/javaFX/interfaceObjects/RootInfoPane.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/interfaceObjects/RootInfoPane.java similarity index 90% rename from src/main/java/ui/javaFX/interfaceObjects/RootInfoPane.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/interfaceObjects/RootInfoPane.java index a50b580..8c530e4 100644 --- a/src/main/java/ui/javaFX/interfaceObjects/RootInfoPane.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/interfaceObjects/RootInfoPane.java @@ -1,11 +1,11 @@ -package ui.javaFX.interfaceObjects; +package de.stevenschwenke.java.javafx.simFX.ui.javaFX.interfaceObjects; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.World; import javafx.event.Event; import javafx.event.EventHandler; import javafx.scene.control.TextArea; import javafx.scene.control.TitledPane; import javafx.scene.input.MouseEvent; -import business.worldObjects.World; /** * Pane showing information about the world during root mode. diff --git a/src/main/java/ui/javaFX/worldObjects/ColonyFX.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/worldObjects/ColonyFX.java similarity index 79% rename from src/main/java/ui/javaFX/worldObjects/ColonyFX.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/worldObjects/ColonyFX.java index 58b29f7..0b55042 100644 --- a/src/main/java/ui/javaFX/worldObjects/ColonyFX.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/worldObjects/ColonyFX.java @@ -1,13 +1,13 @@ -package ui.javaFX.worldObjects; +package de.stevenschwenke.java.javafx.simFX.ui.javaFX.worldObjects; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.GroupMembership; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.Colony; +import de.stevenschwenke.java.javafx.simFX.ui.javaFX.JavaFxApplication; +import de.stevenschwenke.java.javafx.simFX.ui.javaFX.interfaceObjects.ColonyFXMouseOverPane; import javafx.event.EventHandler; import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.scene.input.MouseEvent; -import ui.javaFX.JavaFxApplication; -import ui.javaFX.interfaceObjects.ColonyFXMouseOverPane; -import business.logicalObjects.GroupMembership; -import business.worldObjects.Colony; /** * Graphical representation of a {@link Colony} for JavaFX. diff --git a/src/main/java/ui/javaFX/worldObjects/ResourceFX.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/worldObjects/ResourceFX.java similarity index 89% rename from src/main/java/ui/javaFX/worldObjects/ResourceFX.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/worldObjects/ResourceFX.java index 94d3488..72680bc 100644 --- a/src/main/java/ui/javaFX/worldObjects/ResourceFX.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/worldObjects/ResourceFX.java @@ -1,11 +1,11 @@ -package ui.javaFX.worldObjects; +package de.stevenschwenke.java.javafx.simFX.ui.javaFX.worldObjects; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.Resource; import javafx.animation.FadeTransition; import javafx.animation.ScaleTransition; import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.util.Duration; -import business.worldObjects.Resource; /** * Graphical representation of a {@link Resource} for JavaFX. diff --git a/src/main/java/ui/javaFX/worldObjects/ResourceSpawnerFX.java b/src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/worldObjects/ResourceSpawnerFX.java similarity index 87% rename from src/main/java/ui/javaFX/worldObjects/ResourceSpawnerFX.java rename to src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/worldObjects/ResourceSpawnerFX.java index 0a16bf4..8b496ee 100644 --- a/src/main/java/ui/javaFX/worldObjects/ResourceSpawnerFX.java +++ b/src/main/java/de/stevenschwenke/java/javafx/simFX/ui/javaFX/worldObjects/ResourceSpawnerFX.java @@ -1,13 +1,13 @@ -package ui.javaFX.worldObjects; +package de.stevenschwenke.java.javafx.simFX.ui.javaFX.worldObjects; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.ResourceSpawner; +import de.stevenschwenke.java.javafx.simFX.ui.javaFX.JavaFxApplication; +import de.stevenschwenke.java.javafx.simFX.ui.javaFX.interfaceObjects.ResourceSpawnerFXMouseOverPane; import javafx.event.EventHandler; import javafx.scene.control.Button; import javafx.scene.input.MouseEvent; import javafx.scene.paint.Color; import javafx.scene.shape.Circle; -import ui.javaFX.JavaFxApplication; -import ui.javaFX.interfaceObjects.ResourceSpawnerFXMouseOverPane; -import business.worldObjects.ResourceSpawner; /** * Graphical representation of a {@link RessourceSpawnerRepresentation} for diff --git a/src/test/java/business/logicalObjects/GeographicalLogicProviderTest.java b/src/test/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/GeographicalLogicProviderTest.java similarity index 86% rename from src/test/java/business/logicalObjects/GeographicalLogicProviderTest.java rename to src/test/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/GeographicalLogicProviderTest.java index bc9681a..927d8dc 100644 --- a/src/test/java/business/logicalObjects/GeographicalLogicProviderTest.java +++ b/src/test/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/GeographicalLogicProviderTest.java @@ -1,4 +1,4 @@ -package business.logicalObjects; +package de.stevenschwenke.java.javafx.simFX.business.logicalObjects; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -8,7 +8,10 @@ import org.junit.Test; -import business.worldObjects.Resource; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.CartesianCoordinate; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.GeographicalLogicProvider; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.Resource; + /** * Test for {@link GeographicalLogicProvider}. diff --git a/src/test/java/business/logicalObjects/PolarCoordinateTest.java b/src/test/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/PolarCoordinateTest.java similarity index 92% rename from src/test/java/business/logicalObjects/PolarCoordinateTest.java rename to src/test/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/PolarCoordinateTest.java index 7880a16..326107b 100644 --- a/src/test/java/business/logicalObjects/PolarCoordinateTest.java +++ b/src/test/java/de/stevenschwenke/java/javafx/simFX/business/logicalObjects/PolarCoordinateTest.java @@ -1,9 +1,12 @@ -package business.logicalObjects; +package de.stevenschwenke.java.javafx.simFX.business.logicalObjects; import static org.junit.Assert.assertEquals; import org.junit.Test; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.CartesianCoordinate; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.PolarCoordinate; + /** * Tests for {@link PolarCoordinate}. * diff --git a/src/test/java/business/worldObjects/ColonyTest.java b/src/test/java/de/stevenschwenke/java/javafx/simFX/business/worldObjects/ColonyTest.java similarity index 73% rename from src/test/java/business/worldObjects/ColonyTest.java rename to src/test/java/de/stevenschwenke/java/javafx/simFX/business/worldObjects/ColonyTest.java index 77fe68b..22360b6 100644 --- a/src/test/java/business/worldObjects/ColonyTest.java +++ b/src/test/java/de/stevenschwenke/java/javafx/simFX/business/worldObjects/ColonyTest.java @@ -1,4 +1,4 @@ -package business.worldObjects; +package de.stevenschwenke.java.javafx.simFX.business.worldObjects; import static org.junit.Assert.assertEquals; @@ -6,9 +6,12 @@ import org.junit.Test; import org.mockito.Mockito; -import business.UserInterface; -import business.logicalObjects.CartesianCoordinate; -import business.logicalObjects.GroupMembership; +import de.stevenschwenke.java.javafx.simFX.business.UserInterface; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.CartesianCoordinate; +import de.stevenschwenke.java.javafx.simFX.business.logicalObjects.GroupMembership; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.Colony; +import de.stevenschwenke.java.javafx.simFX.business.worldObjects.World; + /** * Tests for {@link Colony}.