diff --git a/Java/src/main/java/com/gildedrose/GildedRose.java b/Java/src/main/java/com/gildedrose/GildedRose.java index e17f2733..2d9fac85 100644 --- a/Java/src/main/java/com/gildedrose/GildedRose.java +++ b/Java/src/main/java/com/gildedrose/GildedRose.java @@ -15,55 +15,39 @@ class GildedRose { if (!isAgedBrie && !passesToTafkalConcert) { if (item.quality > 0 && !isSulfuras) { - deductOneFromQuality(item); + item.deductOneFromQuality(); } } else if(item.quality < 50) { - addOneToQuality(item); + item.addOneToQuality(); if (passesToTafkalConcert) { if (item.sellIn < 11 && item.quality < 50) { - addOneToQuality(item); + item.addOneToQuality(); } if (item.sellIn < 6 && item.quality < 50) { - addOneToQuality(item); + item.addOneToQuality(); } } } if (!isSulfuras) { - deductSellIn(item); + item.deductSellIn(); } if (item.sellIn < 0) { if (!isAgedBrie) { if (!passesToTafkalConcert) { if (item.quality > 0 && !isSulfuras) { - deductOneFromQuality(item); + item.deductOneFromQuality(); } } else { - setQualityToZero(item); + item.setQualityToZero(); } } else if ((item.quality < 50)) { - addOneToQuality(item); + item.addOneToQuality(); } } } } - - public void setQualityToZero(Item item) { - item.quality = 0; - } - - public void deductSellIn(Item item) { - item.sellIn--; - } - - public void addOneToQuality(Item item) { - item.quality++; - } - - public void deductOneFromQuality(Item item) { - item.quality--; - } } diff --git a/Java/src/main/java/com/gildedrose/Item.java b/Java/src/main/java/com/gildedrose/Item.java index 0abe7da0..85c5d284 100644 --- a/Java/src/main/java/com/gildedrose/Item.java +++ b/Java/src/main/java/com/gildedrose/Item.java @@ -18,6 +18,22 @@ public class Item { return name; } + public void setQualityToZero() { + quality = 0; + } + + public void deductSellIn() { + sellIn--; + } + + public void addOneToQuality() { + quality++; + } + + public void deductOneFromQuality() { + quality--; + } + @Override public String toString() { return this.name + ", " + this.sellIn + ", " + this.quality;