1 files changed, 19 insertions, 8 deletions

diff --git a/Album.java b/Album.java
index e8766a3..34fae7a 100644
--- a/Album.java
+++ b/Album.java
@@ -1,15 +1,17 @@
-import java.util.ArrayList;
+import java.util.*;
+import java.io.Serializable;
 
-public class Album {
+public class Album implements Serializable {
 
-	private int id, duration, date;
+	private int id, duration;
+	private Date date;
 	private String title, artist;
-	private ArrayList<String> songs = new ArrayList<String>();
+	private ArrayList<Song> songs = new ArrayList<Song>();
 
-	public Album(int id, String title, int duration, String artist, int date, ArrayList<String> songs) {
+	public Album(int id, String title, int duration, String artist, Date date, ArrayList<Song> songs) {
 		this.id=id;
 		this.title=title;
-		this.duration=duration;
+		this.duration=this.getDuration();
 		this.artist=artist;
 		this.date=date;
 		this.songs=songs;
@@ -17,12 +19,21 @@ public class Album {
 
 	public int getId(){return id;}
 	public String getTitle(){return title;}
+
 	public int getDuration(){
-		//Addition of the duration of the songs inside the album
+		for (Song s : songs) {duration+=s.getDuration();} //increase with each song's getDuration()
 		return duration;
-
 	}
 
+	public String getArtist(){return artist;}
+	public Date getDate(){return date;}
+	public ArrayList<Song> getSongs(){return songs;}
+
+
+	public void setId(){this.id=id;}
+	public void setTitle(){this.title=title;}
+	public void setArtist(){this.artist=artist;}
+	public void setDate(){this.date=date;}
 
 
 }