Fix bug related to info command not working properly

AY2324S2-CS2113-T11-3 · Apr 9, 2024 · 4fe40a2 · 4fe40a2
1 parent fe1c5fd
commit 4fe40a2
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/src/main/java/florizz/core/FlowerDictionary.java b/src/main/java/florizz/core/FlowerDictionary.java
@@ -57,7 +57,7 @@ public static void startup() {
         // [Fillers have yet to be implemented]
         add("Baby Breath", "White", new String[]{"Wedding", "Valentines", "Mothers Day"}, 1.00,
                 new String[]{"Innocence", "Kindness", "Care", "Humble"}, Flower.Type.FLOWER);
-        add("Eucalyptus", "Green", new String[]{}, 1.5, new String[]{}, Flower.Type.FLOWER);
+        add("Eucalyptus", "Green", new String[]{"Wedding"}, 1.5, new String[]{"Love", "Kindness"}, Flower.Type.FLOWER);
         add("Dusty Miller", "Green", new String[]{}, 1.5, new String[]{}, Flower.Type.FILLER);
         add("Pistacia", "Green", new String[]{}, 1.5, new String[]{}, Flower.Type.FILLER);
         add("Pittosporum", "Green", new String[]{}, 1.5, new String[]{}, Flower.Type.FILLER);

diff --git a/src/main/java/florizz/core/FuzzyLogic.java b/src/main/java/florizz/core/FuzzyLogic.java
@@ -42,6 +42,19 @@ public class FuzzyLogic {
         ITEMS.put("Valentines", "Occasion");
         ITEMS.put("Mothers Day", "Occasion");
         ITEMS.put("Funeral", "Occasion");
+        ITEMS.put("Eucalyptus", "Flower");
+        ITEMS.put("Dusty Miller", "Flower");
+        ITEMS.put("Pistacia", "Flower");
+        ITEMS.put("Pittosporum", "Flower");
+        ITEMS.put("Chamomile", "Flower");
+        ITEMS.put("Astilbe", "Flower");
+        ITEMS.put("Hypericum", "Flower");
+        ITEMS.put("Freesia", "Flower");
+        ITEMS.put("Helichrysum", "Flower");
+        ITEMS.put("Limonium", "Flower");
+        ITEMS.put("Limonium Perezii", "Flower");
+        ITEMS.put("Statice", "Flower");
+        ITEMS.put("Rice Flower", "Flower");
     }
 
     /**

diff --git a/src/main/java/florizz/objects/Flower.java b/src/main/java/florizz/objects/Flower.java
@@ -198,22 +198,36 @@ public Double getPrice () {
      */
     @Override
     public String toString() {
+        String finalOccasion;
+        String finalMeaning;
         StringBuilder occasionsString = new StringBuilder("Occasions: ");
         StringBuilder meaningsString = new StringBuilder("Meanings: ");
         for (Occasion occasion : occasions){
             occasionsString.append(occasionToString(occasion));
             occasionsString.append(", ");
         }
 
-
         for (String meaning : meanings){
             meaningsString.append(meaning);
             meaningsString.append(", ");
         }
+        // Check if occasionString was updated
+        if (!(occasionsString.toString().equals("Occasions: "))) {
+            finalOccasion = occasionsString.substring(0,occasionsString.lastIndexOf(","));
+        } else {
+            finalOccasion = occasionsString.toString();
+        }
+        // Check if meaning String was updated
+        if (!(meaningsString.toString().equals("Meanings: "))) {
+            finalMeaning = meaningsString.substring(0,meaningsString.lastIndexOf(","));
+        } else {
+            finalMeaning = occasionsString.toString();
+        }
+
         return ("Name: " + name + "\n" +
                 "Colour: " + colourToString(colour) + "\n" +
-                occasionsString.substring(0, occasionsString.lastIndexOf(",")) + "\n" +
+                finalOccasion + "\n" +
                 "Price: $" + String.format("%.2f", price) + "\n" +
-                meaningsString.substring(0, meaningsString.lastIndexOf(",")));
+                finalMeaning);
     }
 }