Merge pull request #5 from Decker-Matthew-R/cpage2

further refactor
This commit is contained in:
Matt Decker 2022-07-02 11:51:34 -05:00 committed by GitHub
commit ab3cdd3980
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -19,31 +19,26 @@ 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)) {
item.quality = item.quality - 1; adjustQuality(item, adjustment=-1);
} }
} }
} else { } else {
if (item.quality < 50) { adjustQuality(item, adjustment=+1);
item.quality = item.quality + 1;
if (item.name.equals(BACKSTAGE)) { if (item.name.equals(BACKSTAGE)) {
if (item.sellIn < 11) { if (item.sellIn < 11) {
if (item.quality < 50) { adjustQuality(item, adjustment=1);
item.quality = item.quality + 1;
}
}
if (item.sellIn < 6) {
if (item.quality < 50) {
item.quality = item.quality + 1;
}
}
} }
}
if (item.sellIn < 6) {
adjustQuality(item, adjustment=1);
}
}
} }
if (!item.name.equals(SULFURAS)) { if (!item.name.equals(SULFURAS)) {
@ -52,26 +47,26 @@ 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.quality > 0) { if (!item.name.equals(SULFURAS)) {
if (!item.name.equals(SULFURAS)) { adjustQuality(item, adjustment=-1);
item.quality = item.quality - 1; }
}
}
} else { } else {
item.quality = item.quality - item.quality; item.quality = item.quality - item.quality;
} }
} else { } else {
if (item.quality < 50) { int adjustment = 1;
int adjustment = 1; adjustQuality(item, adjustment);
adjustQuality(item, adjustment);
}
} }
} }
} }
public void adjustQuality(Item item, int adjustment) { public void adjustQuality(Item item, int adjustment) {
item.quality = item.quality + adjustment; int newQuality = item.quality + adjustment;
boolean isValid = newQuality <= 50 && newQuality >= 0;
if (isValid) {
item.quality = newQuality;
}
} }
public Item[] getItems() { public Item[] getItems() {