svn commit: r1731350 - in /ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis: OagisServices.java OagisShipmentServices.java

[deepak]

Author: deepak
Date: Sat Feb 20 09:05:40 2016
New Revision: 1731350

URL: http://svn.apache.org/viewvc?rev=1731350&view=rev
Log:
(OFBIZ-6289) Replace html widget rendering with Macro widget rendering in Oagis 
classes.

Modified:
    ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java
    
ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java

Modified: 
ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java?rev=1731350&r1=1731349&r2=1731350&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java 
(original)
+++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java Sat 
Feb 20 09:05:40 2016
@@ -63,8 +63,8 @@ import org.ofbiz.service.GenericServiceE
 import org.ofbiz.service.LocalDispatcher;
 import org.ofbiz.service.ServiceUtil;
 import org.ofbiz.widget.renderer.ScreenRenderer;
-import org.ofbiz.widget.renderer.fo.FoFormRenderer;
-import org.ofbiz.widget.renderer.html.HtmlScreenRenderer;
+import org.ofbiz.widget.renderer.ScreenStringRenderer;
+import org.ofbiz.widget.renderer.macro.MacroScreenRenderer;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
@@ -73,9 +73,6 @@ public class OagisServices {
 
     public static final String module = OagisServices.class.getName();
 
-    protected static final HtmlScreenRenderer htmlScreenRenderer = new 
HtmlScreenRenderer();
-    protected static final FoFormRenderer foFormRenderer = new 
FoFormRenderer();
-
     public static final SimpleDateFormat isoDateFormat = new 
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSS'Z'Z");
     public static final SimpleDateFormat isoDateFormatNoTzValue = new 
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSS'Z'");
 
@@ -190,7 +187,9 @@ public class OagisServices {
         String outText = null;
         try {
             Writer writer = new StringWriter();
-            ScreenRenderer screens = new ScreenRenderer(writer, 
bodyParameters, new HtmlScreenRenderer());
+            ScreenStringRenderer screenStringRenderer = new 
MacroScreenRenderer(EntityUtilProperties.getPropertyValue("widget", 
"screen.name", delegator),
+                    EntityUtilProperties.getPropertyValue("widget", 
"screen.screenrenderer", delegator));
+            ScreenRenderer screens = new ScreenRenderer(writer, 
bodyParameters, screenStringRenderer);
             screens.render(bodyScreenUri);
             writer.close();
             outText = writer.toString();

Modified: 
ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java?rev=1731350&r1=1731349&r2=1731350&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java 
(original)
+++ 
ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java 
Sat Feb 20 09:05:40 2016
@@ -61,8 +61,8 @@ import org.ofbiz.service.GenericServiceE
 import org.ofbiz.service.LocalDispatcher;
 import org.ofbiz.service.ServiceUtil;
 import org.ofbiz.widget.renderer.ScreenRenderer;
-import org.ofbiz.widget.renderer.fo.FoFormRenderer;
-import org.ofbiz.widget.renderer.html.HtmlScreenRenderer;
+import org.ofbiz.widget.renderer.ScreenStringRenderer;
+import org.ofbiz.widget.renderer.macro.MacroScreenRenderer;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -71,9 +71,6 @@ public class OagisShipmentServices {
 
     public static final String module = OagisShipmentServices.class.getName();
 
-    protected static final HtmlScreenRenderer htmlScreenRenderer = new 
HtmlScreenRenderer();
-    protected static final FoFormRenderer foFormRenderer = new 
FoFormRenderer();
-
     public static final Set<String> invalidShipmentStatusSet = 
UtilMisc.toSet("SHIPMENT_CANCELLED", "SHIPMENT_PICKED", "SHIPMENT_PACKED",
             "SHIPMENT_SHIPPED", "SHIPMENT_DELIVERED");
 
@@ -880,7 +877,9 @@ public class OagisShipmentServices {
             String bodyScreenUri = 
EntityUtilProperties.getPropertyValue("oagis", 
"Oagis.Template.ProcessShipment", delegator);
             String outText = null;
             Writer writer = new StringWriter();
-            ScreenRenderer screens = new ScreenRenderer(writer, 
bodyParameters, htmlScreenRenderer);
+            ScreenStringRenderer screenStringRenderer = new 
MacroScreenRenderer(EntityUtilProperties.getPropertyValue("widget", 
"screen.name", delegator),
+                    EntityUtilProperties.getPropertyValue("widget", 
"screen.screenrenderer", delegator));
+            ScreenRenderer screens = new ScreenRenderer(writer, 
bodyParameters, screenStringRenderer);
             screens.render(bodyScreenUri);
             writer.close();
             outText = writer.toString();
@@ -1125,7 +1124,9 @@ public class OagisShipmentServices {
 
             String bodyScreenUri = 
EntityUtilProperties.getPropertyValue("oagis", 
"Oagis.Template.ReceiveDelivery", delegator);
             Writer writer = new StringWriter();
-            ScreenRenderer screens = new ScreenRenderer(writer, 
bodyParameters, htmlScreenRenderer);
+            ScreenStringRenderer screenStringRenderer = new 
MacroScreenRenderer(EntityUtilProperties.getPropertyValue("widget", 
"screen.name", delegator),
+                    EntityUtilProperties.getPropertyValue("widget", 
"screen.screenrenderer", delegator));
+            ScreenRenderer screens = new ScreenRenderer(writer, 
bodyParameters, screenStringRenderer);
             screens.render(bodyScreenUri);
             writer.close();
             String outText = writer.toString();