Merge pull request #30 from JavaBWAPI/bwem-cleanup

Bwem cleanup

Author: Bytekeeper

src/main/java/bwem/typedef/Altitude.java src/main/java/bwem/Altitude.javasrc/main/java/bwem/typedef/Altitude.java renamed to src/main/java/bwem/Altitude.java

@@ -10,26 +10,23 @@
 //
 //////////////////////////////////////////////////////////////////////////
 
-package bwem.typedef;
-
-import bwem.util.IWrappedInteger;
+package bwem;
 
 /**
  * Immutable wrapper of the integer primitive to satisfy the original C++ definition:
  * defs.h:54:typedef int16_t altitude_t;
  *
  * <p>Type of the altitudes in pixels.
  */
-public final class Altitude implements IWrappedInteger<Altitude>, Comparable<Altitude> {
+public final class Altitude implements Comparable<Altitude> {
     public static final Altitude UNINITIALIZED = new Altitude(-1);
     public static final Altitude ZERO = new Altitude(0);
     private final int val;
 
-    public Altitude(final int val) {
+    Altitude(final int val) {
         this.val = val;
     }
 
-    @Override
     public int intValue() {
         return this.val;
     }

src/main/java/bwem/area/AreaImpl.java src/main/java/bwem/Area.javasrc/main/java/bwem/area/AreaImpl.java renamed to src/main/java/bwem/Area.java

@@ -10,171 +10,127 @@
 //
 //////////////////////////////////////////////////////////////////////////
 
-package bwem.area;
+package bwem;
 
 import bwapi.TilePosition;
 import bwapi.WalkPosition;
-import bwem.Base;
-import bwem.BaseImpl;
-import bwem.ChokePoint;
-import bwem.area.typedef.AreaId;
-import bwem.area.typedef.GroupId;
-import bwem.typedef.Altitude;
-import bwem.unit.Geyser;
-import bwem.unit.Mineral;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-public abstract class AreaImpl implements Area {
-    protected final java.util.Map<Area, List<ChokePoint>> chokePointsByArea = new HashMap<>();
-    protected final List<Area> accessibleNeighbors = new ArrayList<>();
-    protected final List<ChokePoint> chokePoints = new ArrayList<>();
-    protected final List<Mineral> minerals = new ArrayList<>();
-    protected final List<Geyser> geysers = new ArrayList<>();
-    protected final List<Base> bases = new ArrayList<>();
+public abstract class Area {
+    final java.util.Map<Area, List<ChokePoint>> chokePointsByArea = new HashMap<>();
+    final List<Area> accessibleNeighbors = new ArrayList<>();
+    final List<ChokePoint> chokePoints = new ArrayList<>();
+    final List<Mineral> minerals = new ArrayList<>();
+    final List<Geyser> geysers = new ArrayList<>();
+    final List<Base> bases = new ArrayList<>();
     private final AreaId id;
     private final WalkPosition walkPositionWithHighestAltitude;
     private final int miniTileCount;
-    protected GroupId groupId = GroupId.ZERO;
-    protected Altitude highestAltitude;
-    protected TilePosition topLeft = new TilePosition(Integer.MAX_VALUE, Integer.MAX_VALUE);
-    protected TilePosition bottomRight = new TilePosition(Integer.MIN_VALUE, Integer.MIN_VALUE);
-    protected int tileCount = 0;
-    protected int buildableTileCount =
+    int groupId = 0;
+    Altitude highestAltitude;
+    TilePosition topLeft = new TilePosition(Integer.MAX_VALUE, Integer.MAX_VALUE);
+    TilePosition bottomRight = new TilePosition(Integer.MIN_VALUE, Integer.MIN_VALUE);
+    int tileCount = 0;
+    int buildableTileCount =
             0; /* Set and later incremented but not used in original C++ BWEM 1.4.1. Remains for portability consistency. */
-    protected int highGroundTileCount = 0;
-    protected int veryHighGroundTileCount = 0;
+    int highGroundTileCount = 0;
+    int veryHighGroundTileCount = 0;
 
-    protected AreaImpl(final AreaId areaId, final WalkPosition top, final int miniTileCount) {
+    Area(final AreaId areaId, final WalkPosition top, final int miniTileCount) {
         this.id = areaId;
         this.walkPositionWithHighestAltitude = top;
         this.miniTileCount = miniTileCount;
     }
 
-    @Override
     public AreaId getId() {
         return this.id;
     }
 
-    @Override
-    public GroupId getGroupId() {
+    public int getGroupId() {
         return this.groupId;
     }
 
-    @Override
     public TilePosition getTopLeft() {
         return this.topLeft;
     }
 
-    @Override
     public TilePosition getBottomRight() {
         return this.bottomRight;
     }
 
-    @Override
     public TilePosition getBoundingBoxSize() {
         return this.bottomRight.subtract(this.topLeft).add(new TilePosition(1, 1));
     }
 
-    @Override
     public WalkPosition getWalkPositionWithHighestAltitude() {
         return this.walkPositionWithHighestAltitude;
     }
 
-    @Override
     public WalkPosition getTop() {
         return getWalkPositionWithHighestAltitude();
     }
 
-    @Override
     public Altitude getHighestAltitude() {
         return this.highestAltitude;
     }
 
-    @Override
     public int getSize() {
         return this.miniTileCount;
     }
 
-    @Override
     public int getLowGroundPercentage() {
         final int lowGroundTileCount =
                 this.tileCount - this.highGroundTileCount - this.veryHighGroundTileCount;
         return ((lowGroundTileCount * 100) / this.tileCount);
     }
 
-    @Override
     public int getHighGroundPercentage() {
         return ((this.highGroundTileCount * 100) / this.tileCount);
     }
 
-    @Override
     public int getVeryHighGroundPercentage() {
         return ((this.veryHighGroundTileCount * 100) / tileCount);
     }
 
-    @Override
     public List<ChokePoint> getChokePoints() {
         return this.chokePoints;
     }
 
-    @Override
     public List<ChokePoint> getChokePoints(final Area area) {
         final List<ChokePoint> ret = this.chokePointsByArea.get(area);
-        //        bwem_assert(it != getChokePointsByArea.end());
         if (ret == null) {
             throw new IllegalArgumentException();
         }
         return ret;
     }
 
-    @Override
     public java.util.Map<Area, List<ChokePoint>> getChokePointsByArea() {
         return this.chokePointsByArea;
     }
 
-    @Override
     public List<Area> getAccessibleNeighbors() {
         return this.accessibleNeighbors;
     }
 
-    @Override
     public boolean isAccessibleFrom(final Area area) {
-        return getGroupId().equals(area.getGroupId());
+        return groupId == area.getGroupId();
     }
 
-    @Override
     public List<Mineral> getMinerals() {
         return this.minerals;
     }
 
-    @Override
     public List<Geyser> getGeysers() {
         return this.geysers;
     }
 
-    @Override
     public List<Base> getBases() {
         return this.bases;
     }
 
-    public void onMineralDestroyed(final Mineral mineral) {
-        //        bwem_assert(mineral);
-        if (mineral == null) {
-            throw new IllegalArgumentException();
-        }
-
-        this.minerals.remove(mineral);
-
-        // let's examine the bases even if mineral was not found in this Area,
-        // which could arise if minerals were allowed to be assigned to neighboring areas.
-        for (final Base base : getBases()) {
-            ((BaseImpl) base).onMineralDestroyed(mineral);
-        }
-    }
-
     @Override
     public boolean equals(final Object object) {
         if (this == object) {

…/main/java/bwem/area/typedef/AreaId.java src/main/java/bwem/AreaId.javasrc/main/java/bwem/area/typedef/AreaId.java renamed to src/main/java/bwem/AreaId.java src/main/java/bwem/area/typedef/AreaId.java renamed to src/main/java/bwem/AreaId.java

@@ -10,24 +10,21 @@
 //
 //////////////////////////////////////////////////////////////////////////
 
-package bwem.area.typedef;
-
-import bwem.util.IWrappedInteger;
+package bwem;
 
 /**
  * Immutable wrapper of the integer primitive to satisfy the original C++ definition:
  * area.h:54:typedef int16_t id;
  */
-public final class AreaId implements IWrappedInteger<AreaId>, Comparable<AreaId> {
+public final class AreaId implements Comparable<AreaId> {
     public static final AreaId UNINITIALIZED = new AreaId(-1);
     public static final AreaId ZERO = new AreaId(0);
     private final int val;
 
-    public AreaId(final int val) {
+    AreaId(final int val) {
         this.val = val;
     }
 
-    @Override
     public int intValue() {
         return this.val;
     }