Merge branch 'LabWork03' into LabWork04

EntityWithRollers.java

@@ -16,21 +16,21 @@ public class EntityWithRollers<T extends EntityTracktor, U extends IDrawningRoll
 
     public boolean add(T entity) {
         if (entitiesCount >= entities.length) {
-        return false;
-    }
+            return false;
+        }
         entities[entitiesCount++] = entity;
         return true;
     }
 
     public boolean add(U roller) {
         if (rollersCount >= rollers.length) {
-        return false;
-    }
+            return false;
+        }
         rollers[rollersCount++] = roller;
         return true;
     }
 
-    public IDrawningObject constructArtillery() {
+    public IDrawningObject constructTracktor() {
         if (entitiesCount == 0 || rollersCount == 0) {
             return null;
         }

FormGallery.java

@@ -40,9 +40,9 @@ public class FormGallery extends JFrame {
         }
 
         buttonRefresh.addActionListener(e -> {
-            first = storage.constructArtillery();
-            second = storage.constructArtillery();
-            third = storage.constructArtillery();
+            first = storage.constructTracktor();
+            second = storage.constructTracktor();
+            third = storage.constructTracktor();
 
             first.setObject(0, 10, pictureBox.getWidth(), pictureBox.getHeight());
             second.setObject(150, 10, pictureBox.getWidth(), pictureBox.getHeight());