Some more improvements. AA enabled at agenda pane and some color changes.

src/agenda/Act.java

@@ -9,7 +9,8 @@ import java.util.List;
  */
 public class Act implements Serializable  {
     
-    private List<Artist> artists;
+	private static final long serialVersionUID = 2014784638884074426L;
+	private List<Artist> artists;
     private Stage stage;
     private String genre, name;
     private ActTime actTime;

src/agenda/ActTime.java

@@ -9,6 +9,7 @@ import java.util.GregorianCalendar;
  */
 public class ActTime implements Serializable, Comparable<ActTime>{
     
+	private static final long serialVersionUID = -7025223439670300760L;
 	private GregorianCalendar beginTime, endTime;
 
     public ActTime(int y1, int m1, int d1, int hh1, int mm1, int y2, int m2, int d2, int hh2, int mm2){

src/agenda/Agenda.java

@@ -1,7 +1,5 @@
 package agenda;
 
-import sun.util.calendar.Gregorian;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -13,7 +11,8 @@ import java.util.List;
  */
 public class Agenda implements Serializable {
     
-    private List<Stage> stages;
+	private static final long serialVersionUID = -8155172646187138994L;
+	private List<Stage> stages;
     private List<Artist> artists;
     private List<Act> acts;
     
@@ -87,7 +86,6 @@ public class Agenda implements Serializable {
 
     public void addAct(Act act){
         this.acts.add(act);
-        System.err.println(this.acts);
     }
     
     public List<Artist> getArtists() {

src/agenda/Artist.java

@@ -7,7 +7,8 @@ import java.io.Serializable;
  */
 public class Artist implements Serializable {
     
-    private String name, genre;
+	private static final long serialVersionUID = -3956584414752470993L;
+	private String name, genre;
     
     public Artist(String name, String genre){
         this.name = name;

src/agenda/Database.java

@@ -3,29 +3,22 @@ package agenda;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.ArrayList;
 import java.sql.Statement;
+import java.util.ArrayList;
 
 public class Database {
-  //db connection
-  private Connection connect = null;
-  //preparedstatement for filling db with acts
-  private PreparedStatement preparedStatement = null;
-  //statement for checking if db already has stages stored
-  private Statement statement = null;
+  private Connection connect = null;   //db connection
+  private PreparedStatement preparedStatement = null;   //preparedstatement for filling db with acts
+  private Statement statement = null;   //statement for checking if db already has stages stored
   
   //database values
   private String host = "jdbc:mysql://jancokock.me:3306/festivalagenda";
   private String user = "projectgroepa6";
   private String pass = "tzHnYRbpt7r3z4jt";
   
-  //get agenda values
-  private Agenda agenda;
   private ArrayList<Act> acts;
 
   public Database(Agenda agenda){
-	  this.agenda = agenda;
 	  acts = (ArrayList<Act>) agenda.getActs();
   }
   

src/agenda/Io.java

@@ -14,8 +14,7 @@ public class Io {
 	public static void writeIo(Agenda agenda) throws IOException
 	{
 		JFileChooser fileChooser = new JFileChooser();
-		if(fileChooser.showSaveDialog(null)
-				== fileChooser.APPROVE_OPTION) {
+		if(fileChooser.showSaveDialog(null)	== JFileChooser.APPROVE_OPTION) {
 			java.io.File file = fileChooser.getSelectedFile();
 
 			ObjectOutputStream output = null;
@@ -37,8 +36,7 @@ public class Io {
 	public static Agenda readIo() throws IOException
 	{
 		JFileChooser fileChooser = new JFileChooser();
-		if(fileChooser.showOpenDialog(null)
-				== fileChooser.APPROVE_OPTION) {
+		if(fileChooser.showOpenDialog(null)	== JFileChooser.APPROVE_OPTION) {
 			java.io.File file = fileChooser.getSelectedFile();
 
 			ObjectInputStream input = null;
@@ -59,8 +57,6 @@ public class Io {
 			}
 		}
 		return null;
-
-
 	}
 }
 

src/agenda/Stage.java

@@ -7,7 +7,8 @@ import java.io.Serializable;
  */
 public class Stage implements Serializable {
     
-    private String name;
+	private static final long serialVersionUID = 4364562126530653936L;
+	private String name;
     private boolean inUse = false;
     
     public Stage(String name){

src/agenda/Time.java

@@ -1,39 +0,0 @@
-package agenda;
-
-import java.io.Serializable;
-
-/**
- * Created by gjoosen on 07/02/15.
- */
-public class Time implements Serializable {
-    
-    private int hours, minutes;
-    
-    public Time(int hours, int minutes){
-        this.hours = hours;
-        this.minutes = minutes;
-    }
-
-    public int getHours() {
-        return hours;
-    }
-
-    public int getMinutes() {
-        return minutes;
-    }
-    
-    @Override
-    public String toString(){
-        return this.numberToTimeDigits(this.hours) + ":" + this.numberToTimeDigits(this.minutes);
-    }
-    
-    private String numberToTimeDigits(int h){
-        String hours;
-        if(h == 0 || h == 1 || h == 2 || h == 3 || h == 4 || h == 5 || h == 6 || h == 7 || h == 8 || h == 9){
-            hours = "0" + h;
-        }else {
-            hours = String.valueOf(h);
-        }
-        return hours;
-    }
-}

src/gui/frames/MainFrame.java

@@ -6,7 +6,6 @@ import gui.panels.edit.EditPane;
 import gui.panels.table.Table;
 import gui.simulator.SimulatorPane;
 
-import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Window;
 import java.lang.reflect.InvocationTargetException;
@@ -28,12 +27,10 @@ public class MainFrame extends JFrame{
 	private int length;
 	private int terainwidth;
 	private SimulatorPane.Terrains terrain;
-
-
   
     public MainFrame(){
         this.agenda = new Agenda();
-        this.currentPanel = new SimulatorPane(this.agenda, 1000, 1000,  SimulatorPane.Terrains.BEACH);
+        this.currentPanel = new EditPane(agenda);
         this.add(currentPanel);
 		this.setResizable(true);
 		this.setBounds(100,100,1440,900);
@@ -41,16 +38,11 @@ public class MainFrame extends JFrame{
 		this.setUndecorated(false);
 		this.setJMenuBar(new MenuBar(this, agenda));
 		this.setVisible(true);
-
-		this.length = 100000;
-		this.terainwidth = 10000;
-		this.terrain = SimulatorPane.Terrains.UNDEFINED;
-
 		this.getContentPane().setBackground( Color.WHITE );
 
 		if(System.getProperties().getProperty("os.name").equals("Mac OS X")) {
 			try {
-				Class c = Class.forName("com.apple.eawt.FullScreenUtilities");
+				Class<?> c = Class.forName("com.apple.eawt.FullScreenUtilities");
 				Method m = c.getMethod("setWindowCanFullScreen", Window.class, Boolean.TYPE);
 				m.invoke(c, this, true);
 			} catch (ClassNotFoundException e) {

src/gui/main/Main.java

@@ -4,15 +4,9 @@ import gui.frames.MainFrame;
 
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
-import java.awt.*;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 
-
-public class Main {
-	
+public class Main {	
 	public static void main(String[] args){
-        
 		//sets the systems look and feels
         //osx
         if(System.getProperties().getProperty("os.name").equals("Mac OS X")) {

src/gui/menubar/MenuBar.java

@@ -130,10 +130,6 @@ public class MenuBar extends JMenuBar{
 
 			public void actionPerformed(ActionEvent e) {
 				try {
-//					simPanel = mainFrame.getSimulatorpanel();
-//					System.out.println("Simpanel " + simPanel);
-//					terrain = ((SimulatorPane) simPanel).getTerrain();
-//					System.out.println(terrain);
 					List <Object> list = new ArrayList<Object>();
 					 list = (List<Object>) SimIo.readIo();
 					System.out.println(list);
@@ -221,9 +217,7 @@ public class MenuBar extends JMenuBar{
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				System.out.println("Simulator View");
-				if(mainFrame.getLength() == 100000 ||
-						mainFrame.getWidth() == 100000 ||
-						mainFrame.getTerrain() == SimulatorPane.Terrains.UNDEFINED){
+				if(mainFrame.getSimulatorpanel() == null){
 					new SimulatorDialogPane(mainFrame);
 				} else {
 					mainFrame.changeView(MainFrame.Views.SIMULATOR);

src/gui/panels/agenda/AgendaPane.java

@@ -1,15 +1,16 @@
 package gui.panels.agenda;
 
 import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import java.awt.Color;
+import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 
+import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+
 import agenda.Agenda;
 
 @SuppressWarnings("serial")
@@ -18,17 +19,15 @@ public class AgendaPane extends JPanel {
 	private	DaySelectorPane dayselector;
 	private InfoPane infopanel;
 	private final AgendaScrollPane agendapanel;
-	private String actName;
-	private String actInfo;
-	
+
 	public AgendaPane(Agenda agenda){
-		this.actName = "Act";
-		this.actInfo = "Act info";
 		this.setOpaque(true);
+		setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
+		setBackground(Color.white);
 		setLayout(new BorderLayout());
 		
-		infopanel = new InfoPane(actName, actInfo);
-
+		
+		infopanel = new InfoPane("Act", "Actinfo");
 		agendapanel = new AgendaScrollPane(agenda, infopanel);
 		dayselector = new DaySelectorPane();
 		
@@ -46,69 +45,24 @@ public class AgendaPane extends JPanel {
 			setCurrentdate(new GregorianCalendar(date.get(Calendar.YEAR), date.get(Calendar.MONTH), date.get(Calendar.DAY_OF_MONTH)));
 		}
 
-
-		dayselector.getButtonLeft().addMouseListener(new MouseListener() {
+		dayselector.getButtonLeft().addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent e) {
 				currentdate.add(Calendar.DAY_OF_MONTH, -1);
 				setCurrentdate(currentdate);
-						}
-			@Override
-			public void mouseEntered(MouseEvent arg0) {
-				
-			}
-			@Override
-			public void mouseExited(MouseEvent arg0) {
-				
-			}
-			@Override
-			public void mousePressed(MouseEvent arg0) {
-				
-			}
-
-			@Override
-			public void mouseReleased(MouseEvent arg0) {
-
 			}
 		});
-		dayselector.getButtonRight().addMouseListener(new MouseListener() {
+		dayselector.getButtonRight().addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent e) {
 				currentdate.add(Calendar.DAY_OF_MONTH, 1);
 				setCurrentdate(currentdate);
 			}
-			@Override
-			public void mouseEntered(MouseEvent arg0) {
-				
-			}
-			@Override
-			public void mouseExited(MouseEvent arg0) {
-				
-			}
-			@Override
-			public void mousePressed(MouseEvent arg0) {
-				
-			}
-
-			@Override
-			public void mouseReleased(MouseEvent arg0) {
-
-			}
 		});
 	}
 	public void setCurrentdate(GregorianCalendar date){
 		this.currentdate = date;
 		dayselector.setDate(date);
 		agendapanel.setDate(currentdate);
-	}
-	
-	public void setActName(String name){
-		this.actName = name;
-	}
-	
-	public void setActInfo(String info){
-		this.actInfo = info;
-	}
-	
-	
+	}	
 }

src/gui/panels/agenda/AgendaScrollPane.java

@@ -4,9 +4,11 @@ import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Cursor;
 import java.awt.Dimension;
+import java.awt.Font;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
+import java.awt.RenderingHints;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
@@ -26,14 +28,14 @@ public class AgendaScrollPane extends JPanel {
 	private int xdifference, ydifference, xspacing;
 	private final int yspacing = 45;
 	private final int itempadding = 10;
-	private final int heightoffset = 100;
+	private final int heightoffset = 50;
 	GregorianCalendar currentdate;
 	Agenda agenda;
 	
 	
 	public AgendaScrollPane(final Agenda agenda, InfoPane pane){
 		this.setOpaque(true);
-		this.setBackground(Color.WHITE);
+		this.setBackground(new Color(247,247,247));
 		this.infoPane = pane;
 		this.agenda = agenda;
 		this.setPreferredSize(new Dimension(600, yspacing*48+heightoffset));
@@ -158,7 +160,7 @@ public class AgendaScrollPane extends JPanel {
 		currentdate = date;
 		for(Act act : agenda.getActs()){
 			if(currentdate.compareTo(act.getActTime().getBeginTime()) <= 1 && currentdate.compareTo(act.getActTime().getEndTime()) >= -1){
-				agendaItems.add(new AgendaItemShape(act, agenda.getStages().indexOf(act.getStage()), new Color(250,209,101)));
+				agendaItems.add(new AgendaItemShape(act, agenda.getStages().indexOf(act.getStage()), new Color(200,40,40,240)));
 			}
 		}
 		for(AgendaItemShape a:agendaItems){
@@ -170,6 +172,7 @@ public class AgendaScrollPane extends JPanel {
 	public void paintComponent(Graphics g){
 		super.paintComponent(g);
 		Graphics2D g2 = (Graphics2D)g;	
+		g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON);
         if(agenda.getStages().size() == 0){
             xspacing = 0;
         }else{
@@ -215,8 +218,9 @@ public class AgendaScrollPane extends JPanel {
 		g2.setColor(Color.LIGHT_GRAY);
 		g2.fillRect(0, 0, getWidth(), heightoffset);
 		for(int i = 0; i < agenda.getStages().size(); i++){
+			g2.setFont(new Font("Arial", Font.PLAIN, 16));
 			g2.setColor(Color.black);
-			g2.drawString(agenda.getStages().get(i).getName(), i*xspacing+itempadding, heightoffset/2);
+			g2.drawString(agenda.getStages().get(i).getName(), i*xspacing+itempadding+140, heightoffset/2+5);
 			g2.setColor(new Color (100,100,100, 70));
 			g2.drawLine(i*xspacing, getHeight(), i*xspacing, 0); //draws the vertical separation lines
 		}

src/gui/panels/agenda/DaySelectorPane.java

@@ -7,7 +7,6 @@ import java.util.Calendar;
 import java.util.GregorianCalendar;
 
 import javax.swing.ImageIcon;
-import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 

src/gui/panels/agenda/InfoField.java

@@ -23,7 +23,6 @@ public class InfoField extends JPanel {
 		border.setTitleFont(new Font("Arial", Font.PLAIN, 14));
 		border.setTitleColor(new Color(51,51,51));
 		this.setOpaque(false);
-		this.setBackground(Color.WHITE);
 	}
 	
 	public void setLabel(String text){

src/gui/panels/agenda/InfoPane.java

@@ -5,30 +5,23 @@ import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
 
+import javax.swing.BorderFactory;
 import javax.swing.JPanel;
-import javax.swing.border.LineBorder;
 
 @SuppressWarnings("serial")
 public class InfoPane extends JPanel{
 	
 	private String festivalName;
 	private String festivalInfo;
-	private String actName;
-	private String actInfo;	
 	private InfoField upperPanel;
 	private InfoField middlePanel;
 	
-	public InfoPane(String actName, String actInfo){
-		
+	public InfoPane(String actName, String actInfo){	
 		this.festivalName = "Festival";
 		this.festivalInfo = "Random Festival";
-		this.actName = actName;
-		this.actInfo = actInfo;
-		this.setBackground(new Color(242,241,237));
-		this.setBorder(new LineBorder(new Color(0, 0, 0), 1, true));
+		setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
 		this.setLayout(new GridBagLayout());
 		this.setOpaque(false);
-		this.setBackground(Color.WHITE);
 		
 		upperPanel = new InfoField(festivalName, festivalInfo);
 		GridBagConstraints c = new GridBagConstraints();
@@ -54,10 +47,8 @@ public class InfoPane extends JPanel{
 	}
 
 
-	public void setMiddleText(String actName, String actInfo){
-		
+	public void setMiddleText(String actName, String actInfo){		
 		middlePanel.setBorder(actName);
 		middlePanel.setLabel(actInfo);
-		
 	}
 }