From 47f04ee68feaec477565a10659d7daa8d7049ac8 Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Tue, 17 Mar 2015 11:24:51 +0100 Subject: [PATCH] Added actions --- Applicatie/Panel.java | 13 +++++++++++++ Applicatie/PropertiesPanel.java | 29 +++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/Applicatie/Panel.java b/Applicatie/Panel.java index ba7634d..ea37085 100644 --- a/Applicatie/Panel.java +++ b/Applicatie/Panel.java @@ -12,6 +12,7 @@ import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.Iterator; import javax.imageio.ImageIO; import javax.swing.JPanel; @@ -276,4 +277,16 @@ public class Panel extends JPanel { public void setClickedOption(String clickedOption) { this.clickedOption = clickedOption; } + + public void removeObject(DrawObject o) { + Iterator itr = objects.iterator(); + while(itr.hasNext()) { + DrawObject nextObject = (DrawObject) itr.next(); + if(nextObject.equals(o)) { + pp.clearSelected(); + itr.remove(); + } + repaint(); + } + } } diff --git a/Applicatie/PropertiesPanel.java b/Applicatie/PropertiesPanel.java index 13b153c..f3fc75d 100644 --- a/Applicatie/PropertiesPanel.java +++ b/Applicatie/PropertiesPanel.java @@ -6,6 +6,8 @@ import java.awt.Container; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.geom.Point2D; @@ -13,6 +15,7 @@ import java.awt.geom.Point2D; import javax.swing.BorderFactory; import javax.swing.Box; import javax.swing.BoxLayout; +import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; @@ -59,6 +62,32 @@ public class PropertiesPanel extends JPanel { namePanel.add(nameLabel); add(namePanel); + // SPACER + add(Box.createRigidArea(spacerDimension)); + + //BUTTONS + JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.LEFT)); + JLabel buttonLabel = new JLabel("Actions"); + buttonLabel.setFont(new Font("Segoe UI", Font.ITALIC, 20)); + buttonPanel.setPreferredSize(new Dimension(200, 40)); + buttonPanel.setMaximumSize(new Dimension(200, 40)); + buttonPanel.add(buttonLabel); + add(buttonPanel); + + //DELETE + JPanel deletePanel = new JPanel(new FlowLayout(FlowLayout.LEFT)); + JButton deleteButton = new JButton("Delete"); + deleteButton.setFont(new Font("Segoe UI", Font.PLAIN, 20)); + deleteButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + p.removeObject(selectedObject); + } + }); + deletePanel.setPreferredSize(new Dimension(200, 50)); + deletePanel.setMaximumSize(new Dimension(200, 50)); + deletePanel.add(deleteButton); + add(deletePanel); + // SPACER add(Box.createRigidArea(spacerDimension));