- private ArrayList<AbstractCoordinateShape> shapes = new ArrayList<>();
- private ShapesZIndexComparator comparator = new ShapesZIndexComparator();
+ private final ArrayList<AbstractCoordinateShape> shapes = new ArrayList<>();
+ private final ShapesZIndexComparator comparator = new ShapesZIndexComparator();