From 604fc9491a894c157538a5489ad2089e07f59d01 Mon Sep 17 00:00:00 2001 From: Yorick Date: Thu, 26 Feb 2015 11:05:29 +0000 Subject: [PATCH] Woo --- Artist.java | 67 +++++--------------------- Event.java | 135 +++++++++------------------------------------------- test2.png | Bin 0 -> 155 bytes 3 files changed, 35 insertions(+), 167 deletions(-) create mode 100644 test2.png diff --git a/Artist.java b/Artist.java index 3e1a4c2..4742dd3 100644 --- a/Artist.java +++ b/Artist.java @@ -1,70 +1,27 @@ -import java.io.Serializable; - import javax.swing.ImageIcon; -public class Artist implements Serializable{ - - private static final long serialVersionUID = 1; - - private String name; +public class Artist +{ private String genre; - private ImageIcon image; + private String name; private String description; + private ImageIcon image; + private int id; - public Artist(String name, String genre, String image, String description) + public Artist(String genre, String name, String description, ImageIcon image, int id) { - this.name = name; this.genre = genre; + this.name = name; this.description = description; - - if ( !image.equals("null")) { - this.image = new ImageIcon(image); - } - } - - public String getName() - { - return this.name; - } - - public String getGenre() - { - return this.genre; - } - - public ImageIcon getImage() - { - return this.image; - } - - public String getDescription() - { - return this.description; - } - - public void setName(String name) - { - this.name = name; - } - - public void setGenre(String genre) - { - this.genre = genre; - } - - public void setImageIconString(String image) - { - this.image = new ImageIcon(image); - } - - public void setImageIcon(ImageIcon image) - { this.image = image; + this.id = id; } - public void setDescription(String description) + public int getID() { - this.description = description; + return id; } + + } diff --git a/Event.java b/Event.java index 6e1bb04..661ca05 100644 --- a/Event.java +++ b/Event.java @@ -1,123 +1,34 @@ -import java.io.Serializable; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.GregorianCalendar; -public class Event implements Serializable { - - private static final long serialVersionUID = 1; - - private String eventName; - private GregorianCalendar startDate; - private GregorianCalendar endDate; +public class Event +{ + private int startTime; + private int endTime; private Artist artist; - private Stage stage; private String description; - private int expectedPopularity; - - 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; + private int id; + + public Event(int startTime, int endTime, Artist artist, String description, int id) + { + this.startTime = startTime; + this.endTime = endTime; 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 Artist getArtist() + { + return artist; } - - public String getEventName() { - return this.eventName; + + public int getStartTime() + { + return startTime; } - - public GregorianCalendar getStartDate() { - return this.startDate; - } - - public GregorianCalendar getEndDate() { - return this.endDate; - } - - public Artist getArtist() { - return this.artist; - } - - public String getDescription() { - return this.description; - } - - 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()); - this.artist.setImageIcon(artist.getImage()); - this.artist.setDescription(artist.getDescription()); - } - - public void setDescription(String description) { - this.description = description; - } - - public void setExpectedPopularity(int popularity) { - this.expectedPopularity = popularity; - } - - public void setStage(Stage stage) { - this.stage = stage; - } - - public String toString() { - DateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - format.setLenient(false); - - return artist.getName() + " plays from " - + format.format(startDate.getTime()) + " to " - + format.format(endDate.getTime()) + "."; + + public int getID() + { + return id + 10; } + } diff --git a/test2.png b/test2.png new file mode 100644 index 0000000000000000000000000000000000000000..e44d50c3a147ee64e5adc7f63952bc5bcc4d7ba2 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4v7|ftIx;Y9?C1WI$O`0h7I;J! zGcfQS1YyP<6SLm}1tm&cBT9nv(@M${i&7a15;OBk^zu?m6ioCC^h{G*jZ%SXBt2am vLo|YuCC)i;b^K@kXl%gGFHyrKDZ%jd3g;iMk9}u>iWody{an^LB{Ts5