Skip to content

Conversation

@arandaaron04
Copy link
Collaborator

Created TrainApi for pulling ID, Position, Name, and other information.
JavaDocs for TrainApi and VehiclePositionApi.

Will be used for Station Train Tracking information.

carmen-chau and others added 30 commits November 13, 2023 15:29
…on_view, changed variable name. also removed stopData.txt
# Conflicts:
#	src/app/Main.java
#	src/app/SearchUseCaseFactory.java
#	src/data_access/FileStationDataAccessObject.java
#	src/entity/Station.java
#	src/entity/StationFactory.java
#	src/interface_adapter/search/SearchController.java
#	src/interface_adapter/search/SearchPresenter.java
#	src/interface_adapter/search/SearchState.java
#	src/interface_adapter/search/SearchViewModel.java
#	src/use_case/search/SearchDataAccessInterface.java
#	src/use_case/search/SearchInputBoundary.java
#	src/use_case/search/SearchInteractor.java
#	src/use_case/search/SearchOutputBoundary.java
#	src/view/LabelTextPanel.java
#	src/view/SearchPanelView.java
#	src/view/StationInfoView.java
#	src/view/ViewManager.java
…/JasonBarahan/TrackMyTransit into jac-show-imcoming-vehicles-use-case

# Conflicts:
#	src/app/SearchUseCaseFactory.java
#	src/data_access/FileStationDataAccessObject.java
#	src/entity/StationFactory.java
#	src/interface_adapter/search/SearchPresenter.java
#	src/interface_adapter/search/SearchState.java
#	src/use_case/search/SearchDataAccessInterface.java
#	src/view/SearchPanelView.java
#	src/view/StationInfoView.java
#	src/view/ViewManager.java
…nBarahan/TrackMyTransit into jac-show-imcoming-vehicles-use-case

# Conflicts:
#	src/data_access/API/GOTrainsApiClass.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants