Skip to content

Commit 4d9c581

Browse files
authored
Merge branch 'master' into feat/prep-1.4
2 parents ed3fac0 + 3cd5ea1 commit 4d9c581

60 files changed

Lines changed: 749 additions & 287 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/UserGuide.md

Lines changed: 83 additions & 57 deletions
Large diffs are not rendered by default.

docs/assets/css/style.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,11 @@
1010
height: 21px;
1111
width: 21px
1212
}
13+
14+
img[alt$="><"] {
15+
display: block;
16+
max-width: 100%;
17+
height: auto;
18+
margin: auto;
19+
float: none!important;
20+
}

docs/diagrams/LogicClassDiagram.puml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ package Model{
3131
Class HiddenModel #FFFFFF
3232
}
3333

34+
package Storage{
35+
Class HiddenModel #FFFFFF
36+
}
37+
3438
Class HiddenOutside #FFFFFF
3539
HiddenOutside ..> Logic
3640

@@ -39,7 +43,7 @@ LogicManager -->"1" AddressBookParser
3943
AddressBookParser .left.> XYZCommandParser: creates >
4044

4145
XYZCommandParser ..> XYZCommand : creates >
42-
XYZCommandParser ..|> Parser
46+
XYZCommandParser .left.|> Parser
4347
XYZCommandParser ..> ArgumentMultimap
4448
XYZCommandParser ..> ArgumentTokenizer
4549
ArgumentTokenizer .left.> ArgumentMultimap
@@ -52,6 +56,9 @@ XYZCommand -up-|> Command
5256
LogicManager .left.> Command : executes >
5357

5458
LogicManager --> Model
59+
LogicManager --> Storage
60+
Storage --[hidden] Model
61+
Command .[hidden]up.> Storage
5562
Command .right.> Model
5663
note right of XYZCommand: XYZCommand = AddCommand, \nFindCommand, etc
5764

docs/diagrams/StorageClassDiagram.puml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@ StorageManager o-right-> UserPrefsStorage
1919
StorageManager o--> AddressBookStorage
2020
StorageManager o--> AliasMapStorage
2121

22+
Storage -|> UserPrefsStorage
23+
Storage -|> AddressBookStorage
24+
2225
JsonUserPrefsStorage .left.|> UserPrefsStorage
2326
JsonAddressBookStorage .left.|> AddressBookStorage
24-
JsonAddressBookStorage .down.> JsonSerializableAddressBookStorage
25-
JsonSerializableAddressBookStorage .right.> JsonSerializablePerson
26-
JsonSerializablePerson .right.> JsonAdaptedTag
27+
JsonAddressBookStorage .down.> JsonSerializableAddressBook
28+
JsonSerializableAddressBook .right.> JsonAdaptedPerson
29+
JsonAdaptedPerson .right.> JsonAdaptedTag
2730

2831
JsonAliasMapStorage .up.|> AliasMapStorage
2932
JsonAliasMapStorage .left.> JsonSerializableAliasMap

docs/images/LogicClassDiagram.png

27.4 KB
Loading
4.47 KB
Loading

docs/images/UG_Add Command.png

-44.2 KB
Loading
33.3 KB
Loading
34.9 KB
Loading
55.7 KB
Loading

0 commit comments

Comments
 (0)