[refactor] Remove unnecessary declarations in servant pattern.

This commit is contained in:
ruslanpa
2015-02-10 09:57:22 +02:00
parent 300c8dfad4
commit 4b432a79d9
4 changed files with 107 additions and 99 deletions

View File

@ -10,44 +10,42 @@ import java.util.ArrayList;
* *
*/ */
public class App { public class App {
static Servant jenkins = new Servant("Jenkins"); static Servant jenkins = new Servant("Jenkins");
static Servant travis = new Servant("Travis"); static Servant travis = new Servant("Travis");
public static void main( String[] args ){ public static void main(String[] args) {
scenario(jenkins, 1); scenario(jenkins, 1);
scenario(travis, 0); scenario(travis, 0);
} }
/* /*
* Can add a List with enum Actions for variable scenarios * Can add a List with enum Actions for variable scenarios
* */ * */
public static void scenario(Servant servant, int compliment){ public static void scenario(Servant servant, int compliment) {
King k = new King(); King k = new King();
Queen q = new Queen(); Queen q = new Queen();
ArrayList<Royalty> guests = new ArrayList<>(); ArrayList<Royalty> guests = new ArrayList<>();
guests.add(k); guests.add(k);
guests.add(q); guests.add(q);
//feed //feed
servant.feed(k); servant.feed(k);
servant.feed(q); servant.feed(q);
//serve drinks //serve drinks
servant.giveWine(k); servant.giveWine(k);
servant.giveWine(q); servant.giveWine(q);
//compliment //compliment
servant.GiveCompliments( guests.get(compliment) ); servant.GiveCompliments(guests.get(compliment));
//outcome of the night
for(Royalty r : guests)
r.changeMood();
//check your luck
if( servant.checkIfYouWillBeHanged(guests) )
System.out.println(servant.name + " will live another day");
else
System.out.println("Poor " + servant.name + ". His days are numbered");
}
//outcome of the night
for (Royalty r : guests)
r.changeMood();
//check your luck
if (servant.checkIfYouWillBeHanged(guests))
System.out.println(servant.name + " will live another day");
else
System.out.println("Poor " + servant.name + ". His days are numbered");
}
} }

View File

@ -1,31 +1,33 @@
package com.iluwatar; package com.iluwatar;
public class King implements Royalty{ public class King implements Royalty {
private boolean isDrunk = false, isHungry = true, isHappy = false; private boolean isDrunk;
private boolean complimentReceived = false; private boolean isHungry = true;
private boolean isHappy;
private boolean complimentReceived;
@Override @Override
public void getFed() { public void getFed() {
isHungry = false; isHungry = false;
} }
@Override @Override
public void getDrink() { public void getDrink() {
isDrunk = true; isDrunk = true;
} }
public void receiveCompliments(){ public void receiveCompliments() {
complimentReceived = true; complimentReceived = true;
} }
@Override @Override
public void changeMood() { public void changeMood() {
if(!isHungry && isDrunk) isHappy = true; if (!isHungry && isDrunk) isHappy = true;
if( complimentReceived ) isHappy = false; if (complimentReceived) isHappy = false;
} }
@Override @Override
public boolean getMood() { public boolean getMood() {
return isHappy; return isHappy;
} }
} }

View File

@ -1,35 +1,38 @@
package com.iluwatar; package com.iluwatar;
public class Queen implements Royalty{ public class Queen implements Royalty {
private boolean isDrunk = true, isHungry = false, isHappy = false; private boolean isDrunk = true;
private boolean isFlirty = true, complimentReceived = false; private boolean isHungry;
private boolean isHappy;
private boolean isFlirty = true;
private boolean complimentReceived;
@Override @Override
public void getFed() { public void getFed() {
isHungry = false; isHungry = false;
} }
@Override @Override
public void getDrink() { public void getDrink() {
isDrunk = true; isDrunk = true;
} }
public void receiveCompliments(){ public void receiveCompliments() {
complimentReceived = true; complimentReceived = true;
} }
@Override @Override
public void changeMood() { public void changeMood() {
if( complimentReceived && isFlirty && isDrunk ) isHappy = true; if (complimentReceived && isFlirty && isDrunk) isHappy = true;
} }
@Override @Override
public boolean getMood() { public boolean getMood() {
return isHappy; return isHappy;
} }
public void setFlirtiness(boolean f){ public void setFlirtiness(boolean f) {
this.isFlirty = f; this.isFlirty = f;
} }
} }

View File

@ -1,9 +1,14 @@
package com.iluwatar; package com.iluwatar;
interface Royalty { interface Royalty {
public void getFed();
public void getDrink(); void getFed();
public void changeMood();
public void receiveCompliments(); void getDrink();
public boolean getMood();
void changeMood();
void receiveCompliments();
boolean getMood();
} }