From d51de2eea5dc1d9879516672c42cc1b72454fde6 Mon Sep 17 00:00:00 2001 From: Arthur Bols Date: Wed, 7 Mar 2018 21:53:31 +0100 Subject: [PATCH] moved files --- OGP1718-Worms/src-provided/worms/facade/IFacade.java | 2 +- OGP1718-Worms/src/worms/model/Worm.java | 4 +++- OGP1718-Worms/src/{ => worms/util}/IllegalNameException.java | 2 ++ OGP1718-Worms/src/{ => worms/util}/Tuple.java | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) rename OGP1718-Worms/src/{ => worms/util}/IllegalNameException.java (98%) rename OGP1718-Worms/src/{ => worms/util}/Tuple.java (98%) diff --git a/OGP1718-Worms/src-provided/worms/facade/IFacade.java b/OGP1718-Worms/src-provided/worms/facade/IFacade.java index 98b70ee..2a81d1a 100644 --- a/OGP1718-Worms/src-provided/worms/facade/IFacade.java +++ b/OGP1718-Worms/src-provided/worms/facade/IFacade.java @@ -67,7 +67,7 @@ public interface IFacade { * Create and return a new worm that is positioned at the given location, looks * in the given direction, has the given radius and the given name. * - * @param coordinates + * @param location * An array containing the x-coordinate of the position of the new * worm followed by the y-coordinate of the position of the new worm * (in meter) diff --git a/OGP1718-Worms/src/worms/model/Worm.java b/OGP1718-Worms/src/worms/model/Worm.java index beebfa3..4e97915 100644 --- a/OGP1718-Worms/src/worms/model/Worm.java +++ b/OGP1718-Worms/src/worms/model/Worm.java @@ -1,6 +1,8 @@ package worms.model; import be.kuleuven.cs.som.annotate.*; +import worms.util.Tuple; +import worms.util.IllegalNameException; public class Worm { /** @@ -453,7 +455,7 @@ public class Worm { * * @post the worm jumps to his new place. The new place is the x-coordinate plus the jump distance * with the jump velocity - * |Tuple.create(location.item1 + jumpDistance(this.jumpVelocity), location.item2) + * |worms.util.Tuple.create(location.item1 + jumpDistance(this.jumpVelocity), location.item2) * @post the current action points schould be 0 after a jump * |this.points = 0 * @throws IllegalStateException() diff --git a/OGP1718-Worms/src/IllegalNameException.java b/OGP1718-Worms/src/worms/util/IllegalNameException.java similarity index 98% rename from OGP1718-Worms/src/IllegalNameException.java rename to OGP1718-Worms/src/worms/util/IllegalNameException.java index b64dafd..695fba3 100644 --- a/OGP1718-Worms/src/IllegalNameException.java +++ b/OGP1718-Worms/src/worms/util/IllegalNameException.java @@ -1,3 +1,5 @@ +package worms.util; + import be.kuleuven.cs.som.annotate.*; /** diff --git a/OGP1718-Worms/src/Tuple.java b/OGP1718-Worms/src/worms/util/Tuple.java similarity index 98% rename from OGP1718-Worms/src/Tuple.java rename to OGP1718-Worms/src/worms/util/Tuple.java index 83a896f..5aca4da 100644 --- a/OGP1718-Worms/src/Tuple.java +++ b/OGP1718-Worms/src/worms/util/Tuple.java @@ -1,3 +1,5 @@ +package worms.util; + import java.util.Objects; import be.kuleuven.cs.som.annotate.*;