From 05b1a867006551fbfb72d98d68e9961f058c4e51 Mon Sep 17 00:00:00 2001 From: snmangalam2708 <60610814+snmangalam2708@users.noreply.github.com> Date: Thu, 12 Mar 2020 13:17:42 -0400 Subject: [PATCH 01/48] Create README_team.md --- README_team.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README_team.md diff --git a/README_team.md b/README_team.md new file mode 100644 index 0000000..10d608c --- /dev/null +++ b/README_team.md @@ -0,0 +1,2 @@ +Testing +testing From a2a1d83986ec68355f74a96d0cc977dc898f1441 Mon Sep 17 00:00:00 2001 From: sandeep Date: Fri, 13 Mar 2020 15:58:10 -0400 Subject: [PATCH 02/48] March_Madness structure --- .idea/.gitignore | 2 + .idea/March_Madness.iml | 18 +++ .idea/compiler.xml | 16 +++ .idea/libraries/Maven__junit_junit_4_12.xml | 13 ++ .../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 ++ .idea/misc.xml | 14 ++ .idea/modules.xml | 8 ++ .idea/uiDesigner.xml | 124 ++++++++++++++++++ .idea/vcs.xml | 6 + pom.xml | 38 ++++++ src/main/java/Bracket.java | 2 + src/main/java/Console.java | 2 + src/main/java/Player.java | 5 + src/main/java/Region.java | 2 + src/main/java/Roster.java | 5 + src/main/java/Team.java | 9 ++ src/test/java/TestBracket.java | 2 + src/test/java/TestPlayer.java | 2 + src/test/java/TestRegion.java | 2 + src/test/java/TestRoster.java | 2 + src/test/java/TestTeam.java | 2 + 21 files changed, 287 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/March_Madness.iml create mode 100644 .idea/compiler.xml create mode 100644 .idea/libraries/Maven__junit_junit_4_12.xml create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/uiDesigner.xml create mode 100644 .idea/vcs.xml create mode 100644 pom.xml create mode 100644 src/main/java/Bracket.java create mode 100644 src/main/java/Console.java create mode 100644 src/main/java/Player.java create mode 100644 src/main/java/Region.java create mode 100644 src/main/java/Roster.java create mode 100644 src/main/java/Team.java create mode 100644 src/test/java/TestBracket.java create mode 100644 src/test/java/TestPlayer.java create mode 100644 src/test/java/TestRegion.java create mode 100644 src/test/java/TestRoster.java create mode 100644 src/test/java/TestTeam.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..e7e9d11 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/workspace.xml diff --git a/.idea/March_Madness.iml b/.idea/March_Madness.iml new file mode 100644 index 0000000..99ff255 --- /dev/null +++ b/.idea/March_Madness.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fcffaba --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml new file mode 100644 index 0000000..d411041 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..f58bbc1 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..1c3f3fd --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..863eca7 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..fd8d9f5 --- /dev/null +++ b/pom.xml @@ -0,0 +1,38 @@ + + + 4.0.0 + + groupId + JustCode + 1.0-SNAPSHOT + + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + + + + + junit + junit + 4.12 + test + + + junit + junit + 4.12 + test + + + + + \ No newline at end of file diff --git a/src/main/java/Bracket.java b/src/main/java/Bracket.java new file mode 100644 index 0000000..e026d2b --- /dev/null +++ b/src/main/java/Bracket.java @@ -0,0 +1,2 @@ +public class Bracket { +} diff --git a/src/main/java/Console.java b/src/main/java/Console.java new file mode 100644 index 0000000..d926ef5 --- /dev/null +++ b/src/main/java/Console.java @@ -0,0 +1,2 @@ +public class Console { +} diff --git a/src/main/java/Player.java b/src/main/java/Player.java new file mode 100644 index 0000000..9f2db13 --- /dev/null +++ b/src/main/java/Player.java @@ -0,0 +1,5 @@ +public class Player { + +// fields; +// stats; +} diff --git a/src/main/java/Region.java b/src/main/java/Region.java new file mode 100644 index 0000000..5a49700 --- /dev/null +++ b/src/main/java/Region.java @@ -0,0 +1,2 @@ +public class Region { +} diff --git a/src/main/java/Roster.java b/src/main/java/Roster.java new file mode 100644 index 0000000..0ec9b82 --- /dev/null +++ b/src/main/java/Roster.java @@ -0,0 +1,5 @@ +public class Roster { + +// listofplayers; +// positions; +} diff --git a/src/main/java/Team.java b/src/main/java/Team.java new file mode 100644 index 0000000..7733693 --- /dev/null +++ b/src/main/java/Team.java @@ -0,0 +1,9 @@ +public class Team { + +// records; +// projections; +// history; +// schedule; + + +} diff --git a/src/test/java/TestBracket.java b/src/test/java/TestBracket.java new file mode 100644 index 0000000..d8c0a95 --- /dev/null +++ b/src/test/java/TestBracket.java @@ -0,0 +1,2 @@ +public class TestBracket { +} diff --git a/src/test/java/TestPlayer.java b/src/test/java/TestPlayer.java new file mode 100644 index 0000000..7c7a7dd --- /dev/null +++ b/src/test/java/TestPlayer.java @@ -0,0 +1,2 @@ +public class TestPlayer { +} diff --git a/src/test/java/TestRegion.java b/src/test/java/TestRegion.java new file mode 100644 index 0000000..75797f2 --- /dev/null +++ b/src/test/java/TestRegion.java @@ -0,0 +1,2 @@ +public class TestRegion { +} diff --git a/src/test/java/TestRoster.java b/src/test/java/TestRoster.java new file mode 100644 index 0000000..b8b7f1c --- /dev/null +++ b/src/test/java/TestRoster.java @@ -0,0 +1,2 @@ +public class TestRoster { +} diff --git a/src/test/java/TestTeam.java b/src/test/java/TestTeam.java new file mode 100644 index 0000000..c5b6ab4 --- /dev/null +++ b/src/test/java/TestTeam.java @@ -0,0 +1,2 @@ +public class TestTeam { +} From 8209a99e429de8cd47781176a6bac5eb918b2e8c Mon Sep 17 00:00:00 2001 From: snmangalam2708 <60610814+snmangalam2708@users.noreply.github.com> Date: Fri, 13 Mar 2020 16:04:46 -0400 Subject: [PATCH 03/48] Update README_team.md --- README_team.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README_team.md b/README_team.md index 10d608c..0ce2cbd 100644 --- a/README_team.md +++ b/README_team.md @@ -1,2 +1 @@ -Testing -testing +Use SopUI for testiing apis... From f70fe73316d0f653ce652bcdc1700193e3f2f2f2 Mon Sep 17 00:00:00 2001 From: snmangalam2708 <60610814+snmangalam2708@users.noreply.github.com> Date: Fri, 13 Mar 2020 16:04:57 -0400 Subject: [PATCH 04/48] Update README_team.md --- README_team.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_team.md b/README_team.md index 0ce2cbd..1380575 100644 --- a/README_team.md +++ b/README_team.md @@ -1 +1 @@ -Use SopUI for testiing apis... +Use SopUI for testing apis... From bef269d44739dd9d5d02b4bd2ad1422fbf9e266b Mon Sep 17 00:00:00 2001 From: Raheel Uppal Date: Fri, 13 Mar 2020 16:10:04 -0400 Subject: [PATCH 05/48] pull --- .idea/.gitignore | 2 ++ .idea/JustCode.iml | 9 +++++++++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ 5 files changed, 31 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/JustCode.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..5c98b42 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/workspace.xml \ No newline at end of file diff --git a/.idea/JustCode.iml b/.idea/JustCode.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/JustCode.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..28a804d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..3e2996b --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From b3376c76a54488401293a3196e04b7d90b5e8c8d Mon Sep 17 00:00:00 2001 From: Raheel Uppal Date: Fri, 13 Mar 2020 16:22:47 -0400 Subject: [PATCH 06/48] enum --- .idea/JustCode.iml | 16 ++++++++++++++++ .idea/compiler.xml | 6 +++--- .idea/modules.xml | 2 +- src/main/java/Position.java | 14 ++++++++++++++ 4 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 .idea/JustCode.iml create mode 100644 src/main/java/Position.java diff --git a/.idea/JustCode.iml b/.idea/JustCode.iml new file mode 100644 index 0000000..4e3316b --- /dev/null +++ b/.idea/JustCode.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index fcffaba..8f7cd6f 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,11 +6,11 @@ - + - - + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 863eca7..3e2996b 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/src/main/java/Position.java b/src/main/java/Position.java new file mode 100644 index 0000000..d17b205 --- /dev/null +++ b/src/main/java/Position.java @@ -0,0 +1,14 @@ +public enum Position { + PG("Point Guard"), + SG("Shooting Guard"), + SF("Small Forward"), + PF("Power Forward"), + C("Center"); + + private String position; + + private Position(String position){ + this.position = position; + } + +} From 3d3da089b7ff180568c65fbf52a9333e975a4fe5 Mon Sep 17 00:00:00 2001 From: asconem Date: Fri, 13 Mar 2020 17:15:33 -0400 Subject: [PATCH 07/48] Saving after pull from dev --- .idea/misc.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 1c3f3fd..602a0dd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 782a297..3e2996b 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,15 +2,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD -======= - ->>>>>>> f70fe73316d0f653ce652bcdc1700193e3f2f2f2 -======= - ->>>>>>> c35fe3463776a5d458145ddbdde2660c9e63e8bc \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..ec940dc --- /dev/null +++ b/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + groupId + JustCode + 1.0-SNAPSHOT + + + junit + junit + 4.12 + test + + + + + \ No newline at end of file From a73a8e30647dc6b20185b5dcaa4e5f4dc8d9b356 Mon Sep 17 00:00:00 2001 From: ruppal Date: Fri, 13 Mar 2020 18:05:52 -0400 Subject: [PATCH 10/48] fix --- .idea/JustCode.iml | 2 +- .idea/compiler.xml | 2 +- .idea/misc.xml | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.idea/JustCode.iml b/.idea/JustCode.iml index 54ddd53..975d5da 100644 --- a/.idea/JustCode.iml +++ b/.idea/JustCode.iml @@ -1,6 +1,6 @@ - + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 623e16b..8f7cd6f 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -10,7 +10,7 @@ - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 6b87140..f766114 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,8 +3,7 @@ -<<<<<<< HEAD -======= + ->>>>>>> f70fe73316d0f653ce652bcdc1700193e3f2f2f2 + \ No newline at end of file From 826527bbdd9f8739fd6e1d424c22140cab142b1f Mon Sep 17 00:00:00 2001 From: ruppal Date: Fri, 13 Mar 2020 18:53:54 -0400 Subject: [PATCH 11/48] update --- src/main/java/Player.java | 3 ++- src/main/java/Roster.java | 14 ++++++------ src/main/java/Year.java | 2 +- src/test/java/TestPlayer.java | 21 ++++++++++++++++++ src/test/java/TestRoster.java | 40 +++++++++++++++++++++-------------- 5 files changed, 54 insertions(+), 26 deletions(-) diff --git a/src/main/java/Player.java b/src/main/java/Player.java index 375a378..73cf61f 100644 --- a/src/main/java/Player.java +++ b/src/main/java/Player.java @@ -25,7 +25,8 @@ public Player(String name, Position position, Double height, Double weight, Doub } - public Player() { + public Player(String name) { + this.name = name; } public String getName() { diff --git a/src/main/java/Roster.java b/src/main/java/Roster.java index 7145954..a742ca2 100644 --- a/src/main/java/Roster.java +++ b/src/main/java/Roster.java @@ -28,18 +28,16 @@ public Integer size() { return roster.size(); } - public void listRoster() { - System.out.println(roster.toString()); + public String listRoster(Roster roster) { + return roster.toString(); } @Override public String toString() { - String result = null; - for (Map.Entry e : roster.entrySet()) { - result = "Name: " + e.getKey().getName() + - "\n Position: " + e.getValue(); + StringBuilder result = new StringBuilder(); + for (Map.Entry entry : roster.entrySet()) { + result.append("\n").append(entry.getValue().toString()).append(" ").append(entry.getKey().getName());} - } - return result; + return result.toString(); } } diff --git a/src/main/java/Year.java b/src/main/java/Year.java index 7d75cf7..ec08543 100644 --- a/src/main/java/Year.java +++ b/src/main/java/Year.java @@ -6,7 +6,7 @@ public enum Year { private String year; - private Year(String year) { + Year(String year) { this.year = year; } } diff --git a/src/test/java/TestPlayer.java b/src/test/java/TestPlayer.java index 7c7a7dd..441be39 100644 --- a/src/test/java/TestPlayer.java +++ b/src/test/java/TestPlayer.java @@ -1,2 +1,23 @@ +import org.junit.Assert; +import org.junit.Test; + +import java.util.logging.Logger; + public class TestPlayer { + private static final Logger LOGGER = Logger.getLogger(TestPlayer.class.getName()); + @Test + public void playerDetailsTest(){ + Player player = new Player("Raheel Uppal",Position.PG,6.3,230.5,32.6,8.6,9.2,Year.FM); + String expected = player.playerDetails(player); + String actual ="Name: Raheel Uppal\n" + + " Position: PG\n" + + " Height: 6.3\n" + + " Weight: 230.5\n" + + " PPG: 32.6\n" + + " APG: 8.6\n" + + " RPG 9.2\n" + + " Class: FM"; + LOGGER.info(player.playerDetails(player)); + Assert.assertEquals(expected, actual); + } } diff --git a/src/test/java/TestRoster.java b/src/test/java/TestRoster.java index f5c8e52..0a6bad5 100644 --- a/src/test/java/TestRoster.java +++ b/src/test/java/TestRoster.java @@ -9,36 +9,44 @@ public class TestRoster { @Test public void sizeTest(){ - Player player1 = new Player(); + Player player1 = new Player("Raheel Uppal"); Position pg = Position.PG; - Player player2 = new Player(); + Player player2 = new Player("David Kelly"); Position sg = Position.SG; - Player player3 = new Player(); + Player player3 = new Player("Sandeep Manglam"); Position c = Position.SF; Roster roster = new Roster(); roster.addToRoster(player1,pg); roster.addToRoster(player2,sg); - roster.addToRoster(player3,pg); + roster.addToRoster(player3,c); Integer expected = roster.size(); Integer actual = 3; + Assert.assertEquals(expected, actual); } @Test public void listRosterTest(){ - Player player = new Player("Raheel Uppal",Position.PG,6.3,230.5,32.6,8.6,9.2,Year.FM); - String expected = player.playerDetails(player); - String actual ="Name: Raheel Uppal\n" + - " Position: PG\n" + - " Height: 6.3\n" + - " Weight: 230.5\n" + - " PPG: 32.6\n" + - " APG: 8.6\n" + - " RPG 9.2\n" + - " Class: FM"; - LOGGER.info(player.playerDetails(player)); - Assert.assertEquals(expected, actual); + Player player1 = new Player("Raheel Uppal"); + Position pg = Position.PG; + Player player2 = new Player("David Kelly"); + Position sg = Position.SG; + Player player3 = new Player("Sandeep Manglam"); + Position sf = Position.SF; + Player player4 = new Player("Mat Ascone"); + Position c = Position.C; + + Roster roster = new Roster(); + roster.addToRoster(player1,pg); + roster.addToRoster(player2,sg); + roster.addToRoster(player3,sf); + roster.addToRoster(player4,c); + + LOGGER.info(roster.listRoster(roster)); + } + + } From 7caf028614d117d77a30d23f7452cd648720309e Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sat, 14 Mar 2020 12:48:36 -0400 Subject: [PATCH 12/48] region and team framework started --- src/main/java/Bracket.java | 1 + src/main/java/Region.java | 31 +++++++++++++++++++++- src/main/java/Team.java | 54 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 1 deletion(-) diff --git a/src/main/java/Bracket.java b/src/main/java/Bracket.java index e026d2b..bd24ec2 100644 --- a/src/main/java/Bracket.java +++ b/src/main/java/Bracket.java @@ -1,2 +1,3 @@ public class Bracket { + } diff --git a/src/main/java/Region.java b/src/main/java/Region.java index 5a49700..f531c0c 100644 --- a/src/main/java/Region.java +++ b/src/main/java/Region.java @@ -1,2 +1,31 @@ -public class Region { +import java.util.HashMap; + + +public class Region{ + private Bracket regionBracket; + private HashMap teamSeedMap; + + public Region(String selectedRegion){ + this.regionBracket = new Bracket(); + } + + public Bracket getRegionBracket() { + return regionBracket; + } + + public void setRegionBracket(Bracket regionBracket) { + this.regionBracket = regionBracket; + } + + public HashMap getTeamSeedMap() { + return teamSeedMap; + } + + public void setTeamSeedMap(HashMap teamSeedMap) { + this.teamSeedMap = teamSeedMap; + } + + // methods planned for future use below +// get list of teams and seeds from API +// put them in the hashmap } diff --git a/src/main/java/Team.java b/src/main/java/Team.java index 7733693..cfb5d0a 100644 --- a/src/main/java/Team.java +++ b/src/main/java/Team.java @@ -1,5 +1,59 @@ public class Team { + private Roster teamRoster; + private String records; + private String projections; + private String history; + private String schedule; + public Team(String records,String projections,String history,String schedule, Roster roster){ + this.teamRoster = new Roster(); + this.records = records; + this.projections = projections; + this.history = history; + this.schedule = schedule; + + } + + public Roster getTeamRoster() { + return teamRoster; + } + + public void setTeamRoster(Roster teamRoster) { + this.teamRoster = teamRoster; + } + + public String getRecords() { + return records; + } + + public void setRecords(String records) { + this.records = records; + } + + public String getProjections() { + return projections; + } + + public void setProjections(String projections) { + this.projections = projections; + } + + public String getHistory() { + return history; + } + + public void setHistory(String history) { + this.history = history; + } + + public String getSchedule() { + return schedule; + } + + public void setSchedule(String schedule) { + this.schedule = schedule; + } + // get roster from API // records; // projections; // history; From b39fc15434f0defb8d5ccbaa2bcba9a5365b8bb5 Mon Sep 17 00:00:00 2001 From: sandeep Date: Sat, 14 Mar 2020 13:23:42 -0400 Subject: [PATCH 13/48] Created console for regions and GUI for march madness bracket --- pom.xml | 2 + src/main/java/Console.java | 117 +++++++++++++++++++++++++++++++++++++ src/main/java/GUI.java | 105 +++++++++++++++++++++++++++++++++ src/main/java/Region.java | 56 ++++++++++++++++++ 4 files changed, 280 insertions(+) create mode 100644 src/main/java/GUI.java diff --git a/pom.xml b/pom.xml index ec940dc..7124af5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,6 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + groupId JustCode 1.0-SNAPSHOT diff --git a/src/main/java/Console.java b/src/main/java/Console.java index d926ef5..c62edd8 100644 --- a/src/main/java/Console.java +++ b/src/main/java/Console.java @@ -1,2 +1,119 @@ +import java.util.Scanner; + public class Console { + + // ******************************************************************************************** Welcome ********** + + public void welcomeMessage() { + + System.out.println("\n"); + System.out.println("Hello Welcome to MARCH MADNESS " + "\n"); + System.out.println("Please select the Region by number" + "\n"); + System.out.println("1. EAST"); + System.out.println("2. WEST"); + System.out.println("3. MIDWEST"); + System.out.println("4. SOUTH" + "\n"); + System.out.println(" Enter your input :"); +// char escCode = 0x1B; +// int row = 10; int column = 10; +// System.out.print(String.format("%c[%d;%df",escCode,row,column)); + } + + + // ***************** Getting String input from User ********** + + public Integer getUserInput() { + Scanner readInput = new Scanner(System.in); + int userInput = Integer.parseInt(readInput.nextLine()); + return userInput; + } + + // ******************** Main **************** + + public static void main(String[] args) { + +// GUI gui = new GUI(); + + Console console1 = new Console(); + Boolean invalid = false; + + do { + console1.welcomeMessage(); + Integer response = console1.getUserInput(); + + + if (response == 1) { + + System.out.println("You selected EAST" + "\n\n"); + try { + Thread.sleep(1000); + } catch (InterruptedException ex) { + Thread.currentThread().interrupt(); + } + + System.out.println("Redirecting........."); + invalid = false; + // Call region.east(); + + } + + else if (response == 2) { + + System.out.println("You selected WEST" + "\n\n"); + try { + Thread.sleep(1000); + } catch (InterruptedException ex) { + Thread.currentThread().interrupt(); + } + + System.out.println("Redirecting........."); + invalid = false; + // Call region.west(); + } + + else if (response == 3) { + + System.out.println("You selected MIDWEST" + "\n\n"); + try { + Thread.sleep(1000); + } catch (InterruptedException ex) { + Thread.currentThread().interrupt(); + } + + System.out.println("Redirecting........."); + invalid = false; + // Call region.midwest(); + } + + else if (response == 4) { + System.out.println("You selected SOUTH" + "\n\n"); + try { + Thread.sleep(1000); + } catch (InterruptedException ex) { + Thread.currentThread().interrupt(); + } + + System.out.println("Redirecting........."); + invalid = false; + // Call region.south(); + } + + else { + System.out.println(" Invalid Entry ! Please enter a valid response from the menu "); + invalid = true; + + try { + Thread.sleep(500); + } + catch (InterruptedException ex) { + Thread.currentThread().interrupt(); + } + + System.out.println("\n"); + } + + } while (invalid); + } } + + diff --git a/src/main/java/GUI.java b/src/main/java/GUI.java new file mode 100644 index 0000000..952c808 --- /dev/null +++ b/src/main/java/GUI.java @@ -0,0 +1,105 @@ +import javax.swing.JFrame; +import java.awt.Graphics; + +public class GUI extends JFrame{ + + /** + * Constructor + * initializes gui window + * + **/ + + public GUI(){ + super("2020 March Madness Bracket"); + this.setSize(this.getToolkit().getScreenSize()); + this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + this.setVisible(true); + } + + /** + * paint + * draws the bracket to the screen + * + * @param g - Graphics object + * + **/ + public void paint(Graphics g){ + drawBracket(g); + } + + /** + * main + * initializes a gui object + * + **/ + + /** + * + * drawBracket + * gets info about the JFrame window to begin drawing the bracket + * + * @param g - Graphics object + * + * + **/ + public void drawBracket(Graphics g){ + int centerShift = 10; + int winHeight = (int)(this.getToolkit().getScreenSize().getHeight()); + int winWidth = (int)(this.getToolkit().getScreenSize().getWidth()); + int centerX = winWidth/2; + int centerY = winHeight/2; + + int horizLineLength = winWidth/12 - 15; + int vertLineLength = winHeight/8 - 5; + int lineStartHeight = centerY; + int lineStartWidth = centerX; + + //draws the 4 regions + drawLines(g, centerY/2 + 25, centerX - 130, horizLineLength, vertLineLength, 5); + drawLines(g, centerY + 195, centerX - 130, horizLineLength, vertLineLength, 5); + drawLines(g, centerY/2 + 25, centerX + 130, -horizLineLength, vertLineLength, 5); + drawLines(g, centerY + 195, centerX + 130, -horizLineLength, vertLineLength, 5); + + //draws the center bracket + g.drawLine(centerX, centerY, centerX - 130, centerY); + g.drawLine(centerX, centerY, centerX + 130, centerY); + g.drawLine(centerX + 130, centerY, centerX + 130, centerY/2+25); + g.drawLine(centerX + 130, centerY, centerX + 130, centerY + 195); + g.drawLine(centerX - 130, centerY, centerX - 130, centerY/2 + 25); + g.drawLine(centerX - 130, centerY, centerX - 130, centerY+195); + + } + + /** + * + * drawLines + * draws the lines of the bracket on the screen recursively + * + * @param g - Graphics object + * @param lineY - the y position of the right-most point of the line + * @param lineX - the x position of the right-most point of the line + * @param horizLineLength - required length of each of the horizontal lines + * @param vertLineLength = required length of each of the vertical lines + * @param counter - the depth of the bracket + * + * @return int; + * + **/ + public void drawLines(Graphics g, int lineY, int lineX, int horizLineLength, int vertLineLength, int counter){ + //base case + if(counter <= 0){ + return; + } + + //draw step + g.drawLine(lineX, lineY, lineX - horizLineLength, lineY); + g.drawLine(lineX - horizLineLength, lineY, lineX - horizLineLength, lineY + vertLineLength); + g.drawLine(lineX - horizLineLength, lineY, lineX - horizLineLength, lineY - vertLineLength); + + //recursive step + drawLines(g, lineY + vertLineLength, lineX - horizLineLength, horizLineLength, vertLineLength/2, counter-1); + drawLines(g, lineY - vertLineLength, lineX - horizLineLength, horizLineLength, vertLineLength/2, counter-1); + + } + +} \ No newline at end of file diff --git a/src/main/java/Region.java b/src/main/java/Region.java index 5a49700..e3b58a2 100644 --- a/src/main/java/Region.java +++ b/src/main/java/Region.java @@ -1,2 +1,58 @@ +import java.io.FileNotFoundException; + public class Region { + + private String region; + private Team[] teams; + private int numTeams = 16; + private int numGames = 8; + //private Game[] games = new Game[8]; + private Team a; + private Team b; + + /** + * Constructor + * sets up region for first round + * + * @param teams - array of all the teams in the competition + * @param region - name(in String format) of the region + * + */ +// public NCAARegion(NCAATeam[] teams, String region){ +// this.region = region; +// this.teams = teams; +// for(int j = 0; j 1){ +// numTeams = numTeams/2; +// numGames = numGames/2; +// NCAATeam[] newTeams = new NCAATeam[numTeams]; +// NCAAGame[] newGames = new NCAAGame[numGames]; +// for(int i = 0; i < games.length; i++){ +// newTeams[i] = games[i].computeWinner(); +// } +// for(int j = 0; j Date: Sat, 14 Mar 2020 14:39:17 -0400 Subject: [PATCH 14/48] removed some conflicts in region --- src/main/java/Console.java | 42 +++++++++++++++++++-------- src/main/java/Region.java | 58 -------------------------------------- 2 files changed, 31 insertions(+), 69 deletions(-) diff --git a/src/main/java/Console.java b/src/main/java/Console.java index c62edd8..7aba602 100644 --- a/src/main/java/Console.java +++ b/src/main/java/Console.java @@ -4,21 +4,41 @@ public class Console { // ******************************************************************************************** Welcome ********** - public void welcomeMessage() { + public void welcomeMessageRegions() { System.out.println("\n"); - System.out.println("Hello Welcome to MARCH MADNESS " + "\n"); - System.out.println("Please select the Region by number" + "\n"); - System.out.println("1. EAST"); - System.out.println("2. WEST"); - System.out.println("3. MIDWEST"); - System.out.println("4. SOUTH" + "\n"); + System.out.println("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"); + System.out.println("^ Hello Welcome to MARCH MADNESS ^"); + System.out.println("^--------------------------------------------^"); + System.out.println("^ Please select the Region by number ^"); + System.out.println("^ ^"); + System.out.println("^ 1. EAST ^"); + System.out.println("^ 2. WEST ^"); + System.out.println("^ 3. MIDWEST ^"); + System.out.println("^ 4. SOUTH ^"); + System.out.println("^ ^"); + System.out.println("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"); System.out.println(" Enter your input :"); // char escCode = 0x1B; // int row = 10; int column = 10; // System.out.print(String.format("%c[%d;%df",escCode,row,column)); } + public void welcomeMessageTeams() { + + System.out.println("\n"); + System.out.println("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"); + System.out.println("^ Hello Welcome to MARCH MADNESS ^"); + System.out.println("^--------------------------------------------^"); + System.out.println("^ Please enter the name of the Team ^"); + System.out.println("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"); + System.out.println(" Enter your input :"); +// char escCode = 0x1B; +// int row = 10; int column = 10; +// System.out.print(String.format("%c[%d;%df",escCode,row,column)); + } + + // ***************** Getting String input from User ********** @@ -34,12 +54,12 @@ public static void main(String[] args) { // GUI gui = new GUI(); - Console console1 = new Console(); + Console region = new Console(); Boolean invalid = false; do { - console1.welcomeMessage(); - Integer response = console1.getUserInput(); + region.welcomeMessageRegions(); + Integer response = region.getUserInput(); if (response == 1) { @@ -103,7 +123,7 @@ else if (response == 4) { invalid = true; try { - Thread.sleep(500); + Thread.sleep(1000); } catch (InterruptedException ex) { Thread.currentThread().interrupt(); diff --git a/src/main/java/Region.java b/src/main/java/Region.java index e3b58a2..e69de29 100644 --- a/src/main/java/Region.java +++ b/src/main/java/Region.java @@ -1,58 +0,0 @@ -import java.io.FileNotFoundException; - -public class Region { - - private String region; - private Team[] teams; - private int numTeams = 16; - private int numGames = 8; - //private Game[] games = new Game[8]; - private Team a; - private Team b; - - /** - * Constructor - * sets up region for first round - * - * @param teams - array of all the teams in the competition - * @param region - name(in String format) of the region - * - */ -// public NCAARegion(NCAATeam[] teams, String region){ -// this.region = region; -// this.teams = teams; -// for(int j = 0; j 1){ -// numTeams = numTeams/2; -// numGames = numGames/2; -// NCAATeam[] newTeams = new NCAATeam[numTeams]; -// NCAAGame[] newGames = new NCAAGame[numGames]; -// for(int i = 0; i < games.length; i++){ -// newTeams[i] = games[i].computeWinner(); -// } -// for(int j = 0; j Date: Sat, 14 Mar 2020 14:44:12 -0400 Subject: [PATCH 15/48] made changes to region to avoid conflict --- src/main/java/Region.java | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/main/java/Region.java b/src/main/java/Region.java index e69de29..f531c0c 100644 --- a/src/main/java/Region.java +++ b/src/main/java/Region.java @@ -0,0 +1,31 @@ +import java.util.HashMap; + + +public class Region{ + private Bracket regionBracket; + private HashMap teamSeedMap; + + public Region(String selectedRegion){ + this.regionBracket = new Bracket(); + } + + public Bracket getRegionBracket() { + return regionBracket; + } + + public void setRegionBracket(Bracket regionBracket) { + this.regionBracket = regionBracket; + } + + public HashMap getTeamSeedMap() { + return teamSeedMap; + } + + public void setTeamSeedMap(HashMap teamSeedMap) { + this.teamSeedMap = teamSeedMap; + } + + // methods planned for future use below +// get list of teams and seeds from API +// put them in the hashmap +} From 96e98566acea64b7809ed84550bed0b476635e2f Mon Sep 17 00:00:00 2001 From: sandeep Date: Sat, 14 Mar 2020 14:46:56 -0400 Subject: [PATCH 16/48] Minor changes --- src/main/java/Console.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/main/java/Console.java b/src/main/java/Console.java index 7aba602..41424d8 100644 --- a/src/main/java/Console.java +++ b/src/main/java/Console.java @@ -23,23 +23,7 @@ public void welcomeMessageRegions() { // int row = 10; int column = 10; // System.out.print(String.format("%c[%d;%df",escCode,row,column)); } - - public void welcomeMessageTeams() { - - System.out.println("\n"); - System.out.println("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"); - System.out.println("^ Hello Welcome to MARCH MADNESS ^"); - System.out.println("^--------------------------------------------^"); - System.out.println("^ Please enter the name of the Team ^"); - System.out.println("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"); - System.out.println(" Enter your input :"); -// char escCode = 0x1B; -// int row = 10; int column = 10; -// System.out.print(String.format("%c[%d;%df",escCode,row,column)); - } - - - + // ***************** Getting String input from User ********** public Integer getUserInput() { From e58ac5edf954f0059b995877d047f7872e6ac1a2 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sat, 14 Mar 2020 15:21:58 -0400 Subject: [PATCH 17/48] added region test coverage --- src/test/java/RegionTest.java | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/test/java/RegionTest.java diff --git a/src/test/java/RegionTest.java b/src/test/java/RegionTest.java new file mode 100644 index 0000000..fafa258 --- /dev/null +++ b/src/test/java/RegionTest.java @@ -0,0 +1,28 @@ +import org.junit.Assert; +import org.junit.Test; + +import java.util.HashMap; + +import static org.junit.Assert.*; + +public class RegionTest { + Region testRegion = new Region("East"); + Bracket testBracket = new Bracket(); + HashMap testMap = new HashMap<>(); + + @Test + public void getSetRegionBracket() { + testRegion.setRegionBracket(testBracket); + Bracket expected = testBracket; + Bracket actual = testRegion.getRegionBracket(); + Assert.assertEquals(expected,actual); + } + + @Test + public void getSetTeamSeedMap() { + testRegion.setTeamSeedMap(testMap); + HashMap expected = testMap; + HashMap actual = testRegion.getTeamSeedMap(); + Assert.assertEquals(expected,actual); + } +} \ No newline at end of file From ac382f7d76b5cb6ed434b5c27e54c7e26b0954a1 Mon Sep 17 00:00:00 2001 From: ruppal Date: Sat, 14 Mar 2020 15:25:44 -0400 Subject: [PATCH 18/48] tests --- src/test/java/TestPlayer.java | 41 +++++++++++++++++++++++++++++++++++ src/test/java/TestRoster.java | 2 +- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/src/test/java/TestPlayer.java b/src/test/java/TestPlayer.java index 441be39..94619a0 100644 --- a/src/test/java/TestPlayer.java +++ b/src/test/java/TestPlayer.java @@ -20,4 +20,45 @@ public void playerDetailsTest(){ LOGGER.info(player.playerDetails(player)); Assert.assertEquals(expected, actual); } + + @Test + public void getSetterTest(){ + Player player = new Player("Raheel Uppal"); + player.setName("Raheel Uppal"); + player.setAPG(8.9); + player.setHeight(6.3); + player.setPosition(Position.PG); + player.setWeight(230.5); + player.setPPG(33.6); + player.setRPG(12.2); + player.setYear(Year.FM); + + String nameE = player.getName(); + String nameA = "Raheel Uppal"; + Assert.assertEquals(nameE,nameA); + + Double ppgE = player.getPPG(); + Double ppgA = 33.6; + Assert.assertEquals(ppgE,ppgA); + + Double rpgE = player.getRPG(); + Double rpgA = 12.2; + Assert.assertEquals(rpgE,rpgA); + + Double apgE = player.getAPG(); + Double apgA = 8.9; + Assert.assertEquals(apgE,apgA); + + Double heightE = player.getHeight(); + Double heightA = 6.3; + Assert.assertEquals(heightE,heightA); + + Double weightE = player.getWeight(); + Double weightA = 230.5; + Assert.assertEquals(weightE,weightA); + + Position expected = player.getPosition(); + Position actual = Position.PG; + Assert.assertEquals(expected,actual); + } } diff --git a/src/test/java/TestRoster.java b/src/test/java/TestRoster.java index 0a6bad5..e4f80e6 100644 --- a/src/test/java/TestRoster.java +++ b/src/test/java/TestRoster.java @@ -16,6 +16,7 @@ public void sizeTest(){ Player player3 = new Player("Sandeep Manglam"); Position c = Position.SF; Roster roster = new Roster(); + roster.setRoster(roster.getRoster()); roster.addToRoster(player1,pg); roster.addToRoster(player2,sg); roster.addToRoster(player3,c); @@ -48,5 +49,4 @@ public void listRosterTest(){ } - } From b18541e4e3e8eb7a0480de0c6578b3d2308895b7 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sat, 14 Mar 2020 16:03:28 -0400 Subject: [PATCH 19/48] added team testing --- src/main/java/Team.java | 2 + src/test/java/TeamTest.java | 47 ++++++++++++++++++ src/test/java/TestRegion.java | 2 - src/test/java/TestTeam.java | 2 - .../META-INF/JustCode.kotlin_module | Bin 0 -> 16 bytes 5 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 src/test/java/TeamTest.java delete mode 100644 src/test/java/TestRegion.java delete mode 100644 src/test/java/TestTeam.java create mode 100644 target/test-classes/META-INF/JustCode.kotlin_module diff --git a/src/main/java/Team.java b/src/main/java/Team.java index cfb5d0a..c9e1476 100644 --- a/src/main/java/Team.java +++ b/src/main/java/Team.java @@ -14,6 +14,8 @@ public Team(String records,String projections,String history,String schedule, Ro } + public Team(){ } + public Roster getTeamRoster() { return teamRoster; } diff --git a/src/test/java/TeamTest.java b/src/test/java/TeamTest.java new file mode 100644 index 0000000..7a6ff48 --- /dev/null +++ b/src/test/java/TeamTest.java @@ -0,0 +1,47 @@ +import org.junit.Assert; +import org.junit.Test; + +import static org.junit.Assert.*; + +public class TeamTest { + Roster testRoster = new Roster(); + Team testTeam = new Team(); + + @Test + public void getSetTeamRoster() { + testTeam.setTeamRoster(testRoster); + Roster expected = testRoster; + Roster actual = testTeam.getTeamRoster(); + Assert.assertEquals(expected,actual); + } + + @Test + public void getSetRecords() { + testTeam.setRecords("records"); + String expected = "records"; + String actual = testTeam.getRecords(); + Assert.assertEquals(expected,actual); + } + + @Test + public void getSetProjections() { + testTeam.setProjections("proj"); + String expected = "proj"; + String actual = testTeam.getProjections(); + Assert.assertEquals(expected,actual); + } + + @Test + public void getSetHistory() { + testTeam.setHistory("hist"); + String expected = "hist"; + String actual = testTeam.getHistory(); + Assert.assertEquals(expected,actual); + } + + + + @Test + public void getSetSchedule() { + } +} \ No newline at end of file diff --git a/src/test/java/TestRegion.java b/src/test/java/TestRegion.java deleted file mode 100644 index 75797f2..0000000 --- a/src/test/java/TestRegion.java +++ /dev/null @@ -1,2 +0,0 @@ -public class TestRegion { -} diff --git a/src/test/java/TestTeam.java b/src/test/java/TestTeam.java deleted file mode 100644 index c5b6ab4..0000000 --- a/src/test/java/TestTeam.java +++ /dev/null @@ -1,2 +0,0 @@ -public class TestTeam { -} diff --git a/target/test-classes/META-INF/JustCode.kotlin_module b/target/test-classes/META-INF/JustCode.kotlin_module new file mode 100644 index 0000000000000000000000000000000000000000..a49347afef10a9b5f95305e1058ba36adec7d6dd GIT binary patch literal 16 RcmZQzU|?ooU|@t|0RRA102TlM literal 0 HcmV?d00001 From 49ec051095ac170f685682423bae2bb3a8e39294 Mon Sep 17 00:00:00 2001 From: ruppal Date: Sat, 14 Mar 2020 16:08:04 -0400 Subject: [PATCH 20/48] tests --- src/main/java/Position.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/Position.java b/src/main/java/Position.java index d17b205..9413b7b 100644 --- a/src/main/java/Position.java +++ b/src/main/java/Position.java @@ -7,7 +7,7 @@ public enum Position { private String position; - private Position(String position){ + Position(String position){ this.position = position; } From c310be9b07268d694f14828ccc4b32bc87b32974 Mon Sep 17 00:00:00 2001 From: sandeep Date: Sat, 14 Mar 2020 16:21:23 -0400 Subject: [PATCH 21/48] Added ineteger exception for menu in Console --- src/main/java/Console.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/Console.java b/src/main/java/Console.java index 41424d8..da307e6 100644 --- a/src/main/java/Console.java +++ b/src/main/java/Console.java @@ -1,3 +1,4 @@ +import javax.sound.midi.Soundbank; import java.util.Scanner; public class Console { @@ -27,8 +28,17 @@ public void welcomeMessageRegions() { // ***************** Getting String input from User ********** public Integer getUserInput() { + + int userInput = 0; Scanner readInput = new Scanner(System.in); - int userInput = Integer.parseInt(readInput.nextLine()); + try { + userInput = Integer.parseInt(readInput.nextLine()); + + } catch (NumberFormatException ex) { + System.out.println("Invalid entry. Please enter a number from the menu" + "\n"); + userInput = Integer.parseInt(readInput.nextLine()); + return userInput; + } return userInput; } @@ -40,12 +50,12 @@ public static void main(String[] args) { Console region = new Console(); Boolean invalid = false; + region.welcomeMessageRegions(); do { - region.welcomeMessageRegions(); + //region.welcomeMessageRegions(); Integer response = region.getUserInput(); - if (response == 1) { System.out.println("You selected EAST" + "\n\n"); From 8d765c4e4d4ef9cfea283a1e9d63cee52c30efb0 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sat, 14 Mar 2020 16:45:40 -0400 Subject: [PATCH 22/48] added region teams --- src/main/java/TextParser.java | 4 ++++ src/main/resources/East.txt | 16 ++++++++++++++++ src/main/resources/MidWest.txt | 0 src/main/resources/South.txt | 0 src/main/resources/West.txt | 0 src/main/resources/regionSeeds/East.txt | 16 ++++++++++++++++ src/main/resources/regionSeeds/MidWest.txt | 0 src/main/resources/regionSeeds/South.txt | 0 src/main/resources/regionSeeds/West.txt | 0 src/test/java/TeamTest.java | 4 ++++ 10 files changed, 40 insertions(+) create mode 100644 src/main/java/TextParser.java create mode 100644 src/main/resources/East.txt create mode 100644 src/main/resources/MidWest.txt create mode 100644 src/main/resources/South.txt create mode 100644 src/main/resources/West.txt create mode 100644 src/main/resources/regionSeeds/East.txt create mode 100644 src/main/resources/regionSeeds/MidWest.txt create mode 100644 src/main/resources/regionSeeds/South.txt create mode 100644 src/main/resources/regionSeeds/West.txt diff --git a/src/main/java/TextParser.java b/src/main/java/TextParser.java new file mode 100644 index 0000000..05b228d --- /dev/null +++ b/src/main/java/TextParser.java @@ -0,0 +1,4 @@ +package PACKAGE_NAME; + +public class TextParser { +} diff --git a/src/main/resources/East.txt b/src/main/resources/East.txt new file mode 100644 index 0000000..f6ea442 --- /dev/null +++ b/src/main/resources/East.txt @@ -0,0 +1,16 @@ +1 Duke +2 Michigan State +3 LSU +4 Virginia Tech +5 Mississippi State +6 Maryland +7 Louisville +8 VCU +9 UCF +10 Minnesota +11 Belmont +12 Liberty +13 Saint Louis +14 Yale +15 Bradley Missouri Valley +16 North Dakota State diff --git a/src/main/resources/MidWest.txt b/src/main/resources/MidWest.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/South.txt b/src/main/resources/South.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/West.txt b/src/main/resources/West.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/regionSeeds/East.txt b/src/main/resources/regionSeeds/East.txt new file mode 100644 index 0000000..f6ea442 --- /dev/null +++ b/src/main/resources/regionSeeds/East.txt @@ -0,0 +1,16 @@ +1 Duke +2 Michigan State +3 LSU +4 Virginia Tech +5 Mississippi State +6 Maryland +7 Louisville +8 VCU +9 UCF +10 Minnesota +11 Belmont +12 Liberty +13 Saint Louis +14 Yale +15 Bradley Missouri Valley +16 North Dakota State diff --git a/src/main/resources/regionSeeds/MidWest.txt b/src/main/resources/regionSeeds/MidWest.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/regionSeeds/South.txt b/src/main/resources/regionSeeds/South.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/regionSeeds/West.txt b/src/main/resources/regionSeeds/West.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/test/java/TeamTest.java b/src/test/java/TeamTest.java index 7a6ff48..1381bae 100644 --- a/src/test/java/TeamTest.java +++ b/src/test/java/TeamTest.java @@ -43,5 +43,9 @@ public void getSetHistory() { @Test public void getSetSchedule() { + testTeam.setSchedule("schedule"); + String expected = "schedule"; + String actual = testTeam.getSchedule(); + Assert.assertEquals(expected,actual); } } \ No newline at end of file From 64822ff307df614eb4858f7ba7587129140d6be4 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sat, 14 Mar 2020 16:45:59 -0400 Subject: [PATCH 23/48] added parser class --- .DS_Store | Bin 0 -> 8196 bytes src/.DS_Store | Bin 0 -> 8196 bytes src/main/.DS_Store | Bin 0 -> 6148 bytes src/main/java/TextParser.java | 11 ++++++++++- src/main/resources/.DS_Store | Bin 0 -> 6148 bytes src/main/resources/East.txt | 16 ---------------- src/main/resources/MidWest.txt | 0 src/main/resources/South.txt | 0 src/main/resources/West.txt | 0 9 files changed, 10 insertions(+), 17 deletions(-) create mode 100644 .DS_Store create mode 100644 src/.DS_Store create mode 100644 src/main/.DS_Store create mode 100644 src/main/resources/.DS_Store delete mode 100644 src/main/resources/East.txt delete mode 100644 src/main/resources/MidWest.txt delete mode 100644 src/main/resources/South.txt delete mode 100644 src/main/resources/West.txt diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..dae6ab114f0f9316fa9ed2d026c9097f869ced2d GIT binary patch literal 8196 zcmeHMUu+ab82`Suv^zj$ia@)Er6&zg@hZI*3bp*Xw#T1RNRcaTflArCUFgQ`Zn@pN zqpdYHk@zA;jm88L6T=%KPa5UL7yray{1bywVtCLOAB{#6pN!w^?6tI|uWDc?+4*L^ zKR5IJ=C?bUIRL=UoE`_L0RV*_A^9?@?ootYJPS%mpeZAX6c6rL+H%s=yO|za;2kPL z1VRKt1VRKt1VRM<4+zknEsC4S@IWFUz7J7)giHi-T1x-ZL6v_5ASsRj zexWuO4U*A7CIUGvC0VGT3?(T;F*stN3@3dw@Jj@8T1puX7#uz@7#V{T3i_kd??-)i zz=V`x9U>4Sun+<9`jmnTS;(Xdcc0%a)AgE~zQ>Z%vL)pein3H$TDkP;)QD3^d777V zJGJad(L17fBk7>s=Q!3(TTAzwMq!w*>T+yPGi@X52b;P7+MRLi zBUvL)NeyHiD>rJBr7ELYnH)JA9hQ|cCk%JcGtPUWb;5PBUYGAUXi}`u4fB;EzIV(s z9oy|UvMx!+-dVo7cKyc3o3=fc>Y~8fa z4&+VOOj|~ut&JL0*u&VZHPtnhYD9gcXqq3Q@Oou1mp0GkOmEyDV_lufhIE?wVMiCE z==^@Y*V|~xiN^+N`ASNDfX6i9ZOB)u~ znG9>)&eVatOqKTp%J!X19n3hRqm-gsg|R@L=up*DV&p@b>-CNqHqGjD8s5*YPTj94 z$Az^+*J)Pui3YjYJ`DAVCfVa+D^Vc^yI~)kfDG7BfS2GRybPD%3S5Wx;3N19zJRab zYxo9k!%y%F{06_nAMhvqjTN{G*I+f);G@`xPv92ZfxB=ICa?n!VlO_0M=^y%m_{89 zJcAAva2zLa5?{cJ_zJ#?ui<69ir4U6ypA8>hj;@&#!v7|{1$(dGb|~R^|0(0YrI3P z;AJGT2A63ir|w18$iDptlK%-=Z!eb&eR$RCb@dI6&D(c&%&g?RwY!@{K64~Be99Cl z;V<4C9*WggBWqdhVq88(j5E$Ff;PNDdPgJc6=DkasiHrv z&RbYqA$sy9(z=zkG9oZ9lh!uYt`JXoxwP(P2_{}K4zj-?l4J_U#n`tf_uhu9a05Pt zo5Z>A;12u@zrtS#SdQH1TLjl)EpEh3_!w@+7;eK>VqP1zV-ok`emp?zOJN`O;{YBf z_GNtbjo>-VqK7$R;WR!^9K3)p1}uCX-@v!<$~?|>7uhByUYq4yK9#jC$39D%B17jo zhrRm>fl`@GjX3}BUHtz4zREdFCPW}aU@ih!mP{o(Nw?TnU!1k0^qi(g6yY~5r5{4o soQnYJ&-`IX?I^j5m_#6_r6diNfBhmrjfDHZkGzCG-2Z36c#vBE0E+e1QUCw| literal 0 HcmV?d00001 diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..fef57a32748cc767d4199dfda4b0fd416d7eb7c3 GIT binary patch literal 8196 zcmeHMU2IfE6h3Du^iH8NMSgl03o8vj;#OJ;g<5{L?LsMq6xq_2QYm-$Ug(Xt_m;hP zcWG zoO5>OeDmFz%q#$4M^0}7s09FpvXFc!757L&FYBKbqQ;Ety)Cr#}y7FdTJ zAp#)+Ap#)+Ap#)+{|5x<%oa&0bM8xRScV9M2t1Goi2Wf(S;#~ni&FYq2NnJmfTXwr z_=)OVR7l1GnFwT2O43k5=}J<%VsOPk=}!Hzz%CKUqLk7dFt~hRFfs-=6!b@@-;ep` zfC(wXGDILmU?BqH^QnL_(7*(H_WeCQZkevv*!Vq07F8@>QmH6aN>z2$)2UIXkn%Jy z=XPk>Q=)ZD^G4G_z0Yy1nYxzlH;uvwU)kx{o@Uxc)^|2_gG`18Oj~yf9Zt^HUH^Ad zQlThJVIy3fn%dsn8jm$KH@8g3V^h0Zo8qw@RG((bnvG3+yU&bGOin#J{oG|46b2gu zET0$TmDv$mZoX5#P(r77rY56VnH(7#?Ut1?Ck=PdGcI_dHsm^4uhTaiG|5-=jqnx1zjxd- z9oy|UvMx!+-dVP)Zo{U>8+SgrKY6?Qq2;`01!F@5iS3zZO(T1vVCvrJNzKg|wr<+z z2J)tBrY)n-*2at)>|yNo>NU01YE*rsq?+%d@Oou1mp0GmOmD&;W8Hd{4eK=XqmC{{ z(fRud^ELJBRrQq6bY=}Ibw%;JH*Zl{pG#42EijBXFxK}BttEG93S#0-+nIX8($a>- zbtc_fb}@AzFGJ-$L1)_@rVeJDu`vqKt-*NEooH9p(_-W!n(OtB8#c}Aa~j@{ZoS&2 zC?|!sUDs(=^@%NVxqTSw6OFRP#c`rS9QMIM7=jGgP=J@<61)tT;VRsK_uwP=48DY~ z;TyOGci<=Z1%89y;Scx|{>DmNiK}r9*5aesfKT8y+>Lv2KPIpp4`VMrg~u_4!k~*XY5nL&^Vyu6LG6jy}9{)w=pE4cm9^X`flkd8;>@Mm~2WIegNT zNZ~Kv943nOR-5>QA~cWqTDCPxmYTvB zN#kv-Ng;yr#ZtS2wJ@SEuaMeS)}|0s`4Xw!#}Z6@WE^CBV>HPWj^+4QmVIx-HMj|% z((~vo_zv#E&+se!g@8+t`;3d?TCBrOxEUYAtr*9h*h1WE#Wqah0qnv<#J?2wVLuMw zN#b9|=iexv$1Hl7BOVs-Yw~g;(dXuDirHDe?Mj*5y-K+j8u4)K_BZ zT=TGXUm&nZMo}y7{|Cyy|KAs}hCze~gb3Ul0jx--k{zTgx7&-mc8u~F$|4E7qLjW1 p6>}Z}s6F$CA=P7KDtr=wEJ{f|l>YUHfbje$)Wh@NC*K2H`~&J;*joSq literal 0 HcmV?d00001 diff --git a/src/main/.DS_Store b/src/main/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9aaf253d36b255d6c35926aaf89a35d8cbee0eb7 GIT binary patch literal 6148 zcmeHKyG{c^3>?E1K{P2T_ZRqsRTRE}A0Q+&DAGwpp}vam;?o#EkcducBGE)+$va-J z=T(x0`MLYdZYtww{*2vWyMGEIG0 z0C8YCjB(5o#O4WNFPsvYp;=OiNwpd=Ea}X*s_TVQV$xx8GoMp8TTLhyw=>_O9M%)H zN&zWws=#e-m)`%M=x65tQ<8R4Knh%y0yeCl*DJnK_14+Td9Q8s7rNJc)7=;cg-f(! kVzgs!yd6J8QPwq&dEN`B#Go@DbfSI+To;)X_-_S%08ZZ<5dZ)H literal 0 HcmV?d00001 diff --git a/src/main/java/TextParser.java b/src/main/java/TextParser.java index 05b228d..b9d04a9 100644 --- a/src/main/java/TextParser.java +++ b/src/main/java/TextParser.java @@ -1,4 +1,13 @@ -package PACKAGE_NAME; +import java.util.HashMap; public class TextParser { + + public TextParser(){} + + public HashMap parseSeeds(){ + return null; + + //get logic from hamlet lab + } + } diff --git a/src/main/resources/.DS_Store b/src/main/resources/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..028958203ea69d8bf78bf23e06847447a09da6d1 GIT binary patch literal 6148 zcmeHK!A`?447FiMMU&8u9Puiu(Lid+#KeJH|A-4WZhRTfu|ciY9=ITc z>?(PVW4ppwQfU0bKrVrz3Q?S5VDQg;~aY$jQk%Cc@#4bS58?e*pT>SHsXw@b|rybt#$ zs~9ZERcF8%a0Z+KXJE{LTx^hHsp!2k;0!ne-weq45YPmpVXv5v4s^K$04`w80$pke zi3x_$uvf$kgf$eXp=>1vYdGw|{Gws6sNuv`e6YRwt9ar3cH|G)oj59b?+iEtV+PK3 zxRU$-2A|Aikv|Ucku%^7{4)l4QC8&^o3gw0WP5Vg2DDo=5%KFqfj}Sq1YjWN$aS97 c`5-#{qG7KnS;U^hf&L?q3GvPu_yq<&0Z4{ALjV8( literal 0 HcmV?d00001 diff --git a/src/main/resources/East.txt b/src/main/resources/East.txt deleted file mode 100644 index f6ea442..0000000 --- a/src/main/resources/East.txt +++ /dev/null @@ -1,16 +0,0 @@ -1 Duke -2 Michigan State -3 LSU -4 Virginia Tech -5 Mississippi State -6 Maryland -7 Louisville -8 VCU -9 UCF -10 Minnesota -11 Belmont -12 Liberty -13 Saint Louis -14 Yale -15 Bradley Missouri Valley -16 North Dakota State diff --git a/src/main/resources/MidWest.txt b/src/main/resources/MidWest.txt deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/South.txt b/src/main/resources/South.txt deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/West.txt b/src/main/resources/West.txt deleted file mode 100644 index e69de29..0000000 From 2c1486dac9d7b6e2e2b03e5aad34e22dd3be7a3a Mon Sep 17 00:00:00 2001 From: sandeep Date: Sat, 14 Mar 2020 16:56:25 -0400 Subject: [PATCH 24/48] minor changes --- src/main/java/Console.java | 22 ++++++++++++++-------- target/classes/regionSeeds/East.txt | 16 ++++++++++++++++ target/classes/regionSeeds/MidWest.txt | 0 target/classes/regionSeeds/South.txt | 0 target/classes/regionSeeds/West.txt | 0 5 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 target/classes/regionSeeds/East.txt create mode 100644 target/classes/regionSeeds/MidWest.txt create mode 100644 target/classes/regionSeeds/South.txt create mode 100644 target/classes/regionSeeds/West.txt diff --git a/src/main/java/Console.java b/src/main/java/Console.java index da307e6..65752e6 100644 --- a/src/main/java/Console.java +++ b/src/main/java/Console.java @@ -1,4 +1,4 @@ -import javax.sound.midi.Soundbank; + import java.util.Scanner; public class Console { @@ -24,7 +24,10 @@ public void welcomeMessageRegions() { // int row = 10; int column = 10; // System.out.print(String.format("%c[%d;%df",escCode,row,column)); } - + + + + // ***************** Getting String input from User ********** public Integer getUserInput() { @@ -53,7 +56,7 @@ public static void main(String[] args) { region.welcomeMessageRegions(); do { - //region.welcomeMessageRegions(); + Integer response = region.getUserInput(); if (response == 1) { @@ -67,8 +70,8 @@ public static void main(String[] args) { System.out.println("Redirecting........."); invalid = false; - // Call region.east(); - + Region r = new Region("east"); + r.getRegionBracket(); } else if (response == 2) { @@ -82,7 +85,8 @@ else if (response == 2) { System.out.println("Redirecting........."); invalid = false; - // Call region.west(); + Region r = new Region("west"); + r.getRegionBracket(); } else if (response == 3) { @@ -96,7 +100,8 @@ else if (response == 3) { System.out.println("Redirecting........."); invalid = false; - // Call region.midwest(); + Region r = new Region("midwest"); + r.getRegionBracket(); } else if (response == 4) { @@ -109,7 +114,8 @@ else if (response == 4) { System.out.println("Redirecting........."); invalid = false; - // Call region.south(); + Region r = new Region("south"); + r.getRegionBracket(); } else { diff --git a/target/classes/regionSeeds/East.txt b/target/classes/regionSeeds/East.txt new file mode 100644 index 0000000..f6ea442 --- /dev/null +++ b/target/classes/regionSeeds/East.txt @@ -0,0 +1,16 @@ +1 Duke +2 Michigan State +3 LSU +4 Virginia Tech +5 Mississippi State +6 Maryland +7 Louisville +8 VCU +9 UCF +10 Minnesota +11 Belmont +12 Liberty +13 Saint Louis +14 Yale +15 Bradley Missouri Valley +16 North Dakota State diff --git a/target/classes/regionSeeds/MidWest.txt b/target/classes/regionSeeds/MidWest.txt new file mode 100644 index 0000000..e69de29 diff --git a/target/classes/regionSeeds/South.txt b/target/classes/regionSeeds/South.txt new file mode 100644 index 0000000..e69de29 diff --git a/target/classes/regionSeeds/West.txt b/target/classes/regionSeeds/West.txt new file mode 100644 index 0000000..e69de29 From 2aae93451eaef388db2054c4efc23779b7b4c2a8 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sun, 15 Mar 2020 14:35:04 -0400 Subject: [PATCH 25/48] added jdbc to project --- .idea/JustCode.iml | 1 + .idea/libraries/postgresql_42_2_11.xml | 9 +++++++++ src/.DS_Store | Bin 8196 -> 8196 bytes src/main/java/TextParser.java | 10 ++++++++-- 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 .idea/libraries/postgresql_42_2_11.xml diff --git a/.idea/JustCode.iml b/.idea/JustCode.iml index 975d5da..9a8a730 100644 --- a/.idea/JustCode.iml +++ b/.idea/JustCode.iml @@ -13,5 +13,6 @@ + \ No newline at end of file diff --git a/.idea/libraries/postgresql_42_2_11.xml b/.idea/libraries/postgresql_42_2_11.xml new file mode 100644 index 0000000..05f8c50 --- /dev/null +++ b/.idea/libraries/postgresql_42_2_11.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/.DS_Store b/src/.DS_Store index fef57a32748cc767d4199dfda4b0fd416d7eb7c3..f2347931bb81f241b4eb2cf21afa948cd9345c3e 100644 GIT binary patch delta 54 ycmZp1XmOa}&&awlU^hP_>t-GSB{ohLh7yKUhGK@2&GKRw7&o&^sH2LVWds0v>kU2t delta 40 pcmZp1XmOa}&&aYdU^hP_%Vr({CAQ6OVh0%~Hb`t{mr#dsL;?GT3?u*m diff --git a/src/main/java/TextParser.java b/src/main/java/TextParser.java index b9d04a9..d7cb0eb 100644 --- a/src/main/java/TextParser.java +++ b/src/main/java/TextParser.java @@ -2,11 +2,17 @@ public class TextParser { - public TextParser(){} + public TextParser(){ - public HashMap parseSeeds(){ + } + + public String loadFile(){ + ClassLoader classLoader = getClass().getClassLoader(); return null; + } + public HashMap parseSeeds(){ + return null; //get logic from hamlet lab } From 5e671f4de30c7bc4186d139bfed1a2be3d39c904 Mon Sep 17 00:00:00 2001 From: ruppal Date: Sun, 15 Mar 2020 14:49:47 -0400 Subject: [PATCH 26/48] jdbc --- .idea/JustCode.iml | 2 +- .idea/libraries/mysql_connector_java_8_0_19.xml | 9 +++++++++ .idea/libraries/postgresql_42_2_11.xml | 9 --------- 3 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 .idea/libraries/mysql_connector_java_8_0_19.xml delete mode 100644 .idea/libraries/postgresql_42_2_11.xml diff --git a/.idea/JustCode.iml b/.idea/JustCode.iml index 9a8a730..5427d50 100644 --- a/.idea/JustCode.iml +++ b/.idea/JustCode.iml @@ -13,6 +13,6 @@ - + \ No newline at end of file diff --git a/.idea/libraries/mysql_connector_java_8_0_19.xml b/.idea/libraries/mysql_connector_java_8_0_19.xml new file mode 100644 index 0000000..aca512c --- /dev/null +++ b/.idea/libraries/mysql_connector_java_8_0_19.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/postgresql_42_2_11.xml b/.idea/libraries/postgresql_42_2_11.xml deleted file mode 100644 index 05f8c50..0000000 --- a/.idea/libraries/postgresql_42_2_11.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file From c37965bcd8475c52c63f5015dcb8ff69cf812457 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sun, 15 Mar 2020 15:09:35 -0400 Subject: [PATCH 27/48] added jdbc class and connect to db method --- src/main/java/JDBC.java | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/main/java/JDBC.java diff --git a/src/main/java/JDBC.java b/src/main/java/JDBC.java new file mode 100644 index 0000000..d8aefcb --- /dev/null +++ b/src/main/java/JDBC.java @@ -0,0 +1,25 @@ +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; + +public class JDBC { + private final String url = ""; + private final String user = ""; + private final String password = ""; + + //connect to postGres database + + public Connection connect(){ + Connection conn = null; + try { + conn = DriverManager.getConnection(url, user, password); + System.out.println("Connected to SQL server."); + + } catch (SQLException e){ + System.out.println(e.getMessage()); + } + return conn; + } + + +} From 6ddbdf5a60118a805600655eb3d0e150bcbcc5f3 Mon Sep 17 00:00:00 2001 From: asconem Date: Sun, 15 Mar 2020 16:00:39 -0400 Subject: [PATCH 28/48] Pull request done --- src/main/java/Bracket.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/Bracket.java b/src/main/java/Bracket.java index bd24ec2..ef5647e 100644 --- a/src/main/java/Bracket.java +++ b/src/main/java/Bracket.java @@ -1,3 +1,4 @@ public class Bracket { + } From a7941ffa02171b9e8cbcad28368d94c61ca86477 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sun, 15 Mar 2020 17:33:04 -0400 Subject: [PATCH 29/48] added getTeamList method --- .idea/JustCode.iml | 3 ++- .idea/compiler.xml | 2 +- ...ven__org_postgresql_postgresql_42_2_11.xml | 13 +++++++++++++ pom.xml | 5 +++++ src/main/java/JDBC.java | 19 +++++++++++++++---- 5 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 .idea/libraries/Maven__org_postgresql_postgresql_42_2_11.xml diff --git a/.idea/JustCode.iml b/.idea/JustCode.iml index 9a8a730..68ef302 100644 --- a/.idea/JustCode.iml +++ b/.idea/JustCode.iml @@ -11,8 +11,9 @@ + - + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 8f7cd6f..623e16b 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -10,7 +10,7 @@ - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_postgresql_postgresql_42_2_11.xml b/.idea/libraries/Maven__org_postgresql_postgresql_42_2_11.xml new file mode 100644 index 0000000..cac4cab --- /dev/null +++ b/.idea/libraries/Maven__org_postgresql_postgresql_42_2_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7124af5..140944d 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,11 @@ 4.12 test + + org.postgresql + postgresql + 42.2.11 + diff --git a/src/main/java/JDBC.java b/src/main/java/JDBC.java index d8aefcb..b43cc10 100644 --- a/src/main/java/JDBC.java +++ b/src/main/java/JDBC.java @@ -1,13 +1,11 @@ -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; +import java.sql.*; public class JDBC { private final String url = ""; private final String user = ""; private final String password = ""; - //connect to postGres database + //connect to postgres database public Connection connect(){ Connection conn = null; @@ -21,5 +19,18 @@ public Connection connect(){ return conn; } + public String getTeamList() { + String SQL = "SELECT * FROM school_name"; + String teamList = ""; + try (Connection conn = connect(); + Statement stmt = conn.createStatement(); + ResultSet rs = stmt.executeQuery(SQL)) { + rs.next(); + teamList = rs.getString("school_name"); + } catch (SQLException e) { + System.out.println(e.getMessage()); + } + return teamList; + } } From ce8f6441bfb0218c28e1d262c15f8b662c20d2d4 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sun, 15 Mar 2020 18:45:12 -0400 Subject: [PATCH 30/48] SQL queries functioning from my local database --- .idea/compiler.xml | 2 +- src/main/java/JDBC.java | 29 ++++++++++++++++++++++------- src/main/java/Region.java | 4 +++- src/test/java/JDBCTest.java | 25 +++++++++++++++++++++++++ 4 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 src/test/java/JDBCTest.java diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 623e16b..8f7cd6f 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -10,7 +10,7 @@ - + \ No newline at end of file diff --git a/src/main/java/JDBC.java b/src/main/java/JDBC.java index b43cc10..b276b0f 100644 --- a/src/main/java/JDBC.java +++ b/src/main/java/JDBC.java @@ -1,9 +1,11 @@ import java.sql.*; +import java.util.HashMap; public class JDBC { - private final String url = ""; - private final String user = ""; - private final String password = ""; + // change this to the remote server + private final String url = "jdbc:postgresql://localhost:5432/testjava"; + private final String user = "java"; + private final String password = "java"; //connect to postgres database @@ -19,18 +21,31 @@ public Connection connect(){ return conn; } - public String getTeamList() { - String SQL = "SELECT * FROM school_name"; + public String getTeamListFromRegion(String region) { + //String SQL = "SELECT school_name FROM" + region; + String SQL = "SELECT first_name FROM person WHERE id < 10"; String teamList = ""; try (Connection conn = connect(); Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery(SQL)) { - rs.next(); - teamList = rs.getString("school_name"); + while (rs.next()){ + //teamList = rs.getString("school_name"); + teamList += rs.getString("first_name") + "\n"; + } } catch (SQLException e) { System.out.println(e.getMessage()); } return teamList; } + + // need to make this parse query results + + public String[] parseToStringArray(String queryResults){ + return null; + } + public HashMap mapify(String queryResults){ + return new HashMap(); + } + } diff --git a/src/main/java/Region.java b/src/main/java/Region.java index f531c0c..11e1d25 100644 --- a/src/main/java/Region.java +++ b/src/main/java/Region.java @@ -6,7 +6,9 @@ public class Region{ private HashMap teamSeedMap; public Region(String selectedRegion){ - this.regionBracket = new Bracket(); + JDBC jdbc = new JDBC(); + //method below will take jdbc queries - need to mapify the query results + this.teamSeedMap.put(new Team(), 1); } public Bracket getRegionBracket() { diff --git a/src/test/java/JDBCTest.java b/src/test/java/JDBCTest.java new file mode 100644 index 0000000..cd1a570 --- /dev/null +++ b/src/test/java/JDBCTest.java @@ -0,0 +1,25 @@ +import com.sun.xml.internal.bind.v2.runtime.output.FastInfosetStreamWriterOutput; +import org.junit.Test; + +import static org.junit.Assert.*; + +public class JDBCTest { + JDBC jdbc = new JDBC(); + + @Test + public void connect() { + } + + @Test + public void getTeamListFromRegion() { + System.out.println(jdbc.getTeamListFromRegion("east")); + } + + @Test + public void parseToStringArray() { + } + + @Test + public void mapify() { + } +} \ No newline at end of file From 8b33c4cf763fbdb21af63e996895a5ad3a93d39b Mon Sep 17 00:00:00 2001 From: asconem Date: Mon, 16 Mar 2020 14:15:56 -0400 Subject: [PATCH 31/48] Saving changes locally --- .idea/JustCode.iml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.idea/JustCode.iml b/.idea/JustCode.iml index 9a8a730..707dcb4 100644 --- a/.idea/JustCode.iml +++ b/.idea/JustCode.iml @@ -11,8 +11,8 @@ + - \ No newline at end of file From c49865c2fee1e5b2ddc86c6b6f8449ef7e1aae98 Mon Sep 17 00:00:00 2001 From: ruppal Date: Mon, 16 Mar 2020 18:54:16 -0400 Subject: [PATCH 32/48] Bracket Selection --- src/main/java/BracketSelection.java | 51 +++++++++++++++++++++++++++++ src/main/java/Team.java | 12 ++++++- src/main/java/testConsole.java | 37 +++++++++++++++++++++ 3 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 src/main/java/BracketSelection.java create mode 100644 src/main/java/testConsole.java diff --git a/src/main/java/BracketSelection.java b/src/main/java/BracketSelection.java new file mode 100644 index 0000000..92c6d27 --- /dev/null +++ b/src/main/java/BracketSelection.java @@ -0,0 +1,51 @@ +import java.util.Scanner; + +public class BracketSelection { + Team team1 = null; + Team team2 = null; + + public void bracketSelection(Team team1, Team team2) { + this.team1 = team1; + this.team2 = team2; + } + + public String pickBracketsMessage() { + return + "\n" + + ("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^")+ "\n" + + (" Who Will Win This Matchup? ")+ "\n" + + (" -------------------------------------------- ")+ "\n" + + (" ")+ "\n" + + (" 1. " + team1 + " ")+ "\n" + + (" 2. " + team2 + " ")+ "\n" + + (" ")+ "\n" + + ("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^")+ "\n" + + (" Enter your input :"); + } + + public Team pickWinner(Team team1, Team team2) { + + Team winner = new Team(); + + + Integer userInput = testConsole.getInteger(pickBracketsMessage()); + + if (userInput == 1) { + winner = team1; + } else { + winner = team2; + } + + + return winner; + } + + public static void main(String[] args) { + Team team1 = new Team(); + Team team2 = new Team(); + + BracketSelection bs = new BracketSelection(); + bs.pickWinner(team1,team2); + } + +} \ No newline at end of file diff --git a/src/main/java/Team.java b/src/main/java/Team.java index 8b6d451..95265fa 100644 --- a/src/main/java/Team.java +++ b/src/main/java/Team.java @@ -1,11 +1,13 @@ public class Team { + private String teamName; private Roster teamRoster; private String records; private String projections; private String history; private String schedule; - public Team(String records,String projections,String history,String schedule, Roster roster){ + public Team(String teamName, String records,String projections,String history,String schedule, Roster roster){ + this.teamName = teamName; this.teamRoster = new Roster(); this.records = records; this.projections = projections; @@ -16,6 +18,14 @@ public Team(String records,String projections,String history,String schedule, Ro public Team(){ } + public String getTeamName() { + return teamName; + } + + public void setTeamName(String teamName) { + this.teamName = teamName; + } + public Roster getTeamRoster() { return teamRoster; } diff --git a/src/main/java/testConsole.java b/src/main/java/testConsole.java new file mode 100644 index 0000000..52602b7 --- /dev/null +++ b/src/main/java/testConsole.java @@ -0,0 +1,37 @@ + + +import java.util.InputMismatchException; +import java.util.Scanner; + +public class testConsole { + + public static String getStringInput(String prompt) { + Scanner scanner = new Scanner(System.in); + while (true) { + System.out.println(prompt); + try { + String userInput = scanner.nextLine(); + return userInput; + } catch (java.util.InputMismatchException e) { + scanner.nextLine(); + } + } + } + + public static Integer getInteger(String prompt) { + + Scanner scanner = new Scanner(System.in); + while (true) { + System.out.println(prompt); + try { + String userInput = scanner.nextLine(); + return Integer.parseInt(userInput); + } catch (NumberFormatException e) { + System.out.println("Invalid input. Please select one of the options above."); + scanner.nextLine(); + + } + } + + } +} \ No newline at end of file From b56d7ce51f8e5d7ca7b4f51bb3ddd9d357f3be64 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Tue, 17 Mar 2020 11:35:24 -0400 Subject: [PATCH 33/48] commit to pull --- src/main/java/Region.java | 4 ++-- src/main/java/Team.java | 13 +++++++++++-- src/test/java/JDBCTest.java | 3 +-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/Region.java b/src/main/java/Region.java index 11e1d25..0bba9ed 100644 --- a/src/main/java/Region.java +++ b/src/main/java/Region.java @@ -11,8 +11,8 @@ public Region(String selectedRegion){ this.teamSeedMap.put(new Team(), 1); } - public Bracket getRegionBracket() { - return regionBracket; + public HashMap getRegionBracket() { + return teamSeedMap; } public void setRegionBracket(Bracket regionBracket) { diff --git a/src/main/java/Team.java b/src/main/java/Team.java index c9e1476..860944f 100644 --- a/src/main/java/Team.java +++ b/src/main/java/Team.java @@ -4,8 +4,9 @@ public class Team { private String projections; private String history; private String schedule; + private String teamName; - public Team(String records,String projections,String history,String schedule, Roster roster){ + public Team(String records, String projections, String history, String schedule, Roster roster){ this.teamRoster = new Roster(); this.records = records; this.projections = projections; @@ -14,7 +15,7 @@ public Team(String records,String projections,String history,String schedule, Ro } - public Team(){ } + public Team(){} public Roster getTeamRoster() { return teamRoster; @@ -55,6 +56,14 @@ public String getSchedule() { public void setSchedule(String schedule) { this.schedule = schedule; } + + public String getTeamName() { + return teamName; + } + + public void setTeamName(String teamName) { + this.teamName = teamName; + } // get roster from API // records; // projections; diff --git a/src/test/java/JDBCTest.java b/src/test/java/JDBCTest.java index cd1a570..2b6bf72 100644 --- a/src/test/java/JDBCTest.java +++ b/src/test/java/JDBCTest.java @@ -7,8 +7,7 @@ public class JDBCTest { JDBC jdbc = new JDBC(); @Test - public void connect() { - } + public void connect() {} @Test public void getTeamListFromRegion() { From 0651c023ed390aa419b7483016039377ad264238 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Tue, 17 Mar 2020 11:42:40 -0400 Subject: [PATCH 34/48] fixed regionBracket --- .idea/compiler.xml | 1 - .idea/misc.xml | 9 --------- src/main/java/Region.java | 4 ++-- target/classes/regionSeeds/East.txt | 16 ---------------- target/classes/regionSeeds/MidWest.txt | 0 target/classes/regionSeeds/South.txt | 0 target/classes/regionSeeds/West.txt | 0 7 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 target/classes/regionSeeds/East.txt delete mode 100644 target/classes/regionSeeds/MidWest.txt delete mode 100644 target/classes/regionSeeds/South.txt delete mode 100644 target/classes/regionSeeds/West.txt diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 8f7cd6f..ec26f8c 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,7 +6,6 @@ - diff --git a/.idea/misc.xml b/.idea/misc.xml index f766114..2982ebd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,14 +3,5 @@ - - - - - \ No newline at end of file diff --git a/src/main/java/Region.java b/src/main/java/Region.java index 0bba9ed..5377079 100644 --- a/src/main/java/Region.java +++ b/src/main/java/Region.java @@ -11,8 +11,8 @@ public Region(String selectedRegion){ this.teamSeedMap.put(new Team(), 1); } - public HashMap getRegionBracket() { - return teamSeedMap; + public Bracket getRegionBracket(){ + return this.regionBracket; } public void setRegionBracket(Bracket regionBracket) { diff --git a/target/classes/regionSeeds/East.txt b/target/classes/regionSeeds/East.txt deleted file mode 100644 index f6ea442..0000000 --- a/target/classes/regionSeeds/East.txt +++ /dev/null @@ -1,16 +0,0 @@ -1 Duke -2 Michigan State -3 LSU -4 Virginia Tech -5 Mississippi State -6 Maryland -7 Louisville -8 VCU -9 UCF -10 Minnesota -11 Belmont -12 Liberty -13 Saint Louis -14 Yale -15 Bradley Missouri Valley -16 North Dakota State diff --git a/target/classes/regionSeeds/MidWest.txt b/target/classes/regionSeeds/MidWest.txt deleted file mode 100644 index e69de29..0000000 diff --git a/target/classes/regionSeeds/South.txt b/target/classes/regionSeeds/South.txt deleted file mode 100644 index e69de29..0000000 diff --git a/target/classes/regionSeeds/West.txt b/target/classes/regionSeeds/West.txt deleted file mode 100644 index e69de29..0000000 From c7a8d603cd187cc19c5558961e7b7def22dd5fcb Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Tue, 17 Mar 2020 16:23:15 -0400 Subject: [PATCH 35/48] added some of the bracketSelection logic, pushing for kris review --- src/main/java/BracketSelection.java | 65 ++++++++++++++++++++--------- src/main/java/JDBC.java | 1 + src/main/java/Region.java | 20 +++++---- src/test/java/RegionTest.java | 6 +-- 4 files changed, 63 insertions(+), 29 deletions(-) diff --git a/src/main/java/BracketSelection.java b/src/main/java/BracketSelection.java index 92c6d27..ad263c7 100644 --- a/src/main/java/BracketSelection.java +++ b/src/main/java/BracketSelection.java @@ -1,12 +1,19 @@ +import java.util.HashMap; import java.util.Scanner; public class BracketSelection { - Team team1 = null; - Team team2 = null; + private Region east = new Region("east"); + private Region west = new Region("west"); + private Region midwest = new Region("midwest"); + private Region south = new Region("south"); + private Team team1 = null; + private Team team2 = null; - public void bracketSelection(Team team1, Team team2) { - this.team1 = team1; - this.team2 = team2; + public BracketSelection() { + this.east = new Region("east"); + this.west = new Region("west"); + this.midwest = new Region("midwest"); + this.south = new Region("south"); } public String pickBracketsMessage() { @@ -23,29 +30,49 @@ public String pickBracketsMessage() { (" Enter your input :"); } - public Team pickWinner(Team team1, Team team2) { - + public HashMap pickFirstRoundWinner(Region region) { + HashMap winnerMap = new HashMap<>(); Team winner = new Team(); - - - Integer userInput = testConsole.getInteger(pickBracketsMessage()); - - if (userInput == 1) { - winner = team1; - } else { - winner = team2; + int seedCounter = 16; + //below creates round 1 matchups + for(int i = 1; i <=8; i++){ + this.team1 = region.getSeedTeamMap().get(i); + this.team2 = region.getSeedTeamMap().get(seedCounter); + Integer userInput = testConsole.getInteger(pickBracketsMessage()); + if (userInput == 1) { + winner = team1; + winnerMap.put(i,team1); + } else { + winner = team2; + winnerMap.put(i,team2); + } + seedCounter--; } - - - return winner; + region.setPicks(winnerMap); + return winnerMap; } + public void pickSecondRoundWinner(Region region){ + if (region.getPicks().containsKey(1)){}} + + public void pickThirdRoundWinner(Region region){} + public void pickFourthRoundWinner(Region region){} + public void pickRegionWinner(Region region){ + pickFirstRoundWinner(east); + pickSecondRoundWinner(east); + pickThirdRoundWinner(east); + pickFourthRoundWinner(east);} public static void main(String[] args) { + // selectedRegion will be either pulled from user input or we can hardcode it + Team team1 = new Team(); Team team2 = new Team(); BracketSelection bs = new BracketSelection(); - bs.pickWinner(team1,team2); + bs.pickRegionWinner(bs.east); + bs.pickRegionWinner(bs.west); + bs.pickRegionWinner(bs.midwest); + bs.pickRegionWinner(bs.south); } } \ No newline at end of file diff --git a/src/main/java/JDBC.java b/src/main/java/JDBC.java index b276b0f..07cd0d6 100644 --- a/src/main/java/JDBC.java +++ b/src/main/java/JDBC.java @@ -23,6 +23,7 @@ public Connection connect(){ public String getTeamListFromRegion(String region) { //String SQL = "SELECT school_name FROM" + region; + //below runs on local database for testing, above is actual query once connected to remote db String SQL = "SELECT first_name FROM person WHERE id < 10"; String teamList = ""; try (Connection conn = connect(); diff --git a/src/main/java/Region.java b/src/main/java/Region.java index 5377079..c1b3ee4 100644 --- a/src/main/java/Region.java +++ b/src/main/java/Region.java @@ -3,12 +3,13 @@ public class Region{ private Bracket regionBracket; - private HashMap teamSeedMap; + private HashMap seedTeamMap; + private HashMap picks; public Region(String selectedRegion){ JDBC jdbc = new JDBC(); - //method below will take jdbc queries - need to mapify the query results - this.teamSeedMap.put(new Team(), 1); + //method below will take jdbc query results - need to mapify the query results using selectedRegion + this.seedTeamMap.put(1,new Team()); } public Bracket getRegionBracket(){ @@ -19,14 +20,19 @@ public void setRegionBracket(Bracket regionBracket) { this.regionBracket = regionBracket; } - public HashMap getTeamSeedMap() { - return teamSeedMap; + public HashMap getSeedTeamMap() { + return seedTeamMap; } - public void setTeamSeedMap(HashMap teamSeedMap) { - this.teamSeedMap = teamSeedMap; + public void setSeedTeamMap(HashMap teamSeedMap) { + this.seedTeamMap = teamSeedMap; } + public HashMap getPicks(){return this.picks;}; + + public void setPicks(HashMap picks){this.picks = picks;}; + + // methods planned for future use below // get list of teams and seeds from API // put them in the hashmap diff --git a/src/test/java/RegionTest.java b/src/test/java/RegionTest.java index fafa258..0a973cb 100644 --- a/src/test/java/RegionTest.java +++ b/src/test/java/RegionTest.java @@ -8,7 +8,7 @@ public class RegionTest { Region testRegion = new Region("East"); Bracket testBracket = new Bracket(); - HashMap testMap = new HashMap<>(); + HashMap testMap = new HashMap<>(); @Test public void getSetRegionBracket() { @@ -20,9 +20,9 @@ public void getSetRegionBracket() { @Test public void getSetTeamSeedMap() { - testRegion.setTeamSeedMap(testMap); + testRegion.setSeedTeamMap(testMap); HashMap expected = testMap; - HashMap actual = testRegion.getTeamSeedMap(); + HashMap actual = testRegion.getSeedTeamMap(); Assert.assertEquals(expected,actual); } } \ No newline at end of file From 93bb046961c99d4d7ab04de41d7d350873877569 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Tue, 17 Mar 2020 16:36:23 -0400 Subject: [PATCH 36/48] corrected pickRegionWinner --- src/main/java/BracketSelection.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/BracketSelection.java b/src/main/java/BracketSelection.java index ad263c7..54603ed 100644 --- a/src/main/java/BracketSelection.java +++ b/src/main/java/BracketSelection.java @@ -58,9 +58,9 @@ public void pickThirdRoundWinner(Region region){} public void pickFourthRoundWinner(Region region){} public void pickRegionWinner(Region region){ pickFirstRoundWinner(east); - pickSecondRoundWinner(east); - pickThirdRoundWinner(east); - pickFourthRoundWinner(east);} + pickSecondRoundWinner(west); + pickThirdRoundWinner(south); + pickFourthRoundWinner(midwest);} public static void main(String[] args) { // selectedRegion will be either pulled from user input or we can hardcode it From 51c2416832d2751ea526f515e27b2ca65ae2603c Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Tue, 17 Mar 2020 17:47:05 -0400 Subject: [PATCH 37/48] completed bracketSelection - needs testing --- src/main/java/BracketSelection.java | 72 ++++++++++++++++++++++++----- src/main/java/Region.java | 21 +++++++-- 2 files changed, 78 insertions(+), 15 deletions(-) diff --git a/src/main/java/BracketSelection.java b/src/main/java/BracketSelection.java index 54603ed..124f34d 100644 --- a/src/main/java/BracketSelection.java +++ b/src/main/java/BracketSelection.java @@ -1,3 +1,4 @@ +import java.util.ArrayList; import java.util.HashMap; import java.util.Scanner; @@ -30,8 +31,9 @@ public String pickBracketsMessage() { (" Enter your input :"); } - public HashMap pickFirstRoundWinner(Region region) { - HashMap winnerMap = new HashMap<>(); + public ArrayList pickFirstRoundWinner(Region region) { + region.clearPicks(); + ArrayList winnerList = new ArrayList<>(); Team winner = new Team(); int seedCounter = 16; //below creates round 1 matchups @@ -41,21 +43,70 @@ public HashMap pickFirstRoundWinner(Region region) { Integer userInput = testConsole.getInteger(pickBracketsMessage()); if (userInput == 1) { winner = team1; - winnerMap.put(i,team1); + winnerList.add(i); } else { winner = team2; - winnerMap.put(i,team2); + winnerList.add(i); } seedCounter--; } - region.setPicks(winnerMap); - return winnerMap; + region.setPicks(winnerList); + return winnerList; } public void pickSecondRoundWinner(Region region){ - if (region.getPicks().containsKey(1)){}} + ArrayList winnerList = new ArrayList<>(); + Team winner = new Team(); + int seedCounter = 8; + for (int i = 1; i<=4;i++){ + this.team1 = region.getSeedTeamMap().get(region.getPicks().get(i)); + this.team2 = region.getSeedTeamMap().get(region.getPicks().get(seedCounter)); + Integer userInput = testConsole.getInteger(pickBracketsMessage()); + if (userInput == 1) { + winner = team1; + winnerList.add(i); + } else { + winner = team2; + winnerList.add(i); + } + seedCounter--; + } + region.setPicks(winnerList); + } + + public void pickThirdRoundWinner(Region region){ + ArrayList winnerList = new ArrayList<>(); + Team winner = new Team(); + int seedCounter = 4; + for (int i = 1; i<=2;i++){ + this.team1 = region.getSeedTeamMap().get(region.getPicks().get(i)); + this.team2 = region.getSeedTeamMap().get(region.getPicks().get(seedCounter)); + Integer userInput = testConsole.getInteger(pickBracketsMessage()); + if (userInput == 1) { + winner = team1; + winnerList.add(i); + } else { + winner = team2; + winnerList.add(i); + } + seedCounter--; + } + region.setPicks(winnerList); +} + + public void pickFourthRoundWinner(Region region){ + Team winner = new Team(); + this.team1 = region.getSeedTeamMap().get(region.getPicks().get(1)); + this.team2 = region.getSeedTeamMap().get(region.getPicks().get(2)); + Integer userInput = testConsole.getInteger(pickBracketsMessage()); + if (userInput == 1) { + winner = team1; + region.setChamp(team1); + } else { + winner = team2; + region.setChamp(team2); + } + } - public void pickThirdRoundWinner(Region region){} - public void pickFourthRoundWinner(Region region){} public void pickRegionWinner(Region region){ pickFirstRoundWinner(east); pickSecondRoundWinner(west); @@ -65,9 +116,6 @@ public void pickRegionWinner(Region region){ public static void main(String[] args) { // selectedRegion will be either pulled from user input or we can hardcode it - Team team1 = new Team(); - Team team2 = new Team(); - BracketSelection bs = new BracketSelection(); bs.pickRegionWinner(bs.east); bs.pickRegionWinner(bs.west); diff --git a/src/main/java/Region.java b/src/main/java/Region.java index c1b3ee4..665cb26 100644 --- a/src/main/java/Region.java +++ b/src/main/java/Region.java @@ -1,15 +1,19 @@ +import java.util.ArrayList; import java.util.HashMap; public class Region{ private Bracket regionBracket; private HashMap seedTeamMap; - private HashMap picks; + private ArrayList seedPicks; + private Team champ; public Region(String selectedRegion){ JDBC jdbc = new JDBC(); //method below will take jdbc query results - need to mapify the query results using selectedRegion this.seedTeamMap.put(1,new Team()); + this.seedPicks = new ArrayList(); + this.champ = new Team(); } public Bracket getRegionBracket(){ @@ -28,10 +32,21 @@ public void setSeedTeamMap(HashMap teamSeedMap) { this.seedTeamMap = teamSeedMap; } - public HashMap getPicks(){return this.picks;}; + public ArrayList getPicks(){return this.seedPicks;}; - public void setPicks(HashMap picks){this.picks = picks;}; + public void setPicks(ArrayList picks){this.seedPicks = picks;}; + public void clearPicks(){ + this.getPicks().clear(); + } + + public Team getChamp() { + return champ; + } + + public void setChamp(Team champ) { + this.champ = champ; + } // methods planned for future use below // get list of teams and seeds from API From 87c358053d23c46dbf2772f18eda6ebbdd6c6d45 Mon Sep 17 00:00:00 2001 From: asconem Date: Wed, 18 Mar 2020 00:09:17 -0400 Subject: [PATCH 38/48] Merge issue fixed --- .idea/misc.xml | 7 +------ target/classes/regionSeeds/East.txt | 16 ++++++++++++++++ target/classes/regionSeeds/MidWest.txt | 0 target/classes/regionSeeds/South.txt | 0 target/classes/regionSeeds/West.txt | 0 .../META-INF/JustCode.kotlin_module | Bin 16 -> 0 bytes 6 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 target/classes/regionSeeds/East.txt create mode 100644 target/classes/regionSeeds/MidWest.txt create mode 100644 target/classes/regionSeeds/South.txt create mode 100644 target/classes/regionSeeds/West.txt delete mode 100644 target/test-classes/META-INF/JustCode.kotlin_module diff --git a/.idea/misc.xml b/.idea/misc.xml index fe8d13c..7b44806 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,13 +1,9 @@ -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 0a8ecaa564c555d2ffffc2ebd77101f9c0bed8f9 -======= ->>>>>>> cf4212d0e47831d9e0548b7c5ed23eaf7a2d1bd7 + \ No newline at end of file diff --git a/target/classes/regionSeeds/East.txt b/target/classes/regionSeeds/East.txt new file mode 100644 index 0000000..f6ea442 --- /dev/null +++ b/target/classes/regionSeeds/East.txt @@ -0,0 +1,16 @@ +1 Duke +2 Michigan State +3 LSU +4 Virginia Tech +5 Mississippi State +6 Maryland +7 Louisville +8 VCU +9 UCF +10 Minnesota +11 Belmont +12 Liberty +13 Saint Louis +14 Yale +15 Bradley Missouri Valley +16 North Dakota State diff --git a/target/classes/regionSeeds/MidWest.txt b/target/classes/regionSeeds/MidWest.txt new file mode 100644 index 0000000..e69de29 diff --git a/target/classes/regionSeeds/South.txt b/target/classes/regionSeeds/South.txt new file mode 100644 index 0000000..e69de29 diff --git a/target/classes/regionSeeds/West.txt b/target/classes/regionSeeds/West.txt new file mode 100644 index 0000000..e69de29 diff --git a/target/test-classes/META-INF/JustCode.kotlin_module b/target/test-classes/META-INF/JustCode.kotlin_module deleted file mode 100644 index a49347afef10a9b5f95305e1058ba36adec7d6dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 RcmZQzU|?ooU|@t|0RRA102TlM From f2a92c5ddcef251894d07f994b5ab9baf3e39956 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Wed, 18 Mar 2020 16:44:54 -0400 Subject: [PATCH 39/48] established connection to heroku db, need to populate db --- src/main/java/JDBC.java | 10 ++++---- src/test/java/BracketSelectionTest.java | 34 +++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 src/test/java/BracketSelectionTest.java diff --git a/src/main/java/JDBC.java b/src/main/java/JDBC.java index 07cd0d6..d6585b4 100644 --- a/src/main/java/JDBC.java +++ b/src/main/java/JDBC.java @@ -3,9 +3,9 @@ public class JDBC { // change this to the remote server - private final String url = "jdbc:postgresql://localhost:5432/testjava"; - private final String user = "java"; - private final String password = "java"; + private final String url = "jdbc:postgresql://ec2-18-210-51-239.compute-1.amazonaws.com:5432/ddmgjgkagckgto?user=qsbbjcdcnayhnp&password=e902ec9c2d2458dd577f2655c521499e28b90b01bda8728ac907ad9e7db2ea3f"; + private final String user = "qsbbjcdcnayhnp"; + private final String password = "e902ec9c2d2458dd577f2655c521499e28b90b01bda8728ac907ad9e7db2ea3f"; //connect to postgres database @@ -24,14 +24,14 @@ public Connection connect(){ public String getTeamListFromRegion(String region) { //String SQL = "SELECT school_name FROM" + region; //below runs on local database for testing, above is actual query once connected to remote db - String SQL = "SELECT first_name FROM person WHERE id < 10"; + String SQL = "SELECT seed FROM ncaa;"; String teamList = ""; try (Connection conn = connect(); Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery(SQL)) { while (rs.next()){ //teamList = rs.getString("school_name"); - teamList += rs.getString("first_name") + "\n"; + teamList += rs.getString("seed") + "\n"; } } catch (SQLException e) { System.out.println(e.getMessage()); diff --git a/src/test/java/BracketSelectionTest.java b/src/test/java/BracketSelectionTest.java new file mode 100644 index 0000000..7dc9f8c --- /dev/null +++ b/src/test/java/BracketSelectionTest.java @@ -0,0 +1,34 @@ +import org.junit.Test; + +import static org.junit.Assert.*; + +public class BracketSelectionTest { + + @Test + public void pickBracketsMessage() { + } + + @Test + public void pickFirstRoundWinner() { + } + + @Test + public void pickSecondRoundWinner() { + } + + @Test + public void pickThirdRoundWinner() { + } + + @Test + public void pickFourthRoundWinner() { + } + + @Test + public void pickRegionWinner() { + } + + @Test + public void main() { + } +} \ No newline at end of file From f8fac5655dd2b1f35446fd0fb1bda02ad9b48fd8 Mon Sep 17 00:00:00 2001 From: asconem Date: Wed, 18 Mar 2020 23:05:09 -0400 Subject: [PATCH 40/48] Add tests for getting and setting a team name on a given roster While examining the latest update of the codebase after pulling from the dev branch, I noticed that the total test coverage for the Team class was at 78%. This was easily remedied by adding one more test that checked for the getting and setting of a given team's name. --- src/test/java/TeamTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/test/java/TeamTest.java b/src/test/java/TeamTest.java index 1381bae..8222f20 100644 --- a/src/test/java/TeamTest.java +++ b/src/test/java/TeamTest.java @@ -48,4 +48,12 @@ public void getSetSchedule() { String actual = testTeam.getSchedule(); Assert.assertEquals(expected,actual); } + + @Test + public void getSetTeamName() { + testTeam.setTeamName("Latvia"); + String expected = "Latvia"; + String actual = testTeam.getTeamName(); + Assert.assertEquals(expected, actual); + } } \ No newline at end of file From 2c5ca7382f422fae844997fef2db92a04916674a Mon Sep 17 00:00:00 2001 From: asconem Date: Thu, 19 Mar 2020 14:32:46 -0400 Subject: [PATCH 41/48] Adjusting tests --- src/test/java/TeamTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/TeamTest.java b/src/test/java/TeamTest.java index 8222f20..8afdb43 100644 --- a/src/test/java/TeamTest.java +++ b/src/test/java/TeamTest.java @@ -51,8 +51,8 @@ public void getSetSchedule() { @Test public void getSetTeamName() { - testTeam.setTeamName("Latvia"); - String expected = "Latvia"; + testTeam.setTeamName("Duke"); + String expected = "Duke"; String actual = testTeam.getTeamName(); Assert.assertEquals(expected, actual); } From 670e4f50fdb2a46afb9f13cfd4a151d051c46f61 Mon Sep 17 00:00:00 2001 From: ruppal Date: Thu, 19 Mar 2020 14:52:37 -0400 Subject: [PATCH 42/48] pull --- .idea/compiler.xml | 1 + .idea/misc.xml | 7 +++++++ JustCode.iml | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index ec26f8c..8f7cd6f 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,6 +6,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index 2982ebd..1c3f3fd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,12 @@ + + + \ No newline at end of file diff --git a/JustCode.iml b/JustCode.iml index 39a9cec..b61f562 100644 --- a/JustCode.iml +++ b/JustCode.iml @@ -11,9 +11,9 @@ + - \ No newline at end of file From 11be970901e3c48fe8afa288548dd29de5c45c6f Mon Sep 17 00:00:00 2001 From: sandeep Date: Thu, 19 Mar 2020 16:15:24 -0400 Subject: [PATCH 43/48] working on accepting menu as numbers and items --- .idea/compiler.xml | 3 +- .idea/misc.xml | 7 ++ JustCode.iml | 2 +- pom.xml | 4 + src/main/java/Console.java | 83 +++++++++++------- .../classes/META-INF/JustCode.kotlin_module | Bin 0 -> 16 bytes target/classes/regionSeeds/East.txt | 16 ++++ target/classes/regionSeeds/MidWest.txt | 0 target/classes/regionSeeds/South.txt | 0 target/classes/regionSeeds/West.txt | 0 10 files changed, 80 insertions(+), 35 deletions(-) create mode 100644 target/classes/META-INF/JustCode.kotlin_module create mode 100644 target/classes/regionSeeds/East.txt create mode 100644 target/classes/regionSeeds/MidWest.txt create mode 100644 target/classes/regionSeeds/South.txt create mode 100644 target/classes/regionSeeds/West.txt diff --git a/.idea/compiler.xml b/.idea/compiler.xml index ec26f8c..ca5d3ee 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,10 +6,11 @@ + - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 2982ebd..1c3f3fd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,12 @@ + + + \ No newline at end of file diff --git a/JustCode.iml b/JustCode.iml index 39a9cec..b61f562 100644 --- a/JustCode.iml +++ b/JustCode.iml @@ -11,9 +11,9 @@ + - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 140944d..27042a4 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,10 @@ groupId JustCode 1.0-SNAPSHOT + + 1.8 + 1.8 + junit diff --git a/src/main/java/Console.java b/src/main/java/Console.java index 65752e6..fd3dd1e 100644 --- a/src/main/java/Console.java +++ b/src/main/java/Console.java @@ -1,4 +1,5 @@ +import java.util.HashMap; import java.util.Scanner; public class Console { @@ -30,18 +31,18 @@ public void welcomeMessageRegions() { // ***************** Getting String input from User ********** - public Integer getUserInput() { + public Object getUserInput() { - int userInput = 0; + Object userInput; Scanner readInput = new Scanner(System.in); - try { - userInput = Integer.parseInt(readInput.nextLine()); - - } catch (NumberFormatException ex) { - System.out.println("Invalid entry. Please enter a number from the menu" + "\n"); - userInput = Integer.parseInt(readInput.nextLine()); - return userInput; - } +// try { + userInput = readInput.nextLine(); + +// } catch (NumberFormatException ex) { +// System.out.println("Invalid entry. Please enter a number from the menu" + "\n"); +// userInput = Integer.parseInt(readInput.nextLine()); +// return userInput; +// } return userInput; } @@ -55,26 +56,42 @@ public static void main(String[] args) { Boolean invalid = false; region.welcomeMessageRegions(); - do { + HashMap response = new HashMap(); + response.put(1, "EAST"); + response.put(2, "WEST"); + response.put(3, "MIDWEST"); + response.put(4, "SOUTH"); +// System.out.println(response.get(1)); +// System.out.println(response.get(2)); +// System.out.println(response.get(3)); +// System.out.println(response.get(4)); +// System.out.println(response.keySet().toArray()[1]); - Integer response = region.getUserInput(); - if (response == 1) { - System.out.println("You selected EAST" + "\n\n"); - try { - Thread.sleep(1000); - } catch (InterruptedException ex) { - Thread.currentThread().interrupt(); - } + do { - System.out.println("Redirecting........."); - invalid = false; - Region r = new Region("east"); - r.getRegionBracket(); - } + Object r = region.getUserInput(); +// System.out.println(r); +// System.out.println(response.get(2)); +// System.out.println(response.keySet().toArray()[1]); + + if ((response.get(1).equalsIgnoreCase((String)r)) || r == response.keySet().toArray()[0]) + { + System.out.println("You selected EAST" + "\n\n"); + try { + Thread.sleep(1000); + } catch (InterruptedException ex) { + Thread.currentThread().interrupt(); + } + + System.out.println("Redirecting........."); + invalid = false; + Region regionSelected = new Region("east"); + regionSelected.getRegionBracket(); + } - else if (response == 2) { + else if ((response.get(2).equalsIgnoreCase((String)r)) || r == response.keySet().toArray()[1]) { System.out.println("You selected WEST" + "\n\n"); try { @@ -85,11 +102,11 @@ else if (response == 2) { System.out.println("Redirecting........."); invalid = false; - Region r = new Region("west"); - r.getRegionBracket(); + Region regionSelected = new Region("west"); + regionSelected.getRegionBracket(); } - else if (response == 3) { + else if ((response.get(3).equalsIgnoreCase((String)r)) || r == response.keySet().toArray()[2]) { System.out.println("You selected MIDWEST" + "\n\n"); try { @@ -100,11 +117,11 @@ else if (response == 3) { System.out.println("Redirecting........."); invalid = false; - Region r = new Region("midwest"); - r.getRegionBracket(); + Region regionSelected = new Region("midwest"); + regionSelected.getRegionBracket(); } - else if (response == 4) { + else if (((response.get(4).equalsIgnoreCase((String)r))) || r == response.keySet().toArray()[3]) { System.out.println("You selected SOUTH" + "\n\n"); try { Thread.sleep(1000); @@ -114,8 +131,8 @@ else if (response == 4) { System.out.println("Redirecting........."); invalid = false; - Region r = new Region("south"); - r.getRegionBracket(); + Region regionSelected = new Region("south"); + regionSelected.getRegionBracket(); } else { diff --git a/target/classes/META-INF/JustCode.kotlin_module b/target/classes/META-INF/JustCode.kotlin_module new file mode 100644 index 0000000000000000000000000000000000000000..a49347afef10a9b5f95305e1058ba36adec7d6dd GIT binary patch literal 16 RcmZQzU|?ooU|@t|0RRA102TlM literal 0 HcmV?d00001 diff --git a/target/classes/regionSeeds/East.txt b/target/classes/regionSeeds/East.txt new file mode 100644 index 0000000..f6ea442 --- /dev/null +++ b/target/classes/regionSeeds/East.txt @@ -0,0 +1,16 @@ +1 Duke +2 Michigan State +3 LSU +4 Virginia Tech +5 Mississippi State +6 Maryland +7 Louisville +8 VCU +9 UCF +10 Minnesota +11 Belmont +12 Liberty +13 Saint Louis +14 Yale +15 Bradley Missouri Valley +16 North Dakota State diff --git a/target/classes/regionSeeds/MidWest.txt b/target/classes/regionSeeds/MidWest.txt new file mode 100644 index 0000000..e69de29 diff --git a/target/classes/regionSeeds/South.txt b/target/classes/regionSeeds/South.txt new file mode 100644 index 0000000..e69de29 diff --git a/target/classes/regionSeeds/West.txt b/target/classes/regionSeeds/West.txt new file mode 100644 index 0000000..e69de29 From 763879be2c4f67734c2fd5b3c3bb5693c39362f7 Mon Sep 17 00:00:00 2001 From: sandeep Date: Thu, 19 Mar 2020 16:34:21 -0400 Subject: [PATCH 44/48] added .idea to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 386c7e4..dcf4d19 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ # Log file *.log + /.idea # BlueJ files From ea2706798d8b6a16bee52598383c1431ed1f3eef Mon Sep 17 00:00:00 2001 From: Dave Kelly Date: Tue, 31 Mar 2020 16:39:51 -0400 Subject: [PATCH 45/48] added mappers, services, some SQL to populate roster --- JustCode.iml | 67 ++++++++++++++++++- pom.xml | 34 +++++++++- src/main/java/BracketSelection.java | 29 ++++---- src/main/java/Console.java | 4 +- src/main/java/GUI.java | 2 +- src/main/java/Mappers/PlayerMapper.java | 33 +++++++++ src/main/java/Mappers/RegionMapper.java | 19 ++++++ src/main/java/Mappers/RosterMapper.java | 14 ++++ src/main/java/Mappers/TeamMapper.java | 14 ++++ src/main/java/{ => Models}/Bracket.java | 2 + src/main/java/{ => Models}/Player.java | 63 +++++++++++------ .../{ => Models/PlayerEnums}/Position.java | 8 +-- .../java/{ => Models/PlayerEnums}/Year.java | 2 + src/main/java/{ => Models}/Region.java | 6 +- src/main/java/{ => Models}/Roster.java | 30 +++++++-- src/main/java/{ => Models}/Team.java | 2 + src/main/java/Services/PlayerService.java | 18 +++++ src/main/java/Services/RegionService.java | 12 ++++ src/main/java/Services/RosterService.java | 10 +++ src/main/java/Services/TeamService.java | 10 +++ src/test/java/JDBCTest.java | 3 - src/test/java/RegionTest.java | 5 +- src/test/java/TeamTest.java | 4 +- src/test/java/TestPlayer.java | 7 +- src/test/java/TestRoster.java | 4 +- 25 files changed, 345 insertions(+), 57 deletions(-) create mode 100644 src/main/java/Mappers/PlayerMapper.java create mode 100644 src/main/java/Mappers/RegionMapper.java create mode 100644 src/main/java/Mappers/RosterMapper.java create mode 100644 src/main/java/Mappers/TeamMapper.java rename src/main/java/{ => Models}/Bracket.java (61%) rename src/main/java/{ => Models}/Player.java (60%) rename src/main/java/{ => Models/PlayerEnums}/Position.java (59%) rename src/main/java/{ => Models/PlayerEnums}/Year.java (86%) rename src/main/java/{ => Models}/Region.java (93%) rename src/main/java/{ => Models}/Roster.java (59%) rename src/main/java/{ => Models}/Team.java (98%) create mode 100644 src/main/java/Services/PlayerService.java create mode 100644 src/main/java/Services/RegionService.java create mode 100644 src/main/java/Services/RosterService.java create mode 100644 src/main/java/Services/TeamService.java diff --git a/JustCode.iml b/JustCode.iml index b61f562..2d06b19 100644 --- a/JustCode.iml +++ b/JustCode.iml @@ -12,8 +12,73 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 27042a4..5d17966 100644 --- a/pom.xml +++ b/pom.xml @@ -9,11 +9,36 @@ groupId JustCode 1.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-parent + 1.5.3.RELEASE + + + 1.8 1.8 + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-test + test + junit junit @@ -26,6 +51,13 @@ 42.2.11 - + + + + org.springframework.boot + spring-boot-maven-plugin + + + \ No newline at end of file diff --git a/src/main/java/BracketSelection.java b/src/main/java/BracketSelection.java index 124f34d..003aff9 100644 --- a/src/main/java/BracketSelection.java +++ b/src/main/java/BracketSelection.java @@ -1,14 +1,15 @@ +import Models.Region; +import Models.Team; + import java.util.ArrayList; -import java.util.HashMap; -import java.util.Scanner; public class BracketSelection { - private Region east = new Region("east"); - private Region west = new Region("west"); - private Region midwest = new Region("midwest"); - private Region south = new Region("south"); - private Team team1 = null; - private Team team2 = null; + private Region east; + private Region west; + private Region midwest; + private Region south; + private Team team1; + private Team team2; public BracketSelection() { this.east = new Region("east"); @@ -31,7 +32,7 @@ public String pickBracketsMessage() { (" Enter your input :"); } - public ArrayList pickFirstRoundWinner(Region region) { + public void pickFirstRoundWinner(Region region) { region.clearPicks(); ArrayList winnerList = new ArrayList<>(); Team winner = new Team(); @@ -51,8 +52,8 @@ public ArrayList pickFirstRoundWinner(Region region) { seedCounter--; } region.setPicks(winnerList); - return winnerList; } + public void pickSecondRoundWinner(Region region){ ArrayList winnerList = new ArrayList<>(); Team winner = new Team(); @@ -108,10 +109,10 @@ public void pickFourthRoundWinner(Region region){ } public void pickRegionWinner(Region region){ - pickFirstRoundWinner(east); - pickSecondRoundWinner(west); - pickThirdRoundWinner(south); - pickFourthRoundWinner(midwest);} + pickFirstRoundWinner(region); + pickSecondRoundWinner(region); + pickThirdRoundWinner(region); + pickFourthRoundWinner(region);} public static void main(String[] args) { // selectedRegion will be either pulled from user input or we can hardcode it diff --git a/src/main/java/Console.java b/src/main/java/Console.java index fd3dd1e..ce9f369 100644 --- a/src/main/java/Console.java +++ b/src/main/java/Console.java @@ -1,4 +1,6 @@ +import Models.Region; + import java.util.HashMap; import java.util.Scanner; @@ -12,7 +14,7 @@ public void welcomeMessageRegions() { System.out.println("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"); System.out.println("^ Hello Welcome to MARCH MADNESS ^"); System.out.println("^--------------------------------------------^"); - System.out.println("^ Please select the Region by number ^"); + System.out.println("^ Please select the Models.Region by number ^"); System.out.println("^ ^"); System.out.println("^ 1. EAST ^"); System.out.println("^ 2. WEST ^"); diff --git a/src/main/java/GUI.java b/src/main/java/GUI.java index 952c808..7987e4e 100644 --- a/src/main/java/GUI.java +++ b/src/main/java/GUI.java @@ -10,7 +10,7 @@ public class GUI extends JFrame{ **/ public GUI(){ - super("2020 March Madness Bracket"); + super("2020 March Madness Models.Bracket"); this.setSize(this.getToolkit().getScreenSize()); this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); this.setVisible(true); diff --git a/src/main/java/Mappers/PlayerMapper.java b/src/main/java/Mappers/PlayerMapper.java new file mode 100644 index 0000000..25ef191 --- /dev/null +++ b/src/main/java/Mappers/PlayerMapper.java @@ -0,0 +1,33 @@ +package Mappers; + +import Models.Player; +import Models.PlayerEnums.Position; +import org.springframework.jdbc.core.RowMapper; + +import java.sql.ResultSet; +import java.sql.SQLException; + +public class PlayerMapper implements RowMapper { + @Override + public Player mapRow(ResultSet rs, int i) throws SQLException { + Player player = new Player(); + player.setName(rs.getString("name")); + player.setPPG(rs.getDouble("pointspergame")); + player.setAPG(rs.getDouble("assistspergame")); + player.setRPG(rs.getDouble("reboundspergame")); + player.setTeamId(rs.getInt("teamid")); + player.setGames(rs.getInt("games")); + switch (rs.getString("position")) { + case "C": + player.setPosition(Position.C); + break; + case "F": + player.setPosition(Position.F); + break; + case "G": + player.setPosition(Position.G); + break; + } + return player; + } +} diff --git a/src/main/java/Mappers/RegionMapper.java b/src/main/java/Mappers/RegionMapper.java new file mode 100644 index 0000000..8bd3742 --- /dev/null +++ b/src/main/java/Mappers/RegionMapper.java @@ -0,0 +1,19 @@ +package Mappers; + +import Models.Region; +import org.springframework.jdbc.core.RowMapper; + +import java.sql.ResultSet; +import java.sql.SQLException; + +public class RegionMapper implements RowMapper { + + @Override + public Region mapRow(ResultSet rs, int row) throws SQLException { + return new Region(); +// region. +// ArrayList seedPicks; +// Models.Team champ; + + } +} diff --git a/src/main/java/Mappers/RosterMapper.java b/src/main/java/Mappers/RosterMapper.java new file mode 100644 index 0000000..2d6e43d --- /dev/null +++ b/src/main/java/Mappers/RosterMapper.java @@ -0,0 +1,14 @@ +package Mappers; + +import Models.Roster; +import org.springframework.jdbc.core.RowMapper; + +import java.sql.ResultSet; +import java.sql.SQLException; + +public class RosterMapper implements RowMapper { + @Override + public Roster mapRow(ResultSet resultSet, int i) throws SQLException { + return null; + } +} diff --git a/src/main/java/Mappers/TeamMapper.java b/src/main/java/Mappers/TeamMapper.java new file mode 100644 index 0000000..591554c --- /dev/null +++ b/src/main/java/Mappers/TeamMapper.java @@ -0,0 +1,14 @@ +package Mappers; + +import Models.Team; +import org.springframework.jdbc.core.RowMapper; + +import java.sql.ResultSet; +import java.sql.SQLException; + +public class TeamMapper implements RowMapper { + @Override + public Team mapRow(ResultSet resultSet, int i) throws SQLException { + return null; + } +} diff --git a/src/main/java/Bracket.java b/src/main/java/Models/Bracket.java similarity index 61% rename from src/main/java/Bracket.java rename to src/main/java/Models/Bracket.java index ef5647e..2834db7 100644 --- a/src/main/java/Bracket.java +++ b/src/main/java/Models/Bracket.java @@ -1,3 +1,5 @@ +package Models; + public class Bracket { diff --git a/src/main/java/Player.java b/src/main/java/Models/Player.java similarity index 60% rename from src/main/java/Player.java rename to src/main/java/Models/Player.java index 73cf61f..ca2510a 100644 --- a/src/main/java/Player.java +++ b/src/main/java/Models/Player.java @@ -1,17 +1,21 @@ -import java.util.Map; +package Models; + +import Models.PlayerEnums.Position; +import Models.PlayerEnums.Year; public class Player { - -private String name; -private Double height; -private Double weight; + private int teamId; + private String name; + private Double height; + private Double weight; -private Double PPG; -private Double APG; -private Double RPG; + private Double PPG; + private Double APG; + private Double RPG; + private int games; -private Year year; -private Position position; + private Year year; + private Position position; public Player(String name, Position position, Double height, Double weight, Double PPG, Double APG, Double RPG, Year year) { this.name = name; @@ -22,13 +26,16 @@ public Player(String name, Position position, Double height, Double weight, Doub this.APG = APG; this.RPG = RPG; this.year = year; - + } public Player(String name) { this.name = name; } + public Player() { + } + public String getName() { return name; } @@ -93,19 +100,35 @@ public void setPosition(Position position) { this.position = position; } - public String playerDetails(Player player){ + public String playerDetails(Player player) { return player.toString(); } @Override public String toString() { - return "Name: " + getName() + - "\n Position: " + getPosition() + - "\n Height: " + getHeight() + - "\n Weight: " + getWeight() + - "\n PPG: " + getPPG() + - "\n APG: " + getAPG() + - "\n RPG " + getRPG() + - "\n Class: " + getYear(); + return "Name: " + getName() + + "\n Models.PlayerEnums.Position: " + getPosition() + + "\n Height: " + getHeight() + + "\n Weight: " + getWeight() + + "\n PPG: " + getPPG() + + "\n APG: " + getAPG() + + "\n RPG " + getRPG() + + "\n Class: " + getYear(); + } + + public int getTeamId() { + return teamId; + } + + public void setTeamId(int teamId) { + this.teamId = teamId; + } + + public int getGames() { + return games; + } + + public void setGames(int games) { + this.games = games; } } diff --git a/src/main/java/Position.java b/src/main/java/Models/PlayerEnums/Position.java similarity index 59% rename from src/main/java/Position.java rename to src/main/java/Models/PlayerEnums/Position.java index 9413b7b..ae58d85 100644 --- a/src/main/java/Position.java +++ b/src/main/java/Models/PlayerEnums/Position.java @@ -1,8 +1,8 @@ +package Models.PlayerEnums; + public enum Position { - PG("Point Guard"), - SG("Shooting Guard"), - SF("Small Forward"), - PF("Power Forward"), + G("Guard"), + F("Forward"), C("Center"); private String position; diff --git a/src/main/java/Year.java b/src/main/java/Models/PlayerEnums/Year.java similarity index 86% rename from src/main/java/Year.java rename to src/main/java/Models/PlayerEnums/Year.java index ec08543..687b005 100644 --- a/src/main/java/Year.java +++ b/src/main/java/Models/PlayerEnums/Year.java @@ -1,3 +1,5 @@ +package Models.PlayerEnums; + public enum Year { FM("Freshman"), S("Sophomore"), diff --git a/src/main/java/Region.java b/src/main/java/Models/Region.java similarity index 93% rename from src/main/java/Region.java rename to src/main/java/Models/Region.java index 665cb26..c426ed6 100644 --- a/src/main/java/Region.java +++ b/src/main/java/Models/Region.java @@ -1,3 +1,5 @@ +package Models; + import java.util.ArrayList; import java.util.HashMap; @@ -16,6 +18,8 @@ public Region(String selectedRegion){ this.champ = new Team(); } + public Region(){} + public Bracket getRegionBracket(){ return this.regionBracket; } @@ -24,7 +28,7 @@ public void setRegionBracket(Bracket regionBracket) { this.regionBracket = regionBracket; } - public HashMap getSeedTeamMap() { + public HashMap getSeedTeamMap() { return seedTeamMap; } diff --git a/src/main/java/Roster.java b/src/main/java/Models/Roster.java similarity index 59% rename from src/main/java/Roster.java rename to src/main/java/Models/Roster.java index a742ca2..145a487 100644 --- a/src/main/java/Roster.java +++ b/src/main/java/Models/Roster.java @@ -1,15 +1,29 @@ -import com.oracle.webservices.internal.api.message.BasePropertySet; +package Models; + +import Models.PlayerEnums.Position; +import Services.PlayerService; import java.util.LinkedHashMap; -import java.util.LinkedList; +import java.util.List; import java.util.Map; public class Roster { - + private int teamId; LinkedHashMap roster = new LinkedHashMap<>(); - public Roster() { + public Roster(int teamId) { + this.teamId = teamId; + populateRoster(teamId); + } + + public Roster(){}; + public void populateRoster(int teamId){ + PlayerService ps = new PlayerService(); + List players = ps.getPlayersByTeamId(teamId); + for(Player player : players){ + roster.put(player, player.getPosition()); + } } public LinkedHashMap getRoster() { @@ -40,4 +54,12 @@ public String toString() { return result.toString(); } + + public int getTeamId() { + return teamId; + } + + public void setTeamId(int teamId) { + this.teamId = teamId; + } } diff --git a/src/main/java/Team.java b/src/main/java/Models/Team.java similarity index 98% rename from src/main/java/Team.java rename to src/main/java/Models/Team.java index c8c4cca..ea7be8f 100644 --- a/src/main/java/Team.java +++ b/src/main/java/Models/Team.java @@ -1,3 +1,5 @@ +package Models; + public class Team { private String teamName; private Roster teamRoster; diff --git a/src/main/java/Services/PlayerService.java b/src/main/java/Services/PlayerService.java new file mode 100644 index 0000000..148d918 --- /dev/null +++ b/src/main/java/Services/PlayerService.java @@ -0,0 +1,18 @@ +package Services; + +import Mappers.PlayerMapper; +import Models.Player; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.datasource.DriverManagerDataSource; + +import java.util.List; + +public class PlayerService { + + DriverManagerDataSource dataSource = new DriverManagerDataSource("jdbc:postgresql://ec2-18-210-51-239.compute-1.amazonaws.com:5432/ddmgjgkagckgto?user=qsbbjcdcnayhnp&password=e902ec9c2d2458dd577f2655c521499e28b90b01bda8728ac907ad9e7db2ea3f", "qsbbjcdcnayhnp", "e902ec9c2d2458dd577f2655c521499e28b90b01bda8728ac907ad9e7db2ea3f"); + JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); + + public List getPlayersByTeamId(int teamId){ + return jdbcTemplate.query("select * from player_stats_final where teamid = '" + teamId+ "' order by games desc;", new PlayerMapper()); + } +} diff --git a/src/main/java/Services/RegionService.java b/src/main/java/Services/RegionService.java new file mode 100644 index 0000000..73e9829 --- /dev/null +++ b/src/main/java/Services/RegionService.java @@ -0,0 +1,12 @@ +package Services; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.datasource.DriverManagerDataSource; + +public class RegionService { + + DriverManagerDataSource dataSource = new DriverManagerDataSource("jdbc:postgresql://ec2-18-210-51-239.compute-1.amazonaws.com:5432/ddmgjgkagckgto?user=qsbbjcdcnayhnp&password=e902ec9c2d2458dd577f2655c521499e28b90b01bda8728ac907ad9e7db2ea3f", "qsbbjcdcnayhnp", "e902ec9c2d2458dd577f2655c521499e28b90b01bda8728ac907ad9e7db2ea3f"); + JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); + + +} diff --git a/src/main/java/Services/RosterService.java b/src/main/java/Services/RosterService.java new file mode 100644 index 0000000..f480a12 --- /dev/null +++ b/src/main/java/Services/RosterService.java @@ -0,0 +1,10 @@ +package Services; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.datasource.DriverManagerDataSource; + +public class RosterService { + + DriverManagerDataSource dataSource = new DriverManagerDataSource("jdbc:postgresql://ec2-18-210-51-239.compute-1.amazonaws.com:5432/ddmgjgkagckgto?user=qsbbjcdcnayhnp&password=e902ec9c2d2458dd577f2655c521499e28b90b01bda8728ac907ad9e7db2ea3f", "qsbbjcdcnayhnp", "e902ec9c2d2458dd577f2655c521499e28b90b01bda8728ac907ad9e7db2ea3f"); + JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); +} diff --git a/src/main/java/Services/TeamService.java b/src/main/java/Services/TeamService.java new file mode 100644 index 0000000..fac3040 --- /dev/null +++ b/src/main/java/Services/TeamService.java @@ -0,0 +1,10 @@ +package Services; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.datasource.DriverManagerDataSource; + +public class TeamService { + + DriverManagerDataSource dataSource = new DriverManagerDataSource("jdbc:postgresql://ec2-18-210-51-239.compute-1.amazonaws.com:5432/ddmgjgkagckgto?user=qsbbjcdcnayhnp&password=e902ec9c2d2458dd577f2655c521499e28b90b01bda8728ac907ad9e7db2ea3f", "qsbbjcdcnayhnp", "e902ec9c2d2458dd577f2655c521499e28b90b01bda8728ac907ad9e7db2ea3f"); + JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); +} diff --git a/src/test/java/JDBCTest.java b/src/test/java/JDBCTest.java index 2b6bf72..04e2b61 100644 --- a/src/test/java/JDBCTest.java +++ b/src/test/java/JDBCTest.java @@ -1,8 +1,5 @@ -import com.sun.xml.internal.bind.v2.runtime.output.FastInfosetStreamWriterOutput; import org.junit.Test; -import static org.junit.Assert.*; - public class JDBCTest { JDBC jdbc = new JDBC(); diff --git a/src/test/java/RegionTest.java b/src/test/java/RegionTest.java index 0a973cb..f5ea0c3 100644 --- a/src/test/java/RegionTest.java +++ b/src/test/java/RegionTest.java @@ -1,10 +1,11 @@ +import Models.Bracket; +import Models.Region; +import Models.Team; import org.junit.Assert; import org.junit.Test; import java.util.HashMap; -import static org.junit.Assert.*; - public class RegionTest { Region testRegion = new Region("East"); Bracket testBracket = new Bracket(); diff --git a/src/test/java/TeamTest.java b/src/test/java/TeamTest.java index 8afdb43..427c16a 100644 --- a/src/test/java/TeamTest.java +++ b/src/test/java/TeamTest.java @@ -1,8 +1,8 @@ +import Models.Roster; +import Models.Team; import org.junit.Assert; import org.junit.Test; -import static org.junit.Assert.*; - public class TeamTest { Roster testRoster = new Roster(); Team testTeam = new Team(); diff --git a/src/test/java/TestPlayer.java b/src/test/java/TestPlayer.java index 94619a0..402c5e4 100644 --- a/src/test/java/TestPlayer.java +++ b/src/test/java/TestPlayer.java @@ -1,3 +1,6 @@ +import Models.Player; +import Models.PlayerEnums.Position; +import Models.PlayerEnums.Year; import org.junit.Assert; import org.junit.Test; @@ -7,10 +10,10 @@ public class TestPlayer { private static final Logger LOGGER = Logger.getLogger(TestPlayer.class.getName()); @Test public void playerDetailsTest(){ - Player player = new Player("Raheel Uppal",Position.PG,6.3,230.5,32.6,8.6,9.2,Year.FM); + Player player = new Player("Raheel Uppal",Position.PG,6.3,230.5,32.6,8.6,9.2, Year.FM); String expected = player.playerDetails(player); String actual ="Name: Raheel Uppal\n" + - " Position: PG\n" + + " Models.PlayerEnums.Position: PG\n" + " Height: 6.3\n" + " Weight: 230.5\n" + " PPG: 32.6\n" + diff --git a/src/test/java/TestRoster.java b/src/test/java/TestRoster.java index e4f80e6..aa89766 100644 --- a/src/test/java/TestRoster.java +++ b/src/test/java/TestRoster.java @@ -1,7 +1,9 @@ +import Models.Player; +import Models.PlayerEnums.Position; +import Models.Roster; import org.junit.Assert; import org.junit.Test; -import java.util.Random; import java.util.logging.Logger; public class TestRoster { From 51dd73f8ae0c90dbf6307def40fe1f6ed9831cb9 Mon Sep 17 00:00:00 2001 From: ruppal Date: Wed, 1 Apr 2020 13:56:53 -0400 Subject: [PATCH 46/48] pull --- JustCode.iml | 2 +- target/classes/regionSeeds/East.txt | 16 ++++++++++++++++ target/classes/regionSeeds/MidWest.txt | 0 target/classes/regionSeeds/South.txt | 0 target/classes/regionSeeds/West.txt | 0 5 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 target/classes/regionSeeds/East.txt create mode 100644 target/classes/regionSeeds/MidWest.txt create mode 100644 target/classes/regionSeeds/South.txt create mode 100644 target/classes/regionSeeds/West.txt diff --git a/JustCode.iml b/JustCode.iml index d28f922..b61f562 100644 --- a/JustCode.iml +++ b/JustCode.iml @@ -1,6 +1,6 @@ - + diff --git a/target/classes/regionSeeds/East.txt b/target/classes/regionSeeds/East.txt new file mode 100644 index 0000000..f6ea442 --- /dev/null +++ b/target/classes/regionSeeds/East.txt @@ -0,0 +1,16 @@ +1 Duke +2 Michigan State +3 LSU +4 Virginia Tech +5 Mississippi State +6 Maryland +7 Louisville +8 VCU +9 UCF +10 Minnesota +11 Belmont +12 Liberty +13 Saint Louis +14 Yale +15 Bradley Missouri Valley +16 North Dakota State diff --git a/target/classes/regionSeeds/MidWest.txt b/target/classes/regionSeeds/MidWest.txt new file mode 100644 index 0000000..e69de29 diff --git a/target/classes/regionSeeds/South.txt b/target/classes/regionSeeds/South.txt new file mode 100644 index 0000000..e69de29 diff --git a/target/classes/regionSeeds/West.txt b/target/classes/regionSeeds/West.txt new file mode 100644 index 0000000..e69de29 From 61988570f19c9b49a82f935022b1da1b07234096 Mon Sep 17 00:00:00 2001 From: ruppal Date: Thu, 2 Apr 2020 09:49:07 -0400 Subject: [PATCH 47/48] pull --- .idea/compiler.xml | 2 +- .idea/misc.xml | 9 +-- JustCode.iml | 87 ++++++++++++++++++++++++++ target/classes/regionSeeds/East.txt | 16 ----- target/classes/regionSeeds/MidWest.txt | 0 target/classes/regionSeeds/South.txt | 0 target/classes/regionSeeds/West.txt | 0 7 files changed, 90 insertions(+), 24 deletions(-) delete mode 100644 target/classes/regionSeeds/East.txt delete mode 100644 target/classes/regionSeeds/MidWest.txt delete mode 100644 target/classes/regionSeeds/South.txt delete mode 100644 target/classes/regionSeeds/West.txt diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 8f7cd6f..ca5d3ee 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -10,7 +10,7 @@ - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 6254b71..ca692b9 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,20 +3,15 @@ -<<<<<<< HEAD -======= ->>>>>>> a0f3f4931f5be5605ae2b0c5af033681b2c20538 - + +\ -<<<<<<< HEAD -======= ->>>>>>> a0f3f4931f5be5605ae2b0c5af033681b2c20538 \ No newline at end of file diff --git a/JustCode.iml b/JustCode.iml index 2d06b19..4da9fcc 100644 --- a/JustCode.iml +++ b/JustCode.iml @@ -1,5 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -72,6 +94,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/target/classes/regionSeeds/East.txt b/target/classes/regionSeeds/East.txt deleted file mode 100644 index f6ea442..0000000 --- a/target/classes/regionSeeds/East.txt +++ /dev/null @@ -1,16 +0,0 @@ -1 Duke -2 Michigan State -3 LSU -4 Virginia Tech -5 Mississippi State -6 Maryland -7 Louisville -8 VCU -9 UCF -10 Minnesota -11 Belmont -12 Liberty -13 Saint Louis -14 Yale -15 Bradley Missouri Valley -16 North Dakota State diff --git a/target/classes/regionSeeds/MidWest.txt b/target/classes/regionSeeds/MidWest.txt deleted file mode 100644 index e69de29..0000000 diff --git a/target/classes/regionSeeds/South.txt b/target/classes/regionSeeds/South.txt deleted file mode 100644 index e69de29..0000000 diff --git a/target/classes/regionSeeds/West.txt b/target/classes/regionSeeds/West.txt deleted file mode 100644 index e69de29..0000000 From 8a26409f43cd509e889df0f35df52c7052984481 Mon Sep 17 00:00:00 2001 From: ruppal Date: Wed, 13 May 2020 10:28:26 -0400 Subject: [PATCH 48/48] tests --- JustCode.iml | 4 +++- src/main/java/Models/Region.java | 2 ++ src/test/java/TestPlayer.java | 8 ++++---- src/test/java/TestRoster.java | 12 ++++++------ target/classes/regionSeeds/East.txt | 16 ++++++++++++++++ target/classes/regionSeeds/MidWest.txt | 0 target/classes/regionSeeds/South.txt | 0 target/classes/regionSeeds/West.txt | 0 8 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 target/classes/regionSeeds/East.txt create mode 100644 target/classes/regionSeeds/MidWest.txt create mode 100644 target/classes/regionSeeds/South.txt create mode 100644 target/classes/regionSeeds/West.txt diff --git a/JustCode.iml b/JustCode.iml index 4da9fcc..a25a774 100644 --- a/JustCode.iml +++ b/JustCode.iml @@ -5,7 +5,9 @@ - + + + diff --git a/src/main/java/Models/Region.java b/src/main/java/Models/Region.java index c426ed6..28a2037 100644 --- a/src/main/java/Models/Region.java +++ b/src/main/java/Models/Region.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.HashMap; +import static org.springframework.boot.autoconfigure.session.StoreType.JDBC; + public class Region{ private Bracket regionBracket; diff --git a/src/test/java/TestPlayer.java b/src/test/java/TestPlayer.java index 402c5e4..b688db2 100644 --- a/src/test/java/TestPlayer.java +++ b/src/test/java/TestPlayer.java @@ -10,10 +10,10 @@ public class TestPlayer { private static final Logger LOGGER = Logger.getLogger(TestPlayer.class.getName()); @Test public void playerDetailsTest(){ - Player player = new Player("Raheel Uppal",Position.PG,6.3,230.5,32.6,8.6,9.2, Year.FM); + Player player = new Player("Raheel Uppal",Position.G,6.3,230.5,32.6,8.6,9.2, Year.FM); String expected = player.playerDetails(player); String actual ="Name: Raheel Uppal\n" + - " Models.PlayerEnums.Position: PG\n" + + " Models.PlayerEnums.Position: G\n" + " Height: 6.3\n" + " Weight: 230.5\n" + " PPG: 32.6\n" + @@ -30,7 +30,7 @@ public void getSetterTest(){ player.setName("Raheel Uppal"); player.setAPG(8.9); player.setHeight(6.3); - player.setPosition(Position.PG); + player.setPosition(Position.G); player.setWeight(230.5); player.setPPG(33.6); player.setRPG(12.2); @@ -61,7 +61,7 @@ public void getSetterTest(){ Assert.assertEquals(weightE,weightA); Position expected = player.getPosition(); - Position actual = Position.PG; + Position actual = Position.G; Assert.assertEquals(expected,actual); } } diff --git a/src/test/java/TestRoster.java b/src/test/java/TestRoster.java index aa89766..16d762d 100644 --- a/src/test/java/TestRoster.java +++ b/src/test/java/TestRoster.java @@ -12,11 +12,11 @@ public class TestRoster { @Test public void sizeTest(){ Player player1 = new Player("Raheel Uppal"); - Position pg = Position.PG; + Position pg = Position.G; Player player2 = new Player("David Kelly"); - Position sg = Position.SG; + Position sg = Position.G; Player player3 = new Player("Sandeep Manglam"); - Position c = Position.SF; + Position c = Position.F; Roster roster = new Roster(); roster.setRoster(roster.getRoster()); roster.addToRoster(player1,pg); @@ -33,11 +33,11 @@ public void sizeTest(){ @Test public void listRosterTest(){ Player player1 = new Player("Raheel Uppal"); - Position pg = Position.PG; + Position pg = Position.G; Player player2 = new Player("David Kelly"); - Position sg = Position.SG; + Position sg = Position.G; Player player3 = new Player("Sandeep Manglam"); - Position sf = Position.SF; + Position sf = Position.F; Player player4 = new Player("Mat Ascone"); Position c = Position.C; diff --git a/target/classes/regionSeeds/East.txt b/target/classes/regionSeeds/East.txt new file mode 100644 index 0000000..f6ea442 --- /dev/null +++ b/target/classes/regionSeeds/East.txt @@ -0,0 +1,16 @@ +1 Duke +2 Michigan State +3 LSU +4 Virginia Tech +5 Mississippi State +6 Maryland +7 Louisville +8 VCU +9 UCF +10 Minnesota +11 Belmont +12 Liberty +13 Saint Louis +14 Yale +15 Bradley Missouri Valley +16 North Dakota State diff --git a/target/classes/regionSeeds/MidWest.txt b/target/classes/regionSeeds/MidWest.txt new file mode 100644 index 0000000..e69de29 diff --git a/target/classes/regionSeeds/South.txt b/target/classes/regionSeeds/South.txt new file mode 100644 index 0000000..e69de29 diff --git a/target/classes/regionSeeds/West.txt b/target/classes/regionSeeds/West.txt new file mode 100644 index 0000000..e69de29