Merge pull request iluwatar#253 from mgalushka/master

iluwatar · iluwatar · commit 6735c81b5260 · 2015-09-23T21:10:35.000+03:00
iluwatar#247 adding getAttackPower method to pattern decorator
diff --git a/decorator/src/main/java/com/iluwatar/decorator/App.java b/decorator/src/main/java/com/iluwatar/decorator/App.java
@@ -23,11 +23,13 @@ public static void main(String[] args) {
 		Hostile troll = new Troll();
 		troll.attack();
 		troll.fleeBattle();
+		System.out.printf("Simple troll power %d.\n", troll.getAttackPower());
 
 		// change the behavior of the simple troll by adding a decorator
 		System.out.println("\nA smart looking troll surprises you.");
 		Hostile smart = new SmartTroll(troll);
 		smart.attack();
 		smart.fleeBattle();
+		System.out.printf("Smart troll power %d.\n", smart.getAttackPower());
 	}
 }
diff --git a/decorator/src/main/java/com/iluwatar/decorator/Hostile.java b/decorator/src/main/java/com/iluwatar/decorator/Hostile.java
@@ -9,6 +9,8 @@ public interface Hostile {
 
 	void attack();
 
+	int getAttackPower();
+
 	void fleeBattle();
 
 }
diff --git a/decorator/src/main/java/com/iluwatar/decorator/SmartTroll.java b/decorator/src/main/java/com/iluwatar/decorator/SmartTroll.java
@@ -21,6 +21,12 @@ public void attack() {
 		decorated.attack();
 	}
 
+	@Override
+	public int getAttackPower() {
+		// decorated troll power + 20 because it is smart
+		return decorated.getAttackPower() + 20;
+	}
+
 	@Override
 	public void fleeBattle() {
 		System.out.println("The troll calls for help!");
diff --git a/decorator/src/main/java/com/iluwatar/decorator/Troll.java b/decorator/src/main/java/com/iluwatar/decorator/Troll.java
@@ -11,6 +11,11 @@ public void attack() {
 		System.out.println("The troll swings at you with a club!");
 	}
 
+	@Override
+	public int getAttackPower() {
+		return 10;
+	}
+
 	public void fleeBattle() {
 		System.out.println("The troll shrieks in horror and runs away!");
 	}

Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,13 @@ public static void main(String[] args) {`
`23`	`23`	`Hostile troll = new Troll();`
`24`	`24`	`troll.attack();`
`25`	`25`	`troll.fleeBattle();`
	`26`	`+ System.out.printf("Simple troll power %d.\n", troll.getAttackPower());`
`26`	`27`
`27`	`28`	`// change the behavior of the simple troll by adding a decorator`
`28`	`29`	`System.out.println("\nA smart looking troll surprises you.");`
`29`	`30`	`Hostile smart = new SmartTroll(troll);`
`30`	`31`	`smart.attack();`
`31`	`32`	`smart.fleeBattle();`
	`33`	`+ System.out.printf("Smart troll power %d.\n", smart.getAttackPower());`
`32`	`34`	`}`
`33`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ public interface Hostile {`
`9`	`9`
`10`	`10`	`void attack();`
`11`	`11`
	`12`	`+ int getAttackPower();`
	`13`	`+`
`12`	`14`	`void fleeBattle();`
`13`	`15`
`14`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,11 @@ public void attack() {`
`11`	`11`	`System.out.println("The troll swings at you with a club!");`
`12`	`12`	`}`
`13`	`13`
	`14`	`+ @Override`
	`15`	`+ public int getAttackPower() {`
	`16`	`+ return 10;`
	`17`	`+ }`
	`18`	`+`
`14`	`19`	`public void fleeBattle() {`
`15`	`20`	`System.out.println("The troll shrieks in horror and runs away!");`
`16`	`21`	`}`