Inventory.java

@@ -9,31 +9,59 @@ public class Inventory {
 
     public void updateQuality() {
         for (int i = 0; i < items.length; i++) {
+            if (items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
+                 //items[i].setSellIn(items[i].getSellIn() - 1);
+                continue;
+            }
+            
             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);
-                }
+                regItemUpdate();
+                // if (items[i].getQuality() > 0) {
+                    // if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
+                        // items[i].setQuality(items[i].getQuality() - 1);
+                    // }
+                // }
+            } else {agedBrieUpdate();
+                // 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].getQuality() < 80){
+            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].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);
+                    // }
+                // }
+            // }
         }
-}
+    }
+
+    public void agedBrieUpdate() {
+        int i = 0;
+        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() <= 48){
+	    items[i].setQuality(items[i].getQuality() + 2);	
+	   }
+
+    }
+    
+    public void regItemUpdate() {
+        int i = 0;
+        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);	
+	   }
+
+    }
+
 }

package.bluej

@@ -5,17 +5,17 @@ dependency1.type=UsesDependency
 dependency2.from=InventoryTest
 dependency2.to=Inventory
 dependency2.type=UsesDependency
-editor.fx.0.height=722
+editor.fx.0.height=712
 editor.fx.0.width=800
-editor.fx.0.x=320
-editor.fx.0.y=50
+editor.fx.0.x=264
+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.x=480
 package.editor.y=61
 package.frame.height=600
 package.frame.width=800
@@ -34,8 +34,8 @@ target1.name=Item
 target1.showInterface=false
 target1.type=ClassTarget
 target1.width=80
-target1.x=10
-target1.y=100
+target1.x=30
+target1.y=90
 target2.height=50
 target2.name=InventoryTest
 target2.showInterface=false