HUGE code cleanup, again. Removed the unused facility name everywhere. Added the beerbar to the sidebar. Changed the icons of the paths in the sidebar.

src/gui/simulator/DrawEngine.java

@@ -15,8 +15,8 @@ import java.io.Serializable;
  * Edited by master D Mathijssen on 17-3-2015 and some other days
  */
 public abstract class DrawEngine implements Serializable{
-
-    private ImageType image;
+	private static final long serialVersionUID = -4099697007386224936L;
+	private ImageType image;
     private double x, y, rotation, scale;
     private double distanceToOtherObjects;
     public SimulatorPane.Objects type;
@@ -75,6 +75,26 @@ public abstract class DrawEngine implements Serializable{
         Point2D.Double center = new Point2D.Double(x + Images.getImage(image).getWidth(null)*scale / 2, y + Images.getImage(image).getHeight(null)*scale/2);
         return center;
     }
+    
+    public void remove(){
+        this.terrain.getEntities().remove(this);
+        this.terrain.removeWalkingPaths(this);
+    }
+    
+    public void changeLocation(Location loc){
+		switch(loc){
+		case NORTH:
+			//Visitors spawn north
+		case EAST:
+			//Visitors spawn east
+		case SOUTH:
+			//Visitors spawn south
+		case WEST:
+			//Visitors spawn west
+		default:
+			break;
+		}
+	}
 
     //getters and setters down here
     public double getX() {
@@ -124,27 +144,4 @@ public abstract class DrawEngine implements Serializable{
     public Rectangle2D.Double getRect(){
         return new Rectangle2D.Double(-distanceToOtherObjects, - distanceToOtherObjects, Images.getImage(image).getWidth(null)  + 2* distanceToOtherObjects, Images.getImage(image).getHeight(null) + 2*distanceToOtherObjects);
     }
-
-    public void remove(){
-        this.terrain.getEntities().remove(this);
-        this.terrain.removeWalkingPaths(this);
-    }
-    
-    public abstract String getFacilityName();
-    
-    public void changeLocation(Location loc){
-		switch(loc){
-		case NORTH:
-			//Visitors spawn north
-		case EAST:
-			//Visitors spawn east
-		case SOUTH:
-			//Visitors spawn south
-		case WEST:
-			//Visitors spawn west
-		default:
-			break;
-		}
-	}
-
 }

src/gui/simulator/Images.java

@@ -51,6 +51,7 @@ public class Images implements Serializable{
 			images.add(ImageIO.read(Window.class.getResource("/topbar/grid.png")));
 			images.add(ImageIO.read(Window.class.getResource("/topbar/people.png")));
 			images.add(ImageIO.read(Window.class.getResource("/topbar/pauze.png")));
+			images.add(ImageIO.read(Window.class.getResource("/simulator/beerbar.png")));
 			//images.add(ImageIO.read(Main.class.getResource("")));
 
 			tp.add(new TexturePaint(Images.getImage(ImageType.Sand), new Rectangle2D.Double(0, 0, 200, 200)));

src/gui/simulator/Sidebar.java

@@ -1,6 +1,9 @@
 package gui.simulator;
 
 import gui.simulator.Images.TextPaint;
+import gui.simulator.facilities.AccessPoint;
+import gui.simulator.facilities.BeerBar;
+import gui.simulator.facilities.ExitPoint;
 import gui.simulator.facilities.Fence;
 import gui.simulator.facilities.PalmTree1;
 import gui.simulator.facilities.RestRoom;
@@ -73,22 +76,14 @@ public class Sidebar implements Serializable  {
 		//stages
 		drawableStages.put("Stage1", new SimulatorStage(0, 0, 0.26, 1, terrain));
 		drawableStages.put("Stage2",new SimulatorStage(0, 0, 0.26, 1, terrain));
-		drawableStages.put("Stage3",new SimulatorStage(0, 0, 0.26, 1, terrain));
-		drawableStages.put("Stage4", new SimulatorStage(0, 0, 0.26, 1, terrain));
-		drawableStages.put("Stage5", new SimulatorStage(0, 0, 0.26, 1, terrain));
-		drawableStages.put("Stage6", new SimulatorStage(0, 0, 0.26, 1, terrain));
-		drawableStages.put("Stage7", new SimulatorStage(0, 0, 0.26, 1, terrain));
-		drawableStages.put("Stage8", new SimulatorStage(0, 0, 0.26, 1, terrain));
-		drawableStages.put("Stage9", new SimulatorStage(0, 0, 0.26, 1, terrain));
-		drawableStages.put("Stage10", new SimulatorStage(0, 0, 0.26, 1, terrain));
-		drawableStages.put("Stage11", new SimulatorStage(0, 0, 0.26, 1, terrain));
 		
 		//facilities
 		drawableFacilities.put("Toilet", new RestRoom(0, 0, 0.8, 1, this.terrain));
 		drawableFacilities.put("Ingang", new AccessPoint(terrain, 0, 0, 0.26, 1));
 		drawableFacilities.put("Uitgang", new ExitPoint(terrain, 0, 0, 0.26, 1));
-		drawableFacilities.put("Snackbar", new SnackBar(0, 0, 0.2, 1, this.terrain));
-		drawableFacilities.put("Wegwijzer", new WayPoint(0, 0, 0.8, 1, this.terrain));
+		drawableFacilities.put("Snackbar", new SnackBar(0, 0, 0.3, 1, this.terrain));
+		drawableFacilities.put("Beerbar", new BeerBar(0, 0, 0.3, 1, this.terrain));
+		drawableFacilities.put("Wegwijzer", new WayPoint(0, 0, 0.6, 1, this.terrain));
 		
 		//paths
 		drawablePaths.put("Repak", Images.TextPaint.TPPathGroundStone);
@@ -167,7 +162,7 @@ public class Sidebar implements Serializable  {
 			for(Entry<String, DrawEngine> object : drawableArrays.get(currentTab.getValue()).entrySet()){
 				object.getValue().setX(objectPlacementX);
 				object.getValue().setY(objectPlacementY);
-				if(object.getValue().getFacilityName() == "Fence")
+				if(object.getValue().type == SimulatorPane.Objects.FENCE)
 					object.getValue().setY(objectPlacementY+50);
 				object.getValue().draw(g2);
 				g2.drawString(object.getKey(), objectPlacementX+2, objectPlacementY + 95);

src/gui/simulator/Terrain.java

@@ -2,6 +2,8 @@ package gui.simulator;
 
 import gui.simulator.Images.TextPaint;
 import gui.simulator.SimulatorPane.Objects;
+import gui.simulator.facilities.AccessPoint;
+import gui.simulator.facilities.ExitPoint;
 import gui.simulator.facilities.ImageType;
 import gui.simulator.facilities.SimulatorStage;
 

src/gui/simulator/facilities/AccessPoint.java

@@ -1,36 +1,26 @@
-package gui.simulator;
+package gui.simulator.facilities;
 
-import gui.simulator.Terrain.Location;
-import gui.simulator.facilities.ImageType;
+import gui.simulator.DrawEngine;
+import gui.simulator.SimulatorPane;
+import gui.simulator.Terrain;
 
 import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
 
 public class AccessPoint extends DrawEngine implements Serializable {
-	
+	private static final long serialVersionUID = -6336513499960175329L;
 	private static ImageType images = ImageType.Entrance;
-	private static String facilityName = "Ingang";
-	private Terrain terrain;
-	
 	
-    //TODO change visilibty
     public AccessPoint(Terrain terrain, int x, int y) {
-        super(images, x, y, 1, 0, SimulatorPane.Objects.ENTRANCE, terrain, new Rectangle2D.Double(-10, -10, 430, 170), true);
-        this.terrain = terrain;
+        super(images, x, y, 1, 0, SimulatorPane.Objects.ENTRANCE, terrain, new Rectangle2D.Double(-10, -10, 430, 170), false);
     }
 
     public AccessPoint(Terrain terrain, int x, int y, double scale, double distance) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.ENTRANCE, terrain, new Rectangle2D.Double(-10, -10, 430, 170), true);
-        this.terrain = terrain;
+        super(images, x, y, scale, distance, SimulatorPane.Objects.ENTRANCE, terrain, new Rectangle2D.Double(-10, -10, 430, 170), false);
     }
     
     public AccessPoint(int x, int y, double scale, double distance, Terrain terrain) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.ENTRANCE, terrain, new Rectangle2D.Double(-10, -10, 430, 170), true);
-        this.terrain = terrain;
-    }
-    
-    public String getFacilityName(){
-    	return facilityName;
+        super(images, x, y, scale, distance, SimulatorPane.Objects.ENTRANCE, terrain, new Rectangle2D.Double(-10, -10, 430, 170), false);
     }
     
     

src/gui/simulator/facilities/BeerBar.java

@@ -1,7 +1,6 @@
 package gui.simulator.facilities;
 
 import gui.simulator.DrawEngine;
-import gui.simulator.Images;
 import gui.simulator.SimulatorPane;
 import gui.simulator.Terrain;
 
@@ -9,20 +8,13 @@ import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
 
 public class BeerBar extends DrawEngine implements Serializable{
-
+	private static final long serialVersionUID = -8840007124025446730L;
 	private static ImageType images = ImageType.BeerBar;
-	private static String facilityName = "BeerBar";
-
-    //TODO change visibility
     public BeerBar(int x, int y, Terrain terrain) {
-        super(images, x, y, 1, 0, SimulatorPane.Objects.BEERBAR, terrain, new Rectangle2D.Double(-30, -30, 450, 450), true);
+        super(images, x, y, 1, 0, SimulatorPane.Objects.DRINK, terrain, new Rectangle2D.Double(-30, -30, 450, 450), false);
     }
 
     public BeerBar(int x, int y, double scale, double distance, Terrain terrain) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.BEERBAR, terrain, new Rectangle2D.Double(-30, -30, 450, 450), true);
-    }
-    
-    public String getFacilityName(){
-    	return facilityName;
+        super(images, x, y, scale, distance, SimulatorPane.Objects.DRINK, terrain, new Rectangle2D.Double(-30, -30, 450, 450), false);
     }
 }

src/gui/simulator/facilities/ExitPoint.java

@@ -1,28 +1,21 @@
-package gui.simulator;
+package gui.simulator.facilities;
 
-import gui.simulator.facilities.ImageType;
+import gui.simulator.DrawEngine;
+import gui.simulator.SimulatorPane;
+import gui.simulator.Terrain;
 
 import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
 
 public class ExitPoint extends DrawEngine implements Serializable {
-	
+	private static final long serialVersionUID = 3858969094152200452L;
 	private static ImageType images = ImageType.Exit;
-	private static String facilityName = "Uitgang";
-	private Terrain terrain;
 
-    //TODO change visibility
     public ExitPoint(Terrain terrain, int x, int y, double scale, double distance) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.EXIT, terrain, new Rectangle2D.Double(-10, -10, 430, 170), true);
-        this.terrain = terrain;
+        super(images, x, y, scale, distance, SimulatorPane.Objects.EXIT, terrain, new Rectangle2D.Double(-10, -10, 430, 170), false);
     }
     
     public ExitPoint(int x, int y, double scale, double distance, Terrain terrain) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.EXIT, terrain, new Rectangle2D.Double(-10, -10, 430, 170), true);
