From dc4a87a4b3d10eb344b8e2edd51e4254aba3884d Mon Sep 17 00:00:00 2001
From: Kenneth van Ewijk <kennyboy@live.nl>
Date: Tue, 24 Feb 2015 16:58:44 +0100
Subject: [PATCH] Update and rename Event to Event.java

---
 Event => Event.java | 60 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 14 deletions(-)
 rename Event => Event.java (57%)

diff --git a/Event b/Event.java
similarity index 57%
rename from Event
rename to Event.java
index a34ecd2..a869a27 100644
--- a/Event
+++ b/Event.java
@@ -1,31 +1,51 @@
 import java.io.Serializable;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Date;
 import java.util.GregorianCalendar;
 
 public class Event implements Serializable {
 
 	private static final long serialVersionUID = 1;
 
+	private String eventName;
 	private GregorianCalendar startDate;
 	private GregorianCalendar endDate;
 	private Artist artist;
+	private Stage stage;
 	private String description;
 	private int expectedPopularity;
-	private int ID;
 
-	public Event(int startYear, int startMonth, int startDay, int startHour,
-			int startMinute, int endYear, int endMonth, int endDay,
-			int endHour, int endMinute, Artist artist, String description,
-			int expectedPopularity, int ID) {
-		startDate = new GregorianCalendar(startYear, startMonth - 1, startDay,
-				startHour, startMinute);
-		endDate = new GregorianCalendar(endYear, endMonth - 1, endDay, endHour,
-				endMinute);
+	public Event(String eventName, int startYear, int startMonth, int startDay,
+			int startHour, int startMinute, int endYear, int endMonth,
+			int endDay, int endHour, int endMinute, Artist artist, Stage stage,
+			String description, int expectedPopularity) {
+		this.eventName = eventName;
+		this.startDate = new GregorianCalendar(startYear, startMonth - 1,
+				startDay, startHour, startMinute);
+		this.endDate = new GregorianCalendar(endYear, endMonth - 1, endDay,
+				endHour, endMinute);
+		this.stage = stage;
 		this.artist = artist;
 		this.description = description;
 		this.expectedPopularity = expectedPopularity;
-		this.ID = ID;
+	}
+
+	public Event(String eventName, GregorianCalendar startDate,
+			GregorianCalendar endDate, Artist artist, Stage stage,
+			String description, int expectedPopularity) {
+		this.eventName = eventName;
+		this.startDate = startDate;
+		this.endDate = endDate;
+		this.artist = artist;
+		this.stage = stage;
+		this.description = description;
+		this.expectedPopularity = expectedPopularity;
+	}
+
+	public String getEventName() {
+		return this.eventName;
 	}
 
 	public GregorianCalendar getStartDate() {
@@ -44,25 +64,37 @@ public class Event implements Serializable {
 		return this.description;
 	}
 
-	public int getID() {
-		return this.ID;
+	public Stage getStage() {
+		return this.stage;
 	}
 
 	public int getExpectedPopularity() {
 		return this.expectedPopularity;
 	}
 
+	public void setEventName(String name) {
+		this.eventName = name;
+	}
+
 	public void setStartDate(int startYear, int startMonth, int startDay,
 			int startHour, int startMinute) {
 		startDate.set(startYear, startMonth - 1, startDay, startHour,
 				startMinute);
 	}
 
+	public void setStartDate(GregorianCalendar startDate) {
+		this.startDate = startDate;
+	}
+
 	public void setEndDate(int endYear, int endMonth, int endDay, int endHour,
 			int endMinute) {
 		endDate.set(endYear, endMonth - 1, endDay, endHour, endMinute);
 	}
 
+	public void setEndDate(GregorianCalendar endDate) {
+		this.endDate = endDate;
+	}
+
 	public void setArtist(Artist artist) {
 		this.artist.setName(artist.getName());
 		this.artist.setGenre(artist.getGenre());
@@ -78,8 +110,8 @@ public class Event implements Serializable {
 		this.expectedPopularity = popularity;
 	}
 
-	public void setID(int ID) {
-		this.ID = ID;
+	public void setStage(Stage stage) {
+		this.stage = stage;
 	}
 
 	public String toString() {