REFACTORING: Experimenting with separating the patterns and the bluePrintBuilders

Author: makinggoodsoftware

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

@@ -9,6 +9,10 @@ public static <T extends BluePrintPattern> BluePrintPatternBuilder<T> newBluePri
 		return new BluePrintPatternBuilder(name, pattern);
 	}
 
+	public static Blah newBluePrintBuilder(String name) {
+		return new Blah(name);
+	}
+
 	public static class BluePrintPatternBuilder<T extends BluePrintPattern> {
 		private final String name;
 		private final T bluePrintBuilder;
@@ -24,4 +28,30 @@ public T withWireframe(Wireframe wireframe) {
 		}
 	}
 
+	public static class Blah {
+		private final String name;
+
+		public Blah(String name) {
+			this.name = name;
+		}
+
+		public Bleh withWireframe(Wireframe wireframe) {
+			return new Bleh(name, wireframe);
+		}
+	}
+
+	public static class Bleh {
+		private final String name;
+		private final Wireframe wireframe;
+
+		public Bleh(String name, Wireframe wireframe) {
+			this.name = name;
+			this.wireframe = wireframe;
+		}
+
+		public <T extends BluePrintPattern> T withContent(T pattern) {
+			pattern.initialise(name, wireframe);
+			return pattern;
+		}
+	}
 }

invasionII/src/main/java/com/mgs/fantasi/wireframe/Wireframes.java

@@ -15,7 +15,7 @@ public static Wireframe newWireframe(UIPropertiesBuilder uiPropertiesBuilder, Po
 		return new Wireframe(uiPropertiesBuilder.build(), shape);
 	}
 
-	public static Wireframe newRectangularAllUIPropertiesEmptyWireframe() {
+	public static Wireframe rectangularWireframe() {
 		return new Wireframe(allEmptyUIProperties().build(), new NativeRectanguarShape());
 	}
 }

invasionII/src/main/java/com/mgs/invasion/Main.java

@@ -17,7 +17,7 @@
 
 import static com.mgs.fantasi.properties.UIPropertyFactory.uiProperty;
 import static com.mgs.fantasi.structure.BluePrintPatternFactory.newBluePrintBuilder;
-import static com.mgs.fantasi.wireframe.Wireframes.newRectangularAllUIPropertiesEmptyWireframe;
+import static com.mgs.fantasi.wireframe.Wireframes.rectangularWireframe;
 
 public class Main {
 	public static void main(String... args) {
@@ -33,26 +33,27 @@ private void go(UIProfile uiProfile) {
 		UIProperty<Measurement> hexagonMeasurement = uiProperty(Measurements.futureMeasurement(), UIPropertyType.MEASUREMENT);
 
 		BluePrint bluePrint =
-				newBluePrintBuilder("main_frame", new LayeredPattern()).
-						withWireframe(newRectangularAllUIPropertiesEmptyWireframe()).
-						withLayer(
-								newBluePrintBuilder("odd_hexagons", new HexagonRowsPattern()).
-										withWireframe(newRectangularAllUIPropertiesEmptyWireframe()).
-										withNumberOfGenerations(numberOfGenerations).
-										withNumberOfVerticalDivisions(numberOVerticalDivisions).
-										withHexagonSize(hexagonMeasurement)
-						).
-						withLayer(
-								newBluePrintBuilder("even_hexagons", new HexagonRowsPattern()).
-										withWireframe(newRectangularAllUIPropertiesEmptyWireframe()).
-										withNumberOfGenerations(numberOfGenerations).
-										withNumberOfVerticalDivisions(numberOVerticalDivisions).
-										withHexagonSize(hexagonMeasurement)
-						).
-						buildBlueprint();
+				newBluePrintBuilder("main_frame").
+						withWireframe(rectangularWireframe()).
+						withContent(
+								new LayeredPattern().
+										withLayer(
+												newBluePrintBuilder("odd_hexagons", new HexagonRowsPattern()).
+														withWireframe(rectangularWireframe()).
+														withNumberOfGenerations(numberOfGenerations).
+														withNumberOfVerticalDivisions(numberOVerticalDivisions).
+														withHexagonSize(hexagonMeasurement)
+										).
+										withLayer(
+												newBluePrintBuilder("even_hexagons", new HexagonRowsPattern()).
+														withWireframe(rectangularWireframe()).
+														withNumberOfGenerations(numberOfGenerations).
+														withNumberOfVerticalDivisions(numberOVerticalDivisions).
+														withHexagonSize(hexagonMeasurement)
+										)
+						).buildBlueprint();
 		Structure tree = bluePrint.buildStructure();
 
 		uiDriver.show(tree, new Dimension(400, 400), uiProfile);
 	}
-
 }