Merge pull request #165 from LuWenQ/master

Fix UI bugs
AY1920S1-CS2103T-W11-1 · Nov 1, 2019 · 858f344 · 858f344
2 parents 74e4b5e + 63f6d4d
commit 858f344
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/src/main/java/seedu/algobase/logic/commands/DeleteTagCommand.java b/src/main/java/seedu/algobase/logic/commands/DeleteTagCommand.java
@@ -43,8 +43,8 @@ public CommandResult execute(Model model, CommandHistory history) throws Command
         }
 
         Tag tagToDelete = lastShownList.get(targetIndex.getZeroBased());
-        model.deleteTag(tagToDelete);
         model.deleteTags(tagToDelete);
+        model.deleteTag(tagToDelete);
         return new CommandResult(String.format(MESSAGE_DELETE_TAG_SUCCESS, tagToDelete.getName()));
     }
 

diff --git a/src/main/java/seedu/algobase/model/ModelManager.java b/src/main/java/seedu/algobase/model/ModelManager.java
@@ -191,10 +191,8 @@ public void deleteTag(Tag target) {
     public void deleteTags(Tag target) {
         for (Problem problem : filteredProblems) {
             Set<Tag> targetTags = problem.getTags();
-            for (Tag tag : targetTags) {
-                if (tag.getName().equals(target.getName())) {
-                    problem.deleteTag(tag);
-                }
+            if (targetTags.contains(target)) {
+                problem.deleteTag(target);
             }
         }
     }
@@ -224,11 +222,9 @@ public void setTags(Tag target, Tag editedTag) {
         requireAllNonNull(target, editedTag);
         for (Problem problem : filteredProblems) {
             Set<Tag> targetTags = problem.getTags();
-            for (Tag tag : targetTags) {
-                if (tag.getName().equals(target.getName())) {
-                    problem.addTag(editedTag);
-                    problem.deleteTag(tag);
-                }
+            if (targetTags.contains(target)) {
+                problem.deleteTag(target);
+                problem.addTag(editedTag);
             }
         }
     }

diff --git a/src/main/java/seedu/algobase/model/tag/UniqueTagList.java b/src/main/java/seedu/algobase/model/tag/UniqueTagList.java
@@ -42,10 +42,9 @@ public boolean contains(Tag toCheck) {
      */
     public void add(Tag toAdd) {
         requireNonNull(toAdd);
-        if (contains(toAdd)) {
-            throw new DuplicateTagException();
+        if (!contains(toAdd)) {
+            internalList.add(toAdd);
         }
-        internalList.add(toAdd);
     }
 
     /**

diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
@@ -33,7 +33,7 @@
           </Menu>
         </MenuBar>
 
-        <SplitPane fx:id="mainDisplayPlaceholder">
+        <SplitPane fx:id="mainDisplayPlaceholder" VBox.vgrow="ALWAYS">
           <VBox>
             <StackPane VBox.vgrow="NEVER" fx:id="commandBoxPlaceholder" styleClass="pane-with-border">
               <padding>