8

Inventory.java

@@ -9,41 +9,35 @@ public class Inventory {
 
     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")) {
-                //level 2 - quality
-                if (items[i].getQuality() < 50) {
-                    increaseQualityBy1(items[i]);
-                    //level 3 - item type
-                    if (items[i].getName() == "Backstage passes to a TAFKAL80ETC concert") {
-                        //level 4 - sell in date
-                        if (items[i].getSellIn() < 11) {
-                            //level 5 - quality
-                            if (items[i].getQuality() < 50) {
-                                increaseQualityBy1(items[i]);
+            if(!items[i].getName().equals("Sulfuras, Hand of Ragnaros")){
+                if (items[i].getName().equals("Aged Brie")
+                || items[i].getName().equals("Backstage passes to a TAFKAL80ETC concert")) {
+                    //level 2 - quality
+                    if (items[i].getQuality() < 50) {
+                        increaseQualityBy1(items[i]);
+                        //level 3 - item type
+                        if (items[i].getName() == "Backstage passes to a TAFKAL80ETC concert") {
+                            //level 4 - sell in date
+                            if (items[i].getSellIn() < 11) {
+                                //level 5 - quality
+                                if (items[i].getQuality() < 50) {
+                                    increaseQualityBy1(items[i]);
+                                }
                             }
-                        }
-                        //level 4 - sell in date
-                        if (items[i].getSellIn() < 6) {
-                            //level 5 - quality
-                            if (items[i].getQuality() < 50) {
-                                increaseQualityBy1(items[i]);
+                            //level 4 - sell in date
+                            if (items[i].getSellIn() < 6) {
+                                //level 5 - quality
+                                if (items[i].getQuality() < 50) {
+                                    increaseQualityBy1(items[i]);
+                                }
                             }
                         }
                     }
+                    //level 1 - item type
+                } else if (items[i].getQuality() > 0) {
+                    reduceQualityBy1(items[i]);
                 }
-                //level 1 - item type
-            } else {
-                //level 2 - quality
-                if (items[i].getQuality() > 0) {
-                    //level 3 - item type
-                    if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-                        reduceQualityBy1(items[i]);
-                    }
-                }
-            }
 
-            if(!items[i].getName().equals("Sulfuras, Hand of Ragnaros")){
                 updateSellInDays(items[i]);
                 if (items[i].getSellIn() < 0) {
                     updateExpiredItems(items[i]);
@@ -69,24 +63,12 @@ public class Inventory {
     }
 
     public void updateExpiredItems(Item item){
-        //level 1 - item type
-        if (item.getName().equals("Aged Brie")) {
-            //level 2 - quality
-            if (item.getQuality() < 50) {
-                increaseQualityBy1(item);
-            }
-            //level 1 - item type
+        if (item.getName().equals("Aged Brie") && item.getQuality() < 50) {
+            increaseQualityBy1(item);
         } else if (item.getName().equals("Backstage passes to a TAFKAL80ETC concert")){
             setQualityTo0(item);
-            //level 1 - item type
-        } else {
-            //level 2 - quality
-            if (item.getQuality() > 0) {
-                //level 3 - item type
-
-                reduceQualityBy1(item);
-
-            }
+        } else if (item.getQuality() > 0) {
+            reduceQualityBy1(item);
         }
     }
 }