string fix and equals fix

Author: JasperGeurtz

src/main/java/bwapi/Client.java

@@ -124,7 +124,7 @@ String eventString(final int s) {
 
     int addString(final String s) {
         int stringCount = data.getStringCount();
-        if (stringCount >= MAX_COUNT) throw new IllegalStateException("Too many shapes!");
+        if (stringCount >= MAX_COUNT) throw new IllegalStateException("Too many strings!");
         data.setStringCount(stringCount + 1);
         data.setStrings(stringCount, s);
         return stringCount;

src/main/java/bwapi/Pair.java

@@ -52,12 +52,12 @@ public String toString() {
     }
 
     @Override
-    public boolean equals(final Object o) {
-        if (o instanceof Pair) {
-            final Pair op = (Pair)o;
-            return first.equals(op.first) && second.equals(op.second);
-        }
-        return false;
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Pair pair = (Pair) o;
+        return Objects.equals(first, pair.first) &&
+                Objects.equals(second, pair.second);
     }
 
     @Override

src/main/java/bwapi/Point.java

@@ -57,13 +57,13 @@ public int getApproxDistance(final Point point) {
     }
 
 
-    public boolean equals(final Object o) {
-        if (o != null && this.getClass().equals(o.getClass())) {
-            final Point point = (Point) o;
-            return x == point.x && y == point.y;
-        }
-        return false;
-
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Point point = (Point) o;
+        return x == point.x &&
+                y == point.y;
     }
 
     /**
@@ -75,6 +75,7 @@ public boolean isValid(final Game game) {
                 scalar * y < game.mapPixelHeight();
     }
 
+    @Override
     public int hashCode() {
         return (x << 16) ^ y;
     }