Update Logic.java, LogicManager.java, Model.java, ModelManager.java #124
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…into TapBar_branch # Conflicts: # src/main/java/seedu/address/MainApp.java # src/main/java/seedu/address/model/Model.java # src/main/java/seedu/address/model/ModelManager.java # 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/model/ModelManagerTest.java
Codecov Report
@@ Coverage Diff @@
## master #124 +/- ##
============================================
+ Coverage 45.12% 45.62% +0.50%
- Complexity 523 536 +13
============================================
Files 140 140
Lines 2531 2558 +27
Branches 264 266 +2
============================================
+ Hits 1142 1167 +25
+ Misses 1342 1336 -6
- Partials 47 55 +8
Continue to review full report at Codecov.
|
dianneloh9
requested changes
Oct 12, 2020
| @@ -149,4 +152,46 @@ | |||
| */ | |||
| void updateFilteredPropertyList(Predicate<Property> predicate); | |||
|
|
|||
| //=========== ModelManager ================================================================================ | |||
| setTabBar(); | ||
| populateTab(); | ||
| } | ||
|
|
||
| /** | ||
| * Initialises all tabs on the tabpane. | ||
| */ | ||
|
|
||
| private void setPersonCalenderBidTabBar() { |
|
|
||
| private Logic logic; | ||
|
|
||
| @FXML | ||
| private TabPane personCalenderBidTabBar; |
…into TapBar_branch # Conflicts: # src/main/java/seedu/address/MainApp.java # src/main/java/seedu/address/logic/Logic.java # src/main/java/seedu/address/logic/LogicManager.java # src/main/java/seedu/address/model/ModelManager.java # src/main/java/seedu/address/ui/TabBar.java # 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/model/ModelManagerTest.java
dianneloh9
approved these changes
Oct 12, 2020
| @@ -138,6 +140,15 @@ public Path getSellerAddressBookFilePath() { | |||
|
|
|||
| // ===================== PROPERTY ===================== | |||
|
|
|||
| @Override | |||
There was a problem hiding this comment.
Should organise by the comment headers
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.