Merge pull request #239 from EugeneChanJiajun/master

Update sequence diagram for save function
AY2324S2-CS2113-T12-4 · Apr 15, 2024 · 32d14b2 · 32d14b2
2 parents f1796d3 + e5c8e80
commit 32d14b2
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 62 deletions.
diff --git a/docs/DiagramImages/img.png b/docs/DiagramImages/img.png
diff --git a/docs/plantUML diagrams/FileSaveSequence.puml b/docs/plantUML diagrams/FileSaveSequence.puml
@@ -1,61 +1,73 @@
-@startuml
-actor User
-participant "readFile()" as readFile
-participant "loadFileContents(TravelActivityList list)" as loadFileContents
-participant "accommodation:Accommodation" as Accommodation
-participant "food:Food" as Food
-participant "landmark:Landmark" as Landmark
-participant "list:TravelActivityList" as TravelActivityList
-participant "SetActivityStatus" as SetActivityStatus
-participant "s:Scanner" as Scanner
-
-User -> readFile: readFile()
-activate readFile
-readFile -> loadFileContents: loadFileContents(list)
-activate loadFileContents
-
-loop scanner
-loadFileContents -> Scanner: hasNext()
-activate Scanner
-Scanner --> loadFileContents: next
-deactivate Scanner
-    alt Accomodation
-        loadFileContents -> Accommodation: list.addTravelActivity(accommodation)
-        activate Accommodation
-        Accommodation -> TravelActivityList: list.addTravelActivity(accommodation)
-        activate TravelActivityList
-        TravelActivityList --> Accommodation: added activity
-        deactivate TravelActivityList
-        Accommodation -> SetActivityStatus: setActivityStatus()
-        activate SetActivityStatus
-        SetActivityStatus --> Accommodation: Status handled
-        deactivate SetActivityStatus
-    else Food
-        loadFileContents -> Food: list.addTravelActivity(food)
-        activate Food
-        Food -> TravelActivityList: list.addTravelActivity(food)
-        activate TravelActivityList
-        TravelActivityList --> Food: added activity
-        deactivate TravelActivityList
-        Food -> SetActivityStatus: setActivityStatus()
-        activate SetActivityStatus
-        SetActivityStatus --> Food: Status handled
-        deactivate SetActivityStatus
-    else Landmark
-        loadFileContents -> Landmark: list.addTravelActivity(landmark)
-        activate Landmark
-        Landmark -> TravelActivityList: list.addTravelActivity(landmark)
-        activate TravelActivityList
-        TravelActivityList --> Landmark: added activity
-        deactivate TravelActivityList
-        Landmark -> SetActivityStatus: setActivityStatus()
-        activate SetActivityStatus
-        SetActivityStatus --> Landmark: Status handled
-        deactivate SetActivityStatus
-    end
-end
-deactivate TravelActivityList
-deactivate loadFileContents
-deactivate readFile
-
+<<<<<<< HEAD:docs/team/FileSaveSequence.puml
+@startuml
+actor User
+participant "readFile()" as readFile
+participant "loadFileContents(TravelActivityList list)" as loadFileContents
+participant "accommodation:Accommodation" as Accommodation
+participant "food:Food" as Food
+participant "landmark:Landmark" as Landmark
+participant "general:TravelActivity" as General
+participant "list:TravelActivityList" as TravelActivityList
+participant "SetActivityStatus" as SetActivityStatus
+participant "s:Scanner" as Scanner
+
+User -> readFile: readFile()
+activate readFile
+readFile -> loadFileContents: loadFileContents(list)
+activate loadFileContents
+
+loop scanner
+loadFileContents -> Scanner: hasNext()
+activate Scanner
+Scanner --> loadFileContents: next
+deactivate Scanner
+    alt Accomodation
+        loadFileContents -> Accommodation: list.addTravelActivity(accommodation)
+        activate Accommodation
+        Accommodation -> TravelActivityList: list.addTravelActivity(accommodation)
+        activate TravelActivityList
+        TravelActivityList --> Accommodation: added activity
+        deactivate TravelActivityList
+        Accommodation -> SetActivityStatus: setActivityStatus()
+        activate SetActivityStatus
+        SetActivityStatus --> Accommodation: Status handled
+        deactivate SetActivityStatus
+    else Food
+        loadFileContents -> Food: list.addTravelActivity(food)
+        activate Food
+        Food -> TravelActivityList: list.addTravelActivity(food)
+        activate TravelActivityList
+        TravelActivityList --> Food: added activity
+        deactivate TravelActivityList
+        Food -> SetActivityStatus: setActivityStatus()
+        activate SetActivityStatus
+        SetActivityStatus --> Food: Status handled
+        deactivate SetActivityStatus
+    else Landmark
+        loadFileContents -> Landmark: list.addTravelActivity(landmark)
+        activate Landmark
+        Landmark -> TravelActivityList: list.addTravelActivity(landmark)
+        activate TravelActivityList
+        TravelActivityList --> Landmark: added activity
+        deactivate TravelActivityList
+        Landmark -> SetActivityStatus: setActivityStatus()
+        activate SetActivityStatus
+        SetActivityStatus --> Landmark: Status handled
+        deactivate SetActivityStatus
+    else General
+        loadFileContents -> General: list.addTravelActivity(general)
+        activate General
+        General -> TravelActivityList: list.addTravelActivity(general)
+        activate TravelActivityList
+        TravelActivityList --> General: added activity
+        deactivate TravelActivityList
+        General -> SetActivityStatus: setActivityStatus()
+        activate SetActivityStatus
+        SetActivityStatus --> General: Status handled
+        deactivate SetActivityStatus
+    end
+end
+deactivate TravelActivityList
+deactivate loadFileContents
+deactivate readFile
 @enduml
diff --git a/src/main/java/seedu/omnitravel/parser/Parser.java b/src/main/java/seedu/omnitravel/parser/Parser.java
@@ -467,6 +467,4 @@ public static void currencyExchangeCommand(String line) throws OmniException{
         }
         Ui.printLine();
     }
-
-
 }