#108 Consistent package naming throughout the examples

factory-method/src/main/java/com/iluwatar/factory/method/App.java

@@ -1,28 +1,28 @@
-package com.iluwatar.factorymethod;
-
-/**
- * 
- * In Factory Method we have an interface (Blacksmith) with a method for
- * creating objects (manufactureWeapon). The concrete subclasses (OrcBlacksmith,
- * ElfBlacksmith) then override the method to produce objects of their liking.
- * 
- */
-public class App {
-
-	public static void main(String[] args) {
-		Blacksmith blacksmith;
-		Weapon weapon;
-
-		blacksmith = new OrcBlacksmith();
-		weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR);
-		System.out.println(weapon);
-		weapon = blacksmith.manufactureWeapon(WeaponType.AXE);
-		System.out.println(weapon);
-
-		blacksmith = new ElfBlacksmith();
-		weapon = blacksmith.manufactureWeapon(WeaponType.SHORT_SWORD);
-		System.out.println(weapon);
-		weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR);
-		System.out.println(weapon);
-	}
-}
+package com.iluwatar.factory.method;
+
+/**
+ * 
+ * In Factory Method we have an interface (Blacksmith) with a method for
+ * creating objects (manufactureWeapon). The concrete subclasses (OrcBlacksmith,
+ * ElfBlacksmith) then override the method to produce objects of their liking.
+ * 
+ */
+public class App {
+
+	public static void main(String[] args) {
+		Blacksmith blacksmith;
+		Weapon weapon;
+
+		blacksmith = new OrcBlacksmith();
+		weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR);
+		System.out.println(weapon);
+		weapon = blacksmith.manufactureWeapon(WeaponType.AXE);
+		System.out.println(weapon);
+
+		blacksmith = new ElfBlacksmith();
+		weapon = blacksmith.manufactureWeapon(WeaponType.SHORT_SWORD);
+		System.out.println(weapon);
+		weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR);
+		System.out.println(weapon);
+	}
+}

factory-method/src/main/java/com/iluwatar/factory/method/Blacksmith.java

@@ -1,12 +1,12 @@
-package com.iluwatar.factorymethod;
-
-/**
- * 
- * The interface containing method for producing objects.
- * 
- */
-public interface Blacksmith {
-
-	Weapon manufactureWeapon(WeaponType weaponType);
-
-}
+package com.iluwatar.factory.method;
+
+/**
+ * 
+ * The interface containing method for producing objects.
+ * 
+ */
+public interface Blacksmith {
+
+	Weapon manufactureWeapon(WeaponType weaponType);
+
+}

factory-method/src/main/java/com/iluwatar/factory/method/ElfBlacksmith.java

@@ -1,14 +1,14 @@
-package com.iluwatar.factorymethod;
-
-/**
- * 
- * Concrete subclass for creating new objects.
- * 
- */
-public class ElfBlacksmith implements Blacksmith {
-
-	public Weapon manufactureWeapon(WeaponType weaponType) {
-		return new ElfWeapon(weaponType);
-	}
-
-}
+package com.iluwatar.factory.method;
+
+/**
+ * 
+ * Concrete subclass for creating new objects.
+ * 
+ */
+public class ElfBlacksmith implements Blacksmith {
+
+	public Weapon manufactureWeapon(WeaponType weaponType) {
+		return new ElfWeapon(weaponType);
+	}
+
+}

factory-method/src/main/java/com/iluwatar/factory/method/ElfWeapon.java

@@ -1,16 +1,16 @@
-package com.iluwatar.factorymethod;
-
-public class ElfWeapon implements Weapon {
-
-	private WeaponType weaponType;
-
-	public ElfWeapon(WeaponType weaponType) {
-		this.weaponType = weaponType;
-	}
-
-	@Override
-	public String toString() {
-		return "Elven " + weaponType;
-	}
-
-}
+package com.iluwatar.factory.method;
+
+public class ElfWeapon implements Weapon {
+
+	private WeaponType weaponType;
+
+	public ElfWeapon(WeaponType weaponType) {
+		this.weaponType = weaponType;
+	}
+
+	@Override
+	public String toString() {
+		return "Elven " + weaponType;
+	}
+
+}

factory-method/src/main/java/com/iluwatar/factory/method/OrcBlacksmith.java

@@ -1,14 +1,14 @@
-package com.iluwatar.factorymethod;
-
-/**
- * 
- * Concrete subclass for creating new objects.
- * 
- */
-public class OrcBlacksmith implements Blacksmith {
-
-	public Weapon manufactureWeapon(WeaponType weaponType) {
-		return new OrcWeapon(weaponType);
-	}
-
-}
+package com.iluwatar.factory.method;
+
+/**
+ * 
+ * Concrete subclass for creating new objects.
+ * 
+ */
+public class OrcBlacksmith implements Blacksmith {
+
+	public Weapon manufactureWeapon(WeaponType weaponType) {
+		return new OrcWeapon(weaponType);
+	}
+
+}

factory-method/src/main/java/com/iluwatar/factory/method/OrcWeapon.java

@@ -1,16 +1,16 @@
-package com.iluwatar.factorymethod;
-
-public class OrcWeapon implements Weapon {
-
-	private WeaponType weaponType;
-
-	public OrcWeapon(WeaponType weaponType) {
-		this.weaponType = weaponType;
-	}
-
-	@Override
-	public String toString() {
-		return "Orcish " + weaponType;
-	}
-
-}
+package com.iluwatar.factory.method;
+
+public class OrcWeapon implements Weapon {
+
+	private WeaponType weaponType;
+
+	public OrcWeapon(WeaponType weaponType) {
+		this.weaponType = weaponType;
+	}
+
+	@Override
+	public String toString() {
+		return "Orcish " + weaponType;
+	}
+
+}

factory-method/src/main/java/com/iluwatar/factory/method/Weapon.java

@@ -0,0 +1,5 @@
+package com.iluwatar.factory.method;
+
+public interface Weapon {
+
+}

factory-method/src/main/java/com/iluwatar/factory/method/WeaponType.java

@@ -1,17 +1,17 @@
-package com.iluwatar.factorymethod;
-
-public enum WeaponType {
-
-	SHORT_SWORD("short sword"), SPEAR("spear"), AXE("axe"), UNDEFINED("");
-
-    private String title;
-
-    WeaponType(String title) {
-        this.title = title;
-    }
-
-    @Override
-	public String toString() {
-		return title;
-	}
-}
+package com.iluwatar.factory.method;
+
+public enum WeaponType {
+
+	SHORT_SWORD("short sword"), SPEAR("spear"), AXE("axe"), UNDEFINED("");
+
+    private String title;
+
+    WeaponType(String title) {
+        this.title = title;
+    }
+
+    @Override
+	public String toString() {
+		return title;
+	}
+}

factory-method/src/main/java/com/iluwatar/factorymethod/Weapon.java

@@ -1,5 +0,0 @@
-package com.iluwatar.factorymethod;
-
-public interface Weapon {
-
-}

factory-method/src/test/java/com/iluwatar/factory/method/AppTest.java

@@ -1,14 +1,14 @@
-package com.iluwatar.factorymethod;
-
-import org.junit.Test;
-
-import com.iluwatar.factorymethod.App;
-
-public class AppTest {
-
-	@Test
-	public void test() {
-		String[] args = {};
-		App.main(args);
-	}
-}
+package com.iluwatar.factory.method;
+
+import org.junit.Test;
+
+import com.iluwatar.factory.method.App;
+
+public class AppTest {
+
+	@Test
+	public void test() {
+		String[] args = {};
+		App.main(args);
+	}
+}