diff --git a/ProjectCleaningCar/src/CollectionGenericObjects/AbstractCompany.java b/ProjectCleaningCar/src/CollectionGenericObjects/AbstractCompany.java index bedf67f..2ccfe1a 100644 --- a/ProjectCleaningCar/src/CollectionGenericObjects/AbstractCompany.java +++ b/ProjectCleaningCar/src/CollectionGenericObjects/AbstractCompany.java @@ -14,7 +14,7 @@ public abstract class AbstractCompany { protected int _pictureHeight; public ICollectionGenericObjects _collection = null; private int GetMaxCount() { - return _pictureWidth / _placeSizeWidth * (_pictureHeight / _placeSizeHeight / 2) - 1; + return _pictureWidth / _placeSizeWidth * (_pictureHeight / _placeSizeHeight / 2); }; public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects collection) { diff --git a/ProjectCleaningCar/src/FormAdditionalCollection.java b/ProjectCleaningCar/src/FormAdditionalCollection.java index 5522ed9..49f69f8 100644 --- a/ProjectCleaningCar/src/FormAdditionalCollection.java +++ b/ProjectCleaningCar/src/FormAdditionalCollection.java @@ -73,8 +73,8 @@ public class FormAdditionalCollection extends JFrame { } private String ToString(IDrawningWheels wheels) { if (wheels == null || wheels.getNumberOfWheels() == null) - return "Dont have wheels"; - String str = "Wheel "; + return "Don't have wheels"; + String str = "Wheels: "; if (wheels instanceof DrawningCircleWheels) str += "Circle "; else if (wheels instanceof DrawningRhombWheels) str += "Rhomb "; else str += "Triangle ";