Clean

Inventory.java

@@ -1,39 +1,52 @@
 
 public class Inventory {
     private Item[] items;
-
+    
     public Inventory(Item[] items) {
         super();
         this.items = items;
     }
-
+    
+    public void updatedBrie(int i){
+        if(items[i].getSellIn() > 0 && items[i].getQuality() <= 49){
+            items[i].setQuality(items[i].getQuality() + 1);
+        } else if (items[i].getSellIn() < 0 && items[i].getQuality() <= 49){
+            items[i].setQuality(items[i].getQuality() + 2);
+        }
+    }
+    
+    public void updatedRegularItem(int i){
+        if(items[i].getSellIn() > 0 && items[i].getQuality() > 0){
+            items[i].setQuality(items[i].getQuality() - 1);
+        } else if (items[i].getSellIn() < 0 && items[i].getQuality() > 1){
+            items[i].setQuality(items[i].getQuality() - 2);
+        }
+    }
+    
+    public void updatedCounjuredItem(int i){
+        if(items[i].getSellIn() > 0 && items[i].getQuality() > 0){
+            items[i].setQuality(items[i].getQuality() - 2);
+        } else if(items[i].getSellIn() > 0 && items[i].getQuality() > 1){
+            items[i].setQuality(items[i].getQuality() - 4);
+        }
+    }
+    
     public void updateQuality() {
         for (int i = 0; i < items.length; 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);
-                    }
-                }
-            } else {
-                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);
+            
+            if (items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
+                continue;
             }
-
-            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")) {
+                updatedBrie(i);
+            } else if (items[i].getName().equals("Conjured Mage Water")){
+                updatedCounjuredItem(i);
+            } else{updatedRegularItem(i);}
+            
+            if (items[i].getQuality() < 80){
+             items[i].setSellIn(items[i].getSellIn() - 1); 
             }
         }
-}
-}
+        }
+    }

InventoryTest.java

@@ -8,7 +8,8 @@ public class InventoryTest {
     private static final String AGED_BRIE_NAME = "Aged Brie";
     private static final String BACKSTAGE_PASS_NAME = "Backstage passes to a TAFKAL80ETC concert";
     private static final String NORMAL_ITEM_NAME = "+5 Dexterity Vest";
-
+    private static final String CONJURED_ITEM_NAME = "Conjured Mage Water";
+    
     private Item sulfuras;
     private Item normalItem;
 

package.bluej

@@ -5,18 +5,18 @@ dependency1.type=UsesDependency
 dependency2.from=InventoryTest
 dependency2.to=Inventory
 dependency2.type=UsesDependency
-editor.fx.0.height=722
+editor.fx.0.height=721
 editor.fx.0.width=800
-editor.fx.0.x=320
-editor.fx.0.y=50
+editor.fx.0.x=240
+editor.fx.0.y=23
 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=100
+package.editor.y=100
 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=250
+target2.y=210
 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=220
+target3.y=240