Refactoring BuilderPattern.

chrish · chrish · commit 141a42cac5de · 2017-10-24T18:00:09.000+08:00
diff --git a/Creational/BuilderPattern/src/io/csie/chris/Main.java b/Creational/BuilderPattern/src/io/csie/chris/Main.java
@@ -1,24 +1,27 @@
 package io.csie.chris;
 
 import io.csie.chris.builder.*;
+import io.csie.chris.builder.common.Builder;
+import io.csie.chris.builder.common.Director;
+import io.csie.chris.builder.common.Product;
 
 public class Main {
 
     public static void main(String args[]) {
 
         // Create director and builders
-        Director tDirector = new Director();
+        Director director = new Director();
 
-        Builder tBuilder1 = new ConcreteBuilder1();
-        Builder tBuilder2 = new ConcreteBuilder2();
+        Builder builder1 = new ConcreteBuilder1();
+        Builder builder2 = new ConcreteBuilder2();
 
         // Construct two products
-        tDirector.Construct(tBuilder1);
-        Product tProduct1 = tBuilder1.GetResult();
-        tProduct1.Show();
+        director.Construct(builder1);
+        Product product1 = builder1.GetResult();
+        product1.Show();
 
-        tDirector.Construct(tBuilder2);
-        Product tProduct2 = tBuilder2.GetResult();
-        tProduct2.Show();
+        director.Construct(builder2);
+        Product product2 = builder2.GetResult();
+        product2.Show();
     }
 }
diff --git a/Creational/BuilderPattern/src/io/csie/chris/builder/ConcreteBuilder1.java b/Creational/BuilderPattern/src/io/csie/chris/builder/ConcreteBuilder1.java
@@ -1,6 +1,10 @@
 package io.csie.chris.builder;
 
+import io.csie.chris.builder.common.Builder;
+import io.csie.chris.builder.common.Product;
+
 public class ConcreteBuilder1 extends Builder {
+
     private Product mProduct = new Product();
 
     public void BuildPartA() {
diff --git a/Creational/BuilderPattern/src/io/csie/chris/builder/ConcreteBuilder2.java b/Creational/BuilderPattern/src/io/csie/chris/builder/ConcreteBuilder2.java
@@ -1,5 +1,8 @@
 package io.csie.chris.builder;
 
+import io.csie.chris.builder.common.Builder;
+import io.csie.chris.builder.common.Product;
+
 public class ConcreteBuilder2 extends Builder {
 
     private Product mProduct = new Product();
diff --git a/Creational/BuilderPattern/src/io/csie/chris/builder/common/Builder.java b/Creational/BuilderPattern/src/io/csie/chris/builder/common/Builder.java
@@ -1,4 +1,4 @@
-package io.csie.chris.builder;
+package io.csie.chris.builder.common;
 
 public abstract class Builder {
 
diff --git a/Creational/BuilderPattern/src/io/csie/chris/builder/common/Director.java b/Creational/BuilderPattern/src/io/csie/chris/builder/common/Director.java
@@ -1,4 +1,4 @@
-package io.csie.chris.builder;
+package io.csie.chris.builder.common;
 
 public class Director {
 
diff --git a/Creational/BuilderPattern/src/io/csie/chris/builder/common/Product.java b/Creational/BuilderPattern/src/io/csie/chris/builder/common/Product.java
@@ -1,10 +1,10 @@
-package io.csie.chris.builder;
+package io.csie.chris.builder.common;
 
 import java.util.ArrayList;
 
 public class Product {
 
-    private ArrayList<String> szParts = new ArrayList<String>();
+    private ArrayList<String> szParts = new ArrayList<>();
 
     public void Add(String pPart) {
         szParts.add(pPart);
@@ -14,6 +14,7 @@ public void Show() {
 
         System.out.println("\nParts on product:");
 
-        for (String szPart : szParts) System.out.println(szPart);
+        for (String szPart : szParts)
+            System.out.println(szPart);
     }
 }
diff --git a/Creational/ProtypePattern/src/io/csie/chris/prototype/Dog.java b/Creational/ProtypePattern/src/io/csie/chris/prototype/Dog.java
@@ -10,7 +10,6 @@ public Dog(String sound) {
         this.sound = sound;
     }
 
-    // Make a copy from io.csie.chris.prototype.common.IPrototype
     @Override
     public IPrototype doClone() {
         return new Dog(sound);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.csie.chris.builder;`
	`1`	`+package io.csie.chris.builder.common;`
`2`	`2`
`3`	`3`	`public abstract class Builder {`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ public Dog(String sound) {`
`10`	`10`	`this.sound = sound;`
`11`	`11`	`}`
`12`	`12`
`13`		`- // Make a copy from io.csie.chris.prototype.common.IPrototype`
`14`	`13`	`@Override`
`15`	`14`	`public IPrototype doClone() {`
`16`	`15`	`return new Dog(sound);`