You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/02/20 10:21:09 UTC
svn commit: r1731355 -
/ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java
Author: deepak
Date: Sat Feb 20 09:21:09 2016
New Revision: 1731355
URL: http://svn.apache.org/viewvc?rev=1731355&view=rev
Log:
(OFBIZ-6285) Replace html widget rendering with Macro widget rendering in OutputServices.java file.
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java?rev=1731355&r1=1731354&r2=1731355&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java Sat Feb 20 09:21:09 2016
@@ -62,9 +62,10 @@ import org.ofbiz.entity.util.EntityUtilP
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.ServiceUtil;
import org.ofbiz.webapp.view.ApacheFopWorker;
-import org.ofbiz.widget.renderer.fo.FoFormRenderer;
-import org.ofbiz.widget.renderer.fo.FoScreenRenderer;
import org.ofbiz.widget.renderer.ScreenRenderer;
+import org.ofbiz.widget.renderer.ScreenStringRenderer;
+import org.ofbiz.widget.renderer.fo.FoFormRenderer;
+import org.ofbiz.widget.renderer.macro.MacroScreenRenderer;
/**
@@ -74,7 +75,6 @@ public class OutputServices {
public final static String module = OutputServices.class.getName();
- protected static final FoScreenRenderer foScreenRenderer = new FoScreenRenderer();
protected static final FoFormRenderer foFormRenderer = new FoFormRenderer();
public static final String resource = "ContentUiLabels";
@@ -103,7 +103,10 @@ public class OutputServices {
Writer writer = new StringWriter();
// substitute the freemarker variables...
- ScreenRenderer screensAtt = new ScreenRenderer(writer, screenContextTmp, foScreenRenderer);
+ ScreenStringRenderer foScreenStringRenderer = new MacroScreenRenderer(EntityUtilProperties.getPropertyValue("widget", "screenfop.name", dctx.getDelegator()),
+ EntityUtilProperties.getPropertyValue("widget", "screenfop.screenrenderer", dctx.getDelegator()));
+
+ ScreenRenderer screensAtt = new ScreenRenderer(writer, screenContextTmp, foScreenStringRenderer);
screensAtt.populateContextForService(dctx, screenContext);
screenContextTmp.putAll(screenContext);
screensAtt.getContext().put("formStringRenderer", foFormRenderer);
@@ -212,7 +215,9 @@ public class OutputServices {
Writer writer = new StringWriter();
// substitute the freemarker variables...
- ScreenRenderer screensAtt = new ScreenRenderer(writer, screenContextTmp, foScreenRenderer);
+ ScreenStringRenderer foScreenStringRenderer = new MacroScreenRenderer(EntityUtilProperties.getPropertyValue("widget", "screenfop.name", dctx.getDelegator()),
+ EntityUtilProperties.getPropertyValue("widget", "screenfop.screenrenderer", dctx.getDelegator()));
+ ScreenRenderer screensAtt = new ScreenRenderer(writer, screenContextTmp, foScreenStringRenderer);
screensAtt.populateContextForService(dctx, screenContext);
screenContextTmp.putAll(screenContext);
screensAtt.getContext().put("formStringRenderer", foFormRenderer);