From 0cb4b53cb41b14fc1c8a38c740f62ea6170bf608 Mon Sep 17 00:00:00 2001 From: Sallah Kokaina Date: Fri, 1 Nov 2019 19:17:17 +0100 Subject: [PATCH] move specific logic to backstage item --- Java/README.md | 4 ++-- Java/src/main/java/com/gildedrose/GildedRose.java | 3 --- .../main/java/com/gildedrose/item/Backstage.java | 13 +++++++++++++ Java/src/main/java/com/gildedrose/item/Item.java | 10 ---------- .../src/main/java/com/gildedrose/item/Sulfuras.java | 6 ------ 5 files changed, 15 insertions(+), 21 deletions(-) diff --git a/Java/README.md b/Java/README.md index 725b6ac8..d64e55d1 100644 --- a/Java/README.md +++ b/Java/README.md @@ -28,7 +28,7 @@ -[x] long method -[ ] plain logic -[ ] complex operations --[ ] Item properties are public +-[x] Item properties are public -[x] multiple access by index ## Refactoring actions @@ -39,5 +39,5 @@ -[x] extract boolean methods -[x] encapsulate methods -[ ] isolate specific logics --[ ] move specific logic to backstage +-[x] move specific logic to backstage -[x] replace items by specific objects in tests diff --git a/Java/src/main/java/com/gildedrose/GildedRose.java b/Java/src/main/java/com/gildedrose/GildedRose.java index 17c2dc7f..7bdba68d 100644 --- a/Java/src/main/java/com/gildedrose/GildedRose.java +++ b/Java/src/main/java/com/gildedrose/GildedRose.java @@ -55,9 +55,6 @@ class GildedRose { private void increaseQuality(Item item) { item.increaseQuality(); - if (item.name.equals(Backstage.BACKSTAGE)) { - item.increaseBackstageQuality(); - } } private void updateSellIn(Item item) { diff --git a/Java/src/main/java/com/gildedrose/item/Backstage.java b/Java/src/main/java/com/gildedrose/item/Backstage.java index 958c44e3..f2c3ee16 100644 --- a/Java/src/main/java/com/gildedrose/item/Backstage.java +++ b/Java/src/main/java/com/gildedrose/item/Backstage.java @@ -7,4 +7,17 @@ public class Backstage extends Item { public Backstage(int sellIn, int quality) { super(BACKSTAGE, sellIn, quality); } + + @Override + public void increaseQuality() { + super.increaseQuality(); + + if (this.sellIn < 11 && this.quality < 50) { + super.increaseQuality(); + } + + if (this.sellIn < 6 && this.quality < 50) { + super.increaseQuality(); + } + } } diff --git a/Java/src/main/java/com/gildedrose/item/Item.java b/Java/src/main/java/com/gildedrose/item/Item.java index 704a3f20..4a9d2bd2 100644 --- a/Java/src/main/java/com/gildedrose/item/Item.java +++ b/Java/src/main/java/com/gildedrose/item/Item.java @@ -26,14 +26,4 @@ public class Item { public void increaseQuality() { this.quality = this.quality + 1; } - - public void increaseBackstageQuality() { - if (this.sellIn < 11 && this.quality < 50) { - this.increaseQuality(); - } - - if (this.sellIn < 6 && this.quality < 50) { - this.increaseQuality(); - } - } } diff --git a/Java/src/main/java/com/gildedrose/item/Sulfuras.java b/Java/src/main/java/com/gildedrose/item/Sulfuras.java index da61c598..b065dcc4 100644 --- a/Java/src/main/java/com/gildedrose/item/Sulfuras.java +++ b/Java/src/main/java/com/gildedrose/item/Sulfuras.java @@ -7,10 +7,4 @@ public class Sulfuras extends Item { public Sulfuras(int sellIn, int quality) { super(SULFURAS, sellIn, quality); } - - /*@Override - public void increaseQuality() { - - super.increaseQuality(); - }*/ }