Part1

Inventory.java

@@ -9,31 +9,74 @@ public class Inventory {
 
     public void updateQuality() {
         for (int i = 0; i < items.length; i++) {
+
+            if (items[i].getName().equals("Sulfuras, Hand of Ragnaros")){
+                continue;
+            }
+            else if (items[i].getName().equals("Aged Brie")){
+                agedBrieUpdate(i);
+            }
+            else {
+                regularItemUpdate(i);
+            }
+
+            /*
             if (!items[i].getName().equals("Aged Brie")) {
-                if (items[i].getQuality() > 0) {
-                    if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-                        items[i].setQuality(items[i].getQuality() - 1);
-                    }
-                }
+            if (items[i].getQuality() > 0) {
+            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
+            items[i].setQuality(items[i].getQuality() - 1);
+            }
+            }
             } else {
-                if (items[i].getQuality() < 50) {
-                    items[i].setQuality(items[i].getQuality() + 1);
-                }
+            if (items[i].getQuality() < 50) {
+            items[i].setQuality(items[i].getQuality() + 1);
+            }
             }
 
             if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-                items[i].setSellIn(items[i].getSellIn() - 1);
+            items[i].setSellIn(items[i].getSellIn() - 1);
             }
 
             if (items[i].getSellIn() < 0) {
-                if (!items[i].getName().equals("Aged Brie")) {
-                  items[i].setQuality(items[i].getQuality() - 1);
-                } else {
-                    if (items[i].getQuality() < 50) {
-                        items[i].setQuality(items[i].getQuality() + 1);
-                    }
-                }
+            if (!items[i].getName().equals("Aged Brie")) {
+            items[i].setQuality(items[i].getQuality() - 1);
+            } else {
+            if (items[i].getQuality() < 50) {
+            items[i].setQuality(items[i].getQuality() + 1);
+            }
             }
+            }
+             */
         }
-}
-}
+    }
+
+    public void agedBrieUpdate(int i){
+        //decrease the sellin by 1 every day
+        items[i].setSellIn(items[i].getSellIn()-1);
+
+        //increase the quality every day (as long as quality is not more than 50)
+        //increase the quality by 1 if sellin is greater than 0  and by 2 if sellin is 0
+        if  (items[i].getSellIn() > 0 && items[i].getQuality() < 50)
+            items[i].setQuality(items[i].getQuality()+1);
+        else if (items[i].getSellIn() <= 0 && (items[i].getQuality() < 49))
+            items[i].setQuality(items[i].getQuality()+2);
+        else if (items[i].getSellIn() <= 0 && items[i].getQuality() == 49)
+            items[i].setQuality(items[i].getQuality()+1);
+    }
+
+    public void regularItemUpdate(int i){
+        //decrease the sellin by 1 every day
+        items[i].setSellIn(items[i].getSellIn()-1);
+
+        //decrease the quality every day (as long as quality is greater than 0)
+        //decrease the quality by 1 if sellin is greater than 0  and by 2 if sellin is 0
+        if (items[i].getQuality() > 0){
+            if (items[i].getSellIn() > 0){
+                items[i].setQuality(items[i].getQuality() -1);
+            }
+            else {
+                items[i].setQuality(items[i].getQuality() -2);
+            }
+        }
+    }
+}

package.bluej

@@ -5,12 +5,12 @@ dependency1.type=UsesDependency
 dependency2.from=InventoryTest
 dependency2.to=Inventory
 dependency2.type=UsesDependency
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=320
-editor.fx.0.y=50
+editor.fx.0.height=787
+editor.fx.0.width=1113
+editor.fx.0.x=327
+editor.fx.0.y=40
 objectbench.height=164
-objectbench.width=776
+objectbench.width=461
 package.divider.horizontal=0.6
 package.divider.vertical=0.6845018450184502
 package.editor.height=364