diff --git a/src/core/Config.java b/src/com/ausinformatics/phais/core/Config.java similarity index 91% rename from src/core/Config.java rename to src/com/ausinformatics/phais/core/Config.java index 270ee5e..4313173 100644 --- a/src/core/Config.java +++ b/src/com/ausinformatics/phais/core/Config.java @@ -1,9 +1,9 @@ -package core; +package com.ausinformatics.phais.core; import java.util.HashMap; import java.util.Map; -import core.commander.commands.Command; +import com.ausinformatics.phais.core.commander.commands.Command; public class Config { diff --git a/src/core/Director.java b/src/com/ausinformatics/phais/core/Director.java similarity index 86% rename from src/core/Director.java rename to src/com/ausinformatics/phais/core/Director.java index 88cbbe9..b057f22 100644 --- a/src/core/Director.java +++ b/src/com/ausinformatics/phais/core/Director.java @@ -1,4 +1,4 @@ -package core; +package com.ausinformatics.phais.core; import java.util.Collection; import java.util.HashMap; @@ -7,23 +7,23 @@ import java.util.Map; import java.util.Set; -import core.Config.Mode; -import core.commander.Commander; -import core.commander.ShellCommander; -import core.interfaces.GameBuilder; -import core.interfaces.GameInstance; -import core.interfaces.PersistentPlayer; -import core.interfaces.PlayerBuilder; -import core.runner.GameRunner; -import core.runner.RunnerFactory; -import core.scheduler.GameScheduler; -import core.scheduler.PauseScheduler; -import core.scheduler.RandomScheduler; -import core.scheduler.RoundRobinScheduler; -import core.scorer.ScoreKeeper; -import core.scorer.StandardScoreKeeper; -import core.server.ClientConnection; -import core.server.Server; +import com.ausinformatics.phais.core.Config.Mode; +import com.ausinformatics.phais.core.commander.Commander; +import com.ausinformatics.phais.core.commander.ShellCommander; +import com.ausinformatics.phais.core.interfaces.GameBuilder; +import com.ausinformatics.phais.core.interfaces.GameInstance; +import com.ausinformatics.phais.core.interfaces.PersistentPlayer; +import com.ausinformatics.phais.core.interfaces.PlayerBuilder; +import com.ausinformatics.phais.core.runner.GameRunner; +import com.ausinformatics.phais.core.runner.RunnerFactory; +import com.ausinformatics.phais.core.scheduler.GameScheduler; +import com.ausinformatics.phais.core.scheduler.PauseScheduler; +import com.ausinformatics.phais.core.scheduler.RandomScheduler; +import com.ausinformatics.phais.core.scheduler.RoundRobinScheduler; +import com.ausinformatics.phais.core.scorer.ScoreKeeper; +import com.ausinformatics.phais.core.scorer.StandardScoreKeeper; +import com.ausinformatics.phais.core.server.ClientConnection; +import com.ausinformatics.phais.core.server.Server; // The game maker should create one of these, with the specified things. diff --git a/src/core/commander/Commander.java b/src/com/ausinformatics/phais/core/commander/Commander.java similarity index 50% rename from src/core/commander/Commander.java rename to src/com/ausinformatics/phais/core/commander/Commander.java index 8f04330..21f22b0 100644 --- a/src/core/commander/Commander.java +++ b/src/com/ausinformatics/phais/core/commander/Commander.java @@ -1,4 +1,4 @@ -package core.commander; +package com.ausinformatics.phais.core.commander; public interface Commander extends Runnable { diff --git a/src/core/commander/ShellCommander.java b/src/com/ausinformatics/phais/core/commander/ShellCommander.java similarity index 70% rename from src/core/commander/ShellCommander.java rename to src/com/ausinformatics/phais/core/commander/ShellCommander.java index 7507af2..1311974 100644 --- a/src/core/commander/ShellCommander.java +++ b/src/com/ausinformatics/phais/core/commander/ShellCommander.java @@ -1,4 +1,4 @@ -package core.commander; +package com.ausinformatics.phais.core.commander; import java.io.PrintStream; import java.util.Arrays; @@ -6,18 +6,18 @@ import java.util.Map; import java.util.Scanner; -import core.Director; -import core.commander.commands.Command; -import core.commander.commands.DisplayScores; -import core.commander.commands.HelpDisplayer; -import core.commander.commands.KickPlayers; -import core.commander.commands.Kill; -import core.commander.commands.ListPlayers; -import core.commander.commands.ScheduleGame; -import core.commander.commands.SchedulePause; -import core.commander.commands.ScheduleRandom; -import core.commander.commands.ScheduleRoundRobin; -import core.commander.commands.SetVisualiser; +import com.ausinformatics.phais.core.Director; +import com.ausinformatics.phais.core.commander.commands.Command; +import com.ausinformatics.phais.core.commander.commands.DisplayScores; +import com.ausinformatics.phais.core.commander.commands.HelpDisplayer; +import com.ausinformatics.phais.core.commander.commands.KickPlayers; +import com.ausinformatics.phais.core.commander.commands.Kill; +import com.ausinformatics.phais.core.commander.commands.ListPlayers; +import com.ausinformatics.phais.core.commander.commands.ScheduleGame; +import com.ausinformatics.phais.core.commander.commands.SchedulePause; +import com.ausinformatics.phais.core.commander.commands.ScheduleRandom; +import com.ausinformatics.phais.core.commander.commands.ScheduleRoundRobin; +import com.ausinformatics.phais.core.commander.commands.SetVisualiser; public class ShellCommander implements Commander { private Director reportTo; diff --git a/src/core/commander/commands/Command.java b/src/com/ausinformatics/phais/core/commander/commands/Command.java similarity index 66% rename from src/core/commander/commands/Command.java rename to src/com/ausinformatics/phais/core/commander/commands/Command.java index 9ac94a6..fe31ea8 100644 --- a/src/core/commander/commands/Command.java +++ b/src/com/ausinformatics/phais/core/commander/commands/Command.java @@ -1,8 +1,8 @@ -package core.commander.commands; +package com.ausinformatics.phais.core.commander.commands; import java.io.PrintStream; -import core.Director; +import com.ausinformatics.phais.core.Director; public interface Command { public void execute(Director reportTo, PrintStream out, String[] args); diff --git a/src/core/commander/commands/DisplayScores.java b/src/com/ausinformatics/phais/core/commander/commands/DisplayScores.java similarity index 77% rename from src/core/commander/commands/DisplayScores.java rename to src/com/ausinformatics/phais/core/commander/commands/DisplayScores.java index c6e4c4c..fc899e0 100644 --- a/src/core/commander/commands/DisplayScores.java +++ b/src/com/ausinformatics/phais/core/commander/commands/DisplayScores.java @@ -1,10 +1,10 @@ -package core.commander.commands; +package com.ausinformatics.phais.core.commander.commands; import java.io.PrintStream; import java.util.Map; -import core.Director; -import core.interfaces.PersistentPlayer; +import com.ausinformatics.phais.core.Director; +import com.ausinformatics.phais.core.interfaces.PersistentPlayer; public class DisplayScores implements Command { diff --git a/src/core/commander/commands/HelpDisplayer.java b/src/com/ausinformatics/phais/core/commander/commands/HelpDisplayer.java similarity index 94% rename from src/core/commander/commands/HelpDisplayer.java rename to src/com/ausinformatics/phais/core/commander/commands/HelpDisplayer.java index d9e79d9..98c7bef 100644 --- a/src/core/commander/commands/HelpDisplayer.java +++ b/src/com/ausinformatics/phais/core/commander/commands/HelpDisplayer.java @@ -1,11 +1,11 @@ -package core.commander.commands; +package com.ausinformatics.phais.core.commander.commands; import java.io.PrintStream; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import core.Director; +import com.ausinformatics.phais.core.Director; public class HelpDisplayer implements Command { Map commands; diff --git a/src/core/commander/commands/KickPlayers.java b/src/com/ausinformatics/phais/core/commander/commands/KickPlayers.java similarity index 81% rename from src/core/commander/commands/KickPlayers.java rename to src/com/ausinformatics/phais/core/commander/commands/KickPlayers.java index a2599fd..19be247 100644 --- a/src/core/commander/commands/KickPlayers.java +++ b/src/com/ausinformatics/phais/core/commander/commands/KickPlayers.java @@ -1,9 +1,9 @@ -package core.commander.commands; +package com.ausinformatics.phais.core.commander.commands; import java.io.PrintStream; -import core.Director; -import core.interfaces.PersistentPlayer; +import com.ausinformatics.phais.core.Director; +import com.ausinformatics.phais.core.interfaces.PersistentPlayer; public class KickPlayers implements Command { diff --git a/src/core/commander/commands/Kill.java b/src/com/ausinformatics/phais/core/commander/commands/Kill.java similarity index 77% rename from src/core/commander/commands/Kill.java rename to src/com/ausinformatics/phais/core/commander/commands/Kill.java index 778b55a..17de01a 100644 --- a/src/core/commander/commands/Kill.java +++ b/src/com/ausinformatics/phais/core/commander/commands/Kill.java @@ -1,8 +1,8 @@ -package core.commander.commands; +package com.ausinformatics.phais.core.commander.commands; import java.io.PrintStream; -import core.Director; +import com.ausinformatics.phais.core.Director; public class Kill implements Command { diff --git a/src/core/commander/commands/ListPlayers.java b/src/com/ausinformatics/phais/core/commander/commands/ListPlayers.java similarity index 80% rename from src/core/commander/commands/ListPlayers.java rename to src/com/ausinformatics/phais/core/commander/commands/ListPlayers.java index 3def0d0..92637f9 100644 --- a/src/core/commander/commands/ListPlayers.java +++ b/src/com/ausinformatics/phais/core/commander/commands/ListPlayers.java @@ -1,10 +1,10 @@ -package core.commander.commands; +package com.ausinformatics.phais.core.commander.commands; import java.io.PrintStream; import java.util.Collection; -import core.Director; -import core.interfaces.PersistentPlayer; +import com.ausinformatics.phais.core.Director; +import com.ausinformatics.phais.core.interfaces.PersistentPlayer; public class ListPlayers implements Command { diff --git a/src/core/commander/commands/ScheduleGame.java b/src/com/ausinformatics/phais/core/commander/commands/ScheduleGame.java similarity index 84% rename from src/core/commander/commands/ScheduleGame.java rename to src/com/ausinformatics/phais/core/commander/commands/ScheduleGame.java index 871db25..dbe22fc 100644 --- a/src/core/commander/commands/ScheduleGame.java +++ b/src/com/ausinformatics/phais/core/commander/commands/ScheduleGame.java @@ -1,11 +1,11 @@ -package core.commander.commands; +package com.ausinformatics.phais.core.commander.commands; import java.io.PrintStream; import java.util.LinkedList; import java.util.List; -import core.Director; -import core.interfaces.PersistentPlayer; +import com.ausinformatics.phais.core.Director; +import com.ausinformatics.phais.core.interfaces.PersistentPlayer; public class ScheduleGame implements Command { diff --git a/src/core/commander/commands/SchedulePause.java b/src/com/ausinformatics/phais/core/commander/commands/SchedulePause.java similarity index 70% rename from src/core/commander/commands/SchedulePause.java rename to src/com/ausinformatics/phais/core/commander/commands/SchedulePause.java index 9006dc4..67b7b70 100644 --- a/src/core/commander/commands/SchedulePause.java +++ b/src/com/ausinformatics/phais/core/commander/commands/SchedulePause.java @@ -1,10 +1,10 @@ -package core.commander.commands; +package com.ausinformatics.phais.core.commander.commands; import java.io.PrintStream; -import core.Config; -import core.Config.Mode; -import core.Director; +import com.ausinformatics.phais.core.Config; +import com.ausinformatics.phais.core.Director; +import com.ausinformatics.phais.core.Config.Mode; public class SchedulePause implements Command { diff --git a/src/core/commander/commands/ScheduleRandom.java b/src/com/ausinformatics/phais/core/commander/commands/ScheduleRandom.java similarity index 85% rename from src/core/commander/commands/ScheduleRandom.java rename to src/com/ausinformatics/phais/core/commander/commands/ScheduleRandom.java index 0ce4442..62e64ae 100644 --- a/src/core/commander/commands/ScheduleRandom.java +++ b/src/com/ausinformatics/phais/core/commander/commands/ScheduleRandom.java @@ -1,10 +1,10 @@ -package core.commander.commands; +package com.ausinformatics.phais.core.commander.commands; import java.io.PrintStream; -import core.Config; -import core.Config.Mode; -import core.Director; +import com.ausinformatics.phais.core.Config; +import com.ausinformatics.phais.core.Director; +import com.ausinformatics.phais.core.Config.Mode; public class ScheduleRandom implements Command { diff --git a/src/core/commander/commands/ScheduleRoundRobin.java b/src/com/ausinformatics/phais/core/commander/commands/ScheduleRoundRobin.java similarity index 73% rename from src/core/commander/commands/ScheduleRoundRobin.java rename to src/com/ausinformatics/phais/core/commander/commands/ScheduleRoundRobin.java index 985f841..e568fbf 100644 --- a/src/core/commander/commands/ScheduleRoundRobin.java +++ b/src/com/ausinformatics/phais/core/commander/commands/ScheduleRoundRobin.java @@ -1,10 +1,10 @@ -package core.commander.commands; +package com.ausinformatics.phais.core.commander.commands; import java.io.PrintStream; -import core.Config; -import core.Config.Mode; -import core.Director; +import com.ausinformatics.phais.core.Config; +import com.ausinformatics.phais.core.Director; +import com.ausinformatics.phais.core.Config.Mode; public class ScheduleRoundRobin implements Command { diff --git a/src/core/commander/commands/SetVisualiser.java b/src/com/ausinformatics/phais/core/commander/commands/SetVisualiser.java similarity index 86% rename from src/core/commander/commands/SetVisualiser.java rename to src/com/ausinformatics/phais/core/commander/commands/SetVisualiser.java index eaa2ffb..82cd680 100644 --- a/src/core/commander/commands/SetVisualiser.java +++ b/src/com/ausinformatics/phais/core/commander/commands/SetVisualiser.java @@ -1,9 +1,9 @@ -package core.commander.commands; +package com.ausinformatics.phais.core.commander.commands; import java.io.PrintStream; -import core.Config; -import core.Director; +import com.ausinformatics.phais.core.Config; +import com.ausinformatics.phais.core.Director; public class SetVisualiser implements Command { diff --git a/src/core/interfaces/GameBuilder.java b/src/com/ausinformatics/phais/core/interfaces/GameBuilder.java similarity index 96% rename from src/core/interfaces/GameBuilder.java rename to src/com/ausinformatics/phais/core/interfaces/GameBuilder.java index 01e6e4f..c3646ba 100644 --- a/src/core/interfaces/GameBuilder.java +++ b/src/com/ausinformatics/phais/core/interfaces/GameBuilder.java @@ -1,4 +1,4 @@ -package core.interfaces; +package com.ausinformatics.phais.core.interfaces; import java.util.List; diff --git a/src/core/interfaces/GameInstance.java b/src/com/ausinformatics/phais/core/interfaces/GameInstance.java similarity index 97% rename from src/core/interfaces/GameInstance.java rename to src/com/ausinformatics/phais/core/interfaces/GameInstance.java index faf7d8b..75951bb 100644 --- a/src/core/interfaces/GameInstance.java +++ b/src/com/ausinformatics/phais/core/interfaces/GameInstance.java @@ -1,4 +1,4 @@ -package core.interfaces; +package com.ausinformatics.phais.core.interfaces; import java.awt.Graphics; import java.util.Map; diff --git a/src/core/interfaces/PersistentPlayer.java b/src/com/ausinformatics/phais/core/interfaces/PersistentPlayer.java similarity index 92% rename from src/core/interfaces/PersistentPlayer.java rename to src/com/ausinformatics/phais/core/interfaces/PersistentPlayer.java index 97e4555..d6e9b2c 100644 --- a/src/core/interfaces/PersistentPlayer.java +++ b/src/com/ausinformatics/phais/core/interfaces/PersistentPlayer.java @@ -1,6 +1,6 @@ -package core.interfaces; +package com.ausinformatics.phais.core.interfaces; -import core.server.ClientConnection; +import com.ausinformatics.phais.core.server.ClientConnection; /** * This interface needs to be implemented by the game maker. diff --git a/src/core/interfaces/PlayerBuilder.java b/src/com/ausinformatics/phais/core/interfaces/PlayerBuilder.java similarity index 91% rename from src/core/interfaces/PlayerBuilder.java rename to src/com/ausinformatics/phais/core/interfaces/PlayerBuilder.java index 61460a1..a7cad48 100644 --- a/src/core/interfaces/PlayerBuilder.java +++ b/src/com/ausinformatics/phais/core/interfaces/PlayerBuilder.java @@ -1,6 +1,6 @@ -package core.interfaces; +package com.ausinformatics.phais.core.interfaces; -import core.server.ClientConnection; +import com.ausinformatics.phais.core.server.ClientConnection; /** * This interface needs to be implemented by the game maker. diff --git a/src/core/runner/GameRunner.java b/src/com/ausinformatics/phais/core/runner/GameRunner.java similarity index 84% rename from src/core/runner/GameRunner.java rename to src/com/ausinformatics/phais/core/runner/GameRunner.java index 3f883e4..d211eda 100644 --- a/src/core/runner/GameRunner.java +++ b/src/com/ausinformatics/phais/core/runner/GameRunner.java @@ -1,10 +1,10 @@ -package core.runner; +package com.ausinformatics.phais.core.runner; import java.util.List; import java.util.Map; -import core.interfaces.GameInstance; -import core.interfaces.PersistentPlayer; +import com.ausinformatics.phais.core.interfaces.GameInstance; +import com.ausinformatics.phais.core.interfaces.PersistentPlayer; public interface GameRunner extends Runnable { diff --git a/src/core/runner/GameVisualisation.java b/src/com/ausinformatics/phais/core/runner/GameVisualisation.java similarity index 95% rename from src/core/runner/GameVisualisation.java rename to src/com/ausinformatics/phais/core/runner/GameVisualisation.java index 39890e9..ec7e688 100644 --- a/src/core/runner/GameVisualisation.java +++ b/src/com/ausinformatics/phais/core/runner/GameVisualisation.java @@ -1,4 +1,4 @@ -package core.runner; +package com.ausinformatics.phais.core.runner; import java.awt.Color; import java.awt.Frame; @@ -14,7 +14,7 @@ import javax.swing.JFrame; import javax.swing.JPanel; -import core.interfaces.GameInstance; +import com.ausinformatics.phais.core.interfaces.GameInstance; public class GameVisualisation extends JPanel { diff --git a/src/core/runner/RunnerFactory.java b/src/com/ausinformatics/phais/core/runner/RunnerFactory.java similarity index 84% rename from src/core/runner/RunnerFactory.java rename to src/com/ausinformatics/phais/core/runner/RunnerFactory.java index c9af3ff..0f9bd4c 100644 --- a/src/core/runner/RunnerFactory.java +++ b/src/com/ausinformatics/phais/core/runner/RunnerFactory.java @@ -1,10 +1,10 @@ -package core.runner; +package com.ausinformatics.phais.core.runner; import java.util.ArrayList; import java.util.List; -import core.interfaces.GameInstance; -import core.interfaces.PersistentPlayer; +import com.ausinformatics.phais.core.interfaces.GameInstance; +import com.ausinformatics.phais.core.interfaces.PersistentPlayer; public class RunnerFactory { diff --git a/src/core/runner/StandardGameRunner.java b/src/com/ausinformatics/phais/core/runner/StandardGameRunner.java similarity index 87% rename from src/core/runner/StandardGameRunner.java rename to src/com/ausinformatics/phais/core/runner/StandardGameRunner.java index 5163e16..ad533e4 100644 --- a/src/core/runner/StandardGameRunner.java +++ b/src/com/ausinformatics/phais/core/runner/StandardGameRunner.java @@ -1,10 +1,10 @@ -package core.runner; +package com.ausinformatics.phais.core.runner; import java.util.List; import java.util.Map; -import core.interfaces.GameInstance; -import core.interfaces.PersistentPlayer; +import com.ausinformatics.phais.core.interfaces.GameInstance; +import com.ausinformatics.phais.core.interfaces.PersistentPlayer; /** * Runs a game, allowing you to query its state. diff --git a/src/core/runner/VisualRunner.java b/src/com/ausinformatics/phais/core/runner/VisualRunner.java similarity index 73% rename from src/core/runner/VisualRunner.java rename to src/com/ausinformatics/phais/core/runner/VisualRunner.java index f235f45..ab2f4a0 100644 --- a/src/core/runner/VisualRunner.java +++ b/src/com/ausinformatics/phais/core/runner/VisualRunner.java @@ -1,9 +1,9 @@ -package core.runner; +package com.ausinformatics.phais.core.runner; import java.util.List; -import core.interfaces.GameInstance; -import core.interfaces.PersistentPlayer; +import com.ausinformatics.phais.core.interfaces.GameInstance; +import com.ausinformatics.phais.core.interfaces.PersistentPlayer; /* * Runs a game, allowing you to query its state. Also handles visualisation. diff --git a/src/core/scheduler/GameScheduler.java b/src/com/ausinformatics/phais/core/scheduler/GameScheduler.java similarity index 89% rename from src/core/scheduler/GameScheduler.java rename to src/com/ausinformatics/phais/core/scheduler/GameScheduler.java index b8581f4..913758b 100644 --- a/src/core/scheduler/GameScheduler.java +++ b/src/com/ausinformatics/phais/core/scheduler/GameScheduler.java @@ -1,9 +1,9 @@ -package core.scheduler; +package com.ausinformatics.phais.core.scheduler; import java.util.List; -import core.Config.Mode; -import core.interfaces.PersistentPlayer; +import com.ausinformatics.phais.core.Config.Mode; +import com.ausinformatics.phais.core.interfaces.PersistentPlayer; /** * Handles the scheduling of new games diff --git a/src/core/scheduler/PauseScheduler.java b/src/com/ausinformatics/phais/core/scheduler/PauseScheduler.java similarity index 86% rename from src/core/scheduler/PauseScheduler.java rename to src/com/ausinformatics/phais/core/scheduler/PauseScheduler.java index 2e7c35f..34b6c56 100644 --- a/src/core/scheduler/PauseScheduler.java +++ b/src/com/ausinformatics/phais/core/scheduler/PauseScheduler.java @@ -1,12 +1,12 @@ -package core.scheduler; +package com.ausinformatics.phais.core.scheduler; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import core.Config.Mode; -import core.interfaces.PersistentPlayer; +import com.ausinformatics.phais.core.Config.Mode; +import com.ausinformatics.phais.core.interfaces.PersistentPlayer; public class PauseScheduler implements GameScheduler { diff --git a/src/core/scheduler/PrioritisedPlayer.java b/src/com/ausinformatics/phais/core/scheduler/PrioritisedPlayer.java similarity index 84% rename from src/core/scheduler/PrioritisedPlayer.java rename to src/com/ausinformatics/phais/core/scheduler/PrioritisedPlayer.java index 8c2fb5d..41f395e 100644 --- a/src/core/scheduler/PrioritisedPlayer.java +++ b/src/com/ausinformatics/phais/core/scheduler/PrioritisedPlayer.java @@ -1,6 +1,6 @@ -package core.scheduler; +package com.ausinformatics.phais.core.scheduler; -import core.interfaces.PersistentPlayer; +import com.ausinformatics.phais.core.interfaces.PersistentPlayer; public class PrioritisedPlayer implements Comparable { private PersistentPlayer player; diff --git a/src/core/scheduler/RandomScheduler.java b/src/com/ausinformatics/phais/core/scheduler/RandomScheduler.java similarity index 93% rename from src/core/scheduler/RandomScheduler.java rename to src/com/ausinformatics/phais/core/scheduler/RandomScheduler.java index 3cdad94..a479db2 100644 --- a/src/core/scheduler/RandomScheduler.java +++ b/src/com/ausinformatics/phais/core/scheduler/RandomScheduler.java @@ -1,4 +1,4 @@ -package core.scheduler; +package com.ausinformatics.phais.core.scheduler; import java.util.ArrayList; import java.util.LinkedList; @@ -7,8 +7,8 @@ import java.util.Queue; import java.util.Random; -import core.Config.Mode; -import core.interfaces.PersistentPlayer; +import com.ausinformatics.phais.core.Config.Mode; +import com.ausinformatics.phais.core.interfaces.PersistentPlayer; public class RandomScheduler implements GameScheduler { // higher variance means more randomly chosen games diff --git a/src/core/scheduler/RoundRobinScheduler.java b/src/com/ausinformatics/phais/core/scheduler/RoundRobinScheduler.java similarity index 93% rename from src/core/scheduler/RoundRobinScheduler.java rename to src/com/ausinformatics/phais/core/scheduler/RoundRobinScheduler.java index 46f1618..57cccf9 100644 --- a/src/core/scheduler/RoundRobinScheduler.java +++ b/src/com/ausinformatics/phais/core/scheduler/RoundRobinScheduler.java @@ -1,4 +1,4 @@ -package core.scheduler; +package com.ausinformatics.phais.core.scheduler; import java.util.ArrayList; import java.util.Arrays; @@ -8,8 +8,8 @@ import java.util.Map; import java.util.Set; -import core.Config.Mode; -import core.interfaces.PersistentPlayer; +import com.ausinformatics.phais.core.Config.Mode; +import com.ausinformatics.phais.core.interfaces.PersistentPlayer; public class RoundRobinScheduler implements GameScheduler { diff --git a/src/core/scorer/ScoreKeeper.java b/src/com/ausinformatics/phais/core/scorer/ScoreKeeper.java similarity index 87% rename from src/core/scorer/ScoreKeeper.java rename to src/com/ausinformatics/phais/core/scorer/ScoreKeeper.java index 251a6af..3b5afd4 100644 --- a/src/core/scorer/ScoreKeeper.java +++ b/src/com/ausinformatics/phais/core/scorer/ScoreKeeper.java @@ -1,8 +1,8 @@ -package core.scorer; +package com.ausinformatics.phais.core.scorer; import java.util.Map; -import core.interfaces.PersistentPlayer; +import com.ausinformatics.phais.core.interfaces.PersistentPlayer; public interface ScoreKeeper { diff --git a/src/core/scorer/StandardScoreKeeper.java b/src/com/ausinformatics/phais/core/scorer/StandardScoreKeeper.java similarity index 93% rename from src/core/scorer/StandardScoreKeeper.java rename to src/com/ausinformatics/phais/core/scorer/StandardScoreKeeper.java index 98b9708..76be0d2 100644 --- a/src/core/scorer/StandardScoreKeeper.java +++ b/src/com/ausinformatics/phais/core/scorer/StandardScoreKeeper.java @@ -1,9 +1,9 @@ -package core.scorer; +package com.ausinformatics.phais.core.scorer; import java.util.ArrayList; import java.util.Map; -import core.interfaces.PersistentPlayer; +import com.ausinformatics.phais.core.interfaces.PersistentPlayer; public class StandardScoreKeeper implements ScoreKeeper { private ArrayList scores; diff --git a/src/core/server/Client.java b/src/com/ausinformatics/phais/core/server/Client.java similarity index 98% rename from src/core/server/Client.java rename to src/com/ausinformatics/phais/core/server/Client.java index b6735e9..45972c6 100644 --- a/src/core/server/Client.java +++ b/src/com/ausinformatics/phais/core/server/Client.java @@ -1,4 +1,4 @@ -package core.server; +package com.ausinformatics.phais.core.server; import java.io.IOException; import java.net.Socket; diff --git a/src/core/server/ClientConnection.java b/src/com/ausinformatics/phais/core/server/ClientConnection.java similarity index 96% rename from src/core/server/ClientConnection.java rename to src/com/ausinformatics/phais/core/server/ClientConnection.java index 3317dd3..83d5179 100644 --- a/src/core/server/ClientConnection.java +++ b/src/com/ausinformatics/phais/core/server/ClientConnection.java @@ -1,4 +1,4 @@ -package core.server; +package com.ausinformatics.phais.core.server; /** * Acts as an interface through which to communicate with the client. diff --git a/src/core/server/DisconnectedException.java b/src/com/ausinformatics/phais/core/server/DisconnectedException.java similarity index 88% rename from src/core/server/DisconnectedException.java rename to src/com/ausinformatics/phais/core/server/DisconnectedException.java index 76e7462..65e55e5 100644 --- a/src/core/server/DisconnectedException.java +++ b/src/com/ausinformatics/phais/core/server/DisconnectedException.java @@ -1,4 +1,4 @@ -package core.server; +package com.ausinformatics.phais.core.server; public class DisconnectedException extends Exception { diff --git a/src/core/server/InputPoller.java b/src/com/ausinformatics/phais/core/server/InputPoller.java similarity index 96% rename from src/core/server/InputPoller.java rename to src/com/ausinformatics/phais/core/server/InputPoller.java index 52adc2e..bbb0aaa 100644 --- a/src/core/server/InputPoller.java +++ b/src/com/ausinformatics/phais/core/server/InputPoller.java @@ -1,4 +1,4 @@ -package core.server; +package com.ausinformatics.phais.core.server; import java.util.LinkedList; import java.util.NoSuchElementException; diff --git a/src/core/server/NewConnectionHandler.java b/src/com/ausinformatics/phais/core/server/NewConnectionHandler.java similarity index 82% rename from src/core/server/NewConnectionHandler.java rename to src/com/ausinformatics/phais/core/server/NewConnectionHandler.java index f6892d5..6509f63 100644 --- a/src/core/server/NewConnectionHandler.java +++ b/src/com/ausinformatics/phais/core/server/NewConnectionHandler.java @@ -1,8 +1,8 @@ -package core.server; +package com.ausinformatics.phais.core.server; import java.net.Socket; -import core.Director; +import com.ausinformatics.phais.core.Director; public class NewConnectionHandler implements Runnable { private Socket socket; diff --git a/src/core/server/Server.java b/src/com/ausinformatics/phais/core/server/Server.java similarity index 91% rename from src/core/server/Server.java rename to src/com/ausinformatics/phais/core/server/Server.java index fb29af6..e9dd9f1 100644 --- a/src/core/server/Server.java +++ b/src/com/ausinformatics/phais/core/server/Server.java @@ -1,10 +1,10 @@ -package core.server; +package com.ausinformatics.phais.core.server; import java.io.IOException; import java.net.ServerSocket; import java.net.Socket; -import core.Director; +import com.ausinformatics.phais.core.Director; public class Server implements Runnable { diff --git a/src/core/server/SocketTransport.java b/src/com/ausinformatics/phais/core/server/SocketTransport.java similarity index 93% rename from src/core/server/SocketTransport.java rename to src/com/ausinformatics/phais/core/server/SocketTransport.java index 96d8b3c..6881084 100644 --- a/src/core/server/SocketTransport.java +++ b/src/com/ausinformatics/phais/core/server/SocketTransport.java @@ -1,4 +1,4 @@ -package core.server; +package com.ausinformatics.phais.core.server; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/core/visualisation/EndGameEvent.java b/src/com/ausinformatics/phais/core/visualisation/EndGameEvent.java similarity index 51% rename from src/core/visualisation/EndGameEvent.java rename to src/com/ausinformatics/phais/core/visualisation/EndGameEvent.java index 7fb49aa..ec4d8fe 100644 --- a/src/core/visualisation/EndGameEvent.java +++ b/src/com/ausinformatics/phais/core/visualisation/EndGameEvent.java @@ -1,4 +1,4 @@ -package core.visualisation; +package com.ausinformatics.phais.core.visualisation; public class EndGameEvent extends VisualGameEvent { diff --git a/src/core/visualisation/EventBasedFrameVisualiser.java b/src/com/ausinformatics/phais/core/visualisation/EventBasedFrameVisualiser.java similarity index 94% rename from src/core/visualisation/EventBasedFrameVisualiser.java rename to src/com/ausinformatics/phais/core/visualisation/EventBasedFrameVisualiser.java index 1c9073b..d1af518 100644 --- a/src/core/visualisation/EventBasedFrameVisualiser.java +++ b/src/com/ausinformatics/phais/core/visualisation/EventBasedFrameVisualiser.java @@ -1,4 +1,4 @@ -package core.visualisation; +package com.ausinformatics.phais.core.visualisation; import java.awt.Graphics; import java.awt.Graphics2D; @@ -8,8 +8,8 @@ import java.util.List; import java.util.Map; -import core.interfaces.GameInstance; -import core.interfaces.PersistentPlayer; +import com.ausinformatics.phais.core.interfaces.GameInstance; +import com.ausinformatics.phais.core.interfaces.PersistentPlayer; public class EventBasedFrameVisualiser implements GameInstance { diff --git a/src/core/visualisation/FrameVisualisationHandler.java b/src/com/ausinformatics/phais/core/visualisation/FrameVisualisationHandler.java similarity index 89% rename from src/core/visualisation/FrameVisualisationHandler.java rename to src/com/ausinformatics/phais/core/visualisation/FrameVisualisationHandler.java index dd16893..1997ff9 100644 --- a/src/core/visualisation/FrameVisualisationHandler.java +++ b/src/com/ausinformatics/phais/core/visualisation/FrameVisualisationHandler.java @@ -1,4 +1,4 @@ -package core.visualisation; +package com.ausinformatics.phais.core.visualisation; import java.awt.Graphics2D; import java.util.List; diff --git a/src/core/visualisation/GameHandler.java b/src/com/ausinformatics/phais/core/visualisation/GameHandler.java similarity index 89% rename from src/core/visualisation/GameHandler.java rename to src/com/ausinformatics/phais/core/visualisation/GameHandler.java index 0db56a6..3c50a7a 100644 --- a/src/core/visualisation/GameHandler.java +++ b/src/com/ausinformatics/phais/core/visualisation/GameHandler.java @@ -1,8 +1,8 @@ -package core.visualisation; +package com.ausinformatics.phais.core.visualisation; import java.util.Map; -import core.interfaces.PersistentPlayer; +import com.ausinformatics.phais.core.interfaces.PersistentPlayer; /** * This interface can be implemented by the game maker, when visualisation is diff --git a/src/core/visualisation/VisualGameEvent.java b/src/com/ausinformatics/phais/core/visualisation/VisualGameEvent.java similarity index 60% rename from src/core/visualisation/VisualGameEvent.java rename to src/com/ausinformatics/phais/core/visualisation/VisualGameEvent.java index ef06963..c4c6934 100644 --- a/src/core/visualisation/VisualGameEvent.java +++ b/src/com/ausinformatics/phais/core/visualisation/VisualGameEvent.java @@ -1,4 +1,4 @@ -package core.visualisation; +package com.ausinformatics.phais.core.visualisation; public class VisualGameEvent {