Avans/FestivalPlanner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KAas

Browse Source
This commit is contained in:
Yorick
2015-03-17 13:39:16 +01:00
parent 6dec40e70a c21af8db1a
commit f289bec571
13 changed files with 231 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Applicatie/DrawObject.java
+2
View File
@@ -129,6 +129,7 @@ public abstract class DrawObject
try try
{ {
return getTransform().inverseTransform(point, null); return getTransform().inverseTransform(point, null);
} catch (NoninvertibleTransformException e) } catch (NoninvertibleTransformException e)
{ {
e.printStackTrace(); e.printStackTrace();
@@ -166,6 +167,7 @@ public abstract class DrawObject
return true; return true;
else else
return false; return false;
} }
if (point.getX() > chosenCorner.getX() && point.getX() < chosenCorner.getX() + chosenCorner.getWidth() && point.getY() > chosenCorner.getY() && point.getY() < chosenCorner.getY() + chosenCorner.getHeight()) if (point.getX() > chosenCorner.getX() && point.getX() < chosenCorner.getX() + chosenCorner.getWidth() && point.getY() > chosenCorner.getY() && point.getY() < chosenCorner.getY() + chosenCorner.getHeight())
return true; return true;
Applicatie/MenuBar.java
+13 -10
View File
@@ -1,4 +1,5 @@
package Applicatie; package Applicatie;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
@@ -7,24 +8,26 @@ import javax.swing.JMenuBar;
import javax.swing.JMenuItem; import javax.swing.JMenuItem;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
public class MenuBar extends JMenuBar
{
public class MenuBar extends JMenuBar {
public MenuBar(Window w) public MenuBar(Window w)
{ {
super(); super();
JMenu file = new JMenu("File"); JMenu file = new JMenu("File");
JMenuItem exit = new JMenuItem("Exit"); JMenuItem exit = new JMenuItem("Exit");
exit.addActionListener(new ActionListener() { exit.addActionListener(new ActionListener()
public void actionPerformed(ActionEvent e) { {
System.exit(0); public void actionPerformed(ActionEvent e)
{
System.exit(0);
} }
}); });
file.add(exit); file.add(exit);
add(file); add(file);
} }
} }
Applicatie/Panel.java
+1 -6
View File
@@ -114,6 +114,7 @@ public class Panel extends JPanel
{ {
switch (index) switch (index)
{ {
case 0: case 0:
return new Stage(null); return new Stage(null);
case 1: case 1:
@@ -142,10 +143,6 @@ public class Panel extends JPanel
Graphics2D g2 = (Graphics2D) g; Graphics2D g2 = (Graphics2D) g;
g2.setClip(new Rectangle2D.Double(0, 0, getWidth(), 300)); g2.setClip(new Rectangle2D.Double(0, 0, getWidth(), 300));
// g2.fill(new Ellipse2D.Double(0,0,300,300));
// g2.drawImage(podiumImage, 0, 0, null);
g2.drawLine(0, 150, getWidth(), 150); g2.drawLine(0, 150, getWidth(), 150);
for (BufferedImage image : panelInfo) for (BufferedImage image : panelInfo)
{ {
@@ -164,7 +161,6 @@ public class Panel extends JPanel
BasicStroke stroke = new BasicStroke(10); BasicStroke stroke = new BasicStroke(10);
g2.setStroke(stroke); g2.setStroke(stroke);
for (DrawObject o : objects) for (DrawObject o : objects)
{ {
o.draw(g2); o.draw(g2);
@@ -178,7 +174,6 @@ public class Panel extends JPanel
{ {
AffineTransform tx = new AffineTransform(); AffineTransform tx = new AffineTransform();
tx.translate(-cameraPoint.getX() + getWidth() / 2, -cameraPoint.getY() + getHeight() / 2); tx.translate(-cameraPoint.getX() + getWidth() / 2, -cameraPoint.getY() + getHeight() / 2);
tx.scale(cameraScale, cameraScale); tx.scale(cameraScale, cameraScale);
return tx; return tx;
} }
Applicatie/PropertiesPanel.java
+105 -80
View File
@@ -21,7 +21,8 @@ import javax.swing.JPanel;
import javax.swing.JTextField; import javax.swing.JTextField;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class PropertiesPanel extends JPanel { public class PropertiesPanel extends JPanel
{
DrawObject selectedObject = null; DrawObject selectedObject = null;
Panel p = null; Panel p = null;
@@ -35,7 +36,8 @@ public class PropertiesPanel extends JPanel {
JTextField scaleField; JTextField scaleField;
JTextField rotationField; JTextField rotationField;
PropertiesPanel() { PropertiesPanel()
{
super(); super();
BoxLayout box = new BoxLayout(this, BoxLayout.PAGE_AXIS); BoxLayout box = new BoxLayout(this, BoxLayout.PAGE_AXIS);
setLayout(box); setLayout(box);
@@ -78,8 +80,10 @@ public class PropertiesPanel extends JPanel {
JPanel deletePanel = new JPanel(new FlowLayout(FlowLayout.LEFT)); JPanel deletePanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
JButton deleteButton = new JButton("Delete"); JButton deleteButton = new JButton("Delete");
deleteButton.setFont(new Font("Segoe UI", Font.PLAIN, 20)); deleteButton.setFont(new Font("Segoe UI", Font.PLAIN, 20));
deleteButton.addActionListener(new ActionListener() { deleteButton.addActionListener(new ActionListener()
public void actionPerformed(ActionEvent e) { {
public void actionPerformed(ActionEvent e)
{
p.removeObject(selectedObject); p.removeObject(selectedObject);
} }
}); });
@@ -109,27 +113,30 @@ public class PropertiesPanel extends JPanel {
locationXField = new JTextField(); locationXField = new JTextField();
locationXField.setPreferredSize(new Dimension(150, 25)); locationXField.setPreferredSize(new Dimension(150, 25));
{ {
locationXField.addKeyListener(new KeyListener() { locationXField.addKeyListener(new KeyListener()
{
public void keyTyped(KeyEvent e) { public void keyTyped(KeyEvent e)
{
} }
public void keyReleased(KeyEvent e) { public void keyReleased(KeyEvent e)
try { {
try
{
locationXField.setBackground(Color.WHITE); locationXField.setBackground(Color.WHITE);
double xpos = Double.parseDouble(locationXField double xpos = Double.parseDouble(locationXField.getText());
.getText()); selectedObject.setPosition(new Point2D.Double(xpos, selectedObject.getPosition().getY()));
selectedObject.setPosition(new Point2D.Double(xpos,
selectedObject.getPosition().getY()));
p.update(); p.update();
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe)
{
locationXField.setBackground(Color.RED); locationXField.setBackground(Color.RED);
} }
} }
public void keyPressed(KeyEvent e) { public void keyPressed(KeyEvent e)
{
} }
}); });
} }
locationXPanel.add(locationXField); locationXPanel.add(locationXField);
@@ -144,28 +151,32 @@ public class PropertiesPanel extends JPanel {
locationYField = new JTextField(); locationYField = new JTextField();
locationYField.setPreferredSize(new Dimension(150, 25)); locationYField.setPreferredSize(new Dimension(150, 25));
{ {
locationYField.addKeyListener(new KeyListener() { locationYField.addKeyListener(new KeyListener()
{
public void keyTyped(KeyEvent e) { public void keyTyped(KeyEvent e)
try { {
}
public void keyReleased(KeyEvent e)
{
try
{
locationYField.setBackground(Color.WHITE); locationYField.setBackground(Color.WHITE);
double ypos = Double.parseDouble(locationYField double ypos = Double.parseDouble(locationYField.getText());
.getText()); selectedObject.setPosition(new Point2D.Double(selectedObject.getPosition().getX(), ypos));
selectedObject.setPosition(new Point2D.Double(
selectedObject.getPosition().getX(), ypos));
; ;
p.update(); p.update();
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe)
{
locationYField.setBackground(Color.RED); locationYField.setBackground(Color.RED);
} }
} }
public void keyReleased(KeyEvent e) { public void keyPressed(KeyEvent e)
} {
public void keyPressed(KeyEvent e) {
} }
}); });
} }
@@ -190,26 +201,29 @@ public class PropertiesPanel extends JPanel {
scaleField = new JTextField(); scaleField = new JTextField();
scaleField.setPreferredSize(new Dimension(150, 25)); scaleField.setPreferredSize(new Dimension(150, 25));
{ {
scaleField.addKeyListener(new KeyListener() { scaleField.addKeyListener(new KeyListener()
{
public void keyTyped(KeyEvent e) { public void keyTyped(KeyEvent e)
{
}
try { public void keyReleased(KeyEvent e)
{
try
{
scaleField.setBackground(Color.WHITE); scaleField.setBackground(Color.WHITE);
double scale = Double.parseDouble(scaleField double scale = Double.parseDouble(scaleField.getText());
.getText());
selectedObject.setScale(scale); selectedObject.setScale(scale);
p.update(); p.update();
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe)
{
scaleField.setBackground(Color.RED); scaleField.setBackground(Color.RED);
} }
} }
public void keyReleased(KeyEvent e) { public void keyPressed(KeyEvent e)
} {
public void keyPressed(KeyEvent e) {
} }
}); });
} }
@@ -234,27 +248,30 @@ public class PropertiesPanel extends JPanel {
rotationField = new JTextField(); rotationField = new JTextField();
rotationField.setPreferredSize(new Dimension(150, 25)); rotationField.setPreferredSize(new Dimension(150, 25));
{ {
rotationField.addKeyListener(new KeyListener() { rotationField.addKeyListener(new KeyListener()
{
public void keyTyped(KeyEvent e) { public void keyTyped(KeyEvent e)
{
}
try { public void keyReleased(KeyEvent e)
{
try
{
rotationField.setBackground(Color.WHITE); rotationField.setBackground(Color.WHITE);
int rotation = Integer.parseInt(rotationField int rotation = Integer.parseInt(rotationField.getText()) % 360;
.getText()) % 360;
rotationField.setText(rotation + ""); rotationField.setText(rotation + "");
selectedObject.setRotation(rotation); selectedObject.setRotation(rotation);
p.update(); p.update();
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe)
{
rotationField.setBackground(Color.RED); rotationField.setBackground(Color.RED);
} }
} }
public void keyReleased(KeyEvent e) { public void keyPressed(KeyEvent e)
} {
public void keyPressed(KeyEvent e) {
} }
}); });
} }
@@ -264,53 +281,63 @@ public class PropertiesPanel extends JPanel {
// SPACER // SPACER
add(Box.createRigidArea(spacerDimension)); add(Box.createRigidArea(spacerDimension));
// EXAMPLE // AGENDA
JPanel examplePanel = new JPanel(new FlowLayout(FlowLayout.LEFT)); JPanel agendaPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
JLabel exampleLabel = new JLabel("Example"); JLabel agendaLabel = new JLabel("Agenda");
exampleLabel.setFont(new Font("Segoe UI", Font.ITALIC, 20)); agendaLabel.setFont(new Font("Segoe UI", Font.ITALIC, 20));
examplePanel.setPreferredSize(new Dimension(200, 100)); agendaPanel.setPreferredSize(new Dimension(200, 100));
examplePanel.setMaximumSize(new Dimension(200, 100)); agendaPanel.setMaximumSize(new Dimension(200, 100));
examplePanel.add(exampleLabel); agendaPanel.add(agendaLabel);
add(examplePanel); add(agendaPanel);
enableComponents(this, false); enableComponents(this, false);
} }
public void setSelected(DrawObject drOb) { public void setSelected(DrawObject drOb)
{
selectedObject = drOb; selectedObject = drOb;
fillFields(); fillFields();
enableComponents(this, true); enableComponents(this, true);
} }
public void clearSelected() { public void clearSelected()
{
enableComponents(this, false); enableComponents(this, false);
clearFields(this); clearFields(this);
selectedObject = null; selectedObject = null;
} }
public void update() { public void update()
{
fillFields(); fillFields();
} }
private void enableComponents(Container container, boolean enable) { private void enableComponents(Container container, boolean enable)
{
Component[] components = container.getComponents(); Component[] components = container.getComponents();
for (Component component : components) { for (Component component : components)
{
component.setEnabled(enable); component.setEnabled(enable);
if (component instanceof Container) { if (component instanceof Container)
{
enableComponents((Container) component, enable); enableComponents((Container) component, enable);
} }
} }
} }
private void clearFields(Container container) { private void clearFields(Container container)
{
Component[] components = container.getComponents(); Component[] components = container.getComponents();
for (Component component : components) { for (Component component : components)
if (component instanceof JTextField) { {
if (component instanceof JTextField)
{
((JTextField) component).setText(""); ((JTextField) component).setText("");
((JTextField) component).setBackground(Color.WHITE); ((JTextField) component).setBackground(Color.WHITE);
} }
if (component instanceof Container) { if (component instanceof Container)
{
clearFields((Container) component); clearFields((Container) component);
} }
} }
@@ -319,25 +346,23 @@ public class PropertiesPanel extends JPanel {
} }
private void fillFields() { private void fillFields()
if (selectedObject != null) { {
if (selectedObject != null)
{
nameLabel.setText(selectedObject.getName()); nameLabel.setText(selectedObject.getName());
locationXField.setText(Math.round(selectedObject.getPosition() locationXField.setText(Math.round(selectedObject.getPosition().getX()) + "");
.getX()) + ""); locationYField.setText(Math.round(selectedObject.getPosition().getY()) + "");
locationYField.setText(Math.round(selectedObject.getPosition() scaleField.setText((double) Math.round(selectedObject.getScale() * 10) / 10 + "");
.getY()) + ""); rotationField.setText(Math.round(selectedObject.getRotation() % 360) + "");
scaleField
.setText((double) Math.round(selectedObject.getScale() * 10)
/ 10 + "");
rotationField
.setText(Math.round(selectedObject.getRotation() % 360)
+ "");
} }
} }
public void setPanel(Panel p) { public void setPanel(Panel p)
{
this.p = p; this.p = p;
} }
} }
Applicatie/Window.java
+2 -2
View File
@@ -7,7 +7,8 @@ import javax.swing.JPanel;
import Listeners.Keyboard; import Listeners.Keyboard;
public class Window extends JFrame { public class Window extends JFrame
{
private static final long serialVersionUID = -1324363758675184283L; private static final long serialVersionUID = -1324363758675184283L;
Window() { Window() {
@@ -24,7 +25,6 @@ public class Window extends JFrame {
contentPanel.add(pp, BorderLayout.EAST); contentPanel.add(pp, BorderLayout.EAST);
addKeyListener(new Keyboard(fp)); addKeyListener(new Keyboard(fp));
setContentPane(contentPanel); setContentPane(contentPanel);
// END CONTENT PANELS // END CONTENT PANELS
Listeners/Mouse.java
+45 -22
View File
@@ -12,31 +12,35 @@ import Applicatie.Panel;
import Objects.Stage; import Objects.Stage;
public class Mouse extends MouseAdapter { public class Mouse extends MouseAdapter
{
private Panel panel; private Panel panel;
private DrawObject selectedObject; private DrawObject selectedObject;
public Mouse(Panel panel) { public Mouse(Panel panel)
{
this.panel = panel; this.panel = panel;
selectedObject = null; selectedObject = null;
} }
public void mousePressed(MouseEvent e) { public void mousePressed(MouseEvent e)
{
Point2D clickPoint = panel.getClickPoint(e.getPoint()); Point2D clickPoint = panel.getClickPoint(e.getPoint());
panel.setLastClickPosition(clickPoint); panel.setLastClickPosition(clickPoint);
panel.setLastMousePosition(e.getPoint()); panel.setLastMousePosition(e.getPoint());
if (e.getY() < 150) { if (e.getY() < 150)
{
// if(e.getX() < 51) //51 = width podium image // if(e.getX() < 51) //51 = width podium image
// panel.setDragObject(new Podium(clickPoint)); // panel.setDragObject(new Podium(clickPoint));
// else // else
// panel.setDragObject(new Toilet(clickPoint)); // panel.setDragObject(new Toilet(clickPoint));
int i = 0; int i = 0;
int last = 0; int last = 0;
for (BufferedImage image : panel.getPanelInfo()) { for (BufferedImage image : panel.getPanelInfo())
if (e.getX() >= panel.getScrollfactor() {
&& e.getX() < last + image.getWidth() if (e.getX() >= panel.getScrollfactor() && e.getX() < last + image.getWidth() + panel.getScrollfactor())
+ panel.getScrollfactor()) { {
DrawObject tempDrawObj = panel.createNewDrawObject(i); DrawObject tempDrawObj = panel.createNewDrawObject(i);
tempDrawObj.setPosition(clickPoint); tempDrawObj.setPosition(clickPoint);
panel.setDragObject(tempDrawObj); panel.setDragObject(tempDrawObj);
@@ -46,29 +50,46 @@ public class Mouse extends MouseAdapter {
last += image.getWidth(); last += image.getWidth();
} }
if (panel.getDragObject() != null) { if (panel.getDragObject() != null)
{
panel.add(panel.getDragObject()); panel.add(panel.getDragObject());
} }
} else { }
for (DrawObject o : panel.getObjects()) { else
if (o.contains(clickPoint)) { {
if (o == selectedObject) { for (DrawObject o : panel.getObjects())
{
if (o.contains(clickPoint))
{
if (o == selectedObject)
{
boolean upperLeft = o.containsCorner(clickPoint, 0); boolean upperLeft = o.containsCorner(clickPoint, 0);
boolean upperRight = o.containsCorner(clickPoint, 1); boolean upperRight = o.containsCorner(clickPoint, 1);
boolean bottomLeft = o.containsCorner(clickPoint, 2); boolean bottomLeft = o.containsCorner(clickPoint, 2);
boolean bottomRight = o.containsCorner(clickPoint, 3); boolean bottomRight = o.containsCorner(clickPoint, 3);
boolean rotate = o.containsCorner(clickPoint, 4); boolean rotate = o.containsCorner(clickPoint, 4);
if (upperLeft) { if (upperLeft)
{
panel.setClickedOption("upperLeft"); panel.setClickedOption("upperLeft");
} else if (upperRight) { }
else if (upperRight)
{
panel.setClickedOption("upperRight"); panel.setClickedOption("upperRight");
} else if (bottomLeft) { }
else if (bottomLeft)
{
panel.setClickedOption("bottomLeft"); panel.setClickedOption("bottomLeft");
} else if (bottomRight) { }
else if (bottomRight)
{
panel.setClickedOption("bottomRight"); panel.setClickedOption("bottomRight");
} else if (rotate) { }
else if (rotate)
{
panel.setClickedOption("rotate"); panel.setClickedOption("rotate");
} else { }
else
{
panel.setClickedOption("drag"); panel.setClickedOption("drag");
} }
} }
@@ -84,7 +105,8 @@ public class Mouse extends MouseAdapter {
} }
} }
} }
if (panel.getDragObject() == null && selectedObject != null) { if (panel.getDragObject() == null && selectedObject != null)
{
selectedObject.setSelected(false); selectedObject.setSelected(false);
panel.getPP().clearSelected(); panel.getPP().clearSelected();
selectedObject = null; selectedObject = null;
@@ -92,9 +114,10 @@ public class Mouse extends MouseAdapter {
panel.repaint(); panel.repaint();
} }
public void mouseReleased(MouseEvent e) { public void mouseReleased(MouseEvent e)
{
panel.setDragObject(null); panel.setDragObject(null);
panel.setClickedOption("drag"); panel.setClickedOption("drag");
panel.repaint(); panel.repaint();
} }
} }
Listeners/MouseMotion.java
+3 -1
View File
@@ -73,6 +73,7 @@ public class MouseMotion extends MouseMotionAdapter
{ {
panel.setCameraPoint(new Point2D.Double(panel.getCameraPoint().getX() + (panel.getLastMousePosition().getX() - e.getX()), panel.getCameraPoint().getY() + (panel.getLastMousePosition().getY() - e.getY()))); panel.setCameraPoint(new Point2D.Double(panel.getCameraPoint().getX() + (panel.getLastMousePosition().getX() - e.getX()), panel.getCameraPoint().getY() + (panel.getLastMousePosition().getY() - e.getY())));
} }
panel.repaint(); panel.repaint();
panel.setLastMousePosition(e.getPoint()); panel.setLastMousePosition(e.getPoint());
panel.setLastClickPosition(clickPoint); panel.setLastClickPosition(clickPoint);
@@ -82,7 +83,7 @@ public class MouseMotion extends MouseMotionAdapter
private void resizeBigger() private void resizeBigger()
{ {
double scale = panel.getDragObject().getScale() + 0.05; double scale = panel.getDragObject().getScale() + 0.05;
panel.getDragObject().setScale(scale); panel.getDragObject().setScale(scale);
panel.getDragObject().setPosition(new Point2D.Double(panel.getDragObject().getPosition().getX(), panel.getDragObject().getPosition().getY() - 5)); panel.getDragObject().setPosition(new Point2D.Double(panel.getDragObject().getPosition().getX(), panel.getDragObject().getPosition().getY() - 5));
@@ -96,6 +97,7 @@ public class MouseMotion extends MouseMotionAdapter
double scale = panel.getDragObject().getScale() - 0.05; double scale = panel.getDragObject().getScale() - 0.05;
panel.getDragObject().setScale(scale); panel.getDragObject().setScale(scale);
panel.getDragObject().setPosition(new Point2D.Double(panel.getDragObject().getPosition().getX() - clickPoint.getX(), panel.getDragObject().getPosition().getY() - clickPoint.getY())); panel.getDragObject().setPosition(new Point2D.Double(panel.getDragObject().getPosition().getX() - clickPoint.getX(), panel.getDragObject().getPosition().getY() - clickPoint.getY()));
} }
} }
} }
Listeners/MouseWheel.java
+22 -17
View File
@@ -7,41 +7,46 @@ import java.awt.geom.Point2D;
import Applicatie.DrawObject; import Applicatie.DrawObject;
import Applicatie.Panel; import Applicatie.Panel;
public class MouseWheel implements MouseWheelListener { public class MouseWheel implements MouseWheelListener
{
private Panel panel; private Panel panel;
private int scrollfactor; private int scrollfactor;
public MouseWheel(Panel panel) { public MouseWheel(Panel panel)
{
this.panel = panel; this.panel = panel;
scrollfactor = 20; scrollfactor = 20;
} }
public void mouseWheelMoved(MouseWheelEvent e) { public void mouseWheelMoved(MouseWheelEvent e)
if (e.getY() < 150) { {
if (e.getY() < 150)
{
if (e.getPreciseWheelRotation() < 0) { if (e.getPreciseWheelRotation() < 0)
if (panel.getScrollfactor() + scrollfactor {
+ panel.getPanelInfoLength() < panel.getWidth()) { if (panel.getScrollfactor() + scrollfactor + panel.getPanelInfoLength() < panel.getWidth())
panel.setScrollfactor(panel.getScrollfactor() {
+ scrollfactor); panel.setScrollfactor(panel.getScrollfactor() + scrollfactor);
} }
} else { } else
if (panel.getScrollfactor() - scrollfactor >= 0) { {
panel.setScrollfactor(panel.getScrollfactor() if (panel.getScrollfactor() - scrollfactor >= 0)
- scrollfactor); {
panel.setScrollfactor(panel.getScrollfactor() - scrollfactor);
} }
} }
} else { } else
{
// cameraPoint // cameraPoint
double cameraScale = panel.getCameraScale() * 1 double cameraScale = panel.getCameraScale() * 1 - (e.getPreciseWheelRotation() / 10);
- (e.getPreciseWheelRotation() / 10);
panel.setCameraScale((float) cameraScale); panel.setCameraScale((float) cameraScale);
} }
panel.repaint(); panel.repaint();
} }
} }
Objects/Entrance.java
+8 -5
View File
@@ -1,18 +1,21 @@
package Objects; package Objects;
import java.awt.geom.Point2D; import java.awt.geom.Point2D;
import Applicatie.DrawObject; import Applicatie.DrawObject;
public class Entrance extends DrawObject
{
public class Entrance extends DrawObject { public Entrance(Point2D position)
{
public Entrance(Point2D position) {
super("images/entrance.png", position); super("images/entrance.png", position);
} }
@Override @Override
public String getName() { public String getName()
{
return "Entrance"; return "Entrance";
} }
} }
Objects/Path.java
+7 -4
View File
@@ -1,17 +1,20 @@
package Objects; package Objects;
import java.awt.geom.Point2D; import java.awt.geom.Point2D;
import Applicatie.DrawObject; import Applicatie.DrawObject;
public class Path extends DrawObject
{
public class Path extends DrawObject { public Path(Point2D position)
{
public Path(Point2D position) {
super("images/path.jpg", position); super("images/path.jpg", position);
} }
@Override @Override
public String getName() { public String getName()
{
return "Path"; return "Path";
} }
Objects/Stage.java
+8 -7
View File
@@ -1,19 +1,20 @@
package Objects; package Objects;
import java.awt.geom.Point2D; import java.awt.geom.Point2D;
import Applicatie.DrawObject; import Applicatie.DrawObject;
public class Stage extends DrawObject
public class Stage extends DrawObject { {
public Stage(Point2D position)
public Stage(Point2D position) { {
super("images/stage4.png", position); super("images/stage3.png", position);
} }
@Override @Override
public String getName() { public String getName()
{
return "Stage"; return "Stage";
} }
} }
Objects/Toilet.java
+7 -5
View File
@@ -1,19 +1,21 @@
package Objects; package Objects;
import java.awt.geom.Point2D; import java.awt.geom.Point2D;
import Applicatie.DrawObject; import Applicatie.DrawObject;
public class Toilet extends DrawObject
{
public class Toilet extends DrawObject { public Toilet(Point2D position)
{
public Toilet(Point2D position) {
super("images/wc.png", position); super("images/wc.png", position);
} }
@Override @Override
public String getName() { public String getName()
{
return "Toilet"; return "Toilet";
} }
} }
Objects/Wall.java
+8 -5
View File
@@ -1,18 +1,21 @@
package Objects; package Objects;
import java.awt.geom.Point2D; import java.awt.geom.Point2D;
import Applicatie.DrawObject; import Applicatie.DrawObject;
public class Wall extends DrawObject
{
public class Wall extends DrawObject { public Wall(Point2D position)
{
public Wall(Point2D position) {
super("images/wall.png", position); super("images/wall.png", position);
} }
@Override @Override
public String getName() { public String getName()
{
return "Wall"; return "Wall";
} }
} }