From d140d781b749a99c44648ae8bcb225d96342bdce Mon Sep 17 00:00:00 2001
From: "ns.potapov" <ns.potapov@yandex.ru>
Date: Tue, 24 Oct 2023 12:43:15 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20Pl?=
 =?UTF-8?q?anesGenericCollection?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlanesGenericCollection.java              | 29 +++++++++++--------
 ProjectStormtrooper/SetGeneric.java           |  4 +++
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/ProjectStormtrooper/PlanesGenericCollection.java b/ProjectStormtrooper/PlanesGenericCollection.java
index 3b8417a..6c8f481 100644
--- a/ProjectStormtrooper/PlanesGenericCollection.java
+++ b/ProjectStormtrooper/PlanesGenericCollection.java
@@ -25,7 +25,11 @@ public class PlanesGenericCollection<T extends DrawingPlane, U extends IMoveable
     }
 
     public T Sub(int pos) {
-        return _collection.Remove(pos);
+        T obj = _collection.Get(pos);
+        if (obj != null) {
+            _collection.Remove(pos);
+        }
+        return obj;
     }
 
     public U GetU(int pos) {
@@ -55,18 +59,19 @@ public class PlanesGenericCollection<T extends DrawingPlane, U extends IMoveable
     private void DrawObjects(Graphics g) {
         int placesColumnCount = _pictureHeight / _placeSizeHeight;
         int placesRowCount = _pictureWidth / _placeSizeWidth;
-        for (int i = 0; i < _collection.Count(); i++) {
-            // получение объекта
-            var obj = _collection.Get(i);
+        int i = 0;
+        for (var obj :
+                _collection.GetEnumerator()) {
             // установка позиции
-            if (obj == null)
-                continue;
-            obj.SetPosition(
-                    (placesRowCount - 1) * _placeSizeWidth - (i % placesColumnCount * _placeSizeWidth) + (_placeSizeWidth - obj.GetWidth()) / 2,
-                    i / placesColumnCount * _placeSizeHeight + (_placeSizeHeight - obj.GetHeight()) / 2
-            );
-            // прорисовка объекта
-            obj.DrawTransport(g);
+            if (obj != null) {
+                obj.SetPosition(
+                        (placesRowCount - 1) * _placeSizeWidth - (i % placesColumnCount * _placeSizeWidth) + (_placeSizeWidth - obj.GetWidth()) / 2,
+                        i / placesColumnCount * _placeSizeHeight + (_placeSizeHeight - obj.GetHeight()) / 2
+                );
+                // прорисовка объекта
+                obj.DrawTransport(g);
+            }
+            i++;
         }
     }
 }
diff --git a/ProjectStormtrooper/SetGeneric.java b/ProjectStormtrooper/SetGeneric.java
index d773f87..63fd612 100644
--- a/ProjectStormtrooper/SetGeneric.java
+++ b/ProjectStormtrooper/SetGeneric.java
@@ -59,4 +59,8 @@ public class SetGeneric<T extends DrawingPlane> {
         // Вставка в список по позиции
         _places.set(position, plane);
     }
+
+    public ArrayList<T> GetEnumerator() {
+        return _places;
+    }
 }