-        this.terrain = terrain;
-    }
-
-    public String getFacilityName(){
-    	return facilityName;
+        super(images, x, y, scale, distance, SimulatorPane.Objects.EXIT, terrain, new Rectangle2D.Double(-10, -10, 430, 170), false);
     }
 }

src/gui/simulator/facilities/Fence.java

@@ -1,7 +1,6 @@
 package gui.simulator.facilities;
 
 import gui.simulator.DrawEngine;
-import gui.simulator.Images;
 import gui.simulator.SimulatorPane;
 import gui.simulator.Terrain;
 
@@ -9,20 +8,14 @@ import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
 
 public class Fence extends DrawEngine implements Serializable {
-
+	private static final long serialVersionUID = 2143331280981764637L;
 	private static ImageType images = ImageType.Fence;
-	private static String facilityName = "Fence";
 
-    //TODO Make this invisible
-    public Fence(int x, int y, Terrain terrain) {
-        super(images, x, y, 1, 0, SimulatorPane.Objects.FENCE, terrain, new Rectangle2D.Double(-50, -20, 340, 60), true);
+	public Fence(int x, int y, Terrain terrain) {
+        super(images, x, y, 1, 0, SimulatorPane.Objects.FENCE, terrain, new Rectangle2D.Double(-50, -20, 340, 60), false);
     }
 
     public Fence(int x, int y, double scale, double distance, Terrain terrain) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.FENCE, terrain, new Rectangle2D.Double(-50, -20, 340, 60), true);
-    }
-    
-    public String getFacilityName(){
-    	return facilityName;
+        super(images, x, y, scale, distance, SimulatorPane.Objects.FENCE, terrain, new Rectangle2D.Double(-50, -20, 340, 60), false);
     }
 }

