diff --git a/EntityWithIlumCreator.java b/EntityWithIlumCreator.java index 0aac12d..27ddaa5 100644 --- a/EntityWithIlumCreator.java +++ b/EntityWithIlumCreator.java @@ -1,43 +1,35 @@ +import java.util.ArrayList; import java.util.Random; public class EntityWithIlumCreator { - private final Object[] entityArr; - private final Object[] IlumArr; + private final ArrayList entityArr; + private final ArrayList IlumArr; - int entitiesCount = 0; - int ilumCount = 0; - - public EntityWithIlumCreator(int countEntities, int countExtra) { - entityArr = new Object[countEntities]; - IlumArr = new Object[countExtra]; + public EntityWithIlumCreator() { + entityArr = new ArrayList(); + IlumArr = new ArrayList(); } public void Insert(T entityAirbus) { - if(entitiesCount < entityArr.length) { - entityArr[entitiesCount] = entityAirbus; - entitiesCount++; - } + entityArr.add(entityAirbus); } - public void Insert (U extra) { - if(ilumCount < IlumArr.length) { - IlumArr[ilumCount] = extra; - ilumCount++; - } + public void Insert (U ilum) { + IlumArr.add(ilum); } public DrawingAirbus getEntityWithExtra() { Random random = new Random(); - int getEntityRandomIndex = random.nextInt(entityArr.length); - int getExtraRandomIndex = random.nextInt(IlumArr.length); + int getEntityRandomIndex = random.nextInt(entityArr.size()); + int getExtraRandomIndex = random.nextInt(IlumArr.size()); - EntityAirbus airbus = (T)entityArr[getEntityRandomIndex]; - IDrawingIlum ilum = (U) IlumArr[getExtraRandomIndex]; + EntityAirbus airbus = entityArr.get(getEntityRandomIndex); + IDrawingIlum ilum = IlumArr.get(getExtraRandomIndex); if (airbus instanceof EntityAdvancedAirbus) { return new DrawingAdvancedAirbus(airbus, ilum); } return new DrawingAirbus(airbus, ilum); } -} +} \ No newline at end of file