updating to include CI/CD pipeline

.gitignore

@@ -10,6 +10,8 @@
 ### Gradle ###
 .gradle
 /build/
+.gradle/
+.metadata
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
@@ -30,4 +32,4 @@ hs_err_pid*
 .project
 .settings/
 .classpath
-/bin/
+/bin/

README.md

@@ -1,11 +1,11 @@
 # HockeyApp
 An Educational Test-Driven exercise in Object-Oriented design using Java Swing. 
 
-This project gives you the task of managing a Hockey team using Java Swing, but it is really designed to practice 
-object-oriented design patterns with each added feature. The associated project also is organized to help facilitate 
-a Test-Driven Development approach.
+This project gives you the opportunity to predict the result of a Hockey game using Java Swing, but it is really
+designed to practice object-oriented design patterns with each added feature. The associated project also is organized
+to help facilitate a Test-Driven Development approach.
 
-Clone it, build it, run it, and click through some of the options available as a Team Owner. 
+Clone it, build it, run it, and run a few games. 
 Then, when you understand **what** the app does, explore **how** the code is structured, and imagine new features you 
 would like to add using classic and modern design patterns. 
 
@@ -23,18 +23,18 @@ Using your SSH key, enter the command `git clone [email protected]:Bryan-Culver/hoc
 If you're using HTTPS still, the command is `git clone https://github.com/Bryan-Culver/hockeyApp.git` in your terminal.
 
 ## Build It
+
 Currently, this project is a simple Java Swing project. Use your IDE to compile the program with at least JavaSE-17. 
 No other versions of Java have been tested at this time. As it is compiled, an executable is generated which will run
-the app. 
+the app.
 
 ## Run It
-When you run the app, you will see one Window that will display some basic amount of information about the team. 
+When you run the app, you will see one Window that will display inputs for the home team and away team. 
 
 As this project grows, more screens and "Views" will be required and will eventually be available. 
 
 ## Contributing
-There will be a "Contributing.md" file provided within this repository as soon as this project is ready to take on 
-contributions. 
+Please reference the "Contributing.md" doc provided in this repository. 
 
 You'll notice the **.gitignore** file has several file types that are specific to IDEs. Any additional files that your 
-editor will creat for metadata should be added to the **.gitignore** file.
+editor will create for metadata should be added to the **.gitignore** file.

build.gradle

@@ -1,2 +1,10 @@
-apply plugin: 'java'
-apply plugin: 'eclipse'
+plugins{
+	id 'java'
+	id 'eclipse'
+	id 'jacoco'
+}
+
+test {
+	useJUnitPlatform()
+	finalizedBy jacocoTestReport 
+}

src/main/Main.java → src/main/java/launch/Main.java

@@ -1,9 +1,10 @@
 /**
  * This is the Main view for the Team building Interface window. 
  */
-package main;
+package main.java.launch;
 
-import view.TeamBuildingView;
+//import main.java.view.TeamBuildingView;
+import main.java.view.GameScreenView;
 
 /**
  * 
@@ -21,8 +22,8 @@ public static void main(String[] args) {
 	}
 
 	public static void run() {
-		TeamBuildingView view = new TeamBuildingView("The Fun Hockey App");
-		view.setVisible(true);
+		@SuppressWarnings("unused")
+		GameScreenView view = new GameScreenView("The Fun Hockey App");
 	}
 
 }

src/main/java/model/Game.java

@@ -0,0 +1,70 @@
+/**
+ * 
+ */
+package main.java.model;
+
+import java.util.concurrent.ThreadLocalRandom;
+
+/**The Game class creates and runs a Hockey game, generating all stats that come from it. 
+ * @author "Bryan Culver"
+ *
+ */
+public class Game {
+	private Team homeTeam;
+	private Team awayTeam;
+	private int scoreAway = 0;
+	private int scoreHome = 0;
+	//private boolean overtime;
+	private final int RANDOM_MAX = 100;
+	private final int RANDOM_MIN = 0;
+
+	/**Game will take two teams, play a game between them, and generate stats from the game.
+	 * Stats are available through getters. 
+	 * 
+	 * @param homeTeam
+	 * @param awayTeam
+	 */
+	public Game(Team awayTeam, Team homeTeam) {
+		this.awayTeam = awayTeam;
+		this.homeTeam = homeTeam;
+		play();
+	}
+
+	/**This getter provides a string of the team's location and name. 
+	 * 
+	 * @return String
+	 */
+	public String getHomeTeam() {
+		return homeTeam.toString();
+	}
+
+	public String getAwayTeam() {
+		return awayTeam.toString();
+	}
+
+	public int getScoreAway() {
+		return scoreAway;
+	}
+
+	public int getScoreHome() {
+		return scoreHome;
+	}
+
+	private void play() {
+		for (int period=1;period<=3;period++) {
+			int randomNum = ThreadLocalRandom.current().nextInt(RANDOM_MIN, RANDOM_MAX +1);
+			if(randomNum>60) {
+				scoreAway++;
+			}else {
+				scoreHome++;
+			}
+		}
+	}
+
+	/*public String toString() {
+		String result = "";
+		result = awayTeam.getLocation()+" "+awayTeam.getName()+" at "+homeTeam.getLocation()+" "+homeTeam.getName()+": "+scoreAway+" - "+scoreHome;
+		return result;
+	}*/
+
+}

