resolve conflict

AY2324S2-CS2113-T12-4 · Mar 20, 2024 · 56615d8 · 56615d8
1 parent 547c2ae
commit 56615d8
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/src/main/java/seedu/duke/TravelActivityList.java b/src/main/java/seedu/duke/TravelActivityList.java
@@ -144,36 +144,36 @@ public void uncheckTravelActivity(int taskNumber) throws OmniException{
      * @param taskNumber The travel activity number on the list
      * @param tag The tag of travel activity
      */
-    public void tagActivity(int taskNumber, String tag) throws OmniException{
+    public void tagActivity(int taskNumber, String tag) throws OmniException {
         assert taskNumber != 0 : "There is no tasks in the list";
         if (taskNumber > travelActivities.size()) {
             throw new OmniException("Travel activity cannot be found");
         }
         int indexOfTask = taskNumber - 1;
-        TravelActivity taggedTask  = travelActivities.get(indexOfTask);
+        TravelActivity taggedTask = travelActivities.get(indexOfTask);
         taggedTask.setTag(tag);
         System.out.println("I have tagged this task:");
         System.out.println(taggedTask + "(" + tag + ")");
-
-    public ArrayList<TravelActivity> getTravelActivities() {
-        return travelActivities;
-
     }
+        public ArrayList<TravelActivity> getTravelActivities () {
+            return travelActivities;
 
-    /**
-     * Removes the tag on a travel activity
-     * @param taskNumber The travel activity number on the list
-     */
-    public void removeTag(int taskNumber) throws OmniException {
-        assert taskNumber != 0 : "There is no task in the list";
-        if (taskNumber > travelActivities.size()) {
-            throw new OmniException("Travel activity cannot be found");
         }
-        int indexOfTask = taskNumber - 1;
-        TravelActivity taggedTask = travelActivities.get(indexOfTask);
-        taggedTask.removeTag();
-        System.out.println("Tag removed from the task:");
-        System.out.println(taggedTask);
-    }
-
+
+        /**
+         * Removes the tag on a travel activity
+         * @param taskNumber The travel activity number on the list
+         */
+        public void removeTag ( int taskNumber) throws OmniException {
+            assert taskNumber != 0 : "There is no task in the list";
+            if (taskNumber > travelActivities.size()) {
+                throw new OmniException("Travel activity cannot be found");
+            }
+            int indexOfTask = taskNumber - 1;
+            TravelActivity taggedTask = travelActivities.get(indexOfTask);
+            taggedTask.removeTag();
+            System.out.println("Tag removed from the task:");
+            System.out.println(taggedTask);
+        }
+
 }