cleanup: rename class for consistency

lacostej · Jun 23, 2009 · fed15cb · fed15cb
1 parent 29a82ee
commit fed15cb
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/src/com/mycitybikes/android/ClearChannel.java b/src/com/mycitybikes/android/ClearChannel.java
@@ -24,7 +24,7 @@
 import android.util.Log;
 
 import com.google.android.maps.GeoPoint;
-import com.mycitybikes.android.model.BikeStationStatus;
+import com.mycitybikes.android.model.StationStatus;
 import com.mycitybikes.android.model.StationInfoBuilder;
 import com.mycitybikes.android.model.StationLocation;
 import com.mycitybikes.android.util.AndroidUtils;
@@ -133,7 +133,7 @@ public String buildStationInfo() {
 		}
 	}
 
-	public static BikeStationStatus readBikeStationStatus(String httpUrl) {
+	public static StationStatus readBikeStationStatus(String httpUrl) {
 		try {
 			return parseStatus(Utils.readContent(httpUrl, 5000));
 		} catch (Exception e) {
@@ -142,7 +142,7 @@ public static BikeStationStatus readBikeStationStatus(String httpUrl) {
 		}
 	}
 
-	static BikeStationStatus parseStatus(InputStream content)
+	static StationStatus parseStatus(InputStream content)
 			throws IOException {
 		String s = Utils.parseISToString(content);
 		s = s.substring(s.indexOf("<string"));
@@ -179,7 +179,7 @@ static BikeStationStatus parseStatus(InputStream content)
 	 * xstream.fromXML(is); return bikeStationStatus; }
 	 */
 
-	private static BikeStationStatus parseBikeStationStatusDOM(InputStream is) {
+	private static StationStatus parseBikeStationStatusDOM(InputStream is) {
 		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
 		DocumentBuilder db;
 		Document dom;
@@ -195,7 +195,7 @@ private static BikeStationStatus parseBikeStationStatusDOM(InputStream is) {
 			throw new IllegalArgumentException("Unexpected XML:"
 					+ stationNode.getNodeName());
 		}
-		BikeStationStatus bikeStationStatus = new BikeStationStatus();
+		StationStatus bikeStationStatus = new StationStatus();
 		NodeList stationChildren = stationNode.getChildNodes();
 		for (int i = 0; i < stationChildren.getLength(); i++) {
 			Node child = stationChildren.item(i);
@@ -249,15 +249,15 @@ public static String getStationInfo(StationLocation stationLocation) {
 	public static String getOsloStationInfo(StationLocation stationLocation) {
 		String result;
 		try {
-			BikeStationStatus status = readBikeStationStatus(stationLocation.getId());
+			StationStatus status = readBikeStationStatus(stationLocation.getId());
 			result = formatStationInfo(stationLocation, status);
 		} catch (Exception e) {
 			result = "Error: station information not available";
 		}
 		return result;
 	}
 
-	private static String formatStationInfo(StationLocation stationLocation, BikeStationStatus status) {
+	private static String formatStationInfo(StationLocation stationLocation, StationStatus status) {
 		String result;
 		if (!status.isOnline()) {
 			result = stationLocation.getDescription() + "\n\n(no station information)";
@@ -268,7 +268,7 @@ private static String formatStationInfo(StationLocation stationLocation, BikeSta
 		return result;
 	}
 
-	public static BikeStationStatus readBikeStationStatus(int stationId) {
+	public static StationStatus readBikeStationStatus(int stationId) {
 		return ClearChannel
 				.readBikeStationStatus("http://smartbikeportal.clearchannel.no/public/mobapp/maq.asmx/getRack?id="
 						+ stationId);
@@ -340,7 +340,7 @@ static void parseKml(InputStream is,
 	        GeoPoint geoPoint = null;
 			Node placemarkNode = placemarks.item(i);
 
-			final BikeStationStatus bikeStationStatus = new BikeStationStatus();
+			final StationStatus bikeStationStatus = new StationStatus();
 
 			// FIXME find out how offline is supported for Barcelona and the like
 			bikeStationStatus.setOnline(true);
@@ -513,7 +513,7 @@ static void parseWashington(InputStream is, List<StationLocation> stationLocatio
 						Log.e(Constants.TAG, "Missing data in a Whashington station.");
 						break;
 					}
-					final BikeStationStatus bikeStationStatus = new BikeStationStatus();
+					final StationStatus bikeStationStatus = new StationStatus();
 					bikeStationStatus.setEmptyLocks(emptyLocks);
 					bikeStationStatus.setReadyBikes(readyBikes);
 					bikeStationStatus.setOnline(true);

diff --git a/src/com/mycitybikes/android/JCDecaux.java b/src/com/mycitybikes/android/JCDecaux.java
@@ -15,7 +15,7 @@
 import android.content.Context;
 import android.util.Log;
 
-import com.mycitybikes.android.model.BikeStationStatus;
+import com.mycitybikes.android.model.StationStatus;
 import com.mycitybikes.android.model.StationInfoBuilder;
 import com.mycitybikes.android.model.StationLocation;
 import com.mycitybikes.android.util.Utils;
@@ -63,7 +63,7 @@ static void loadParisBikeLocations(InputStream is,
 			Double longitude = null;
 
 			// FIXME refactor model as to attach status to station
-			BikeStationStatus bikeStationStatus = new BikeStationStatus();
+			StationStatus bikeStationStatus = new StationStatus();
 
 			NamedNodeMap markerAttributes = markerNode.getAttributes();
 			Node n;
@@ -105,7 +105,7 @@ public String buildStationInfo() {
 		}
 	}
 
-	static BikeStationStatus readBikeStationStatus(int id) {
+	static StationStatus readBikeStationStatus(int id) {
 		try {
 			InputStream is = Utils.readContent(
 					"http://www.velib.paris.fr/service/stationdetails/" + id,
@@ -119,7 +119,7 @@ static BikeStationStatus readBikeStationStatus(int id) {
 		}
 	}
 
-	static BikeStationStatus parseStatus(InputStream is) {
+	static StationStatus parseStatus(InputStream is) {
 		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
 		DocumentBuilder db;
 		Document dom;
@@ -135,7 +135,7 @@ static BikeStationStatus parseStatus(InputStream is) {
 			throw new IllegalArgumentException("Unexpected XML:"
 					+ stationNode.getNodeName());
 		}
-		BikeStationStatus bikeStationStatus = new BikeStationStatus();
+		StationStatus bikeStationStatus = new StationStatus();
 		NodeList stationChildren = stationNode.getChildNodes();
 		for (int i = 0; i < stationChildren.getLength(); i++) {
 			Node child = stationChildren.item(i);
@@ -182,7 +182,7 @@ public static String getParisStationInfo(StationLocation stationLocation) {
 		int stationIndex = stationLocation.getId();
 		String result;
 		try {
-			BikeStationStatus status = readBikeStationStatus(stationIndex);
+			StationStatus status = readBikeStationStatus(stationIndex);
 			if (!status.isOnline()) {
 				result = stationLocation.getDescription()
 						+ "\n\n(no station information)";

diff --git a/src/com/mycitybikes/android/MyCityBikesActivity.java b/src/com/mycitybikes/android/MyCityBikesActivity.java
@@ -20,7 +20,7 @@
 import com.google.android.maps.MapActivity;
 import com.google.android.maps.MapController;
 import com.google.android.maps.Overlay;
-import com.mycitybikes.android.model.BikeStationStatus;
+import com.mycitybikes.android.model.StationStatus;
 import com.mycitybikes.android.model.StationLocation;
 import com.mycitybikes.android.util.AndroidUtils;
 import com.mycitybikes.android.view.MapLocationItemizedOverlay;
@@ -322,7 +322,7 @@ public void findClosestStation(FindStationCriteria criteria) {
 		StationLocation foundStation = null;
 		for (LocationAndDistance lad : sortedStationLocations) {
 			try {
-				BikeStationStatus status = ClearChannel
+				StationStatus status = ClearChannel
 						.readBikeStationStatus(lad.getStationIndex());
 				if ((criteria == FindStationCriteria.ReadyBike && status
 						.getReadyBikes() > 0)

diff --git a/...ikes/android/model/BikeStationStatus.java → ...itybikes/android/model/StationStatus.java b/...ikes/android/model/BikeStationStatus.java → ...itybikes/android/model/StationStatus.java
@@ -1,6 +1,6 @@
 package com.mycitybikes.android.model;
 
-public class BikeStationStatus {
+public class StationStatus {
 	private boolean online;
 	private int readyBikes;
 	private int emptyLocks;

diff --git a/tests/src/com/mycitybikes/android/ClearChannelTest.java b/tests/src/com/mycitybikes/android/ClearChannelTest.java
@@ -11,7 +11,7 @@
 import android.util.Log;
 
 import com.google.android.maps.GeoPoint;
-import com.mycitybikes.android.model.BikeStationStatus;
+import com.mycitybikes.android.model.StationStatus;
 import com.mycitybikes.android.model.StationLocation;
 
 public class ClearChannelTest extends AndroidTestCase {
@@ -58,15 +58,15 @@ private ByteArrayInputStream getStringInputStream(String string)
 	}
 
 	public void testParseOfflineStatus() throws IOException {
-		BikeStationStatus status = ClearChannel
+		StationStatus status = ClearChannel
 				.parseStatus(getStringInputStream(OFFLINE_STATION_STATUS));
 		assertEquals(false, status.isOnline());
 		assertEquals(0, status.getEmptyLocks());
 		assertEquals(0, status.getReadyBikes());
 	}
 
 	public void testParseOnlineStatus() throws IOException {
-		BikeStationStatus status = ClearChannel
+		StationStatus status = ClearChannel
 				.parseStatus(getStringInputStream(ONLINE_STATION_STATUS));
 		assertEquals(true, status.isOnline());
 		assertEquals(7, status.getEmptyLocks());
@@ -75,7 +75,7 @@ public void testParseOnlineStatus() throws IOException {
 
 	public void testFetchLiveStatus() {
 		int id = 10;
-		BikeStationStatus status = ClearChannel.readBikeStationStatus(id);
+		StationStatus status = ClearChannel.readBikeStationStatus(id);
 		Log.i(Constants.TAG, "Fetch status for station #" + id + ": "
 				+ status.toString());
 	}

diff --git a/tests/src/com/mycitybikes/android/JCDecauxTest.java b/tests/src/com/mycitybikes/android/JCDecauxTest.java
@@ -11,7 +11,7 @@
 import android.util.Log;
 
 import com.mycitybikes.android.JCDecaux;
-import com.mycitybikes.android.model.BikeStationStatus;
+import com.mycitybikes.android.model.StationStatus;
 import com.mycitybikes.android.model.StationLocation;
 
 public class JCDecauxTest extends AndroidTestCase {
@@ -82,7 +82,7 @@ private ByteArrayInputStream getStringInputStream(String string)
 	}
 
 	public void testParseParisStatus() throws IOException {
-		BikeStationStatus status = JCDecaux
+		StationStatus status = JCDecaux
 				.parseStatus(getStringInputStream(PARIS_STATION_STATUS));
 		assertEquals(true, status.isOnline());
 		assertEquals(2, status.getEmptyLocks());
@@ -91,14 +91,14 @@ public void testParseParisStatus() throws IOException {
 	}
 
 	public void testParseOfflineParisStatus() throws IOException {
-		BikeStationStatus status = JCDecaux
+		StationStatus status = JCDecaux
 				.parseStatus(getStringInputStream(PARIS_OFFLINE_STATION_STATUS));
 		assertEquals(false, status.isOnline());
 	}
 
 	public void testFetchLiveParisStatus() {
 		int id = 4027;
-		BikeStationStatus status = JCDecaux.readBikeStationStatus(id);
+		StationStatus status = JCDecaux.readBikeStationStatus(id);
 		Log.i(Constants.TAG, "Fetch Paris status for station #" + id + ": "
 				+ status.toString());
 	}