Merge pull request #6 from Decker-Matthew-R/Decker-Refactor-Branch2

Removed adjustment variable
This commit is contained in:
Matt Decker 2022-07-02 12:00:41 -05:00 committed by GitHub
commit 21cb24bf97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,7 +1,7 @@
package com.gildedrose; package com.gildedrose;
class GildedRose { class GildedRose {
public static final String AGED_BRIE = "Aged Brie"; public static final String AGED_BRIE = "Aged Brie";
public static final String SULFURAS = "Sulfuras, Hand of Ragnaros"; public static final String SULFURAS = "Sulfuras, Hand of Ragnaros";
public static final String BACKSTAGE = "Backstage passes to a TAFKAL80ETC concert"; public static final String BACKSTAGE = "Backstage passes to a TAFKAL80ETC concert";
@ -19,26 +19,25 @@ class GildedRose {
} }
private void updateItemQuality(Item item) { private void updateItemQuality(Item item) {
int adjustment;
if (!item.name.equals(AGED_BRIE) if (!item.name.equals(AGED_BRIE)
&& !item.name.equals(BACKSTAGE)) { && !item.name.equals(BACKSTAGE)) {
if (item.quality > 0) { if (item.quality > 0) {
if (!item.name.equals(SULFURAS)) { if (!item.name.equals(SULFURAS)) {
adjustQuality(item, adjustment=-1); adjustQuality(item, -1);
} }
} }
} else { } else {
adjustQuality(item, adjustment=+1); adjustQuality(item, 1);
if (item.name.equals(BACKSTAGE)) { if (item.name.equals(BACKSTAGE)) {
if (item.sellIn < 11) { if (item.sellIn < 11) {
adjustQuality(item, adjustment=1); adjustQuality(item, 1);
} }
if (item.sellIn < 6) { if (item.sellIn < 6) {
adjustQuality(item, adjustment=1); adjustQuality(item, 1);
} }
} }
} }
if (!item.name.equals(SULFURAS)) { if (!item.name.equals(SULFURAS)) {
@ -47,16 +46,16 @@ class GildedRose {
if (item.sellIn < 0) { if (item.sellIn < 0) {
if (!item.name.equals(AGED_BRIE)) { if (!item.name.equals(AGED_BRIE)) {
if (!item.name.equals(BACKSTAGE)) { if (!item.name.equals(BACKSTAGE)) {
if (!item.name.equals(SULFURAS)) { if (!item.name.equals(SULFURAS)) {
adjustQuality(item, adjustment=-1); adjustQuality(item, -1);
} }
} else { } else {
item.quality = item.quality - item.quality; item.quality = item.quality - item.quality;
} }
} else { } else {
int adjustment = 1; int adjustment = 1;
adjustQuality(item, adjustment); adjustQuality(item, adjustment);
} }
} }
} }
@ -66,7 +65,7 @@ class GildedRose {
boolean isValid = newQuality <= 50 && newQuality >= 0; boolean isValid = newQuality <= 50 && newQuality >= 0;
if (isValid) { if (isValid) {
item.quality = newQuality; item.quality = newQuality;
} }
} }
public Item[] getItems() { public Item[] getItems() {