From b8efb779fe6a884b3911ff8e0aab8c8436d33c3f Mon Sep 17 00:00:00 2001 From: bspeice Date: Sun, 8 Dec 2013 23:27:35 -0500 Subject: [PATCH] Remove references to the ParkingCoordinate system, left unimplemented. --- .../activities/parking/LotViewFragment.java | 2 - .../uncc/gameday/parking/ParkingClient.java | 26 ----- .../gameday/parking/ParkingCoordinate.java | 108 ------------------ src/com/uncc/gameday/parking/ParkingLot.java | 21 ---- src/com/uncc/gameday/rest/GamedayService.java | 10 -- 5 files changed, 167 deletions(-) delete mode 100644 src/com/uncc/gameday/parking/ParkingCoordinate.java diff --git a/src/com/uncc/gameday/activities/parking/LotViewFragment.java b/src/com/uncc/gameday/activities/parking/LotViewFragment.java index 35b3a65..40ed8ab 100644 --- a/src/com/uncc/gameday/activities/parking/LotViewFragment.java +++ b/src/com/uncc/gameday/activities/parking/LotViewFragment.java @@ -108,8 +108,6 @@ public class LotViewFragment extends DialogFragment { public void run() { ParkingClient client = new ParkingClient(f.getActivity()); ParkingLot pl = client.listLot(this.pc); - ParkingLot pl2 = client.listLotLocation(this.pc); - pl.setCoordinate(pl2.getCoordinate()); f.initializeData(pl); } diff --git a/src/com/uncc/gameday/parking/ParkingClient.java b/src/com/uncc/gameday/parking/ParkingClient.java index 2d6774f..1616608 100644 --- a/src/com/uncc/gameday/parking/ParkingClient.java +++ b/src/com/uncc/gameday/parking/ParkingClient.java @@ -80,30 +80,4 @@ public class ParkingClient { gds.rateLot(rating, new ParkingLotCallback()); } - /** - * Get the coordinates for a specific parking lot - * - * @param p the p - * @return the parking lot - */ - public ParkingLot listLotLocation(ParkingLot p){ - ParkingCoordinate pc = gds.listLotLocation(p.getLocation().getValue()); - p.setCoordinate(pc); - return p; - } - - /** - * Get the coordinates for a specific parking lot - * - * @param c the c - * @return the parking lot - */ - public ParkingLot listLotLocation(ParkingChoice c) { - ParkingCoordinate pc = gds.listLotLocation(c.getValue()); - ParkingLot pl = new ParkingLot(); - pl.setLocation(c); - pl.setCoordinate(pc); - return pl; - } - } diff --git a/src/com/uncc/gameday/parking/ParkingCoordinate.java b/src/com/uncc/gameday/parking/ParkingCoordinate.java deleted file mode 100644 index d579b92..0000000 --- a/src/com/uncc/gameday/parking/ParkingCoordinate.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.uncc.gameday.parking; - -import android.content.Intent; -import android.net.Uri; - -// TODO: Auto-generated Javadoc -/** - * The Class ParkingCoordinate. - */ -public class ParkingCoordinate { - - /** The latitude. */ - private double latitude; - - /** The longitude. */ - private double longitude; - - /** The label. */ - private String label; - - /** - * Gets the latitude. - * - * @return the latitude - */ - public double getLatitude() { - return latitude; - } - - /** - * Sets the latitude. - * - * @param latitude the new latitude - */ - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - /** - * Gets the longitude. - * - * @return the longitude - */ - public double getLongitude() { - return longitude; - } - - /** - * Sets the longitude. - * - * @param longitude the new longitude - */ - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - /** - * Gets the label. - * - * @return the label - */ - public String getLabel() { - return label; - } - - /** - * Sets the label. - * - * @param label the new label - */ - public void setLabel(String label) { - this.label = label; - } - - /** - * Gets the navigation uri. - * - * @return the navigation uri - */ - public Uri getNavigationURI() { - // URI used to construct an intent for navigation - return Uri.parse("google.navigation:q=" + this.getLatitude() + "," + this.getLongitude()); - } - - /** - * Gets the navigation intent. - * - * @return the navigation intent - */ - public Intent getNavigationIntent() { - // Intent used to do navigation - return new Intent(Intent.ACTION_VIEW, this.getNavigationURI()); - } - - /** - * Instantiates a new parking coordinate. - * - * @param latitude the latitude - * @param longitude the longitude - * @param label the label - */ - public ParkingCoordinate(double latitude, double longitude, String label) { - this.latitude = latitude; - this.longitude = longitude; - this.label = label; - } - -} diff --git a/src/com/uncc/gameday/parking/ParkingLot.java b/src/com/uncc/gameday/parking/ParkingLot.java index 5bfb98b..1cccb6a 100644 --- a/src/com/uncc/gameday/parking/ParkingLot.java +++ b/src/com/uncc/gameday/parking/ParkingLot.java @@ -13,9 +13,6 @@ public class ParkingLot { /** The filled_pct. */ private int filled_pct; - /** The coordinate. */ - private ParkingCoordinate coordinate; - /** * Gets the filled pct. * @@ -52,22 +49,4 @@ public class ParkingLot { this.location = location; } - /** - * Gets the coordinate. - * - * @return the coordinate - */ - public ParkingCoordinate getCoordinate() { - return coordinate; - } - - /** - * Sets the coordinate. - * - * @param coordinate the new coordinate - */ - public void setCoordinate(ParkingCoordinate coordinate) { - this.coordinate = coordinate; - } - } diff --git a/src/com/uncc/gameday/rest/GamedayService.java b/src/com/uncc/gameday/rest/GamedayService.java index 40f3d3f..31601af 100644 --- a/src/com/uncc/gameday/rest/GamedayService.java +++ b/src/com/uncc/gameday/rest/GamedayService.java @@ -8,7 +8,6 @@ import retrofit.http.GET; import retrofit.http.POST; import retrofit.http.Path; -import com.uncc.gameday.parking.ParkingCoordinate; import com.uncc.gameday.parking.ParkingLot; import com.uncc.gameday.parking.ParkingRating; import com.uncc.gameday.registration.Attendee; @@ -46,15 +45,6 @@ public interface GamedayService { @POST("/lots/rate/") void rateLot(@Body ParkingRating p, Callback lot); - /** - * List lot location. - * - * @param lot the lot - * @return the parking coordinate - */ - @GET("/lots/{lot}/") - ParkingCoordinate listLotLocation(@Path("lot") String lot); - /** * Gets the user. *