From 0ae65273614611101147f4eead9db0e5e4e6c1e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=9F=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=B2=D0=BE=D0=B9?= <sergpolevoi@yandex.ru>
Date: Sat, 5 Nov 2022 16:31:00 +0400
Subject: [PATCH] First stage: Refactoring MapWithSetArtilleriesGeneric

---
 MapWithSetArtilleriesGeneric.java | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/MapWithSetArtilleriesGeneric.java b/MapWithSetArtilleriesGeneric.java
index 79fd53b..826e6d4 100644
--- a/MapWithSetArtilleriesGeneric.java
+++ b/MapWithSetArtilleriesGeneric.java
@@ -1,5 +1,6 @@
 import java.awt.*;
 import java.awt.image.BufferedImage;
+import java.util.Iterator;
 
 public class MapWithSetArtilleriesGeneric<T extends IDrawingObject, U extends AbstractMap> {
     public final int _pictureWidth;
@@ -12,7 +13,7 @@ public class MapWithSetArtilleriesGeneric<T extends IDrawingObject, U extends Ab
     public MapWithSetArtilleriesGeneric(int picWidth, int picHeight, U map) {
         int width = picWidth / _placeSizeWidth;
         int height = picHeight / _placeSizeHeight;
-        _setArtilleries = new SetArtilleriesGeneric<T>(width * height);
+        _setArtilleries = new SetArtilleriesGeneric<>(width * height);
         _pictureWidth = picWidth;
         _pictureHeight = picHeight;
         _map = map;
@@ -36,13 +37,8 @@ public class MapWithSetArtilleriesGeneric<T extends IDrawingObject, U extends Ab
 
     public Image showOnMap() {
         shaking();
-        for (int i = 0; i < _setArtilleries.getCount(); i++)
-        {
-            var car = _setArtilleries.get(i);
-            if (car != null)
-            {
-                return _map.createMap(_pictureWidth, _pictureHeight, car);
-            }
+        for (T artillery : _setArtilleries.getArtilleries()) {
+            return _map.createMap(_pictureWidth, _pictureHeight, artillery);
         }
         return new BufferedImage(_pictureWidth, _pictureHeight, BufferedImage.TYPE_INT_ARGB);
     }
@@ -120,14 +116,12 @@ public class MapWithSetArtilleriesGeneric<T extends IDrawingObject, U extends Ab
         int width = _pictureWidth / _placeSizeWidth;
         int height = _pictureHeight / _placeSizeHeight;
 
-        for (int i = 0; i < _setArtilleries.getCount(); i++)
+        int index = 0;
+        for (T artillery : _setArtilleries.getArtilleries())
         {
-            var artillery = _setArtilleries.get(i);
-            if (artillery != null)
-            {
-                artillery.setObject(i % width * _placeSizeWidth + 10, (height - 1 - i / width) * _placeSizeHeight + 10, _pictureWidth, _pictureHeight);
-                artillery.drawingObject(g);
-            }
+            artillery.setObject(index % width * _placeSizeWidth + 10, (height - 1 - index / width) * _placeSizeHeight + 10, _pictureWidth, _pictureHeight);
+            artillery.drawingObject(g);
+            index++;
         }
     }
 }