From bdf3d9ae6bf78f10347e5e3fb43b94e65940ceb6 Mon Sep 17 00:00:00 2001 From: Andreas Jakobsson Date: Mon, 12 Jan 2009 11:28:57 +0100 Subject: [PATCH] Changed package name map to level --- report/report.tex | 10 +++++----- src/se/umu/cs/dit06ajnajs/ATDController.java | 6 +++--- src/se/umu/cs/dit06ajnajs/ATDModel.java | 6 +++--- src/se/umu/cs/dit06ajnajs/ATDView.java | 3 ++- src/se/umu/cs/dit06ajnajs/AntiTD.java | 3 ++- src/se/umu/cs/dit06ajnajs/agent/Agent.java | 2 +- src/se/umu/cs/dit06ajnajs/agent/Unit.java | 7 ++++--- src/se/umu/cs/dit06ajnajs/{map => level}/BlockedSquare.java | 2 +- src/se/umu/cs/dit06ajnajs/{map => level}/Clickable.java | 2 +- src/se/umu/cs/dit06ajnajs/{map => level}/GoalSquare.java | 2 +- src/se/umu/cs/dit06ajnajs/{map => level}/Level.java | 2 +- src/se/umu/cs/dit06ajnajs/{map => level}/MapSquare.java | 2 +- src/se/umu/cs/dit06ajnajs/{map => level}/MapSquareFactory.java | 2 +- .../dit06ajnajs/{map => level}/MapSquarePrototypeFactory.java | 2 +- src/se/umu/cs/dit06ajnajs/{map => level}/PathSquare.java | 2 +- src/se/umu/cs/dit06ajnajs/{map => level}/StartSquare.java | 2 +- src/se/umu/cs/dit06ajnajs/{map => level}/TowerSquare.java | 2 +- src/se/umu/cs/dit06ajnajs/{map => level}/Traversable.java | 2 +- src/se/umu/cs/dit06ajnajs/{map => level}/TurnSquare.java | 2 +- src/se/umu/cs/dit06ajnajs/util/LevelEditor.java | 6 +++--- src/se/umu/cs/dit06ajnajs/util/LevelsXMLOutputter.java | 5 +++-- src/se/umu/cs/dit06ajnajs/util/LevelsXMLParser.java | 8 ++++---- 22 files changed, 42 insertions(+), 38 deletions(-) rename src/se/umu/cs/dit06ajnajs/{map => level}/BlockedSquare.java (81%) rename src/se/umu/cs/dit06ajnajs/{map => level}/Clickable.java (61%) rename src/se/umu/cs/dit06ajnajs/{map => level}/GoalSquare.java (96%) rename src/se/umu/cs/dit06ajnajs/{map => level}/Level.java (99%) rename src/se/umu/cs/dit06ajnajs/{map => level}/MapSquare.java (98%) rename src/se/umu/cs/dit06ajnajs/{map => level}/MapSquareFactory.java (99%) rename src/se/umu/cs/dit06ajnajs/{map => level}/MapSquarePrototypeFactory.java (99%) rename src/se/umu/cs/dit06ajnajs/{map => level}/PathSquare.java (94%) rename src/se/umu/cs/dit06ajnajs/{map => level}/StartSquare.java (98%) rename src/se/umu/cs/dit06ajnajs/{map => level}/TowerSquare.java (93%) rename src/se/umu/cs/dit06ajnajs/{map => level}/Traversable.java (87%) rename src/se/umu/cs/dit06ajnajs/{map => level}/TurnSquare.java (98%) diff --git a/report/report.tex b/report/report.tex index 95b2f30..ec655dc 100644 --- a/report/report.tex +++ b/report/report.tex @@ -121,7 +121,7 @@ Problemspecifikation finns i original på sidan:\\ \begin{footnotesize} -\verb!http://www.cs.umu.se/kurser/5DV085/HT08/lab4/! % TODO check +\verb!http://www.cs.umu.se/kurser/5DV085/HT08/labbar/lab4.html/! % DONE check \end{footnotesize} \section{Användarhandledning}\label{Anvandarhandledning} @@ -177,7 +177,7 @@ terminal. \end{center} \end{figure} -\subsection{se.umu.cs.dit06ajnajs pakage} +\subsection{se.umu.cs.dit06ajnajs package} \subsubsection{ATDController}\label{sec:ATDController} \subsubsection{ATDModel}\label{sec:ATDModel} \subsubsection{ATDSoundPlayer}\label{sec:ATDSoundPlayer} @@ -187,7 +187,7 @@ terminal. \subsubsection{Paintable}\label{sec:Paintable} \subsubsection{Player}\label{sec:Player} -\subsection{se.umu.cs.dit06ajnajs.agent pakage} +\subsection{se.umu.cs.dit06ajnajs.agent package} \subsubsection{Agent}\label{sec:Agent} \subsubsection{AgentPrototypeFactory}\label{sec:AgentPrototypeFactory} \subsubsection{BasicTower}\label{sec:BasicTower} @@ -198,7 +198,7 @@ terminal. \subsubsection{Tower}\label{sec:Tower} \subsubsection{Unit}\label{sec:Unit} -\subsection{se.umu.cs.dit06ajnajs.map pakage} +\subsection{se.umu.cs.dit06ajnajs.map package} \subsubsection{BlockedSquare}\label{sec:BlockedSquare} \subsubsection{Clickable}\label{sec:Clickable} \subsubsection{GoalSquare}\label{sec:GoalSquare} @@ -213,7 +213,7 @@ terminal. \subsubsection{Traversable}\label{sec:Traversable} \subsubsection{TurnSquare}\label{sec:TurnSquare} -\subsection{se.umu.cs.dit06ajnajs.util pakage} +\subsection{se.umu.cs.dit06ajnajs.util package} \subsubsection{LevelEditor}\label{sec:LevelEditor} \subsubsection{LevelsXMLOutputter}\label{sec:LevelsXMLOutputter} \subsubsection{LevelsXMLParser}\label{sec:LevelsXMLParser} diff --git a/src/se/umu/cs/dit06ajnajs/ATDController.java b/src/se/umu/cs/dit06ajnajs/ATDController.java index 1fac289..ee167f5 100644 --- a/src/se/umu/cs/dit06ajnajs/ATDController.java +++ b/src/se/umu/cs/dit06ajnajs/ATDController.java @@ -16,9 +16,9 @@ import java.awt.event.WindowEvent; import se.umu.cs.dit06ajnajs.agent.AgentPrototypeFactory; import se.umu.cs.dit06ajnajs.agent.Tower; import se.umu.cs.dit06ajnajs.agent.Unit; -import se.umu.cs.dit06ajnajs.map.GoalSquare; -import se.umu.cs.dit06ajnajs.map.Level; -import se.umu.cs.dit06ajnajs.map.StartSquare; +import se.umu.cs.dit06ajnajs.level.GoalSquare; +import se.umu.cs.dit06ajnajs.level.Level; +import se.umu.cs.dit06ajnajs.level.StartSquare; import se.umu.cs.edu.jap.highscoreservice.HighScoreServiceClient; import se.umu.cs.edu.jap.highscoreservice.Entry; diff --git a/src/se/umu/cs/dit06ajnajs/ATDModel.java b/src/se/umu/cs/dit06ajnajs/ATDModel.java index 4fa37fd..6a06be0 100644 --- a/src/se/umu/cs/dit06ajnajs/ATDModel.java +++ b/src/se/umu/cs/dit06ajnajs/ATDModel.java @@ -18,9 +18,9 @@ import java.util.logging.Logger; import se.umu.cs.dit06ajnajs.agent.AgentPrototypeFactory; import se.umu.cs.dit06ajnajs.agent.Tower; -import se.umu.cs.dit06ajnajs.map.GoalSquare; -import se.umu.cs.dit06ajnajs.map.Level; -import se.umu.cs.dit06ajnajs.map.StartSquare; +import se.umu.cs.dit06ajnajs.level.GoalSquare; +import se.umu.cs.dit06ajnajs.level.Level; +import se.umu.cs.dit06ajnajs.level.StartSquare; import se.umu.cs.dit06ajnajs.agent.Unit; import java.util.Collection; diff --git a/src/se/umu/cs/dit06ajnajs/ATDView.java b/src/se/umu/cs/dit06ajnajs/ATDView.java index c8638c9..9c35e27 100644 --- a/src/se/umu/cs/dit06ajnajs/ATDView.java +++ b/src/se/umu/cs/dit06ajnajs/ATDView.java @@ -33,7 +33,8 @@ import javax.swing.JList; import javax.swing.ListSelectionModel; import se.umu.cs.dit06ajnajs.agent.Unit; import javax.swing.SwingUtilities; -import se.umu.cs.dit06ajnajs.map.MapSquare; + +import se.umu.cs.dit06ajnajs.level.MapSquare; public class ATDView { private static Logger logger = Logger.getLogger("AntiTD"); diff --git a/src/se/umu/cs/dit06ajnajs/AntiTD.java b/src/se/umu/cs/dit06ajnajs/AntiTD.java index ecff1fa..98dc4ff 100644 --- a/src/se/umu/cs/dit06ajnajs/AntiTD.java +++ b/src/se/umu/cs/dit06ajnajs/AntiTD.java @@ -6,7 +6,8 @@ import java.net.URL; import java.util.List; import java.util.logging.Logger; import org.jdom.JDOMException; -import se.umu.cs.dit06ajnajs.map.Level; + +import se.umu.cs.dit06ajnajs.level.Level; import se.umu.cs.dit06ajnajs.util.LevelsXMLParser; public class AntiTD { diff --git a/src/se/umu/cs/dit06ajnajs/agent/Agent.java b/src/se/umu/cs/dit06ajnajs/agent/Agent.java index 243f21d..f661a27 100644 --- a/src/se/umu/cs/dit06ajnajs/agent/Agent.java +++ b/src/se/umu/cs/dit06ajnajs/agent/Agent.java @@ -1,7 +1,7 @@ package se.umu.cs.dit06ajnajs.agent; import se.umu.cs.dit06ajnajs.Paintable; -import se.umu.cs.dit06ajnajs.map.Clickable; +import se.umu.cs.dit06ajnajs.level.Clickable; public interface Agent extends Paintable, Clickable, Cloneable { /** diff --git a/src/se/umu/cs/dit06ajnajs/agent/Unit.java b/src/se/umu/cs/dit06ajnajs/agent/Unit.java index f3fef1f..7180f7a 100644 --- a/src/se/umu/cs/dit06ajnajs/agent/Unit.java +++ b/src/se/umu/cs/dit06ajnajs/agent/Unit.java @@ -8,9 +8,10 @@ import java.util.Map; import java.util.logging.Logger; import se.umu.cs.dit06ajnajs.ATDSoundPlayer; -import se.umu.cs.dit06ajnajs.map.Level; -import se.umu.cs.dit06ajnajs.map.MapSquare; -import se.umu.cs.dit06ajnajs.map.Traversable; +import se.umu.cs.dit06ajnajs.level.Level; +import se.umu.cs.dit06ajnajs.level.MapSquare; +import se.umu.cs.dit06ajnajs.level.Traversable; + import java.awt.Rectangle; import java.awt.Color; diff --git a/src/se/umu/cs/dit06ajnajs/map/BlockedSquare.java b/src/se/umu/cs/dit06ajnajs/level/BlockedSquare.java similarity index 81% rename from src/se/umu/cs/dit06ajnajs/map/BlockedSquare.java rename to src/se/umu/cs/dit06ajnajs/level/BlockedSquare.java index e43ea88..6840710 100644 --- a/src/se/umu/cs/dit06ajnajs/map/BlockedSquare.java +++ b/src/se/umu/cs/dit06ajnajs/level/BlockedSquare.java @@ -1,4 +1,4 @@ -package se.umu.cs.dit06ajnajs.map; +package se.umu.cs.dit06ajnajs.level; import java.awt.Image; diff --git a/src/se/umu/cs/dit06ajnajs/map/Clickable.java b/src/se/umu/cs/dit06ajnajs/level/Clickable.java similarity index 61% rename from src/se/umu/cs/dit06ajnajs/map/Clickable.java rename to src/se/umu/cs/dit06ajnajs/level/Clickable.java index 752ec9d..6d12c73 100644 --- a/src/se/umu/cs/dit06ajnajs/map/Clickable.java +++ b/src/se/umu/cs/dit06ajnajs/level/Clickable.java @@ -1,4 +1,4 @@ -package se.umu.cs.dit06ajnajs.map; +package se.umu.cs.dit06ajnajs.level; public interface Clickable { public void click(); diff --git a/src/se/umu/cs/dit06ajnajs/map/GoalSquare.java b/src/se/umu/cs/dit06ajnajs/level/GoalSquare.java similarity index 96% rename from src/se/umu/cs/dit06ajnajs/map/GoalSquare.java rename to src/se/umu/cs/dit06ajnajs/level/GoalSquare.java index e9852cd..2172bb1 100644 --- a/src/se/umu/cs/dit06ajnajs/map/GoalSquare.java +++ b/src/se/umu/cs/dit06ajnajs/level/GoalSquare.java @@ -1,4 +1,4 @@ -package se.umu.cs.dit06ajnajs.map; +package se.umu.cs.dit06ajnajs.level; import java.awt.Image; import java.util.ArrayList; diff --git a/src/se/umu/cs/dit06ajnajs/map/Level.java b/src/se/umu/cs/dit06ajnajs/level/Level.java similarity index 99% rename from src/se/umu/cs/dit06ajnajs/map/Level.java rename to src/se/umu/cs/dit06ajnajs/level/Level.java index 5c0bc27..3ede83d 100644 --- a/src/se/umu/cs/dit06ajnajs/map/Level.java +++ b/src/se/umu/cs/dit06ajnajs/level/Level.java @@ -1,4 +1,4 @@ -package se.umu.cs.dit06ajnajs.map; +package se.umu.cs.dit06ajnajs.level; import java.awt.Dimension; import java.awt.Graphics; diff --git a/src/se/umu/cs/dit06ajnajs/map/MapSquare.java b/src/se/umu/cs/dit06ajnajs/level/MapSquare.java similarity index 98% rename from src/se/umu/cs/dit06ajnajs/map/MapSquare.java rename to src/se/umu/cs/dit06ajnajs/level/MapSquare.java index d8814ad..65a0912 100644 --- a/src/se/umu/cs/dit06ajnajs/map/MapSquare.java +++ b/src/se/umu/cs/dit06ajnajs/level/MapSquare.java @@ -1,4 +1,4 @@ -package se.umu.cs.dit06ajnajs.map; +package se.umu.cs.dit06ajnajs.level; import java.awt.Graphics; import java.awt.Image; diff --git a/src/se/umu/cs/dit06ajnajs/map/MapSquareFactory.java b/src/se/umu/cs/dit06ajnajs/level/MapSquareFactory.java similarity index 99% rename from src/se/umu/cs/dit06ajnajs/map/MapSquareFactory.java rename to src/se/umu/cs/dit06ajnajs/level/MapSquareFactory.java index 558e49b..2504034 100644 --- a/src/se/umu/cs/dit06ajnajs/map/MapSquareFactory.java +++ b/src/se/umu/cs/dit06ajnajs/level/MapSquareFactory.java @@ -1,4 +1,4 @@ -package se.umu.cs.dit06ajnajs.map; +package se.umu.cs.dit06ajnajs.level; import java.awt.image.BufferedImage; import java.io.IOException; diff --git a/src/se/umu/cs/dit06ajnajs/map/MapSquarePrototypeFactory.java b/src/se/umu/cs/dit06ajnajs/level/MapSquarePrototypeFactory.java similarity index 99% rename from src/se/umu/cs/dit06ajnajs/map/MapSquarePrototypeFactory.java rename to src/se/umu/cs/dit06ajnajs/level/MapSquarePrototypeFactory.java index cb26926..5033799 100644 --- a/src/se/umu/cs/dit06ajnajs/map/MapSquarePrototypeFactory.java +++ b/src/se/umu/cs/dit06ajnajs/level/MapSquarePrototypeFactory.java @@ -1,4 +1,4 @@ -package se.umu.cs.dit06ajnajs.map; +package se.umu.cs.dit06ajnajs.level; import java.awt.image.BufferedImage; import java.io.IOException; diff --git a/src/se/umu/cs/dit06ajnajs/map/PathSquare.java b/src/se/umu/cs/dit06ajnajs/level/PathSquare.java similarity index 94% rename from src/se/umu/cs/dit06ajnajs/map/PathSquare.java rename to src/se/umu/cs/dit06ajnajs/level/PathSquare.java index bd6d98c..f615c1d 100644 --- a/src/se/umu/cs/dit06ajnajs/map/PathSquare.java +++ b/src/se/umu/cs/dit06ajnajs/level/PathSquare.java @@ -1,4 +1,4 @@ -package se.umu.cs.dit06ajnajs.map; +package se.umu.cs.dit06ajnajs.level; import java.awt.Image; import java.util.logging.Logger; diff --git a/src/se/umu/cs/dit06ajnajs/map/StartSquare.java b/src/se/umu/cs/dit06ajnajs/level/StartSquare.java similarity index 98% rename from src/se/umu/cs/dit06ajnajs/map/StartSquare.java rename to src/se/umu/cs/dit06ajnajs/level/StartSquare.java index cfd0bcf..97ea7b8 100644 --- a/src/se/umu/cs/dit06ajnajs/map/StartSquare.java +++ b/src/se/umu/cs/dit06ajnajs/level/StartSquare.java @@ -1,4 +1,4 @@ -package se.umu.cs.dit06ajnajs.map; +package se.umu.cs.dit06ajnajs.level; import java.awt.Image; import se.umu.cs.dit06ajnajs.agent.Unit; diff --git a/src/se/umu/cs/dit06ajnajs/map/TowerSquare.java b/src/se/umu/cs/dit06ajnajs/level/TowerSquare.java similarity index 93% rename from src/se/umu/cs/dit06ajnajs/map/TowerSquare.java rename to src/se/umu/cs/dit06ajnajs/level/TowerSquare.java index 8c4d20a..302e76c 100644 --- a/src/se/umu/cs/dit06ajnajs/map/TowerSquare.java +++ b/src/se/umu/cs/dit06ajnajs/level/TowerSquare.java @@ -1,4 +1,4 @@ -package se.umu.cs.dit06ajnajs.map; +package se.umu.cs.dit06ajnajs.level; import java.awt.Image; import se.umu.cs.dit06ajnajs.agent.Tower; diff --git a/src/se/umu/cs/dit06ajnajs/map/Traversable.java b/src/se/umu/cs/dit06ajnajs/level/Traversable.java similarity index 87% rename from src/se/umu/cs/dit06ajnajs/map/Traversable.java rename to src/se/umu/cs/dit06ajnajs/level/Traversable.java index 415fcf4..6d2957e 100644 --- a/src/se/umu/cs/dit06ajnajs/map/Traversable.java +++ b/src/se/umu/cs/dit06ajnajs/level/Traversable.java @@ -1,4 +1,4 @@ -package se.umu.cs.dit06ajnajs.map; +package se.umu.cs.dit06ajnajs.level; import se.umu.cs.dit06ajnajs.agent.Unit; diff --git a/src/se/umu/cs/dit06ajnajs/map/TurnSquare.java b/src/se/umu/cs/dit06ajnajs/level/TurnSquare.java similarity index 98% rename from src/se/umu/cs/dit06ajnajs/map/TurnSquare.java rename to src/se/umu/cs/dit06ajnajs/level/TurnSquare.java index c027588..1dca5fe 100644 --- a/src/se/umu/cs/dit06ajnajs/map/TurnSquare.java +++ b/src/se/umu/cs/dit06ajnajs/level/TurnSquare.java @@ -1,4 +1,4 @@ -package se.umu.cs.dit06ajnajs.map; +package se.umu.cs.dit06ajnajs.level; import java.awt.Image; diff --git a/src/se/umu/cs/dit06ajnajs/util/LevelEditor.java b/src/se/umu/cs/dit06ajnajs/util/LevelEditor.java index 8630cac..0acf3b6 100644 --- a/src/se/umu/cs/dit06ajnajs/util/LevelEditor.java +++ b/src/se/umu/cs/dit06ajnajs/util/LevelEditor.java @@ -24,9 +24,9 @@ import javax.swing.ListSelectionModel; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import se.umu.cs.dit06ajnajs.AntiTD; -import se.umu.cs.dit06ajnajs.map.Level; -import se.umu.cs.dit06ajnajs.map.MapSquare; -import se.umu.cs.dit06ajnajs.map.MapSquarePrototypeFactory; +import se.umu.cs.dit06ajnajs.level.Level; +import se.umu.cs.dit06ajnajs.level.MapSquare; +import se.umu.cs.dit06ajnajs.level.MapSquarePrototypeFactory; import se.umu.cs.dit06ajnajs.util.LevelsXMLOutputter; /** diff --git a/src/se/umu/cs/dit06ajnajs/util/LevelsXMLOutputter.java b/src/se/umu/cs/dit06ajnajs/util/LevelsXMLOutputter.java index 7b7ee08..9273f86 100644 --- a/src/se/umu/cs/dit06ajnajs/util/LevelsXMLOutputter.java +++ b/src/se/umu/cs/dit06ajnajs/util/LevelsXMLOutputter.java @@ -6,8 +6,9 @@ import org.jdom.Document; import org.jdom.Element; import org.jdom.output.Format; import org.jdom.output.XMLOutputter; -import se.umu.cs.dit06ajnajs.map.Level; -import se.umu.cs.dit06ajnajs.map.MapSquare; + +import se.umu.cs.dit06ajnajs.level.Level; +import se.umu.cs.dit06ajnajs.level.MapSquare; /** * Converts a Level to XML. diff --git a/src/se/umu/cs/dit06ajnajs/util/LevelsXMLParser.java b/src/se/umu/cs/dit06ajnajs/util/LevelsXMLParser.java index cd5e0b2..8ed9b46 100644 --- a/src/se/umu/cs/dit06ajnajs/util/LevelsXMLParser.java +++ b/src/se/umu/cs/dit06ajnajs/util/LevelsXMLParser.java @@ -11,10 +11,10 @@ import org.jdom.Element; import org.jdom.JDOMException; import se.umu.cs.dit06ajnajs.AntiTD; -import se.umu.cs.dit06ajnajs.map.Level; -import se.umu.cs.dit06ajnajs.map.MapSquare; -import se.umu.cs.dit06ajnajs.map.MapSquareFactory; -import se.umu.cs.dit06ajnajs.map.StartSquare; +import se.umu.cs.dit06ajnajs.level.Level; +import se.umu.cs.dit06ajnajs.level.MapSquare; +import se.umu.cs.dit06ajnajs.level.MapSquareFactory; +import se.umu.cs.dit06ajnajs.level.StartSquare; import se.umu.cs.dit06ajnajs.agent.AgentPrototypeFactory; import se.umu.cs.dit06ajnajs.agent.Direction; import se.umu.cs.dit06ajnajs.agent.Tower; -- 2.11.4.GIT