seperate sidebar class

src/gui/simulator/Sidebar.java

@@ -24,7 +24,7 @@ public class Sidebar {
 		this.sideBarHeight = screenHeight;
 		this.terrain = terrain;
 		
-		System.out.println(screenHeight); System.out.println(sideBarWidth); System.out.println(terrain);
+		System.out.println(this.sideBarHeight); System.out.println(this.sideBarWidth); System.out.println(this.terrain);
 	}
 	
 	public void draw(Graphics2D g2){

src/gui/simulator/Terrain.java

@@ -33,10 +33,11 @@ public class Terrain extends JPanel {
     private Point2D oldPosition;
     private Draw dragObject, selectedObject;
     private BufferedImage background;
+    private Sidebar sidebar;
     
     private int festivalheight, festivalwidth;
+    private int sideBarWidth = 200;
     private SimulatorPane.Terrains terrain;
-    private Sidebar sidebar;
     Point2D cameraPoint = new Point2D.Double(festivalwidth/2,festivalheight/2);
 	float cameraScale = 1;
 	
@@ -47,8 +48,9 @@ public class Terrain extends JPanel {
     	//get values
     	setFestivalHeight(length);
     	setFestivalWidth(width);
-    	sidebar = new Sidebar(200, getFestivalHeight(), this);
     	this.terrain = terrain;
+    	//initialize sidebar
+    	sidebar = new Sidebar(200, getFestivalHeight(), this);
     	//set terrainbackground
     	switch(terrain){
     	case BEACH: 
@@ -84,15 +86,15 @@ public class Terrain extends JPanel {
     	Point2D clickPoint = getClickPoint(e.getPoint());
     	if(e.getX() < 200)
 		{
-    		if(e.getY() < 300){
+			if(e.getY() < 300){
 				dragObject = new Stage((int)clickPoint.getX(),(int)clickPoint.getY(), 0.5, 10);
-			}else if(e.getY() > 300 && e.getY() < 500){
+			}else if(e.getY() > 300 && e.getY() < 550){
 				dragObject = new RestRoom((int)clickPoint.getX(),(int)clickPoint.getY(), 0.5, 10);
-			}else if(e.getY() > 500 && e.getY() < 700){
+			}else if(e.getY() > 550 && e.getY() < 800){
 				dragObject = new AccessPoint(this, (int)clickPoint.getX(),(int)clickPoint.getY(), 0.5, 10);
 			}
-			else if(e.getY() > 700 && e.getY() < 900){
-				dragObject = new ExitPoint(this, (int)clickPoint.getX(),(int)clickPoint.getY(), 0.5, 10);
+			else if(e.getY() > 800 && e.getY() < 1100){
+				//dragObject = new custom facility
 			}
 			entities.add(dragObject);
 		}
@@ -107,7 +109,7 @@ public class Terrain extends JPanel {
                 //if selected in sidebar
 				getFacility(e);
                 //else selected in terrain
-                if(e.getX() > sidebar.getSideBarWidth()){
+                if(e.getX() > sideBarWidth){
 	                for(Draw drawObject: entities){
 	                    if(drawObject.contains(clickPoint)){
 	                        dragObject = drawObject;
@@ -195,11 +197,10 @@ public class Terrain extends JPanel {
     public void paint(Graphics g) {
         super.paint(g);
         Graphics2D g2 = (Graphics2D) g;
-        
-        //draw sidebar
         sidebar.draw(g2);
         
-//        g2.setClip(new Rectangle2D.Double(0,0, 200, getHeight()));
+        //draw sidebar
+//        g2.setClip(new Rectangle2D.Double(0,0, sideBarWidth, getHeight()));
 //        g2.setColor(Color.GRAY);
 //        g2.fill3DRect(0, 0, 200, 50, true);
 //        g2.setColor(Color.WHITE);
@@ -218,9 +219,6 @@ public class Terrain extends JPanel {
 //        Draw object3 = new AccessPoint(this, 0,550, 0.5, 10);
 //        object3.draw(g2);
 //        g2.drawString("ingang", 70, 675);
-//        Draw object4 = new ExitPoint(this, 0,700, 0.5, 10);
-//        object4.draw(g2);
-//        g2.drawString("uitgang", 70, 800);
 		
 		//draw simulation field
 		g2.setClip(new Rectangle2D.Double(200, 0, getWidth()-200, getHeight()));