From d4b3a30334dd68ea689e43e26f7d2b105bfbc492 Mon Sep 17 00:00:00 2001 From: Ton van Bart Date: Mon, 9 Jan 2017 22:31:26 +0100 Subject: [PATCH 1/3] delete package with weird name --- .../main/java/com.gildedrose/GildedRose.java | 62 ------------------- Java/src/main/java/com.gildedrose/Item.java | 21 ------- 2 files changed, 83 deletions(-) delete mode 100644 Java/src/main/java/com.gildedrose/GildedRose.java delete mode 100644 Java/src/main/java/com.gildedrose/Item.java diff --git a/Java/src/main/java/com.gildedrose/GildedRose.java b/Java/src/main/java/com.gildedrose/GildedRose.java deleted file mode 100644 index 87a3b926..00000000 --- a/Java/src/main/java/com.gildedrose/GildedRose.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.gildedrose; - -class GildedRose { - Item[] items; - - public GildedRose(Item[] items) { - this.items = items; - } - - public void updateQuality() { - for (int i = 0; i < items.length; i++) { - if (!items[i].name.equals("Aged Brie") - && !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 { - 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) { - 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; - } - } - } - } - } -} diff --git a/Java/src/main/java/com.gildedrose/Item.java b/Java/src/main/java/com.gildedrose/Item.java deleted file mode 100644 index 465729ec..00000000 --- a/Java/src/main/java/com.gildedrose/Item.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.gildedrose; - -public class Item { - - public String name; - - public int sellIn; - - public int quality; - - public Item(String name, int sellIn, int quality) { - this.name = name; - this.sellIn = sellIn; - this.quality = quality; - } - - @Override - public String toString() { - return this.name + ", " + this.sellIn + ", " + this.quality; - } -} From b2422cf733fca9803188a7c8f42e7bc5bf63c391 Mon Sep 17 00:00:00 2001 From: Ton van Bart Date: Mon, 9 Jan 2017 22:38:54 +0100 Subject: [PATCH 2/3] delete package with weird name --- .../java/com.gildedrose/GildedRoseTest.java | 17 --------- .../java/com.gildedrose/TexttestFixture.java | 37 ------------------- 2 files changed, 54 deletions(-) delete mode 100644 Java/src/test/java/com.gildedrose/GildedRoseTest.java delete mode 100644 Java/src/test/java/com.gildedrose/TexttestFixture.java diff --git a/Java/src/test/java/com.gildedrose/GildedRoseTest.java b/Java/src/test/java/com.gildedrose/GildedRoseTest.java deleted file mode 100644 index 95bfddc4..00000000 --- a/Java/src/test/java/com.gildedrose/GildedRoseTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.gildedrose; - -import static org.junit.Assert.*; - -import org.junit.Test; - -public class GildedRoseTest { - - @Test - public void foo() { - Item[] items = new Item[] { new Item("foo", 0, 0) }; - GildedRose app = new GildedRose(items); - app.updateQuality(); - assertEquals("fixme", app.items[0].name); - } - -} diff --git a/Java/src/test/java/com.gildedrose/TexttestFixture.java b/Java/src/test/java/com.gildedrose/TexttestFixture.java deleted file mode 100644 index d059c88f..00000000 --- a/Java/src/test/java/com.gildedrose/TexttestFixture.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gildedrose; - -public class TexttestFixture { - public static void main(String[] args) { - System.out.println("OMGHAI!"); - - Item[] items = new Item[] { - new Item("+5 Dexterity Vest", 10, 20), // - new Item("Aged Brie", 2, 0), // - new Item("Elixir of the Mongoose", 5, 7), // - new Item("Sulfuras, Hand of Ragnaros", 0, 80), // - new Item("Sulfuras, Hand of Ragnaros", -1, 80), - new Item("Backstage passes to a TAFKAL80ETC concert", 15, 20), - new Item("Backstage passes to a TAFKAL80ETC concert", 10, 49), - new Item("Backstage passes to a TAFKAL80ETC concert", 5, 49), - // this conjured item does not work properly yet - new Item("Conjured Mana Cake", 3, 6) }; - - GildedRose app = new GildedRose(items); - - int days = 2; - if (args.length > 0) { - days = Integer.parseInt(args[0]) + 1; - } - - for (int i = 0; i < days; i++) { - System.out.println("-------- day " + i + " --------"); - System.out.println("name, sellIn, quality"); - for (Item item : items) { - System.out.println(item); - } - System.out.println(); - app.updateQuality(); - } - } - -} From 560517343930acab681120036de59a041f879174 Mon Sep 17 00:00:00 2001 From: Ton van Bart Date: Wed, 11 Jan 2017 21:32:08 +0100 Subject: [PATCH 3/3] 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