diff --git a/src/MonorailHard/FormMonorail.java b/src/MonorailHard/FormMonorail.java index bd45a5c..f245845 100644 --- a/src/MonorailHard/FormMonorail.java +++ b/src/MonorailHard/FormMonorail.java @@ -192,7 +192,7 @@ public class FormMonorail{ }); MonorailFrame.setSize (900, 500); - MonorailFrame.setDefaultCloseOperation (JFrame.EXIT_ON_CLOSE); + MonorailFrame.setDefaultCloseOperation (JFrame.DISPOSE_ON_CLOSE); MonorailFrame.setLayout(null); canv = new Canvas(); canv.setSize(pictureBoxWidth, pictureBoxHeight); diff --git a/src/MonorailHard/FormMonorailCollection.java b/src/MonorailHard/FormMonorailCollection.java index d7722d5..8074fa1 100644 --- a/src/MonorailHard/FormMonorailCollection.java +++ b/src/MonorailHard/FormMonorailCollection.java @@ -60,13 +60,11 @@ public class FormMonorailCollection { if (_monorails.Insert(form.SelectedMonorail()) != -1) { JOptionPane.showMessageDialog(null, "Объект добавлен", "Информация", JOptionPane.INFORMATION_MESSAGE); - System.out.println("Объект добавлен"); Draw(); } else { JOptionPane.showMessageDialog(null, "Не удалось добавить объект", "Информация", JOptionPane.INFORMATION_MESSAGE); - System.out.println("Не удалось добавить объект"); } canv._monorails = _monorails; form.MonorailFrame.dispose(); @@ -75,6 +73,39 @@ public class FormMonorailCollection { }); } }); + removeButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + if(_monorails == null) { + return; + } + String tmp = monorailNumb.getText(); + int numb; + + try{ + numb = Integer.parseInt(tmp); + } + catch(Exception ex){ + JOptionPane.showMessageDialog(null, "Введите число", "Информация", JOptionPane.INFORMATION_MESSAGE); + return; + } + _monorails.Remove(numb); + _monorails.ShowMonorails(); + JOptionPane.showMessageDialog(null, "Объект удален", "Информация", JOptionPane.INFORMATION_MESSAGE); + Draw(); + } + }); + + refreshButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + if(_monorails == null) { + return; + } + _monorails.ShowMonorails(); + Draw(); + } + }); } }