Author: adrianc
Date: Sun Jan 25 17:56:26 2015
New Revision: 1654672
URL: http://svn.apache.org/r1654672
Log:
Small fixup for my last commit.
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlScreenRenderer.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlScreenRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlScreenRenderer.java?rev=1654672&r1=1654671&r2=1654672&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlScreenRenderer.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlScreenRenderer.java
Sun Jan 25 17:56:26 2015
@@ -28,6 +28,7 @@ import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.xml.parsers.ParserConfigurationException;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
@@ -65,6 +66,7 @@ import org.ofbiz.widget.renderer.FormStr
import org.ofbiz.widget.renderer.MenuStringRenderer;
import org.ofbiz.widget.renderer.Paginator;
import org.ofbiz.widget.renderer.ScreenStringRenderer;
+import org.xml.sax.SAXException;
/**
* Widget Library - HTML Form Renderer implementation
@@ -290,7 +292,12 @@ public class HtmlScreenRenderer extends
protected void renderScreenletPaginateMenu(Appendable writer, Map<String,
Object> context, Form form) throws IOException {
HttpServletResponse response = (HttpServletResponse)
context.get("response");
HttpServletRequest request = (HttpServletRequest)
context.get("request");
- ModelForm modelForm = form.getModelForm(context);
+ ModelForm modelForm;
+ try {
+ modelForm = form.getModelForm(context);
+ } catch (Exception e) {
+ throw new IOException(e);
+ }
modelForm.runFormActions(context);
Paginator.preparePager(modelForm, context);
String targetService = modelForm.getPaginateTarget(context);
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java?rev=1654672&r1=1654671&r2=1654672&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java
Sun Jan 25 17:56:26 2015
@@ -684,7 +684,12 @@ public class MacroScreenRenderer impleme
protected void renderScreenletPaginateMenu(Appendable writer, Map<String,
Object> context, ModelScreenWidget.Form form) throws IOException {
HttpServletResponse response = (HttpServletResponse)
context.get("response");
HttpServletRequest request = (HttpServletRequest)
context.get("request");
- ModelForm modelForm = form.getModelForm(context);
+ ModelForm modelForm;
+ try {
+ modelForm = form.getModelForm(context);
+ } catch (Exception e) {
+ throw new IOException(e);
+ }
modelForm.runFormActions(context);
Paginator.preparePager(modelForm, context);
String targetService = modelForm.getPaginateTarget(context);