diff options
author | Christopher Baines <cbaines8@gmail.com> | 2012-02-28 22:27:49 +0000 |
---|---|---|
committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-28 22:27:49 +0000 |
commit | cde3c08d7e9e486d7d1a795832ea1b767d96a4f3 (patch) | |
tree | f1af1424ebf5cb3a548a7d73257723395dccb267 /src/net/cbaines/suma/Waypoint.java | |
parent | 7e88b00e017bde16c12e6adb78883acf7b2ba575 (diff) | |
parent | 5f2b8712079aeb5b7cee476b06b36013edac4fb3 (diff) | |
download | southamptonuniversitymap-cde3c08d7e9e486d7d1a795832ea1b767d96a4f3.tar southamptonuniversitymap-cde3c08d7e9e486d7d1a795832ea1b767d96a4f3.tar.gz |
Merge branch 'dev'
Conflicts:
src/net/cbaines/suma/BusSpecificStopView.java
src/net/cbaines/suma/StopView.java
Diffstat (limited to 'src/net/cbaines/suma/Waypoint.java')
-rw-r--r-- | src/net/cbaines/suma/Waypoint.java | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/src/net/cbaines/suma/Waypoint.java b/src/net/cbaines/suma/Waypoint.java deleted file mode 100644 index d56c05d..0000000 --- a/src/net/cbaines/suma/Waypoint.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Southampton University Map App - * Copyright (C) 2011 Christopher Baines - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package net.cbaines.suma; - -import org.osmdroid.util.GeoPoint; - -import com.j256.ormlite.table.DatabaseTable; - -@DatabaseTable(tableName = "routeWaypoints") -public class Waypoint extends POI { - - Waypoint() { - } - - int sequence; - - String route; - - public Waypoint(int sequence, GeoPoint point) { - super(point.toDoubleString() + ":" + sequence, point); - this.type = POI.WAYPOINT; - this.sequence = sequence; - } - -} |