Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ReopenCommand #96

Merged
merged 24 commits into from Oct 27, 2019
Merged

Conversation

jakq
Copy link

@jakq jakq commented Oct 27, 2019

No description provided.

v1.0 with 3 EditCommandTest failures.
# Conflicts:
#	src/main/java/seedu/address/logic/Logic.java
#	src/main/java/seedu/address/logic/LogicManager.java
#	src/main/java/seedu/address/logic/commands/EditCommand.java
#	src/main/java/seedu/address/logic/parser/AddCommandParser.java
#	src/main/java/seedu/address/logic/parser/ParserUtil.java
#	src/main/java/seedu/address/model/AddressBook.java
#	src/main/java/seedu/address/model/Model.java
#	src/main/java/seedu/address/model/ModelManager.java
#	src/main/java/seedu/address/model/eatery/Eatery.java
#	src/main/java/seedu/address/model/eatery/UniqueEateryList.java
#	src/main/java/seedu/address/model/util/SampleDataUtil.java
#	src/main/java/seedu/address/storage/JsonAdaptedEatery.java
#	src/main/java/seedu/address/storage/JsonSerializableAddressBook.java
#	src/main/java/seedu/address/ui/EateryCard.java
#	src/main/java/seedu/address/ui/MainWindow.java
#	src/main/resources/view/EateryListCard.fxml
#	src/main/resources/view/EateryListPanel.fxml
#	src/main/resources/view/MainWindow.fxml
#	src/test/data/JsonSerializableAddressBookTest/duplicateEateryAddressBook.json
#	src/test/data/JsonSerializableAddressBookTest/invalidEateryAddressBook.json
#	src/test/data/JsonSerializableAddressBookTest/typicalEateriesAddressBook.json
#	src/test/java/seedu/address/logic/LogicManagerTest.java
#	src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java
#	src/test/java/seedu/address/logic/commands/AddCommandTest.java
#	src/test/java/seedu/address/logic/commands/ClearCommandTest.java
#	src/test/java/seedu/address/logic/commands/DeleteCommandTest.java
#	src/test/java/seedu/address/logic/commands/EditCommandTest.java
#	src/test/java/seedu/address/logic/commands/FindCommandTest.java
#	src/test/java/seedu/address/logic/commands/ListCommandTest.java
#	src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
#	src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
#	src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
#	src/test/java/seedu/address/logic/parser/ParserUtilTest.java
#	src/test/java/seedu/address/model/AddressBookTest.java
#	src/test/java/seedu/address/model/ModelManagerTest.java
#	src/test/java/seedu/address/model/eatery/EateryTest.java
#	src/test/java/seedu/address/model/eatery/UniqueEateryListTest.java
#	src/test/java/seedu/address/storage/JsonAdaptedEateryTest.java
#	src/test/java/seedu/address/testutil/EateryBuilder.java
#	src/test/java/seedu/address/testutil/EateryUtil.java
#	src/test/java/seedu/address/testutil/EditEateryDescriptorBuilder.java
#	src/test/java/seedu/address/testutil/TypicalEateries.java
1. Remove buildClose() from EateryBuilder
2. Add EOF line to EateryListPanel.fxml
3. Fix duplicateEateryAddressBook.json
4. Require nonnull Category for Eatery
- Removed the hasExactEatery method and its calls.
# Conflicts:
#	src/main/java/seedu/address/logic/commands/CloseCommand.java
#	src/test/java/seedu/address/logic/commands/AddCommandTest.java
#	src/test/java/seedu/address/logic/commands/CloseCommandTest.java
@JunHongT JunHongT merged commit 5f3e4e0 into AY1920S1-CS2103T-W11-3:master Oct 27, 2019
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.

None yet

2 participants