PIBD-11 Ryabov I.V. LabWork04 Hard #9

Closed
ilyaryabovv wants to merge 6 commits from LabWork04 into LabWork03
Showing only changes of commit 615abc0bca - Show all commits

View File

@ -15,7 +15,6 @@ public class FormStormtrooperCollection extends JFrame {
private Dimension dimension;
public static CanvasFormStormtrooperCollection<DrawingBaseStormtrooper> _canvasStormtrooper = new CanvasFormStormtrooperCollection<DrawingBaseStormtrooper>();
private static AbstractCompany _company = null;
private Queue<DrawingBaseStormtrooper> _collectionRemovedObjects = new LinkedList<>();
private StorageCollection<DrawingBaseStormtrooper> _storageCollection = new StorageCollection<DrawingBaseStormtrooper>();
private JTextField textBoxCollection = new JTextField();
@ -61,7 +60,6 @@ public class FormStormtrooperCollection extends JFrame {
boolean rockets = new Random().nextBoolean();
boolean bombs = new Random().nextBoolean();
boolean engines = new Random().nextBoolean();
int typeOfEngine = ((int) ((Math.random() * 3) + 1));
drawingBaseStormtrooper = new DrawingStormtrooper(speed, weight, bodyColor, additionalColor, rockets, bombs, engines, typeOfEngine);
break;
@ -97,7 +95,6 @@ public class FormStormtrooperCollection extends JFrame {
CreateObject("DrawingBaseStormtrooper");
}
});
createButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
@ -176,8 +173,6 @@ public class FormStormtrooperCollection extends JFrame {
}
});
buttonAddCollection.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {