Changes from PR review.

Author: bytekeeper

src/main/java/bwapi/ClientData.java

@@ -596,17 +596,17 @@ public Shape(int myOffset) {
     }
     ShapeType getType() {
       int offset = myOffset + 0;
-      return ShapeType.withId(sharedMemory.getInt(offset));
+      return ShapeType.idToEnum[sharedMemory.getInt(offset)];
     }
     void setType(ShapeType value) {
-      sharedMemory.putInt(myOffset + 0, value.getId());
+      sharedMemory.putInt(myOffset + 0, value.id);
     }
     CoordinateType getCtype() {
       int offset = myOffset + 4;
-      return CoordinateType.withId(sharedMemory.getInt(offset));
+      return CoordinateType.idToEnum[sharedMemory.getInt(offset)];
     }
     void setCtype(CoordinateType value) {
-      sharedMemory.putInt(myOffset + 4, value.getId());
+      sharedMemory.putInt(myOffset + 4, value.id);
     }
     int getX1() {
       int offset = myOffset + 8;
@@ -672,10 +672,10 @@ public Command(int myOffset) {
     }
     CommandType getType() {
       int offset = myOffset + 0;
-      return CommandType.withId(sharedMemory.getInt(offset));
+      return CommandType.idToEnum[sharedMemory.getInt(offset)];
     }
     void setType(CommandType value) {
-      sharedMemory.putInt(myOffset + 0, value.getId());
+      sharedMemory.putInt(myOffset + 0, value.id);
     }
     int getValue1() {
       int offset = myOffset + 4;
@@ -721,10 +721,10 @@ public Event(int myOffset) {
     }
     EventType getType() {
       int offset = myOffset + 0;
-      return EventType.withId(sharedMemory.getInt(offset));
+      return EventType.idToEnum[sharedMemory.getInt(offset)];
     }
     void setType(EventType value) {
-      sharedMemory.putInt(myOffset + 0, value.getId());
+      sharedMemory.putInt(myOffset + 0, value.id);
     }
     int getV1() {
       int offset = myOffset + 4;

src/main/java/bwapi/CommandType.java

@@ -1,6 +1,8 @@
 package bwapi;
 
-public enum CommandType implements WithId {
+import java.util.Arrays;
+
+public enum CommandType {
     None(0),
     SetScreenPosition(1),
     PingMinimap(2),
@@ -21,28 +23,15 @@ public enum CommandType implements WithId {
     SetCommandOptimizerLevel(17),
     SetRevealAll(18);
 
-    public final int value;
-
-    CommandType(final int value) {
-        this.value = value;
-    }
-
-    @Override
-    public int getId() {
-        return value;
-    }
+    static final CommandType[] idToEnum = new CommandType[19];
 
-    static CommandType withId(int id) {
-        if (id < 0) return null;
-        CommandType commandType = IdMapper.commandTypeForId[id];
-        if (commandType == null) {
-            throw new IllegalArgumentException("No CommandType with id " + id);
-        }
-        return commandType;
+    static {
+        Arrays.stream(CommandType.values()).forEach(v -> idToEnum[v.id] = v);
     }
 
-    private static class IdMapper {
+    public final int id;
 
-        static final CommandType[] commandTypeForId = IdMapperHelper.toIdTypeArray(CommandType.class);
+    CommandType(final int id) {
+        this.id = id;
     }
 }

src/main/java/bwapi/CoordinateType.java

@@ -1,34 +1,22 @@
 package bwapi;
 
-public enum CoordinateType implements WithId {
+import java.util.Arrays;
+
+public enum CoordinateType {
     None(0),
     Screen(1),
     Map(2),
     Mouse(3);
 
-    public final int value;
-
-    CoordinateType(final int value) {
-        this.value = value;
-    }
-
-    @Override
-    public int getId() {
-        return value;
-    }
+    static final CoordinateType[] idToEnum = new CoordinateType[4];
 
-    static CoordinateType withId(int id) {
-        if (id < 0) return null;
-        CoordinateType coordinateType = IdMapper.coordinateTypes[id];
-        if (coordinateType == null) {
-            throw new IllegalArgumentException("No CoordinateType with id " + id);
-        }
-        return coordinateType;
+    static {
+        Arrays.stream(CoordinateType.values()).forEach(v -> idToEnum[v.id] = v);
     }
 
-    private static class IdMapper {
+    public final int id;
 
-        static final CoordinateType[] coordinateTypes = IdMapperHelper.toIdTypeArray(CoordinateType.class);
+    CoordinateType(final int id) {
+        this.id = id;
     }
-
 }

src/main/java/bwapi/EventType.java

@@ -1,6 +1,8 @@
 package bwapi;
 
-public enum EventType implements WithId {
+import java.util.Arrays;
+
+public enum EventType {
   MatchStart(0),
   MatchEnd(1),
   MatchFrame(2),
@@ -22,32 +24,16 @@ public enum EventType implements WithId {
   //TriggerAction,
   None(18);
 
-  private final int value;
-
-  EventType(int value) {
-
-    this.value = value;
-  }
+  static final EventType[] idToEnum = new EventType[19];
 
-  @Override
-  public int getId() {
-    return value;
+  static {
+    Arrays.stream(EventType.values()).forEach(v -> idToEnum[v.id] = v);
   }
 
-  static EventType withId(int id) {
-    if (id < 0) {
-      return null;
-    }
-    EventType eventType = IdMapper.eventTypes[id];
-    if (eventType == null) {
-      throw new IllegalArgumentException("No EventType with id " + id);
-    }
-    return eventType;
-  }
+  final int id;
 
-  private static class IdMapper {
+  EventType(int id) {
 
-    static final EventType[] eventTypes = IdMapperHelper.toIdTypeArray(EventType.class);
+    this.id = id;
   }
-
 }

src/main/java/bwapi/IdMapperHelper.java

@@ -1,6 +1,8 @@
 package bwapi;
 
-enum ShapeType implements WithId {
+import java.util.Arrays;
+
+enum ShapeType {
     None(0),
     Text(1),
     Box(2),
@@ -10,28 +12,15 @@ enum ShapeType implements WithId {
     Dot(6),
     Line(7);
 
-    public final int value;
-
-    ShapeType(final int value) {
-      this.value = value;
-    }
-
-    @Override
-    public int getId() {
-      return value;
-    }
+    static final ShapeType[] idToEnum = new ShapeType[8];
 
-    static ShapeType withId(int id) {
-        if (id < 0) return null;
-        ShapeType shapeType = IdMapper.shapeTypeForId[id];
-        if (shapeType == null) {
-            throw new IllegalArgumentException("No ShapeType with id " + id);
-        }
-        return shapeType;
+    static {
+        Arrays.stream(ShapeType.values()).forEach(v -> idToEnum[v.id] = v);
     }
 
-    private static class IdMapper {
+    public final int id;
 
-        static final ShapeType[] shapeTypeForId = IdMapperHelper.toIdTypeArray(ShapeType.class);
+    ShapeType(final int id) {
+      this.id = id;
     }
 }

src/main/java/bwapi/ShapeType.java

@@ -188,7 +188,7 @@ public static void main(String[] args) throws IOException {
               out.printf("Buffers.toString(sharedMemory, offset, %d)", v.arraySizes.size());
               break;
             case ENUM:
-              out.print(v.enumName + ".withId(sharedMemory.getInt(offset))");
+              out.print(v.enumName + ".idToEnum[sharedMemory.getInt(offset)]");
               break;
             case DOUBLE:
               out.print("sharedMemory.getDouble(offset)");
@@ -220,7 +220,7 @@ public static void main(String[] args) throws IOException {
                 break;
               case ENUM:
                 out.printf("%s value) {\n", v.enumName);
-                out.printf("      sharedMemory.putInt(%s, value.getId());\n", offsetString);
+                out.printf("      sharedMemory.putInt(%s, value.id);\n", offsetString);
                 break;
               case UNSIGNED_SHORT:
                 out.print("short value) {");