REFACTORING: Removing the JPanelDtoFactory

Author: makinggoodsoftware

invasionII/src/main/java/com/mgs/fantasi/driver/UIDriver.java

@@ -2,7 +2,6 @@
 
 import com.mgs.fantasi.driver.swing.JPanelRenderingManager;
 import com.mgs.fantasi.driver.swing.SwingUIDisplayManager;
-import com.mgs.fantasi.driver.swing.jPanelCreation.JPanelDtoFactory;
 import com.mgs.fantasi.driver.swing.jPanelCreation.JPanelLayoutTranslator;
 import com.mgs.fantasi.profile.UIProfile;
 import com.mgs.fantasi.properties.PaddingDecorator;
@@ -18,15 +17,14 @@ public class UIDriver<T> {
 
 
 	public static UIDriver<JPanel> forSwing() {
-		JPanelLayoutTranslator jPanelLayoutTranslator = new JPanelLayoutTranslator();
-		JPanelDtoFactory jPanelDtoFactory = new JPanelDtoFactory(jPanelLayoutTranslator, new PaddingDecorator());
 
 		return new UIDriver<JPanel>
 				(
 						new SwingUIDisplayManager(),
 						new JPanelRenderingManager(
-								jPanelDtoFactory,
-								new UIPropertiesManager()
+								new UIPropertiesManager(),
+								new JPanelLayoutTranslator(),
+								new PaddingDecorator()
 						)
 				);
 	}

invasionII/src/main/java/com/mgs/fantasi/driver/swing/JPanelRenderingManager.java

@@ -1,11 +1,13 @@
 package com.mgs.fantasi.driver.swing;
 
 import com.mgs.fantasi.driver.RenderingManager;
-import com.mgs.fantasi.driver.swing.jPanelCreation.JPanelDto;
-import com.mgs.fantasi.driver.swing.jPanelCreation.JPanelDtoFactory;
+import com.mgs.fantasi.driver.swing.jPanelCreation.*;
 import com.mgs.fantasi.profile.UIProfile;
+import com.mgs.fantasi.properties.JPanelDecorator;
 import com.mgs.fantasi.properties.UIPropertiesManager;
 import com.mgs.fantasi.properties.UIPropertiesProvider;
+import com.mgs.fantasi.properties.data.Padding;
+import com.mgs.fantasi.properties.data.polygon.PolygonPointsIterator;
 import com.mgs.fantasi.structure.CollocationInfo;
 import com.mgs.fantasi.structure.Structure;
 import com.mgs.fantasi.structure.treeAux.WireframeNode;
@@ -14,13 +16,15 @@
 import java.util.Map;
 
 public class JPanelRenderingManager implements RenderingManager<JPanel> {
-	private final JPanelDtoFactory jPanelDtoFactory;
 	private final UIPropertiesManager uiPropertiesManager;
+	private final JPanelLayoutTranslator jPanelLayoutTranslator;
+	private final JPanelDecorator<Padding> paddingDecorator;
 
 
-	public JPanelRenderingManager(JPanelDtoFactory jPanelDtoFactory, UIPropertiesManager uiPropertiesManager) {
-		this.jPanelDtoFactory = jPanelDtoFactory;
+	public JPanelRenderingManager(UIPropertiesManager uiPropertiesManager, JPanelLayoutTranslator jPanelLayoutTranslator, JPanelDecorator<Padding> paddingDecorator) {
 		this.uiPropertiesManager = uiPropertiesManager;
+		this.jPanelLayoutTranslator = jPanelLayoutTranslator;
+		this.paddingDecorator = paddingDecorator;
 	}
 
 	@Override
@@ -32,7 +36,9 @@ private JPanelDto createDto(Structure structure, UIProfile uiProfile) {
 		WireframeNode root = structure.getRoot();
 
 		UIPropertiesProvider withStylesApplied = uiPropertiesManager.applyStyles(root.getUiProperties(), uiProfile.findStylesFor(root));
-		JPanelDto containerJPanelDto = jPanelDtoFactory.forUIProperties(withStylesApplied, root.getShape());
+		PolygonPointsIterator shape = root.getShape();
+		JPanelFactory jPanelFactory = shape.isRectangular() ? new StandardJPanelFactory() : new NonRectangularJPanelFactory();
+		JPanelDto containerJPanelDto = new JPanelDto(withStylesApplied, jPanelLayoutTranslator, shape, jPanelFactory, paddingDecorator);
 
 		for (Map.Entry<CollocationInfo, Structure> childNode : structure.getChildren().entrySet()) {
 			JPanelDto childJPanelDto = createDto(childNode.getValue(), uiProfile);