Some fixes for database upload

src/agenda/Agenda.java

@@ -32,11 +32,11 @@ public class Agenda implements Serializable {
         this.artists.add(new Artist("Sabaton", "Power metal"));
 
         //acts
-//        this.acts.add(new Act(this.artists.get(0).getName(), this.stages.get(0), "Heavy metal", new ActTime(2015,02,11,21,00  ,2015,02,11,23,00), this.artists.get(0)));
-//        this.acts.add(new Act(this.artists.get(1).getName(), this.stages.get(1), "Test metal" , new ActTime(2015,02,11,23,00  ,2015,02,12,04,30), this.artists.get(1)));
-//        this.acts.add(new Act(this.artists.get(2).getName(), this.stages.get(0), "Power metal" ,new ActTime(2015,02,11,20,00  ,2015,02,11,23,00), this.artists.get(2)));
+//        this.acts.add(new Act(this.artists.get(0).getName(), this.stages.get(0), "Heavy metal", new ActTime(2015,02,11,21,00  ,2015,02,11,23,00), 5, this.artists.get(0)));
+//        this.acts.add(new Act(this.artists.get(1).getName(), this.stages.get(1), "Test metal" , new ActTime(2015,02,11,23,00  ,2015,02,12,04,30), 5, this.artists.get(1)));
+//        this.acts.add(new Act(this.artists.get(2).getName(), this.stages.get(0), "Power metal" ,new ActTime(2015,02,11,20,00  ,2015,02,11,23,00), 4, this.artists.get(2)));
         
-        System.out.println(this);
+        //System.out.println(this);
     }
     
     public List<Stage> getStages() {

src/agenda/Database.java

@@ -15,17 +15,24 @@ public class Database {
   private String pass = "tzHnYRbpt7r3z4jt";
   
   //get agenda values
-  private Agenda agenda = new Agenda();
-  private ArrayList<Act> acts = (ArrayList<Act>) agenda.getActs();
-  
+  private Agenda agenda;
+  private ArrayList<Act> acts;
 
+  public Database(Agenda agenda){
+	  this.agenda = agenda;
+	  acts = (ArrayList<Act>) agenda.getActs();
+  }
+  
   public void writeDatabase() throws Exception {
+	  for(Act act : agenda.getActs()){
+		  System.out.println(act);
+	  }
     try {
       Class.forName("com.mysql.jdbc.Driver");
       connect = DriverManager.getConnection(host,user,pass);
 
       //first check if agenda already exists in DB, otherwise delete everything
-       
+      System.out.println("test1");
 	//insert stage names
       for(Act act : acts){
     	  String name = act.getName();
@@ -40,13 +47,14 @@ public class Database {
     	  System.out.println(endTime);
     	  System.out.println(popularity);
     	  //insert data into database
-    	  preparedStatement = connect.prepareStatement("insert into  festivalagenda.Act (agenda_view_id, begintijd, eindtijd, naam, genre, populariteit) values (0, ?, ?, ?, ?, ?)");
+    	  preparedStatement = connect.prepareStatement("insert into  festivalagenda.Act (agenda_view_id, stage_id, begintijd, eindtijd, naam, genre, populariteit) values (1, 1, ?, ?, ?, ?, ?)");
     	  preparedStatement.setString(1, beginTime);
     	  preparedStatement.setString(2, endTime);
           preparedStatement.setString(3, name);
           preparedStatement.setString(4, genre);
           preparedStatement.setInt(5, popularity);
           preparedStatement.executeUpdate();
+          System.out.println("test2");
       }
             
     } catch (Exception e) {

src/gui/frames/MainFrame.java

@@ -39,7 +39,7 @@ public class MainFrame extends JFrame{
 		this.setBounds(100,100,1440,900);
 		this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		this.setUndecorated(false);
-		this.setJMenuBar(new MenuBar(this));
+		this.setJMenuBar(new MenuBar(this, agenda));
 		this.setVisible(true);
 
 		this.length = 100000;

src/gui/menubar/MenuBar.java

@@ -25,9 +25,12 @@ import agenda.Io;
 public class MenuBar extends JMenuBar{
 
 	private MainFrame mainFrame;
+	private Agenda agenda;
 
-	public MenuBar(MainFrame frame){
+	//add agenda because Database needs it to acces all inserted acts
+	public MenuBar(MainFrame frame, Agenda agenda){
 		this.mainFrame = frame;
+		this.agenda = agenda;
 		initialize();
 	}
 
@@ -102,9 +105,10 @@ public class MenuBar extends JMenuBar{
 		fileMenu.add(uploadAction);
 		uploadAction.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
-				Database database = new Database();
+				Database database = new Database(agenda);
 				try {
 					database.writeDatabase();
+					System.out.println("Act data send to database");
 				} catch (Exception e) {
 					e.printStackTrace();
 					System.out.println("Database error");

src/gui/simulator/Terrain.java

@@ -387,6 +387,7 @@ public class Terrain extends JPanel {
             g2.fill(this.selectedObject.getAffineTransform().createTransformedShape(this.selectedObject.getRect()));
             g2.setTransform(oldTransform);
         }
+        g2.setClip(null);
     }
 
     private Rectangle drawDragRectangle(DrawEngine shape){