Gilian Joosen преди 10 години
родител
ревизия
7c925b3334

+ 3 - 1
src/gui/simulator/AccessPoint.java

@@ -1,11 +1,13 @@
 package gui.simulator;
 
+import gui.simulator.facilities.ImageType;
+
 import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
 
 public class AccessPoint extends DrawEngine implements Serializable {
 	
-	private static Images.ImageType images = Images.ImageType.Entrance;
+	private static ImageType images = ImageType.Entrance;
 	private static String facilityName = "Ingang";
 	private Terrain terrain;
 	

+ 3 - 1
src/gui/simulator/Border.java

@@ -1,5 +1,7 @@
 package gui.simulator;
 
+import gui.simulator.facilities.ImageType;
+
 import java.awt.Graphics2D;
 import java.awt.Shape;
 import java.awt.geom.Point2D;
@@ -10,7 +12,7 @@ import java.io.Serializable;
 
 public class Border extends DrawEngine implements Serializable {
 
-	private static Images.ImageType images = Images.ImageType.Border;
+	private static ImageType images = ImageType.Border;
 	private static String facilityName = "Border";
 	private int width;
 	private int height;

+ 3 - 1
src/gui/simulator/ExitPoint.java

@@ -1,11 +1,13 @@
 package gui.simulator;
 
+import gui.simulator.facilities.ImageType;
+
 import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
 
 public class ExitPoint extends DrawEngine implements Serializable {
 	
-	private static Images.ImageType images = Images.ImageType.Exit;
+	private static ImageType images = ImageType.Exit;
 	private static String facilityName = "Uitgang";
 	private Terrain terrain;
 

+ 0 - 3
src/gui/simulator/Topbar.java

@@ -1,7 +1,6 @@
 package gui.simulator;
 
 import gui.simulator.facilities.ImageType;
-
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Font;
@@ -14,9 +13,7 @@ import java.awt.geom.GeneralPath;
 import java.io.Serializable;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
-
 import javax.swing.JDialog;
-
 import agenda.Agenda;
 
 public class Topbar implements MouseListener, Serializable{

+ 4 - 5
src/gui/simulator/facilities/Stage.java

@@ -1,23 +1,22 @@
 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 Stage extends DrawEngine implements Serializable{
 
-	private static Images.ImageType images = Images.ImageType.Tent;
+	private static ImageType images = ImageType.Tent;
 	private static String facilityName = "Stage";
 
     public Stage(int x, int y, Terrain terrain) {
-        super(images, x, y, 1, 0,SimulatorPane.Objects.STAGE, terrain);
+        super(images, x, y, 1, 0,SimulatorPane.Objects.STAGE, terrain, new Rectangle2D.Double(20, 250, 350, 200), false);
     }
 
     public Stage(int x, int y, double scale, double distance, Terrain terrain) {
-        super(images, x, y, scale, distance,SimulatorPane.Objects.STAGE, terrain);
+        super(images, x, y, scale, distance,SimulatorPane.Objects.STAGE, terrain, new Rectangle2D.Double(20, 250, 350, 200), false);
     }
     
     public String getFacilityName(){