Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules

main
hba56 9 years ago
commit c95f5377f6

@ -20,6 +20,7 @@ public class Boat {
* @param name Name of the Boat. * @param name Name of the Boat.
* @param velocity Speed in m/s that the boat travels at. * @param velocity Speed in m/s that the boat travels at.
* @param abbrev nam abbreviation * @param abbrev nam abbreviation
* @param sourceID id of boat
*/ */
public Boat(String name, double velocity, String abbrev, int sourceID) { public Boat(String name, double velocity, String abbrev, int sourceID) {
this.velocity = velocity; this.velocity = velocity;

@ -38,6 +38,7 @@ public class BoatInRace extends Boat {
* @param velocity Speed that the boat travels. * @param velocity Speed that the boat travels.
* @param colour Colour the boat will be displayed as on the map * @param colour Colour the boat will be displayed as on the map
* @param abbrev of boat * @param abbrev of boat
* @param sourceID id of boat
*/ */
public BoatInRace(String name, double velocity, Color colour, String abbrev, int sourceID) { public BoatInRace(String name, double velocity, Color colour, String abbrev, int sourceID) {
super(name, velocity, abbrev, sourceID); super(name, velocity, abbrev, sourceID);

@ -62,7 +62,6 @@ public class Leg {
* Returns the leg number that the leg exists in the Race * Returns the leg number that the leg exists in the Race
* *
* @return Returns the Leg * @return Returns the Leg
* @see Race
*/ */
public int getLegNumber() { public int getLegNumber() {
return legNumber; return legNumber;

Loading…
Cancel
Save