src/main/java/model/Team.java

@@ -0,0 +1,35 @@
+/**
+ * 
+ */
+package main.java.model;
+
+/**
+ * @author "Bryan Culver"
+ *
+ */
+public class Team {
+	String location = "";
+	String name = "";
+
+	/**
+	 * This class takes two strings and creates a simple team class. 
+	 * @param location String
+	 * @param name String
+	 */
+	public Team(String location, String name) {
+		this.location = location;
+		this.name = name;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public String getLocation() {
+		return location;
+	}
+
+	public String toString() {
+		return location + " " + name;
+	}
+}

src/util/GridBagConstraintsObject.java → src/main/java/util/GridBagConstraintsObject.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package util;
+package main.java.util;
 
 import java.awt.GridBagConstraints;
 import java.awt.Insets;

src/main/java/view/CreateTeamView.java

@@ -0,0 +1,87 @@
+package main.java.view;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+
+import main.java.util.GridBagConstraintsObject;
+
+import javax.swing.JTextArea;
+import javax.swing.JPanel;
+import javax.swing.JLabel;
+
+public class CreateTeamView{
+	/**
+	 * 
+	 */
+	private JFrame createTeamFrame = new JFrame("Create a New Team");
+	private JPanel panel;
+
+	public CreateTeamView(String title) {
+		createTeamFrame.setTitle(title);
+
+		GridBagLayout gbl = new GridBagLayout();
+		panel = new JPanel(gbl);
+
+		JLabel teamNameLabel = new JLabel("Team Name");
+		JButton saveButton = new JButton("Save");
+		JButton cancelButton = new JButton("Cancel");
+		//int cupWins = 0; // TODO implement a get method for this. 
+		//int standingLastYear = 12; // TODO implement a get method for this. 
+
+		// Implemented a HockeyViewTextArea class to avoid repeating changes to the JTextAreas. 
+		//HockeyViewTextArea cupWinsTA = new HockeyViewTextArea(Integer.toString(cupWins),createTeamFrame.getBackground());
+		//HockeyViewTextArea standingTA = new HockeyViewTextArea(Integer.toString(standingLastYear), createTeamFrame.getBackground());
+		//HockeyViewTextArea userNameTA = new HockeyViewTextArea("username", createTeamFrame.getBackground());
+		JTextArea locationTA = new JTextArea("City/State");
+		JTextArea teamNameTA = new JTextArea("Team Name");
+
+		GridBagConstraintsObject gbco = new GridBagConstraintsObject(); 
+		gbco.insets(15).anchor(GridBagConstraints.LINE_START).fill(GridBagConstraints.VERTICAL).ipadx(2).ipady(2);
+
+		//panel.add(new JLabel("Owner's Name"),gbco.gridx(0).gridy(0));
+		panel.add(new JLabel("Team's Location"), gbco.gridy(1).gridx(0));
+		panel.add(teamNameLabel, gbco.gridy(2).gridx(0));
+		//panel.add(new JLabel("Stanley Cup Wins"), gbco.gridy(3).gridx(0));
+		//panel.add(new JLabel("Last Year's standing"), gbco.gridy(4).gridx(0));
+
+		//panel.add(userNameTA,gbco.gridx(1).gridy(0).fill(GridBagConstraints.HORIZONTAL).weightx(0.6));
+		panel.add(locationTA, gbco.gridx(1).gridy(1));
+		panel.add(teamNameTA, gbco.gridx(1).gridy(2));
+		//panel.add(cupWinsTA, gbco.gridx(1).gridy(3));
+		//panel.add(standingTA, gbco.gridx(1).gridy(4).fill(GridBagConstraints.HORIZONTAL));
+
+		panel.add(cancelButton, gbco.gridx(0).gridy(5).anchor(GridBagConstraints.LAST_LINE_START).fill(0));
+		panel.add(saveButton, gbco.gridy(5).gridx(4).anchor(GridBagConstraints.LAST_LINE_END).weightx(0));
+
+		saveButton.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				//Check data submitted
+				//Save team information submitted
+				@SuppressWarnings("unused")
+				GameScreenView welcomeView = new GameScreenView("Hockey App");
+				createTeamFrame.dispose();
+			}
+		});
+
+		cancelButton.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				@SuppressWarnings("unused")
+				GameScreenView welcomeView = new GameScreenView("Hockey App");
+				createTeamFrame.dispose();
+			}
+		});
+
+		createTeamFrame.getContentPane().add(panel);
+		createTeamFrame.setLocationRelativeTo(null);
+		createTeamFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+		createTeamFrame.pack();
+		createTeamFrame.setVisible(true);
+	}
+}