Resolving Conflict

build.gradle

@@ -66,7 +66,7 @@ dependencies {
 }
 
 shadowJar {
-    archiveFileName = 'addressbook.jar'
+    archiveFileName = 'DoConnekPro.jar'
 }
 
 run {

docs/AboutUs.md

@@ -34,11 +34,11 @@ We are a team based in the [School of Computing, National University of Singapor
 
 <img src="images/alvinlim277.png" width="200px">
 
-[[github](http://github.com/alvinlim277)] 
+[[github](http://github.com/alvinlim277)]
 [[portfolio](team/alvinlim277.md)]
 
 * Role: Developer
-* Responsibilities: Documentation, Testing 
+* Responsibilities: Documentation, Testing
 
 ### Ng Kok Seng
 

docs/SettingUp.md

@@ -45,11 +45,4 @@ If you plan to use Intellij IDEA (highly recommended):
 
 1. **Learn the design**
 
-   When you are ready to start coding, we recommend that you get some sense of the overall design by reading about [AddressBook’s architecture](DeveloperGuide.md#architecture).
-
-1. **Do the tutorials**
-   These tutorials will help you get acquainted with the codebase.
-
-   * [Tracing code](tutorials/TracingCode.md)
-   * [Adding a new command](tutorials/AddRemark.md)
-   * [Removing fields](tutorials/RemovingFields.md)
+   When you are ready to start coding, we recommend that you get some sense of the overall design by reading about [DoConnekPro's architecture](DeveloperGuide.md#architecture).

docs/diagrams/AddCommandStringActivityDiagram.puml

@@ -0,0 +1,19 @@
+@startuml
+skin rose
+skinparam ActivityFontSize 15
+skinparam ArrowFontSize 12
+start
+:User executes command;
+
+'Since the beta syntax does not support placing the condition outside the
+'diamond we place it as the true branch instead.
+
+if () then ([command successfully
+ executed])
+    :Add command string to CommandStringStash;
+    :Move currentCmdIndex to right after the
+    last element in the CommandStringStash;
+else ([else])
+endif
+stop
+@enduml

docs/diagrams/AddShortcutActivityDiagram.puml

@@ -0,0 +1,24 @@
+@startuml
+skin rose
+skinparam ActivityFontSize 15
+skinparam ArrowFontSize 13
+start
+:User requests to add shortcut;
+
+if () then ([Request parsed successfully])
+    switch ()
+    case ([Shortcut alias already mapped])
+        :Notify user of existing shortcut to be overwritten;
+        :Register new shortcut;
+    case ([Mapping already exists])
+        :Notify user of existing mapping;
+    case ([else])
+        :Register new shortcut;
+    endswitch
+else ([else])
+    :Show error and usage message;
+endif
+
+
+stop
+@enduml

docs/diagrams/AddShortcutCommandSequenceDiagram.puml

@@ -0,0 +1,78 @@
+@startuml
+!include style.puml
+skinparam ArrowFontStyle plain
+skinparam defaultFontSize 20
+'
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":AddressBookParser" as AddressBookParser LOGIC_COLOR
+participant ":AddShortcutCommandParser" as AddShortcutCommandParser  LOGIC_COLOR
+participant "a:AddShortcutCommand" as AddShortcutCommand LOGIC_COLOR
+participant ":CommandResult" as CommandResult LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant ":Model" as Model MODEL_COLOR
+participant ":ShortcutSettings" as ShortcutSettings MODEL_COLOR
+end box
+
+[-> LogicManager : execute\n("addsc sc/del kw/delete")
+activate LogicManager
+
+LogicManager -> AddressBookParser : parseCommand\n("addsc sc/del kw/delete")
+activate AddressBookParser
+
+create AddShortcutCommandParser
+AddressBookParser -> AddShortcutCommandParser
+activate AddShortcutCommandParser
+
+AddShortcutCommandParser --> AddressBookParser
+deactivate AddShortcutCommandParser
+
+AddressBookParser -> AddShortcutCommandParser : parse\n("sc/del kw/delete")
+activate AddShortcutCommandParser
+
+create AddShortcutCommand
+AddShortcutCommandParser -> AddShortcutCommand
+activate AddShortcutCommand
+
+AddShortcutCommand --> AddShortcutCommandParser : a
+deactivate AddShortcutCommand
+
+AddShortcutCommandParser --> AddressBookParser : a
+deactivate AddShortcutCommandParser
+'Hidden arrow to position the destroy marker below the end of the activation bar.
+AddShortcutCommandParser -[hidden]-> AddressBookParser
+destroy AddShortcutCommandParser
+
+AddressBookParser --> LogicManager : a
+deactivate AddressBookParser
+
+LogicManager -> AddShortcutCommand : execute()
+activate AddShortcutCommand
+
+AddShortcutCommand -> Model : registerShortcut\n(del, delete)
+activate Model
+
+Model -> ShortcutSettings : registerShortcut\n(del, delete)
+activate ShortcutSettings
+
+ShortcutSettings --> Model
+deactivate ShortcutSettings
+
+Model --> AddShortcutCommand
+deactivate Model
+
+create CommandResult
+AddShortcutCommand -> CommandResult
+activate CommandResult
+
+CommandResult --> AddShortcutCommand
+deactivate CommandResult
+
+AddShortcutCommand --> LogicManager : result
+deactivate AddShortcutCommand
+
+[<--LogicManager
+deactivate LogicManager
+@enduml

docs/diagrams/BetterModelClassDiagram.puml

@@ -17,5 +17,4 @@ Person -up-> "*" Tag
 Person *--> Name
 Person *--> Phone
 Person *--> Email
-Person *--> Address
 @enduml

docs/diagrams/CommitActivityDiagram.puml

@@ -8,10 +8,10 @@ start
 'Since the beta syntax does not support placing the condition outside the
 'diamond we place it as the true branch instead.
 
-if () then ([command commits AddressBook])
+if () then ([command commits ModelManager])
     :Purge redundant states;
-    :Save AddressBook to
-    addressBookStateList;
+    :Save ModelManager to
+    ModelManagerStateList;
 else ([else])
 endif
 stop

docs/diagrams/DeleteShortcutActivityDiagram.puml

@@ -0,0 +1,21 @@
+@startuml
+skin rose
+skinparam ActivityFontSize 15
+skinparam ArrowFontSize 13
+start
+:User requests to remove shortcuts;
+
+'Since the beta syntax does not support placing the condition outside the
+'diamond we place it as the true branch instead.
+if () then ([Request parsed successfully])
+if () then ([Shortcuts are mapped])
+    :Remove shortcuts;
+else ([else])
+    :Notify user shortcut does not exist;
+endif
+else ([else])
+    :Show error and usage message;
+endif
+
+stop
+@enduml

docs/diagrams/FindCommandSequenceDiagram.puml

@@ -0,0 +1,78 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":AddressBookParser" as AddressBookParser LOGIC_COLOR
+participant ":FindCommandParser" as FindCommandParser LOGIC_COLOR
+participant "m:FindPredicateMap" as FindPredicateMap LOGIC_COLOR
+participant "f:FindCommand" as FindCommand LOGIC_COLOR
+participant ":CommandResult" as CommandResult LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant ":Model" as Model MODEL_COLOR
+end box
+
+
+[-> LogicManager : execute("find -pa n/Tim m/Anaemia")
+activate LogicManager
+
+LogicManager -> AddressBookParser : parseCommand("find -pa n/Tim m/Anaemia")
+activate AddressBookParser
+
+create FindCommandParser
+AddressBookParser -> FindCommandParser
+activate FindCommandParser
+
+FindCommandParser --> AddressBookParser
+deactivate FindCommandParser
+
+AddressBookParser -> FindCommandParser : parse("n/Tim m/Anaemia")
+activate FindCommandParser
+
+create FindPredicateMap
+FindCommandParser -> FindPredicateMap
+activate FindPredicateMap
+FindPredicateMap --> FindCommandParser : m
+deactivate FindPredicateMap
+
+create FindCommand
+FindCommandParser -> FindCommand : FindCommand(m, PersonType.PATIENT)
+activate FindCommand
+
+FindCommand --> FindCommandParser : f
+deactivate FindCommand
+
+FindCommandParser --> AddressBookParser : f
+deactivate FindCommandParser
+'Hidden arrow to position the destroy marker below the end of the activation bar.
+FindCommandParser -[hidden]-> AddressBookParser
+destroy FindCommandParser
+
+AddressBookParser --> LogicManager : f
+deactivate AddressBookParser
+
+LogicManager -> FindCommand : execute()
+activate FindCommand
+
+FindCommand -> Model : updateFilteredPersonList(predicate)
+activate Model
+Model --> FindCommand
+deactivate Model
+
+create CommandResult
+FindCommand -> CommandResult
+activate CommandResult
+CommandResult --> FindCommand
+deactivate CommandResult
+
+FindCommand --> LogicManager
+deactivate FindCommand
+
+[<-- LogicManager
+deactivate LogicManager
+
+
+deactivate LogicManager
+@enduml

docs/diagrams/FindPredicateMapExample.puml

@@ -0,0 +1,27 @@
+@startuml
+!include style.puml
+skinparam ClassFontColor #000000
+skinparam ClassBorderColor #000000
+skinparam ClassBackgroundColor #FFFFAA
+
+title FindPredicateMap Example
+
+hide members
+
+object "<u>:FindPredicateMap</u>" as FindPredicateMap #FFFFAA
+
+object "<u>p0:NameContainsKeywordPredicate</u>" as p1 {
+    keywords = {"Tim"}
+}
+
+object "<u>p1:MedHistoryContainsKeywordsPredicate</u>" as p0 {
+    keywords = {"Anaemia"}
+}
+
+show p0 member
+show p1 member
+
+FindPredicateMap-down->p0
+FindPredicateMap-down->p1
+
+@end

docs/diagrams/ModelClassDiagram.puml

@@ -14,11 +14,12 @@ Class UserPrefs
 
 Class UniquePersonList
 Class Person
-Class Address
 Class Email
 Class Name
 Class Phone
 Class Tag
+Class ThemeProperty
+Class CommandStringStash
 
 Class I #FFFFFF
 }
@@ -33,22 +34,20 @@ Model .right.> ReadOnlyUserPrefs
 Model .left.> ReadOnlyAddressBook
 ModelManager -left-> "1" AddressBook
 ModelManager -right-> "1" UserPrefs
+ModelManager -right-> "1" ThemeProperty
+ModelManager -left-> "1" CommandStringStash
 UserPrefs .up.|> ReadOnlyUserPrefs
 
 AddressBook *--> "1" UniquePersonList
 UniquePersonList --> "~* all" Person
 Person *--> Name
 Person *--> Phone
 Person *--> Email
-Person *--> Address
 Person *--> "*" Tag
 
 Person -[hidden]up--> I
 UniquePersonList -[hidden]right-> I
-
 Name -[hidden]right-> Phone
-Phone -[hidden]right-> Address
-Address -[hidden]right-> Email
 
 ModelManager --> "~* filtered" Person
 @enduml

docs/diagrams/RecallCommandSequenceDiagram.puml

@@ -0,0 +1,32 @@
+@startuml
+!include style.puml
+skinparam ArrowFontStyle plain
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant ":Model" as Model MODEL_COLOR
+participant ":CommandStringStash" as CommandStringStash MODEL_COLOR
+end box
+[-> LogicManager : getPrevCommandString(input)
+activate LogicManager
+
+LogicManager -> Model : getPrevCommandString(input)
+activate Model
+
+Model -> CommandStringStash : getPrevCommandString(input)
+activate CommandStringStash
+
+CommandStringStash --> Model : commandString
+
+deactivate CommandStringStash
+
+Model --> LogicManager : commandString
+
+deactivate Model
+
+[<--LogicManager : commandString
+deactivate LogicManager
+@enduml

docs/diagrams/RecallStep1.puml

@@ -0,0 +1,15 @@
+@startuml
+!include style.puml
+skinparam ClassFontColor #000000
+skinparam ClassBorderColor #000000
+skinparam ClassBackgroundColor #FFFFAA
+
+title Initial state
+
+show members
+
+object "<u>:CommandStringStash</u>" as CommandStringStash #FFFFAA {
+    currentCmdIndex = 0
+}
+
+@end