Skip to content

Commit 6b1d24e

Browse files
committed
simplify Point code
1 parent be41ca5 commit 6b1d24e

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

src/main/java/bwapi/Position.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,27 @@ public Position(final int x, final int y) {
1414
}
1515

1616
public Position(final Position p) {
17-
super(p.x, p.y, SIZE_IN_PIXELS);
17+
this(p.x, p.y);
1818
}
1919

2020
public Position(final WalkPosition wp) {
21-
super(wp.x * WalkPosition.SIZE_IN_PIXELS, wp.y * WalkPosition.SIZE_IN_PIXELS, SIZE_IN_PIXELS);
21+
this(wp.x * WalkPosition.SIZE_IN_PIXELS, wp.y * WalkPosition.SIZE_IN_PIXELS);
2222
}
2323

2424
public Position(final TilePosition tp) {
25-
super(tp.x * TilePosition.SIZE_IN_PIXELS, tp.y * TilePosition.SIZE_IN_PIXELS, SIZE_IN_PIXELS);
25+
this(tp.x * TilePosition.SIZE_IN_PIXELS, tp.y * TilePosition.SIZE_IN_PIXELS);
2626
}
2727

2828
Position(ClientData.Position position) {
2929
this(position.getX(), position.getY());
3030
}
3131

3232
public TilePosition toTilePosition() {
33-
return new TilePosition(x / TilePosition.SIZE_IN_PIXELS, y / TilePosition.SIZE_IN_PIXELS);
33+
return new TilePosition(this);
3434
}
3535

3636
public WalkPosition toWalkPosition() {
37-
return new WalkPosition(x / WalkPosition.SIZE_IN_PIXELS, y / WalkPosition.SIZE_IN_PIXELS);
37+
return new WalkPosition(this);
3838
}
3939

4040
public Position subtract(final Position other) {

src/main/java/bwapi/TilePosition.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,27 @@ public TilePosition(final int x, final int y) {
1313
}
1414

1515
public TilePosition(final Position p) {
16-
super(p.x / SIZE_IN_PIXELS, p.y / SIZE_IN_PIXELS, SIZE_IN_PIXELS);
16+
this(p.x / SIZE_IN_PIXELS, p.y / SIZE_IN_PIXELS);
1717
}
1818

1919
public TilePosition(final WalkPosition wp) {
20-
super(wp.x / WalkPosition.TILE_WALK_FACTOR, wp.y / WalkPosition.TILE_WALK_FACTOR, SIZE_IN_PIXELS);
20+
this(wp.x / WalkPosition.TILE_WALK_FACTOR, wp.y / WalkPosition.TILE_WALK_FACTOR);
2121
}
2222

2323
public TilePosition(final TilePosition tp) {
24-
super(tp.x, tp.y, SIZE_IN_PIXELS);
24+
this(tp.x, tp.y);
2525
}
2626

2727
TilePosition(ClientData.Position position) {
2828
this(position.getX(), position.getY());
2929
}
3030

3131
public Position toPosition() {
32-
return new Position(x * SIZE_IN_PIXELS, y * SIZE_IN_PIXELS);
32+
return new Position(this);
3333
}
3434

3535
public WalkPosition toWalkPosition() {
36-
return new WalkPosition(x * TILE_WALK_FACTOR, y * TILE_WALK_FACTOR);
36+
return new WalkPosition(this);
3737
}
3838

3939
public TilePosition subtract(final TilePosition other) {

src/main/java/bwapi/WalkPosition.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ public WalkPosition(final int x, final int y) {
1313
}
1414

1515
public WalkPosition(final Position p) {
16-
super(p.x / SIZE_IN_PIXELS, p.y / SIZE_IN_PIXELS, SIZE_IN_PIXELS);
16+
this(p.x / SIZE_IN_PIXELS, p.y / SIZE_IN_PIXELS);
1717
}
1818

1919
public WalkPosition(final WalkPosition wp) {
20-
super(wp.x, wp.y, SIZE_IN_PIXELS);
20+
this(wp.x, wp.y);
2121
}
2222

2323
public WalkPosition(final TilePosition tp) {
24-
super(tp.x * TILE_WALK_FACTOR, tp.y * TILE_WALK_FACTOR, SIZE_IN_PIXELS);
24+
this(tp.x * TILE_WALK_FACTOR, tp.y * TILE_WALK_FACTOR);
2525
}
2626

2727
public Position toPosition() {
28-
return new Position(x * SIZE_IN_PIXELS, y * SIZE_IN_PIXELS);
28+
return new Position(this);
2929
}
3030

3131
public TilePosition toTilePosition() {
32-
return new TilePosition(x / TILE_WALK_FACTOR, y / TILE_WALK_FACTOR);
32+
return new TilePosition(this);
3333
}
3434

3535
public WalkPosition subtract(final WalkPosition other) {

0 commit comments

Comments
 (0)