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

Refresh en close toegevoegd (infoframe)

Browse Source 
Het venster met info over de artiest en het event refresh na een
bewerking en verdwijnt wanneer het wordt verwijderd.
This commit is contained in:
aareschluchtje
2015-02-26 22:04:33 +01:00
parent 9ee421b792
commit 047770950f
6 changed files with 52 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ArtistPanel.java
+3 -2
View File
@@ -16,7 +16,7 @@ import javax.swing.SwingConstants;
public class ArtistPanel extends JPanel{
public ArtistPanel(Event event, Agenda a)
public ArtistPanel(Event event, Agenda a, TabbedPane tab)
{
super(new BorderLayout());
JLabel name = new JLabel(event.getArtist().getName());
@@ -25,7 +25,7 @@ public class ArtistPanel extends JPanel{
@Override
public void actionPerformed(ActionEvent e)
{
EditArtistPanel editter = new EditArtistPanel(a, event.getArtist());
EditArtistPanel editter = new EditArtistPanel(a, event.getArtist(), tab);
}
});
name.setFont(new Font("Dialog", Font.BOLD, 20));
@@ -46,4 +46,5 @@ public class ArtistPanel extends JPanel{
add(description, BorderLayout.CENTER);
add(panel, BorderLayout.NORTH);
}
}
EditArtistPanel.java
+22 -4
View File
@@ -12,12 +12,11 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTextField;
public class EditArtistPanel extends JFrame{
public class EditArtistPanel extends JFrame {
private static final long serialVersionUID = 1;
public EditArtistPanel(Agenda agenda, Artist art)
public EditArtistPanel(Agenda agenda, Artist art, TabbedPane tab)
{
super("Artist editscreen!");
setDefaultCloseOperation(HIDE_ON_CLOSE);
@@ -113,6 +112,20 @@ public class EditArtistPanel extends JFrame{
setVisible(false);
dispose();
Window.updatePanel("art_sta");
if(tab != null)
{
tab.setVisible(false);
tab.dispose();
Event eventartist = null;
for(Event event: agenda.getEvents())
{
if (event.getArtist().getName().equals(name))
{
eventartist = event;
}
}
TabbedPane panel = new TabbedPane(agenda, eventartist, false);
}
} else {
JOptionPane.showMessageDialog(null, "Choose a different artist name!");
}
@@ -150,6 +163,11 @@ public class EditArtistPanel extends JFrame{
setVisible(false);
dispose();
Window.updatePanel("art_sta");
if(tab != null)
{
tab.setVisible(false);
tab.dispose();
}
}
}
});
@@ -159,5 +177,5 @@ public class EditArtistPanel extends JFrame{
setVisible(true);
setSize(500,320);
}
}
EditEventPanel.java
+21 -2
View File
@@ -21,7 +21,7 @@ public class EditEventPanel extends JFrame{
private static final long serialVersionUID = 1;
public EditEventPanel(Agenda agenda, Event e)
public EditEventPanel(Agenda agenda, Event e, TabbedPane tab)
{
super("Event editscreen!");
setDefaultCloseOperation(HIDE_ON_CLOSE);
@@ -271,6 +271,20 @@ public class EditEventPanel extends JFrame{
setVisible(false);
dispose();
Window.updatePanel("table");
if(tab != null)
{
tab.setVisible(false);
tab.dispose();
Event eventartist = null;
for(Event event: agenda.getEvents())
{
if (event.getEventName().equals(name))
{
eventartist = event;
}
}
TabbedPane panel = new TabbedPane(agenda, eventartist, true);
}
}
@@ -300,6 +314,11 @@ public class EditEventPanel extends JFrame{
setVisible(false);
dispose();
Window.updatePanel("table");
if(tab != null)
{
tab.setVisible(false);
tab.dispose();
}
}
}
});
@@ -308,7 +327,6 @@ public class EditEventPanel extends JFrame{
setContentPane(content);
setVisible(true);
setSize(700,320);
}
public int monthToInt(String month)
@@ -352,5 +370,6 @@ public class EditEventPanel extends JFrame{
}
return number;
}
}
EventPanel.java
+2 -2
View File
@@ -19,7 +19,7 @@ public class EventPanel extends JPanel{
private static final long serialVersionUID = 504733981352439417L;
public EventPanel(Event event, Agenda a)
public EventPanel(Event event, Agenda a, TabbedPane tab)
{
super(new BorderLayout());
SimpleDateFormat dateformatter = new SimpleDateFormat("dd-MM-yyyy");
@@ -38,7 +38,7 @@ public class EventPanel extends JPanel{
@Override
public void actionPerformed(ActionEvent e)
{
EditEventPanel edit = new EditEventPanel(a, event);
EditEventPanel edit = new EditEventPanel(a, event, tab);
}
});
panel.setLayout(new BoxLayout(panel, BoxLayout.PAGE_AXIS));
PanelArtSta.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class PanelArtSta extends JPanel implements Panel{
if (artists.getSelectedIndex() == -1) {
} else {
new EditArtistPanel(w.getAgenda(), a.getArtists().get(artists.getSelectedIndex()));
new EditArtistPanel(w.getAgenda(), a.getArtists().get(artists.getSelectedIndex()), null);
artists.clearSelection();
}
}
TabbedPane.java
+3 -3
View File
@@ -1,5 +1,5 @@
//een jframe met info, heeft alleen een event object (het desbetreffende event) en een boolean met daarin true of false (slaande op je wel of niet met het event wilt starten) nodig.
//een jframe met info, heeft alleen een agenda object, event object (het desbetreffende event) en een boolean met daarin true of false (slaande op je wel of niet met het event wilt starten) nodig.
//Voorderest heeft dit niks nodig en is het een apart openend JFrame wat gewoon weer afgesloten kan worden.
import javax.swing.JFrame;
import javax.swing.JTabbedPane;
@@ -10,8 +10,8 @@ public class TabbedPane extends JFrame{
{
super("info GUI");
JTabbedPane tab = new JTabbedPane();
tab.add("Event", new EventPanel(event, a));
tab.add("Artist", new ArtistPanel(event, a));
tab.add("Event", new EventPanel(event, a, this));
tab.add("Artist", new ArtistPanel(event, a, this));
if(eventSelected)
{
tab.setSelectedIndex(0);