[refactor] Remove unnecessary declarations in servant pattern.
This commit is contained in:
@ -13,7 +13,7 @@ public class App {
|
||||
static Servant jenkins = new Servant("Jenkins");
|
||||
static Servant travis = new Servant("Travis");
|
||||
|
||||
public static void main( String[] args ){
|
||||
public static void main(String[] args) {
|
||||
scenario(jenkins, 1);
|
||||
scenario(travis, 0);
|
||||
}
|
||||
@ -21,7 +21,7 @@ public class App {
|
||||
/*
|
||||
* 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();
|
||||
Queen q = new Queen();
|
||||
|
||||
@ -36,18 +36,16 @@ public class App {
|
||||
servant.giveWine(k);
|
||||
servant.giveWine(q);
|
||||
//compliment
|
||||
servant.GiveCompliments( guests.get(compliment) );
|
||||
servant.GiveCompliments(guests.get(compliment));
|
||||
|
||||
//outcome of the night
|
||||
for(Royalty r : guests)
|
||||
for (Royalty r : guests)
|
||||
r.changeMood();
|
||||
|
||||
//check your luck
|
||||
if( servant.checkIfYouWillBeHanged(guests) )
|
||||
if (servant.checkIfYouWillBeHanged(guests))
|
||||
System.out.println(servant.name + " will live another day");
|
||||
else
|
||||
System.out.println("Poor " + servant.name + ". His days are numbered");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@ -1,8 +1,10 @@
|
||||
package com.iluwatar;
|
||||
|
||||
public class King implements Royalty{
|
||||
private boolean isDrunk = false, isHungry = true, isHappy = false;
|
||||
private boolean complimentReceived = false;
|
||||
public class King implements Royalty {
|
||||
private boolean isDrunk;
|
||||
private boolean isHungry = true;
|
||||
private boolean isHappy;
|
||||
private boolean complimentReceived;
|
||||
|
||||
@Override
|
||||
public void getFed() {
|
||||
@ -14,14 +16,14 @@ public class King implements Royalty{
|
||||
isDrunk = true;
|
||||
}
|
||||
|
||||
public void receiveCompliments(){
|
||||
public void receiveCompliments() {
|
||||
complimentReceived = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void changeMood() {
|
||||
if(!isHungry && isDrunk) isHappy = true;
|
||||
if( complimentReceived ) isHappy = false;
|
||||
if (!isHungry && isDrunk) isHappy = true;
|
||||
if (complimentReceived) isHappy = false;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -1,8 +1,11 @@
|
||||
package com.iluwatar;
|
||||
|
||||
public class Queen implements Royalty{
|
||||
private boolean isDrunk = true, isHungry = false, isHappy = false;
|
||||
private boolean isFlirty = true, complimentReceived = false;
|
||||
public class Queen implements Royalty {
|
||||
private boolean isDrunk = true;
|
||||
private boolean isHungry;
|
||||
private boolean isHappy;
|
||||
private boolean isFlirty = true;
|
||||
private boolean complimentReceived;
|
||||
|
||||
@Override
|
||||
public void getFed() {
|
||||
@ -14,13 +17,13 @@ public class Queen implements Royalty{
|
||||
isDrunk = true;
|
||||
}
|
||||
|
||||
public void receiveCompliments(){
|
||||
public void receiveCompliments() {
|
||||
complimentReceived = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void changeMood() {
|
||||
if( complimentReceived && isFlirty && isDrunk ) isHappy = true;
|
||||
if (complimentReceived && isFlirty && isDrunk) isHappy = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -28,7 +31,7 @@ public class Queen implements Royalty{
|
||||
return isHappy;
|
||||
}
|
||||
|
||||
public void setFlirtiness(boolean f){
|
||||
public void setFlirtiness(boolean f) {
|
||||
this.isFlirty = f;
|
||||
}
|
||||
|
||||
|
@ -1,9 +1,14 @@
|
||||
package com.iluwatar;
|
||||
|
||||
interface Royalty {
|
||||
public void getFed();
|
||||
public void getDrink();
|
||||
public void changeMood();
|
||||
public void receiveCompliments();
|
||||
public boolean getMood();
|
||||
|
||||
void getFed();
|
||||
|
||||
void getDrink();
|
||||
|
||||
void changeMood();
|
||||
|
||||
void receiveCompliments();
|
||||
|
||||
boolean getMood();
|
||||
}
|
||||
|
Reference in New Issue
Block a user