level2 done

Inventory.java

@@ -1,64 +1,78 @@
 
 public class Inventory {
     private Item[] items;
-
     public Inventory(Item[] items) {
         super();
         this.items = items;
     }
 
+    public void bringQualityToRange (int i) {
+        if (items[i].getQuality() > 50) {
+            items[i].setQuality(50);
+        }
+        if (items[i].getQuality() < 0) {
+            items[i].setQuality(0);
+        }
+    }
 
-    public void updateQuality() {
-        for (int i = 0; i < items.length; i++) {
-            if (!items[i].getName().equals("Aged Brie")
-                    && !items[i].getName().equals("Backstage passes to a TAFKAL80ETC concert")) {
-                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);
+    public void updateBrie(int i) {
+        if (items[i].getSellIn() > 0) {
+            items[i].setQuality(items[i].getQuality() + 1);
+        } else if (items[i].getSellIn() <= 0) {
+            items[i].setQuality(items[i].getQuality() + 2);
+        }
+        items[i].setSellIn(items[i].getSellIn() - 1);
+        bringQualityToRange(i);
+    }
 
-                    if (items[i].getName() == "Backstage passes to a TAFKAL80ETC concert") {
-                        if (items[i].getSellIn() < 11) {
-                            if (items[i].getQuality() < 50) {
-                                items[i].setQuality(items[i].getQuality() + 1);
-                            }
-                        }
+    public void updateBackstagePasses(int i) {
+        if (items[i].getSellIn() < 0) {
+            items[i].setQuality(0);
+        } else if (items[i].getSellIn() < 6) {
+            items[i].setQuality(items[i].getQuality() + 3);
+        } else if (items[i].getSellIn() < 11) {
+            items[i].setQuality(items[i].getQuality() + 2);
+        } else if (items[i].getSellIn() >= 11) {
+            items[i].setQuality(items[i].getQuality() + 1);
+        }
+        items[i].setSellIn(items[i].getSellIn() - 1);
+        bringQualityToRange(i);
+    }
 
-                        if (items[i].getSellIn() < 6) {
-                            if (items[i].getQuality() < 50) {
-                                items[i].setQuality(items[i].getQuality() + 1);
-                            }
-                        }
-                    }
-                }
-            }
+    public void updateConjured (int i) {
+        if (items[i].getSellIn() > 0){
+            items[i].setQuality(items[i].getQuality() - 2);
+        } else {
+            items[i].setQuality(items[i].getQuality() - 4);
+        }
+        items[i].setSellIn(items[i].getSellIn() - 1);
+        bringQualityToRange(i);
+    }
 
-            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-                items[i].setSellIn(items[i].getSellIn() - 1);
-            }
+    public void updateNormalItem (int i) {
+        if (items[i].getSellIn() >= 0){
+            items[i].setQuality(items[i].getQuality() - 1);
+        } else {
+            items[i].setQuality(items[i].getQuality() - 2);
+        }
+        items[i].setSellIn(items[i].getSellIn() - 1);
+        bringQualityToRange(i);
+    }
 
-            if (items[i].getSellIn() < 0) {
-                if (!items[i].getName().equals("Aged Brie")) {
-                    if (!items[i].getName().equals("Backstage passes to a TAFKAL80ETC concert")) {
-                        if (items[i].getQuality() > 0) {
-                            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-                                items[i].setQuality(items[i].getQuality() - 1);
-                            }
-                        }
-                    } else {
-                        items[i].setQuality(items[i].getQuality()
-                                - items[i].getQuality());
-                    }
-                } else {
-                    if (items[i].getQuality() < 50) {
-                        items[i].setQuality(items[i].getQuality() + 1);
-                    }
-                }
+    public void updateQuality() {
+        for (int i = 0; i < items.length; i++) {
+            if (items[i].getName().equals("Aged Brie")) {
+                updateBrie(i);
+            } else if (items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
+            } else if (items[i].getName().equals("Conjured")) {
+                updateConjured(i);
+            } else if (items[i].getName().equals("Backstage passes to a TAFKAL80ETC concert")) {
+                updateBackstagePasses(i);
+            } 
+            else {
+                updateNormalItem(i);
             }
         }
+    }
 }
-}
+

package.bluej

@@ -6,17 +6,17 @@ 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.width=1206
+editor.fx.0.x=222
+editor.fx.0.y=-1040
 objectbench.height=164
-objectbench.width=776
+objectbench.width=461
 package.divider.horizontal=0.6
 package.divider.vertical=0.6845018450184502
 package.editor.height=364
 package.editor.width=674
-package.editor.x=577
-package.editor.y=61
+package.editor.x=132
+package.editor.y=66
 package.frame.height=600
 package.frame.width=800
 package.numDependencies=2
@@ -41,13 +41,13 @@ target2.name=InventoryTest
 target2.showInterface=false
 target2.type=UnitTestTargetJunit4
 target2.width=80
-target2.x=40
-target2.y=160
+target2.x=90
+target2.y=190
 target3.association=InventoryTest
 target3.height=50
 target3.name=Inventory
 target3.showInterface=false
 target3.type=ClassTarget
 target3.width=80
-target3.x=10
-target3.y=190
+target3.x=60
+target3.y=220