Renamed packages to de.stevenschwenke.java.javafx.simFX.[specific

package name]
stevenschwenke · Mar 29, 2013 · 6e0c7af · 6e0c7af
1 parent 682a67e
commit 6e0c7af
Show file tree

Hide file tree

Showing 26 changed files with 103 additions and 88 deletions.
diff --git a/src/main/java/application/Start.java → .../java/javafx/simFX/application/Start.java b/src/main/java/application/Start.java → .../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 → .../javafx/simFX/business/UserInterface.java b/src/main/java/business/UserInterface.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/...s/logicalObjects/CartesianCoordinate.java → ...s/logicalObjects/CartesianCoordinate.java b/...s/logicalObjects/CartesianCoordinate.java → ...s/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/...va/business/logicalObjects/GameState.java → ...FX/business/logicalObjects/GameState.java b/...va/business/logicalObjects/GameState.java → ...FX/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/...ness/logicalObjects/GameStateManager.java → ...ness/logicalObjects/GameStateManager.java b/...ness/logicalObjects/GameStateManager.java → ...ness/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/...calObjects/GeographicalLogicProvider.java → ...calObjects/GeographicalLogicProvider.java b/...calObjects/GeographicalLogicProvider.java → ...calObjects/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/...iness/logicalObjects/GroupMembership.java → ...iness/logicalObjects/GroupMembership.java b/...iness/logicalObjects/GroupMembership.java → ...iness/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/.../business/logicalObjects/Interaction.java → .../business/logicalObjects/Interaction.java b/.../business/logicalObjects/Interaction.java → .../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/...iness/logicalObjects/PolarCoordinate.java → ...iness/logicalObjects/PolarCoordinate.java b/...iness/logicalObjects/PolarCoordinate.java → ...iness/logicalObjects/PolarCoordinate.java
@@ -1,4 +1,4 @@
-package business.logicalObjects;
+package de.stevenschwenke.java.javafx.simFX.business.logicalObjects;
 
 
 /**

diff --git a/...in/java/business/worldObjects/Colony.java → ...x/simFX/business/worldObjects/Colony.java b/...in/java/business/worldObjects/Colony.java → ...x/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/.../java/business/worldObjects/Resource.java → ...simFX/business/worldObjects/Resource.java b/.../java/business/worldObjects/Resource.java → ...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/...usiness/worldObjects/ResourceSpawner.java → ...usiness/worldObjects/ResourceSpawner.java b/...usiness/worldObjects/ResourceSpawner.java → ...usiness/worldObjects/ResourceSpawner.java
@@ -1,13 +1,14 @@
-package business.worldObjects;
+package de.stevenschwenke.java.javafx.simFX.business.worldObjects;
 
 import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
 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/...ain/java/business/worldObjects/World.java → ...fx/simFX/business/worldObjects/World.java b/...ain/java/business/worldObjects/World.java → ...fx/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/...va/business/worldObjects/WorldObject.java → ...FX/business/worldObjects/WorldObject.java b/...va/business/worldObjects/WorldObject.java → ...FX/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/...ain/java/ui/javaFX/JavaFxApplication.java → ...fx/simFX/ui/javaFX/JavaFxApplication.java b/...ain/java/ui/javaFX/JavaFxApplication.java → ...fx/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/.../interfaceObjects/AttackEventHandler.java → .../interfaceObjects/AttackEventHandler.java b/.../interfaceObjects/AttackEventHandler.java → .../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/...nterfaceObjects/ColonizeEventHandler.java → ...nterfaceObjects/ColonizeEventHandler.java b/...nterfaceObjects/ColonizeEventHandler.java → ...nterfaceObjects/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/...terfaceObjects/ColonyFXMouseOverPane.java → ...terfaceObjects/ColonyFXMouseOverPane.java b/...terfaceObjects/ColonyFXMouseOverPane.java → ...terfaceObjects/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/...jects/ResourceSpawnerFXMouseOverPane.java → ...jects/ResourceSpawnerFXMouseOverPane.java b/...jects/ResourceSpawnerFXMouseOverPane.java → ...jects/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/...javaFX/interfaceObjects/RootInfoPane.java → ...javaFX/interfaceObjects/RootInfoPane.java b/...javaFX/interfaceObjects/RootInfoPane.java → ...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/...java/ui/javaFX/worldObjects/ColonyFX.java → ...imFX/ui/javaFX/worldObjects/ColonyFX.java b/...java/ui/javaFX/worldObjects/ColonyFX.java → ...imFX/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/...va/ui/javaFX/worldObjects/ResourceFX.java → ...FX/ui/javaFX/worldObjects/ResourceFX.java b/...va/ui/javaFX/worldObjects/ResourceFX.java → ...FX/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/...avaFX/worldObjects/ResourceSpawnerFX.java → ...avaFX/worldObjects/ResourceSpawnerFX.java b/...avaFX/worldObjects/ResourceSpawnerFX.java → ...avaFX/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/...bjects/GeographicalLogicProviderTest.java → ...bjects/GeographicalLogicProviderTest.java b/...bjects/GeographicalLogicProviderTest.java → ...bjects/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/...s/logicalObjects/PolarCoordinateTest.java → ...s/logicalObjects/PolarCoordinateTest.java b/...s/logicalObjects/PolarCoordinateTest.java → ...s/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}.
  *