Merge remote-tracking branch 'origin/main'

This commit is contained in:
Leonardo Brandenberger 2021-12-10 10:38:08 +01:00
commit d1d6db894b
4 changed files with 11 additions and 11 deletions

View File

@ -1,6 +1,6 @@
package ch.zhaw.catan;
import java.awt.*;
import java.awt.Point;
/// TODO: 09/12/2021 Java Doc
@ -15,9 +15,10 @@ public class Road extends Structure {
/**
* Constructor of Road
*
* @param faction The faction of the owner
* @param start the coordinates of the start Point
* @param end the coordinates of the End Point
* @param start the coordinates of the start Point
* @param end the coordinates of the End Point
*/
public Road(Config.Faction faction, Point start, Point end) {
super(faction);
@ -26,7 +27,6 @@ public class Road extends Structure {
}
/**
*
* @return the coordinates of the start Point
*/
public Point getStart() {
@ -34,7 +34,6 @@ public class Road extends Structure {
}
/**
*
* @return the coordinates of the end Point
*/
public Point getEnd() {

View File

@ -1,6 +1,6 @@
package ch.zhaw.catan;
import java.awt.*;
import java.awt.Point;
/**
* Sub Class of Structure and Super Class of City

View File

@ -4,13 +4,13 @@ import ch.zhaw.hexboard.HexBoard;
import ch.zhaw.hexboard.Label;
import java.awt.Point;
import java.util.List;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Iterator;
import java.util.Collections;
import java.util.List;
import java.util.Map;
//TODO Enhance JavaDoc
/**
@ -138,6 +138,7 @@ public class SiedlerBoard extends HexBoard<Config.Land, Settlement, Road, String
/**
* This method checks for the player with the longest road according to the siedler game rules.
*
* @param factionList a List with all factions which can place structures on the board
* @return the faction who owns the longest road with minimum length of 5, null there is no road longer then 4
*/

View File

@ -1,10 +1,10 @@
package ch.zhaw.catan;
import java.awt.Point;
import java.util.Map;
import java.util.HashMap;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;