Skip to content

Refactoring #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
klampela wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Refactoring #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c81ed6f
Baseline OK, All test Passed!
Oct 18, 2016
dc4434c
Refactoring, all test OK
Oct 18, 2016
e1619dc
Refactoring OK
Oct 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bin/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/fi/
Binary file modified bin/fi/oulu/tol/sqat/GildedRose.class
View file
Open in desktop
Binary file not shown.
Binary file modified bin/fi/oulu/tol/sqat/tests/GildedRoseTest.class
View file
Open in desktop
Binary file not shown.
211 changes: 142 additions & 69 deletions src/fi/oulu/tol/sqat/GildedRose.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package fi.oulu.tol.sqat;

//Refactoring KLA 18.10.2016


import java.util.ArrayList;
import java.util.List;

Expand All @@ -8,6 +11,100 @@ public class GildedRose {

private static List<Item> items = null;

public void addItem(Item item) {
// TODO Auto-generated method stub

items.add(item);
}

public GildedRose(){
items = new ArrayList<Item>();
}
public List<Item> getItems() {

return items;
}

public void updateEndOfDay() {
{
for (int i = 0; i < items.size(); i++)
{
eguals_Aged_or_TAFKAL80ETC_getItemAndQuality(i);

equals_Sulfuras_getItems_SetSell(i);
}
}
}

private static void eguals_Aged_or_TAFKAL80ETC_getItemAndQuality(int i) {
if ((!"Aged Brie".equals(items.get(i).getName())) && !"Backstage passes to a TAFKAL80ETC concert".equals(items.get(i).getName()))
getItems_QualityMore0(i);
else
{
getQualityLess50(i);
}
}

private static void equals_Sulfuras_getItems_SetSell(int i) {
if (!"Sulfuras, Hand of Ragnaros".equals(items.get(i).getName()))
setSellminus1(i);

getSellInLess0(i);
}

private static void getItems_QualityMore0(int i) {
{
if (items.get(i).getQuality() > 0)
sulfurasSetQualityminus1(i);
}
}

private static void getQualityLess50(int i) {
if (items.get(i).getQuality() < 50)
{
setQualityPlus1(i);

egual_TAFKAL80ETC(i);
}
}

private static void getSellInLess0(int i) {
if (items.get(i).getSellIn() < 0)
{
if (!"Aged Brie".equals(items.get(i).getName()))
{
equals_TAFKAL80ETC_setQualityOrDropQuality(i);
} else
getQualityLess50setQualityplus1(i);
}
}

private static void equals_TAFKAL80ETC_setQualityOrDropQuality(int i) {
if (!"Backstage passes to a TAFKAL80ETC concert".equals(items.get(i).getName()))
getItems_QualityMore0(i);
else
dropQualityZero(i);
}

private static void setSellminus1(int i) {
{
items.get(i).setSellIn(items.get(i).getSellIn() - 1);
}
}

private static void egual_TAFKAL80ETC(int i) {
if ("Backstage passes to a TAFKAL80ETC concert".equals(items.get(i).getName()))
{
if (items.get(i).getSellIn() < 11)
getQualityLess50setQualityplus1(i);

if (items.get(i).getSellIn() < 6)
getQualityLess50setQualityplus1(i);
}
}



/**
* @param args
*/
Expand All @@ -32,76 +129,52 @@ public static void updateQuality()
{
for (int i = 0; i < items.size(); i++)
{
if ((!"Aged Brie".equals(items.get(i).getName())) && !"Backstage passes to a TAFKAL80ETC concert".equals(items.get(i).getName()))
{
if (items.get(i).getQuality() > 0)
{
if (!"Sulfuras, Hand of Ragnaros".equals(items.get(i).getName()))
{
items.get(i).setQuality(items.get(i).getQuality() - 1);
}
}
}
else
{
if (items.get(i).getQuality() < 50)
{
items.get(i).setQuality(items.get(i).getQuality() + 1);

if ("Backstage passes to a TAFKAL80ETC concert".equals(items.get(i).getName()))
{
if (items.get(i).getSellIn() < 11)
{
if (items.get(i).getQuality() < 50)
{
items.get(i).setQuality(items.get(i).getQuality() + 1);
}
}

if (items.get(i).getSellIn() < 6)
{
if (items.get(i).getQuality() < 50)
{
items.get(i).setQuality(items.get(i).getQuality() + 1);
}
}
}
}
}

if (!"Sulfuras, Hand of Ragnaros".equals(items.get(i).getName()))
{
items.get(i).setSellIn(items.get(i).getSellIn() - 1);
}

if (items.get(i).getSellIn() < 0)
{
if (!"Aged Brie".equals(items.get(i).getName()))
{
if (!"Backstage passes to a TAFKAL80ETC concert".equals(items.get(i).getName()))
{
if (items.get(i).getQuality() > 0)
{
if (!"Sulfuras, Hand of Ragnaros".equals(items.get(i).getName()))
{
items.get(i).setQuality(items.get(i).getQuality() - 1);
}
}
}
else
{
items.get(i).setQuality(items.get(i).getQuality() - items.get(i).getQuality());
}
}
else
{
if (items.get(i).getQuality() < 50)
{
items.get(i).setQuality(items.get(i).getQuality() + 1);
}
}
}
eguals_Aged_or_TAFKAL80ETC_getItemAndQuality(i);

equals_Sulfuras_getItems_SetSell(i);
}
}

private static void setQualityPlus1(int i) {
items.get(i).setQuality(items.get(i).getQuality() + 1);
}

private static void dropQualityZero(int i) {
{
items.get(i).setQuality(items.get(i).getQuality() - items.get(i).getQuality());
}
}

private static void getQualityLess50setQualityplus1(int i) {
{
if (items.get(i).getQuality() < 50)
setQualityplus1(i);
}
}

private static void sulfurasSetQualityminus1(int i) {
{
if (!"Sulfuras, Hand of Ragnaros".equals(items.get(i).getName()))
setQualityminus1(i);
}
}

private static void setQualityminus1(int i) {
{
items.get(i).setQuality(items.get(i).getQuality() - 1);
}
}

private static void setQualityplus1(int i) {
{
setQualityPlus1(i);
}
}







}
Loading