diff --git a/src/com/uncc/gameday/parking/ParkingChoices.java b/src/com/uncc/gameday/parking/ParkingChoice.java similarity index 73% rename from src/com/uncc/gameday/parking/ParkingChoices.java rename to src/com/uncc/gameday/parking/ParkingChoice.java index 2d1bd14..7574a9f 100644 --- a/src/com/uncc/gameday/parking/ParkingChoices.java +++ b/src/com/uncc/gameday/parking/ParkingChoice.java @@ -1,6 +1,6 @@ package com.uncc.gameday.parking; -public enum ParkingChoices { +public enum ParkingChoice { GREEN ("GREEN"), BLACK ("BLACK"), RED ("RED"), @@ -14,6 +14,6 @@ public enum ParkingChoices { GOLD ("GOLD"); String choice; - ParkingChoices(String choice) { this.choice = choice; } + ParkingChoice(String choice) { this.choice = choice; } public String getValue() { return choice; } } \ No newline at end of file diff --git a/src/com/uncc/gameday/parking/ParkingClient.java b/src/com/uncc/gameday/parking/ParkingClient.java index 8f34745..f9dabcd 100644 --- a/src/com/uncc/gameday/parking/ParkingClient.java +++ b/src/com/uncc/gameday/parking/ParkingClient.java @@ -25,7 +25,7 @@ public class ParkingClient { return gds.listLots(); } - public ParkingLot listLot(ParkingChoices choice) { + public ParkingLot listLot(ParkingChoice choice) { return gds.listLot(choice.getValue()); } @@ -33,7 +33,7 @@ public class ParkingClient { return gds.listLot(lot.getLocation().getValue()); } - public void rateLot(RatingChoices rating, ParkingChoices parkingLot) { + public void rateLot(RatingChoices rating, ParkingChoice parkingLot) { ParkingRating pRating = new ParkingRating(); pRating.setParkingLot(parkingLot); pRating.setRating(rating); @@ -50,7 +50,7 @@ public class ParkingClient { return mMap; } - public Map listLotLocation(ParkingChoices c) { + public Map listLotLocation(ParkingChoice c) { HashMap mMap = new HashMap(); ParkingLot mParkingLot = new ParkingLot(); mParkingLot.setLocation(c); diff --git a/src/com/uncc/gameday/parking/ParkingLot.java b/src/com/uncc/gameday/parking/ParkingLot.java index 2c278a9..df5b8f9 100644 --- a/src/com/uncc/gameday/parking/ParkingLot.java +++ b/src/com/uncc/gameday/parking/ParkingLot.java @@ -2,7 +2,7 @@ package com.uncc.gameday.parking; public class ParkingLot { - private ParkingChoices location; + private ParkingChoice location; private int filled_pct; public int getFilledPct() { @@ -11,10 +11,10 @@ public class ParkingLot { public void setFilledPct(int filled_pct) { this.filled_pct = filled_pct; } - public ParkingChoices getLocation() { + public ParkingChoice getLocation() { return location; } - public void setLocation(ParkingChoices location) { + public void setLocation(ParkingChoice location) { this.location = location; } diff --git a/src/com/uncc/gameday/parking/ParkingRating.java b/src/com/uncc/gameday/parking/ParkingRating.java index 8670d61..9e03669 100644 --- a/src/com/uncc/gameday/parking/ParkingRating.java +++ b/src/com/uncc/gameday/parking/ParkingRating.java @@ -1,13 +1,13 @@ package com.uncc.gameday.parking; public class ParkingRating { - private ParkingChoices parking_lot; + private ParkingChoice parking_lot; private RatingChoices rating; - public ParkingChoices getParkingLot() { + public ParkingChoice getParkingLot() { return parking_lot; } - public void setParkingLot(ParkingChoices parking_lot) { + public void setParkingLot(ParkingChoice parking_lot) { this.parking_lot = parking_lot; } public RatingChoices getRating() { diff --git a/src/com/uncc/gameday/registration/RegistrationClient.java b/src/com/uncc/gameday/registration/RegistrationClient.java index f20a00b..cf292ba 100644 --- a/src/com/uncc/gameday/registration/RegistrationClient.java +++ b/src/com/uncc/gameday/registration/RegistrationClient.java @@ -6,7 +6,7 @@ import retrofit.RestAdapter; import android.content.Context; import com.uncc.gameday.R; -import com.uncc.gameday.parking.ParkingChoices; +import com.uncc.gameday.parking.ParkingChoice; import com.uncc.gameday.parking.ParkingLot; import com.uncc.gameday.parking.ParkingLotCallback; import com.uncc.gameday.parking.ParkingRating;