From dde94437fca0fd8fb9f4fb756f1a637ddef85b81 Mon Sep 17 00:00:00 2001 From: Jan Philipp Timme Date: Tue, 28 Oct 2014 10:26:54 +0100 Subject: [PATCH] =?UTF-8?q?Packages=20haben=20nun=20grunds=C3=A4tzlich=20s?= =?UTF-8?q?ingulare=20Namen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/de/teamteamteam/spacescooter/Main.java | 10 +++++----- .../spacescooter/background/Background.java | 2 +- .../spacescooter/background/StarBackground.java | 2 +- .../spacescooter/{controls => control}/Keyboard.java | 2 +- .../spacescooter/{entities => entity}/Entity.java | 2 +- .../spacescooter/{entities => entity}/Paintable.java | 2 +- .../spacescooter/{entities => entity}/Player.java | 4 ++-- .../spacescooter/{entities => entity}/TestEntity.java | 4 ++-- .../spacescooter/{entities => entity}/Updateable.java | 2 +- src/de/teamteamteam/spacescooter/gui/GameFrame.java | 4 ++-- .../spacescooter/{threads => thread}/PaintThread.java | 2 +- .../spacescooter/{threads => thread}/TimedThread.java | 2 +- .../spacescooter/{threads => thread}/UpdateThread.java | 4 ++-- .../{utilities => utility}/GraphicsSettings.java | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) rename src/de/teamteamteam/spacescooter/{controls => control}/Keyboard.java (93%) rename src/de/teamteamteam/spacescooter/{entities => entity}/Entity.java (93%) rename src/de/teamteamteam/spacescooter/{entities => entity}/Paintable.java (66%) rename src/de/teamteamteam/spacescooter/{entities => entity}/Player.java (91%) rename src/de/teamteamteam/spacescooter/{entities => entity}/TestEntity.java (81%) rename src/de/teamteamteam/spacescooter/{entities => entity}/Updateable.java (55%) rename src/de/teamteamteam/spacescooter/{threads => thread}/PaintThread.java (91%) rename src/de/teamteamteam/spacescooter/{threads => thread}/TimedThread.java (96%) rename src/de/teamteamteam/spacescooter/{threads => thread}/UpdateThread.java (86%) rename src/de/teamteamteam/spacescooter/{utilities => utility}/GraphicsSettings.java (95%) diff --git a/src/de/teamteamteam/spacescooter/Main.java b/src/de/teamteamteam/spacescooter/Main.java index 0e76b93..d7ed32c 100644 --- a/src/de/teamteamteam/spacescooter/Main.java +++ b/src/de/teamteamteam/spacescooter/Main.java @@ -3,12 +3,12 @@ package de.teamteamteam.spacescooter; import java.awt.EventQueue; import de.teamteamteam.spacescooter.background.StarBackground; -import de.teamteamteam.spacescooter.entities.Player; -import de.teamteamteam.spacescooter.entities.TestEntity; +import de.teamteamteam.spacescooter.entity.Player; +import de.teamteamteam.spacescooter.entity.TestEntity; import de.teamteamteam.spacescooter.gui.GameFrame; -import de.teamteamteam.spacescooter.threads.PaintThread; -import de.teamteamteam.spacescooter.threads.UpdateThread; -import de.teamteamteam.spacescooter.utilities.GraphicsSettings; +import de.teamteamteam.spacescooter.thread.PaintThread; +import de.teamteamteam.spacescooter.thread.UpdateThread; +import de.teamteamteam.spacescooter.utility.GraphicsSettings; /** * Nothing but a class containing the main method. diff --git a/src/de/teamteamteam/spacescooter/background/Background.java b/src/de/teamteamteam/spacescooter/background/Background.java index 3da0420..6953805 100644 --- a/src/de/teamteamteam/spacescooter/background/Background.java +++ b/src/de/teamteamteam/spacescooter/background/Background.java @@ -2,7 +2,7 @@ package de.teamteamteam.spacescooter.background; import java.util.ArrayList; -import de.teamteamteam.spacescooter.entities.Entity; +import de.teamteamteam.spacescooter.entity.Entity; public abstract class Background extends Entity { diff --git a/src/de/teamteamteam/spacescooter/background/StarBackground.java b/src/de/teamteamteam/spacescooter/background/StarBackground.java index 2dc7dbb..c9d65bb 100644 --- a/src/de/teamteamteam/spacescooter/background/StarBackground.java +++ b/src/de/teamteamteam/spacescooter/background/StarBackground.java @@ -6,7 +6,7 @@ import java.io.IOException; import javax.imageio.ImageIO; -import de.teamteamteam.spacescooter.entities.Player; +import de.teamteamteam.spacescooter.entity.Player; public class StarBackground extends Background { diff --git a/src/de/teamteamteam/spacescooter/controls/Keyboard.java b/src/de/teamteamteam/spacescooter/control/Keyboard.java similarity index 93% rename from src/de/teamteamteam/spacescooter/controls/Keyboard.java rename to src/de/teamteamteam/spacescooter/control/Keyboard.java index 6547b8c..52c2f9c 100644 --- a/src/de/teamteamteam/spacescooter/controls/Keyboard.java +++ b/src/de/teamteamteam/spacescooter/control/Keyboard.java @@ -1,4 +1,4 @@ -package de.teamteamteam.spacescooter.controls; +package de.teamteamteam.spacescooter.control; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; diff --git a/src/de/teamteamteam/spacescooter/entities/Entity.java b/src/de/teamteamteam/spacescooter/entity/Entity.java similarity index 93% rename from src/de/teamteamteam/spacescooter/entities/Entity.java rename to src/de/teamteamteam/spacescooter/entity/Entity.java index 1914ecc..ef34eb1 100644 --- a/src/de/teamteamteam/spacescooter/entities/Entity.java +++ b/src/de/teamteamteam/spacescooter/entity/Entity.java @@ -1,4 +1,4 @@ -package de.teamteamteam.spacescooter.entities; +package de.teamteamteam.spacescooter.entity; import java.util.ArrayList; diff --git a/src/de/teamteamteam/spacescooter/entities/Paintable.java b/src/de/teamteamteam/spacescooter/entity/Paintable.java similarity index 66% rename from src/de/teamteamteam/spacescooter/entities/Paintable.java rename to src/de/teamteamteam/spacescooter/entity/Paintable.java index 36b1120..5795edb 100644 --- a/src/de/teamteamteam/spacescooter/entities/Paintable.java +++ b/src/de/teamteamteam/spacescooter/entity/Paintable.java @@ -1,4 +1,4 @@ -package de.teamteamteam.spacescooter.entities; +package de.teamteamteam.spacescooter.entity; import java.awt.Graphics; diff --git a/src/de/teamteamteam/spacescooter/entities/Player.java b/src/de/teamteamteam/spacescooter/entity/Player.java similarity index 91% rename from src/de/teamteamteam/spacescooter/entities/Player.java rename to src/de/teamteamteam/spacescooter/entity/Player.java index d89d32c..f6ef257 100644 --- a/src/de/teamteamteam/spacescooter/entities/Player.java +++ b/src/de/teamteamteam/spacescooter/entity/Player.java @@ -1,4 +1,4 @@ -package de.teamteamteam.spacescooter.entities; +package de.teamteamteam.spacescooter.entity; import java.awt.Graphics; import java.awt.event.KeyEvent; @@ -7,7 +7,7 @@ import java.io.IOException; import javax.imageio.ImageIO; -import de.teamteamteam.spacescooter.controls.Keyboard; +import de.teamteamteam.spacescooter.control.Keyboard; public class Player extends Entity { diff --git a/src/de/teamteamteam/spacescooter/entities/TestEntity.java b/src/de/teamteamteam/spacescooter/entity/TestEntity.java similarity index 81% rename from src/de/teamteamteam/spacescooter/entities/TestEntity.java rename to src/de/teamteamteam/spacescooter/entity/TestEntity.java index 1410afd..5e191d0 100644 --- a/src/de/teamteamteam/spacescooter/entities/TestEntity.java +++ b/src/de/teamteamteam/spacescooter/entity/TestEntity.java @@ -1,10 +1,10 @@ -package de.teamteamteam.spacescooter.entities; +package de.teamteamteam.spacescooter.entity; import java.awt.Color; import java.awt.Graphics; import java.awt.event.KeyEvent; -import de.teamteamteam.spacescooter.controls.Keyboard; +import de.teamteamteam.spacescooter.control.Keyboard; public class TestEntity extends Entity { diff --git a/src/de/teamteamteam/spacescooter/entities/Updateable.java b/src/de/teamteamteam/spacescooter/entity/Updateable.java similarity index 55% rename from src/de/teamteamteam/spacescooter/entities/Updateable.java rename to src/de/teamteamteam/spacescooter/entity/Updateable.java index 669a420..343f661 100644 --- a/src/de/teamteamteam/spacescooter/entities/Updateable.java +++ b/src/de/teamteamteam/spacescooter/entity/Updateable.java @@ -1,4 +1,4 @@ -package de.teamteamteam.spacescooter.entities; +package de.teamteamteam.spacescooter.entity; public interface Updateable { diff --git a/src/de/teamteamteam/spacescooter/gui/GameFrame.java b/src/de/teamteamteam/spacescooter/gui/GameFrame.java index 20b81ee..c52b15e 100644 --- a/src/de/teamteamteam/spacescooter/gui/GameFrame.java +++ b/src/de/teamteamteam/spacescooter/gui/GameFrame.java @@ -8,8 +8,8 @@ import java.util.Iterator; import javax.swing.JFrame; import de.teamteamteam.spacescooter.background.Background; -import de.teamteamteam.spacescooter.controls.Keyboard; -import de.teamteamteam.spacescooter.entities.Entity; +import de.teamteamteam.spacescooter.control.Keyboard; +import de.teamteamteam.spacescooter.entity.Entity; /** * The game will take place in this beautiful window. diff --git a/src/de/teamteamteam/spacescooter/threads/PaintThread.java b/src/de/teamteamteam/spacescooter/thread/PaintThread.java similarity index 91% rename from src/de/teamteamteam/spacescooter/threads/PaintThread.java rename to src/de/teamteamteam/spacescooter/thread/PaintThread.java index 946a9ff..0adfd20 100644 --- a/src/de/teamteamteam/spacescooter/threads/PaintThread.java +++ b/src/de/teamteamteam/spacescooter/thread/PaintThread.java @@ -1,4 +1,4 @@ -package de.teamteamteam.spacescooter.threads; +package de.teamteamteam.spacescooter.thread; import java.awt.EventQueue; diff --git a/src/de/teamteamteam/spacescooter/threads/TimedThread.java b/src/de/teamteamteam/spacescooter/thread/TimedThread.java similarity index 96% rename from src/de/teamteamteam/spacescooter/threads/TimedThread.java rename to src/de/teamteamteam/spacescooter/thread/TimedThread.java index f5bef8a..2f922d5 100644 --- a/src/de/teamteamteam/spacescooter/threads/TimedThread.java +++ b/src/de/teamteamteam/spacescooter/thread/TimedThread.java @@ -1,4 +1,4 @@ -package de.teamteamteam.spacescooter.threads; +package de.teamteamteam.spacescooter.thread; public abstract class TimedThread extends Thread { diff --git a/src/de/teamteamteam/spacescooter/threads/UpdateThread.java b/src/de/teamteamteam/spacescooter/thread/UpdateThread.java similarity index 86% rename from src/de/teamteamteam/spacescooter/threads/UpdateThread.java rename to src/de/teamteamteam/spacescooter/thread/UpdateThread.java index 2ea79bd..2e8df3d 100644 --- a/src/de/teamteamteam/spacescooter/threads/UpdateThread.java +++ b/src/de/teamteamteam/spacescooter/thread/UpdateThread.java @@ -1,9 +1,9 @@ -package de.teamteamteam.spacescooter.threads; +package de.teamteamteam.spacescooter.thread; import java.util.Iterator; import de.teamteamteam.spacescooter.background.Background; -import de.teamteamteam.spacescooter.entities.Entity; +import de.teamteamteam.spacescooter.entity.Entity; public class UpdateThread extends TimedThread { diff --git a/src/de/teamteamteam/spacescooter/utilities/GraphicsSettings.java b/src/de/teamteamteam/spacescooter/utility/GraphicsSettings.java similarity index 95% rename from src/de/teamteamteam/spacescooter/utilities/GraphicsSettings.java rename to src/de/teamteamteam/spacescooter/utility/GraphicsSettings.java index f16e3d7..a84e227 100644 --- a/src/de/teamteamteam/spacescooter/utilities/GraphicsSettings.java +++ b/src/de/teamteamteam/spacescooter/utility/GraphicsSettings.java @@ -1,4 +1,4 @@ -package de.teamteamteam.spacescooter.utilities; +package de.teamteamteam.spacescooter.utility; import java.awt.DisplayMode; import java.awt.GraphicsDevice;