diff --git a/docs/AboutUs.md b/docs/AboutUs.md index 9245b65cc27..ee10d300f8c 100644 --- a/docs/AboutUs.md +++ b/docs/AboutUs.md @@ -14,8 +14,10 @@ You can reach us at the email `seer[at]comp.nus.edu.sg` [[github](https://github.com/howenc)] [[portfolio](team/howenc.md)] -* Role: Developer -* Responsibilities: In charge of code quality and overall coordination +* Role: Project Lead +* Responsibilities: + * Organizes tasks and coordination between team members + * Ensures deliverables are done on time ### Huang Jia Can (Jason) diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 72abafd6039..6adeb00b7be 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -24,7 +24,7 @@ Refer to the guide [_Setting up and getting started_](SettingUp.md).
-:bulb: **Tip:** The `.puml` files used to create diagrams in this document `docs/diagrams` folder. Refer to the [_PlantUML Tutorial_ at se-edu/guides](https://se-education.org/guides/tutorials/plantUml.html) to learn how to create and edit diagrams. +:bulb: **Tip:** The `.puml` & `.uxf` files used to create diagrams in this document `docs/diagrams` folder. Refer to the [_PlantUML Tutorial_ at se-edu/guides (for `.puml`)](https://se-education.org/guides/tutorials/plantUml.html) or [_UMLet_ (for `.uxf`)](https://www.umlet.com) to learn how to create and edit diagrams.
@@ -73,7 +73,7 @@ The sections below give more details of each component. The **API** of this component is specified in [`Ui.java`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/ui/Ui.java) -![Structure of the UI Component](images/UiClassDiagram.png) + The UI consists of a `MainWindow` that is made up of parts e.g.`CommandBox`, `ResultDisplay`, `PersonListPanel`, `StatusBarFooter` etc. All these, including the `MainWindow`, inherit from the abstract `UiPart` class which captures the commonalities between classes that represent parts of the visible GUI. @@ -119,9 +119,10 @@ How the parsing works: ### Model component -**API** : [`Model.java`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/model/Model.java) +**API** : [`Model.java`](https://github.com/AY2324S1-CS2103T-F12-4/tp/blob/master/src/main/java/seedu/address/model/Model.java) - + + The `Model` component, @@ -129,18 +130,13 @@ The `Model` component, - stores the currently 'selected' `Person` and `Meeting` objects (e.g., results of a search query) as a separate _filtered_ list which is exposed to outsiders as an unmodifiable `ObservableList` and `ObservableList` that can be 'observed' e.g. the UI can be bound to this list so that the UI automatically updates when the data in the list change. - stores a `UserPref` object that represents the user’s preferences. This is exposed to the outside as a `ReadOnlyUserPref` objects. - does not depend on any of the other three components (as the `Model` represents data entities of the domain, they should make sense on their own without depending on other components) - -
:information_source: **Note:** An alternative (arguably, a more OOP) model is given below. It has a `Tag` list in the `AddressBook`, which `Person` references. This allows `AddressBook` to only require one `Tag` object per unique tag, instead of each `Person` needing their own `Tag` objects.
- - - -
+- The Tag is a factory class that keeps its own HashMap of the Tags it has created before, thus it ensures that every Tag is unique and can be referenced by all Person and Meetings. ### Storage component -**API** : [`Storage.java`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/storage/Storage.java) +**API** : [`Storage.java`](https://github.com/AY2324S1-CS2103T-F12-4/tp/blob/master/src/main/java/seedu/address/storage/Storage.java) - + The `Storage` component, @@ -252,12 +248,14 @@ All of these fields are optional and typing `findm` alone will not impose any pr Given below is an example usage scenario and how the `findm` command behaves at each step. Step 1. The user executes `findm m/meeting` command to find all meetings that have the keyword `meeting` in their title. This results in the logic component calling `parse` from the `AddressBookParser` object to make a `FindMeetingCommandParser` object. This will parse the arguments available and create the `GeneralPredicateMeeting` object and FindMeetingCommand object. -![FindMeetingSequence](images/FindMeetingSequence.png) + + Step 2. The `FindMeetingCommand` will be immediately executed and will call `setPredicate(GeneralMeetingPredicate)` from `Model`. The `GeneralMeetingPredicate` will be used on all meetings, meetings which pass all 5 predicates are shown in `MeetingSchedulePanel`. After which `FindMeetingCommand` and the predicate objects will no longer be referenced. The following diagrams show the entire sequence flow for `LogicManager#execute()` for FindMeetingCommand. -![FindMeetingSequence2](images/FindMeetingSequence2.png) + + #### Design Considerations and Rationale @@ -628,6 +626,8 @@ testers are expected to do more *exploratory* testing. 1. Download the jar file and copy into an empty folder 2. Double-click the jar file Expected: Shows the GUI with a set of sample contacts. The window size may not be optimum. + 1. If this fails, open command prompt and navigate to the empty folder you just created. + 2. use command `java -jar OutBook.jar` to see if it runs. If it runs continue as per normal. 2. Saving window preferences @@ -636,29 +636,133 @@ testers are expected to do more *exploratory* testing. 2. Re-launch the app by double-clicking the jar file.
Expected: The most recent window size and location is retained. -3. _{ more test cases …​ }_ +3. Exiting + 1. input command `exit`.
Expected: OutBook closes and shutdown. + +### Adding a person + +1. Adding a person while all persons are being shown + + 1. Prerequisites: List all persons using the `listc` command. Multiple persons in the list. + + 2. Test case: `addc n/John Doe p/12345678 e/JohnDoe@gmail.com`
+ Expected: Contact John Doe is created wth phone number 12345678 and email JohnDoe@gmail.com. The contact should be the first in the list as it does not have a last contacted date. Details of the added contact shown in the status message. + + 3. Test case: `addc n/John Not Doe p/87654321 e/JohnNotDoe@gmail.com lc/10.10.2023 1000 s/Active t/tagOne`
Expected: Contact John Not Doe is created wth phone number 87654321, email JohnNotDoe@gmail.com, last contacted at 10.10.2023 1000, status as Active and is tagged with tagOne. Details of the added contact shown in the status message. + + 4. If you were to repeat any of the test cases above, you will encounter a duplicate error + + 5. Test case: `addc n/John Doe`
+ Expected: No person is added. Error details shown in the status message. + + 6. Test case: `addc p/12345678`
Expected: Similar to previous. + + 7. Test case: `addc e/JohnDoe@gmail.com`
Expected: Similar to previous. + + 8. Other incorrect delete commands to try: `addc`, `addc 1` and any `addc` command that does not have `n/NAME`, `p/PHONE_NUMBER` & `e/EMAIL`
+ Expected: Similar to previous. + +2. Adding a person while not all persons are being shown. + 1. Prerequisites: Filter the contact list by using the `findc` command. If you are using the default data given, input `findc n/Yu`.
Expected: Only Bernice Yu is shown in the contact list. + + 2. Repeat Test case from `Adding a person 1.2`.
+ Expected: similar to 1.2. + + 3. Adding a contact automatically list all contact after it is done. + +### Editing a person + +1. Editing a person + + 1. Test case: `editc 1 n/John Doe p/12345678 e/JohnDoe@gmail.com`
+ Expected: The first person in the contact list is has its details replaced with the given arguments. Details of the added contact shown in the status message. + + 2. If you were to edit a contact so that it has the same name or phone number or email to any other contact, you will encounter a duplicate error + + 3. Other incorrect delete commands to try: `editc` and `editc 1`, you will receive a required index error and a required field error. ### Deleting a person 1. Deleting a person while all persons are being shown - 1. Prerequisites: List all persons using the `list` command. Multiple persons in the list. + 1. Prerequisites: List all persons using the `listc` command. Multiple persons in the list. 2. Test case: `delete 1`
- Expected: First contact is deleted from the list. Details of the deleted contact shown in the status message. Timestamp in the status bar is updated. + Expected: First contact is deleted from the list. Details of the deleted contact shown in the status message. 3. Test case: `delete 0`
- Expected: No person is deleted. Error details shown in the status message. Status bar remains the same. + Expected: No person is deleted. Error details shown in the status message. 4. Other incorrect delete commands to try: `delete`, `delete x`, `...` (where x is larger than the list size)
Expected: Similar to previous. -2. _{ more test cases …​ }_ +2. Deleting a person while not all persons are being shown. + 1. Prerequisites: Filter the contact list by using the `findc` command. If you are using the default data given, input `findc n/Yu`.
Expected: Only Bernice Yu is shown in the contact list. + + 2. Test case: `delete 1`
+ Expected: Bernice Yu is deleted from the list. Nothing should be shown in the list. Details of the deleted contact shown in the status message. + + 3. Test case: `delete 0`
+ Expected: No person is deleted. Error details shown in the status message. + + 4. Other incorrect delete commands to try: `delete`, `deletec` `delete x` (where x is larger than the list size)
+ Expected: Similar to previous. + +### View Contact + +1. View contact without list changing + 1. use `viewc 1` to view the first contact
+ Expected: the first contact will have its details shown on the details panel. +2. View contact with list changing + 1. Do the same test as before + 2. Edit the first contact to have a later last contacted date than the second contact.
+ Expected: The second contact will now take first place in the list and the details panel will change to show the new first place contact. + +### Meeting Tests + +Repeat the contact test cases with meeting commands +1. Add Meeting commands + - `adddm m/Test Meeting 1 a/Test Location 1 s/02.10.2023 1000 e/02.10.2023 1200` +2. Find Meeting commands + - `findm m/Meeting` +3. Edit Meeting commands + - `editm m/Changed Meeting Name` +4. Delete Meeting commands + - `deletem 1` +5. View Meeting commands + - `viewm 1` + +### Meeting Attendees + +1. Add Meeting Attendee + 1. Use `addmc 1 2`
+ Expected: The second person in the current person list will be added to the first meeting in the current meeting list. + 2. Instead of using 1 or 2, use indexes that are more than the amount of meetings or persons.
+ Expected: An error will be shown which indicated the index which is out of bounds. + 3. Repeat 1 and 2 with filtered lists using `findc` and `findm` +2. Remove Meeting Attendee + 1. Prerequisite: There must be an attendee in the meeting you are looking at. To look at the attendees for a meeting, use `viewm` on the meeting. In this case we will look at the first meeting. + 2. The attendees will be listed with an index in the meeting. Use `rmmc 1 1`.
+ Expected: The meeting will have its first attendee removed. + +### Mark Meetings + +1. Mark a Meeting as completed + 1. Use `mark 1` to mark the first meeting as completed
+ Expected: Meeting will be shown as completed and the attendees that are in the meeting will have their last contacted updated to the end time of the meeting. ### Saving data 1. Dealing with missing/corrupted data files - 1. _{explain how to simulate a missing/corrupted file, and the expected behavior}_ + 1. If you have added, edited or deleted anything, there should be a new folder that appears in the folder that you placed OutBook.jar in. + 2. Open file and open the `outbook.json` file. In the persons section, delete any line that has name, phone, email, etc... + 3. Run the program again with `java -jar OutBook.jar`
+ Expected: You will open up to a blank OutBook. At this point if you were to add, edit or delete anything, the data you had previously will be deleted and saved over with the new data you just added, losing all you data. + +2. Recovering from missing/corrupted data files -2. _{ more test cases …​ }_ + 1. After completed the test above, add back the field that was deleted in step 2. If you do not know what was deleted, place a placeholder for that specific field. + 1. All persons will have a name, phone, email, lastContactedTime, status, remark and tags. + 2. Meetings have a similar structure with title, location, start, end, attendees, tags, status. + 2. Run the program again, and you will see the rest of the data with the placeholder that you put. diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 93df36aaa64..a4c87fa7bff 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -5,7 +5,7 @@ title: OutBook User Guide # OutBook ## About OutBook -OutBook is an app that allows freelance insurance agents to manage their numerous contacts and meeting schedule. It is optimised for Command Line Interface (CLI) and aims to significantly reduce the time needed for organizational tasks. +OutBook is a desktop app that allows freelance insurance agents to manage their numerous contacts and meeting schedule. It is optimised for Command Line Interface (CLI) and aims to significantly reduce the time needed for organizational tasks. This guide aims to help you explore its features and learn how to use them. diff --git a/docs/diagrams/Howen's_UML.uxf b/docs/diagrams/Howen's_UML.uxf index 5b30559e569..07cf5797e66 100644 --- a/docs/diagrams/Howen's_UML.uxf +++ b/docs/diagrams/Howen's_UML.uxf @@ -1,13 +1,13 @@ - 11 + 13 UMLClass - 957 - 77 - 110 - 44 + 1898 + 39 + 130 + 52 <<interface>> UI @@ -17,10 +17,10 @@ bg=green UMLClass - 1155 - 88 - 110 - 33 + 2132 + 52 + 130 + 39 UIManager bg=green @@ -29,10 +29,10 @@ bg=green Relation - 1056 - 88 - 121 - 33 + 2015 + 52 + 143 + 39 lt=<<. 10.0;10.0;90.0;10.0 @@ -40,10 +40,10 @@ bg=green UMLClass - 957 - 242 - 110 - 33 + 2119 + 234 + 130 + 39 MainWindow bg=green @@ -52,10 +52,10 @@ bg=green UMLClass - 638 - 418 - 132 - 33 + 1521 + 364 + 156 + 39 StatusBarFooter bg=green @@ -64,10 +64,10 @@ bg=green UMLClass - 803 - 418 - 110 - 33 + 1716 + 364 + 130 + 39 ResultDisplay bg=green @@ -76,10 +76,10 @@ bg=green UMLClass - 946 - 418 - 110 - 33 + 1885 + 364 + 130 + 39 CommandBox bg=green @@ -88,10 +88,10 @@ bg=green UMLClass - 1089 - 418 - 110 - 33 + 2054 + 364 + 130 + 39 HelpWindow bg=green @@ -100,10 +100,10 @@ bg=green UMLClass - 1221 - 418 - 132 - 33 + 2210 + 364 + 156 + 39 PersonListPanel bg=green @@ -112,82 +112,82 @@ bg=green Relation - 1001 - 110 - 220 - 154 + 2171 + 78 + 52 + 182 lt=<- r1=1 - 10.0;120.0;180.0;10.0 + 10.0;120.0;10.0;10.0 Relation - 1056 - 264 - 209 - 176 + 2171 + 260 + 156 + 130 lt=<- r1=\n1 - 170.0;140.0;10.0;10.0 + 90.0;80.0;90.0;50.0;10.0;50.0;10.0;10.0 Relation - 1034 - 264 - 121 - 176 + 2106 + 260 + 104 + 130 lt=<- m1=0..1 - 80.0;140.0;10.0;10.0 + 10.0;80.0;10.0;50.0;60.0;50.0;60.0;10.0 Relation - 979 - 264 - 55 - 176 + 1937 + 260 + 273 + 130 lt=<- m1=1 - 10.0;140.0;30.0;10.0 + 10.0;80.0;10.0;50.0;190.0;50.0;190.0;10.0 Relation - 847 - 264 - 154 - 176 + 1768 + 260 + 442 + 130 lt=<- m1=1 - 10.0;140.0;120.0;10.0 + 10.0;80.0;10.0;50.0;320.0;50.0;320.0;10.0 Relation - 693 - 253 - 286 - 187 + 1586 + 260 + 624 + 130 lt=<- r1=1 - 10.0;150.0;240.0;10.0 + 10.0;80.0;10.0;50.0;460.0;50.0;460.0;10.0 UMLClass - 1386 - 418 - 176 - 33 + 2405 + 364 + 208 + 39 MeetingSchedulePanel bg=green @@ -196,22 +196,22 @@ bg=green Relation - 1056 - 253 - 396 - 187 + 2171 + 260 + 364 + 130 lt=<- r1=\n1 - 340.0;150.0;10.0;10.0 + 250.0;80.0;250.0;50.0;10.0;50.0;10.0;10.0 UMLClass - 946 - 660 - 110 - 44 + 1885 + 624 + 130 + 52 {abstract} UiPart @@ -221,94 +221,94 @@ bg=green Relation - 594 - 242 - 418 - 440 + 1469 + 234 + 676 + 416 lt=<<- - 360.0;380.0;360.0;230.0;10.0;230.0;10.0;10.0;330.0;10.0 + 360.0;300.0;360.0;180.0;10.0;180.0;10.0;10.0;500.0;10.0 Relation - 726 - 440 - 286 - 242 + 1586 + 390 + 377 + 260 lt=<<- - 240.0;200.0;240.0;50.0;10.0;50.0;10.0;10.0 + 270.0;180.0;270.0;60.0;10.0;60.0;10.0;10.0 Relation - 858 - 440 - 154 - 242 + 1768 + 390 + 195 + 260 lt=<<- - 120.0;200.0;120.0;50.0;10.0;50.0;10.0;10.0 + 130.0;180.0;130.0;60.0;10.0;60.0;10.0;10.0 Relation - 979 - 440 - 33 - 242 + 1924 + 390 + 39 + 260 lt=<<- - 10.0;200.0;10.0;10.0 + 10.0;180.0;10.0;10.0 Relation - 979 - 440 - 154 - 242 + 1924 + 390 + 221 + 260 lt=<<- - 10.0;200.0;10.0;50.0;120.0;50.0;120.0;10.0 + 10.0;180.0;10.0;60.0;150.0;60.0;150.0;10.0 Relation - 979 - 440 - 286 - 242 + 1924 + 390 + 338 + 260 lt=<<- - 10.0;200.0;10.0;50.0;240.0;50.0;240.0;10.0 + 10.0;180.0;10.0;60.0;240.0;60.0;240.0;10.0 Relation - 979 - 528 - 275 - 154 + 1924 + 520 + 390 + 130 lt=<<- - 10.0;120.0;10.0;20.0;230.0;20.0 + 10.0;80.0;10.0;40.0;280.0;40.0;280.0;10.0 UMLClass - 1232 - 528 - 110 - 33 + 2223 + 494 + 130 + 39 PersonCard bg=green @@ -317,10 +317,10 @@ bg=green Relation - 1276 - 440 - 44 - 110 + 2275 + 390 + 52 + 130 lt=<- m1= * @@ -329,10 +329,10 @@ m1= * UMLClass - 1408 - 528 - 110 - 33 + 2431 + 494 + 130 + 39 MeetingCard bg=green @@ -341,10 +341,10 @@ bg=green Relation - 1452 - 440 - 44 - 110 + 2483 + 390 + 52 + 130 lt=<- m1= * @@ -353,34 +353,34 @@ m1= * Relation - 979 - 440 - 440 - 242 + 1924 + 390 + 520 + 260 lt=<<- - 10.0;200.0;10.0;130.0;380.0;130.0;380.0;10.0 + 10.0;180.0;10.0;140.0;380.0;140.0;380.0;10.0 Relation - 979 - 550 - 473 - 132 + 1924 + 520 + 598 + 130 lt=<<- - 10.0;100.0;10.0;30.0;410.0;30.0;410.0;10.0 + 10.0;80.0;10.0;40.0;440.0;40.0;440.0;10.0 UMLClass - 1584 - 418 - 176 - 33 + 2639 + 364 + 208 + 39 InfoDisplayPanel bg=green @@ -389,34 +389,34 @@ bg=green Relation - 1056 - 242 - 550 - 198 + 2171 + 260 + 611 + 130 lt=<- r1=\n1 - 480.0;160.0;10.0;10.0 + 440.0;80.0;440.0;50.0;10.0;50.0;10.0;10.0 Relation - 979 - 440 - 649 - 242 + 1924 + 390 + 767 + 260 lt=<<- - 10.0;200.0;10.0;130.0;570.0;130.0;570.0;10.0 + 10.0;180.0;10.0;140.0;570.0;140.0;570.0;10.0 UMLClass - 550 + 1417 0 - 1243 - 737 + 1469 + 702 UI @@ -424,10 +424,10 @@ r1=\n1 UMLClass - 1859 - 77 - 198 - 165 + 2912 + 143 + 78 + 39 Logic @@ -435,10 +435,10 @@ r1=\n1 UMLClass - 1870 - 473 - 198 - 165 + 2925 + 520 + 91 + 39 Model @@ -446,65 +446,65 @@ r1=\n1 Relation - 1254 - 99 - 627 - 66 + 2249 + 65 + 689 + 117 lt=<- - 550.0;40.0;10.0;10.0 + 510.0;70.0;450.0;70.0;450.0;10.0;10.0;10.0 Relation - 1056 - 154 - 825 - 110 + 2236 + 143 + 702 + 130 lt=<- - 730.0;10.0;10.0;80.0 + 520.0;10.0;460.0;10.0;460.0;80.0;10.0;80.0 Relation - 1738 - 440 - 154 - 88 + 2756 + 390 + 195 + 182 lt=<. - 120.0;60.0;10.0;10.0 + 130.0;120.0;10.0;120.0;10.0;10.0 Relation - 1507 - 528 - 385 - 33 + 2548 + 494 + 403 + 78 lt=<. - 330.0;10.0;10.0;10.0 + 290.0;40.0;130.0;40.0;130.0;10.0;10.0;10.0 Relation - 1298 - 550 - 594 - 66 + 2301 + 520 + 650 + 117 lt=<. - 520.0;40.0;10.0;40.0;10.0;10.0 + 480.0;20.0;320.0;20.0;320.0;70.0;10.0;70.0;10.0;10.0 UMLClass - 1111 - 847 - 110 - 44 + 2080 + 949 + 130 + 52 <<interface>> Model @@ -514,10 +514,10 @@ bg=red UMLClass - 1309 - 847 - 176 - 44 + 2314 + 949 + 208 + 52 <<interface>> ReadOnlyUserPrefs @@ -527,10 +527,10 @@ bg=red UMLClass - 847 - 847 - 198 - 44 + 1768 + 949 + 234 + 52 <<interface>> ReadOnlyAddressBook @@ -540,10 +540,10 @@ bg=red UMLClass - 869 - 957 - 121 - 33 + 1794 + 1079 + 143 + 39 AddressBook bg=red @@ -552,10 +552,10 @@ bg=red UMLClass - 1100 - 957 - 121 - 33 + 2067 + 1079 + 143 + 39 ModelManager bg=red @@ -564,10 +564,10 @@ bg=red UMLClass - 1331 - 957 - 121 - 33 + 2340 + 1079 + 143 + 39 UserPrefs bg=red @@ -576,10 +576,10 @@ bg=red UMLClass - 880 - 1221 - 121 - 33 + 1807 + 1391 + 143 + 39 Person bg=red @@ -588,10 +588,10 @@ bg=red UMLClass - 1287 - 1221 - 121 - 33 + 2288 + 1391 + 143 + 39 Meeting bg=red @@ -600,10 +600,10 @@ bg=red UMLClass - 869 - 1056 - 154 - 33 + 1794 + 1196 + 182 + 39 UniquePersonList bg=red @@ -612,10 +612,10 @@ bg=red UMLClass - 1265 - 1056 - 154 - 33 + 2262 + 1196 + 182 + 39 UniqueMeetingList bg=red @@ -624,10 +624,10 @@ bg=red UMLClass - 583 - 1067 - 121 - 33 + 1456 + 1209 + 143 + 39 Name bg=red @@ -636,10 +636,10 @@ bg=red UMLClass - 583 - 1133 - 121 - 33 + 1456 + 1287 + 143 + 39 Email bg=red @@ -648,10 +648,10 @@ bg=red UMLClass - 583 - 1199 - 121 - 33 + 1456 + 1365 + 143 + 39 Phone bg=red @@ -660,10 +660,10 @@ bg=red UMLClass - 583 - 1265 - 121 - 33 + 1456 + 1443 + 143 + 39 Remark bg=red @@ -672,10 +672,10 @@ bg=red UMLClass - 583 - 1331 - 121 - 33 + 1456 + 1521 + 143 + 39 Status bg=red @@ -684,10 +684,10 @@ bg=red UMLClass - 1100 - 1397 - 121 - 33 + 2067 + 1599 + 143 + 39 Tag bg=red @@ -696,10 +696,10 @@ bg=red UMLClass - 1584 - 1056 - 121 - 33 + 2639 + 1196 + 143 + 39 Title bg=red @@ -708,10 +708,10 @@ bg=red UMLClass - 1584 - 1122 - 121 - 33 + 2639 + 1274 + 143 + 39 Location bg=red @@ -720,10 +720,10 @@ bg=red UMLClass - 1584 - 1188 - 121 - 33 + 2639 + 1352 + 143 + 39 MeetingTime bg=red @@ -732,10 +732,10 @@ bg=red UMLClass - 1584 - 1254 - 121 - 33 + 2639 + 1430 + 143 + 39 Attendee bg=red @@ -744,10 +744,10 @@ bg=red Relation - 1210 - 858 - 121 - 33 + 2197 + 962 + 143 + 39 lt=<. 90.0;10.0;10.0;10.0 @@ -755,10 +755,10 @@ bg=red Relation - 1034 - 858 - 99 - 33 + 1989 + 962 + 117 + 39 lt=<. 10.0;10.0;70.0;10.0 @@ -766,10 +766,10 @@ bg=red Relation - 1155 - 759 - 33 - 110 + 2132 + 845 + 39 + 130 lt=<. 10.0;80.0;10.0;10.0 @@ -777,10 +777,10 @@ bg=red Relation - 1386 - 880 - 33 - 99 + 2405 + 988 + 39 + 117 lt=<<. @@ -789,10 +789,10 @@ bg=red Relation - 924 - 880 - 33 - 99 + 1859 + 988 + 39 + 117 lt=<<. @@ -801,10 +801,10 @@ bg=red Relation - 1155 - 880 - 33 - 99 + 2132 + 988 + 39 + 117 lt=<<. @@ -813,10 +813,10 @@ bg=red Relation - 979 - 946 - 143 - 44 + 1924 + 1066 + 169 + 52 lt=<- r1=1 @@ -825,10 +825,10 @@ r1=1 Relation - 1210 - 946 - 143 - 44 + 2197 + 1066 + 169 + 52 lt=<- r1=1 @@ -837,10 +837,10 @@ r1=1 Relation - 935 - 979 - 44 - 99 + 1872 + 1105 + 52 + 117 lt=<- r2=1 @@ -849,10 +849,10 @@ r2=1 Relation - 935 - 1078 - 55 - 165 + 1872 + 1222 + 65 + 195 lt=<- m1=*all @@ -861,10 +861,10 @@ m1=*all Relation - 1331 - 1078 - 55 - 165 + 2340 + 1222 + 65 + 195 lt=<- m1=*all @@ -873,10 +873,10 @@ m1=*all Relation - 957 - 979 - 418 - 99 + 1898 + 1105 + 494 + 117 lt=<- m1=1 @@ -885,10 +885,10 @@ m1=1 Relation - 990 - 979 - 165 - 264 + 1937 + 1105 + 195 + 312 lt=<- r1=* filtered @@ -897,10 +897,10 @@ r1=* filtered Relation - 1177 - 979 - 165 - 264 + 2158 + 1105 + 195 + 312 lt=<- r1=* filtered @@ -910,10 +910,10 @@ r1pos=-15,10 Relation - 693 - 1067 - 209 - 187 + 1586 + 1209 + 247 + 221 lt=<- m1=1 @@ -922,10 +922,10 @@ m1=1 Relation - 693 - 1133 - 209 - 121 + 1586 + 1287 + 247 + 143 lt=<- m1=1 @@ -934,10 +934,10 @@ m1=1 UMLClass - 550 - 792 - 1265 - 968 + 1378 + 884 + 1534 + 1144 Model @@ -945,10 +945,10 @@ m1=1 Relation - 693 - 1199 - 209 - 55 + 1586 + 1365 + 247 + 65 lt=<- m1=1 @@ -957,10 +957,10 @@ m1=1 Relation - 693 - 1221 - 209 - 88 + 1586 + 1391 + 247 + 104 lt=<- m1=1 @@ -969,10 +969,10 @@ m1=1 Relation - 693 - 1221 - 209 - 154 + 1586 + 1391 + 247 + 182 lt=<- m1=1 @@ -981,10 +981,10 @@ m1=1 Relation - 792 - 1221 - 341 - 198 + 1703 + 1391 + 403 + 234 lt=<- m1=* @@ -993,10 +993,10 @@ m1=* Relation - 1397 - 1056 - 209 - 198 + 2418 + 1196 + 247 + 234 lt=<- m1=1 @@ -1005,10 +1005,10 @@ m1=1 Relation - 1397 - 1122 - 209 - 132 + 2418 + 1274 + 247 + 156 lt=<- m1=1 @@ -1017,10 +1017,10 @@ m1=1 Relation - 1397 - 1188 - 209 - 66 + 2418 + 1352 + 247 + 78 lt=<- m1=1 @@ -1029,22 +1029,22 @@ m1=1 Relation - 1397 - 1221 - 209 - 77 + 2418 + 1391 + 247 + 91 lt=<- -m1=* +m1=1 170.0;40.0;100.0;40.0;100.0;10.0;10.0;10.0 Relation - 1188 - 1221 - 341 - 198 + 2171 + 1391 + 403 + 234 lt=<- m1=* @@ -1053,10 +1053,10 @@ m1=* UMLClass - 1419 - 1496 - 275 - 33 + 2444 + 1716 + 325 + 39 AttendeeContainsKeywordsPredicate bg=red @@ -1065,10 +1065,10 @@ bg=red UMLClass - 1419 - 1441 - 275 - 33 + 2444 + 1651 + 325 + 39 TitleContainsKeywordsPredicate bg=red @@ -1077,10 +1077,10 @@ bg=red UMLClass - 1419 - 1551 - 275 - 33 + 2444 + 1781 + 325 + 39 LocationContainsKeywordsPredicate bg=red @@ -1089,10 +1089,10 @@ bg=red UMLClass - 1419 - 1606 - 275 - 33 + 2444 + 1846 + 325 + 39 MeetingTimeContainsPredicate bg=red @@ -1101,10 +1101,10 @@ bg=red UMLClass - 1023 - 1496 - 275 - 33 + 1976 + 1716 + 325 + 39 TagContainsKeywordsPredicate bg=red @@ -1113,10 +1113,10 @@ bg=red UMLClass - 1419 - 1661 - 275 - 33 + 2444 + 1911 + 325 + 39 GeneralMeetingPredicate bg=red @@ -1125,10 +1125,10 @@ bg=red UMLClass - 627 - 1441 - 275 - 33 + 1521 + 1716 + 325 + 39 NameContainsKeywordsPredicate bg=red @@ -1137,21 +1137,21 @@ bg=red Relation - 891 - 1243 - 55 - 231 + 1651 + 1417 + 234 + 325 lt=<. - 30.0;10.0;30.0;190.0;10.0;190.0 + 160.0;10.0;160.0;170.0;10.0;170.0;10.0;230.0 Relation - 1353 - 1243 - 88 - 231 + 2366 + 1417 + 104 + 273 lt=<. 10.0;10.0;10.0;190.0;60.0;190.0 @@ -1159,10 +1159,10 @@ bg=red Relation - 1353 - 1243 - 88 - 297 + 2366 + 1417 + 104 + 351 lt=<. 10.0;10.0;10.0;250.0;60.0;250.0 @@ -1170,10 +1170,10 @@ bg=red Relation - 1353 - 1243 - 88 - 341 + 2366 + 1417 + 104 + 403 lt=<. 10.0;10.0;10.0;290.0;60.0;290.0 @@ -1181,10 +1181,10 @@ bg=red Relation - 1353 - 1243 - 88 - 396 + 2366 + 1417 + 104 + 468 lt=<. 10.0;10.0;10.0;340.0;60.0;340.0 @@ -1192,10 +1192,10 @@ bg=red Relation - 1353 - 1243 - 88 - 451 + 2366 + 1417 + 104 + 533 lt=<. 10.0;10.0;10.0;390.0;60.0;390.0 @@ -1203,10 +1203,10 @@ bg=red Relation - 1287 - 1243 - 99 - 297 + 2288 + 1417 + 117 + 351 lt=<. 70.0;10.0;70.0;250.0;10.0;250.0 @@ -1214,70 +1214,65 @@ bg=red Relation - 1683 - 1441 - 77 - 264 + 2756 + 1651 + 91 + 312 - lt=-> -m2=1 + lt=-> 10.0;220.0;50.0;220.0;50.0;10.0;10.0;10.0 Relation - 1683 - 1507 - 77 - 198 + 2756 + 1729 + 91 + 234 - lt=-> -m2=1 + lt=-> 10.0;160.0;50.0;160.0;50.0;10.0;10.0;10.0 Relation - 1683 - 1562 - 77 - 143 + 2756 + 1794 + 91 + 169 - lt=-> -m2=1 + lt=-> 10.0;110.0;50.0;110.0;50.0;10.0;10.0;10.0 Relation - 1683 - 1617 - 77 - 88 + 2756 + 1859 + 91 + 104 - lt=-> -m2=1 + lt=-> 10.0;60.0;50.0;60.0;50.0;10.0;10.0;10.0 Relation - 1199 - 1518 - 561 - 220 + 2132 + 1742 + 715 + 260 - lt=-> -m2=1 - 450.0;150.0;490.0;150.0;490.0;180.0;10.0;180.0;10.0;10.0 + lt=-> + 490.0;150.0;530.0;150.0;530.0;180.0;10.0;180.0;10.0;10.0 UMLClass - 264 - 2321 - 231 - 209 + 1274 + 2821 + 78 + 39 Model @@ -1285,10 +1280,10 @@ m2=1 UMLClass - 1122 - 1936 - 110 - 44 + 2093 + 2236 + 130 + 52 <<interface>> Storage @@ -1298,10 +1293,10 @@ bg=yellow UMLClass - 1309 - 1936 - 176 - 44 + 2314 + 2236 + 208 + 52 <<interface>> UserPrefsStorage @@ -1311,10 +1306,10 @@ bg=yellow UMLClass - 847 - 1936 - 209 - 44 + 1768 + 2236 + 247 + 52 <<interface>> AddressBookStorage @@ -1324,10 +1319,10 @@ bg=yellow Relation - 1166 - 1859 - 33 - 99 + 2145 + 2145 + 39 + 117 lt=<. 10.0;70.0;10.0;10.0 @@ -1335,10 +1330,10 @@ bg=yellow Relation - 1166 - 1969 - 33 - 99 + 2145 + 2275 + 39 + 117 lt=<<. @@ -1347,10 +1342,10 @@ bg=yellow Relation - 1045 - 1936 - 99 - 44 + 2002 + 2236 + 117 + 52 lt=<<- @@ -1359,10 +1354,10 @@ bg=yellow Relation - 1221 - 1936 - 110 - 44 + 2210 + 2236 + 130 + 52 lt=<<- @@ -1371,10 +1366,10 @@ bg=yellow UMLClass - 1111 - 2046 - 132 - 33 + 2080 + 2366 + 156 + 39 StorageManager bg=yellow @@ -1383,10 +1378,10 @@ bg=yellow UMLClass - 1309 - 2046 - 176 - 33 + 2314 + 2366 + 208 + 39 JsonUserPrefsStorage bg=yellow @@ -1395,10 +1390,10 @@ bg=yellow UMLClass - 847 - 2046 - 209 - 33 + 1768 + 2366 + 247 + 39 JsonAddressBookStorage bg=yellow @@ -1407,10 +1402,10 @@ bg=yellow Relation - 935 - 1969 - 33 - 99 + 1872 + 2275 + 39 + 117 lt=<<. @@ -1419,10 +1414,10 @@ bg=yellow Relation - 1386 - 1969 - 33 - 99 + 2405 + 2275 + 39 + 117 lt=<<. @@ -1431,10 +1426,10 @@ bg=yellow Relation - 1232 - 1969 - 99 - 99 + 2223 + 2275 + 117 + 117 lt=<- m1=1 @@ -1443,10 +1438,10 @@ m1=1 Relation - 1045 - 1969 - 88 - 99 + 2002 + 2275 + 104 + 117 lt=<- m1=1 @@ -1456,10 +1451,10 @@ m1pos=-10,0 UMLClass - 814 - 2145 - 253 - 33 + 1729 + 2483 + 299 + 39 JsonSerializableAddressBook bg=yellow @@ -1468,10 +1463,10 @@ bg=yellow UMLClass - 660 - 2266 - 198 - 33 + 1547 + 2626 + 234 + 39 JsonAdaptedPerson bg=yellow @@ -1480,10 +1475,10 @@ bg=yellow UMLClass - 946 - 2266 - 198 - 33 + 1885 + 2626 + 234 + 39 JsonAdaptedMeeting bg=yellow @@ -1492,10 +1487,10 @@ bg=yellow UMLClass - 946 - 2376 - 198 - 33 + 1885 + 2756 + 234 + 39 JsonAdaptedAttendee bg=yellow @@ -1504,10 +1499,10 @@ bg=yellow UMLClass - 660 - 2376 - 198 - 33 + 1547 + 2756 + 234 + 39 JsonAdaptedTag bg=yellow @@ -1516,10 +1511,10 @@ bg=yellow UMLClass - 572 - 1892 - 1089 - 605 + 1456 + 2184 + 1092 + 715 Storage @@ -1527,10 +1522,10 @@ bg=yellow Relation - 484 - 2398 - 572 - 77 + 1339 + 2782 + 676 + 91 lt=<. 10.0;50.0;500.0;50.0;500.0;10.0 @@ -1538,10 +1533,10 @@ bg=yellow Relation - 847 - 2288 - 121 - 110 + 1768 + 2652 + 143 + 130 lt=<- m1=* @@ -1550,10 +1545,10 @@ m1=* Relation - 1034 - 2288 - 33 - 110 + 1989 + 2652 + 39 + 130 lt=<- m1=* @@ -1562,10 +1557,10 @@ m1=* Relation - 484 - 2277 - 748 - 198 + 1339 + 2639 + 884 + 234 lt=<. 10.0;160.0;660.0;160.0;660.0;10.0;600.0;10.0 @@ -1573,10 +1568,10 @@ m1=* Relation - 748 - 2288 - 33 - 110 + 1651 + 2652 + 39 + 130 lt=<- m1=* @@ -1585,10 +1580,10 @@ m1=* Relation - 484 - 2277 - 198 - 198 + 1339 + 2639 + 234 + 234 lt=<. 10.0;160.0;110.0;160.0;110.0;10.0;160.0;10.0 @@ -1596,10 +1591,10 @@ m1=* Relation - 484 - 2387 - 198 - 88 + 1339 + 2769 + 234 + 104 lt=<. 10.0;60.0;110.0;60.0;110.0;10.0;160.0;10.0 @@ -1607,10 +1602,10 @@ m1=* Relation - 781 - 2167 - 121 - 121 + 1690 + 2509 + 143 + 143 lt=<- m1=* @@ -1619,10 +1614,10 @@ m1=* Relation - 957 - 2167 - 55 - 121 + 1898 + 2509 + 65 + 143 lt=<- m1=* @@ -1631,10 +1626,10 @@ m1=* Relation - 484 - 2145 - 352 - 330 + 1339 + 2483 + 416 + 390 lt=<. 10.0;280.0;110.0;280.0;110.0;10.0;300.0;10.0 @@ -1642,10 +1637,10 @@ m1=* Relation - 935 - 2068 - 33 - 99 + 1872 + 2392 + 39 + 117 lt=<. 10.0;70.0;10.0;10.0 @@ -1653,10 +1648,10 @@ m1=* UMLClass - 0 - 2838 - 110 - 55 + 767 + 3302 + 130 + 65 _:Name_ -- @@ -1666,10 +1661,10 @@ m1=* UMLClass - 132 - 2750 - 110 - 55 + 923 + 3198 + 130 + 65 _:Email_ -- @@ -1679,10 +1674,10 @@ m1=* UMLClass - 132 - 2970 - 110 - 55 + 923 + 3458 + 130 + 65 _:Person_ -- @@ -1692,10 +1687,10 @@ m1=* UMLClass - 264 - 2838 - 110 - 55 + 1079 + 3302 + 130 + 65 _:Status_ -- @@ -1705,10 +1700,10 @@ m1=* UMLClass - 0 - 2750 - 110 - 55 + 767 + 3198 + 130 + 65 _:Phone_ -- @@ -1718,10 +1713,10 @@ m1=* UMLClass - 264 - 2750 - 110 - 55 + 1079 + 3198 + 130 + 65 _:Remark_ -- @@ -1731,10 +1726,10 @@ m1=* UMLClass - 451 - 2750 - 143 - 55 + 1300 + 3198 + 169 + 65 _:Tag_ -- @@ -1745,10 +1740,10 @@ tagName = "friend" Relation - 99 - 2860 - 110 - 132 + 884 + 3328 + 130 + 156 lt=-> 80.0;100.0;80.0;10.0;10.0;10.0 @@ -1756,10 +1751,10 @@ tagName = "friend" Relation - 176 - 2794 - 33 - 198 + 975 + 3250 + 39 + 234 lt=-> 10.0;160.0;10.0;10.0 @@ -1767,10 +1762,10 @@ tagName = "friend" Relation - 176 - 2860 - 110 - 132 + 975 + 3328 + 130 + 156 lt=-> 10.0;100.0;10.0;10.0;80.0;10.0 @@ -1778,10 +1773,10 @@ tagName = "friend" Relation - 176 - 2794 - 165 - 198 + 975 + 3250 + 195 + 234 lt=-> 10.0;160.0;10.0;30.0;130.0;30.0;130.0;10.0 @@ -1789,10 +1784,10 @@ tagName = "friend" Relation - 44 - 2794 - 165 - 198 + 819 + 3250 + 195 + 234 lt=-> 130.0;160.0;130.0;30.0;10.0;30.0;10.0;10.0 @@ -1800,10 +1795,10 @@ tagName = "friend" Relation - 176 - 2794 - 363 - 198 + 975 + 3250 + 429 + 234 lt=-> 10.0;160.0;10.0;110.0;310.0;110.0;310.0;10.0 @@ -1811,10 +1806,10 @@ tagName = "friend" UMLClass - 110 - 3234 - 165 - 55 + 897 + 3770 + 195 + 65 _:UniquePersonList_ -- @@ -1824,10 +1819,10 @@ tagName = "friend" Relation - 176 - 3014 - 33 - 242 + 975 + 3510 + 39 + 286 lt=<- 10.0;10.0;10.0;200.0 @@ -1835,10 +1830,10 @@ tagName = "friend" UMLClass - 946 - 3256 - 165 - 33 + 1885 + 3796 + 195 + 39 _:AddressBook_ @@ -1848,10 +1843,10 @@ tagName = "friend" UMLClass - 1177 - 3179 - 165 - 33 + 2158 + 3705 + 195 + 39 _:UniqueMeetingList_ @@ -1861,10 +1856,10 @@ tagName = "friend" Relation - 1100 - 3201 - 99 - 77 + 2067 + 3731 + 117 + 91 lt=<- 70.0;10.0;10.0;50.0 @@ -1872,10 +1867,10 @@ tagName = "friend" UMLClass - 660 - 2750 - 231 - 55 + 1547 + 3198 + 273 + 65 _:Location_ -- @@ -1885,10 +1880,10 @@ location = "zoom call url" UMLClass - 649 - 2838 - 242 - 55 + 1534 + 3302 + 286 + 65 _:Title_ -- @@ -1898,10 +1893,10 @@ meetingTitle = "cs2103t meeting" Relation - 957 - 2772 - 110 - 220 + 1898 + 3224 + 130 + 260 lt=-> 10.0;180.0;10.0;10.0;80.0;10.0 @@ -1909,10 +1904,10 @@ meetingTitle = "cs2103t meeting" UMLClass - 1045 - 2772 - 110 - 33 + 2002 + 3224 + 130 + 39 _:MeetingTime_ @@ -1921,10 +1916,10 @@ meetingTitle = "cs2103t meeting" Relation - 880 - 2772 - 110 - 220 + 1807 + 3224 + 130 + 260 lt=-> 80.0;180.0;80.0;10.0;10.0;10.0 @@ -1932,10 +1927,10 @@ meetingTitle = "cs2103t meeting" Relation - 880 - 2860 - 110 - 132 + 1807 + 3328 + 130 + 156 lt=-> 80.0;100.0;80.0;10.0;10.0;10.0 @@ -1943,10 +1938,10 @@ meetingTitle = "cs2103t meeting" UMLClass - 913 - 2970 - 110 - 33 + 1846 + 3458 + 130 + 39 _:Meeting_ @@ -1956,10 +1951,10 @@ meetingTitle = "cs2103t meeting" UMLClass - 946 - 3344 - 165 - 33 + 1885 + 3900 + 195 + 39 _:ModelManager_ @@ -1968,10 +1963,10 @@ meetingTitle = "cs2103t meeting" Relation - 1012 - 3278 - 33 - 88 + 1963 + 3822 + 39 + 104 lt=<- 10.0;10.0;10.0;60.0 @@ -1979,10 +1974,10 @@ meetingTitle = "cs2103t meeting" UMLClass - 1254 - 3267 - 165 - 33 + 2249 + 3809 + 195 + 39 _:FilteredList<Meeting>_ @@ -1991,10 +1986,10 @@ meetingTitle = "cs2103t meeting" Relation - 1100 - 3278 - 176 - 99 + 2067 + 3822 + 208 + 117 lt=<- 140.0;10.0;10.0;70.0 @@ -2002,10 +1997,10 @@ meetingTitle = "cs2103t meeting" UMLClass - 946 - 3069 - 286 - 33 + 1885 + 3575 + 338 + 39 _internalList:ObservableList<Meeting>_ @@ -2015,10 +2010,10 @@ meetingTitle = "cs2103t meeting" Relation - 1144 - 3091 - 110 - 110 + 2119 + 3601 + 130 + 130 lt=<- 10.0;10.0;80.0;80.0 @@ -2026,10 +2021,10 @@ meetingTitle = "cs2103t meeting" Relation - 902 - 2992 - 66 - 99 + 1833 + 3484 + 78 + 117 lt=<- 10.0;10.0;40.0;70.0 @@ -2037,10 +2032,10 @@ meetingTitle = "cs2103t meeting" UMLClass - 1309 - 3069 - 396 - 33 + 2314 + 3575 + 468 + 39 _internalUnmodifiableList:ObservableList<Meeting>_ @@ -2050,10 +2045,10 @@ meetingTitle = "cs2103t meeting" Relation - 1276 - 3091 - 99 - 110 + 2275 + 3601 + 117 + 130 lt=<- 70.0;10.0;10.0;80.0 @@ -2061,10 +2056,10 @@ meetingTitle = "cs2103t meeting" Relation - 1353 - 3091 - 99 - 198 + 2366 + 3601 + 117 + 234 lt=<- 70.0;10.0;10.0;160.0 @@ -2072,10 +2067,10 @@ meetingTitle = "cs2103t meeting" UMLClass - 1375 - 3388 - 220 - 33 + 2392 + 3952 + 260 + 39 _:MeetingSchedulePanel_ @@ -2084,10 +2079,10 @@ meetingTitle = "cs2103t meeting" Relation - 1386 - 3289 - 88 - 121 + 2405 + 3835 + 104 + 143 lt=<- 10.0;10.0;60.0;90.0 @@ -2095,10 +2090,10 @@ meetingTitle = "cs2103t meeting" UMLClass - 1518 - 3487 - 220 - 33 + 2561 + 4069 + 260 + 39 _:MainWindow_ @@ -2107,10 +2102,10 @@ meetingTitle = "cs2103t meeting" Relation - 1540 - 3410 - 44 - 99 + 2587 + 3978 + 52 + 117 lt=<- 10.0;10.0;20.0;70.0 @@ -2118,10 +2113,10 @@ meetingTitle = "cs2103t meeting" UMLClass - 1232 - 2750 - 176 - 55 + 2223 + 3198 + 208 + 65 _:Location_ -- @@ -2131,10 +2126,10 @@ location = "Main office" Relation - 1474 - 2772 - 110 - 220 + 2509 + 3224 + 130 + 260 lt=-> 10.0;180.0;10.0;10.0;80.0;10.0 @@ -2142,10 +2137,10 @@ location = "Main office" Relation - 1397 - 2772 - 110 - 220 + 2418 + 3224 + 130 + 260 lt=-> 80.0;180.0;80.0;10.0;10.0;10.0 @@ -2153,10 +2148,10 @@ location = "Main office" Relation - 1397 - 2860 - 110 - 132 + 2418 + 3328 + 130 + 156 lt=-> 80.0;100.0;80.0;10.0;10.0;10.0 @@ -2164,10 +2159,10 @@ location = "Main office" UMLClass - 1562 - 2772 - 110 - 33 + 2613 + 3224 + 130 + 39 _:MeetingTime_ @@ -2176,10 +2171,10 @@ location = "Main office" UMLClass - 1144 - 2838 - 264 - 55 + 2119 + 3302 + 312 + 65 _:Title_ -- @@ -2189,10 +2184,10 @@ meetingTitle = "Performance review" UMLClass - 1430 - 2970 - 110 - 33 + 2457 + 3458 + 130 + 39 _:Meeting_ @@ -2202,10 +2197,10 @@ meetingTitle = "Performance review" Relation - 1221 - 2992 - 231 - 99 + 2210 + 3484 + 273 + 117 lt=<- 190.0;10.0;10.0;70.0 @@ -2213,10 +2208,10 @@ meetingTitle = "Performance review" UMLClass - 902 - 2695 - 154 - 33 + 1833 + 3133 + 182 + 39 _start:LocalDateTime_ @@ -2225,10 +2220,10 @@ meetingTitle = "Performance review" UMLClass - 1100 - 2695 - 154 - 33 + 2067 + 3133 + 182 + 39 _end:LocalDateTime_ @@ -2236,10 +2231,10 @@ meetingTitle = "Performance review" Relation - 1034 - 2717 - 66 - 77 + 1989 + 3159 + 78 + 91 lt=-> 40.0;50.0;10.0;10.0 @@ -2247,10 +2242,10 @@ meetingTitle = "Performance review" Relation - 1067 - 2717 - 55 - 77 + 2028 + 3159 + 65 + 91 lt=-> 10.0;50.0;30.0;10.0 @@ -2258,10 +2253,10 @@ meetingTitle = "Performance review" UMLClass - 1441 - 2695 - 154 - 33 + 2470 + 3133 + 182 + 39 _start:LocalDateTime_ @@ -2270,10 +2265,10 @@ meetingTitle = "Performance review" UMLClass - 1639 - 2695 - 154 - 33 + 2704 + 3133 + 182 + 39 _end:LocalDateTime_ @@ -2281,10 +2276,10 @@ meetingTitle = "Performance review" Relation - 1573 - 2717 - 66 - 77 + 2626 + 3159 + 78 + 91 lt=-> 40.0;50.0;10.0;10.0 @@ -2292,10 +2287,10 @@ meetingTitle = "Performance review" Relation - 1606 - 2717 - 55 - 77 + 2665 + 3159 + 65 + 91 lt=-> 10.0;50.0;30.0;10.0 @@ -2303,10 +2298,10 @@ meetingTitle = "Performance review" UMLClass - 1793 - 3289 - 242 - 33 + 2886 + 3835 + 286 + 39 _:FindMeetingCommand_ bg=red @@ -2315,10 +2310,10 @@ bg=red UMLClass - 1804 - 3234 - 209 - 33 + 2899 + 3770 + 247 + 39 _:GeneralMeetingPredicate_ @@ -2327,10 +2322,10 @@ bg=red UMLClass - 1892 - 3003 - 275 - 33 + 3003 + 3497 + 325 + 39 _:TitleContainsKeywordsPredicate_ @@ -2339,10 +2334,10 @@ bg=red UMLClass - 1892 - 3047 - 275 - 33 + 3003 + 3549 + 325 + 39 _:LocationContainsKeywordsPredicate_ @@ -2351,10 +2346,10 @@ bg=red UMLClass - 1892 - 3135 - 275 - 33 + 3003 + 3653 + 325 + 39 _:AttendeeContainsKeywordsPredicate_ @@ -2363,10 +2358,10 @@ bg=red UMLClass - 1892 - 3179 - 275 - 33 + 3003 + 3705 + 325 + 39 _:TagContainsKeywordsPredicate_ @@ -2375,10 +2370,10 @@ bg=red UMLClass - 1892 - 3091 - 275 - 33 + 3003 + 3601 + 325 + 39 _:MeetingTimeContainsPredicate_ @@ -2387,10 +2382,10 @@ bg=red Relation - 1903 - 3256 - 33 - 55 + 3016 + 3796 + 39 + 65 lt=<- 10.0;10.0;10.0;30.0 @@ -2398,10 +2393,10 @@ bg=red Relation - 1837 - 3190 - 77 - 66 + 2938 + 3718 + 91 + 78 lt=<- 50.0;10.0;10.0;10.0;10.0;40.0 @@ -2409,10 +2404,10 @@ bg=red Relation - 1837 - 3146 - 77 - 110 + 2938 + 3666 + 91 + 130 lt=<- 50.0;10.0;10.0;10.0;10.0;80.0 @@ -2420,10 +2415,10 @@ bg=red Relation - 1837 - 3102 - 77 - 154 + 2938 + 3614 + 91 + 182 lt=<- 50.0;10.0;10.0;10.0;10.0;120.0 @@ -2431,10 +2426,10 @@ bg=red Relation - 1837 - 3058 - 77 - 198 + 2938 + 3562 + 91 + 234 lt=<- 50.0;10.0;10.0;10.0;10.0;160.0 @@ -2442,10 +2437,10 @@ bg=red Relation - 1837 - 3014 - 77 - 231 + 2938 + 3510 + 91 + 273 lt=<- 50.0;10.0;10.0;10.0;10.0;190.0 @@ -2453,10 +2448,10 @@ bg=red Relation - 1727 - 3421 - 132 - 88 + 2808 + 3991 + 156 + 104 lt=<- 100.0;10.0;10.0;60.0 @@ -2464,10 +2459,10 @@ bg=red Relation - 1100 - 3366 - 880 - 209 + 2067 + 3926 + 1040 + 247 lt=<- bg=red @@ -2476,10 +2471,10 @@ bg=red Relation - 1903 - 3311 - 33 - 110 + 3016 + 3861 + 39 + 130 lt=<- 10.0;10.0;10.0;80.0 @@ -2487,10 +2482,10 @@ bg=red UMLClass - 1837 - 3399 - 165 - 33 + 2938 + 3965 + 195 + 39 _:LogicManager_ @@ -2499,10 +2494,10 @@ bg=red Relation - 1023 - 3366 - 33 - 110 + 1976 + 3926 + 39 + 130 lt=<- 10.0;10.0;10.0;80.0 @@ -2510,10 +2505,10 @@ bg=red UMLClass - 968 - 3454 - 220 - 33 + 1911 + 4030 + 260 + 39 _:MainApp_ @@ -2522,10 +2517,10 @@ bg=red Relation - 1001 - 2992 - 330 - 99 + 1950 + 3484 + 390 + 117 lt=<- 10.0;10.0;280.0;70.0 @@ -2533,10 +2528,10 @@ bg=red Relation - 1529 - 2992 - 198 - 99 + 2574 + 3484 + 234 + 117 lt=<- 10.0;10.0;160.0;70.0 @@ -2544,10 +2539,10 @@ bg=red UMLClass - 649 - 2662 - 1562 - 935 + 1534 + 3094 + 1846 + 1105 Objects @@ -2555,10 +2550,10 @@ bg=red UMLGeneric - 715 - 3740 - 121 - 33 + 1612 + 4368 + 143 + 39 _:LogicManager_ @@ -2566,10 +2561,10 @@ bg=red UMLGeneric - 968 - 3751 - 165 - 33 + 1911 + 4368 + 195 + 39 _:AddressBookParser_ @@ -2577,10 +2572,10 @@ bg=red Relation - 759 - 3762 - 33 - 66 + 1664 + 4394 + 39 + 78 lt=. 10.0;10.0;10.0;40.0 @@ -2588,10 +2583,10 @@ bg=red UMLGeneric - 759 - 3806 - 22 - 572 + 1664 + 4446 + 26 + 442 @@ -2599,10 +2594,10 @@ bg=red Relation - 506 - 3784 - 275 - 44 + 1365 + 4420 + 325 + 52 lt=<- execute("findm m/meeting") @@ -2611,10 +2606,10 @@ execute("findm m/meeting") Relation - 770 - 3806 - 286 - 44 + 1677 + 4446 + 338 + 52 lt=<- parseCommand("findm m/meeting") @@ -2623,21 +2618,21 @@ parseCommand("findm m/meeting") Relation - 1034 - 3773 - 33 - 77 + 1989 + 4394 + 39 + 104 lt=. - 10.0;10.0;10.0;50.0 + 10.0;10.0;10.0;60.0 UMLGeneric - 1111 - 3850 - 231 - 33 + 2080 + 4498 + 273 + 39 _:FindMeetingCommandParser_ @@ -2645,10 +2640,10 @@ parseCommand("findm m/meeting") UMLGeneric - 1210 - 3883 - 22 - 33 + 2197 + 4537 + 26 + 39 @@ -2656,10 +2651,10 @@ parseCommand("findm m/meeting") Relation - 1045 - 3828 - 88 - 44 + 2002 + 4472 + 104 + 52 lt=<- @@ -2668,10 +2663,10 @@ parseCommand("findm m/meeting") Relation - 1045 - 3894 - 187 - 44 + 2002 + 4550 + 221 + 52 lt=<.. @@ -2680,10 +2675,10 @@ parseCommand("findm m/meeting") Relation - 1210 - 3905 - 33 - 77 + 2197 + 4563 + 39 + 91 lt=. 10.0;10.0;10.0;50.0 @@ -2691,44 +2686,66 @@ parseCommand("findm m/meeting") Relation - 770 - 4081 - 286 - 44 + 1677 + 4771 + 338 + 52 lt=<.. 10.0;20.0;240.0;20.0 + + UMLGeneric + + 1664 + 5031 + 26 + 91 + + + + Relation - 1210 - 3949 - 33 - 198 + 2197 + 4758 + 39 + 91 lt=. - 10.0;10.0;10.0;160.0 + 10.0;10.0;10.0;50.0 Relation - 1034 - 4092 - 33 - 363 + 1989 + 4784 + 39 + 65 lt=. - 10.0;10.0;10.0;310.0 + 10.0;10.0;10.0;30.0 UMLSpecialState - 1210 - 4125 - 22 - 22 + 1989 + 4823 + 26 + 26 + + type=termination + + + + UMLSpecialState + + 2197 + 4823 + 26 + 26 type=termination @@ -2736,10 +2753,10 @@ parseCommand("findm m/meeting") Relation - 1331 - 4477 - 33 - 33 + 2340 + 5239 + 39 + 39 lt=<- @@ -2748,10 +2765,10 @@ parseCommand("findm m/meeting") UMLClass - 1749 - 3718 - 154 - 715 + 2418 + 4316 + 182 + 845 Storage @@ -2759,10 +2776,10 @@ parseCommand("findm m/meeting") UMLGeneric - 1760 - 3751 - 132 - 33 + 2431 + 4355 + 156 + 39 _:StorageManager_ @@ -2770,33 +2787,33 @@ parseCommand("findm m/meeting") Relation - 1815 - 3773 - 33 - 572 + 2496 + 4381 + 39 + 702 lt=. - 10.0;10.0;10.0;500.0 + 10.0;10.0;10.0;520.0 Relation - 770 - 4301 - 1067 - 44 + 1677 + 5031 + 845 + 52 lt=<- - saveAddressBook() - 950.0;20.0;10.0;20.0 +saveAddressBook() + 630.0;20.0;10.0;20.0 UMLGeneric - 1815 - 4323 - 22 - 33 + 2496 + 5057 + 26 + 39 @@ -2804,22 +2821,22 @@ parseCommand("findm m/meeting") Relation - 770 - 4334 - 1067 - 44 + 1677 + 5070 + 845 + 52 lt=<.. - 10.0;20.0;950.0;20.0 + 10.0;20.0;630.0;20.0 Relation - 550 - 4356 - 231 - 44 + 1417 + 5096 + 273 + 52 lt=<.. @@ -2828,10 +2845,10 @@ parseCommand("findm m/meeting") UMLGeneric - 737 - 5126 - 154 - 33 + 1638 + 6006 + 182 + 39 _:AddressBookParser_ @@ -2839,10 +2856,10 @@ parseCommand("findm m/meeting") Relation - 803 - 5148 - 33 - 605 + 1716 + 6032 + 39 + 715 lt=. 10.0;10.0;10.0;530.0 @@ -2850,10 +2867,10 @@ parseCommand("findm m/meeting") UMLGeneric - 1001 - 5225 - 22 - 473 + 1950 + 6123 + 26 + 559 @@ -2861,10 +2878,10 @@ parseCommand("findm m/meeting") UMLGeneric - 902 - 5126 - 231 - 33 + 1833 + 6006 + 273 + 39 _:FindMeetingCommandParser_ @@ -2872,10 +2889,10 @@ parseCommand("findm m/meeting") Relation - 1012 - 5214 - 759 - 44 + 1963 + 6110 + 897 + 52 lt=<- @@ -2884,10 +2901,10 @@ parseCommand("findm m/meeting") Relation - 1001 - 5148 - 33 - 99 + 1950 + 6032 + 39 + 117 lt=. 10.0;10.0;10.0;70.0 @@ -2895,10 +2912,10 @@ parseCommand("findm m/meeting") UMLGeneric - 1749 - 5236 - 253 - 33 + 2834 + 6136 + 299 + 39 _:TitleContainsKeywordsPredicate_ @@ -2906,10 +2923,10 @@ parseCommand("findm m/meeting") UMLGeneric - 1881 - 5269 - 22 - 22 + 2990 + 6175 + 26 + 26 @@ -2917,10 +2934,10 @@ parseCommand("findm m/meeting") Relation - 1012 - 5269 - 891 - 44 + 1963 + 6175 + 1053 + 52 lt=<.. @@ -2929,10 +2946,10 @@ parseCommand("findm m/meeting") UMLGeneric - 1606 - 5302 - 275 - 33 + 2665 + 6214 + 325 + 39 _:LocationContainsKeywordsPredicate_ @@ -2940,10 +2957,10 @@ parseCommand("findm m/meeting") Relation - 1012 - 5280 - 616 - 44 + 1963 + 6188 + 728 + 52 lt=<- @@ -2952,10 +2969,10 @@ parseCommand("findm m/meeting") Relation - 1012 - 5335 - 759 - 44 + 1963 + 6253 + 897 + 52 lt=<.. @@ -2964,10 +2981,10 @@ parseCommand("findm m/meeting") UMLGeneric - 1749 - 5335 - 22 - 22 + 2834 + 6253 + 26 + 26 @@ -2975,10 +2992,10 @@ parseCommand("findm m/meeting") UMLGeneric - 1496 - 5368 - 253 - 33 + 2535 + 6292 + 299 + 39 _:MeetingTimeContainsPredicate_ @@ -2986,10 +3003,10 @@ parseCommand("findm m/meeting") UMLGeneric - 1617 - 5401 - 22 - 22 + 2678 + 6331 + 26 + 26 @@ -2997,10 +3014,10 @@ parseCommand("findm m/meeting") Relation - 1012 - 5346 - 506 - 44 + 1963 + 6266 + 598 + 52 lt=<- @@ -3009,10 +3026,10 @@ parseCommand("findm m/meeting") Relation - 1012 - 5401 - 627 - 44 + 1963 + 6331 + 741 + 52 lt=<.. @@ -3021,10 +3038,10 @@ parseCommand("findm m/meeting") UMLGeneric - 1342 - 5434 - 275 - 33 + 2353 + 6370 + 325 + 39 _:AttendeeContainsKeywordsPredicate_ @@ -3032,10 +3049,10 @@ parseCommand("findm m/meeting") UMLGeneric - 1474 - 5467 - 22 - 22 + 2509 + 6409 + 26 + 26 @@ -3043,10 +3060,10 @@ parseCommand("findm m/meeting") Relation - 1012 - 5467 - 484 - 44 + 1963 + 6409 + 572 + 52 lt=<.. @@ -3055,10 +3072,10 @@ parseCommand("findm m/meeting") UMLGeneric - 1221 - 5500 - 253 - 33 + 2210 + 6448 + 299 + 39 _:TagContainsKeywordsPredicate_ @@ -3066,10 +3083,10 @@ parseCommand("findm m/meeting") Relation - 1012 - 5412 - 352 - 44 + 1963 + 6344 + 416 + 52 lt=<- @@ -3078,10 +3095,10 @@ parseCommand("findm m/meeting") UMLGeneric - 1353 - 5533 - 22 - 22 + 2366 + 6487 + 26 + 26 @@ -3089,10 +3106,10 @@ parseCommand("findm m/meeting") Relation - 1012 - 5478 - 231 - 44 + 1963 + 6422 + 273 + 52 lt=<- @@ -3101,10 +3118,10 @@ parseCommand("findm m/meeting") UMLGeneric - 1155 - 5566 - 198 - 33 + 2132 + 6526 + 234 + 39 _:GeneralMeetingPredicate_ @@ -3113,10 +3130,10 @@ parseCommand("findm m/meeting") Relation - 1012 - 5533 - 363 - 44 + 1963 + 6487 + 429 + 52 lt=<.. @@ -3125,10 +3142,10 @@ parseCommand("findm m/meeting") Relation - 1012 - 5555 - 165 - 33 + 1963 + 6513 + 195 + 39 lt=<- 130.0;10.0;10.0;10.0 @@ -3136,10 +3153,10 @@ parseCommand("findm m/meeting") Relation - 1012 - 5621 - 66 - 33 + 1963 + 6591 + 78 + 39 lt=<- 40.0;10.0;10.0;10.0 @@ -3147,10 +3164,10 @@ parseCommand("findm m/meeting") UMLGeneric - 1056 - 5632 - 187 - 33 + 2015 + 6604 + 221 + 39 _:FindMeetingCommand_ @@ -3159,10 +3176,10 @@ parseCommand("findm m/meeting") UMLGeneric - 1243 - 5599 - 22 - 22 + 2236 + 6565 + 26 + 26 @@ -3170,10 +3187,10 @@ parseCommand("findm m/meeting") Relation - 1012 - 5599 - 253 - 44 + 1963 + 6565 + 299 + 52 lt=<.. @@ -3182,10 +3199,10 @@ parseCommand("findm m/meeting") Relation - 1133 - 5676 - 33 - 77 + 2106 + 6656 + 39 + 91 lt=. 10.0;10.0;10.0;50.0 @@ -3193,10 +3210,10 @@ parseCommand("findm m/meeting") UMLGeneric - 1133 - 5665 - 22 - 22 + 2106 + 6643 + 26 + 26 @@ -3204,10 +3221,10 @@ parseCommand("findm m/meeting") Relation - 1012 - 5665 - 143 - 44 + 1963 + 6643 + 169 + 52 lt=<.. @@ -3216,10 +3233,10 @@ parseCommand("findm m/meeting") Relation - 1243 - 5610 - 33 - 143 + 2236 + 6578 + 39 + 169 lt=. 10.0;10.0;10.0;110.0 @@ -3227,10 +3244,10 @@ parseCommand("findm m/meeting") Relation - 1353 - 5544 - 33 - 209 + 2366 + 6500 + 39 + 247 lt=. 10.0;10.0;10.0;170.0 @@ -3238,10 +3255,10 @@ parseCommand("findm m/meeting") Relation - 1474 - 5478 - 33 - 275 + 2509 + 6422 + 39 + 325 lt=. 10.0;10.0;10.0;230.0 @@ -3249,10 +3266,10 @@ parseCommand("findm m/meeting") Relation - 1617 - 5412 - 33 - 341 + 2678 + 6344 + 39 + 403 lt=. 10.0;10.0;10.0;290.0 @@ -3260,10 +3277,10 @@ parseCommand("findm m/meeting") Relation - 1749 - 5346 - 33 - 407 + 2834 + 6266 + 39 + 481 lt=. 10.0;10.0;10.0;350.0 @@ -3271,10 +3288,10 @@ parseCommand("findm m/meeting") Relation - 1881 - 5280 - 33 - 473 + 2990 + 6188 + 39 + 559 lt=. 10.0;10.0;10.0;410.0 @@ -3282,10 +3299,10 @@ parseCommand("findm m/meeting") Relation - 803 - 5203 - 220 - 44 + 1716 + 6097 + 260 + 52 lt=<- parse() @@ -3294,10 +3311,10 @@ parse() Relation - 803 - 5676 - 220 - 44 + 1716 + 6656 + 260 + 52 lt=<.. @@ -3306,21 +3323,55 @@ parse() UMLFrame - 693 - 5082 - 1331 - 649 + 1586 + 5954 + 1573 + 767 sd parse + + UMLFrame + + 1924 + 4628 + 338 + 143 + + ref + + + + Relation + + 1937 + 4615 + 247 + 52 + + lt=- +m1=parse + 10.0;10.0;170.0;10.0 + + + UMLGeneric + + 1989 + 4472 + 26 + 156 + + + + UMLGeneric - 1034 - 3828 - 22 - 275 + 1989 + 4771 + 26 + 26 @@ -3328,10 +3379,10 @@ parse() UMLFrame - 693 - 5742 - 1562 - 792 + 1586 + 6734 + 1846 + 936 sd execute @@ -3339,10 +3390,10 @@ parse() UMLGeneric - 748 - 5984 - 121 - 33 + 1651 + 7020 + 143 + 39 _:LogicManager_ @@ -3350,10 +3401,10 @@ parse() Relation - 792 - 6006 - 33 - 528 + 1703 + 7046 + 39 + 624 lt=. 10.0;10.0;10.0;460.0 @@ -3361,10 +3412,10 @@ parse() Relation - 792 - 6083 - 286 - 44 + 1703 + 7137 + 338 + 52 lt=<- execute() @@ -3373,10 +3424,10 @@ execute() UMLGeneric - 979 - 6050 - 187 - 33 + 1924 + 7098 + 221 + 39 _:FindMeetingCommand_ @@ -3385,10 +3436,10 @@ execute() Relation - 1056 - 6072 - 33 - 55 + 2015 + 7124 + 39 + 65 lt=. 10.0;10.0;10.0;30.0 @@ -3396,10 +3447,10 @@ execute() UMLGeneric - 1078 - 6006 - 198 - 33 + 2041 + 7046 + 234 + 39 _:GeneralMeetingPredicate_ @@ -3408,10 +3459,10 @@ execute() Relation - 1166 - 6028 - 33 - 132 + 2145 + 7072 + 39 + 156 lt=. 10.0;10.0;10.0;100.0 @@ -3419,10 +3470,10 @@ execute() UMLGeneric - 1056 - 6105 - 22 - 341 + 2015 + 7163 + 26 + 403 @@ -3430,10 +3481,10 @@ execute() UMLGeneric - 1166 - 6138 - 22 - 198 + 2145 + 7202 + 26 + 234 @@ -3441,10 +3492,10 @@ execute() UMLGeneric - 1144 - 5962 - 253 - 33 + 2119 + 6994 + 299 + 39 _:TagContainsKeywordsPredicate_ @@ -3452,10 +3503,10 @@ execute() UMLGeneric - 1265 - 5918 - 275 - 33 + 2262 + 6942 + 325 + 39 _:AttendeeContainsKeywordsPredicate_ @@ -3463,10 +3514,10 @@ execute() Relation - 1397 - 5940 - 33 - 275 + 2418 + 6968 + 39 + 325 lt=. 10.0;10.0;10.0;230.0 @@ -3474,10 +3525,10 @@ execute() UMLGeneric - 1419 - 5874 - 253 - 33 + 2444 + 6890 + 299 + 39 _:MeetingTimeContainsPredicate_ @@ -3485,10 +3536,10 @@ execute() Relation - 1540 - 5896 - 33 - 352 + 2587 + 6916 + 39 + 416 lt=. 10.0;10.0;10.0;300.0 @@ -3496,10 +3547,10 @@ execute() UMLGeneric - 1529 - 5830 - 275 - 33 + 2574 + 6838 + 325 + 39 _:LocationContainsKeywordsPredicate_ @@ -3507,10 +3558,10 @@ execute() Relation - 1672 - 5852 - 33 - 429 + 2743 + 6864 + 39 + 507 lt=. 10.0;10.0;10.0;370.0 @@ -3518,10 +3569,10 @@ execute() UMLGeneric - 1672 - 5786 - 253 - 33 + 2743 + 6786 + 299 + 39 _:TitleContainsKeywordsPredicate_ @@ -3529,10 +3580,10 @@ execute() Relation - 1804 - 5808 - 33 - 506 + 2899 + 6812 + 39 + 598 lt=. 10.0;10.0;10.0;440.0 @@ -3540,10 +3591,10 @@ execute() Relation - 1067 - 6094 - 968 - 44 + 2028 + 7150 + 1144 + 52 lt=<- updateFilteredMeetingList() @@ -3552,10 +3603,10 @@ updateFilteredMeetingList() Relation - 1177 - 6138 - 121 - 44 + 2158 + 7202 + 143 + 52 lt=<- test() @@ -3564,10 +3615,10 @@ test() Relation - 1276 - 5984 - 33 - 198 + 2275 + 7020 + 39 + 234 lt=. 10.0;10.0;10.0;160.0 @@ -3575,10 +3626,10 @@ test() Relation - 1276 - 6171 - 33 - 308 + 2275 + 7241 + 39 + 364 lt=. 10.0;10.0;10.0;260.0 @@ -3586,10 +3637,10 @@ test() Relation - 1397 - 6204 - 33 - 275 + 2418 + 7280 + 39 + 325 lt=. 10.0;10.0;10.0;230.0 @@ -3597,10 +3648,10 @@ test() Relation - 1177 - 6171 - 242 - 44 + 2158 + 7241 + 286 + 52 lt=<- test() @@ -3609,10 +3660,10 @@ test() Relation - 1177 - 6237 - 517 - 44 + 2158 + 7319 + 611 + 52 lt=<- test() @@ -3621,10 +3672,10 @@ test() Relation - 1540 - 6237 - 33 - 242 + 2587 + 7319 + 39 + 286 lt=. 10.0;10.0;10.0;200.0 @@ -3632,10 +3683,10 @@ test() Relation - 1177 - 6204 - 385 - 44 + 2158 + 7280 + 455 + 52 lt=<- test() @@ -3644,10 +3695,10 @@ test() Relation - 1177 - 6270 - 649 - 44 + 2158 + 7358 + 767 + 52 lt=<- test() @@ -3656,10 +3707,10 @@ test() Relation - 1177 - 6259 - 517 - 44 + 2158 + 7345 + 611 + 52 lt=<.. @@ -3668,10 +3719,10 @@ test() Relation - 1177 - 6226 - 385 - 44 + 2158 + 7306 + 455 + 52 lt=<.. @@ -3680,10 +3731,10 @@ test() Relation - 1177 - 6193 - 242 - 44 + 2158 + 7267 + 286 + 52 lt=<.. @@ -3692,10 +3743,10 @@ test() Relation - 1177 - 6160 - 121 - 44 + 2158 + 7228 + 143 + 52 lt=<.. @@ -3704,10 +3755,10 @@ test() Relation - 1177 - 6314 - 990 - 44 + 2158 + 7410 + 1170 + 52 lt=<.. @@ -3716,10 +3767,10 @@ test() Relation - 1177 - 6292 - 649 - 44 + 2158 + 7384 + 767 + 52 lt=<.. @@ -3728,10 +3779,10 @@ test() Relation - 1067 - 6336 - 968 - 44 + 2028 + 7436 + 1144 + 52 lt=<.. @@ -3740,10 +3791,10 @@ test() Relation - 1672 - 6270 - 33 - 209 + 2743 + 7358 + 39 + 247 lt=. 10.0;10.0;10.0;170.0 @@ -3751,10 +3802,10 @@ test() Relation - 1804 - 6303 - 33 - 187 + 2899 + 7397 + 39 + 221 lt=. 10.0;10.0;10.0;150.0 @@ -3762,10 +3813,10 @@ test() Relation - 1177 - 6116 - 990 - 44 + 2158 + 7176 + 1170 + 52 lt=<- test() @@ -3774,10 +3825,10 @@ test() UMLGeneric - 2013 - 6116 - 22 - 242 + 3146 + 7176 + 26 + 286 @@ -3785,10 +3836,10 @@ test() Relation - 2024 - 6325 - 143 - 44 + 3159 + 7423 + 169 + 52 lt=<.. @@ -3797,10 +3848,10 @@ test() UMLGeneric - 2145 - 6127 - 22 - 220 + 3302 + 7189 + 26 + 260 @@ -3808,10 +3859,10 @@ test() UMLClass - 1958 - 5775 - 264 - 737 + 3081 + 6773 + 312 + 871 Model @@ -3819,10 +3870,10 @@ test() UMLGeneric - 1276 - 6160 - 22 - 22 + 2275 + 7228 + 26 + 26 @@ -3830,10 +3881,10 @@ test() UMLGeneric - 1397 - 6193 - 22 - 22 + 2418 + 7267 + 26 + 26 @@ -3841,10 +3892,10 @@ test() UMLGeneric - 1540 - 6226 - 22 - 22 + 2587 + 7306 + 26 + 26 @@ -3852,10 +3903,10 @@ test() UMLGeneric - 1672 - 6259 - 22 - 22 + 2743 + 7345 + 26 + 26 @@ -3863,10 +3914,10 @@ test() UMLGeneric - 1804 - 6292 - 22 - 22 + 2899 + 7384 + 26 + 26 @@ -3874,10 +3925,10 @@ test() UMLGeneric - 1969 - 5918 - 132 - 33 + 3094 + 6942 + 156 + 39 _:ModelManager_ @@ -3885,10 +3936,10 @@ test() UMLGeneric - 2046 - 5874 - 165 - 33 + 3185 + 6890 + 195 + 39 _:FilteredList<Meeting>_ @@ -3896,10 +3947,10 @@ test() Relation - 2013 - 5940 - 33 - 198 + 3146 + 6968 + 39 + 234 lt=. 10.0;10.0;10.0;160.0 @@ -3907,10 +3958,10 @@ test() Relation - 2145 - 5896 - 33 - 253 + 3302 + 6916 + 39 + 299 lt=. 10.0;10.0;10.0;210.0 @@ -3918,10 +3969,10 @@ test() UMLGeneric - 847 - 6369 - 187 - 33 + 1768 + 7475 + 221 + 39 _:CommandResult_ @@ -3930,10 +3981,10 @@ test() Relation - 935 - 6402 - 143 - 44 + 1872 + 7514 + 169 + 52 lt=<.. @@ -3942,10 +3993,10 @@ test() UMLGeneric - 924 - 6402 - 22 - 22 + 1859 + 7514 + 26 + 26 @@ -3953,10 +4004,10 @@ test() Relation - 1023 - 6358 - 55 - 33 + 1976 + 7462 + 65 + 39 lt=<- 10.0;10.0;30.0;10.0 @@ -3964,10 +4015,10 @@ test() Relation - 792 - 6424 - 286 - 44 + 1703 + 7540 + 338 + 52 lt=<.. @@ -3976,10 +4027,10 @@ test() Relation - 1166 - 6325 - 33 - 154 + 2145 + 7423 + 39 + 182 lt=. 10.0;10.0;10.0;120.0 @@ -3987,10 +4038,10 @@ test() Relation - 1056 - 6435 - 33 - 44 + 2015 + 7553 + 39 + 52 lt=. 10.0;10.0;10.0;20.0 @@ -3998,10 +4049,10 @@ test() UMLSpecialState - 1056 - 6457 - 22 - 22 + 2015 + 7579 + 26 + 26 type=termination @@ -4009,10 +4060,10 @@ test() UMLSpecialState - 1166 - 6457 - 22 - 22 + 2145 + 7579 + 26 + 26 type=termination @@ -4020,10 +4071,10 @@ test() UMLSpecialState - 1276 - 6457 - 22 - 22 + 2275 + 7579 + 26 + 26 type=termination @@ -4031,10 +4082,10 @@ test() UMLSpecialState - 1397 - 6457 - 22 - 22 + 2418 + 7579 + 26 + 26 type=termination @@ -4042,10 +4093,10 @@ test() UMLSpecialState - 1540 - 6457 - 22 - 22 + 2587 + 7579 + 26 + 26 type=termination @@ -4053,10 +4104,10 @@ test() UMLSpecialState - 1672 - 6457 - 22 - 22 + 2743 + 7579 + 26 + 26 type=termination @@ -4064,10 +4115,10 @@ test() UMLSpecialState - 1804 - 6457 - 22 - 22 + 2899 + 7579 + 26 + 26 type=termination @@ -4075,10 +4126,10 @@ test() Relation - 2013 - 6347 - 33 - 187 + 3146 + 7449 + 39 + 221 lt=. 10.0;10.0;10.0;150.0 @@ -4086,10 +4137,10 @@ test() Relation - 2145 - 6336 - 33 - 198 + 3302 + 7436 + 39 + 234 lt=. 10.0;10.0;10.0;160.0 @@ -4097,10 +4148,44 @@ test() UMLClass - 737 - 5775 - 1199 - 737 + 1638 + 6773 + 1417 + 871 + + Model + + + + Relation + + 1638 + 4875 + 247 + 52 + + lt=- +m1=execute + 10.0;10.0;170.0;10.0 + + + UMLFrame + + 1625 + 4888 + 338 + 143 + + ref + + + + UMLClass + + 1560 + 4316 + 819 + 845 Logic @@ -4108,10 +4193,10 @@ test() Relation - 2024 - 6105 - 143 - 44 + 3159 + 7163 + 169 + 52 lt=<- setPredicate() @@ -4120,32 +4205,32 @@ setPredicate() Relation - 1815 - 4345 - 33 - 110 + 2496 + 5083 + 39 + 104 lt=. - 10.0;10.0;10.0;80.0 + 10.0;10.0;10.0;60.0 Relation - 759 - 4367 - 33 - 88 + 1664 + 5109 + 39 + 78 lt=. - 10.0;10.0;10.0;60.0 + 10.0;10.0;10.0;40.0 UMLClass - 2882 - 3014 - 165 - 33 + 4173 + 3510 + 195 + 39 _:FilteredList<Meeting>_ @@ -4154,10 +4239,10 @@ setPredicate() UMLClass - 2882 - 3179 - 165 - 33 + 4173 + 3705 + 195 + 39 _:ModelManager_ @@ -4166,10 +4251,10 @@ setPredicate() UMLClass - 2926 - 3300 - 121 - 33 + 4225 + 3848 + 143 + 39 _:MainApp_ @@ -4178,10 +4263,10 @@ setPredicate() UMLClass - 2596 - 3245 - 220 - 33 + 3835 + 3783 + 260 + 39 _:MeetingSchedulePanel_ @@ -4190,10 +4275,10 @@ setPredicate() UMLClass - 2739 - 3421 - 220 - 33 + 4004 + 3991 + 260 + 39 _:MainWindow_ @@ -4202,10 +4287,10 @@ setPredicate() Relation - 3234 - 3179 - 33 - 88 + 4589 + 3705 + 39 + 104 lt=<- 10.0;10.0;10.0;60.0 @@ -4213,10 +4298,10 @@ setPredicate() UMLClass - 3168 - 3245 - 165 - 33 + 4511 + 3783 + 195 + 39 _:LogicManager_ @@ -4225,10 +4310,10 @@ setPredicate() UMLClass - 3124 - 3157 - 242 - 33 + 4459 + 3679 + 286 + 39 _:FindMeetingCommand_ @@ -4237,10 +4322,10 @@ setPredicate() Relation - 3234 - 3102 - 33 - 77 + 4589 + 3614 + 39 + 91 lt=<- 10.0;10.0;10.0;50.0 @@ -4248,10 +4333,10 @@ setPredicate() UMLClass - 3135 - 3080 - 209 - 33 + 4472 + 3588 + 247 + 39 _:GeneralMeetingPredicate_ @@ -4260,10 +4345,10 @@ setPredicate() UMLClass - 3223 - 3025 - 275 - 33 + 4576 + 3523 + 325 + 39 _:TagContainsKeywordsPredicate_ @@ -4271,10 +4356,10 @@ setPredicate() UMLClass - 3223 - 2981 - 275 - 33 + 4576 + 3471 + 325 + 39 _:AttendeeContainsKeywordsPredicate_ @@ -4283,10 +4368,10 @@ setPredicate() UMLClass - 3223 - 2937 - 275 - 33 + 4576 + 3419 + 325 + 39 _:MeetingTimeContainsPredicate_ @@ -4295,10 +4380,10 @@ setPredicate() UMLClass - 3223 - 2893 - 275 - 33 + 4576 + 3367 + 325 + 39 _:LocationContainsKeywordsPredicate_ @@ -4307,10 +4392,10 @@ setPredicate() UMLClass - 3223 - 2849 - 275 - 33 + 4576 + 3315 + 325 + 39 _:TitleContainsKeywordsPredicate_ @@ -4319,10 +4404,10 @@ setPredicate() Relation - 3036 - 3201 - 176 - 66 + 4355 + 3731 + 208 + 78 lt=<- bg=red @@ -4331,10 +4416,10 @@ bg=red Relation - 2948 - 3267 - 242 - 176 + 4251 + 3809 + 286 + 208 lt=<- 200.0;10.0;10.0;140.0 @@ -4342,10 +4427,10 @@ bg=red Relation - 2772 - 3267 - 33 - 176 + 4043 + 3809 + 39 + 208 lt=<- 10.0;10.0;10.0;140.0 @@ -4353,10 +4438,10 @@ bg=red Relation - 2772 - 3025 - 132 - 242 + 4043 + 3523 + 156 + 286 lt=<- 100.0;10.0;10.0;200.0 @@ -4364,10 +4449,10 @@ bg=red Relation - 2948 - 3036 - 33 - 165 + 4251 + 3536 + 39 + 195 lt=<- 10.0;10.0;10.0;130.0 @@ -4375,10 +4460,10 @@ bg=red Relation - 2959 - 3201 - 33 - 121 + 4264 + 3731 + 39 + 143 lt=<- 10.0;10.0;10.0;90.0 @@ -4386,10 +4471,10 @@ bg=red Relation - 3168 - 3036 - 77 - 66 + 4511 + 3536 + 91 + 78 lt=<- 50.0;10.0;10.0;10.0;10.0;40.0 @@ -4397,10 +4482,10 @@ bg=red Relation - 3168 - 2992 - 77 - 110 + 4511 + 3484 + 91 + 130 lt=<- 50.0;10.0;10.0;10.0;10.0;80.0 @@ -4408,10 +4493,10 @@ bg=red Relation - 3168 - 2948 - 77 - 154 + 4511 + 3432 + 91 + 182 lt=<- 50.0;10.0;10.0;10.0;10.0;120.0 @@ -4419,10 +4504,10 @@ bg=red Relation - 3168 - 2904 - 77 - 198 + 4511 + 3380 + 91 + 234 lt=<- 50.0;10.0;10.0;10.0;10.0;160.0 @@ -4430,10 +4515,10 @@ bg=red Relation - 3168 - 2860 - 77 - 231 + 4511 + 3328 + 91 + 273 lt=<- 50.0;10.0;10.0;10.0;10.0;190.0 @@ -4441,10 +4526,10 @@ bg=red UMLClass - 2563 - 2794 - 990 - 693 + 3796 + 3250 + 1170 + 819 Objects @@ -4452,1270 +4537,682 @@ bg=red UMLClass - 693 - 3718 - 869 - 715 + 1404 + 1599 + 195 + 39 - Logic + LastContactedTime +bg=red - UMLActor + Relation - 1980 - 3652 - 66 - 121 + 1586 + 1391 + 247 + 260 - Actor - + lt=<- +m1=1 + 10.0;170.0;100.0;170.0;100.0;10.0;170.0;10.0 - UMLGeneric + UMLClass - 1419 - 3927 - 121 - 33 + 481 + 949 + 130 + 52 - _:XYZPredicate_ + <<interface>> +Model +bg=red - UMLGeneric + Relation - 1463 - 3960 - 22 - 33 + 533 + 845 + 39 + 130 - - + lt=<. + 10.0;80.0;10.0;10.0 - UMLGeneric + Relation - 1232 - 4004 - 187 - 33 + 390 + 962 + 117 + 39 - _:FindMeetingCommand_ - + lt=<. + 10.0;10.0;70.0;10.0 - UMLGeneric + UMLClass - 1309 - 4037 - 22 - 33 + 169 + 949 + 234 + 52 - + <<interface>> +ReadOnlyAddressBook +bg=red Relation - 1045 - 3905 - 396 - 44 + 260 + 988 + 39 + 117 - lt=<- + lt=<<. - 340.0;20.0;10.0;20.0 + 10.0;10.0;10.0;70.0 - Relation + UMLClass - 1045 - 3982 - 209 - 44 + 195 + 1079 + 143 + 39 - lt=<- - - 170.0;20.0;10.0;20.0 + AddressBook +bg=red + - Relation + UMLClass - 1045 - 3971 - 440 - 44 + 130 + 884 + 819 + 585 - lt=<.. - - 10.0;20.0;380.0;20.0 + Model + Relation - 1045 - 4048 - 286 - 44 + 325 + 1066 + 169 + 52 - lt=<.. - - 10.0;20.0;240.0;20.0 + lt=<- +r1=1 + 10.0;20.0;110.0;20.0 - Relation + UMLClass - 770 - 4136 - 561 - 44 + 468 + 1079 + 143 + 39 - lt=<- - execute() - 490.0;20.0;10.0;20.0 + ModelManager +bg=red + Relation - 1309 - 4059 - 33 - 121 + 533 + 988 + 39 + 117 - lt=. - 10.0;10.0;10.0;90.0 + lt=<<. + + 10.0;10.0;10.0;70.0 - UMLGeneric + Relation - 1309 - 4158 - 22 - 143 + 598 + 1066 + 169 + 52 - - + lt=<- +r1=1 + 110.0;20.0;10.0;20.0 UMLClass - 1573 - 3718 - 154 - 715 - - Model - - - - UMLGeneric - - 1584 - 3751 - 132 - 33 + 741 + 1079 + 143 + 39 - _:ModelManager_ + UserPrefs +bg=red Relation - 1639 - 3773 - 33 - 418 + 806 + 988 + 39 + 117 - lt=. - 10.0;10.0;10.0;360.0 + lt=<<. + + 10.0;10.0;10.0;70.0 - UMLGeneric + UMLClass - 1639 - 4169 - 22 - 55 + 715 + 949 + 208 + 52 - + <<interface>> +ReadOnlyUserPrefs +bg=red Relation - 1320 - 4147 - 341 - 44 + 598 + 962 + 143 + 39 - lt=<- -updateFilteredMeetingList() - 290.0;20.0;10.0;20.0 + lt=<. + 90.0;10.0;10.0;10.0 - UMLGeneric + UMLClass - 1463 - 4191 - 22 - 22 + 663 + 1196 + 182 + 39 - + UniqueMeetingList +bg=red Relation - 1463 - 3982 - 33 - 231 - - lt=. - 10.0;10.0;10.0;190.0 - - - Relation - - 1474 - 4169 - 187 - 44 + 299 + 1105 + 494 + 117 lt=<- -test() - 10.0;20.0;150.0;20.0 +m1=1 + 350.0;70.0;350.0;40.0;10.0;40.0;10.0;10.0 Relation - 1474 - 4191 - 187 - 44 + 559 + 1105 + 195 + 312 - lt=<.. - - 150.0;20.0;10.0;20.0 + lt=<- +r1=* filtered +r1pos=-15,10 + 100.0;220.0;10.0;10.0 Relation - 1320 - 4202 - 341 - 44 - - lt=<.. - - 10.0;20.0;290.0;20.0 - - - UMLGeneric - - 1122 - 4235 - 154 - 33 + 338 + 1105 + 195 + 312 - _:CommandResult_ - - + lt=<- +r1=* filtered + 10.0;220.0;130.0;10.0 - UMLGeneric + UMLClass - 1188 - 4268 - 22 - 22 + 195 + 1196 + 182 + 39 - + UniquePersonList +bg=red Relation - 1265 - 4213 - 66 - 44 + 273 + 1105 + 52 + 117 lt=<- - - 10.0;20.0;40.0;20.0 - - - Relation - - 1199 - 4268 - 132 - 44 - - lt=<.. - - 100.0;20.0;10.0;20.0 - - - Relation - - 770 - 4279 - 561 - 44 - - lt=<.. - - 10.0;20.0;490.0;20.0 +r2=1 + 10.0;70.0;10.0;10.0 - UMLSpecialState + UMLClass - 1463 - 4257 - 22 - 22 + 208 + 1391 + 143 + 39 - type=termination + Person +bg=red Relation - 1463 - 4202 - 33 - 77 + 273 + 1222 + 65 + 195 - lt=. - 10.0;10.0;10.0;50.0 + lt=<- +m1=*all + 10.0;130.0;10.0;10.0 Relation - 1309 - 4290 - 33 - 99 + 741 + 1222 + 65 + 195 - lt=. - 10.0;10.0;10.0;70.0 + lt=<- +m1=*all + 10.0;130.0;10.0;10.0 - UMLSpecialState + UMLClass - 1309 - 4367 - 22 - 22 + 689 + 1391 + 143 + 39 - type=termination + Meeting +bg=red - Relation - - 1188 - 4279 - 33 - 176 - - lt=. - 10.0;10.0;10.0;140.0 - - - Relation + UMLClass - 1639 - 4213 - 33 - 242 + 78 + 1612 + 143 + 39 - lt=. - 10.0;10.0;10.0;200.0 + Name +bg=red + UMLClass - 1991 - 1870 - 176 - 33 + 78 + 1690 + 143 + 39 - FindMeetingCommand + Email +bg=red Relation - 2068 - 1892 - 44 + 208 + 1690 + 169 143 lt=<- m1=1 - 10.0;110.0;10.0;10.0 + 10.0;10.0;60.0;10.0;60.0;90.0;110.0;90.0 - UMLClass + Relation - 1980 - 2013 - 198 - 33 + 208 + 1612 + 169 + 221 - GeneralMeetingPredicate - + lt=<- +m1=1 + 10.0;10.0;60.0;10.0;60.0;150.0;110.0;150.0 UMLClass - 1727 - 2079 - 253 - 33 + 78 + 1768 + 143 + 39 - TitleContainsKeywordsPredicate + Phone +bg=red - UMLClass + Relation - 1771 - 2189 - 275 - 33 + 208 + 1768 + 169 + 65 - AttendeeContainsKeywordsPredicate - + lt=<- +m1=1 + 10.0;10.0;60.0;10.0;60.0;30.0;110.0;30.0 UMLClass - 2112 - 2189 - 275 - 33 + 78 + 1846 + 143 + 39 - LocationContainsKeywordsPredicate + Remark +bg=red - UMLClass + Relation - 2178 - 2079 - 231 - 33 + 208 + 1794 + 169 + 104 - MeetingTimeContainsPredicate - + lt=<- +m1=1 + 10.0;50.0;60.0;50.0;60.0;10.0;110.0;10.0 - Relation + UMLClass - 1991 - 2035 - 110 - 176 + 78 + 1924 + 143 + 39 - lt=<- -m1=1 - 10.0;140.0;80.0;10.0 + Status +bg=red + Relation - 2068 - 2035 - 110 - 176 + 208 + 1794 + 169 + 182 lt=<- m1=1 - 80.0;140.0;10.0;10.0 + 10.0;110.0;60.0;110.0;60.0;10.0;110.0;10.0 - Relation + UMLClass - 2068 - 2035 - 132 - 66 + 26 + 2002 + 195 + 39 - lt=<- -m1=1 - 100.0;40.0;10.0;10.0 + LastContactedTime +bg=red + Relation - 1969 - 2035 - 132 - 66 + 208 + 1794 + 169 + 260 lt=<- m1=1 - 10.0;40.0;100.0;10.0 + 10.0;170.0;60.0;170.0;60.0;10.0;110.0;10.0 UMLClass - 1705 - 1837 - 737 - 110 + 351 + 1794 + 143 + 39 - Logic + Person +bg=red UMLClass - 1705 - 1958 - 737 - 374 - - Storage - - - - UMLFrame - - 693 - 4455 - 1012 - 473 + 442 + 2002 + 143 + 39 - sd parse + Tag +bg=red - UMLGeneric + Relation - 748 - 4510 - 121 - 33 + 273 + 1794 + 208 + 234 - _:LogicManager_ - + lt=<- +m1=* + 140.0;160.0;140.0;130.0;10.0;130.0;10.0;10.0;60.0;10.0 Relation - 803 - 4565 - 286 - 44 + 559 + 1794 + 195 + 234 lt=<- -parseCommand("findm m/meeting") - 240.0;20.0;10.0;20.0 +m1=* + 10.0;160.0;10.0;130.0;130.0;130.0;130.0;10.0;80.0;10.0 - UMLGeneric + UMLClass - 792 - 4576 - 22 - 308 + 520 + 1794 + 143 + 39 - + Meeting +bg=red - Relation - - 792 - 4532 - 33 - 66 - - lt=. - 10.0;10.0;10.0;40.0 - - - UMLGeneric + UMLClass - 1001 - 4510 - 165 - 33 + 793 + 1833 + 143 + 39 - _:AddressBookParser_ + Attendee +bg=red Relation - 1067 - 4532 - 33 - 77 - - lt=. - 10.0;10.0;10.0;50.0 - - - UMLGeneric - - 1067 - 4587 - 22 - 286 + 650 + 1794 + 169 + 91 - - + lt=<- +m1=1 + 110.0;40.0;60.0;40.0;60.0;10.0;10.0;10.0 - UMLGeneric + UMLClass - 1144 - 4598 - 231 - 33 + 793 + 1755 + 143 + 39 - _:FindMeetingCommandParser_ + MeetingTime +bg=red - UMLGeneric + Relation - 1320 - 4697 - 121 - 33 + 650 + 1755 + 169 + 78 - _:XYZPredicate_ - + lt=<- +m1=1 + 110.0;10.0;60.0;10.0;60.0;40.0;10.0;40.0 - UMLGeneric + UMLClass - 1364 - 4730 - 22 - 33 + 793 + 1677 + 143 + 39 - + Location +bg=red - UMLGeneric + Relation - 1419 - 4785 - 187 - 33 + 650 + 1677 + 169 + 156 - _:FindMeetingCommand_ - + lt=<- +m1=1 + 110.0;10.0;60.0;10.0;60.0;100.0;10.0;100.0 - UMLGeneric + UMLClass - 1496 - 4818 - 22 - 33 + 793 + 1599 + 143 + 39 - + Title +bg=red Relation - 1078 - 4576 - 88 - 44 + 650 + 1599 + 169 + 234 lt=<- - - 60.0;20.0;10.0;20.0 - - - Relation - - 1243 - 4620 - 33 - 77 - - lt=. - 10.0;10.0;10.0;50.0 +m1=1 + 110.0;10.0;60.0;10.0;60.0;160.0;10.0;160.0 - UMLGeneric + UMLClass - 1243 - 4675 - 22 - 187 + 793 + 1911 + 143 + 39 - + MeetingStatus +bg=red Relation - 1078 - 4653 - 187 - 44 + 650 + 1794 + 169 + 169 lt=<- -parse() - 150.0;20.0;10.0;20.0 +m1=1 + 110.0;100.0;60.0;100.0;60.0;10.0;10.0;10.0 - Relation + UMLClass - 1078 - 4840 - 187 - 44 + 0 + 1547 + 975 + 585 - lt=<.. - - 10.0;20.0;150.0;20.0 + Model + Relation - 1254 - 4741 - 132 - 44 + 572 + 1495 + 39 + 325 - lt=<.. - - 10.0;20.0;100.0;20.0 + lt=<. + 10.0;230.0;10.0;10.0 Relation - 1254 - 4829 - 264 - 44 + 416 + 1495 + 39 + 325 - lt=<.. - - 10.0;20.0;220.0;20.0 - - - Relation - - 803 - 4851 - 286 - 44 - - lt=<.. - - 10.0;20.0;240.0;20.0 - - - Relation - - 1254 - 4675 - 88 - 44 - - lt=<- - - 60.0;20.0;10.0;20.0 - - - Relation - - 1254 - 4763 - 187 - 44 - - lt=<- - - 150.0;20.0;10.0;20.0 - - - Relation - - 792 - 4873 - 33 - 77 - - lt=. - 10.0;10.0;10.0;50.0 - - - UMLSpecialState - - 517 - 4840 - 22 - 22 - - type=termination - - - - Relation - - 1067 - 4862 - 33 - 88 - - lt=. - 10.0;10.0;10.0;60.0 - - - Relation - - 1364 - 4752 - 33 - 198 - - lt=. - 10.0;10.0;10.0;160.0 - - - Relation - - 1243 - 4851 - 33 - 66 - - lt=. - 10.0;10.0;10.0;40.0 - - - UMLSpecialState - - 1243 - 4895 - 22 - 22 - - type=termination - - - - Relation - - 1496 - 4840 - 33 - 110 - - lt=. - 10.0;10.0;10.0;80.0 - - - UMLGeneric - - 2310 - 4499 - 187 - 33 - - _:FindMeetingCommand_ - - - - UMLGeneric - - 1914 - 4499 - 121 - 33 - - _:LogicManager_ - - - - UMLGeneric - - 2090 - 4499 - 165 - 33 - - _:AddressBookParser_ - - - - Relation - - 1958 - 4521 - 33 - 66 - - lt=. - 10.0;10.0;10.0;40.0 - - - Relation - - 2156 - 4521 - 33 - 88 - - lt=. - 10.0;10.0;10.0;60.0 - - - Relation - - 2387 - 4521 - 33 - 88 - - lt=. - 10.0;10.0;10.0;60.0 - - - Relation - - 2640 - 4521 - 33 - 198 - - lt=. - 10.0;10.0;10.0;160.0 - - - UMLGeneric - - 2563 - 4499 - 187 - 33 - - _:ModelManager_ - - - - Relation - - 2398 - 4675 - 264 - 44 - - lt=<- -setPredicate(XYZPredicate) - 220.0;20.0;10.0;20.0 - - - UMLFrame - - 1859 - 4587 - 616 - 66 - - ref - - - - UMLGeneric - - 1958 - 4653 - 22 - 154 - - - - - - Relation - - 1870 - 4576 - 99 - 44 - - lt=- -m2=parse - 70.0;10.0;10.0;10.0 - - - Relation - - 2156 - 4642 - 33 - 220 - - lt=. - 10.0;10.0;10.0;180.0 - - - UMLGeneric - - 2387 - 4686 - 22 - 44 - - - - - - Relation - - 2387 - 4642 - 33 - 66 - - lt=. - 10.0;10.0;10.0;40.0 - - - Relation - - 1969 - 4664 - 440 - 44 - - lt=<- - execute(model) - 380.0;20.0;10.0;20.0 - - - UMLGeneric - - 2640 - 4697 - 22 - 22 - - - - - - Relation - - 2398 - 4697 - 264 - 44 - - lt=<.. - - 10.0;20.0;220.0;20.0 - - - Relation - - 1969 - 4708 - 440 - 44 - - lt=<.. - - 10.0;20.0;380.0;20.0 - - - Relation - - 2387 - 4719 - 33 - 55 - - lt=. - 10.0;10.0;10.0;30.0 - - - UMLSpecialState - - 2387 - 4741 - 22 - 22 - - type=termination - - - - Relation - - 2640 - 4708 - 33 - 154 - - lt=. - 10.0;10.0;10.0;120.0 - - - UMLClass - - 1727 - 4455 - 1243 - 385 - - - - - - UMLGeneric - - 2772 - 4499 - 187 - 33 - - _:StorageManager_ - - - - Relation - - 2860 - 4785 - 33 - 77 - - lt=. - 10.0;10.0;10.0;50.0 - - - Relation - - 2860 - 4521 - 33 - 275 - - lt=. - 10.0;10.0;10.0;230.0 - - - UMLGeneric - - 2860 - 4774 - 22 - 22 - - - - - - Relation - - 1969 - 4752 - 913 - 44 - - lt=<- - saveAddressBook(storage) - 810.0;20.0;10.0;20.0 - - - Relation - - 1969 - 4774 - 913 - 44 - - lt=<.. - - 10.0;20.0;810.0;20.0 - - - Relation - - 1727 - 4543 - 253 - 44 - - lt=<- -execute("findm m/meeting") - 210.0;20.0;10.0;20.0 - - - Relation - - 1727 - 4785 - 253 - 44 - - lt=<.. - - 10.0;20.0;210.0;20.0 - - - Relation - - 1958 - 4796 - 33 - 66 - - lt=. - 10.0;10.0;10.0;40.0 - - - UMLGeneric - - 1958 - 4565 - 22 - 22 - - - - - - UMLClass - - 1947 - 2255 - 275 - 33 - - TagContainsKeywordsPredicate - - - - Relation - - 2068 - 2035 - 44 - 242 - - lt=<- -m1=1 - 10.0;200.0;10.0;10.0 + lt=<. + 10.0;230.0;10.0;10.0 diff --git a/docs/images/ModelClassDiagram.png b/docs/images/ModelClassDiagram.png index ab9f074918b..f7ab69aee36 100644 Binary files a/docs/images/ModelClassDiagram.png and b/docs/images/ModelClassDiagram.png differ diff --git a/docs/images/Person&MeetingClassDiagram.png b/docs/images/Person&MeetingClassDiagram.png new file mode 100644 index 00000000000..9c834222a2d Binary files /dev/null and b/docs/images/Person&MeetingClassDiagram.png differ diff --git a/docs/images/StorageClassDiagram.png b/docs/images/StorageClassDiagram.png index f2a7940a930..76e3edc5ce3 100644 Binary files a/docs/images/StorageClassDiagram.png and b/docs/images/StorageClassDiagram.png differ diff --git a/docs/images/UiClassDiagram.png b/docs/images/UiClassDiagram.png index 8b0d7867ed9..1dfc744cdc8 100644 Binary files a/docs/images/UiClassDiagram.png and b/docs/images/UiClassDiagram.png differ diff --git a/docs/team/howenc.md b/docs/team/howenc.md index 4a18a38c655..b86273f3eea 100644 --- a/docs/team/howenc.md +++ b/docs/team/howenc.md @@ -5,40 +5,55 @@ title: Howen's Project Portfolio Page ### Project: OutBook -OutBook is a desktop personal secretary application used for saving contacts and scheduling meetings. Users can link their contacts to their meetings, to keep track of the personnel attending these meetings. +OutBook is a desktop data management application for freelance insurance agents to manage their numerous contacts and meeting schedule. Users can link their contacts to their meetings, to keep track of the personnel attending these meetings. My contributions to the project are listed below. -- **New Feature**: Added the ability to undo/redo previous commands. +- **New Feature**: Add Meetings (Pull Request [#16](https://github.com/AY2324S1-CS2103T-F12-4/tp/pull/16)) + - What it does: Allows the user to add meetings into OutBook. This meeting allows the user to set the Meeting title, time, location and tags. + - Highlights: This new feature is the foundation of half our other features as it is one of the base functions of our program. + - Credits: It was built in a similar manner to add person to have similar structure. - - Add UI for showing meeting instance - - New Commands + Test cases - - "addm" - - Command to add a meeting into address book. - - "findm" - - Command to find a meeting in the address book. - - Sort meetings by start time. +- **New Feature**: Add UI to show meeting instances (Pull Request [#54](https://github.com/AY2324S1-CS2103T-F12-4/tp/pull/54)) + - What it does: Allows the user to see the meetings that are in OutBook. This will show the meeting title, time, location and tags that it has. +- **New Feature**: Find Meetings (Pull Request [#70](https://github.com/AY2324S1-CS2103T-F12-4/tp/pull/70)) + - What it does: Allows the user to find meetings using all the different fields on the meeting, title, time, location, tags, attendees. + - Justification: This feature enables the user to quickly find the meeting that they want instead of scrolling through the entire list of meetings, improving the quality of life and efficiency of our product. + - Highlights: The design process proved quite hard as in order to maintain SLAP (Single Level of Abstraction Principle) many predicate classes had to be made which increase coupling and decreased cohesion. In order to maintain similar level of coupling as before, a general predicate class needed to be created to handle all other predicates. + +- **New Feature**: Made meetings to be sorted by start time (Pull Request [#83](https://github.com/AY2324S1-CS2103T-F12-4/tp/pull/83)) + - What it does: Meetings are sorted by start time + - Justification: This feature would always put the earliest meeting the user has at the top of the list so that they do not have to search the entire list to find the meeting to prepare for next. + - Highlights: The original implementation wanted to enable the user to specify the type of sort that they want, with the default being by start time. However, upon further dicussion with the team, this feature was reduced to sort by start time to keep things simple. - **Code contributed**: [RepoSense link](https://nus-cs2103-ay2324s1.github.io/tp-dashboard/?search=howenc&breakdown=true) - **Project management**: + - Organising tasks and team meetings - Forking workflow - Review and merge pull requests + - Ensuring deliverables are done on time + - Managed [releases](https://github.com/AY2324S1-CS2103T-F12-4/tp/releases) `v1.2`-`v1.3(final)` - **Enhancements to existing features**: - - - Configured the model and storage to support Meetings. +- + - Configured the model and storage to support Meetings. (Pull Request [#42](https://github.com/AY2324S1-CS2103T-F12-4/tp/pull/42)) + - What it does: This was the groundwork needed for the rest of our project to happen. + - Highlights: The saving of the Attendees using Jackson proved quite difficult. The original implementation wanted the Person to be saved within the meeting. However, this would not be feasible as it would take up too much space and have a non-unique instance of a Person. This was resolved by using a string to represent the Person, as there cannot be 2 persons with the same name. - **Documentation**: + - User Guide: + - Added documentation for `editm`, `findm` + - Developer Guide: + - Added implementation for `findm` + - Updated diagram for UI, Model, Storage and Appendix: Instructions for Manual Testing - Updated README - **Community**: - - to be added soon - - **Tools**: - - to be added soon + - Umlet for UML modeling