Skip to content

Commit 2e06125

Browse files
committed
Fix format issues, add implementation of find and cluster commands
1 parent 5624ef3 commit 2e06125

9 files changed

+129
-87
lines changed

docs/DeveloperGuide.md

Lines changed: 98 additions & 44 deletions
Large diffs are not rendered by default.

docs/diagrams/ArchitectureSequenceDiagram.puml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Participant ":Storage" as storage STORAGE_COLOR
1111
user -[USER_COLOR]> ui : "delete S1234567X"
1212
activate ui UI_COLOR
1313

14-
ui -[UI_COLOR]> logic : execute("delete X1234567X")
14+
ui -[UI_COLOR]> logic : execute("delete S1234567X")
1515
activate logic LOGIC_COLOR
1616

1717
logic -[LOGIC_COLOR]> model : deletePerson(p)

docs/diagrams/DeleteInfoModelDiagram.puml

Lines changed: 15 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,17 @@ participant ":ImmuniMate" as ImmuniMate MODEL_COLOR
1111
participant ":UniquePersonList" as UniquePersonList MODEL_COLOR
1212
participant "internalList: ObservableList<Person>" as internalList MODEL_COLOR
1313
participant "p1:Person" as p1 MODEL_COLOR
14-
participant "p1:Person" as p MODEL_COLOR
1514
end box
1615

1716
[-> CreateCommand : execute()
1817
activate CreateCommand
1918

19+
CreateCommand -> ModelManager : getFilteredPersonsList()
20+
activate ModelManager
21+
22+
ModelManager --> CreateCommand : persons
23+
deactivate ModelManager
24+
2025
CreateCommand -> ModelManager : hasPerson(...)
2126
activate ModelManager
2227

@@ -32,49 +37,26 @@ activate internalList
3237
internalList -> p1 : isSamePerson(p1)
3338
activate p1
3439

35-
p1 --> internalList
40+
p1 --> internalList : true
3641
deactivate p1
3742

38-
internalList --> UniquePersonList
43+
internalList --> UniquePersonList : true
3944
deactivate internalList
4045

41-
UniquePersonList --> ImmuniMate
46+
UniquePersonList --> ImmuniMate : true
4247
deactivate UniquePersonList
4348

44-
ImmuniMate --> ModelManager
49+
ImmuniMate --> ModelManager : true
4550
deactivate ImmuniMate
4651

47-
ModelManager --> CreateCommand
52+
ModelManager --> CreateCommand : true
4853
deactivate ModelManager
4954

50-
CreateCommand -> ModelManager : setEmail(...)
51-
activate ModelManager
52-
53-
ModelManager -> ImmuniMate: getPerson(...)
54-
activate ImmuniMate
55-
56-
ImmuniMate -> UniquePersonList : get(...)
57-
activate UniquePersonList
58-
59-
UniquePersonList -> internalList : get(...)
60-
activate internalList
61-
62-
internalList --> UniquePersonList : p
63-
deactivate internalList
64-
65-
UniquePersonList --> ImmuniMate : p
66-
deactivate UniquePersonList
67-
68-
ImmuniMate -> p : setEmail(null)
69-
activate p
70-
p --> ImmuniMate : set email to null
71-
deactivate p
72-
73-
ImmuniMate --> ModelManager
74-
deactivate ImmuniMate
55+
CreateCommand -> p1 : setEmail(null)
56+
activate p1
7557

76-
ModelManager --> CreateCommand
77-
deactivate ModelManager
58+
p1 --> CreateCommand
59+
deactivate p1
7860

7961
[<--CreateCommand
8062
deactivate CreateCommand

docs/diagrams/DeleteInfoSequenceDiagram.puml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,16 @@ deactivate ImmuniMateParser
4949
LogicManager -> DeleteInfoCommand : execute(m)
5050
activate DeleteInfoCommand
5151

52+
DeleteInfoCommand -> Model : getFilteredPersonsList()
53+
activate Model
54+
55+
Model --> DeleteInfoCommand : persons
56+
deactivate Model
57+
5258
DeleteInfoCommand -> Model : hasPerson(...)
5359
activate Model
54-
Model --> DeleteInfoCommand : false
60+
61+
Model --> DeleteInfoCommand : true
5562
deactivate Model
5663

5764
DeleteInfoCommand -> Model : setEmail(...)

docs/diagrams/ModelClassDiagram.puml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ skinparam arrowColor MODEL_COLOR
55
skinparam classBackgroundColor MODEL_COLOR
66

77
Package Model as ModelPackage <<Rectangle>>{
8-
Class "<<interface>>\nReadOnlyAddressBook" as ReadOnlyAddressBook
8+
Class "<<interface>>\nReadOnlyImmuniMate" as ReadOnlyImmuniMate
99
Class "<<interface>>\nReadOnlyUserPrefs" as ReadOnlyUserPrefs
1010
Class "<<interface>>\nModel" as Model
1111
Class ImmuniMate
1212
Class ModelManager
1313
Class UserPrefs
14-
1514
Class UniquePersonList
1615
Class Person
1716
Class Address
@@ -37,11 +36,11 @@ Class I #FFFFFF
3736
Class HiddenOutside #FFFFFF
3837
HiddenOutside ..> Model
3938

40-
ImmuniMate .up.|> ReadOnlyAddressBook
39+
ImmuniMate .up.|> ReadOnlyImmuniMate
4140

4241
ModelManager .up.|> Model
4342
Model .right.> ReadOnlyUserPrefs
44-
Model .left.> ReadOnlyAddressBook
43+
Model .left.> ReadOnlyImmuniMate
4544
ModelManager -left-> "1" ImmuniMate
4645
ModelManager -right-> "1" UserPrefs
4746
UserPrefs .up.|> ReadOnlyUserPrefs

docs/diagrams/ParserClasses.puml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Class XYZCommand
99

1010
package "Parser classes"{
1111
Class "<<interface>>\nParser" as Parser
12-
Class AddressBookParser
12+
Class ImmuniMateParser
1313
Class XYZCommandParser
1414
Class CliSyntax
1515
Class ParserUtil
@@ -19,12 +19,12 @@ Class Prefix
1919
}
2020

2121
Class HiddenOutside #FFFFFF
22-
HiddenOutside ..> AddressBookParser
22+
HiddenOutside ..> ImmuniMateParser
2323

24-
AddressBookParser .down.> XYZCommandParser: <<create>>
24+
ImmuniMateParser .down.> XYZCommandParser: <<create>>
2525

2626
XYZCommandParser ..> XYZCommand : <<create>>
27-
AddressBookParser ..> Command : <<use>>
27+
ImmuniMateParser ..> Command : <<use>>
2828
XYZCommandParser .up.|> Parser
2929
XYZCommandParser ..> ArgumentMultimap
3030
XYZCommandParser ..> ArgumentTokenizer
-3.32 KB
Loading

docs/images/ModelClassDiagram.png

-27.2 KB
Loading

docs/images/ParserClasses.png

-284 Bytes
Loading

0 commit comments

Comments
 (0)