Move CalendarServiceImpl and UnknownAgencyTimezoneException from

onebusaway2 into package 'org.opentripplanner.calendar.impl'. (Refactor OTP to have new OTP classes to replace the OBA GTFS classes opentripplanner#2494)
entur · Sep 20, 2017 · 52c98c5 · 52c98c5
1 parent f9f717c
commit 52c98c5
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 7 deletions.
diff --git a/src/main/java/org/opentripplanner/calendar/impl/CalendarServiceDataFactoryImpl.java b/src/main/java/org/opentripplanner/calendar/impl/CalendarServiceDataFactoryImpl.java
@@ -17,8 +17,6 @@
  */
 package org.opentripplanner.calendar.impl;
 
-import org.onebusaway2.gtfs.impl.calendar.CalendarServiceImpl;
-import org.onebusaway2.gtfs.impl.calendar.UnknownAgencyTimezoneException;
 import org.onebusaway2.gtfs.model.Agency;
 import org.onebusaway2.gtfs.model.AgencyAndId;
 import org.onebusaway2.gtfs.model.ServiceCalendar;

diff --git a/...fs/impl/calendar/CalendarServiceImpl.java → ...er/calendar/impl/CalendarServiceImpl.java b/...fs/impl/calendar/CalendarServiceImpl.java → ...er/calendar/impl/CalendarServiceImpl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway2.gtfs.impl.calendar;
+package org.opentripplanner.calendar.impl;
 
 import org.onebusaway2.gtfs.model.AgencyAndId;
 import org.onebusaway2.gtfs.model.calendar.CalendarServiceData;

diff --git a/src/main/java/org/opentripplanner/calendar/impl/MultiCalendarServiceImpl.java b/src/main/java/org/opentripplanner/calendar/impl/MultiCalendarServiceImpl.java
@@ -13,7 +13,6 @@ the License, or (at your option) any later version.
 
 package org.opentripplanner.calendar.impl;
 
-import org.onebusaway2.gtfs.impl.calendar.CalendarServiceImpl;
 import org.onebusaway2.gtfs.model.Agency;
 import org.onebusaway2.gtfs.model.AgencyAndId;
 import org.onebusaway2.gtfs.model.calendar.CalendarServiceData;

diff --git a/...endar/UnknownAgencyTimezoneException.java → .../impl/UnknownAgencyTimezoneException.java b/...endar/UnknownAgencyTimezoneException.java → .../impl/UnknownAgencyTimezoneException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onebusaway2.gtfs.impl.calendar;
+package org.opentripplanner.calendar.impl;
 
 public class UnknownAgencyTimezoneException extends RuntimeException {
 

diff --git a/src/main/java/org/opentripplanner/routing/graph/Graph.java b/src/main/java/org/opentripplanner/routing/graph/Graph.java
@@ -23,7 +23,7 @@ the License, or (at your option) any later version.
 import gnu.trove.list.linked.TDoubleLinkedList;
 import org.apache.commons.math3.stat.descriptive.rank.Median;
 import org.joda.time.DateTime;
-import org.onebusaway2.gtfs.impl.calendar.CalendarServiceImpl;
+import org.opentripplanner.calendar.impl.CalendarServiceImpl;
 import org.onebusaway2.gtfs.model.Agency;
 import org.onebusaway2.gtfs.model.AgencyAndId;
 import org.onebusaway2.gtfs.model.Stop;

diff --git a/src/test/java/org/opentripplanner/api/resource/GraphPathToTripPlanConverterTest.java b/src/test/java/org/opentripplanner/api/resource/GraphPathToTripPlanConverterTest.java
@@ -22,7 +22,7 @@ the License, or (at your option) any later version.
 import com.vividsolutions.jts.geom.GeometryFactory;
 import com.vividsolutions.jts.geom.LineString;
 import org.junit.Test;
-import org.onebusaway2.gtfs.impl.calendar.CalendarServiceImpl;
+import org.opentripplanner.calendar.impl.CalendarServiceImpl;
 import org.onebusaway2.gtfs.model.Agency;
 import org.onebusaway2.gtfs.model.AgencyAndId;
 import org.onebusaway2.gtfs.model.Route;