diff --git a/Project/src/DrawingEntities.java b/Project/src/DrawingEntities.java index c99f11b..e40059c 100644 --- a/Project/src/DrawingEntities.java +++ b/Project/src/DrawingEntities.java @@ -1,19 +1,23 @@ +import java.lang.reflect.Array; import java.util.Random; public class DrawingEntities { - public EntityPlane[] _arrPlane; - public IAdditionalDrawingObject[] _arrWindow; + public T[] _arrPlane; + public U[] _arrWindow; int countArrPlane = 0; int countArrWindows = 0; String _x_index; String _y_index; //конструктор - public DrawingEntities(int sizeArrPlane, int sizeArrAddElem) + public DrawingEntities(int sizeArr, Class objectT, Class objectU) { - _arrPlane = new EntityPlane[sizeArrPlane]; - _arrWindow = new IAdditionalDrawingObject[sizeArrAddElem]; + final T[] arrPlane = (T[]) Array.newInstance(objectT, sizeArr); + _arrPlane = arrPlane; + + final U[] arrWindod = (U[]) Array.newInstance(objectU, sizeArr); + _arrWindow = arrWindod; } //добавить сущность-самолёт diff --git a/Project/src/FormParam.java b/Project/src/FormParam.java index 289ecd3..b88d93a 100644 --- a/Project/src/FormParam.java +++ b/Project/src/FormParam.java @@ -76,7 +76,7 @@ public class FormParam extends JFrame LableBox.add(LabelColor); StatusStrip.add(LableBox); - _drawingEntities = new DrawingEntities<>(10, 10); + _drawingEntities = new DrawingEntities<>(10, EntityPlane.class, IAdditionalDrawingObject.class); ButtonAddPlane.addActionListener(new ActionListener() { @Override