Grid.createCellShape() is now only for the current size

Hex grids already ignored the `size` parameter and for square grids it was only ever called with the current size
anyways. Isometrics grids used it, but they can have their own private overload for that.

src/main/java/net/rptools/maptool/model/Grid.java

@@ -84,7 +84,7 @@ public Grid(Grid grid) {
   }
 
   protected Object readResolve() {
-    cellShape = createCellShape(getSize());
+    cellShape = createCellShape();
     return this;
   }
 
@@ -274,7 +274,12 @@ public BufferedImage getCellHighlight() {
     return null;
   }
 
-  protected abstract Area createCellShape(int size);
+  /**
+   * Build the shape of a cell for the current grid size.
+   *
+   * @return The cell shape.
+   */
+  protected abstract Area createCellShape();
 
   /**
    * @param offsetX The grid's x offset component
@@ -339,7 +344,7 @@ public int getSize() {
    */
   public void setSize(int size) {
     this.size = constrainSize(size);
-    cellShape = createCellShape(size);
+    cellShape = createCellShape();
     fireGridChanged();
   }
 
@@ -838,7 +843,7 @@ protected AffineTransform getGridOffset(Token token) {
    * @return the {@link Area} conforming to the current grid layout for the given radius
    */
   protected Area createGridArea(int gridRadius) {
-    final Area cellArea = new Area(createCellShape(getSize()));
+    final Area cellArea = new Area(getCellShape());
     final Set<Point> points = generateRadius(gridRadius);
     Area gridArea = new Area();
 
@@ -945,7 +950,7 @@ public static Grid fromDto(GridDto dto) {
     grid.offsetX = dto.getOffsetX();
     grid.offsetY = dto.getOffsetY();
     grid.size = dto.getSize();
-    grid.cellShape = grid.createCellShape(grid.size);
+    grid.cellShape = grid.createCellShape();
 
     return grid;
   }

src/main/java/net/rptools/maptool/model/GridlessGrid.java

@@ -158,7 +158,7 @@ public CellPoint convert(ZonePoint zp) {
   }
 
   @Override
-  protected Area createCellShape(int size) {
+  protected Area createCellShape() {
     // Doesn't do this
     return null;
   }

src/main/java/net/rptools/maptool/model/HexGrid.java

@@ -126,9 +126,7 @@ public Point2D.Double getCellCenter(CellPoint cell) {
   }
 
   @Override
-  protected Area createCellShape(int size) {
-    // don't use size. it has already been used to set the minorRadius
-    // and will only introduce a rounding error.
+  protected Area createCellShape() {
     var hex = new GeneralPath();
     hex.moveTo(0, minorRadius);
     hex.lineTo(edgeProjection, 0);

src/main/java/net/rptools/maptool/model/IsometricGrid.java

@@ -241,9 +241,13 @@ public GridCapabilities getCapabilities() {
   }
 
   @Override
-  protected Area createCellShape(int size) {
-    int x[] = {size, size * 2, size, 0};
-    int y[] = {0, size / 2, size, size / 2};
+  protected Area createCellShape() {
+    return createCellShape(getSize());
+  }
+
+  private Area createCellShape(int size) {
+    int[] x = {size, size * 2, size, 0};
+    int[] y = {0, size / 2, size, size / 2};
     return new Area(new Polygon(x, y, 4));
   }
 
@@ -400,7 +404,7 @@ public Area getShapedArea(
         footprint.x = -footprint.width / 2;
         footprint.y = -footprint.height / 2;
         // convert the cell footprint to an area
-        Area cellShape = getZone().getGrid().createCellShape(footprint.height);
+        Area cellShape = createCellShape(footprint.height);
         // convert the area to isometric view
         AffineTransform mtx = new AffineTransform();
         mtx.translate(-footprint.width / 2, -footprint.height / 2);
@@ -432,7 +436,7 @@ public Area getTokenCellArea(Area bounds) {
     footprint.x = -footprint.width / 2;
     footprint.y = -footprint.height / 2;
     // convert the cell footprint to an area
-    Area cellShape = getZone().getGrid().createCellShape(footprint.height);
+    Area cellShape = createCellShape(footprint.height);
     // convert the area to isometric view
     AffineTransform mtx = new AffineTransform();
     mtx.translate(bounds.getBounds().getX(), bounds.getBounds().getY());

src/main/java/net/rptools/maptool/model/SquareGrid.java

@@ -249,7 +249,8 @@ public BufferedImage getCellHighlight() {
   }
 
   @Override
-  protected Area createCellShape(int size) {
+  protected Area createCellShape() {
+    var size = getSize();
     return new Area(new Rectangle(0, 0, size, size));
   }