Woo

there is a sprites folder, add it to the root of the project

Agenda

@@ -1,188 +0,0 @@
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.util.ArrayList;
-
-public class Agenda implements Serializable {
-
-	private static final long serialVersionUID = 1;
-
-	private ArrayList<Stage> stages;
-	private ArrayList<Event> events;
-	private ArrayList<Artist> artists;
-
-	public Agenda() {
-		stages = new ArrayList<Stage>();
-		events = new ArrayList<Event>();
-		artists = new ArrayList<Artist>();
-	}
-
-	public void addStage(Stage stage) {
-		stages.add(stage);
-	}
-
-	public void addEvent(Event event) {
-		events.add(event);
-	}
-
-	public void addArtist(Artist artist) {
-		artists.add(artist);
-	}
-
-	public void fillArtists() {
-		FileInputStream fis = null;
-		ObjectInputStream ois = null;
-
-		try {
-			fis = new FileInputStream("artists.dat");
-			ois = new ObjectInputStream(fis);
-
-			Object object;
-			object = ois.readObject();
-			try {
-				while (object != null) {
-					artists.add((Artist) object);
-					object = ois.readObject();
-				}
-			} catch (EOFException e) {
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void fillEvents() {
-		FileInputStream fis = null;
-		ObjectInputStream ois = null;
-
-		try {
-			fis = new FileInputStream("events.dat");
-			ois = new ObjectInputStream(fis);
-
-			Object object;
-			object = ois.readObject();
-			try {
-				while (object != null) {
-					events.add((Event) object);
-					object = ois.readObject();
-				}
-			} catch (EOFException e) {
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	public void fillStages() {
-		FileInputStream fis = null;
-		ObjectInputStream ois = null;
-
-		try {
-			fis = new FileInputStream("stages.dat");
-			ois = new ObjectInputStream(fis);
-
-			Object object;
-			object = ois.readObject();
-			try {
-				while (object != null) {
-					stages.add((Stage) object);
-					object = ois.readObject();
-				}
-			} catch (EOFException e) {
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void saveStages() {
-
-		try {
-			File file = new File("stages.dat");
-			if (!file.exists()){
-				file.createNewFile();
-			} 		
-			FileOutputStream fos = new FileOutputStream(file);
-			ObjectOutputStream oos = new ObjectOutputStream(fos);
-			for (Stage stage : stages) {
-				oos.writeObject(stage);
-			}
-			oos.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public void saveEvents() {
-
-		try {
-			File file = new File("events.dat");
-			if (!file.exists()){
-				file.createNewFile();
-			} 
-			FileOutputStream fos = new FileOutputStream(file);
-			ObjectOutputStream oos = new ObjectOutputStream(fos);
-			for (Event event : events) {
-				oos.writeObject(event);
-			}
-			oos.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public void saveArtists() {
-		
-		try {
-			File file = new File("artists.dat");
-			if (!file.exists()){
-				file.createNewFile();
-			} 
-			FileOutputStream fos = new FileOutputStream(file);
-			ObjectOutputStream oos = new ObjectOutputStream(fos);
-			for (Artist artist : artists) {
-				oos.writeObject(artist);
-			}
-			oos.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public void addEvents()
-	{
-		int ID = 0;
-		for (Stage stage : stages)
-		{
-			ID = stage.getID();
-			for (Event event : events)
-			{
-				if ( ID == event.getID())
-				{
-					stage.addEvent(event);
-				}
-			}
-		}
-	}
-		
-	public void saveAll()
-	{
-		saveArtists();
-		saveEvents();
-		saveStages();
-	}
-	
-	public void fillAll()
-	{
-		fillArtists();
-		fillEvents();
-		fillStages();
-		addEvents();
-	}
-}

Artist

@@ -1,72 +0,0 @@
-import java.io.Serializable;
-
-import javax.swing.ImageIcon;
-
-
-public class Artist implements Serializable{
-
-	private static final long serialVersionUID = 1;
-	
-	private String name;
-	private String genre;
-	private ImageIcon image;
-	private String description;
-	
-	public Artist(String name, String genre, String image, String description)
-	{
-		this.name = name;
-		this.genre = genre;
-		this.description = description;
-		
-		if ( !image.equals("null")) {
-			this.image = new ImageIcon(image);
-		} else {
-			this.image = null;
-		}
-	}
-	
-	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;
-	}
-	
-	public void setDescription(String description)
-	{
-		this.description = description;
-	}
-}

Artist.java

@@ -0,0 +1,27 @@
+import javax.swing.ImageIcon;
+
+
+public class Artist 
+{
+	private String genre;
+	private String name;
+	private String description;
+	private ImageIcon image;
+	private int id;
+	
+	public Artist(String genre, String name, String description, ImageIcon image, int id)
+	{
+		this.genre = genre;
+		this.name = name;
+		this.description = description;
+		this.image = image;
+		this.id = id;
+	}
+	
+	public int getID()
+	{
+		return id;
+	}
+	
+	
+}

Event

@@ -1,93 +0,0 @@
-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 GregorianCalendar startDate;
-	private GregorianCalendar endDate;
-	private Artist artist;
-	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);
-		this.artist = artist;
-		this.description = description;
-		this.expectedPopularity = expectedPopularity;
-		this.ID = ID;
-	}
-
-	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 int getID() {
-		return this.ID;
-	}
-
-	public int getExpectedPopularity() {
-		return this.expectedPopularity;
-	}
-
-	public void setStartDate(int startYear, int startMonth, int startDay,
-			int startHour, int startMinute) {
-		startDate.set(startYear, startMonth - 1, startDay, startHour,
-				startMinute);
-	}
-
-	public void setEndDate(int endYear, int endMonth, int endDay, int endHour,
-			int endMinute) {
-		endDate.set(endYear, endMonth - 1, endDay, endHour, endMinute);
-	}
-
-	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 setID(int ID) {
-		this.ID = ID;
-	}
-
-	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()) + ".";
-	}
-}

Event.java

@@ -0,0 +1,34 @@
+
+public class Event 
+{
+	private int startTime;
+	private int endTime;
+	private Artist artist;
+	private String description;
+	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.id = id;
+	}
+
+	public Artist getArtist()
+	{
+		return artist;
+	}
+	
+	public int getStartTime()
+	{
+		return startTime;
+	}
+	
+	public int getID()
+	{
+		return id + 10;
+	}
+	
+}

GUI

@@ -1,5 +0,0 @@
-
-public class GUI {
-
-	//Leeg
-}

GUI.java

@@ -0,0 +1,51 @@
+import java.awt.BorderLayout;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+
+
+public class GUI extends JFrame
+{
+	private Timeline timeline;
+	
+	public GUI() 
+	{
+		super("Gui");
+		this.setDefaultCloseOperation(EXIT_ON_CLOSE);
+
+//		JPanel contentPane = new JPanel(new BorderLayout());
+//		this.setContentPane(contentPane);
+//		this.setSize(600, 600);
+//		this.setVisible(true);
+//		System.out.println(contentPane.getWidth());
+//		timeline = new Timeline(contentPane);
+//		contentPane.add(timeline,BorderLayout.CENTER);
+//		contentPane.add(timeline.createWestPanel(), BorderLayout.WEST);
+//		timeline.refresh();
+		TimelinePanel panel = new TimelinePanel();
+		this.setContentPane(panel);
+		this.setSize(600, 600);
+		this.setVisible(true);
+
+		this.getRootPane().addComponentListener(new ComponentAdapter() 
+		{
+			public void componentResized(ComponentEvent e) {
+                panel.refresh();
+            }
+		});
+		
+		
+		
+		
+
+
+	}
+
+	public static void main(String[] args) 
+	{
+		new GUI();
+	}
+
+}

README.md

@@ -0,0 +1,6 @@
+# BELANGRIJK
+De .jar file moet als externe Library toegevoegd worden.  
+De sprites folder moet in de root van het project.
+
+BRANCH VAN YORICK
+Ja, codemess please.

Stage

@@ -1,49 +0,0 @@
-import java.io.Serializable;
-import java.util.ArrayList;
-
-
-public class Stage implements Serializable {
-
-	private static final long serialVersionUID = 1;
-	
-	private ArrayList<Event> events;
-	private String description;
-	private int ID;
-	
-	public Stage(String description, int ID )
-	{
-		this.events = new ArrayList<Event>();
-		this.description = description;
-		this.ID = ID;
-	}
-	
-	public Event getEvent(int number)
-	{
-		return events.get(number);
-	}
-		
-	public String getDescription()
-	{
-		return this.description;
-	}
-	
-	public int getID()
-	{
-		return this.ID;
-	}
-	
-	public void setDescription(String description)
-	{
-		this.description = description;
-	}
-	
-	public void setID(int ID)
-	{
-		this.ID = ID;
-	}
-	
-	public void addEvent(Event event)
-	{
-		events.add(event);
-	}
-}

Stage.java

@@ -0,0 +1,57 @@
+import java.util.ArrayList;
+
+
+public class Stage 
+{
+	private ArrayList<Event> performances;
+	private int expectedPopularity;
+	private String description;
+	private int length;
+	private int startTime,endTime;
+	
+	public Stage(ArrayList<Event> performances, int expectedPopularity, String description, int startTime, int endTime)
+	{
+		this.performances = performances;
+		this.expectedPopularity = expectedPopularity;
+		this.description = description;
+		this.startTime = startTime;
+		this.endTime = endTime;
+		this.length = endTime - startTime;
+	}
+	
+	public void setStartTime(int startTime)
+	{
+		this.startTime = startTime;
+	}
+	
+	public void setEndTime(int endTime)
+	{
+		this.endTime = endTime;
+	}
+	
+	public ArrayList<Event> getPerformances()
+	{
+		return performances;
+	}
+	
+//	public int getID()
+//	{
+//		return id + 100;
+//	}
+	
+	public int getLength()
+	{
+		return length;
+	}
+	
+	public int getStartTime()
+	{
+		return startTime;
+	}
+	
+	public int getEndTime()
+	{
+		return endTime;
+	}
+	
+}

StagePanel.java

@@ -0,0 +1,90 @@
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.LayoutManager;
+import java.awt.image.BufferedImage;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+
+
+public class StagePanel extends JPanel 
+{
+	private BufferedImage image;
+	private int width, height, posX;
+	private Stage stage;
+	public StagePanel(int width, int height, int posX, Stage stage) 
+	{
+		this.width = width;
+		this.height = height;
+		this.posX = posX;
+		this.stage = stage;
+		image = new BufferedImage(this.width, this.height, BufferedImage.TYPE_INT_ARGB);
+		Graphics2D g2 = image.createGraphics();
+		g2.setColor(Color.blue);
+		g2.fillRect(0, 0, image.getWidth(), image.getHeight());
+	}
+	
+	public void paint(Graphics g)
+	{
+		super.paint(g);
+		((Graphics2D)g).drawImage(image, this.posX, 0, this);
+	}
+
+	public StagePanel(LayoutManager arg0) 
+	{
+		super(arg0);
+
+	}
+
+	public StagePanel(boolean arg0) 
+	{
+		super(arg0);
+
+	}
+	
+	public void update(int posx)
+	{
+		this.posX = posx;
+		repaint();
+	}
+	
+
+	public StagePanel(LayoutManager arg0, boolean arg1) 
+	{
+		super(arg0, arg1);
+
+	}
+	
+	public int getPosX()
+	{
+		return this.posX;
+	}
+	
+	public void setLength(int length)
+	{
+		this.width = length;
+	}
+	
+	public void setStageStartTime(int startTime)
+	{
+		stage.setStartTime(startTime);
+	}
+	
+	public void setStageEndTime(int endTime)
+	{
+		stage.setEndTime(endTime);
+	}
+	
+	public int getStageStartTime()
+	{
+		return stage.getStartTime();
+	}
+	
+	public int getImageWidth()
+	{
+		return this.width;
+	}
+
+}

Timeline.java

@@ -0,0 +1,358 @@
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.ComponentListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionAdapter;
+import java.awt.event.MouseMotionListener;
+import java.util.ArrayList;
+
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+
+@SuppressWarnings({ "serial" })
+public class Timeline extends JPanel
+{
+	private ArrayList<Stage> stages = new ArrayList<Stage>();
+	private JPanel frame;
+
+//	Geef dit object je JFrame mee, en zet in je JFrame de volgende code:
+//	this.setContentPane(timeline.getTimeline());
+//	this.getRootPane().addComponentListener(new ComponentAdapter() 
+//	{
+//		public void componentResized(ComponentEvent e) {
+//            timeline.refresh();
+//        }
+//	});
+	
+	
+	public Timeline(JPanel frame) 
+	{
+		super();
+		this.frame = frame;
+
+		genStages();
+		this.setSize(frame.getWidth(), frame.getHeight());
+		refresh();
+		
+	}
+
+	public void refresh()
+	{
+		this.removeAll();	
+//		createWestPanel();
+		createMainPanel();
+		this.revalidate();
+	}
+	
+	private void createMainPanel()
+	{
+		JPanel mainPanel = new JPanel();
+		mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
+		Container topContainer = createTopPanel();
+		Dimension dim = new Dimension(this.getWidth(), 60);
+		topContainer.setMaximumSize(dim);
+		mainPanel.add(topContainer);
+		
+		Dimension centerDim = new Dimension(this.getWidth(), frame.getHeight());
+		
+//		Container centerContainer = createCenterPanel();
+		JPanel centerContainer = createCenterPanel();
+		centerContainer.setPreferredSize(centerDim);
+
+		centerContainer.setMaximumSize(centerDim);
+		System.out.println(centerDim);
+		mainPanel.add(centerContainer);
+		this.add(mainPanel, BorderLayout.CENTER);
+	}
+
+	private JPanel createCenterPanel()
+	{
+
+		JPanel centerPanel = new JPanel();
+		centerPanel.setBackground(Color.lightGray);
+		centerPanel.setLayout(new BoxLayout(centerPanel, BoxLayout.Y_AXIS));
+		centerPanel.add(Box.createRigidArea(new Dimension(0, 30)));
+
+		for(Stage stage : stages)
+		{
+			StagePanel stagepanel = new StagePanel(calcLengthOfStage(stage.getLength()), 30, calcPositionOfStage(stage.getStartTime()), stage);
+			Container content = stagepanel;
+			content.setMaximumSize(new Dimension(this.getWidth(),30));
+			content.addMouseListener(new MouseListener() {
+				
+				@Override
+				public void mouseReleased(MouseEvent e) {
+					resizeTimeline(stagepanel);
+				}
+				
+				@Override
+				public void mousePressed(MouseEvent e) {
+					
+				}
+				
+				@Override
+				public void mouseExited(MouseEvent e) {
+					
+				}
+				
+				@Override
+				public void mouseEntered(MouseEvent e) {
+					
+				}
+				
+				@Override
+				public void mouseClicked(MouseEvent e) {
+					
+				}
+			});
+			content.addMouseMotionListener(new MouseMotionListener() {
+
+				@Override
+				public void mouseMoved(MouseEvent e) {
+
+				}
+
+				@Override
+				public void mouseDragged(MouseEvent e) {
+					stagepanel.update(e.getX() - stagepanel.getImageWidth() / 2);
+				}
+			});
+			centerPanel.add(content);
+			centerPanel.add(Box.createRigidArea(new Dimension(0,15)));
+		}
+
+//		this.add(centerPanel, BorderLayout.CENTER);
+		return centerPanel;
+	}
+
+	public void resizeTimeline(StagePanel stagepanel)
+	{
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+//		System.out.println(stagepanel.getStageStartTime());
+//		System.out.println(calcStartTimeOfStagePanel(stagepanel.getPosX()));
+		stagepanel.setStageStartTime(calcStartTimeOfStagePanel(stagepanel.getPosX()));
+		stagepanel.setStageEndTime(calcEndTimeOfStagePanel(stagepanel.getPosX(), stagepanel.getImageWidth()));
+//		stagepanel.setLength(calcLengthOfStagePanel(stagepanel.getImageWidth()));
+//		System.out.println(calcLengthOfStagePanel(stagepanel.getImageWidth()));
+		refresh();
+		
+		
+	}
+	
+	public int calcLengthOfStage(int length)
+	{
+		double lengthOfStage = 0;
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+		
+		double frameWidth = this.getWidth();
+		double pixelsPerLength = frameWidth / (max - min);
+		lengthOfStage =  pixelsPerLength * (double)length;
+//		System.out.println((int)lengthOfStage);
+		return (int)lengthOfStage;
+	}
+	
+	public int calcLengthOfStagePanel(int length)
+	{
+		double lengthOfStagePanel = 0;
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+//		System.out.println(length);
+		double frameWidth = this.getWidth();
+		double pixelsPerLength = frameWidth / (max - min);
+//		System.out.println(pixelsPerLength);
+		lengthOfStagePanel =  (double)length / pixelsPerLength;
+//		System.out.println(lengthOfStagePanel);
+		
+		return (int)lengthOfStagePanel;
+	}
+	
+	public int calcPositionOfStage(int startTime)
+	{
+		int posx = 0;
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+		posx = startTime - min;
+		posx = posx * this.getWidth() / (max-min);
+//		System.out.println("Frame: " + this.getWidth());
+//		System.out.println("startTime: " + startTime);
+//		System.out.println("Max: " + max + " min: " + min);
+//		System.out.println("Posx: " + posx);
+		return posx;
+	}
+	
+	public int calcStartTimeOfStagePanel(int posx)
+	{
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+//		double startTime = (posx / (this.getWidth() / (max - min )) ) + min;
+		//Omdat het anders onnodig afgerond wordt, alles apart in doubles.
+		double minmax = max-min;
+		double bottom = this.getWidth() / minmax;
+		double all = posx / bottom;
+		double startTime = all + min;
+		
+		
+//		System.out.println("starttime----------------");
+//		System.out.println("Frame: " + this.getWidth());
+//		System.out.println("startTime: " + startTime);
+//		System.out.println("Max: " + max + " min: " + min);
+//		System.out.println("Posx: " + posx);
+		return (int)startTime;
+	}
+
+	public int calcEndTimeOfStagePanel(int posx, int imageWidth)
+	{
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+		//Omdat het anders onnodig afgerond wordt, alles apart in doubles.
+		double minmax = max-min;
+		double bottom = this.getWidth() / minmax;
+		double all = posx / bottom;
+		double endTime = all + min + calcLengthOfStagePanel(imageWidth);
+//		System.out.println(calcLengthOfStagePanel(imageWidth));
+//		System.out.println(endTime);
+		return (int)endTime;
+	}
+	
+	public int findMinMax(int i)
+	{
+		//		Event oldevent = new Event(0, 0, null, "Base", 0);
+		//		ArrayList<Event> oldevents = new ArrayList<Event>();
+		//		oldevents.add(oldevent);
+		//		Stage oldstage = new Stage(oldevents,0,null, 0, 0);
+		ArrayList<Stage> stagescopy = (ArrayList<Stage>) stages.clone();
+
+		Integer earliestStartTime = null;
+		Integer lastEndTime = null;
+
+		for(Stage stage : stagescopy)
+		{
+			if(i == 1)
+			{
+				if(earliestStartTime == null)
+				{
+
+					earliestStartTime = stage.getStartTime();
+				}
+
+				else
+				{
+					if(stage.getStartTime() < earliestStartTime)
+					{
+						earliestStartTime = stage.getStartTime();
+					}
+				}
+			}
+			else if( i == 2)
+			{
+				if(lastEndTime == null)
+				{
+					lastEndTime = stage.getEndTime();
+				}
+				else
+				{
+					if(stage.getEndTime() > lastEndTime)
+					{
+						lastEndTime = stage.getEndTime();
+					}
+				}
+			}
+		}
+		if(i == 1)
+		{
+			return earliestStartTime;
+		}
+		else if(i == 2)
+		{
+			return lastEndTime;
+		}
+		else
+		{
+			System.out.println("Return -1");
+			return -1;
+		}
+	}
+
+	private JPanel createTopPanel()
+	{
+		JPanel topPane = new JPanel();
+		topPane.setLayout(new BoxLayout(topPane, BoxLayout.Y_AXIS));
+		JPanel topPanel = new JPanel(new FlowLayout());
+		for(int i = 0; i <= this.getWidth() / 10; i++)
+		{
+			ImageIcon topImageIcon = new ImageIcon("src/test2.png");
+			JLabel topImage = new JLabel(topImageIcon);
+			topPanel.add(topImage);
+		}
+		topPane.add(Box.createRigidArea(new Dimension(0,20)));
+		JPanel panel = new JPanel();
+		panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS));
+		panel.add(Box.createRigidArea(new Dimension(50, 10)));
+		panel.add(new JLabel(Integer.toString(findMinMax(1))));
+		panel.add(Box.createHorizontalGlue());
+		panel.add(new JLabel(Integer.toString(findMinMax(2))));
+		panel.add(Box.createRigidArea(new Dimension(50, 10)));
+		topPane.add(panel);
+		topPane.add(topPanel);
+//		this.add(topPane, BorderLayout.NORTH);
+		return topPane;
+	}
+
+	public JPanel createWestPanel()
+	{
+		JPanel westPanel = new JPanel();
+		westPanel.setLayout(new BoxLayout(westPanel, BoxLayout.Y_AXIS));
+		westPanel.add(Box.createRigidArea(new Dimension(0, 100)));
+		for(int i = 0; i < stages.size(); i++)
+		{
+			JLabel stageText = new JLabel("Stage: " + (i+1) + "    ");
+			westPanel.add(stageText);
+			westPanel.add(Box.createRigidArea(new Dimension(0, 30 )));
+		}
+//		this.add(westPanel, BorderLayout.WEST);
+		return westPanel;
+	}
+
+	private void genStages()
+	{
+		ImageIcon image = new ImageIcon();
+		Artist artist2 = new Artist("Henk", "paul2", "kaas", image, 2);
+		Artist artist1 = new Artist("Kaas", "Paul", "Lala", image, 1);
+		Event event2 = new Event(1900, 2000, artist2, "hi2", 2);
+		Event event1 = new Event(600, 1800, artist1, "hi", 1);
+		ArrayList<Event> performances = new ArrayList<Event>();
+		performances.add(event1);
+		performances.add(event2);
+		Stage stage1 = new Stage(performances, 100, null, 1800, 2100);
+		stages.add(stage1);
+		Stage stage2 = new Stage(performances, 100, null, 1700, 1900);
+		Stage stage3 = new Stage(performances, 100, null, 1600, 1800);
+		Stage stage4 = new Stage(performances, 100, null, 1600, 2100);
+		stages.add(stage3);
+		stages.add(stage2);
+//		stages.add(stage4);
+
+	}
+
+	public JPanel getTimeline()
+	{
+		return this;
+	}
+
+}

TimelinePanel.java

@@ -0,0 +1,26 @@
+import java.awt.BorderLayout;
+
+import javax.swing.JPanel;
+
+
+public class TimelinePanel extends JPanel {
+
+	private Timeline timeline;
+	
+	public TimelinePanel() 
+	{
+		super(new BorderLayout());
+		
+		this.setSize(600, 600);
+		this.setVisible(true);
+		timeline = new Timeline(this);
+		this.add(timeline,BorderLayout.CENTER);
+		this.add(timeline.createWestPanel(), BorderLayout.WEST);
+	}
+	
+	public void refresh()
+	{
+		timeline.refresh();
+	}
+
+}

testmethode

@@ -1,16 +0,0 @@
-Eventuele methode om de Arraylisten mee te vullen.
-
-public void test()
-	{
-		Artist artist = new Artist("Paul", "Rock", "null", "description");
-		Event e = new Event(2015,2,13,15,0,2015,2,13,16,0,artist,"Description",7, 1);
-		Stage s = new Stage("Main Stage", 1);
-		
-		addArtist(artist);
-		addEvent(e);
-		addStage(s);
-		
-		saveAll();
-		fillAll();
-		System.out.println("Saved All Data!");
-	}