svn commit: r757077 [1/5] - in /ofbiz/trunk/framework/widget/src/org/ofbiz/widget: ./ cache/ fo/ form/ html/ menu/ screen/ text/ tree/ xml/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r757077 [1/5] - in /ofbiz/trunk/framework/widget/src/org/ofbiz/widget: ./ cache/ fo/ form/ html/ menu/ screen/ text/ tree/ xml/

doogie-3
Author: doogie
Date: Sat Mar 21 23:24:58 2009
New Revision: 757077

URL: http://svn.apache.org/viewvc?rev=757077&view=rev
Log:
Fix purely empty whitespace lines, and remove trailing whitespace.

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/DataResourceWorkerInterface.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidget.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetContentWorker.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetDataResourceWorker.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/AbstractCache.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/GenericWidgetOutput.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/ScreenCache.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FormFactory.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FormStringRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormWrapper.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRendererImage.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapper.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapperImage.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlWidgetRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuStringRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroFormRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFopViewHandler.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderException.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenStringRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenTextViewHandler.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenWidgetViewHandler.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenXmlViewHandler.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/text/TextFormRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/text/TextScreenRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/TreeFactory.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/TreeStringRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java?rev=757077&r1=757076&r2=757077&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java Sat Mar 21 23:24:58 2009
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -44,5 +44,5 @@
     public String renderContentAsTextExt(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException;
 
     public void renderSubContentAsTextExt(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, Appendable out, String mapKey, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException;
-    public String renderSubContentAsTextExt(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, String mapKey, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException;            
+    public String renderSubContentAsTextExt(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, String mapKey, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException;
 }

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/DataResourceWorkerInterface.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/DataResourceWorkerInterface.java?rev=757077&r1=757076&r2=757077&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/DataResourceWorkerInterface.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/DataResourceWorkerInterface.java Sat Mar 21 23:24:58 2009
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -31,7 +31,7 @@
 public interface DataResourceWorkerInterface {
     public String renderDataResourceAsTextExt(GenericDelegator delegator, String dataResourceId, Map templateContext,
             Locale locale, String targetMimeTypeId, boolean cache) throws GeneralException, IOException;
-    
+
     public void renderDataResourceAsTextExt(GenericDelegator delegator, String dataResourceId, Appendable out, Map templateContext,
             Locale locale, String targetMimeTypeId, boolean cache) throws GeneralException, IOException;
 }

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidget.java?rev=757077&r1=757076&r2=757077&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidget.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidget.java Sat Mar 21 23:24:58 2009
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -41,7 +41,7 @@
      * &lt;context-param&gt;<br/>
      * &nbsp;&nbsp;&lt;param-name&gt;widgetVerbose&lt;/param-name&gt;<br/>
      * &nbsp;&nbsp;&lt;param-value&gt;true&lt;/param-value&gt;<br/>
-     * &lt;/context-param&gt;  
+     * &lt;/context-param&gt;
      * </code><br/><br/>
      * Screen widget example:<br/><br/>
      * <code>
@@ -53,11 +53,11 @@
     public static final String enableBoundaryCommentsParam = "widgetVerbose";
     protected String name;
     protected boolean enableWidgetBoundaryComments = false;
-    
+
     protected ModelWidget() {}
 
     /**
-     * Derived classes must call this constructor.
+     * Derived classes must call this constructor.
      * @param widgetElement The XML Element for the widget
      */
     public ModelWidget(Element widgetElement) {
@@ -71,7 +71,7 @@
     public String getName() {
         return name;
     }
-    
+
     /**
      * Returns the widget's name to be used in boundary comments. The default action
      * is to return the widget's name. Derived classes can override this method to
@@ -81,7 +81,7 @@
     public String getBoundaryCommentName() {
         return name;
     }
-    
+
     /**
      * Returns true if boundary comments are enabled for this widget, otherwise
      * returns false.
@@ -115,20 +115,20 @@
     }
 
     public int getPaginatorNumber(Map<String, Object> context) {
-        int paginator_number = 0;
-        Map<String, Object> globalCtx = UtilGenerics.checkMap(context.get("globalContext"));      
+        int paginator_number = 0;
+        Map<String, Object> globalCtx = UtilGenerics.checkMap(context.get("globalContext"));
         if (globalCtx != null) {
             Integer paginateNumberInt= (Integer)globalCtx.get("PAGINATOR_NUMBER");
-            if (paginateNumberInt == null) {    
+            if (paginateNumberInt == null) {
                 paginateNumberInt = Integer.valueOf(0);
                 globalCtx.put("PAGINATOR_NUMBER", paginateNumberInt);
             }
             paginator_number = paginateNumberInt.intValue();
-        }    
+        }
         return paginator_number;
-    }      
-    
-    public void incrementPaginatorNumber(Map<String, Object> context) {    
+    }
+
+    public void incrementPaginatorNumber(Map<String, Object> context) {
         Map<String, Object> globalCtx = UtilGenerics.checkMap(context.get("globalContext"));
         if (globalCtx != null) {
             Boolean NO_PAGINATOR = (Boolean) globalCtx.get("NO_PAGINATOR");
@@ -138,7 +138,7 @@
                 Integer paginateNumberInt = Integer.valueOf(getPaginatorNumber(context) + 1);
                 globalCtx.put("PAGINATOR_NUMBER", paginateNumberInt);
             }
-        }    
+        }
     }
-    
+
 }

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetContentWorker.java?rev=757077&r1=757076&r2=757077&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetContentWorker.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetContentWorker.java Sat Mar 21 23:24:58 2009
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetDataResourceWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetDataResourceWorker.java?rev=757077&r1=757076&r2=757077&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetDataResourceWorker.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetDataResourceWorker.java Sat Mar 21 23:24:58 2009
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java?rev=757077&r1=757076&r2=757077&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java Sat Mar 21 23:24:58 2009
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -47,11 +47,11 @@
 
     public WidgetWorker () {}
 
-    public static void buildHyperlinkUrl(Appendable externalWriter, String target, String targetType, List<WidgetWorker.Parameter> parameterList,
+    public static void buildHyperlinkUrl(Appendable externalWriter, String target, String targetType, List<WidgetWorker.Parameter> parameterList,
             String prefix, boolean fullPath, boolean secure, boolean encode, HttpServletRequest request, HttpServletResponse response, Map<String, Object> context) throws IOException {
         String localRequestName = UtilHttp.encodeAmpersands(target);
         Appendable localWriter = new StringWriter();
-        
+
         if ("intra-app".equals(targetType)) {
             if (request != null && response != null) {
                 ServletContext servletContext = (ServletContext) request.getSession().getServletContext();
@@ -83,7 +83,7 @@
         } else {
             localWriter.append(localRequestName);
         }
-        
+
         if (parameterList != null && parameterList.size() > 0) {
             String localUrl = localWriter.toString();
             externalWriter.append(localUrl);
@@ -92,7 +92,7 @@
                 externalWriter.append('?');
                 needsAmp = false;
             }
-            
+
             for (WidgetWorker.Parameter parameter: parameterList) {
                 if (needsAmp) {
                     externalWriter.append("&amp;");
@@ -120,8 +120,8 @@
         writer.append(location);
     }
 
-    public static void makeHyperlinkByType(Appendable writer, String linkType, String linkStyle, String targetType, String target,
-            List<WidgetWorker.Parameter> parameterList, String description, String targetWindow, ModelFormField modelFormField,
+    public static void makeHyperlinkByType(Appendable writer, String linkType, String linkStyle, String targetType, String target,
+            List<WidgetWorker.Parameter> parameterList, String description, String targetWindow, ModelFormField modelFormField,
             HttpServletRequest request, HttpServletResponse response, Map<String, Object> context) throws IOException {
         String realLinkType = WidgetWorker.determineAutoLinkType(linkType, target, targetType, request);
         if ("hidden-form".equals(realLinkType)) {
@@ -143,11 +143,11 @@
         } else {
             WidgetWorker.makeHyperlinkString(writer, linkStyle, targetType, target, parameterList, description, modelFormField, request, response, context, targetWindow);
         }
-        
+
     }
-    
-    public static void makeHyperlinkString(Appendable writer, String linkStyle, String targetType, String target, List<WidgetWorker.Parameter> parameterList,
-            String description, ModelFormField modelFormField, HttpServletRequest request, HttpServletResponse response, Map<String, Object> context, String targetWindow)
+
+    public static void makeHyperlinkString(Appendable writer, String linkStyle, String targetType, String target, List<WidgetWorker.Parameter> parameterList,
+            String description, ModelFormField modelFormField, HttpServletRequest request, HttpServletResponse response, Map<String, Object> context, String targetWindow)
             throws IOException {
         if (UtilValidate.isNotEmpty(description) || UtilValidate.isNotEmpty(request.getAttribute("image"))) {
             writer.append("<a");
@@ -163,7 +163,7 @@
             buildHyperlinkUrl(writer, target, targetType, parameterList, null, false, false, true, request, response, context);
 
             writer.append("\"");
-            
+
             if (UtilValidate.isNotEmpty(targetWindow)) {
                 writer.append(" target=\"");
                 writer.append(targetWindow);
@@ -179,7 +179,7 @@
             }
 
             writer.append('>');
-            
+
             if (UtilValidate.isNotEmpty(request.getAttribute("image"))){
                 writer.append("<img src=\"");
                 writer.append(request.getAttribute("image").toString());
@@ -190,7 +190,7 @@
             writer.append("</a>");
         }
     }
-    
+
     public static void makeHiddenFormLinkAnchor(Appendable writer, String linkStyle, String description, ModelFormField modelFormField, HttpServletRequest request, HttpServletResponse response, Map<String, Object> context) throws IOException {
         if (UtilValidate.isNotEmpty(description) || UtilValidate.isNotEmpty(request.getAttribute("image"))) {
             writer.append("<a");
@@ -204,7 +204,7 @@
             writer.append(" href=\"javascript:document.");
             writer.append(makeLinkHiddenFormName(context, modelFormField));
             writer.append(".submit()\"");
-            
+
             if (UtilValidate.isNotEmpty(modelFormField.getEvent()) && UtilValidate.isNotEmpty(modelFormField.getAction(context))) {
                 writer.append(" ");
                 writer.append(modelFormField.getEvent());
@@ -214,7 +214,7 @@
             }
 
             writer.append('>');
-            
+
             if (UtilValidate.isNotEmpty(request.getAttribute("image"))){
                 writer.append("<img src=\"");
                 writer.append(request.getAttribute("image").toString());
@@ -225,7 +225,7 @@
             writer.append("</a>");
         }
     }
-    
+
     public static void makeHiddenFormLinkForm(Appendable writer, String target, String targetType, String targetWindow, List<WidgetWorker.Parameter> parameterList, ModelFormField modelFormField, HttpServletRequest request, HttpServletResponse response, Map<String, Object> context) throws IOException {
         writer.append("<form method=\"post\"");
         writer.append(" action=\"");
@@ -252,10 +252,10 @@
             writer.append(parameter.getValue(context));
             writer.append("\" type=\"hidden\"/>");
         }
-        
+
         writer.append("</form>");
     }
-    
+
     public static String makeLinkHiddenFormName(Map<String, Object> context, ModelFormField modelFormField) {
         ModelForm modelForm = modelFormField.getModelForm();
         Integer itemIndex = (Integer) context.get("itemIndex");
@@ -303,12 +303,12 @@
             }
         }
     }
-    
+
     public static String determineAutoLinkType(String linkType, String target, String targetType, HttpServletRequest request) {
         Debug.logInfo("determineAutoLinkType: linkType=" + linkType + ", target=[" + target + "], targetType=" + targetType, module);
         if ("auto".equals(linkType)) {
             if ("intra-app".equals(targetType)) {
-                String requestUri = (target.indexOf('?') > -1) ? target.substring(0, target.indexOf('?')) : target;
+                String requestUri = (target.indexOf('?') > -1) ? target.substring(0, target.indexOf('?')) : target;
                 ServletContext servletContext = (ServletContext) request.getSession().getServletContext();
                 RequestHandler rh = (RequestHandler) servletContext.getAttribute("_REQUEST_HANDLER_");
                 ConfigXMLReader.RequestMap requestMap = rh.getControllerConfig().requestMapMap.get(requestUri);

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/AbstractCache.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/AbstractCache.java?rev=757077&r1=757076&r2=757077&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/AbstractCache.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/AbstractCache.java Sat Mar 21 23:24:58 2009
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/GenericWidgetOutput.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/GenericWidgetOutput.java?rev=757077&r1=757076&r2=757077&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/GenericWidgetOutput.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/GenericWidgetOutput.java Sat Mar 21 23:24:58 2009
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,8 +27,8 @@
     public GenericWidgetOutput(String output) {
         this.output = new String(output);
     }
-    
+
     public String toString() {
-        return this.output;
+        return this.output;
     }
 }

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/ScreenCache.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/ScreenCache.java?rev=757077&r1=757076&r2=757077&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/ScreenCache.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/ScreenCache.java Sat Mar 21 23:24:58 2009
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java?rev=757077&r1=757076&r2=757077&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java Sat Mar 21 23:24:58 2009
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -32,9 +32,9 @@
 public class WidgetContextCacheKey {
 
     public static final String module = WidgetContextCacheKey.class.getName();
-    
+
     private static Set<String> fieldNamesToSkip;
-    
+
     static {
         fieldNamesToSkip = FastSet.newInstance();
         fieldNamesToSkip.add("globalContext");
@@ -78,7 +78,7 @@
         fieldNamesToSkip.add("visit");
         fieldNamesToSkip.add("visitor");
     }
-            
+
     protected Map<String, Object> context;
 
     public WidgetContextCacheKey(Map<String, Object> context) {
@@ -133,7 +133,7 @@
         }
         return true;
     }
-    
+
     public String toString() {
         Map<String, Object> printableMap = FastMap.newInstance();
         Iterator fieldNameIt = this.context.keySet().iterator();

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java?rev=757077&r1=757076&r2=757077&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java Sat Mar 21 23:24:58 2009
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -59,7 +59,7 @@
 public class FoFormRenderer extends HtmlWidgetRenderer implements FormStringRenderer {
 
     public static final String module = FoFormRenderer.class.getName();
-    
+
     HttpServletRequest request;
     HttpServletResponse response;
 
@@ -408,12 +408,12 @@
     public void renderFieldGroupClose(Appendable writer, Map<String, Object> context, ModelForm.FieldGroup fieldGroup) throws IOException {
         // TODO
     }
-    
+
     public void renderBanner(Appendable writer, Map<String, Object> context, ModelForm.Banner banner) throws IOException {
         // TODO
         this.makeBlockString(writer, null, "");
     }
-    
+
     public void renderHyperlinkTitle(Appendable writer, Map<String, Object> context, ModelFormField modelFormField, String titleText) throws IOException {
     }
 }

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java?rev=757077&r1=757076&r2=757077&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java Sat Mar 21 23:24:58 2009
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FormFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FormFactory.java?rev=757077&r1=757076&r2=757077&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FormFactory.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FormFactory.java Sat Mar 21 23:24:58 2009
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -45,12 +45,12 @@
  * Widget Library - Form factory class
  */
 public class FormFactory {
-    
+
     public static final String module = FormFactory.class.getName();
     public static final UtilCache<String, ModelForm> formLocationCache = new UtilCache<String, ModelForm>("widget.form.locationResource", 0, 0, false);
     public static final UtilCache<String, ModelForm> formWebappCache = new UtilCache<String, ModelForm>("widget.form.webappResource", 0, 0, false);
-    
-    public static Map<String, ModelForm> getFormsFromLocation(String resourceName, ModelReader entityModelReader, DispatchContext dispatchContext)
+
+    public static Map<String, ModelForm> getFormsFromLocation(String resourceName, ModelReader entityModelReader, DispatchContext dispatchContext)
             throws IOException, SAXException, ParserConfigurationException {
         /*
         ClassLoader loader = Thread.currentThread().getContextClassLoader();
@@ -63,7 +63,7 @@
         return readFormDocument(formFileDoc, entityModelReader, dispatchContext, resourceName);
     }
 
-    public static ModelForm getFormFromLocation(String resourceName, String formName, ModelReader entityModelReader, DispatchContext dispatchContext)
+    public static ModelForm getFormFromLocation(String resourceName, String formName, ModelReader entityModelReader, DispatchContext dispatchContext)
             throws IOException, SAXException, ParserConfigurationException {
         String cacheKey = resourceName + "#" + formName;
         ModelForm modelForm = formLocationCache.get(cacheKey);
@@ -90,7 +90,7 @@
         return modelForm;
     }
 
-    public static ModelForm getFormFromWebappContext(String resourceName, String formName, HttpServletRequest request)
+    public static ModelForm getFormFromWebappContext(String resourceName, String formName, HttpServletRequest request)
             throws IOException, SAXException, ParserConfigurationException {
         String webappName = UtilHttp.getApplicationName(request);
         String cacheKey = webappName + "::" + resourceName + "::" + formName;

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FormStringRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FormStringRenderer.java?rev=757077&r1=757076&r2=757077&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FormStringRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FormStringRenderer.java Sat Mar 21 23:24:58 2009
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -45,11 +45,11 @@
 
     public void renderFieldTitle(Appendable writer, Map<String, Object> context, ModelFormField modelFormField) throws IOException;
     public void renderSingleFormFieldTitle(Appendable writer, Map<String, Object> context, ModelFormField modelFormField) throws IOException;
-    
+
     public void renderFormOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException;
     public void renderFormClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException;
     public void renderMultiFormClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException;
-    
+
     public void renderFormatListWrapperOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException;
     public void renderFormatListWrapperClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException;
 
@@ -61,7 +61,7 @@
     public void renderFormatHeaderRowFormCellOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException;
     public void renderFormatHeaderRowFormCellClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException;
     public void renderFormatHeaderRowFormCellTitleSeparator(Appendable writer, Map<String, Object> context, ModelForm modelForm, ModelFormField modelFormField, boolean isLast) throws IOException;
-    
+
     public void renderFormatItemRowOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException;
     public void renderFormatItemRowClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException;
     public void renderFormatItemRowCellOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm, ModelFormField modelFormField, int positionSpan) throws IOException;

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=757077&r1=757076&r2=757077&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Sat Mar 21 23:24:58 2009
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -115,9 +115,9 @@
     protected boolean useRowSubmit = false;
     protected FlexibleStringExpander targetWindowExdr;
     protected String defaultRequiredFieldStyle;
-    protected String defaultSortFieldStyle;    
+    protected String defaultSortFieldStyle;
     protected String defaultSortFieldAscStyle;
-    protected String defaultSortFieldDescStyle;    
+    protected String defaultSortFieldDescStyle;
     protected String oddRowStyle;
     protected String evenRowStyle;
     protected String defaultTableStyle;
@@ -155,17 +155,17 @@
      * Can also include Banner objects.
      */
     protected List<FieldGroupBase> fieldGroupList = FastList.newInstance();
-    
+
     /** This Map is keyed with the field name and has a FieldGroup for the value.
      * Can also include Banner objects.
      */
     protected Map<String, FieldGroupBase> fieldGroupMap = FastMap.newInstance();
-    
+
     /** This field group will be the "catch-all" group for fields that are not
      *  included in an explicit field-group.
      */
     protected FieldGroup defaultFieldGroup;
-    
+
     /** Default hyperlink target. */
     public static String DEFAULT_TARGET_TYPE = "intra-app";
 
@@ -179,18 +179,18 @@
     public static String DEFAULT_PAG_PREV_STYLE = "nav-previous";
     public static String DEFAULT_PAG_NEXT_STYLE = "nav-next";
     public static String DEFAULT_PAG_LAST_STYLE = "nav-last";
-    
+
     /** Sort field default styles. */
     public static String DEFAULT_SORT_FIELD_STYLE = "sort-order";
     public static String DEFAULT_SORT_FIELD_ASC_STYLE = "sort-order-asc";
     public static String DEFAULT_SORT_FIELD_DESC_STYLE = "sort-order-desc";
-    
+
     protected List<ModelFormAction> actions;
     protected List<ModelFormAction> rowActions;
     protected FlexibleStringExpander rowCountExdr;
     protected List<ModelFormField> multiSubmitFields = FastList.newInstance();
     protected int rowCount = 0;
-    
+
     /** On Submit areas to be updated. */
     protected List<UpdateArea> onSubmitUpdateAreas;
     /** On Paginate areas to be updated. */
@@ -207,12 +207,12 @@
         this.dispatchContext = dispatchContext;
         initForm(formElement);
     }
-    
+
     public ModelForm(Element formElement) {
         super(formElement);
         initForm(formElement);
     }
-    
+
     public void initForm(Element formElement) {
 
         setDefaultViewSize(UtilProperties.getPropertyValue("widget.properties", "widget.form.defaultViewSize"));
@@ -293,7 +293,7 @@
                 this.onSubmitUpdateAreas = parent.onSubmitUpdateAreas;
                 this.onPaginateUpdateAreas = parent.onPaginateUpdateAreas;
                 this.altRowStyles = parent.altRowStyles;
-                
+
                 //these are done below in a special way...
                 //this.fieldList = parent.fieldList;
                 //this.fieldMap = parent.fieldMap;
@@ -399,13 +399,13 @@
         }
         if (this.defaultSortFieldStyle == null || formElement.hasAttribute("default-sort-field-style")) {
             this.defaultSortFieldStyle = formElement.getAttribute("default-sort-field-style");
-        }        
+        }
         if (this.defaultSortFieldAscStyle == null || formElement.hasAttribute("default-sort-field-asc-style")) {
             this.defaultSortFieldAscStyle = formElement.getAttribute("default-sort-field-asc-style");
         }
         if (this.defaultSortFieldDescStyle == null || formElement.hasAttribute("default-sort-field-desc-style")) {
             this.defaultSortFieldDescStyle = formElement.getAttribute("default-sort-field-desc-style");
-        }        
+        }
 
         // pagination settings
         if (this.paginateTarget == null || formElement.hasAttribute("paginate-target")) {
@@ -438,7 +438,7 @@
         if (this.paginateStyle == null || formElement.hasAttribute("paginate-style")) {
             setPaginateStyle(formElement.getAttribute("paginate-style"));
         }
-        
+
         this.paginate = "true".equals(formElement.getAttribute("paginate"));
         this.skipStart = "true".equals(formElement.getAttribute("skip-start"));
         this.skipEnd = "true".equals(formElement.getAttribute("skip-end"));
@@ -466,7 +466,7 @@
             AltRowStyle altRowStyle = new AltRowStyle(altRowStyleElement);
             this.altRowStyles.add(altRowStyle);
         }
-        
+
         // alt-target
         List altTargetElements = UtilXml.childElementList(formElement, "alt-target");
         Iterator altTargetElementIter = altTargetElements.iterator();
@@ -475,14 +475,14 @@
             AltTarget altTarget = new AltTarget(altTargetElement);
             this.addAltTarget(altTarget);
         }
-            
+
         // on-event-update-area
         List<? extends Element> updateAreaElements = UtilXml.childElementList(formElement, "on-event-update-area");
         for (Element updateAreaElement : updateAreaElements) {
             UpdateArea updateArea = new UpdateArea(updateAreaElement);
             this.addOnEventUpdateArea(updateArea);
         }
-            
+
         // auto-fields-service
         List autoFieldsServiceElements = UtilXml.childElementList(formElement, "auto-fields-service");
         Iterator autoFieldsServiceElementIter = autoFieldsServiceElements.iterator();
@@ -537,13 +537,13 @@
                 } else if (tagName.equals("banner")) {
                     Banner thisBanner = new Banner(sortFieldElement, this);
                     this.fieldGroupList.add(thisBanner);
-                    
+
                     lastFieldGroup = new FieldGroup(null, this);
                     this.fieldGroupList.add(lastFieldGroup);
                 } else if (tagName.equals("field-group")) {
                     FieldGroup thisFieldGroup = new FieldGroup(sortFieldElement, this);
                     this.fieldGroupList.add(thisFieldGroup);
-                    
+
                     lastFieldGroup = new FieldGroup(null, this);
                     this.fieldGroupList.add(lastFieldGroup);
                 }
@@ -796,7 +796,7 @@
      */
     public void renderFormString(Appendable writer, Map<String, Object> context, FormStringRenderer formStringRenderer) throws IOException {
         runFormActions(context);
-        
+
         setWidgetBoundaryComments(context);
 
         // if this is a list form, don't useRequestParameters
@@ -844,7 +844,7 @@
     public void renderSingleFormString(Appendable writer, Map<String, Object> context, FormStringRenderer formStringRenderer, int positions) throws IOException {
         List<ModelFormField> tempFieldList = FastList.newInstance();
         tempFieldList.addAll(this.fieldList);
-        
+
         // Check to see if there is a field, same name and same use-when (could come from extended form)
         for (int j = 0; j < tempFieldList.size(); j++) {
             ModelFormField modelFormField = (ModelFormField) tempFieldList.get(j);
@@ -888,21 +888,21 @@
         if (fieldIter.hasNext()) {
             nextFormField = (ModelFormField) fieldIter.next();
         }
-        
+
         FieldGroup currentFieldGroup = null;
         String currentFieldGroupName = null;
         String lastFieldGroupName = null;
         if (currentFormField != null) {
-            currentFieldGroup = (FieldGroup)fieldGroupMap.get(currentFormField.getFieldName());
+            currentFieldGroup = (FieldGroup)fieldGroupMap.get(currentFormField.getFieldName());
             if (currentFieldGroup == null) {
                 currentFieldGroup = defaultFieldGroup;
             }
             if (currentFieldGroup != null) {
                 currentFieldGroupName = currentFieldGroup.getId();
-            }
+            }
         }
-        
-            
+
+
         boolean isFirstPass = true;
         boolean haveRenderedOpenFieldRow = false;
         while (currentFormField != null) {
@@ -913,9 +913,9 @@
                 List inbetweenList = getInbetweenList(lastFieldGroup, currentFieldGroup);
                 Iterator iter = inbetweenList.iterator();
                 while (iter.hasNext()) {
-                    Object obj = iter.next();
+                    Object obj = iter.next();
                     if (obj instanceof ModelForm.Banner) {
-                        ((ModelForm.Banner) obj).renderString(writer, context, formStringRenderer);  
+                        ((ModelForm.Banner) obj).renderString(writer, context, formStringRenderer);
                     }
                 }
                 if (currentFieldGroup != null && (lastFieldGroup == null || !lastFieldGroupName.equals(currentFieldGroupName))) {
@@ -942,29 +942,29 @@
                 }
                 currentFieldGroup = null;
                 if (currentFormField != null) {
-                    currentFieldGroup = (FieldGroup) fieldGroupMap.get(currentFormField.getName());
+                    currentFieldGroup = (FieldGroup) fieldGroupMap.get(currentFormField.getName());
                 }
                 if (currentFieldGroup == null) {
                     currentFieldGroup = defaultFieldGroup;
                 }
                 currentFieldGroupName = currentFieldGroup.getId();
-                
+
                 if (lastFieldGroup != null ) {
                     lastFieldGroupName = lastFieldGroup.getId();
                     if (!lastFieldGroupName.equals(currentFieldGroupName)) {
                         lastFieldGroup.renderEndString(writer, context, formStringRenderer);
-                        
+
                         List inbetweenList = getInbetweenList(lastFieldGroup, currentFieldGroup);
                         Iterator iter = inbetweenList.iterator();
                         while (iter.hasNext()) {
-                            Object obj = iter.next();
+                            Object obj = iter.next();
                             if (obj instanceof ModelForm.Banner) {
-                                ((ModelForm.Banner) obj).renderString(writer, context, formStringRenderer);  
+                                ((ModelForm.Banner) obj).renderString(writer, context, formStringRenderer);
                             }
                         }
                     }
                 }
-                
+
                 if (currentFieldGroup != null && (lastFieldGroup == null || !lastFieldGroupName.equals(currentFieldGroupName))) {
                         currentFieldGroup.renderStartString(writer, context, formStringRenderer);
                         lastFieldGroup = currentFieldGroup;
@@ -1106,7 +1106,7 @@
         this.renderItemRows(writer, context, formStringRenderer, false, numOfColumns);
 
         formStringRenderer.renderFormatListWrapperClose(writer, context, this);
-        
+
         if (!skipEnd) {
             formStringRenderer.renderMultiFormClose(writer, context, this);
         }
@@ -1166,7 +1166,7 @@
                 ModelFormField modelFormField = (ModelFormField) displayHyperlinkFieldIter.next();
                 ModelFormField.FieldInfo fieldInfo = modelFormField.getFieldInfo();
 
-                // if the field's title is explicitly set to "" (title="") then
+                // if the field's title is explicitly set to "" (title="") then
                 // the header is not created for it; this is useful for position list
                 // where one line can be rendered with more than one row, and we
                 // only want to display the title header for the main row
@@ -1218,7 +1218,7 @@
             if (maxNumOfColumns < numOfColumns) {
                 maxNumOfColumns = numOfColumns;
             }
-            
+
             fieldRowsByPosition.add(UtilMisc.toMap("displayBefore", innerDisplayHyperlinkFieldsBegin,
                                                    "inputFields", innerFormFields,
                                                    "displayAfter", innerDisplayHyperlinkFieldsEnd));
@@ -1232,9 +1232,9 @@
             List innerDisplayHyperlinkFieldsBegin = (List)listsMap.get("displayBefore");
             List innerFormFields = (List)listsMap.get("inputFields");
             List innerDisplayHyperlinkFieldsEnd = (List)listsMap.get("displayAfter");
-            
+
             int numOfCells = innerDisplayHyperlinkFieldsBegin.size() +
-                             innerDisplayHyperlinkFieldsEnd.size() +
+                             innerDisplayHyperlinkFieldsEnd.size() +
                              (innerFormFields.size() > 0? 1: 0);
             int numOfColumnsToSpan = maxNumOfColumns - numOfCells + 1;
             if (numOfColumnsToSpan < 1) {
@@ -1310,7 +1310,7 @@
     }
 
     public void preparePager(Map<String, Object> context) {
-        
+
         //  increment the paginator
         this.incrementPaginatorNumber(context);
         this.rowCount = 0;
@@ -1328,7 +1328,7 @@
         Iterator iter = null;
         List items = null;
         if (obj instanceof Iterator) {
-            iter = (Iterator) obj;  
+            iter = (Iterator) obj;
             setPaginate(true);
         } else if (obj instanceof List) {
             items = (List) obj;
@@ -1395,7 +1395,7 @@
         Iterator iter = null;
         List items = null;
         if (obj instanceof Iterator) {
-            iter = (Iterator) obj;  
+            iter = (Iterator) obj;
             setPaginate(true);
         } else if (obj instanceof List) {
             items = (List) obj;
@@ -1434,7 +1434,7 @@
                 if (itemIndex < lowIndex) {
                     continue;
                 }
-                
+
                 Map<String, Object> itemMap = UtilGenerics.checkMap(item);
                 MapStack<String> localContext = MapStack.create(context);
                 if (UtilValidate.isNotEmpty(this.getListEntryName())) {
@@ -1476,7 +1476,7 @@
                     }
                 }
 
-                // Each single item is rendered in one or more rows if its fields have
+                // Each single item is rendered in one or more rows if its fields have
                 // different "position" attributes. All the fields with the same position
                 // are rendered in the same row.
                 // The default position is 1, and represents the main row:
@@ -1587,7 +1587,7 @@
                 context.put("highIndex", Integer.valueOf(isOverridenListSize() ? listSize : highIndex));
             }
             context.put("actualPageSize", Integer.valueOf(highIndex - lowIndex));
-            
+
             if (iter instanceof EntityListIterator) {
                 try {
                     ((EntityListIterator) iter).close();
@@ -1603,7 +1603,7 @@
     // of one row (corresponding to one position).
     public void renderItemRow(Appendable writer, Map<String, Object> localContext, FormStringRenderer formStringRenderer, boolean formPerItem, List hiddenIgnoredFieldList, List innerDisplayHyperlinkFieldsBegin, List innerFormFields, List innerDisplayHyperlinkFieldsEnd, int position, int numOfColumns) throws IOException {
         int numOfCells = innerDisplayHyperlinkFieldsBegin.size() +
-                         innerDisplayHyperlinkFieldsEnd.size() +
+                         innerDisplayHyperlinkFieldsEnd.size() +
                          (innerFormFields.size() > 0? 1: 0);
         int numOfColumnsToSpan = numOfColumns - numOfCells + 1;
         if (numOfColumnsToSpan < 1) {
@@ -1781,9 +1781,9 @@
     }
 
     public String getTargetType() {
-        return this.targetType;  
+        return this.targetType;
     }
-    
+
     public String getParentFormName() {
         return this.parentFormName;
     }
@@ -1806,22 +1806,22 @@
     public Map<String, ? extends Object> getDefaultMap(Map<String, ? extends Object> context) {
         return this.defaultMapName.get(context);
     }
-    
+
     public String getDefaultRequiredFieldStyle() {
         return this.defaultRequiredFieldStyle;
     }
-    
+
     public String getDefaultSortFieldStyle() {
         return (UtilValidate.isEmpty(this.defaultSortFieldStyle) ? DEFAULT_SORT_FIELD_STYLE : this.defaultSortFieldStyle);
     }
-    
+
     public String getDefaultSortFieldAscStyle() {
         return (UtilValidate.isEmpty(this.defaultSortFieldAscStyle) ? DEFAULT_SORT_FIELD_ASC_STYLE : this.defaultSortFieldAscStyle);
     }
-    
+
     public String getDefaultSortFieldDescStyle() {
         return (UtilValidate.isEmpty(this.defaultSortFieldDescStyle) ? DEFAULT_SORT_FIELD_DESC_STYLE : this.defaultSortFieldDescStyle);
-    }    
+    }
 
 
     public String getDefaultServiceName() {
@@ -1847,7 +1847,7 @@
     public String getOddRowStyle() {
         return this.oddRowStyle;
     }
-    
+
     public String getEvenRowStyle() {
         return this.evenRowStyle;
     }
@@ -1855,11 +1855,11 @@
     public String getDefaultTableStyle() {
         return this.defaultTableStyle;
     }
-    
+
     public String getHeaderRowStyle() {
         return this.headerRowStyle;
     }
-    
+
     public String getDefaultTitleStyle() {
         return this.defaultTitleStyle;
     }
@@ -1919,7 +1919,7 @@
         if (simpleEncoder != null) {
             expanderContext = StringUtil.HtmlEncodingMapWrapper.getHtmlEncodingMapWrapper(context, simpleEncoder);
         }
-        
+
         try {
             // use the same Interpreter (ie with the same context setup) for all evals
             Interpreter bsh = this.getBshInterpreter(context);
@@ -1982,11 +1982,11 @@
     public String getBoundaryCommentName() {
         return formLocation + "#" + name;
     }
-    
+
     public void resetBshInterpreter(Map<String, Object> context) {
         context.remove("bshInterpreter");
     }
-    
+
     public Interpreter getBshInterpreter(Map<String, Object> context) throws EvalError {
         Interpreter bsh = (Interpreter) context.get("bshInterpreter");
         if (bsh == null) {
@@ -2044,35 +2044,35 @@
     public void setDefaultWidgetAreaStyle(String string) {
         this.defaultWidgetAreaStyle = string;
     }
-    
+
     /**
      * @param string
      */
     public void setOddRowStyle(String string) {
         this.oddRowStyle = string;
     }
-    
+
     /**
      * @param string
      */
     public void setEvenRowStyle(String string) {
         this.evenRowStyle = string;
     }
-    
+
     /**
      * @param string
      */
     public void setDefaultTableStyle(String string) {
         this.defaultTableStyle = string;
     }
-    
+
     /**
      * @param string
      */
     public void setHeaderRowStyle(String string) {
         this.headerRowStyle = string;
     }
-    
+
     /**
      * @param string
      */
@@ -2111,7 +2111,7 @@
     public String getFormLocation() {
         return this.formLocation;
     }
-    
+
     /**
      * @param string
      */
@@ -2193,7 +2193,7 @@
     public String getPaginateTargetAnchor() {
         return this.paginateTargetAnchor;
     }
-    
+
     public String getPaginateIndexField(Map<String, Object> context) {
         String field = this.paginateIndexField.expandString(context);
         if (UtilValidate.isEmpty(field)) {
@@ -2206,7 +2206,7 @@
 
     public int getPaginateIndex(Map<String, Object> context) {
         String field = this.getPaginateIndexField(context);
-        
+
         int viewIndex = 0;
         try {
             Object value = context.get(field);
@@ -2216,22 +2216,22 @@
             Map parameters = (Map) context.get("parameters");
             if (parameters != null) {
                 value = parameters.get("VIEW_INDEX" + "_" + getPaginatorNumber(context));
-                
+
                 if (value == null) {
                     value = parameters.get(field);
                 }
             }
             }
 
-            if (value instanceof Integer) {
+            if (value instanceof Integer) {
                 viewIndex = ((Integer) value).intValue();
-            } else if (value instanceof String) {
+            } else if (value instanceof String) {
                 viewIndex = Integer.parseInt((String) value);
             }
         } catch (Exception e) {
             Debug.logWarning(e, "Error getting paginate view index: " + e.toString(), module);
         }
-        
+
         return viewIndex;
     }
 
@@ -2335,7 +2335,7 @@
     public String getTargetWindow(Map<String, Object> context) {
         return this.targetWindowExdr.expandString(context);
     }
-            
+
     public void setTargetWindow( String val ) {
         this.targetWindowExdr = FlexibleStringExpander.getInstance(val);
     }
@@ -2351,7 +2351,7 @@
     public boolean getSkipStart() {
         return this.skipStart;
     }
-    
+
     public boolean getSkipEnd() {
         return this.skipEnd;
     }
@@ -2363,11 +2363,11 @@
     public void setSkipStart(boolean val) {
         this.skipStart = val;
     }
-    
+
     public void setSkipEnd(boolean val) {
         this.skipEnd = val;
     }
-    
+
     public boolean getHideHeader() {
         return this.hideHeader;
     }
@@ -2409,10 +2409,10 @@
             Integer sz = Integer.valueOf(val);
             defaultViewSize = sz.intValue();
         } catch (NumberFormatException e) {
-            defaultViewSize = DEFAULT_PAGE_SIZE;  
+            defaultViewSize = DEFAULT_PAGE_SIZE;
         }
     }
-    
+
     public int getListSize(Map<String, Object> context) {
         Integer value = (Integer) context.get("listSize");
         return value != null ? value.intValue() : 0;
@@ -2469,7 +2469,7 @@
         if (listSize > 0) {
             setOverridenListSize(true);
         } else if (entryList instanceof EntityListIterator) {
-            EntityListIterator iter = (EntityListIterator) entryList;  
+            EntityListIterator iter = (EntityListIterator) entryList;
             try {
                 iter.last();
                 listSize = iter.currentIndex();
@@ -2482,11 +2482,11 @@
             List items = (List) entryList;
             listSize = items.size();
         }
-        
+
         if (paginate) {
             viewIndex = this.getPaginateIndex(context);
             viewSize = this.getPaginateSize(context);
-            
+
             lowIndex = viewIndex * viewSize;
             highIndex = (viewIndex + 1) * viewSize;
         } else {
@@ -2495,18 +2495,18 @@
             lowIndex = 0;
             highIndex = defaultViewSize;
         }
-        
+
         context.put("listSize", Integer.valueOf(listSize));
         context.put("viewIndex", Integer.valueOf(viewIndex));
         context.put("viewSize", Integer.valueOf(viewSize));
         context.put("lowIndex", Integer.valueOf(lowIndex));
         context.put("highIndex", Integer.valueOf(highIndex));
     }
-    
+
     public String getPassedRowCount(Map<String, Object> context) {
         return rowCountExdr.expandString(context);
     }
-    
+
     public int getRowCount() {
         return this.rowCount;
     }
@@ -2525,18 +2525,18 @@
         String startFieldGroupId = null;
         String endFieldGroupId = null;
         if (endFieldGroup != null) {
-            endFieldGroupId = endFieldGroup.getId();  
+            endFieldGroupId = endFieldGroup.getId();
         }
         if (startFieldGroup == null) {
             firstFound = true;
         } else {
-            startFieldGroupId = startFieldGroup.getId();  
+            startFieldGroupId = startFieldGroup.getId();
         }
         Iterator iter = fieldGroupList.iterator();
         while (iter.hasNext()) {
             Object obj = iter.next();
             if (obj instanceof ModelForm.Banner) {
-                if (firstFound) inbetweenList.add(obj);  
+                if (firstFound) inbetweenList.add(obj);
             } else {
                 FieldGroup fieldGroup = (FieldGroup)obj;
                 String fieldGroupId = fieldGroup.getId();
@@ -2550,14 +2550,14 @@
                     if (fieldGroupId.equals(endFieldGroupId)) {
                         break;
                     } else {
-                        inbetweenList.add(fieldGroup);  
+                        inbetweenList.add(fieldGroup);
                     }
                 }
             }
         }
         return inbetweenList;
     }
-    
+
     public String getSortField(Map<String, Object> context) {
         String field = "sortField";
         String value = null;
@@ -2573,16 +2573,16 @@
         } catch (Exception e) {
             Debug.logWarning(e, "Error getting sortField: " + e.toString(), module);
         }
-        
+
         return value;
-    }    
-    
+    }
+
     /* Returns the list of ModelForm.UpdateArea objects.
      */
     public List<UpdateArea> getOnSubmitUpdateAreas() {
         return this.onSubmitUpdateAreas;
     }
-        
+
     public static class AltRowStyle {
         public String useWhen;
         public String style;
@@ -2591,7 +2591,7 @@
             this.style = altRowStyleElement.getAttribute("style");
         }
     }
-    
+
     /**
      * iterate through alt-row-styles list to see if should be used, then add style
      * @return The style for item row
@@ -2622,7 +2622,7 @@
 
         return styles;
     }
-    
+
     public static class AltTarget {
         public String useWhen;
         public FlexibleStringExpander targetExdr;
@@ -2727,7 +2727,7 @@
             this.defaultPosition = position;
         }
     }
-    
+
     public static interface FieldGroupBase {}
 
     public static class FieldGroup implements FieldGroupBase {
@@ -2740,7 +2740,7 @@
         protected static int baseSeqNo = 0;
         protected static String baseId = "_G";
         public FieldGroup(Element sortOrderElement, ModelForm modelForm) {
-          
+
             this.modelForm = modelForm;
             if (sortOrderElement != null) {
                 this.id = sortOrderElement.getAttribute("id");
@@ -2755,7 +2755,7 @@
                 if (this.initiallyCollapsed) {
                     this.collapsible = true;
                 }
-                
+
                 List sortFieldElements = UtilXml.childElementList(sortOrderElement, "sort-field");
                 Iterator sortFieldElementIter = sortFieldElements.iterator();
                 while (sortFieldElementIter.hasNext()) {
@@ -2768,36 +2768,36 @@
                 this.setId(lastGroupId);
             }
         }
-        
+
         public String getId() {
-            return this.id;  
+            return this.id;
         }
-        
+
         public void setId( String id) {
-            this.id = id;  
+            this.id = id;
         }
-        
+
         public String getStyle() {
-            return this.style;  
+            return this.style;
         }
-        
+
         public String getTitle() {
-            return this.title;  
+            return this.title;
         }
 
         public Boolean collapsible() {
-            return this.collapsible;  
+            return this.collapsible;
         }
 
         public Boolean initiallyCollapsed() {
-            return this.initiallyCollapsed;  
+            return this.initiallyCollapsed;
         }
 
         public void renderStartString(Appendable writer, Map<String, Object> context, FormStringRenderer formStringRenderer) throws IOException {
             formStringRenderer.renderFieldGroupOpen(writer, context, this);
             formStringRenderer.renderFormatSingleWrapperOpen(writer, context, modelForm);
         }
-        
+
         public void renderEndString(Appendable writer, Map<String, Object> context, FormStringRenderer formStringRenderer) throws IOException {
             formStringRenderer.renderFormatSingleWrapperClose(writer, context, modelForm);
             formStringRenderer.renderFieldGroupClose(writer, context, this);
@@ -2813,7 +2813,7 @@
         public FlexibleStringExpander leftTextStyle;
         public FlexibleStringExpander rightText;
         public FlexibleStringExpander rightTextStyle;
-        
+
         public Banner(Element sortOrderElement, ModelForm modelForm) {
             this.modelForm = modelForm;
             this.style = FlexibleStringExpander.getInstance(sortOrderElement.getAttribute("style"));
@@ -2824,7 +2824,7 @@
             this.rightText = FlexibleStringExpander.getInstance(sortOrderElement.getAttribute("right-text"));
             this.rightTextStyle = FlexibleStringExpander.getInstance(sortOrderElement.getAttribute("right-text-style"));
         }
-        
+
         public String getStyle(Map<String, Object> context) { return this.style.expandString(context); }
         public String getText(Map<String, Object> context) { return this.text.expandString(context); }
         public String getTextStyle(Map<String, Object> context) { return this.textStyle.expandString(context); }
@@ -2832,7 +2832,7 @@
         public String getLeftTextStyle(Map<String, Object> context) { return this.leftTextStyle.expandString(context); }
         public String getRightText(Map<String, Object> context) { return this.rightText.expandString(context); }
         public String getRightTextStyle(Map<String, Object> context) { return this.rightTextStyle.expandString(context); }
-        
+
         public void renderString(Appendable writer, Map<String, Object> context, FormStringRenderer formStringRenderer) throws IOException {
             formStringRenderer.renderBanner(writer, context, this);
         }
@@ -2921,7 +2921,7 @@
                     String target = link.getTarget(null);
                     String urlMode = link.getTargetType();
                     // Debug.logInfo("In findRequestNamesLinkedtoInWidget found link [" + link.rawString() + "] with target [" + target + "]", module);
-                    
+
                     Set<String> controllerLocAndRequestSet = ConfigXMLReader.findControllerRequestUniqueForTargetType(target, urlMode);
                     if (controllerLocAndRequestSet != null) {
                         allRequestsUsed.addAll(controllerLocAndRequestSet);
@@ -2979,14 +2979,14 @@
             for (AltTarget altTarget: this.altTargets) {
                 String target = altTarget.targetExdr.getOriginal();
                 String urlMode = "intra-app";
-                
+
                 Set<String> controllerLocAndRequestSet = ConfigXMLReader.findControllerRequestUniqueForTargetType(target, urlMode);
                 if (controllerLocAndRequestSet != null) {
                     allRequestsUsed.addAll(controllerLocAndRequestSet);
                 }
             }
         }
-        
+
         if (!this.target.isEmpty()) {
             String target = this.target.getOriginal();
             String urlMode = UtilValidate.isNotEmpty(this.targetType) ? this.targetType : "intra-app";
@@ -2997,7 +2997,7 @@
                 }
             }
         }
-        
+
         return allRequestsUsed;
     }
 }

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java?rev=757077&r1=757076&r2=757077&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java Sat Mar 21 23:24:58 2009
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -61,12 +61,12 @@
         this.modelForm = modelForm;
         if (Debug.verboseOn()) Debug.logVerbose("Reading Screen action with name: " + actionElement.getNodeName(), module);
     }
-    
+
     public abstract void runAction(Map<String, Object> context);
-    
+
     public static List<ModelFormAction> readSubActions(ModelForm modelForm, Element parentElement) {
         List<ModelFormAction> actions = new LinkedList<ModelFormAction>();
-        
+
         for (Element actionElement: UtilXml.childElementList(parentElement)) {
             if ("set".equals(actionElement.getNodeName())) {
                 actions.add(new SetField(modelForm, actionElement));
@@ -88,19 +88,19 @@
                 throw new IllegalArgumentException("Action element not supported with name: " + actionElement.getNodeName());
             }
         }
-        
+
         return actions;
     }
-    
+
     public static void runSubActions(List<ModelFormAction> actions, Map<String, Object> context) {
         if (actions == null) return;
-        
+
         for (ModelFormAction action: actions) {
             if (Debug.verboseOn()) Debug.logVerbose("Running screen action " + action.getClass().getName(), module);
             action.runAction(context);
         }
     }
-    
+
     public static class SetField extends ModelFormAction {
         protected FlexibleMapAccessor<Object> field;
         protected FlexibleMapAccessor<String> fromField;
@@ -108,7 +108,7 @@
         protected FlexibleStringExpander defaultExdr;
         protected FlexibleStringExpander globalExdr;
         protected String type;
-        
+
         public SetField(ModelForm modelForm, Element setElement) {
             super (modelForm, setElement);
             this.field = FlexibleMapAccessor.getInstance(setElement.getAttribute("field"));
@@ -121,12 +121,12 @@
                 throw new IllegalArgumentException("Cannot specify a from-field [" + setElement.getAttribute("from-field") + "] and a value [" + setElement.getAttribute("value") + "] on the set action in a screen widget");
             }
         }
-        
+
         public void runAction(Map<String, Object> context) {
             String globalStr = this.globalExdr.expandString(context);
             // default to false
             boolean global = "true".equals(globalStr);
-            
+
             Object newValue = null;
             if (!this.fromField.isEmpty()) {
                 newValue = this.fromField.get(context);
@@ -148,18 +148,18 @@
                     Debug.logError(e, errMsg, module);
                     throw new IllegalArgumentException(errMsg);
                 }
-        
+
             }
             if (Debug.verboseOn()) Debug.logVerbose("In screen setting field [" + this.field.getOriginalName() + "] to value: " + newValue, module);
             this.field.put(context, newValue);
-            
+
             if (global) {
                 Map<String, Object> globalCtx = UtilGenerics.checkMap(context.get("globalContext"));
                 if (globalCtx != null) {
                     this.field.put(globalCtx, newValue);
                 }
             }
-            
+
             // this is a hack for backward compatibility with the JPublish page object
             Map<String, Object> page = UtilGenerics.checkMap(context.get("page"));
             if (page != null) {
@@ -167,19 +167,19 @@
             }
         }
     }
-    
+
     public static class PropertyMap extends ModelFormAction {
         protected FlexibleStringExpander resourceExdr;
         protected FlexibleMapAccessor<Map<String, Object>> mapNameAcsr;
         protected FlexibleStringExpander globalExdr;
-        
+
         public PropertyMap(ModelForm modelForm, Element setElement) {
             super (modelForm, setElement);
             this.resourceExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("resource"));
             this.mapNameAcsr = FlexibleMapAccessor.getInstance(setElement.getAttribute("map-name"));
             this.globalExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("global"));
         }
-        
+
         public void runAction(Map<String, Object> context) {
             String globalStr = this.globalExdr.expandString(context);
             // default to false
@@ -198,9 +198,9 @@
             }
         }
     }
-    
+
     public static class PropertyToField extends ModelFormAction {
-        
+
         protected FlexibleStringExpander resourceExdr;
         protected FlexibleStringExpander propertyExdr;
         protected FlexibleMapAccessor<String> fieldAcsr;
@@ -219,7 +219,7 @@
             this.argListAcsr = FlexibleMapAccessor.getInstance(setElement.getAttribute("arg-list-name"));
             this.globalExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("global"));
         }
-        
+
         public void runAction(Map<String, Object> context) {
             //String globalStr = this.globalExdr.expandString(context);
             // default to false
@@ -228,7 +228,7 @@
             Locale locale = (Locale) context.get("locale");
             String resource = this.resourceExdr.expandString(context, locale);
             String property = this.propertyExdr.expandString(context, locale);
-            
+
             String value = null;
             if (noLocale) {
                 value = UtilProperties.getPropertyValue(resource, property);
@@ -238,8 +238,8 @@
             if (value == null || value.length() == 0) {
                 value = this.defaultExdr.expandString(context);
             }
-            
-            // note that expanding the value string here will handle defaultValue and the string from
+
+            // note that expanding the value string here will handle defaultValue and the string from
             //  the properties file; if we decide later that we don't want the string from the properties
             //  file to be expanded we should just expand the defaultValue at the beginning of this method.
             value = FlexibleStringExpander.expandString(value, context);
@@ -254,15 +254,15 @@
             fieldAcsr.put(context, value);
         }
     }
-    
+
     public static class Script extends ModelFormAction {
         protected String location;
-        
+
         public Script(ModelForm modelForm, Element scriptElement) {
             super (modelForm, scriptElement);
             this.location = scriptElement.getAttribute("location");
         }
-        
+
         public void runAction(Map<String, Object> context) {
             if (location.endsWith(".bsh")) {
                 try {
@@ -292,7 +292,7 @@
         protected FlexibleStringExpander autoFieldMapExdr;
         protected FlexibleStringExpander resultMapListNameExdr;
         protected Map<FlexibleMapAccessor<Object>, Object> fieldMap;
-        
+
         public Service(ModelForm modelForm, Element serviceElement) {
             super (modelForm, serviceElement);
             this.serviceNameExdr = FlexibleStringExpander.getInstance(serviceElement.getAttribute("service-name"));
@@ -315,19 +315,19 @@
                 this.resultMapListNameExdr = FlexibleStringExpander.getInstance(serviceElement.getAttribute("result-map-list"));
                 if (this.resultMapListNameExdr.isEmpty()) this.resultMapListNameExdr = FlexibleStringExpander.getInstance(serviceElement.getAttribute("result-map-list-name"));
             }
-            
+
             this.fieldMap = EntityFinderUtil.makeFieldMap(serviceElement);
         }
-        
+
         public void runAction(Map<String, Object> context) {
             String serviceNameExpanded = this.serviceNameExdr.expandString(context);
             if (UtilValidate.isEmpty(serviceNameExpanded)) {
                 throw new IllegalArgumentException("Service name was empty, expanded from: " + this.serviceNameExdr.getOriginal());
             }
-            
+
             String autoFieldMapString = this.autoFieldMapExdr.expandString(context);
             boolean autoFieldMapBool = !"false".equals(autoFieldMapString);
-            
+
             try {
                 Map<String, Object> serviceContext = null;
                 if (autoFieldMapBool) {
@@ -335,13 +335,13 @@
                 } else {
                     serviceContext = new HashMap<String, Object>();
                 }
-                
+
                 if (this.fieldMap != null) {
                     EntityFinderUtil.expandFieldMapToContext(this.fieldMap, context, serviceContext);
                 }
-                
+
                 Map<String, Object> result = this.modelForm.getDispatcher(context).runSync(serviceNameExpanded, serviceContext);
-                
+
                 if (!this.resultMapNameAcsr.isEmpty()) {
                     this.resultMapNameAcsr.put(context, result);
                     String queryString = (String)result.get("queryString");
@@ -352,7 +352,7 @@
                             String queryStringEncoded = queryString.replaceAll("&", "%26");
                             context.put("queryStringEncoded", queryStringEncoded);
                         } catch (PatternSyntaxException e) {
-                            
+
                         }
                     }
                 } else {
@@ -377,12 +377,12 @@
 
     public static class EntityOne extends ModelFormAction {
         protected PrimaryKeyFinder finder;
-        
+
         public EntityOne(ModelForm modelForm, Element entityOneElement) {
             super (modelForm, entityOneElement);
             finder = new PrimaryKeyFinder(entityOneElement);
         }
-        
+
         public void runAction(Map<String, Object> context) {
             try {
                 finder.runFind(context, this.modelForm.getDelegator(context));
@@ -397,7 +397,7 @@
     public static class EntityAnd extends ModelFormAction {
         protected ByAndFinder finder;
         String actualListName;
-        
+
         public EntityAnd(ModelForm modelForm, Element entityAndElement) {
             super (modelForm, entityAndElement);
 
@@ -405,7 +405,7 @@
             // Document ownerDoc = entityAndElement.getOwnerDocument();
             // boolean useCache = "true".equalsIgnoreCase(entityAndElement.getAttribute("use-cache"));
             // if (!useCache) UtilXml.addChildElement(entityAndElement, "use-iterator", ownerDoc);
-            
+
             // make list-name optional
             if (UtilValidate.isEmpty(entityAndElement.getAttribute("list")) && UtilValidate.isEmpty(entityAndElement.getAttribute("list-name"))) {
                 String lstNm = modelForm.getListName();
@@ -418,7 +418,7 @@
             if (UtilValidate.isEmpty(this.actualListName)) this.actualListName = entityAndElement.getAttribute("list-name");
             finder = new ByAndFinder(entityAndElement);
         }
-        
+
         public void runAction(Map<String, Object> context) {
             try {
                 // don't want to do this: context.put("defaultFormResultList", null);
@@ -434,21 +434,21 @@
                 throw new IllegalArgumentException(errMsg);
             }
         }
-        
+
     }
 
     public static class EntityCondition extends ModelFormAction {
         ByConditionFinder finder;
         String actualListName;
-        
+
         public EntityCondition(ModelForm modelForm, Element entityConditionElement) {
             super (modelForm, entityConditionElement);
-            
+
             //don't want to default to the iterator, should be specified explicitly, not the default
             // Document ownerDoc = entityConditionElement.getOwnerDocument();
             // boolean useCache = "true".equalsIgnoreCase(entityConditionElement.getAttribute("use-cache"));
             // if (!useCache) UtilXml.addChildElement(entityConditionElement, "use-iterator", ownerDoc);
-            
+
             // make list-name optional
             if (UtilValidate.isEmpty(entityConditionElement.getAttribute("list")) && UtilValidate.isEmpty(entityConditionElement.getAttribute("list-name"))) {
                 String lstNm = modelForm.getListName();
@@ -461,7 +461,7 @@
             if (UtilValidate.isEmpty(this.actualListName)) this.actualListName = entityConditionElement.getAttribute("list-name");
             finder = new ByConditionFinder(entityConditionElement);
         }
-        
+
         public void runAction(Map<String, Object> context) {
             try {
                 // don't want to do this: context.put("defaultFormResultList", null);