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

Merge guus dev

Browse Source
This commit is contained in:
Yorick
2015-04-08 13:24:41 +02:00
parent 9066d0212f
commit a03463442c
12 changed files with 85 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Agenda/EditStagePanel.java
+4 -4
View File
@@ -18,7 +18,7 @@ public class EditStagePanel extends JFrame{
private static final long serialVersionUID = 1;
public EditStagePanel(Agenda agenda, Stage sta)
public EditStagePanel(Agenda agenda, AgendaStage sta)
{
super("Stage editscreen!");
setDefaultCloseOperation(HIDE_ON_CLOSE);
@@ -59,7 +59,7 @@ public class EditStagePanel extends JFrame{
String description = descriptionTF.getText();
boolean alreadyExists = false;
for (Stage stage : agenda.getStages())
for (AgendaStage stage : agenda.getStages())
{
if (stage.getName().equals(name) && !stage.equals(sta))
{
@@ -101,10 +101,10 @@ public class EditStagePanel extends JFrame{
if(JOptionPane.showConfirmDialog(null, "Are you sure you want to remove this stage?", "Remove Stage", JOptionPane.YES_NO_OPTION) == JOptionPane.OK_OPTION)
{
Iterator<Stage> it = agenda.getStages().iterator();
Iterator<AgendaStage> it = agenda.getStages().iterator();
while(it.hasNext())
{
Stage s = it.next();
AgendaStage s = it.next();
if(s.equals(sta))
{
it.remove();