tri11paragon
/
COSC-3P91-Assignments
mirror of https://github.com/Tri11Paragon/COSC-3P91-Assignments.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reformat

main
Brett 2023-03-02 13:01:41 -05:00
parent 5b516418ed
commit 9a7aa7c6b3
19 changed files with 292 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
Assignment 2/src/ca/cosc3p91/a2/game/GameEngine.java
View File

@ -5,47 +5,47 @@ import ca.cosc3p91.a2.player.*;
public class GameEngine implements Runnable { public class GameEngine implements Runnable {
private Player player; private Player player;
private int pillageFactor; private int pillageFactor;
private int currentTime; private int currentTime;
public Map map; public Map map;
public GameEngine () { public GameEngine() {
player = new Player(); player = new Player();
VillageStage vInitialStage = new VillageStage(100,0,2,30,0, VillageStage vInitialStage = new VillageStage(100, 0, 2, 30, 0,
0, 12,12,12); 0, 12, 12, 12);
map = new Map(new Village_Hall(1,vInitialStage),30); map = new Map(new Village_Hall(1, vInitialStage), 30);
}
public void printState() {
// Print toPrint = new Print("~ Current Village Buildings ~",2);
System.out.println("In Map:\n");
System.out.println("\t~ Current Village Buildings ~\n");
for (Building b : map.contains) {
System.out.println("\t|> "+b.getClass().getSimpleName()+" lvl: "+b.getLevel()+" health: "+b.getHealth());
} }
System.out.println("\n\t~ Current Village Inhabitants ~\n\n");
for (Inhabitant i : map.inhabitants) { public void printState() {
System.out.println("\t|> "+i.getClass().getSimpleName()+" lvl: "+i.getLevel()); // Print toPrint = new Print("~ Current Village Buildings ~",2);
System.out.println("In Map:\n");
System.out.println("\t~ Current Village Buildings ~\n");
for (Building b : map.contains) {
System.out.println("\t|> " + b.getClass().getSimpleName() + " lvl: " + b.getLevel() + " health: " + b.getHealth());
}
System.out.println("\n\t~ Current Village Inhabitants ~\n\n");
for (Inhabitant i : map.inhabitants) {
System.out.println("\t|> " + i.getClass().getSimpleName() + " lvl: " + i.getLevel());
}
} }
}
public void attackVillage(Map map) { public void attackVillage(Map map) {
} }
public Map generateMap() { public Map generateMap() {
return null; return null;
} }
public void getScore(Map map) { public void getScore(Map map) {
} }
@Override @Override
public void run() { public void run() {
} }
} }

50
Assignment 2/src/ca/cosc3p91/a2/game/Map.java
View File

@ -7,42 +7,42 @@ import java.util.List;
public class Map { public class Map {
static int MAXSIZE = 400; static int MAXSIZE = 400;
private Village_Hall townHall; private Village_Hall townHall;
private int guardTime; private int guardTime;
public List<Building> contains; public List<Building> contains;
public List<Inhabitant> inhabitants; public List<Inhabitant> inhabitants;
public Map (Village_Hall villageHall, int gTime) { public Map(Village_Hall villageHall, int gTime) {
contains = new ArrayList<>(); contains = new ArrayList<>();
inhabitants = new ArrayList<>(); inhabitants = new ArrayList<>();
this.townHall = villageHall; this.townHall = villageHall;
this.contains.add(villageHall); this.contains.add(villageHall);
this.guardTime = gTime; this.guardTime = gTime;
} }
public void move(Infantry i, Tile t) { public void move(Infantry i, Tile t) {
} }
public void inRange(Infantry i, Building b) { public void inRange(Infantry i, Building b) {
} }
public void build(Tile t, Building b) { public void build(Tile t, Building b) {
contains.add(b); contains.add(b);
} }
public int getGuardTime() { public int getGuardTime() {
return guardTime; return guardTime;
} }
public void setGuardTime(int gTime) { public void setGuardTime(int gTime) {
this.guardTime = gTime; this.guardTime = gTime;
} }
} }

