Removed interfaces where possible.

Author: bytekeeper

src/main/java/bwem/BWEM.java

@@ -14,13 +14,13 @@
 
 import bwapi.Game;
 import bwem.map.Map;
-import bwem.map.MapInitializerImpl;
+import bwem.map.MapInitializer;
 
 public final class BWEM {
     private final Map map;
 
     public BWEM(final Game game) {
-        this.map = new MapInitializerImpl(game);
+        this.map = new MapInitializer(game);
     }
 
     /**
@@ -35,10 +35,10 @@ public Map getMap() {
      * Initializes and pre-computes all of the internal data.
      */
     public void initialize() {
-        if (!(this.map instanceof MapInitializerImpl)) {
+        if (!(this.map instanceof MapInitializer)) {
             throw new IllegalStateException("BWEM was not instantiated properly.");
         }
-        ((MapInitializerImpl) this.map).initialize();
+        ((MapInitializer) this.map).initialize();
         this.map.assignStartingLocationsToSuitableBases();
     }
 }

src/main/java/bwem/Graph.java

@@ -17,7 +17,7 @@
 import bwapi.TilePosition;
 import bwapi.WalkPosition;
 import bwem.area.Area;
-import bwem.area.AreaInitializerImpl;
+import bwem.area.AreaInitializer;
 import bwem.area.typedef.AreaId;
 import bwem.area.typedef.GroupId;
 import bwem.map.Map;
@@ -264,7 +264,7 @@ public void createAreas(final List<Pair<WalkPosition, Integer>> areasList) {
         for (int id = 1; id <= areasList.size(); ++id) {
             final WalkPosition top = areasList.get(id - 1).getLeft();
             final int miniTileCount = areasList.get(id - 1).getRight();
-            this.areas.add(new AreaInitializerImpl(getMap(), new AreaId(id), top, miniTileCount));
+            this.areas.add(new AreaInitializer(getMap(), new AreaId(id), top, miniTileCount));
         }
     }
 
@@ -458,8 +458,8 @@ public void createChokePoints(
                 final AreaId a = new AreaId(loopA);
                 final AreaId b = new AreaId(loopB);
                 if (!getChokePoints(a, b).isEmpty()) {
-                    ((AreaInitializerImpl) getArea(a)).addChokePoints(getArea(b), getChokePoints(a, b));
-                    ((AreaInitializerImpl) getArea(b)).addChokePoints(getArea(a), getChokePoints(a, b));
+                    ((AreaInitializer) getArea(a)).addChokePoints(getArea(b), getChokePoints(a, b));
+                    ((AreaInitializer) getArea(b)).addChokePoints(getArea(a), getChokePoints(a, b));
 
                     this.chokePoints.addAll(getChokePoints(a, b));
                 }
@@ -512,7 +512,7 @@ public void computeChokePointDistanceMatrix() {
         }
 
         // 4) Update Area::m_AccessibleNeighbors for each Area
-        for (final Area area : getAreas()) ((AreaInitializerImpl) area).updateAccessibleNeighbors();
+        for (final Area area : getAreas()) ((AreaInitializer) area).updateAccessibleNeighbors();
 
         // 5)  Update Area::m_groupId for each Area
         updateGroupIds();
@@ -524,22 +524,22 @@ public void collectInformation() {
         for (final Mineral mineral : getMap().getNeutralData().getMinerals()) {
             final Area area = getMap().getMainArea(mineral.getTopLeft(), mineral.getSize());
             if (area != null) {
-                ((AreaInitializerImpl) area).addMineral(mineral);
+                ((AreaInitializer) area).addMineral(mineral);
             }
         }
 
         for (Geyser geyser : getMap().getNeutralData().getGeysers()) {
             final Area area = getMap().getMainArea(geyser.getTopLeft(), geyser.getSize());
             if (area != null) {
-                ((AreaInitializerImpl) area).addGeyser(geyser);
+                ((AreaInitializer) area).addGeyser(geyser);
             }
         }
 
         for (int y = 0; y < getMap().getData().getMapData().getTileSize().getY(); ++y)
             for (int x = 0; x < getMap().getData().getMapData().getTileSize().getX(); ++x) {
                 final Tile tile = getMap().getData().getTile(new TilePosition(x, y));
                 if (tile.getAreaId().intValue() > 0) {
-                    ((AreaInitializerImpl) getArea(tile.getAreaId()))
+                    ((AreaInitializer) getArea(tile.getAreaId()))
                             .addTileInformation(new TilePosition(x, y), tile);
                 }
             }
@@ -548,7 +548,7 @@ public void collectInformation() {
     public void createBases(final TerrainData terrainData) {
         this.bases.clear();
         for (final Area area : this.areas) {
-            ((AreaInitializerImpl) area).createBases(terrainData);
+            ((AreaInitializer) area).createBases(terrainData);
             this.bases.addAll(area.getBases());
         }
     }
@@ -575,7 +575,7 @@ private void computeChokePointDistances(final Area pContext) {
             }
 
             final int[] distanceToTargets =
-                    ((AreaInitializerImpl) pContext).computeDistances(pStart, targets);
+                    ((AreaInitializer) pContext).computeDistances(pStart, targets);
 
             setPathForComputeChokePointDistances(distanceToTargets, pStart, targets, false);
         }
@@ -682,7 +682,7 @@ private int[] computeDistances(final ChokePoint start, final List<ChokePoint> ta
             }
 
             for (final Area pArea :
-                    new Area[]{current.getAreas().getLeft(), current.getAreas().getRight()}) {
+                new Area[]{current.getAreas().getLeft(), current.getAreas().getRight()}) {
                 for (final ChokePoint next : pArea.getChokePoints()) {
                     if (!next.equals(current)) {
                         final int newNextDist = currentDist + distance(current, next);
@@ -735,19 +735,19 @@ private int[] computeDistances(final ChokePoint start, final List<ChokePoint> ta
     private void updateGroupIds() {
         int nextGroupId = 1;
 
-        AreaInitializerImpl.getStaticMarkable().unmarkAll();
+        AreaInitializer.getStaticMarkable().unmarkAll();
 
         for (final Area start : getAreas()) {
-            if (((AreaInitializerImpl) start).getMarkable().isUnmarked()) {
+            if (((AreaInitializer) start).getMarkable().isUnmarked()) {
                 final List<Area> toVisit = new ArrayList<>();
                 toVisit.add(start);
                 while (!toVisit.isEmpty()) {
                     final Area current = toVisit.remove(toVisit.size() - 1);
-                    ((AreaInitializerImpl) current).setGroupId(new GroupId(nextGroupId));
+                    ((AreaInitializer) current).setGroupId(new GroupId(nextGroupId));
 
                     for (final Area next : current.getAccessibleNeighbors()) {
-                        if (((AreaInitializerImpl) next).getMarkable().isUnmarked()) {
-                            ((AreaInitializerImpl) next).getMarkable().setMarked();
+                        if (((AreaInitializer) next).getMarkable().isUnmarked()) {
+                            ((AreaInitializer) next).getMarkable().setMarked();
                             toVisit.add(next);
                         }
                     }