From 4c17abdcf4ed94d9cf87a16f95956afd1c3dd2f2 Mon Sep 17 00:00:00 2001 From: ZakenChannel Date: Tue, 23 Apr 2024 14:04:46 +0400 Subject: [PATCH 1/2] change method of getting plane from stack --- .../main/java/com/projectairfighter/FormWarPlaneCollection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectAirFighter/src/main/java/com/projectairfighter/FormWarPlaneCollection.java b/ProjectAirFighter/src/main/java/com/projectairfighter/FormWarPlaneCollection.java index a998de8..6229975 100644 --- a/ProjectAirFighter/src/main/java/com/projectairfighter/FormWarPlaneCollection.java +++ b/ProjectAirFighter/src/main/java/com/projectairfighter/FormWarPlaneCollection.java @@ -210,7 +210,7 @@ public class FormWarPlaneCollection extends Application implements Initializable @FXML private void buttonGoToFormWithDeleteObject(ActionEvent event){ if (!removedPlanesStack.isEmpty()) { - goToFormAirFighter(removedPlanesStack.get(new Random().nextInt(0, removedPlanesStack.size()))); + goToFormAirFighter(removedPlanesStack.pop()); } else { showAlert("Стек удаленных объектов пуст."); } From 8c1949ab34954e225f5c70870ea72895e418d789 Mon Sep 17 00:00:00 2001 From: ZakenChannel Date: Tue, 23 Apr 2024 14:08:14 +0400 Subject: [PATCH 2/2] merge from lab 4 to lab 5 --- .../main/java/com/projectairfighter/FormWarPlaneCollection.java | 1 - 1 file changed, 1 deletion(-) diff --git a/ProjectAirFighter/src/main/java/com/projectairfighter/FormWarPlaneCollection.java b/ProjectAirFighter/src/main/java/com/projectairfighter/FormWarPlaneCollection.java index 9c97384..6be7c8c 100644 --- a/ProjectAirFighter/src/main/java/com/projectairfighter/FormWarPlaneCollection.java +++ b/ProjectAirFighter/src/main/java/com/projectairfighter/FormWarPlaneCollection.java @@ -160,7 +160,6 @@ public class FormWarPlaneCollection extends Application implements Initializable } else { showAlert("Стек удаленных объектов пуст."); } - } @FXML