REFACTORING: Cleaning up....

Author: makinggoodsoftware

invasionII/src/main/java/com/mgs/fantasi/structure/BluePrintBuilderFactory.java

@@ -1,37 +1,36 @@
 package com.mgs.fantasi.structure;
 
 import com.mgs.fantasi.structure.bluePrint.BluePrint;
-import com.mgs.fantasi.structure.bluePrintPatterns.BluePrintBuilderPattern;
+import com.mgs.fantasi.structure.bluePrintPatterns.BluePrintBuilder;
 import com.mgs.fantasi.wireframe.Wireframe;
 
 public abstract class BluePrintBuilderFactory {
 
-	public static BluePrintBuilder newBluePrintBuilder(String name) {
-		return new BluePrintBuilder(name);
+	public static BluePrintBuilderHelper createCanvas(String name) {
+		return new BluePrintBuilderHelper(name);
 	}
 
-	public static class BluePrintBuilder {
+	public static class BluePrintBuilderHelper {
 		private final String name;
 		private Wireframe wireframe;
-		private BluePrintBuilderPattern builderPattern;
+		private BluePrintBuilder builder;
 
-		public BluePrintBuilder(String name) {
+		public BluePrintBuilderHelper(String name) {
 			this.name = name;
 		}
 
-		public BluePrintBuilder withContent(BluePrintBuilderPattern builderPattern) {
-			this.builderPattern = builderPattern;
-			builderPattern.initialise(name, wireframe);
+		public BluePrintBuilderHelper withContent(BluePrintBuilder builder) {
+			this.builder = builder;
 			return this;
 		}
 
-		public BluePrintBuilder withFrame(Wireframe wireframe) {
+		public BluePrintBuilderHelper withFrame(Wireframe wireframe) {
 			this.wireframe = wireframe;
 			return this;
 		}
 
 		public BluePrint build() {
-			return builderPattern.buildBlueprint();
+			return builder.buildBlueprint(name, wireframe);
 		}
 	}
 }

invasionII/src/main/java/com/mgs/fantasi/structure/bluePrintPatterns/BluePrintBuilderPattern.java renamed to invasionII/src/main/java/com/mgs/fantasi/structure/bluePrintPatterns/BluePrintBuilder.java

@@ -3,10 +3,8 @@
 import com.mgs.fantasi.structure.bluePrint.BluePrint;
 import com.mgs.fantasi.wireframe.Wireframe;
 
-public interface BluePrintBuilderPattern {
+public interface BluePrintBuilder {
 
-	void initialise(String name, Wireframe wireframe);
-
-	BluePrint buildBlueprint();
+	BluePrint buildBlueprint(String name, Wireframe wireframe);
 
 }

invasionII/src/main/java/com/mgs/fantasi/structure/bluePrintPatterns/EmptyRectangleBuilder.java

@@ -0,0 +1,12 @@
+package com.mgs.fantasi.structure.bluePrintPatterns;
+
+import com.mgs.fantasi.structure.bluePrint.BluePrint;
+import com.mgs.fantasi.structure.bluePrint.NoChildrenBluePrint;
+import com.mgs.fantasi.wireframe.Wireframe;
+
+public class EmptyRectangleBuilder implements BluePrintBuilder {
+	@Override
+	public BluePrint buildBlueprint(String name, Wireframe wireframe) {
+		return new NoChildrenBluePrint(name, wireframe);
+	}
+}

invasionII/src/main/java/com/mgs/fantasi/structure/bluePrintPatterns/EmptyRectangleBuilderPattern.java

@@ -0,0 +1,30 @@
+package com.mgs.fantasi.structure.bluePrintPatterns;
+
+import com.mgs.fantasi.structure.BluePrintBuilderFactory;
+import com.mgs.fantasi.structure.bluePrint.BluePrint;
+import com.mgs.fantasi.structure.bluePrint.GridBluePrint;
+import com.mgs.fantasi.wireframe.Wireframe;
+
+import java.awt.*;
+
+public class HorizontalRepeaterBuilder implements BluePrintBuilder {
+	private BluePrintBuilderFactory.BluePrintBuilderHelper bluePrintBuilderHelperPattern;
+	private int numberOfGenerations;
+
+	public HorizontalRepeaterBuilder repeating(BluePrintBuilderFactory.BluePrintBuilderHelper bluePrintBuilderHelperPattern) {
+		this.bluePrintBuilderHelperPattern = bluePrintBuilderHelperPattern;
+		return this;
+	}
+
+	public HorizontalRepeaterBuilder repetitions(int numberOfGenerations) {
+		this.numberOfGenerations = numberOfGenerations;
+		return this;
+	}
+
+	@Override
+	public BluePrint buildBlueprint(String name, Wireframe wireframe) {
+		return new GridBluePrint(name, wireframe)
+				.withDimension(new Dimension(1, numberOfGenerations))
+				.allCellsWith(bluePrintBuilderHelperPattern.build());
+	}
+}

invasionII/src/main/java/com/mgs/fantasi/structure/bluePrintPatterns/HorizontalRepeaterBuilder.java

@@ -0,0 +1,34 @@
+package com.mgs.fantasi.structure.bluePrintPatterns;
+
+import com.mgs.fantasi.structure.BluePrintBuilderFactory;
+import com.mgs.fantasi.structure.bluePrint.BluePrint;
+import com.mgs.fantasi.structure.bluePrint.LayeredElementsBluePrint;
+import com.mgs.fantasi.wireframe.Wireframe;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LayeredBuilder implements BluePrintBuilder {
+	private final List<BluePrintBuilderFactory.BluePrintBuilderHelper> layers = new ArrayList<BluePrintBuilderFactory.BluePrintBuilderHelper>();
+
+	private LayeredBuilder() {
+	}
+
+	public static LayeredBuilder layered() {
+		return new LayeredBuilder();
+	}
+
+	public LayeredBuilder withLayer(BluePrintBuilderFactory.BluePrintBuilderHelper layer) {
+		layers.add(layer);
+		return this;
+	}
+
+	@Override
+	public BluePrint buildBlueprint(String name, Wireframe wireframe) {
+		LayeredElementsBluePrint layeredElementsBluePrint = new LayeredElementsBluePrint(name, wireframe);
+		for (BluePrintBuilderFactory.BluePrintBuilderHelper layer : layers) {
+			layeredElementsBluePrint.withLayer(layer.build());
+		}
+		return layeredElementsBluePrint;
+	}
+}

invasionII/src/main/java/com/mgs/fantasi/structure/bluePrintPatterns/HorizontalRepeaterBuilderPattern.java

@@ -9,36 +9,28 @@
 
 import java.awt.*;
 
-public class TwoLinesBuilderPattern implements BluePrintBuilderPattern {
-	private String name;
-	private Wireframe wireframe;
+public class TwoLinesBuilder implements BluePrintBuilder {
 	private Fraction firstLineHeightSizeRatio;
-	private BluePrintBuilderFactory.BluePrintBuilder firstLine;
-	private BluePrintBuilderFactory.BluePrintBuilder secondLine;
+	private BluePrintBuilderFactory.BluePrintBuilderHelper firstLine;
+	private BluePrintBuilderFactory.BluePrintBuilderHelper secondLine;
 
-	public TwoLinesBuilderPattern withFirstLineHeightSizeRatio(Fraction firstLineHeightSizeRatio) {
+	public TwoLinesBuilder withFirstLineHeightSizeRatio(Fraction firstLineHeightSizeRatio) {
 		this.firstLineHeightSizeRatio = firstLineHeightSizeRatio;
 		return this;
 	}
 
-	public TwoLinesBuilderPattern withFirstLineTreeBuilder(BluePrintBuilderFactory.BluePrintBuilder firstLine) {
+	public TwoLinesBuilder withFirstLineTreeBuilder(BluePrintBuilderFactory.BluePrintBuilderHelper firstLine) {
 		this.firstLine = firstLine;
 		return this;
 	}
 
-	public TwoLinesBuilderPattern withSecondLineTreeBuilder(BluePrintBuilderFactory.BluePrintBuilder secondLine) {
+	public TwoLinesBuilder withSecondLineTreeBuilder(BluePrintBuilderFactory.BluePrintBuilderHelper secondLine) {
 		this.secondLine = secondLine;
 		return this;
 	}
 
 	@Override
-	public void initialise(String name, Wireframe wireframe) {
-		this.name = name;
-		this.wireframe = wireframe;
-	}
-
-	@Override
-	public BluePrint buildBlueprint() {
+	public BluePrint buildBlueprint(String name, Wireframe wireframe) {
 		Fraction remainder = Fractions.allWithBase(firstLineHeightSizeRatio.getBase()).minus(firstLineHeightSizeRatio);
 		return new GridBluePrint(name, wireframe)
 				.withDimension(new Dimension(1, 2))

invasionII/src/main/java/com/mgs/fantasi/structure/bluePrintPatterns/LayeredBuilder.java

@@ -0,0 +1,30 @@
+package com.mgs.fantasi.structure.bluePrintPatterns;
+
+import com.mgs.fantasi.structure.BluePrintBuilderFactory;
+import com.mgs.fantasi.structure.bluePrint.BluePrint;
+import com.mgs.fantasi.structure.bluePrint.GridBluePrint;
+import com.mgs.fantasi.wireframe.Wireframe;
+
+import java.awt.*;
+
+public class VerticalRepeaterBuilder implements BluePrintBuilder {
+	private BluePrintBuilderFactory.BluePrintBuilderHelper bluePrintBuilderHelperPattern;
+	private int numberOfGenerations;
+
+	public VerticalRepeaterBuilder repeating(BluePrintBuilderFactory.BluePrintBuilderHelper bluePrintBuilderHelper) {
+		this.bluePrintBuilderHelperPattern = bluePrintBuilderHelper;
+		return this;
+	}
+
+	public VerticalRepeaterBuilder repetitions(int numberOfGenerations) {
+		this.numberOfGenerations = numberOfGenerations;
+		return this;
+	}
+
+	@Override
+	public BluePrint buildBlueprint(String name, Wireframe wireframe) {
+		return new GridBluePrint(name, wireframe)
+				.withDimension(new Dimension(numberOfGenerations, 1))
+				.allCellsWith(bluePrintBuilderHelperPattern.build());
+	}
+}