94
Assignment 2/src/ca/cosc3p91/a2/gameobjects/Building.java
View File

@ -4,66 +4,68 @@ import java.util.ArrayList;
public abstract class Building { public abstract class Building {
// members // members
private int level; private int level;
private int health; private int health;
private Stage stage; private Stage stage;
private int goldCost; private int goldCost;
private int ironCost; private int ironCost;
private int woodCost; private int woodCost;
private int buildTime; private int buildTime;
public ArrayList<Tile> tiles = new ArrayList<>(); public ArrayList<Tile> tiles = new ArrayList<>();
public ArrayList<Inhabitant> inhabitants = new ArrayList<>(); public ArrayList<Inhabitant> inhabitants = new ArrayList<>();
// functions // functions
public int getLevel() { public int getLevel() {
return level; return level;
} }
public int getHealth() { public int getHealth() {
return health; return health;
} }
public int getCost(String type) { public int getCost(String type) {
return (type.equals("gold"))?(goldCost): return (type.equals("gold")) ? (goldCost) :
(type.equals("iron"))?(ironCost):woodCost; (type.equals("iron")) ? (ironCost) : woodCost;
} }
public Stage getStage() { public Stage getStage() {
return stage; return stage;
} }
public int getUpgradeCost() { public int getUpgradeCost() {
return 0; return 0;
} }
public void setLevel(int level) { public void setLevel(int level) {
this.level = level; this.level = level;
} }
public void setHealth(int health) { public void setHealth(int health) {
this.health = health; this.health = health;
} }
public void setStage(Stage stage) {this.stage = stage; } public void setStage(Stage stage) {
this.stage = stage;
}
public void addInhabitant(Inhabitant newMember) { public void addInhabitant(Inhabitant newMember) {
inhabitants.add(newMember); inhabitants.add(newMember);
// newMember.setBuilding(this); // newMember.setBuilding(this);
} }
public void upgrade(Stage stage) { public void upgrade(Stage stage) {
this.stage = stage; this.stage = stage;
this.health += stage.dHealth; this.health += stage.dHealth;
// interact with the timer regarding Upgrade time // interact with the timer regarding Upgrade time
} }
public int getBuildTime() { public int getBuildTime() {
return buildTime; return buildTime;
} }
} }

18
Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseBuilding.java
View File

@ -2,17 +2,17 @@ package ca.cosc3p91.a2.gameobjects;
public class DefenseBuilding extends Building { public class DefenseBuilding extends Building {
private int damage; private int damage;
private int range; private int range;
public void upgrade(DefenseStage stage) { public void upgrade(DefenseStage stage) {
super.upgrade(stage); super.upgrade(stage);
this.damage += stage.getDamageChange(); this.damage += stage.getDamageChange();
this.range += stage.getRangeChange(); this.range += stage.getRangeChange();
} }
public void attack(Infantry attacker) { public void attack(Infantry attacker) {
} }
} }

28
Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseStage.java
View File

@ -2,23 +2,23 @@ package ca.cosc3p91.a2.gameobjects;
class DefenseStage extends Stage { class DefenseStage extends Stage {
protected int dDamage; protected int dDamage;
protected int dRange; protected int dRange;
public DefenseStage(int dHealth, int goldCost, int requiredVillageLevel, int upgradeTime, int ironCost, int woodCost, public DefenseStage(int dHealth, int goldCost, int requiredVillageLevel, int upgradeTime, int ironCost, int woodCost,
int damageIncrease, int rangeIncrease) { int damageIncrease, int rangeIncrease) {
super(dHealth,goldCost,requiredVillageLevel,upgradeTime,ironCost,woodCost); super(dHealth, goldCost, requiredVillageLevel, upgradeTime, ironCost, woodCost);
this.dDamage = damageIncrease; this.dDamage = damageIncrease;
this.dRange = rangeIncrease; this.dRange = rangeIncrease;
} }
public int getDamageChange() { public int getDamageChange() {
return dDamage; return dDamage;
} }
public int getRangeChange() { public int getRangeChange() {
return dRange; return dRange;
} }
} }

