From 9ee421b792530f663b7738eabc90e37ef20cbdec Mon Sep 17 00:00:00 2001 From: aareschluchtje Date: Thu, 26 Feb 2015 20:27:01 +0100 Subject: [PATCH] Edit toegevoegd aan infoframe Edit JButton toegevoegd bij zowel Artist als Event. --- ArtistPanel.java | 24 +++++++++++++++++++++--- EventPanel.java | 20 ++++++++++++++++++-- TabbedPane.java | 4 ++-- 3 files changed, 41 insertions(+), 7 deletions(-) diff --git a/ArtistPanel.java b/ArtistPanel.java index 25de98b..483053d 100644 --- a/ArtistPanel.java +++ b/ArtistPanel.java @@ -1,9 +1,14 @@ import java.awt.BorderLayout; +import java.awt.Dimension; import java.awt.Font; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import javax.swing.Box; import javax.swing.BoxLayout; +import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JSeparator; @@ -11,18 +16,31 @@ import javax.swing.SwingConstants; public class ArtistPanel extends JPanel{ - public ArtistPanel(Event event) + public ArtistPanel(Event event, Agenda a) { super(new BorderLayout()); JLabel name = new JLabel(event.getArtist().getName()); - + JButton edit = new JButton("Edit Info"); + edit.addActionListener(new ActionListener(){ + @Override + public void actionPerformed(ActionEvent e) + { + EditArtistPanel editter = new EditArtistPanel(a, event.getArtist()); + } + }); name.setFont(new Font("Dialog", Font.BOLD, 20)); JLabel description = new JLabel("" + " Genre: " + event.getArtist().getGenre() + "

Beschrijving

" + event.getArtist().getDescription() + "

achtergrondinfo

" + event.getArtist().getBackground() + ""); description.setFont(new Font("Dialog", Font.PLAIN, 12)); JPanel panel = new JPanel(); panel.setLayout(new BoxLayout(panel, BoxLayout.PAGE_AXIS)); + JPanel panel2 = new JPanel(); + panel2.setLayout(new BoxLayout(panel2, BoxLayout.LINE_AXIS)); + panel2.setAlignmentX(LEFT_ALIGNMENT); JLabel photo = new JLabel(event.getArtist().getImage()); - panel.add(name); + panel2.add(name); + panel2.add(Box.createRigidArea(new Dimension(10,0))); + panel2.add(edit); + panel.add(panel2); panel.add(new JSeparator(SwingConstants.HORIZONTAL)); add(photo, BorderLayout.EAST); add(description, BorderLayout.CENTER); diff --git a/EventPanel.java b/EventPanel.java index 688e502..ebb4756 100644 --- a/EventPanel.java +++ b/EventPanel.java @@ -1,10 +1,15 @@ import java.awt.BorderLayout; +import java.awt.Dimension; import java.awt.Font; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.text.SimpleDateFormat; +import javax.swing.Box; import javax.swing.BoxLayout; +import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JSeparator; @@ -14,7 +19,7 @@ public class EventPanel extends JPanel{ private static final long serialVersionUID = 504733981352439417L; - public EventPanel(Event event) + public EventPanel(Event event, Agenda a) { super(new BorderLayout()); SimpleDateFormat dateformatter = new SimpleDateFormat("dd-MM-yyyy"); @@ -28,8 +33,16 @@ public class EventPanel extends JPanel{ JPanel row = new JPanel(); row.setLayout(new BoxLayout(row, BoxLayout.LINE_AXIS)); JPanel panel = new JPanel(); + JButton edit = new JButton("Edit Info"); + edit.addActionListener(new ActionListener(){ + @Override + public void actionPerformed(ActionEvent e) + { + EditEventPanel edit = new EditEventPanel(a, event); + } + }); panel.setLayout(new BoxLayout(panel, BoxLayout.PAGE_AXIS)); - JLabel title = new JLabel("" + event.getEventName() + ""); + JLabel title = new JLabel(event.getEventName()); JLabel date = new JLabel("" + dateformatter.format(event.getEndDate().getTime()) + ""); JLabel data = new JLabel(" " + event.getStage().getName() + "

" + event.getArtist().getName() + "

" + event.getExpectedPopularity() + "

" + timeformatter.format(event.getStartDate().getTime()) + " - " + timeformatter.format(event.getEndDate().getTime()) + "

"); JLabel text = new JLabel(" Podium:

Artiest:

Populariteit:

Tijd:

"); @@ -43,6 +56,9 @@ public class EventPanel extends JPanel{ JLabel description = new JLabel(" Beschrijving

" + event.getDescription() + ""); description.setFont(new Font("Dialog", Font.PLAIN, 12)); row.add(title); + row.add(Box.createRigidArea(new Dimension(10,0))); + row.add(edit); + row.add(Box.createRigidArea(new Dimension(30,0))); row.add(date); box1.add(row); box1.add(new JSeparator(SwingConstants.HORIZONTAL)); diff --git a/TabbedPane.java b/TabbedPane.java index ceb0c84..7891ace 100644 --- a/TabbedPane.java +++ b/TabbedPane.java @@ -10,8 +10,8 @@ public class TabbedPane extends JFrame{ { super("info GUI"); JTabbedPane tab = new JTabbedPane(); - tab.add("Event", new EventPanel(event)); - tab.add("Artist", new ArtistPanel(event)); + tab.add("Event", new EventPanel(event, a)); + tab.add("Artist", new ArtistPanel(event, a)); if(eventSelected) { tab.setSelectedIndex(0);