From 560517343930acab681120036de59a041f879174 Mon Sep 17 00:00:00 2001 From: Ton van Bart Date: Wed, 11 Jan 2017 21:32:08 +0100 Subject: [PATCH] reverted GildedRose to original code --- .../main/java/com/gildedrose/GildedRose.java | 76 ++++++++----------- 1 file changed, 33 insertions(+), 43 deletions(-) diff --git a/Java/src/main/java/com/gildedrose/GildedRose.java b/Java/src/main/java/com/gildedrose/GildedRose.java index a334fa0a..e6feb751 100644 --- a/Java/src/main/java/com/gildedrose/GildedRose.java +++ b/Java/src/main/java/com/gildedrose/GildedRose.java @@ -16,57 +16,47 @@ class GildedRose { items[i].quality = items[i].quality - 1; } } - } else increaseQuality(items[i]); + } else { + if (items[i].quality < 50) { + items[i].quality = items[i].quality + 1; + + if (items[i].name.equals("Backstage passes to a TAFKAL80ETC concert")) { + if (items[i].sellIn < 11) { + if (items[i].quality < 50) { + items[i].quality = items[i].quality + 1; + } + } + + if (items[i].sellIn < 6) { + if (items[i].quality < 50) { + items[i].quality = items[i].quality + 1; + } + } + } + } + } if (!items[i].name.equals("Sulfuras, Hand of Ragnaros")) { items[i].sellIn = items[i].sellIn - 1; } if (items[i].sellIn < 0) { - handlePastSellin(items[i]); - } - } - } - - private void handlePastSellin(Item item) { - if (!item.name.equals("Aged Brie")) { - if (!item.name.equals("Backstage passes to a TAFKAL80ETC concert")) { - if (item.quality > 0) { - if (!item.name.equals("Sulfuras, Hand of Ragnaros")) { - item.quality = item.quality - 1; + if (!items[i].name.equals("Aged Brie")) { + if (!items[i].name.equals("Backstage passes to a TAFKAL80ETC concert")) { + if (items[i].quality > 0) { + if (!items[i].name.equals("Sulfuras, Hand of Ragnaros")) { + items[i].quality = items[i].quality - 1; + } + } + } else { + items[i].quality = items[i].quality - items[i].quality; + } + } else { + if (items[i].quality < 50) { + items[i].quality = items[i].quality + 1; } } - } else { - item.quality = 0; - } - } else { - if (item.quality < 50) { - item.quality = item.quality + 1; } } } - - private void increaseQuality(Item item) { - if (item.quality < 50) { - item.quality = item.quality + 1; - - if (item.name.equals("Backstage passes to a TAFKAL80ETC concert")) { - handleBackstagePass(item); - } - } - } - - private void handleBackstagePass(Item backstagePass) { - if (backstagePass.sellIn < 11) { - if (backstagePass.quality < 50) { - backstagePass.quality = backstagePass.quality + 1; - } - } - - if (backstagePass.sellIn < 6) { - if (backstagePass.quality < 50) { - backstagePass.quality = backstagePass.quality + 1; - } - } - } -} +} \ No newline at end of file