From 3ece3588e61ef3e3a62b01c27d29dd2b9b700d0e Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Thu, 26 Feb 2015 20:38:57 +0100 Subject: [PATCH] Fix for changing to different panel on data change. After data has been edited, the current panel is now updated. --- AddArtistPanel.java | 2 +- AddEventPanel.java | 2 +- AddStagePanel.java | 2 +- EditArtistPanel.java | 4 ++-- EditEventPanel.java | 4 ++-- EditStagePanel.java | 4 ++-- Main.java | 2 +- MenuBar.java | 12 ++++++------ Window.java | 18 +++++++++--------- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/AddArtistPanel.java b/AddArtistPanel.java index 39c02bb..7e3e303 100644 --- a/AddArtistPanel.java +++ b/AddArtistPanel.java @@ -108,7 +108,7 @@ public class AddArtistPanel extends JFrame{ JOptionPane.showMessageDialog(null, "Artist added!"); setVisible(false); dispose(); - Window.updatePanel("art_sta"); + Window.updatePanel(); } else { JOptionPane.showMessageDialog(null, "Choose a different artist name!"); } diff --git a/AddEventPanel.java b/AddEventPanel.java index c4ead88..8df26ae 100644 --- a/AddEventPanel.java +++ b/AddEventPanel.java @@ -248,7 +248,7 @@ public class AddEventPanel extends JFrame{ JOptionPane.showMessageDialog(null, "Event added!"); setVisible(false); dispose(); - Window.updatePanel("table"); + Window.updatePanel(); } diff --git a/AddStagePanel.java b/AddStagePanel.java index 1b298cc..f0ae546 100644 --- a/AddStagePanel.java +++ b/AddStagePanel.java @@ -74,7 +74,7 @@ public class AddStagePanel extends JFrame{ JOptionPane.showMessageDialog(null, "Stage added!"); setVisible(false); dispose(); - Window.updatePanel("art_sta"); + Window.updatePanel(); } else { JOptionPane.showMessageDialog(null, "Choose a different stage name!"); diff --git a/EditArtistPanel.java b/EditArtistPanel.java index 3620010..e4b564d 100644 --- a/EditArtistPanel.java +++ b/EditArtistPanel.java @@ -112,7 +112,7 @@ public class EditArtistPanel extends JFrame{ JOptionPane.showMessageDialog(null, "Artist edited!"); setVisible(false); dispose(); - Window.updatePanel("art_sta"); + Window.updatePanel(); } else { JOptionPane.showMessageDialog(null, "Choose a different artist name!"); } @@ -149,7 +149,7 @@ public class EditArtistPanel extends JFrame{ JOptionPane.showMessageDialog(null, "Artist removed!"); setVisible(false); dispose(); - Window.updatePanel("art_sta"); + Window.updatePanel(); } } }); diff --git a/EditEventPanel.java b/EditEventPanel.java index 45a3ada..b531f76 100644 --- a/EditEventPanel.java +++ b/EditEventPanel.java @@ -270,7 +270,7 @@ public class EditEventPanel extends JFrame{ JOptionPane.showMessageDialog(null, "Event edited!"); setVisible(false); dispose(); - Window.updatePanel("table"); + Window.updatePanel(); } @@ -299,7 +299,7 @@ public class EditEventPanel extends JFrame{ JOptionPane.showMessageDialog(null, "Event removed!"); setVisible(false); dispose(); - Window.updatePanel("table"); + Window.updatePanel(); } } }); diff --git a/EditStagePanel.java b/EditStagePanel.java index b87a7d0..9958300 100644 --- a/EditStagePanel.java +++ b/EditStagePanel.java @@ -75,7 +75,7 @@ public class EditStagePanel extends JFrame{ JOptionPane.showMessageDialog(null, "Stage edited!"); setVisible(false); dispose(); - Window.updatePanel("art_sta"); + Window.updatePanel(); } else { JOptionPane.showMessageDialog(null, "Choose a different stage name!"); @@ -113,7 +113,7 @@ public class EditStagePanel extends JFrame{ JOptionPane.showMessageDialog(null, "Stage removed!"); setVisible(false); dispose(); - Window.updatePanel("art_sta"); + Window.updatePanel(); } } }); diff --git a/Main.java b/Main.java index 161993e..b8902ce 100644 --- a/Main.java +++ b/Main.java @@ -35,7 +35,7 @@ public class Main { agn.fillArtists(); agn.fillStages(); - w.updatePanel("table"); + w.updatePanel(); } } diff --git a/MenuBar.java b/MenuBar.java index e09e783..a601620 100644 --- a/MenuBar.java +++ b/MenuBar.java @@ -53,7 +53,7 @@ public class MenuBar extends JMenuBar { { Agenda a = new Agenda(); w.setAgenda(a); - Window.updatePanel("table"); + Window.updatePanel(); } } }); @@ -63,7 +63,7 @@ public class MenuBar extends JMenuBar { open.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { w.getAgenda().loadAgenda(); - Window.updatePanel("table"); + Window.updatePanel(); } }); @@ -72,7 +72,7 @@ public class MenuBar extends JMenuBar { save.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { w.getAgenda().saveAgenda(); - Window.updatePanel("table"); + Window.updatePanel(); } }); @@ -108,21 +108,21 @@ public class MenuBar extends JMenuBar { JMenuItem timeline = new JMenuItem("Timeline"); timeline.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - Window.updatePanel("timeline"); + Window.changePanel("timeline"); } }); JMenuItem table = new JMenuItem("Table"); table.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - Window.updatePanel("table"); + Window.changePanel("table"); } }); JMenuItem art_sta = new JMenuItem("Artists and Stages"); art_sta.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - Window.updatePanel("art_sta"); + Window.changePanel("art_sta"); } }); diff --git a/Window.java b/Window.java index 2c92870..fdfecf0 100644 --- a/Window.java +++ b/Window.java @@ -95,7 +95,7 @@ public class Window extends JFrame { public void actionPerformed(ActionEvent e) { date.set(GregorianCalendar.DAY_OF_MONTH, date.get(GregorianCalendar.DAY_OF_MONTH) - 7); dateLabel.setText(formatter.format(date.getTime())); - changePanel(); + updatePanel(); } }); bottomPanel.add(new JSeparator(SwingConstants.VERTICAL)); @@ -108,7 +108,7 @@ public class Window extends JFrame { public void actionPerformed(ActionEvent e) { date.set(GregorianCalendar.DAY_OF_MONTH, date.get(GregorianCalendar.DAY_OF_MONTH) - 1); dateLabel.setText(formatter.format(date.getTime())); - changePanel(); + updatePanel(); } }); bottomPanel.add(new JSeparator(SwingConstants.VERTICAL)); @@ -121,7 +121,7 @@ public class Window extends JFrame { public void actionPerformed(ActionEvent e) { date = new GregorianCalendar(); dateLabel.setText(formatter.format(date.getTime())); - changePanel(); + updatePanel(); } }); bottomPanel.add(new JSeparator(SwingConstants.VERTICAL)); @@ -134,7 +134,7 @@ public class Window extends JFrame { public void actionPerformed(ActionEvent e) { date.set(GregorianCalendar.DAY_OF_MONTH, date.get(GregorianCalendar.DAY_OF_MONTH) + 1); dateLabel.setText(formatter.format(date.getTime())); - changePanel(); + updatePanel(); } }); bottomPanel.add(new JSeparator(SwingConstants.VERTICAL)); @@ -147,7 +147,7 @@ public class Window extends JFrame { public void actionPerformed(ActionEvent e) { date.set(GregorianCalendar.DAY_OF_MONTH, date.get(GregorianCalendar.DAY_OF_MONTH) + 7); dateLabel.setText(formatter.format(date.getTime())); - changePanel(); + updatePanel(); } }); bottomPanel.add(new JSeparator(SwingConstants.VERTICAL)); @@ -159,19 +159,19 @@ public class Window extends JFrame { setContentPane(mainPanel); - changePanel(); + updatePanel(); //Show window setVisible(true); } - public static void updatePanel(String panel) + public static void changePanel(String panel) { currentPanel = panel; - changePanel(); + updatePanel(); } - private static void changePanel() + public static void updatePanel() { centerPanel.removeAll(); Panel p = panels.get(currentPanel);