Skip to content

Commit

Permalink
Remove redundant interfaces
Browse files Browse the repository at this point in the history
  • Loading branch information
mikera committed Sep 1, 2012
1 parent 789d653 commit a2a0c55
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/main/java/mikera/ai/Tasks.java
Expand Up @@ -50,7 +50,7 @@ public R run(T actor, P param) {
return task.run(actor, param);
}
};
};
}

public static <T,P,R> Task<T,P,R> prioritise(
final PersistentList<PriorityFunction<T,P>> ps,
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/mikera/data/Data.java
Expand Up @@ -4,7 +4,6 @@
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.Serializable;
import java.nio.ByteBuffer;
import java.util.AbstractList;
import java.util.Iterator;
Expand All @@ -28,7 +27,7 @@
*
*/
@Mutable
public final class Data extends AbstractList<Byte> implements List<Byte>, Cloneable, Serializable, Comparable<Data>, Externalizable {
public final class Data extends AbstractList<Byte> implements Cloneable, Comparable<Data>, Externalizable {
private static final long serialVersionUID = 293989965333996558L;
private static final int DEFAULT_DATA_INCREMENT=50;

Expand Down
8 changes: 8 additions & 0 deletions src/main/java/mikera/engine/BaseObject.java
Expand Up @@ -314,4 +314,12 @@ public void flattenProperties() {
this.local = flattened.local;
this.inherited = null;
}

@Override
public int hashCode() {
// TODO should we have a proper hashcode?
return super.hashCode();
}


}
2 changes: 1 addition & 1 deletion src/main/java/mikera/engine/BitGrid.java
Expand Up @@ -10,7 +10,7 @@
*
*/
@Mutable
public final class BitGrid extends BaseGrid<Boolean> implements Cloneable {
public final class BitGrid extends BaseGrid<Boolean> {
private static final int GROW_BORDER=1;

private static final int XLOWBITS=2;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/mikera/util/Arrays.java
Expand Up @@ -69,7 +69,7 @@ public static <T> T[] deleteElement(T[] array, int i) {

public static float[] deleteElement(float[] array, int i) {
int count=array.length;
float[] newarray=new float[count-1];;
float[] newarray=new float[count-1];

System.arraycopy(array, 0, newarray, 0, i);
System.arraycopy(array, i+1, newarray, i, count-i-1);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/mikera/util/TextUtils.java
Expand Up @@ -184,7 +184,7 @@ public static String toHexString(int n) {
for (int i=0; i<8; i++) {
chars[7-i]=toHexChar(n);
n>>=4;
};
}
return new String(chars);
}

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/mikera/engine/TestGrid.java
Expand Up @@ -151,7 +151,7 @@ public Object visit(int x1, int y1, int z1, int x2, int y2, int z2,

return null;
}
};
}


@Test public void testTreeGidBlockSet() {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/mikera/engine/TestOctreap.java
Expand Up @@ -358,7 +358,7 @@ public Object visit(int x1, int y1, int z1, int x2, int y2, int z2,
oct.setBlock(x1, y1, z1, x2, y2, z2, value);
return null;
}
};
}

@Test public void testBlock2x() {
Octreap<Integer> m=new Octreap<>();
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/mikera/persistent/TestPersistentLongMap.java
Expand Up @@ -165,7 +165,7 @@ public void testNullAdds(PersistentMap<Long,String> pm) {
public void testEquals(PersistentMap<Long,String> pm) {
PersistentMap<Long,String> pm2=pm.include(2L,new String("Hello"));
PersistentMap<Long,String> pm3=pm.include(2L,new String("Hello"));
assertEquals(pm2,pm3);;
assertEquals(pm2,pm3);
}


Expand Down
2 changes: 1 addition & 1 deletion src/test/java/mikera/persistent/TestPersistentMap.java
Expand Up @@ -177,7 +177,7 @@ public void testNullAdds(PersistentMap<Integer,String> pm) {
public void testEquals(PersistentMap<Integer,String> pm) {
PersistentMap<Integer,String> pm2=pm.include(2,new String("Hello"));
PersistentMap<Integer,String> pm3=pm.include(2,new String("Hello"));
assertEquals(pm2,pm3);;
assertEquals(pm2,pm3);
}


Expand Down

0 comments on commit a2a0c55

Please sign in to comment.