src/gui/simulator/facilities/PalmTree1.java

@@ -1,16 +1,14 @@
 package gui.simulator.facilities;
 
 import gui.simulator.DrawEngine;
-import gui.simulator.Images;
 import gui.simulator.SimulatorPane;
 import gui.simulator.Terrain;
 
 import java.io.Serializable;
 
 public class PalmTree1 extends DrawEngine implements Serializable {
-
+	private static final long serialVersionUID = -6674848204806417490L;
 	private static ImageType images = ImageType.PalmTree1;
-	private static String facilityName = "PalmTree1";
 
     public PalmTree1(int x, int y, Terrain terrain) {
         super(images, x, y, 1, 0, SimulatorPane.Objects.PALMTREE1, terrain, null, false);
@@ -19,8 +17,4 @@ public class PalmTree1 extends DrawEngine implements Serializable {
     public PalmTree1(int x, int y, double scale, double distance, Terrain terrain) {
         super(images, x, y, scale, distance, SimulatorPane.Objects.PALMTREE1, terrain, null, false);
     }
-    
-    public String getFacilityName(){
-    	return facilityName;
-    }
 }

src/gui/simulator/facilities/RestRoom.java

@@ -1,28 +1,21 @@
 package gui.simulator.facilities;
 
-import java.awt.geom.Rectangle2D;
-import java.io.Serializable;
-
 import gui.simulator.DrawEngine;
-import gui.simulator.Images;
 import gui.simulator.SimulatorPane;
 import gui.simulator.Terrain;
 
-public class RestRoom extends DrawEngine implements Serializable {
+import java.awt.geom.Rectangle2D;
+import java.io.Serializable;
 
+public class RestRoom extends DrawEngine implements Serializable {
+	private static final long serialVersionUID = -5709468998996035730L;
 	private static ImageType images = ImageType.Toilet;
-	private static String facilityName = "Toilet";
 
-    //TODO change visibility
     public RestRoom(int x, int y, Terrain terrain) {
-        super(images, x, y, 1, 0, SimulatorPane.Objects.RESTROOM, terrain, new Rectangle2D.Double(-30, -30, 150, 150), true);
+        super(images, x, y, 1, 0, SimulatorPane.Objects.RESTROOM, terrain, new Rectangle2D.Double(-30, -30, 150, 150), false);
     }
 
     public RestRoom(int x, int y, double scale, double distance, Terrain terrain) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.RESTROOM, terrain, new Rectangle2D.Double(-30, -30, 150, 150), true);
-    }
-    
-    public String getFacilityName(){
-    	return facilityName;
+        super(images, x, y, scale, distance, SimulatorPane.Objects.RESTROOM, terrain, new Rectangle2D.Double(-30, -30, 150, 150), false);
     }
 }

src/gui/simulator/facilities/SimulatorStage.java

@@ -1,5 +1,9 @@
 package gui.simulator.facilities;
 
+import gui.simulator.DrawEngine;
+import gui.simulator.SimulatorPane;
+import gui.simulator.Terrain;
+
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.geom.GeneralPath;
@@ -8,23 +12,15 @@ import java.io.Serializable;
 
 import agenda.Act;
 import agenda.Stage;
-import gui.simulator.DrawEngine;
-import gui.simulator.Images;
-import gui.simulator.SimulatorPane;
-import gui.simulator.Terrain;
 
 public class SimulatorStage extends DrawEngine implements Serializable {
-
+	private static final long serialVersionUID = 2131624449588308870L;
 	private static ImageType images = ImageType.Tent;
-	private static String facilityName = "Stage";
     private Stage stage;
     private Act playingact;
     private int movement1,movement2;
     private long lastTime;
-	private Rectangle2D.Double walkArea = new Rectangle2D.Double(20, 250, 350, 200);
-
-	//walk area
-	private static final int WALKAREAHEIGHT = 200;
+	private static final int WALKAREAHEIGHT = 200; 	//walk area
 
     public SimulatorStage(int x, int y, Terrain terrain, boolean drawWalkArea) {
         super(images, x, y, 1, 0, SimulatorPane.Objects.STAGE, terrain, new Rectangle2D.Double(20, 250, 350, WALKAREAHEIGHT), drawWalkArea);
@@ -41,32 +37,11 @@ public class SimulatorStage extends DrawEngine implements Serializable {
 		changeLightbeam();
 	}
 
-
 	public SimulatorStage(int x, int y, Terrain terrain) {
 		super(images, x, y, 1, 0,SimulatorPane.Objects.STAGE, terrain, new Rectangle2D.Double(20, 250, 350, WALKAREAHEIGHT), false);
 		changeLightbeam();
 	}
     
-    public String getFacilityName(){
-    	return facilityName;
-    }
-
-    public void setStage(Stage stage) {
-        this.stage = stage;
-    }
-
-    public Stage getStage() {
-        return stage;
-    }
-    
-    public Act getPlayingact() {
-		return playingact;
-	}
-
-	public void setPlayingact(Act playingact) {
-		this.playingact = playingact;
-	}
-
 	public void draw(Graphics2D g){
     	if(playingact != null){
         	if(System.currentTimeMillis() - lastTime > 1000) 
@@ -87,7 +62,6 @@ public class SimulatorStage extends DrawEngine implements Serializable {
 	    	g.fill(this.getAffineTransform().createTransformedShape(lightbeam));
     	}
     	super.draw(g);
-
     }
 
     public void changeLightbeam(){
@@ -95,4 +69,18 @@ public class SimulatorStage extends DrawEngine implements Serializable {
     	movement1 = (int) (Math.random()*70)-35;
     	movement2 = (int) (Math.random()*70)-35;
     }
+    
+    public void setStage(Stage stage) {
+        this.stage = stage;
+    }
+    public Stage getStage() {
+        return stage;
+    }
+   
+    public Act getPlayingact() {
+		return playingact;
+	}
+	public void setPlayingact(Act playingact) {
+		this.playingact = playingact;
+	}
 }

src/gui/simulator/facilities/SnackBar.java

@@ -1,28 +1,20 @@
 package gui.simulator.facilities;
 
-import java.awt.geom.Rectangle2D;
-import java.io.Serializable;
-
 import gui.simulator.DrawEngine;
-import gui.simulator.Images;
 import gui.simulator.SimulatorPane;
 import gui.simulator.Terrain;
 
-public class SnackBar extends DrawEngine implements Serializable{
+import java.awt.geom.Rectangle2D;
+import java.io.Serializable;
 
+public class SnackBar extends DrawEngine implements Serializable{
+	private static final long serialVersionUID = -3340675439900668254L;
 	private static ImageType images = ImageType.Snackbar;
-	private static String facilityName = "Snackbar";
 
-    //TODO change visibility
     public SnackBar(int x, int y, Terrain terrain) {
-        super(images, x, y, 1, 0, SimulatorPane.Objects.SNACKBAR, terrain, new Rectangle2D.Double(-30, -30, 450, 450), true);
+        super(images, x, y, 1, 0, SimulatorPane.Objects.SNACKBAR, terrain, new Rectangle2D.Double(-30, -30, 450, 450), false);
     }
-
     public SnackBar(int x, int y, double scale, double distance, Terrain terrain) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.SNACKBAR, terrain, new Rectangle2D.Double(-30, -30, 450, 450), true);
-    }
-    
-    public String getFacilityName(){
-    	return facilityName;
+        super(images, x, y, scale, distance, SimulatorPane.Objects.SNACKBAR, terrain, new Rectangle2D.Double(-30, -30, 450, 450), false);
     }
 }

src/gui/simulator/facilities/Tree1.java

@@ -1,26 +1,18 @@
 package gui.simulator.facilities;
 
 import gui.simulator.DrawEngine;
-import gui.simulator.Images;
 import gui.simulator.SimulatorPane;
 import gui.simulator.Terrain;
 
 import java.io.Serializable;
 
 public class Tree1 extends DrawEngine implements Serializable {
-
+	private static final long serialVersionUID = 5407922567540861958L;
 	private static ImageType images = ImageType.Tree1;
-	private static String facilityName = "Tree1";
-
     public Tree1(int x, int y, Terrain terrain) {
         super(images, x, y, 1, 0, SimulatorPane.Objects.TREE1, terrain, null, false);
     }
-
     public Tree1(int x, int y, double scale, double distance, Terrain terrain) {
         super(images, x, y, scale, distance, SimulatorPane.Objects.TREE1, terrain, null, false);
     }
-    
-    public String getFacilityName(){
-    	return facilityName;
-    }
 }

src/gui/simulator/facilities/WayPoint.java

@@ -1,24 +1,15 @@
 package gui.simulator.facilities;
 
-import java.awt.geom.Rectangle2D;
-
 import gui.simulator.DrawEngine;
-import gui.simulator.Images;
 import gui.simulator.SimulatorPane;
 import gui.simulator.Terrain;
 
+import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
 
 public class WayPoint extends DrawEngine implements Serializable{
-
-	private static String facilityName = "WayPoint";
-	
+	private static final long serialVersionUID = -4294999763646986702L;
 	public WayPoint(int x, int y, double scale, double distance, Terrain terrain) {
-		super(ImageType.Crosspoint, x, y, scale, 1, SimulatorPane.Objects.WAYPOINT, terrain, new Rectangle2D.Double(-30, -30, 150, 150), true);
+		super(ImageType.Crosspoint, x, y, scale, 1, SimulatorPane.Objects.WAYPOINT, terrain, new Rectangle2D.Double(-30, -30, 150, 150), false);
 	}
-	
-    public String getFacilityName(){
-    	return facilityName;
-    }
-
 }