Support for more days, bugfixes

src/gui/frames/MainFrame.java

@@ -1,12 +1,11 @@
 package gui.frames;
 
-import agenda.Agenda;
 import gui.menubar.MenuBar;
 import gui.panels.MainPanel;
-import gui.panels.edit.EditPane;
 
 import javax.swing.JFrame;
-import javax.swing.JPanel;
+
+import agenda.Agenda;
 
 @SuppressWarnings("serial")
 public class MainFrame extends JFrame{
@@ -15,7 +14,7 @@ public class MainFrame extends JFrame{
     
     public MainFrame(){
         this.agenda = new Agenda();
-        this.add(new EditPane(this.agenda));
+        this.add(new MainPanel(this.agenda));
 		this.setResizable(true);
 		this.setBounds(100,100,1440,900);
 		this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);

src/gui/panels/MainPanel.java

@@ -7,6 +7,7 @@ import javax.swing.JScrollPane;
 
 import agenda.Agenda;
 import gui.panels.agenda.AgendaPane;
+import gui.panels.agenda.AgendaScrollPane;
 import gui.panels.agenda.InfoPane;
 
 @SuppressWarnings("serial")
@@ -18,12 +19,6 @@ public class MainPanel extends JPanel{
         this.agenda = agenda;
 		this.setLayout(new BorderLayout());
 		this.add(new InfoPane(), BorderLayout.WEST);
-		
-		AgendaPane agendapanel = new AgendaPane(this.agenda);
-		
-		JScrollPane scroll = new JScrollPane(agendapanel);
-		scroll.getVerticalScrollBar().setUnitIncrement(20);
-		
-		this.add(scroll, BorderLayout.CENTER);
+		this.add(new AgendaPane(agenda), BorderLayout.CENTER);
 	}
 }

src/gui/panels/agenda/AgendaPane.java

@@ -1,186 +1,53 @@
 package gui.panels.agenda;
 
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
+import java.awt.BorderLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Calendar;
 import java.util.GregorianCalendar;
 
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 
-import agenda.Act;
 import agenda.Agenda;
 
 @SuppressWarnings("serial")
 public class AgendaPane extends JPanel {
-	ArrayList<AgendaItemShape> agendaItems;
-	private int clickedItem[];
-	private int xdifference, ydifference;
-	private final int yspacing = 45;
-	private final int itempadding = 10;
-	private final int heightoffset = 100;
-	Agenda agenda;
+	private GregorianCalendar currentdate;
+	private	DaySelectorPane dayselector;
+	private final AgendaScrollPane agendapanel;
 	
 	public AgendaPane(Agenda agenda){
-		this.agenda = agenda;
-		this.setPreferredSize(new Dimension(600, yspacing*48+heightoffset));
-		agendaItems = new ArrayList<AgendaItemShape>();
-		clickedItem = new int[]{-1};
-		for(Act act: agenda.getActs()){
-			agendaItems.add(new AgendaItemShape(act, agenda.getStages().indexOf(act.getStage()), new Color(250,209,101)));
-		}
-		for(AgendaItemShape a:agendaItems){
-			a.setSize((int) a.getWidth(), (int) (a.getLength()* (yspacing/30.0)));
-			a.setLocation((int)a.getY(), (int) (a.getBeginTime() * (yspacing/30.0)+heightoffset));
-		}
-		this.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseReleased(MouseEvent e) {
-				repaint();
-				clickedItem = new int[]{-1};			
-				setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
-			}
+		setLayout(new BorderLayout());
+		currentdate = new GregorianCalendar(2015, 1, 11);
+		
+		agendapanel = new AgendaScrollPane(agenda, currentdate);
+		dayselector = new DaySelectorPane();
+		JScrollPane scroll = new JScrollPane(agendapanel);
+		scroll.getVerticalScrollBar().setUnitIncrement(20);
+		
+		this.add(scroll, BorderLayout.CENTER);
+		this.add(dayselector, BorderLayout.SOUTH);
+		dayselector.setDate(currentdate);
+		dayselector.getButtonLeft().addActionListener(new ActionListener() {
 			@Override
-			public void mousePressed(MouseEvent e) {
-				clickedItem = getClickedItem(e);
-				if(clickedItem[0] != -1){
-					xdifference = -1*((int)agendaItems.get(clickedItem[0]).getX() - e.getX());
-					ydifference = -1*((int)agendaItems.get(clickedItem[0]).getY() - e.getY())+heightoffset;	
-				}				
+			public void actionPerformed(ActionEvent e) {
+				currentdate.add(Calendar.DAY_OF_MONTH, -1);
+				setCurrentdate(currentdate);
 			}
 		});
-		this.addMouseMotionListener(new MouseAdapter() {	
+		dayselector.getButtonRight().addActionListener(new ActionListener() {
 			@Override
-			public void mouseDragged(MouseEvent e) {
-				if(clickedItem[0] != -1){
-					Rectangle item = agendaItems.get(clickedItem[0]);
-					if(clickedItem[1] == 2){
-						item.setSize((int)item.getWidth(), (int)(-1*(item.getY()-e.getY())));
-					}else{
-						item.setLocation(e.getX()-xdifference, e.getY()-ydifference);
-					}
-					repaint();
-				}
+			public void actionPerformed(ActionEvent e) {
+				currentdate.add(Calendar.DAY_OF_MONTH, 1);
+				setCurrentdate(currentdate);
 			}
 		});
 	}
+	public void setCurrentdate(GregorianCalendar date){
+		this.currentdate = date;
+		dayselector.setDate(date);
+		agendapanel.setDate(currentdate);
+	}
 	
-	public int[] getClickedItem(MouseEvent e){
-		if(e.getButton() == 1){
-			for(int i = 0; i < agendaItems.size(); i++){
-				if(agendaItems.get(i).intersects(e.getX(), e.getY(), 1, 1)){
-					if(	agendaItems.get(i).getY()+agendaItems.get(i).getHeight()+10 > e.getY() &&
-						agendaItems.get(i).getY()+agendaItems.get(i).getHeight()-10 < e.getY()){
-						setCursor(new Cursor(Cursor.S_RESIZE_CURSOR));
-						return new int[]{i, 2}; //Clicked on the bottom border of the item
-					}
-					setCursor(new Cursor(Cursor.MOVE_CURSOR));
-					return new int[]{i, 0}; // Clicked inside the item
-				}
-			}
-		}
-		return new int[]{-1}; //Clicked outside all the agenda-items so return a -1
-	}	
-	public void paintComponent(Graphics g){
-		super.paintComponent(g);
-		Graphics2D g2 = (Graphics2D)g;		
-        
-        
-        //agenda.getStages().size() mag niet 0 zijn (je mag niet delen door 0.)
-        int xspacing;
-        if(agenda.getStages().size() == 0){
-            xspacing = 0;
-        }else{
-            xspacing = getWidth()/agenda.getStages().size()+20;
-        }
-		for(int i = 0; i < agenda.getStages().size(); i++){
-			g2.setColor(Color.black);
-			g2.drawString(agenda.getStages().get(i).getName(), i*xspacing+itempadding, heightoffset/2);
-			g2.setColor(new Color (100,100,100, 70));
-			g2.drawLine(i*xspacing, getHeight(), i*xspacing, 0); //draws the vertical separation lines
-		}
-		for(int i = 0; i <= 48; i++){
-			if(i%2==0){
-				g2.setStroke(new BasicStroke(1)); //full at normal hours
-				g2.setColor(Color.BLACK);
-				g2.drawString(i/2+":00", 0, i*yspacing+heightoffset);
-				g2.setColor(new Color (100,100,100, 50));
-			}else{
-				g2.setStroke(new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[]{9}, 0)); //dashed at half hours
-			}
-			g2.drawLine(0, i*yspacing+heightoffset, getWidth(), i*yspacing+heightoffset); //draws the horizontal time lines
-		}
-		
-		for(AgendaItemShape agendaItem: agendaItems){	
-			if(clickedItem[0] == -1){ //Window is resized, only resize & place the items 
-				agendaItem.setSize(xspacing-itempadding*2, (int) (agendaItem.getHeight()));
-				agendaItem.setLocation(agendaItem.getRow()*xspacing+itempadding, (int) agendaItem.getY());
-			}else if(agendaItems.get(clickedItem[0]) == agendaItem){ // The agenda item is moved
-				if(clickedItem[1] == 0){ //if the agenda item is moved, not resized
-					if(agendaItem.getX() / xspacing > agenda.getStages().size()-1){ // outside the window on the right
-						agendaItem.setLocation((int)xspacing*(agenda.getStages().size()-1)+itempadding, (int)agendaItem.getY()+heightoffset);
-					}else if(agendaItem.getX() / xspacing < 0){ // outside the window on the left
-						agendaItem.setLocation((int)itempadding, (int)agendaItem.getY()+heightoffset);
-					}else{ //inside the window, stick it to a stage
-						agendaItem.setLocation((int) Math.round(agendaItem.getX() / xspacing)*xspacing+itempadding, (int)agendaItem.getY()+heightoffset);
-					}
-					if(agendaItem.getY() < heightoffset){ // outside the window on the top
-						agendaItem.setLocation((int)agendaItem.getX(), heightoffset);
-					}else if(agendaItem.getHeight()+agendaItem.getY() > 48*yspacing+heightoffset){ // outside the window on the bottom
-						agendaItem.setLocation((int)agendaItem.getX(),(48*yspacing+heightoffset)-(int)agendaItem.getHeight()-1);
-					}	
-				}else if(clickedItem[1] == 2){ //agenda item is resized
-					if(agendaItem.getHeight() < 30){ //check the height of the item
-						agendaItem.setSize((int) agendaItem.getWidth(), 30);
-					}else if(agendaItem.getHeight()+agendaItem.getY() > 48*yspacing+heightoffset){ // outside the window on the bottom
-						agendaItem.setSize((int)agendaItem.getWidth(),(int) ((48*yspacing+heightoffset)-agendaItem.getY()-1));
-					}		
-				}
-				for(AgendaItemShape agendaItem2: agendaItems){ //check if there are any collisions with other items
-					if(agendaItem2 != agendaItem){
-						if(agendaItem.intersects(agendaItem2)){	//intersection found
-							if( agendaItem.getHeight()+agendaItem.getY() > agendaItem2.getY() && agendaItem.getY() > agendaItem2.getY()){//collision on the bottom of another item
-								agendaItem.setLocation((int)agendaItem.getX(), (int)(agendaItem2.getY()+agendaItem2.getHeight()));
-							}else if(agendaItem.getY() <= agendaItem2.getY()){//collision on the top of another item
-								if(clickedItem[1] == 0){//item was moved, only change location
-									agendaItem.setLocation((int)agendaItem.getX(), (int)(agendaItem2.getY()-agendaItem.getHeight()));
-									if(agendaItem.getY() < heightoffset){
-										agendaItem.y = (int) (agendaItem2.getY() + agendaItem2.getHeight());
-									}
-								}else if(clickedItem[1] == 2){//item was resized, only change the size
-									agendaItem.setSize((int)agendaItem.getWidth(), (int)(agendaItem2.getY()-agendaItem.getY()));
-								}
-							}
-						}
-					}
-				}	 
-				//update the new data to the Act
-				agendaItem.setStage(agenda.getStages().get((int) Math.round(agendaItem.getX() / xspacing)), (int) Math.round(agendaItem.getX() / xspacing));
-				agendaItem.getTime().getBeginTime().set((GregorianCalendar.MINUTE), (int) Math.round((agendaItem.getY()-heightoffset)/45*30)%60);
-				agendaItem.getTime().getBeginTime().set((GregorianCalendar.HOUR_OF_DAY), (int) Math.round((agendaItem.getY()-heightoffset)/45*30)/60);
-				agendaItem.getTime().getEndTime().set(GregorianCalendar.MINUTE, (int) Math.round((agendaItem.getY()+agendaItem.getHeight()-heightoffset)/45*30)%60);
-				agendaItem.getTime().getEndTime().set(GregorianCalendar.HOUR_OF_DAY, (int) Math.round((agendaItem.getY()+agendaItem.getHeight()-heightoffset)/45*30)/60);
-			}
-			
-			g2.setColor(agendaItem.getColor());			//Fills the item with a given 
-			g2.fill(agendaItem);
-			g2.setColor(agendaItem.getColor().darker());
-			g2.draw(agendaItem);
-			g2.setColor(Color.BLACK);
-			
-			if(agendaItem.getHeight() < 50){
-				g2.drawString(agendaItem.getName() + " " + agendaItem.getTime().getBeginTimeString() + " - " + agendaItem.getTime().getEndTimeString(), (int)agendaItem.getX() +5, (int)agendaItem.getY() +15);
-			}else{
-				g2.drawString(agendaItem.getName(), (int)agendaItem.getX() +5, (int)agendaItem.getY() +15);
-				g2.drawString(agendaItem.getTime().getBeginTimeString(), (int)agendaItem.getX() +5, (int)agendaItem.getY() +30);
-				g2.drawString(agendaItem.getTime().getEndTimeString(), (int)agendaItem.getX() +5, (int)agendaItem.getY() +45);
-			}
-		}
-	}	
 }

src/gui/panels/agenda/AgendaScrollPane.java

@@ -0,0 +1,202 @@
+package gui.panels.agenda;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+
+import javax.swing.JPanel;
+
+import agenda.Act;
+import agenda.Agenda;
+
+@SuppressWarnings("serial")
+public class AgendaScrollPane extends JPanel {
+	ArrayList<AgendaItemShape> agendaItems;
+	private int clickedItem[];
+	private int xdifference, ydifference, xspacing;
+	private final int yspacing = 45;
+	private final int itempadding = 10;
+	private final int heightoffset = 100;
+	GregorianCalendar currentdate;
+	Agenda agenda;
+	
+	public AgendaScrollPane(final Agenda agenda, GregorianCalendar date){
+		this.agenda = agenda;
+		this.setPreferredSize(new Dimension(600, yspacing*48+heightoffset));
+		agendaItems = new ArrayList<AgendaItemShape>();
+		clickedItem = new int[]{-1};
+		setDate(date);
+
+		this.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseReleased(MouseEvent e) {
+				clickedItem = new int[]{-1};			
+				setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
+			}
+			@Override
+			public void mousePressed(MouseEvent e) {
+				clickedItem = getClickedItem(e);
+				if(clickedItem[0] != -1){
+					xdifference = -1*((int)agendaItems.get(clickedItem[0]).getX() - e.getX());
+					ydifference = -1*((int)agendaItems.get(clickedItem[0]).getY() - e.getY())+heightoffset;	
+				}				
+			}
+		});
+		this.addMouseMotionListener(new MouseAdapter() {	
+			@Override
+			public void mouseDragged(MouseEvent e) {
+				if(clickedItem[0] != -1){
+					Rectangle item = agendaItems.get(clickedItem[0]);
+					if(clickedItem[1] == 2){
+						item.setSize((int)item.getWidth(), (int)(-1*(item.getY()-e.getY())));
+					}else{
+						item.setLocation(e.getX()-xdifference, e.getY()-ydifference);
+					}
+					
+					for(AgendaItemShape agendaItem: agendaItems){	
+						if(clickedItem[0] == -1){ //Window is resized, only resize & place the items 
+							agendaItem.setSize(xspacing-itempadding*2, (int) (agendaItem.getHeight()));
+							agendaItem.setLocation(agendaItem.getRow()*xspacing+itempadding, (int) agendaItem.getY());
+						}else if(agendaItems.get(clickedItem[0]) == agendaItem){ // The agenda item is moved
+							if(clickedItem[1] == 0){ //if the agenda item is moved, not resized
+								if(agendaItem.getX() / xspacing > agenda.getStages().size()-1){ // outside the window on the right
+									agendaItem.setLocation((int)xspacing*(agenda.getStages().size()-1)+itempadding, (int)agendaItem.getY()+heightoffset);
+								}else if(agendaItem.getX() / xspacing < 0){ // outside the window on the left
+									agendaItem.setLocation((int)itempadding, (int)agendaItem.getY()+heightoffset);
+								}else{ //inside the window, stick it to a stage
+									agendaItem.setLocation((int) Math.round(agendaItem.getX() / xspacing)*xspacing+itempadding, (int)agendaItem.getY()+heightoffset);
+								}
+//								if(agendaItem.getY() < heightoffset){ // outside the window on the top
+//									agendaItem.setLocation((int)agendaItem.getX(), heightoffset);}
+////								}else if(agendaItem.getHeight()+agendaItem.getY() > 48*yspacing+heightoffset){ // outside the window on the bottom
+////									agendaItem.setLocation((int)agendaItem.getX(),(48*yspacing+heightoffset)-(int)agendaItem.getHeight()-1);
+////								}	
+							}else if(clickedItem[1] == 2){ //agenda item is resized
+								if(agendaItem.getHeight() < 30){ //check the height of the item
+									agendaItem.setSize((int) agendaItem.getWidth(), 30);
+								}else if(agendaItem.getHeight()+agendaItem.getY() > 48*yspacing+heightoffset){ // outside the window on the bottom
+									agendaItem.setSize((int)agendaItem.getWidth(),(int) ((48*yspacing+heightoffset)-agendaItem.getY()-1));
+								}		
+							}
+							for(AgendaItemShape agendaItem2: agendaItems){ //check if there are any collisions with other items
+								if(agendaItem2 != agendaItem){
+									if(agendaItem.intersects(agendaItem2)){	//intersection found
+										if( agendaItem.getHeight()+agendaItem.getY() > agendaItem2.getY() && agendaItem.getY() > agendaItem2.getY()){//collision on the bottom of another item
+											agendaItem.setLocation((int)agendaItem.getX(), (int)(agendaItem2.getY()+agendaItem2.getHeight()));
+										}else if(agendaItem.getY() <= agendaItem2.getY()){//collision on the top of another item
+											if(clickedItem[1] == 0){//item was moved, only change location
+												agendaItem.setLocation((int)agendaItem.getX(), (int)(agendaItem2.getY()-agendaItem.getHeight()));
+												if(agendaItem.getY() < heightoffset){
+													agendaItem.y = (int) (agendaItem2.getY() + agendaItem2.getHeight());
+												}
+											}else if(clickedItem[1] == 2){//item was resized, only change the size
+												agendaItem.setSize((int)agendaItem.getWidth(), (int)(agendaItem2.getY()-agendaItem.getY()));
+											}
+										}
+									}
+								}
+							}	 
+							//update the new data to the Act
+							agendaItem.setStage(agenda.getStages().get((int) Math.round(agendaItem.getX() / xspacing)), (int) Math.round(agendaItem.getX() / xspacing));
+							agendaItem.getTime().getBeginTime().set((GregorianCalendar.MINUTE), (int) Math.round((agendaItem.getY()-heightoffset)/45*30)%60);
+							agendaItem.getTime().getBeginTime().set((GregorianCalendar.HOUR_OF_DAY), (int) Math.round((agendaItem.getY()-heightoffset)/45*30)/60);
+							agendaItem.getTime().getBeginTime().set(GregorianCalendar.DAY_OF_YEAR, (int) (currentdate.get(Calendar.DAY_OF_YEAR)+(Math.round(agendaItem.getY()-heightoffset)/45*30)/60/24));
+							agendaItem.getTime().getEndTime().set(GregorianCalendar.MINUTE, (int) Math.round((agendaItem.getY()+agendaItem.getHeight()-heightoffset)/45*30)%60);
+							agendaItem.getTime().getEndTime().set(GregorianCalendar.HOUR_OF_DAY, (int) Math.round((agendaItem.getY()+agendaItem.getHeight()-heightoffset)/45*30)/60%24);
+							agendaItem.getTime().getEndTime().set(GregorianCalendar.DAY_OF_YEAR, (int) (currentdate.get(Calendar.DAY_OF_YEAR)+(Math.round(agendaItem.getY()+agendaItem.getHeight()-heightoffset)/45*30)/60/24));
+						}
+					}
+					repaint();
+				}
+			}
+		});
+	}
+	
+	public int[] getClickedItem(MouseEvent e){
+		if(e.getButton() == 1){
+			for(int i = 0; i < agendaItems.size(); i++){
+				if(agendaItems.get(i).intersects(e.getX(), e.getY(), 1, 1)){
+					if(	agendaItems.get(i).getY()+agendaItems.get(i).getHeight()+10 > e.getY() &&
+						agendaItems.get(i).getY()+agendaItems.get(i).getHeight()-10 < e.getY()){
+						setCursor(new Cursor(Cursor.S_RESIZE_CURSOR));
+						return new int[]{i, 2}; //Clicked on the bottom border of the item
+					}
+					setCursor(new Cursor(Cursor.MOVE_CURSOR));
+					return new int[]{i, 0}; // Clicked inside the item
+				}
+			}
+		}
+		return new int[]{-1}; //Clicked outside all the agenda-items so return a -1
+	}	
+	public void setDate(GregorianCalendar date){
+		agendaItems.clear();
+		currentdate = date;
+		for(Act act: agenda.getActs()){
+			GregorianCalendar begintime = act.getActTime().getBeginTime();
+			GregorianCalendar endtime = act.getActTime().getEndTime();
+			if(currentdate.compareTo(begintime) <= 1 && currentdate.compareTo(endtime) >= -1){
+				agendaItems.add(new AgendaItemShape(act, agenda.getStages().indexOf(act.getStage()), new Color(250,209,101)));
+			}
+		}
+		for(AgendaItemShape a:agendaItems){
+			a.setLocation(0, (int) (((a.getTime().getBeginTime().get(Calendar.DAY_OF_YEAR) - currentdate.get(Calendar.DAY_OF_YEAR))*yspacing*48+heightoffset) + (a.getBeginTime() * (yspacing/30.0))));
+			a.setSize(0, (int) (a.getLength()* (yspacing/30.0)));
+		}
+		repaint();
+	}
+	public void paintComponent(Graphics g){
+		super.paintComponent(g);
+		Graphics2D g2 = (Graphics2D)g;		
+        if(agenda.getStages().size() == 0){
+            xspacing = 0;
+        }else{
+            xspacing = getWidth()/agenda.getStages().size()+20;
+        }
+		for(int i = 0; i < agenda.getStages().size(); i++){
+			g2.setColor(Color.black);
+			g2.drawString(agenda.getStages().get(i).getName(), i*xspacing+itempadding, heightoffset/2);
+			g2.setColor(new Color (100,100,100, 70));
+			g2.drawLine(i*xspacing, getHeight(), i*xspacing, 0); //draws the vertical separation lines
+		}
+		for(int i = 0; i <= 48; i++){
+			if(i%2==0){
+				g2.setStroke(new BasicStroke(1)); //full at normal hours
+				g2.setColor(Color.BLACK);
+				g2.drawString(i/2+":00", 0, i*yspacing+heightoffset);
+				g2.setColor(new Color (100,100,100, 50));
+			}else{
+				g2.setStroke(new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[]{9}, 0)); //dashed at half hours
+			}
+			g2.drawLine(0, i*yspacing+heightoffset, getWidth(), i*yspacing+heightoffset); //draws the horizontal time lines
+		}
+		
+		for(AgendaItemShape agendaItem: agendaItems){	
+			if(clickedItem[0] == -1){ //Window is resized, only resize & place the items 
+				agendaItem.setSize(xspacing-itempadding*2, (int) (agendaItem.getHeight()));
+				agendaItem.setLocation(agendaItem.getRow()*xspacing+itempadding, (int) agendaItem.getY());
+			}			
+			g2.setColor(agendaItem.getColor());			//Fills the item with a given 
+			g2.fill(agendaItem);
+			g2.setColor(agendaItem.getColor().darker());
+			g2.draw(agendaItem);
+			g2.setColor(Color.BLACK);
+			
+			if(agendaItem.getHeight() < 50){
+				g2.drawString(agendaItem.getName() + " " + agendaItem.getTime().getBeginTimeString() + " - " + agendaItem.getTime().getEndTimeString(), (int)agendaItem.getX() +5, (int)agendaItem.getY() +15);
+			}else{
+				g2.drawString(agendaItem.getName(), (int)agendaItem.getX() +5, (int)agendaItem.getY() +15);
+				g2.drawString(agendaItem.getTime().getBeginTimeString(), (int)agendaItem.getX() +5, (int)agendaItem.getY() +30);
+				g2.drawString(agendaItem.getTime().getEndTimeString(), (int)agendaItem.getX() +5, (int)agendaItem.getY() +45);
+			}
+		}
+	}	
+}

src/gui/panels/agenda/DaySelectorPane.java

@@ -1,23 +1,40 @@
 package gui.panels.agenda;
 
 import java.awt.FlowLayout;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
 
 import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
 public class DaySelectorPane extends JPanel{
+	private JButton buttonLeft, buttonRight;
+	private JLabel dateLabel;
+	
 	public DaySelectorPane(){
 		this.setLayout(new FlowLayout());
 		addContent();
 	}
 	
 	private void addContent(){
-		JButton buttonLeft = new JButton("<");
-		JLabel dateLabel = new JLabel("11-09-2001");
-		JButton buttonRight = new JButton(">");
+		buttonLeft = new JButton("<");
+		dateLabel = new JLabel();
+		buttonRight = new JButton(">");
 		this.add(buttonLeft);
 		this.add(dateLabel);
 		this.add(buttonRight);
 	}
+	
+	public void setDate(GregorianCalendar date){
+		dateLabel.setText(date.get(Calendar.YEAR) + "-" + (date.get(Calendar.MONTH)+1) + "-" + date.get(Calendar.DATE));
+	}
+
+	public JButton getButtonLeft() {
+		return buttonLeft;
+	}
+
+	public JButton getButtonRight() {
+		return buttonRight;
+	}	
 }