updated flyweight sample

iluwatar · iluwatar · commit f42c34059829 · 2014-08-23T19:13:09.000+03:00
diff --git a/flyweight/src/main/java/com/iluwatar/AlchemistShop.java b/flyweight/src/main/java/com/iluwatar/AlchemistShop.java
@@ -15,20 +15,23 @@ public AlchemistShop() {
 	}
 
 	private void fillShelves() {
-		topShelf.add(new InvisibilityPotion());
-		topShelf.add(new InvisibilityPotion());
-		topShelf.add(new StrengthPotion());
-		topShelf.add(new HealingPotion());
-		topShelf.add(new InvisibilityPotion());
-		topShelf.add(new StrengthPotion());
-		topShelf.add(new HealingPotion());
-		topShelf.add(new HealingPotion());
 		
-		bottomShelf.add(new PoisonPotion());
-		bottomShelf.add(new PoisonPotion());
-		bottomShelf.add(new PoisonPotion());
-		bottomShelf.add(new HolyWaterPotion());
-		bottomShelf.add(new HolyWaterPotion());
+		PotionFactory factory = new PotionFactory();
+		
+		topShelf.add(factory.createPotion(PotionType.INVISIBILITY));
+		topShelf.add(factory.createPotion(PotionType.INVISIBILITY));
+		topShelf.add(factory.createPotion(PotionType.STRENGTH));
+		topShelf.add(factory.createPotion(PotionType.HEALING));
+		topShelf.add(factory.createPotion(PotionType.INVISIBILITY));
+		topShelf.add(factory.createPotion(PotionType.STRENGTH));
+		topShelf.add(factory.createPotion(PotionType.HEALING));
+		topShelf.add(factory.createPotion(PotionType.HEALING));
+		
+		bottomShelf.add(factory.createPotion(PotionType.POISON));
+		bottomShelf.add(factory.createPotion(PotionType.POISON));
+		bottomShelf.add(factory.createPotion(PotionType.POISON));
+		bottomShelf.add(factory.createPotion(PotionType.HOLY_WATER));
+		bottomShelf.add(factory.createPotion(PotionType.HOLY_WATER));
 	}
 	
 	public void enumerate() {
diff --git a/flyweight/src/main/java/com/iluwatar/HealingPotion.java b/flyweight/src/main/java/com/iluwatar/HealingPotion.java
@@ -4,7 +4,7 @@ public class HealingPotion implements Potion {
 
 	@Override
 	public void drink() {
-		System.out.println("You feel healed.");
+		System.out.println("You feel healed. (Potion=" + System.identityHashCode(this) + ")");
 	}
 
 }
diff --git a/flyweight/src/main/java/com/iluwatar/HolyWaterPotion.java b/flyweight/src/main/java/com/iluwatar/HolyWaterPotion.java
@@ -4,7 +4,7 @@ public class HolyWaterPotion implements Potion {
 
 	@Override
 	public void drink() {
-		System.out.println("You feel blessed.");
+		System.out.println("You feel blessed. (Potion=" + System.identityHashCode(this) + ")");
 	}
 
 }
diff --git a/flyweight/src/main/java/com/iluwatar/InvisibilityPotion.java b/flyweight/src/main/java/com/iluwatar/InvisibilityPotion.java
@@ -4,7 +4,7 @@ public class InvisibilityPotion implements Potion {
 
 	@Override
 	public void drink() {
-		System.out.println("You become invisible.");
+		System.out.println("You become invisible. (Potion=" + System.identityHashCode(this) + ")");
 	}
 
 }
diff --git a/flyweight/src/main/java/com/iluwatar/PoisonPotion.java b/flyweight/src/main/java/com/iluwatar/PoisonPotion.java
@@ -4,7 +4,7 @@ public class PoisonPotion implements Potion {
 
 	@Override
 	public void drink() {
-		System.out.println("Urgh! This is poisonous.");
+		System.out.println("Urgh! This is poisonous. (Potion=" + System.identityHashCode(this) + ")");
 	}
 
 }
diff --git a/flyweight/src/main/java/com/iluwatar/PotionFactory.java b/flyweight/src/main/java/com/iluwatar/PotionFactory.java
@@ -16,18 +16,23 @@ Potion createPotion(PotionType type) {
 			switch (type) {
 			case HEALING:
 				potion = new HealingPotion();
+				potions.put(type, potion);
 				break;
 			case HOLY_WATER:
 				potion = new HolyWaterPotion();
+				potions.put(type, potion);
 				break;
 			case INVISIBILITY:
 				potion = new InvisibilityPotion();
+				potions.put(type, potion);
 				break;
 			case POISON:
 				potion = new PoisonPotion();
+				potions.put(type, potion);
 				break;
 			case STRENGTH:
 				potion = new StrengthPotion();
+				potions.put(type, potion);
 				break;
 			default:
 				break;
diff --git a/flyweight/src/main/java/com/iluwatar/StrengthPotion.java b/flyweight/src/main/java/com/iluwatar/StrengthPotion.java
@@ -4,7 +4,7 @@ public class StrengthPotion implements Potion {
 
 	@Override
 	public void drink() {
-		System.out.println("You feel strong.");
+		System.out.println("You feel strong. (Potion=" + System.identityHashCode(this) + ")");
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ public class HealingPotion implements Potion {`
`4`	`4`
`5`	`5`	`@Override`
`6`	`6`	`public void drink() {`
`7`		`- System.out.println("You feel healed.");`
	`7`	`+ System.out.println("You feel healed. (Potion=" + System.identityHashCode(this) + ")");`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ public class HolyWaterPotion implements Potion {`
`4`	`4`
`5`	`5`	`@Override`
`6`	`6`	`public void drink() {`
`7`		`- System.out.println("You feel blessed.");`
	`7`	`+ System.out.println("You feel blessed. (Potion=" + System.identityHashCode(this) + ")");`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ public class InvisibilityPotion implements Potion {`
`4`	`4`
`5`	`5`	`@Override`
`6`	`6`	`public void drink() {`
`7`		`- System.out.println("You become invisible.");`
	`7`	`+ System.out.println("You become invisible. (Potion=" + System.identityHashCode(this) + ")");`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ public class PoisonPotion implements Potion {`
`4`	`4`
`5`	`5`	`@Override`
`6`	`6`	`public void drink() {`
`7`		`- System.out.println("Urgh! This is poisonous.");`
	`7`	`+ System.out.println("Urgh! This is poisonous. (Potion=" + System.identityHashCode(this) + ")");`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ public class StrengthPotion implements Potion {`
`4`	`4`
`5`	`5`	`@Override`
`6`	`6`	`public void drink() {`
`7`		`- System.out.println("You feel strong.");`
	`7`	`+ System.out.println("You feel strong. (Potion=" + System.identityHashCode(this) + ")");`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`}`