More smaller clean-ups.

Author: bytekeeper

src/main/java/bwem/BWMapInitializer.java

@@ -68,7 +68,6 @@ void initialize() {
 
         getGraph().collectInformation();
 
-
         getGraph().createBases(getData());
     }
 
@@ -649,8 +648,7 @@ void onBlockingNeutralDestroyed(Neutral pBlocking) {
         // Unblock the Tiles of pBlocking:
         for (int dy = 0; dy < pBlocking.getSize().getY(); ++dy)
             for (int dx = 0; dx < pBlocking.getSize().getX(); ++dx) {
-                getData()
-                                .getTile(pBlocking.getTopLeft().add(new TilePosition(dx, dy)))
+                getData().getTile(pBlocking.getTopLeft().add(new TilePosition(dx, dy)))
                         .resetAreaId();
                 setAreaIdInTile(pBlocking.getTopLeft().add(new TilePosition(dx, dy)));
             }

src/main/java/bwem/Graph.java

@@ -18,6 +18,7 @@
 import bwapi.WalkPosition;
 import bwem.util.BwemExt;
 import bwem.util.CheckMode;
+import bwem.util.Pred;
 import bwem.util.Utils;
 
 import java.util.*;
@@ -80,7 +81,7 @@ public Area getNearestArea(final WalkPosition walkPosition) {
                                 // findCond
                             (MiniTile miniTile, WalkPosition unused) -> (miniTile.getAreaId().intValue() > 0),
                                 // visitCond
-                            (MiniTile miniTile, WalkPosition unused) -> true);
+                            Pred.accept());
 
         return getArea(w);
     }
@@ -338,7 +339,7 @@ public void createChokePoints(
                                 // findCond
                                 (MiniTile miniTile, WalkPosition unused) -> miniTile.isWalkable(),
                                 // visitCond
-                                (MiniTile miniTile, WalkPosition unused) -> true);
+                                Pred.accept());
 
                         final List<WalkPosition> list = new ArrayList<>();
                         list.add(center);

src/main/java/bwem/PathingResult.java

@@ -3,7 +3,7 @@
 /**
  * Result of a path query including the approximated length of the path.
  */
-public class PathingResult {
+public final class PathingResult {
 
     private final CPPath cpPath;
     private final int approxDistance;

src/main/java/bwem/Tile.java

@@ -210,27 +210,12 @@ void setInternalData(int internalData) {
      * Corresponds to BWAPI::getGroundHeight divided by 2.
      */
     public enum GroundHeight {
-        LOW_GROUND(0),
-        HIGH_GROUND(1),
-        VERY_HIGH_GROUND(2);
+        LOW_GROUND, // Height 0
+        HIGH_GROUND, // Height 1
+        VERY_HIGH_GROUND; // Height 2
 
-        private final int val;
-
-        GroundHeight(final int val) {
-            this.val = val;
-        }
-
-        static GroundHeight parseGroundHeight(final int height) {
-            for (final GroundHeight val : GroundHeight.values()) {
-                if (val.intValue() == height) {
-                    return val;
-                }
-            }
-            throw new IllegalArgumentException("Unrecognized height: " + height);
-        }
-
-        int intValue() {
-            return this.val;
+        static GroundHeight parseGroundHeight(int height) {
+            return values()[height];
         }
     }
 }

src/main/java/bwem/util/Markable.java

@@ -22,22 +22,13 @@ public final class Markable {
 
     public Markable(final StaticMarkable staticMarkable) {
         this.staticMarkable = staticMarkable;
-        this.lastMark = 0;
-    }
-
-    private StaticMarkable getStaticMarkable() {
-        return this.staticMarkable;
     }
 
     public boolean isUnmarked() {
-        return (this.lastMark != getStaticMarkable().getCurrentMark());
+        return (this.lastMark != staticMarkable.getCurrentMark());
     }
 
     public void setMarked() {
-        this.lastMark = getStaticMarkable().getCurrentMark();
-    }
-
-    public void setUnmarked() {
-        this.lastMark = getStaticMarkable().getCurrentMark() - 1;
+        this.lastMark = staticMarkable.getCurrentMark();
     }
 }

src/main/java/bwem/util/Pred.java

@@ -15,4 +15,8 @@
 @FunctionalInterface
 public interface Pred<T, P> {
     boolean test(T tile, P position);
+
+    static <T, P> Pred<T, P> accept() {
+        return (tile, position) -> true;
+    }
 }

src/main/java/bwem/util/StaticMarkable.java

@@ -19,11 +19,7 @@
 public final class StaticMarkable {
     private int currentMark;
 
-    public StaticMarkable() {
-        this.currentMark = 0;
-    }
-
-    public int getCurrentMark() {
+    int getCurrentMark() {
         return this.currentMark;
     }