GroupId -> int

Author: bytekeeper

src/main/java/bwem/Graph.java

@@ -19,7 +19,6 @@
 import bwem.area.Area;
 import bwem.area.AreaInitializer;
 import bwem.area.typedef.AreaId;
-import bwem.area.typedef.GroupId;
 import bwem.map.Map;
 import bwem.map.TerrainData;
 import bwem.tile.MiniTile;
@@ -741,7 +740,7 @@ private void updateGroupIds() {
                 toVisit.add(start);
                 while (!toVisit.isEmpty()) {
                     final Area current = toVisit.remove(toVisit.size() - 1);
-                    ((AreaInitializer) current).setGroupId(new GroupId(nextGroupId));
+                    ((AreaInitializer) current).setGroupId(nextGroupId);
 
                     for (final Area next : current.getAccessibleNeighbors()) {
                         if (((AreaInitializer) next).getMarkable().isUnmarked()) {

src/main/java/bwem/area/Area.java

@@ -17,7 +17,6 @@
 import bwem.Base;
 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;
@@ -36,7 +35,7 @@ public abstract class Area {
     private final AreaId id;
     private final WalkPosition walkPositionWithHighestAltitude;
     private final int miniTileCount;
-    GroupId groupId = GroupId.ZERO;
+    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);
@@ -56,7 +55,7 @@ public AreaId getId() {
         return this.id;
     }
 
-    public GroupId getGroupId() {
+    public int getGroupId() {
         return this.groupId;
     }
 
@@ -123,7 +122,7 @@ public List<Area> getAccessibleNeighbors() {
     }
 
     public boolean isAccessibleFrom(final Area area) {
-        return getGroupId().equals(area.getGroupId());
+        return groupId == area.getGroupId();
     }
 
     public List<Mineral> getMinerals() {

src/main/java/bwem/area/AreaInitializer.java

@@ -25,7 +25,6 @@
 import bwem.Markable;
 import bwem.StaticMarkable;
 import bwem.area.typedef.AreaId;
-import bwem.area.typedef.GroupId;
 import bwem.map.Map;
 import bwem.map.TerrainData;
 import bwem.tile.MiniTile;
@@ -133,10 +132,7 @@ public void addTileInformation(final TilePosition tilePosition, final Tile tile)
         }
     }
 
-    public void setGroupId(final GroupId gid) {
-        if (!(gid.intValue() >= 1)) {
-            throw new IllegalArgumentException();
-        }
+    public void setGroupId(int gid) {
         super.groupId = gid;
     }