8
Assignment 2/src/ca/cosc3p91/a2/gameobjects/Farm.java
View File

@ -2,10 +2,10 @@ package ca.cosc3p91.a2.gameobjects;
public class Farm extends ResourceBuilding { public class Farm extends ResourceBuilding {
public Farm (int lvl, ResourceStage baseStage) { public Farm(int lvl, ResourceStage baseStage) {
setLevel(lvl); setLevel(lvl);
upgrade(baseStage); upgrade(baseStage);
} }
public int getPopulationContribution() { public int getPopulationContribution() {
return 0; return 0;

4
Assignment 2/src/ca/cosc3p91/a2/gameobjects/Inhabitant.java
View File

@ -1,4 +1,5 @@
package ca.cosc3p91.a2.gameobjects; package ca.cosc3p91.a2.gameobjects;
import ca.cosc3p91.a2.game.Map; import ca.cosc3p91.a2.game.Map;
public interface Inhabitant { public interface Inhabitant {
@ -8,10 +9,13 @@ public interface Inhabitant {
int lvl = 1; int lvl = 1;
void move(Tile t); void move(Tile t);
void getPosition(); void getPosition();
default int getLevel() { default int getLevel() {
return lvl; return lvl;
} }
default int setLevel(int level) { default int setLevel(int level) {
return lvl; return lvl;
} }

16
Assignment 2/src/ca/cosc3p91/a2/gameobjects/IronMine.java
View File

@ -2,15 +2,15 @@ package ca.cosc3p91.a2.gameobjects;
public class IronMine extends ResourceBuilding { public class IronMine extends ResourceBuilding {
public static String resource = "iron"; public static String resource = "iron";
public IronMine (int lvl, ResourceStage baseStage) { public IronMine(int lvl, ResourceStage baseStage) {
setLevel(lvl); setLevel(lvl);
upgrade(baseStage); upgrade(baseStage);
} }
@Override @Override
public void harvest(Village_Hall hall) { public void harvest(Village_Hall hall) {
} }
} }

14
Assignment 2/src/ca/cosc3p91/a2/gameobjects/LumberMine.java
View File

@ -2,15 +2,15 @@ package ca.cosc3p91.a2.gameobjects;
public class LumberMine extends ResourceBuilding { public class LumberMine extends ResourceBuilding {
public static String resource = "wood"; public static String resource = "wood";
public LumberMine (int lvl, ResourceStage baseStage) { public LumberMine(int lvl, ResourceStage baseStage) {
setLevel(lvl); setLevel(lvl);
upgrade(baseStage); upgrade(baseStage);
} }
public void harvest(Village_Hall hall) { public void harvest(Village_Hall hall) {
} }
} }

14
Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceBuilding.java
View File

@ -2,14 +2,14 @@ package ca.cosc3p91.a2.gameobjects;
public abstract class ResourceBuilding extends Building { public abstract class ResourceBuilding extends Building {
public static String resource; public static String resource;
private int harvest_rate; private int harvest_rate;
public void upgrade(ResourceStage stage) { public void upgrade(ResourceStage stage) {
super.upgrade(stage); super.upgrade(stage);
this.harvest_rate += stage.getHarvestRateIncrease(); this.harvest_rate += stage.getHarvestRateIncrease();
} }
public abstract void harvest(Village_Hall hall); public abstract void harvest(Village_Hall hall);
} }

18
Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceStage.java
View File

@ -2,16 +2,16 @@ package ca.cosc3p91.a2.gameobjects;
public class ResourceStage extends Stage { public class ResourceStage extends Stage {
protected int harvestRateIncrease; protected int harvestRateIncrease;
public ResourceStage(int dHealth, int goldCost, int requiredVillageLevel, int upgradeTime, int ironCost, int woodCost, public ResourceStage(int dHealth, int goldCost, int requiredVillageLevel, int upgradeTime, int ironCost, int woodCost,
int harvestRateIncr) { int harvestRateIncr) {
super(dHealth,goldCost,requiredVillageLevel,upgradeTime,ironCost,woodCost); super(dHealth, goldCost, requiredVillageLevel, upgradeTime, ironCost, woodCost);
this.harvestRateIncrease = harvestRateIncr; this.harvestRateIncrease = harvestRateIncr;
} }
public int getHarvestRateIncrease() { public int getHarvestRateIncrease() {
return harvestRateIncrease; return harvestRateIncrease;
} }
} }

16
Assignment 2/src/ca/cosc3p91/a2/gameobjects/SaulGoodMine.java
View File

@ -2,15 +2,15 @@ package ca.cosc3p91.a2.gameobjects;
public class SaulGoodMine extends ResourceBuilding { public class SaulGoodMine extends ResourceBuilding {
public static String resource = "gold"; public static String resource = "gold";
public SaulGoodMine(int lvl, ResourceStage baseStage) { public SaulGoodMine(int lvl, ResourceStage baseStage) {
setLevel(lvl); setLevel(lvl);
upgrade(baseStage); upgrade(baseStage);
} }
@Override @Override
public void harvest(Village_Hall hall) { public void harvest(Village_Hall hall) {
} }
} }

54
Assignment 2/src/ca/cosc3p91/a2/gameobjects/Stage.java
View File

@ -2,42 +2,42 @@ package ca.cosc3p91.a2.gameobjects;
abstract class Stage { abstract class Stage {
protected int dHealth; protected int dHealth;
protected int goldCost; protected int goldCost;
protected int requiredVillageLevel; protected int requiredVillageLevel;
protected int upgradeTime; protected int upgradeTime;
protected int ironCost; protected int ironCost;
protected int woodCost; protected int woodCost;
public Stage(int dHealth, int goldCost, int requiredVillageLevel, int upgradeTime, int ironCost, int woodCost) { public Stage(int dHealth, int goldCost, int requiredVillageLevel, int upgradeTime, int ironCost, int woodCost) {
this.dHealth = dHealth; this.dHealth = dHealth;
this.goldCost = goldCost; this.goldCost = goldCost;
this.requiredVillageLevel = requiredVillageLevel; this.requiredVillageLevel = requiredVillageLevel;
this.upgradeTime = upgradeTime; this.upgradeTime = upgradeTime;
this.ironCost = ironCost; this.ironCost = ironCost;
this.woodCost = woodCost; this.woodCost = woodCost;
} }
public int getHealthChange() { public int getHealthChange() {
return dHealth; return dHealth;
} }
public int getCost(String type) { public int getCost(String type) {
return (type.equals("gold"))?(goldCost): return (type.equals("gold")) ? (goldCost) :
(type.equals("iron"))?(ironCost):woodCost; (type.equals("iron")) ? (ironCost) : woodCost;
} }
public int getRequiredVillageLevel() { public int getRequiredVillageLevel() {
return requiredVillageLevel; return requiredVillageLevel;
} }
public int getUpgradeTime() { public int getUpgradeTime() {
return upgradeTime; return upgradeTime;
} }
} }

4
Assignment 2/src/ca/cosc3p91/a2/gameobjects/Tile.java
View File

@ -4,8 +4,8 @@ import java.util.List;
public class Tile { public class Tile {
public int x; public int x;
public int y; public int y;
} }

38
Assignment 2/src/ca/cosc3p91/a2/gameobjects/VillageStage.java
View File

@ -2,30 +2,30 @@ package ca.cosc3p91.a2.gameobjects;
public class VillageStage extends Stage { public class VillageStage extends Stage {
protected int goldCapacityIncrease; protected int goldCapacityIncrease;
protected int ironCapacityIncrease; protected int ironCapacityIncrease;
protected int woodCapacityIncrease; protected int woodCapacityIncrease;
public VillageStage(int dHealth, int goldCost, int requiredVillageLevel, int upgradeTime, int ironCost, int woodCost, public VillageStage(int dHealth, int goldCost, int requiredVillageLevel, int upgradeTime, int ironCost, int woodCost,
int goldCapIncrease, int ironCapIncrease, int woodCapIncrease) { int goldCapIncrease, int ironCapIncrease, int woodCapIncrease) {
super(dHealth,goldCost,requiredVillageLevel,upgradeTime,ironCost,woodCost); super(dHealth, goldCost, requiredVillageLevel, upgradeTime, ironCost, woodCost);
this.goldCapacityIncrease = goldCapIncrease; this.goldCapacityIncrease = goldCapIncrease;
this.ironCapacityIncrease = ironCapIncrease; this.ironCapacityIncrease = ironCapIncrease;
this.woodCapacityIncrease = woodCapIncrease; this.woodCapacityIncrease = woodCapIncrease;
} }
public int getGoldCapacityIncrease() { public int getGoldCapacityIncrease() {
return goldCapacityIncrease; return goldCapacityIncrease;
} }
public int getIronCapacityIncrease() { public int getIronCapacityIncrease() {
return ironCapacityIncrease; return ironCapacityIncrease;
} }
public int getWoodCapacityIncrease() { public int getWoodCapacityIncrease() {
return woodCapacityIncrease; return woodCapacityIncrease;
} }
} }

86
Assignment 2/src/ca/cosc3p91/a2/gameobjects/Village_Hall.java
View File

@ -4,60 +4,60 @@ import java.util.ArrayList;
public class Village_Hall extends Building { public class Village_Hall extends Building {
private int goldCapacity = 0; private int goldCapacity = 0;
private int ironCapacity = 0; private int ironCapacity = 0;
private int woodCapacity = 0; private int woodCapacity = 0;
private int currentGold; private int currentGold;
private int currentIron; private int currentIron;
private int currentWood; private int currentWood;
public Village_Hall (int lvl, VillageStage baseStage) { public Village_Hall(int lvl, VillageStage baseStage) {
setLevel(lvl); setLevel(lvl);
upgrade(baseStage); upgrade(baseStage);
} }
public void upgrade(VillageStage stage) { public void upgrade(VillageStage stage) {
super.upgrade(stage); super.upgrade(stage);
this.goldCapacity += stage.getGoldCapacityIncrease(); this.goldCapacity += stage.getGoldCapacityIncrease();
this.ironCapacity += stage.getIronCapacityIncrease(); this.ironCapacity += stage.getIronCapacityIncrease();
this.woodCapacity += stage.getWoodCapacityIncrease(); this.woodCapacity += stage.getWoodCapacityIncrease();
} }
public int getGoldCapacity() { public int getGoldCapacity() {
return goldCapacity; return goldCapacity;
} }
public int getIronCapacity() { public int getIronCapacity() {
return ironCapacity; return ironCapacity;
} }
public int getWoodCapacity() { public int getWoodCapacity() {
return woodCapacity; return woodCapacity;
} }
public int getCurrentGold() { public int getCurrentGold() {
return currentGold; return currentGold;
} }
public void addCurrentGold(int currentGold) { public void addCurrentGold(int currentGold) {
this.currentGold += currentGold; this.currentGold += currentGold;
} }
public int getCurrentIron() { public int getCurrentIron() {
return currentIron; return currentIron;
} }
public void addCurrentIron(int currentIron) { public void addCurrentIron(int currentIron) {
this.currentIron += currentIron; this.currentIron += currentIron;
} }
public int getCurrentWood() { public int getCurrentWood() {
return currentWood; return currentWood;
} }
public void addCurrentWood(int currentWood) { public void addCurrentWood(int currentWood) {
this.currentWood += currentWood; this.currentWood += currentWood;
} }
} }

1
Assignment 2/src/ca/cosc3p91/a2/gameobjects/Worker.java
View File

@ -7,6 +7,7 @@ public class Worker implements Inhabitant {
public void set_IsBuilding(boolean state) { public void set_IsBuilding(boolean state) {
currentlyBuilding = state; currentlyBuilding = state;
} }
public boolean isCurrentlyBuilding() { public boolean isCurrentlyBuilding() {
return currentlyBuilding; return currentlyBuilding;
} }

1
Assignment 2/src/ca/cosc3p91/a2/player/Player.java
View File

@ -3,5 +3,4 @@ package ca.cosc3p91.a2.player;
public class Player { public class Player {
} }

50
Assignment 2/src/ca/cosc3p91/a2/util/Print.java
View File

@ -15,11 +15,11 @@ public class Print {
this.values = row; this.values = row;
} }
public Row(){ public Row() {
this.values = new ArrayList<>(); this.values = new ArrayList<>();
} }
public void add(String value){ public void add(String value) {
values.add(value); values.add(value);
} }
} }
@ -28,7 +28,7 @@ public class Print {
private final String columnName; private final String columnName;
private long maxColumnLength = 0; private long maxColumnLength = 0;
public Column(String columnName){ public Column(String columnName) {
this.columnName = columnName; this.columnName = columnName;
} }
} }
@ -40,18 +40,18 @@ public class Print {
private final int columnPadding; private final int columnPadding;
private int maxColumnWidth; private int maxColumnWidth;
public Print(String tableName, int columnPadding){ public Print(String tableName, int columnPadding) {
this.tableName = tableName; this.tableName = tableName;
this.columnPadding = columnPadding; this.columnPadding = columnPadding;
} }
public Print(){ public Print() {
this("", 2); this("", 2);
} }
private String createPadding(int amount) { private String createPadding(int amount) {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
for (int i = 0; i < amount; i++){ for (int i = 0; i < amount; i++) {
builder.append(' '); builder.append(' ');
} }
return builder.toString(); return builder.toString();
@ -64,8 +64,8 @@ public class Print {
StringBuilder halfWidthLeftSeparator = new StringBuilder(); StringBuilder halfWidthLeftSeparator = new StringBuilder();
StringBuilder halfWidthRightSeparator = new StringBuilder(); StringBuilder halfWidthRightSeparator = new StringBuilder();
long sizeNameFloor = (long) Math.floor((double)sizeNameRemoved / 2.0); long sizeNameFloor = (long) Math.floor((double) sizeNameRemoved / 2.0);
long sizeNameCeil = (long) Math.ceil((double)sizeNameRemoved / 2.0); long sizeNameCeil = (long) Math.ceil((double) sizeNameRemoved / 2.0);
halfWidthLeftSeparator.append('+'); halfWidthLeftSeparator.append('+');
@ -78,7 +78,7 @@ public class Print {
StringBuilder separator = new StringBuilder(); StringBuilder separator = new StringBuilder();
separator.append(halfWidthLeftSeparator.toString()); separator.append(halfWidthLeftSeparator.toString());
if (sizeOfName != 0){ if (sizeOfName != 0) {
separator.append("{ "); separator.append("{ ");
separator.append(tableName); separator.append(tableName);
separator.append(" }"); separator.append(" }");
@ -87,20 +87,20 @@ public class Print {
return separator.toString(); return separator.toString();
} }
private String generateColumnHeader(){ private String generateColumnHeader() {
updateColumnLengths(); updateColumnLengths();
StringBuilder header = new StringBuilder(); StringBuilder header = new StringBuilder();
header.append('|'); header.append('|');
for (int i = 0; i < columns.size(); i++){ for (int i = 0; i < columns.size(); i++) {
Column column = columns.get(i); Column column = columns.get(i);
double columnPaddingLength = ((int)(column.maxColumnLength) - (int)(column.columnName.length()))/2.0; double columnPaddingLength = ((int) (column.maxColumnLength) - (int) (column.columnName.length())) / 2.0;
header.append(createPadding((int)(columnPadding + (int)Math.floor(columnPaddingLength)))); header.append(createPadding((int) (columnPadding + (int) Math.floor(columnPaddingLength))));
header.append(column.columnName); header.append(column.columnName);
header.append(createPadding((int)(columnPadding + (int)Math.ceil(columnPaddingLength)))); header.append(createPadding((int) (columnPadding + (int) Math.ceil(columnPaddingLength))));
if (i < columns.size()-1) if (i < columns.size() - 1)
header.append('|'); header.append('|');
} }
header.append('|'); header.append('|');
@ -115,7 +115,7 @@ public class Print {
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
if (i == nextIndex) { if (i == nextIndex) {
System.out.println(currentColumnIndex + " " + nextIndex + " " + size); System.out.println(currentColumnIndex + " " + nextIndex + " " + size);
int currentColumnSize = (int) (columns.get(currentColumnIndex++).maxColumnLength + columnPadding*2); int currentColumnSize = (int) (columns.get(currentColumnIndex++).maxColumnLength + columnPadding * 2);
nextIndex += currentColumnSize + 1; nextIndex += currentColumnSize + 1;
wholeWidthSeparator.append('+'); wholeWidthSeparator.append('+');
} else } else
@ -139,7 +139,7 @@ public class Print {
return column.columnName.length() + columnPadding * 2L; return column.columnName.length() + columnPadding * 2L;
} }
public Print addColumn(Column column){ public Print addColumn(Column column) {
columns.add(column); columns.add(column);
return this; return this;
} }
@ -154,11 +154,11 @@ public class Print {
return this; return this;
} }
public Print addRow(ArrayList<String> row){ public Print addRow(ArrayList<String> row) {
return addRow(new Row(row)); return addRow(new Row(row));
} }
public ArrayList<String> createTable(boolean top, boolean bottom, boolean separators){ public ArrayList<String> createTable(boolean top, boolean bottom, boolean separators) {
ArrayList<String> lines = new ArrayList<>(); ArrayList<String> lines = new ArrayList<>();
String header = generateColumnHeader(); String header = generateColumnHeader();
@ -174,13 +174,13 @@ public class Print {
for (Row row : rows) { for (Row row : rows) {
StringBuilder rowLine = new StringBuilder(); StringBuilder rowLine = new StringBuilder();
rowLine.append('|'); rowLine.append('|');
for (int i = 0; i < row.values.size(); i++){ for (int i = 0; i < row.values.size(); i++) {
String value = row.values.get(i); String value = row.values.get(i);
Column column = columns.get(i); Column column = columns.get(i);
int spaceLeft = (int)(column.maxColumnLength - value.length()); int spaceLeft = (int) (column.maxColumnLength - value.length());
rowLine.append(createPadding((int)Math.floor(spaceLeft / 2.0) + columnPadding)); rowLine.append(createPadding((int) Math.floor(spaceLeft / 2.0) + columnPadding));
rowLine.append(value); rowLine.append(value);
rowLine.append(createPadding((int)Math.ceil(spaceLeft / 2.0) + columnPadding)); rowLine.append(createPadding((int) Math.ceil(spaceLeft / 2.0) + columnPadding));
rowLine.append('|'); rowLine.append('|');
} }
lines.add(rowLine.toString()); lines.add(rowLine.toString());
@ -192,7 +192,7 @@ public class Print {
return lines; return lines;
} }
public ArrayList<String> createBox(){ public ArrayList<String> createBox() {
return new ArrayList<>(); return new ArrayList<>();
} }
@ -200,7 +200,7 @@ public class Print {
return createTable(true, true, true); return createTable(true, true, true);
} }
public static void print(ArrayList<String> lines){ public static void print(ArrayList<String> lines) {
for (String line : lines) for (String line : lines)
System.out.println(line); System.out.println(line);
} }