From d4a80ec466e7dc2b0aeeab6f70bc0350e36227cf Mon Sep 17 00:00:00 2001
From: Jason Long <jason@long.name>
Date: Sun, 21 Sep 2014 15:57:29 -0400
Subject: [PATCH] cleanup: rename isRoadAny() to isRoad()... ditto for
 isRailAny()

---
 src/micropolisj/engine/MapScanner.java    | 2 +-
 src/micropolisj/engine/Sprite.java        | 2 +-
 src/micropolisj/engine/TileConstants.java | 4 ++--
 src/micropolisj/gui/OverlayMapView.java   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/micropolisj/engine/MapScanner.java b/src/micropolisj/engine/MapScanner.java
index a839b7b..be27976 100644
--- a/src/micropolisj/engine/MapScanner.java
+++ b/src/micropolisj/engine/MapScanner.java
@@ -615,7 +615,7 @@ class MapScanner extends TileBehavior
 			// look for road
 			if (city.testBounds(xx, yy)) {
 				int tmp = city.getTile(xx, yy);
-				if (isRoadAny(tmp) || isRailAny(tmp))
+				if (isRoad(tmp) || isRail(tmp))
 				{
 					score++;
 				}
diff --git a/src/micropolisj/engine/Sprite.java b/src/micropolisj/engine/Sprite.java
index 0d69aef..430657a 100644
--- a/src/micropolisj/engine/Sprite.java
+++ b/src/micropolisj/engine/Sprite.java
@@ -180,7 +180,7 @@ public abstract class Sprite
 
 		int t = city.getTile(xpos, ypos);
 		if (isOverWater(t)) {
-			if (isRoadAny(t)) {
+			if (isRoad(t)) {
 				// becomes water
 				city.setTile(xpos, ypos, RIVER);
 			}
diff --git a/src/micropolisj/engine/TileConstants.java b/src/micropolisj/engine/TileConstants.java
index 7f5248a..718a580 100644
--- a/src/micropolisj/engine/TileConstants.java
+++ b/src/micropolisj/engine/TileConstants.java
@@ -384,7 +384,7 @@ public class TileConstants
 		return (tile == DIRT || (isDozeable(tile) && isCombustible(tile)));
 	}
 
-	public static boolean isRoadAny(int tile)
+	public static boolean isRoad(int tile)
 	{
 		assert (tile & LOMASK) == tile;
 
@@ -447,7 +447,7 @@ public class TileConstants
 			(tile != VBRIDGE));
 	}
 
-	public static boolean isRailAny(int tile)
+	public static boolean isRail(int tile)
 	{
 		assert (tile & LOMASK) == tile;
 
diff --git a/src/micropolisj/gui/OverlayMapView.java b/src/micropolisj/gui/OverlayMapView.java
index 2d38ecd..8de4c72 100644
--- a/src/micropolisj/gui/OverlayMapView.java
+++ b/src/micropolisj/gui/OverlayMapView.java
@@ -345,8 +345,8 @@ public class OverlayMapView extends JComponent
 				case TRANSPORT:
 				case TRAFFIC_OVERLAY:
 					if (isConstructed(tile)
-						&& !isRoadAny(tile)
-						&& !isRailAny(tile))
+						&& !isRoad(tile)
+						&& !isRail(tile))
 					{
 						tile = DIRT;
 					}