diff --git a/Java-Approvals/src/main/java/com/gildedrose/GildedRose.java b/Java-Approvals/src/main/java/com/gildedrose/GildedRose.java index 13b365a6..93995fd3 100644 --- a/Java-Approvals/src/main/java/com/gildedrose/GildedRose.java +++ b/Java-Approvals/src/main/java/com/gildedrose/GildedRose.java @@ -12,19 +12,17 @@ class GildedRose { public void updateQuality() { for (int i = 0; i < items.length; i++) { - if (items[i].name.equals(AGED_BRIE) - || items[i].name.equals(BACKSTAGE_PASSES)) { + if (items[i].name.equals(AGED_BRIE)) { + incrementQualityByOne(i); + } else if (items[i].name.equals(BACKSTAGE_PASSES)) { incrementQualityByOne(i); - if (items[i].name.equals(BACKSTAGE_PASSES)) { - if (items[i].sellIn < 11) { - incrementQualityByOne(i); - } - - if (items[i].sellIn < 6) { - incrementQualityByOne(i); - } + if (items[i].sellIn < 6) { + increaseQualityByTwo(i); + } else if (items[i].sellIn < 11) { + incrementQualityByOne(i); } + } else { decreaseQualityByOne(i); } @@ -47,6 +45,11 @@ class GildedRose { } } + private void increaseQualityByTwo(int i) { + incrementQualityByOne(i); + incrementQualityByOne(i); + } + private void decreaseQualityByOne(int i) { if (items[i].quality > 0) { if (!items[i].name.equals(SULFURAS)) {