svn commit: r1858295 [5/5] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/ applications/content/src/main/java/org/apache/ofbiz/content/content/ applications/content/src/main/java/org/apache/...

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

svn commit: r1858295 [5/5] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/ applications/content/src/main/java/org/apache/ofbiz/content/content/ applications/content/src/main/java/org/apache/...

mthl
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/FoFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/FoFormRenderer.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/FoFormRenderer.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/FoFormRenderer.java Sat Apr 27 19:34:25 2019
@@ -88,40 +88,47 @@ public class FoFormRenderer extends Html
         writer.append("</fo:block>");
     }
 
+    @Override
     public void renderDisplayField(Appendable writer, Map<String, Object> context, DisplayField displayField) throws IOException {
         ModelFormField modelFormField = displayField.getModelFormField();
         this.makeBlockString(writer, modelFormField.getWidgetStyle(), displayField.getDescription(context));
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderHyperlinkField(Appendable writer, Map<String, Object> context, HyperlinkField hyperlinkField) throws IOException {
         ModelFormField modelFormField = hyperlinkField.getModelFormField();
         this.makeBlockString(writer, modelFormField.getWidgetStyle(), hyperlinkField.getDescription(context));
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderMenuField(Appendable writer, Map<String, Object> context, MenuField menuField) throws IOException {
         menuField.renderFieldString(writer, context, null);
     }
 
+    @Override
     public void renderTextField(Appendable writer, Map<String, Object> context, TextField textField) throws IOException {
         ModelFormField modelFormField = textField.getModelFormField();
         this.makeBlockString(writer, modelFormField.getWidgetStyle(), modelFormField.getEntry(context, textField.getDefaultValue(context)));
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderTextareaField(Appendable writer, Map<String, Object> context, TextareaField textareaField) throws IOException {
         ModelFormField modelFormField = textareaField.getModelFormField();
         this.makeBlockString(writer, modelFormField.getWidgetStyle(), modelFormField.getEntry(context, textareaField.getDefaultValue(context)));
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderDateTimeField(Appendable writer, Map<String, Object> context, DateTimeField dateTimeField) throws IOException {
         ModelFormField modelFormField = dateTimeField.getModelFormField();
         this.makeBlockString(writer, modelFormField.getWidgetStyle(), modelFormField.getEntry(context, dateTimeField.getDefaultValue(context)));
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderDropDownField(Appendable writer, Map<String, Object> context, DropDownField dropDownField) throws IOException {
         ModelFormField modelFormField = dropDownField.getModelFormField();
         String currentValue = modelFormField.getEntry(context);
@@ -152,53 +159,66 @@ public class FoFormRenderer extends Html
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderCheckField(Appendable writer, Map<String, Object> context, CheckField checkField) throws IOException {
         this.makeBlockString(writer, null, "");
     }
 
+    @Override
     public void renderRadioField(Appendable writer, Map<String, Object> context, RadioField radioField) throws IOException {
         this.makeBlockString(writer, null, "");
     }
 
+    @Override
     public void renderSubmitField(Appendable writer, Map<String, Object> context, SubmitField submitField) throws IOException {
         this.makeBlockString(writer, null, "");
     }
 
+    @Override
     public void renderResetField(Appendable writer, Map<String, Object> context, ResetField resetField) throws IOException {
         this.makeBlockString(writer, null, "");
     }
 
+    @Override
     public void renderHiddenField(Appendable writer, Map<String, Object> context, HiddenField hiddenField) throws IOException {
     }
 
+    @Override
     public void renderHiddenField(Appendable writer, Map<String, Object> context, ModelFormField modelFormField, String value) throws IOException {
     }
 
+    @Override
     public void renderIgnoredField(Appendable writer, Map<String, Object> context, IgnoredField ignoredField) throws IOException {
     }
 
+    @Override
     public void renderFieldTitle(Appendable writer, Map<String, Object> context, ModelFormField modelFormField) throws IOException {
         String tempTitleText = modelFormField.getTitle(context);
         writer.append(tempTitleText);
     }
 
+    @Override
     public void renderSingleFormFieldTitle(Appendable writer, Map<String, Object> context, ModelFormField modelFormField) throws IOException {
         renderFieldTitle(writer, context, modelFormField);
     }
 
+    @Override
     public void renderFormOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         this.widgetCommentsEnabled = ModelWidget.widgetBoundaryCommentsEnabled(context);
         renderBeginningBoundaryComment(writer, "Form Widget", modelForm);
     }
 
+    @Override
     public void renderFormClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         renderEndingBoundaryComment(writer, "Form Widget", modelForm);
     }
 
+    @Override
     public void renderMultiFormClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         renderEndingBoundaryComment(writer, "Form Widget", modelForm);
     }
 
+    @Override
     public void renderFormatListWrapperOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         writer.append("<fo:table border=\"solid black\">");
         List<ModelFormField> childFieldList = modelForm.getFieldList();
@@ -219,17 +239,20 @@ public class FoFormRenderer extends Html
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatListWrapperClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         writer.append("</fo:table-body>");
         writer.append("</fo:table>");
         appendWhitespace(writer);
     }
     
+    @Override
     public void renderFormatHeaderOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         writer.append("<fo:table-header>");
         appendWhitespace(writer);
     }
         
+    @Override
     public void renderFormatHeaderClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         writer.append("  </fo:table-header>");
         writer.append("  <fo:table-body>");
@@ -238,16 +261,19 @@ public class FoFormRenderer extends Html
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatHeaderRowOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         writer.append("<fo:table-row>");
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatHeaderRowClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         writer.append("</fo:table-row>");
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatHeaderRowCellOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm, ModelFormField modelFormField, int positionSpan) throws IOException {
         writer.append("<fo:table-cell ");
         if (positionSpan > 1) {
@@ -261,35 +287,42 @@ public class FoFormRenderer extends Html
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatHeaderRowCellClose(Appendable writer, Map<String, Object> context, ModelForm modelForm, ModelFormField modelFormField) throws IOException {
         writer.append("</fo:block>");
         writer.append("</fo:table-cell>");
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatHeaderRowFormCellOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         writer.append("<fo:table-cell>");
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatHeaderRowFormCellClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         writer.append("</fo:table-cell>");
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatHeaderRowFormCellTitleSeparator(Appendable writer, Map<String, Object> context, ModelForm modelForm, ModelFormField modelFormField, boolean isLast) throws IOException {
     }
 
+    @Override
     public void renderFormatItemRowOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         writer.append("<fo:table-row>");
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatItemRowClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         writer.append("</fo:table-row>");
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatItemRowCellOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm, ModelFormField modelFormField, int positionSpan) throws IOException {
         writer.append("<fo:table-cell ");
         if (positionSpan > 1) {
@@ -306,22 +339,26 @@ public class FoFormRenderer extends Html
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatItemRowCellClose(Appendable writer, Map<String, Object> context, ModelForm modelForm, ModelFormField modelFormField) throws IOException {
         writer.append("</fo:table-cell>");
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatItemRowFormCellOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         writer.append("<fo:table-cell>");
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatItemRowFormCellClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         writer.append("</fo:table-cell>");
         appendWhitespace(writer);
     }
 
     // TODO: multi columns (position attribute) in single forms are still not implemented
+    @Override
     public void renderFormatSingleWrapperOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         writer.append("<fo:table>");
         appendWhitespace(writer);
@@ -332,70 +369,83 @@ public class FoFormRenderer extends Html
         writer.append("<fo:table-body>");
         appendWhitespace(writer);
     }
+    @Override
     public void renderFormatSingleWrapperClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         writer.append("</fo:table-body>");
         writer.append("</fo:table>");
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatFieldRowOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         writer.append("<fo:table-row>");
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatFieldRowClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         writer.append("</fo:table-row>");
         appendWhitespace(writer);
     }
 
 
+    @Override
     public void renderFormatFieldRowTitleCellOpen(Appendable writer, Map<String, Object> context, ModelFormField modelFormField) throws IOException {
         writer.append("<fo:table-cell font-weight=\"bold\" text-align=\"right\" padding=\"3pt\">");
         writer.append("<fo:block>");
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatFieldRowTitleCellClose(Appendable writer, Map<String, Object> context, ModelFormField modelFormField) throws IOException {
         writer.append("</fo:block>");
         writer.append("</fo:table-cell>");
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatFieldRowSpacerCell(Appendable writer, Map<String, Object> context, ModelFormField modelFormField) throws IOException {
     }
 
+    @Override
     public void renderFormatFieldRowWidgetCellOpen(Appendable writer, Map<String, Object> context, ModelFormField modelFormField, int positions, int positionSpan, Integer nextPositionInRow) throws IOException {
         writer.append("<fo:table-cell text-align=\"left\" padding=\"2pt\" padding-left=\"5pt\">");
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatFieldRowWidgetCellClose(Appendable writer, Map<String, Object> context, ModelFormField modelFormField, int positions, int positionSpan, Integer nextPositionInRow) throws IOException {
         writer.append("</fo:table-cell>");
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderFormatEmptySpace(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         // TODO
     }
 
+    @Override
     public void renderTextFindField(Appendable writer, Map<String, Object> context, TextFindField textFindField) throws IOException {
         ModelFormField modelFormField = textFindField.getModelFormField();
         this.makeBlockString(writer, modelFormField.getWidgetStyle(), modelFormField.getEntry(context, textFindField.getDefaultValue(context)));
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderRangeFindField(Appendable writer, Map<String, Object> context, RangeFindField rangeFindField) throws IOException {
         ModelFormField modelFormField = rangeFindField.getModelFormField();
         this.makeBlockString(writer, modelFormField.getWidgetStyle(), modelFormField.getEntry(context, rangeFindField.getDefaultValue(context)));
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderDateFindField(Appendable writer, Map<String, Object> context, DateFindField dateFindField) throws IOException {
         ModelFormField modelFormField = dateFindField.getModelFormField();
         this.makeBlockString(writer, modelFormField.getWidgetStyle(), modelFormField.getEntry(context, dateFindField.getDefaultValue(context)));
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderLookupField(Appendable writer, Map<String, Object> context, LookupField lookupField) throws IOException {
         ModelFormField modelFormField = lookupField.getModelFormField();
         this.makeBlockString(writer, modelFormField.getWidgetStyle(), modelFormField.getEntry(context, lookupField.getDefaultValue(context)));
@@ -405,29 +455,35 @@ public class FoFormRenderer extends Html
     public void renderNextPrev(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
     }
 
+    @Override
     public void renderFileField(Appendable writer, Map<String, Object> context, FileField textField) throws IOException {
         ModelFormField modelFormField = textField.getModelFormField();
         this.makeBlockString(writer, modelFormField.getWidgetStyle(), modelFormField.getEntry(context, textField.getDefaultValue(context)));
         appendWhitespace(writer);
     }
 
+    @Override
     public void renderPasswordField(Appendable writer, Map<String, Object> context, PasswordField passwordField) throws IOException {
         this.makeBlockString(writer, null, "");
     }
 
+    @Override
     public void renderImageField(Appendable writer, Map<String, Object> context, ImageField imageField) throws IOException {
         // TODO
         this.makeBlockString(writer, null, "");
     }
 
+    @Override
     public void renderFieldGroupOpen(Appendable writer, Map<String, Object> context, ModelForm.FieldGroup fieldGroup) throws IOException {
         // TODO
     }
 
+    @Override
     public void renderFieldGroupClose(Appendable writer, Map<String, Object> context, ModelForm.FieldGroup fieldGroup) throws IOException {
         // TODO
     }
 
+    @Override
     public void renderBanner(Appendable writer, Map<String, Object> context, ModelForm.Banner banner) throws IOException {
         // TODO
         this.makeBlockString(writer, null, "");
@@ -436,8 +492,10 @@ public class FoFormRenderer extends Html
     public void renderHyperlinkTitle(Appendable writer, Map<String, Object> context, ModelFormField modelFormField, String titleText) throws IOException {
     }
 
+    @Override
     public void renderContainerFindField(Appendable writer, Map<String, Object> context, ContainerField containerField) throws IOException {
     }
+    @Override
     public void renderEmptyFormDataMessage(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         // TODO
     }

Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRenderer.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRenderer.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRenderer.java Sat Apr 27 19:34:25 2019
@@ -114,6 +114,7 @@ public class HtmlMenuRenderer extends Ht
         }
     }
 
+    @Override
     public void renderFormatSimpleWrapperRows(Appendable writer, Map<String, Object> context, Object menuObj) throws IOException {
         List<ModelMenuItem> menuItemList = ((ModelMenu) menuObj).getMenuItemList();
         for (ModelMenuItem currentMenuItem: menuItemList) {
@@ -121,6 +122,7 @@ public class HtmlMenuRenderer extends Ht
         }
     }
 
+    @Override
     public void renderMenuItem(Appendable writer, Map<String, Object> context, ModelMenuItem menuItem) throws IOException {
         boolean hideThisItem = isHideIfSelected(menuItem, context);
 
@@ -203,6 +205,7 @@ public class HtmlMenuRenderer extends Ht
         return disabled;
     }
 
+    @Override
     public void renderMenuOpen(Appendable writer, Map<String, Object> context, ModelMenu modelMenu) throws IOException {
 
         this.widgetCommentsEnabled = ModelWidget.widgetBoundaryCommentsEnabled(context);
@@ -240,9 +243,7 @@ public class HtmlMenuRenderer extends Ht
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.ofbiz.widget.menu.MenuStringRenderer#renderMenuClose(java.io.Writer, java.util.Map, org.apache.ofbiz.widget.menu.ModelMenu)
-     */
+    @Override
     public void renderMenuClose(Appendable writer, Map<String, Object> context, ModelMenu modelMenu) throws IOException {
         // TODO: div can't be directly inside an UL
         String fillStyle = modelMenu.getFillStyle();
@@ -272,9 +273,11 @@ public class HtmlMenuRenderer extends Ht
         }
     }
 
+    @Override
     public void renderFormatSimpleWrapperOpen(Appendable writer, Map<String, Object> context, ModelMenu modelMenu) throws IOException {
     }
 
+    @Override
     public void renderFormatSimpleWrapperClose(Appendable writer, Map<String, Object> context, ModelMenu modelMenu) throws IOException {
     }
 
@@ -338,6 +341,7 @@ public class HtmlMenuRenderer extends Ht
         return title;
     }
 
+    @Override
     public void renderLink(Appendable writer, Map<String, Object> context, ModelMenuItem.MenuLink link) throws IOException {
         String target = link.getTarget(context);
         ModelMenuItem menuItem = link.getLinkMenuItem();
@@ -443,6 +447,7 @@ public class HtmlMenuRenderer extends Ht
 
     }
 
+    @Override
     public void renderImage(Appendable writer, Map<String, Object> context, Image image) throws IOException {
         // open tag
         writer.append("<img ");

Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java Sat Apr 27 19:34:25 2019
@@ -55,6 +55,7 @@ public class HtmlTreeRenderer extends Ht
 
     public HtmlTreeRenderer() {}
 
+    @Override
     public void renderNodeBegin(Appendable writer, Map<String, Object> context, ModelTree.ModelNode node, int depth) throws IOException {
         String currentNodeTrailPiped = null;
         List<String> currentNodeTrail = UtilGenerics.toList(context.get("currentNodeTrail"));
@@ -131,6 +132,7 @@ public class HtmlTreeRenderer extends Ht
         }
     }
 
+    @Override
     public void renderNodeEnd(Appendable writer, Map<String, Object> context, ModelTree.ModelNode node) throws IOException {
         Boolean processChildren = (Boolean) context.get("processChildren");
         if (processChildren) {
@@ -147,6 +149,7 @@ public class HtmlTreeRenderer extends Ht
         }
     }
 
+    @Override
     public void renderLastElement(Appendable writer, Map<String, Object> context, ModelTree.ModelNode node) throws IOException {
         Boolean processChildren = (Boolean) context.get("processChildren");
         if (processChildren) {
@@ -155,6 +158,7 @@ public class HtmlTreeRenderer extends Ht
         }
     }
 
+    @Override
     public void renderLabel(Appendable writer, Map<String, Object> context, ModelTree.ModelNode.Label label) throws IOException {
         // open tag
         writer.append("<span");
@@ -182,6 +186,7 @@ public class HtmlTreeRenderer extends Ht
     }
 
 
+    @Override
     public void renderLink(Appendable writer, Map<String, Object> context, ModelTree.ModelNode.Link link) throws IOException {
         // open tag
         writer.append("<a");
@@ -265,6 +270,7 @@ public class HtmlTreeRenderer extends Ht
         writer.append("</a>");
     }
 
+    @Override
     public void renderImage(Appendable writer, Map<String, Object> context, ModelTree.ModelNode.Image image) throws IOException {
         // open tag
         writer.append("<img ");
@@ -332,6 +338,7 @@ public class HtmlTreeRenderer extends Ht
 
     }
 
+    @Override
     public ScreenStringRenderer getScreenStringRenderer(Map<String, Object> context) {
         VisualTheme visualTheme = (VisualTheme) context.get("visualTheme");
         ModelTheme modelTheme = visualTheme.getModelTheme();

Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java Sat Apr 27 19:34:25 2019
@@ -198,6 +198,7 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderDisplayField(Appendable writer, Map<String, Object> context, DisplayField displayField) throws IOException {
         ModelFormField modelFormField = displayField.getModelFormField();
         String idName = modelFormField.getCurrentContainerId(context);
@@ -317,6 +318,7 @@ public final class MacroFormRenderer imp
         this.appendTooltip(writer, context, modelFormField);
     }
 
+    @Override
     public void renderHyperlinkField(Appendable writer, Map<String, Object> context, HyperlinkField hyperlinkField) throws IOException {
         this.request.setAttribute("image", hyperlinkField.getImageLocation(context));
         ModelFormField modelFormField = hyperlinkField.getModelFormField();
@@ -337,10 +339,12 @@ public final class MacroFormRenderer imp
         this.request.removeAttribute("descriptionSize");
     }
 
+    @Override
     public void renderMenuField(Appendable writer, Map<String, Object> context, MenuField menuField) throws IOException {
         menuField.renderFieldString(writer, context, null);
     }
 
+    @Override
     public void renderTextField(Appendable writer, Map<String, Object> context, TextField textField) throws IOException {
         ModelFormField modelFormField = textField.getModelFormField();
         String name = modelFormField.getParameterName(context);
@@ -440,6 +444,7 @@ public final class MacroFormRenderer imp
         this.appendTooltip(writer, context, modelFormField);
     }
 
+    @Override
     public void renderTextareaField(Appendable writer, Map<String, Object> context, TextareaField textareaField) throws IOException {
         ModelFormField modelFormField = textareaField.getModelFormField();
         String name = modelFormField.getParameterName(context);
@@ -524,6 +529,7 @@ public final class MacroFormRenderer imp
         this.appendTooltip(writer, context, modelFormField);
     }
 
+    @Override
     public void renderDateTimeField(Appendable writer, Map<String, Object> context, DateTimeField dateTimeField) throws IOException {
         ModelFormField modelFormField = dateTimeField.getModelFormField();
         String paramName = modelFormField.getParameterName(context);
@@ -770,6 +776,7 @@ public final class MacroFormRenderer imp
         this.appendTooltip(writer, context, modelFormField);
     }
 
+    @Override
     public void renderDropDownField(Appendable writer, Map<String, Object> context, DropDownField dropDownField) throws IOException {
         ModelFormField modelFormField = dropDownField.getModelFormField();
         ModelForm modelForm = modelFormField.getModelForm();
@@ -1014,6 +1021,7 @@ public final class MacroFormRenderer imp
         this.appendTooltip(writer, context, modelFormField);
     }
 
+    @Override
     public void renderCheckField(Appendable writer, Map<String, Object> context, CheckField checkField) throws IOException {
         ModelFormField modelFormField = checkField.getModelFormField();
         String currentValue = modelFormField.getEntry(context);
@@ -1081,6 +1089,7 @@ public final class MacroFormRenderer imp
         this.appendTooltip(writer, context, modelFormField);
     }
 
+    @Override
     public void renderRadioField(Appendable writer, Map<String, Object> context, RadioField radioField) throws IOException {
         ModelFormField modelFormField = radioField.getModelFormField();
         List<ModelFormField.OptionValue> allOptionValues = radioField.getAllOptionValues(context, WidgetWorker.getDelegator(context));
@@ -1142,6 +1151,7 @@ public final class MacroFormRenderer imp
         this.appendTooltip(writer, context, modelFormField);
     }
 
+    @Override
     public void renderSubmitField(Appendable writer, Map<String, Object> context, SubmitField submitField) throws IOException {
         ModelFormField modelFormField = submitField.getModelFormField();
         ModelForm modelForm = modelFormField.getModelForm();
@@ -1219,6 +1229,7 @@ public final class MacroFormRenderer imp
         this.appendTooltip(writer, context, modelFormField);
     }
 
+    @Override
     public void renderResetField(Appendable writer, Map<String, Object> context, ResetField resetField) throws IOException {
         ModelFormField modelFormField = resetField.getModelFormField();
         String name = modelFormField.getParameterName(context);
@@ -1246,12 +1257,14 @@ public final class MacroFormRenderer imp
         this.appendTooltip(writer, context, modelFormField);
     }
 
+    @Override
     public void renderHiddenField(Appendable writer, Map<String, Object> context, HiddenField hiddenField) throws IOException {
         ModelFormField modelFormField = hiddenField.getModelFormField();
         String value = hiddenField.getValue(context);
         this.renderHiddenField(writer, context, modelFormField, value);
     }
 
+    @Override
     public void renderHiddenField(Appendable writer, Map<String, Object> context, ModelFormField modelFormField, String value) throws IOException {
         String name = modelFormField.getParameterName(context);
         String action = modelFormField.getAction(context);
@@ -1280,10 +1293,12 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderIgnoredField(Appendable writer, Map<String, Object> context, IgnoredField ignoredField) {
         // do nothing, it's an ignored field; could add a comment or something if we wanted to
     }
 
+    @Override
     public void renderFieldTitle(Appendable writer, Map<String, Object> context, ModelFormField modelFormField) throws IOException {
         String titleText = modelFormField.getTitle(context);
         String style = modelFormField.getTitleStyle();
@@ -1370,10 +1385,12 @@ public final class MacroFormRenderer imp
         }
     }
 
+    @Override
     public void renderSingleFormFieldTitle(Appendable writer, Map<String, Object> context, ModelFormField modelFormField) throws IOException {
         renderFieldTitle(writer, context, modelFormField);
     }
 
+    @Override
     public void renderFormOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         this.widgetCommentsEnabled = ModelWidget.widgetBoundaryCommentsEnabled(context);
         if (modelForm instanceof ModelSingleForm) {
@@ -1443,6 +1460,7 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderFormClose />");
@@ -1454,6 +1472,7 @@ public final class MacroFormRenderer imp
         }
     }
 
+    @Override
     public void renderMultiFormClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         //FIXME copy from HtmlFormRenderer.java (except for the closing form tag itself, that is now converted)
         Iterator<ModelFormField> submitFields = modelForm.getMultiSubmitFields().iterator();
@@ -1489,6 +1508,7 @@ public final class MacroFormRenderer imp
         }
     }
 
+    @Override
     public void renderFormatListWrapperOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         Map<String, Object> inputFields = UtilGenerics.checkMap(context.get("requestParameters"));
         Map<String, Object> queryStringMap = UtilGenerics.toMap(context.get("queryStringMap"));
@@ -1546,6 +1566,7 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
 
     }
+    @Override
     public void renderEmptyFormDataMessage(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderEmptyFormDataMessage");
@@ -1555,6 +1576,7 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatListWrapperClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderFormatListWrapperClose");
@@ -1572,6 +1594,7 @@ public final class MacroFormRenderer imp
         }
     }
 
+    @Override
     public void renderFormatHeaderOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderFormatHeaderOpen ");
@@ -1579,6 +1602,7 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatHeaderClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderFormatHeaderClose");
@@ -1586,6 +1610,7 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatHeaderRowOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         String headerStyle = FlexibleStringExpander.expandString(modelForm.getHeaderRowStyle(), context);
         StringWriter sr = new StringWriter();
@@ -1596,12 +1621,14 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatHeaderRowClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderFormatHeaderRowClose />");
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatHeaderRowCellOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm, ModelFormField modelFormField, int positionSpan) throws IOException {
         String areaStyle = modelFormField.getTitleAreaStyle();
         StringWriter sr = new StringWriter();
@@ -1614,12 +1641,14 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatHeaderRowCellClose(Appendable writer, Map<String, Object> context, ModelForm modelForm, ModelFormField modelFormField) throws IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderFormatHeaderRowCellClose />");
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatHeaderRowFormCellOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         String areaStyle = modelForm.getFormTitleAreaStyle();
         StringWriter sr = new StringWriter();
@@ -1630,12 +1659,14 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatHeaderRowFormCellClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderFormatHeaderRowFormCellClose />");
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatHeaderRowFormCellTitleSeparator(Appendable writer, Map<String, Object> context, ModelForm modelForm, ModelFormField modelFormField, boolean isLast) throws IOException {
         String titleStyle = modelFormField.getTitleStyle();
         StringWriter sr = new StringWriter();
@@ -1648,6 +1679,7 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatItemRowOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         Integer itemIndex = (Integer) context.get("itemIndex");
         String altRowStyles = "";
@@ -1677,6 +1709,7 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatItemRowClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderFormatItemRowClose ");
@@ -1686,6 +1719,7 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatItemRowCellOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm, ModelFormField modelFormField, int positionSpan) throws IOException {
         String areaStyle = modelFormField.getWidgetAreaStyle();
         StringWriter sr = new StringWriter();
@@ -1700,6 +1734,7 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatItemRowCellClose(Appendable writer, Map<String, Object> context, ModelForm modelForm, ModelFormField modelFormField) throws IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderFormatItemRowCellClose");
@@ -1709,6 +1744,7 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatItemRowFormCellOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         String areaStyle = modelForm.getFormTitleAreaStyle();
         StringWriter sr = new StringWriter();
@@ -1719,12 +1755,14 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatItemRowFormCellClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderFormatItemRowFormCellClose />");
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatSingleWrapperOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         String style = FlexibleStringExpander.expandString(modelForm.getDefaultTableStyle(), context);
         StringWriter sr = new StringWriter();
@@ -1737,6 +1775,7 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatSingleWrapperClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderFormatSingleWrapperClose");
@@ -1746,18 +1785,21 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatFieldRowOpen(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderFormatFieldRowOpen />");
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatFieldRowClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderFormatFieldRowClose />");
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatFieldRowTitleCellOpen(Appendable writer, Map<String, Object> context, ModelFormField modelFormField) throws IOException {
         String style = modelFormField.getTitleAreaStyle();
         StringWriter sr = new StringWriter();
@@ -1768,15 +1810,18 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatFieldRowTitleCellClose(Appendable writer, Map<String, Object> context, ModelFormField modelFormField) throws IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderFormatFieldRowTitleCellClose />");
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatFieldRowSpacerCell(Appendable writer, Map<String, Object> context, ModelFormField modelFormField) throws IOException {
     }
 
+    @Override
     public void renderFormatFieldRowWidgetCellOpen(Appendable writer, Map<String, Object> context, ModelFormField modelFormField, int positions, int positionSpan, Integer nextPositionInRow) throws IOException {
         String areaStyle = modelFormField.getWidgetAreaStyle();
         StringWriter sr = new StringWriter();
@@ -1789,18 +1834,21 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatFieldRowWidgetCellClose(Appendable writer, Map<String, Object> context, ModelFormField modelFormField, int positions, int positionSpan, Integer nextPositionInRow) throws IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderFormatFieldRowWidgetCellClose />");
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFormatEmptySpace(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderFormatEmptySpace />");
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderTextFindField(Appendable writer, Map<String, Object> context, TextFindField textFindField) throws IOException {
         ModelFormField modelFormField = textFindField.getModelFormField();
         String defaultOption = textFindField.getDefaultOption(context);
@@ -1893,6 +1941,7 @@ public final class MacroFormRenderer imp
         this.appendTooltip(writer, context, modelFormField);
     }
 
+    @Override
     public void renderRangeFindField(Appendable writer, Map<String, Object> context, RangeFindField rangeFindField) throws IOException {
         ModelFormField modelFormField = rangeFindField.getModelFormField();
         Locale locale = (Locale) context.get("locale");
@@ -1979,6 +2028,7 @@ public final class MacroFormRenderer imp
         this.appendTooltip(writer, context, modelFormField);
     }
 
+    @Override
     public void renderDateFindField(Appendable writer, Map<String, Object> context, DateFindField dateFindField) throws IOException {
         ModelFormField modelFormField = dateFindField.getModelFormField();
         Locale locale = (Locale) context.get("locale");
@@ -2127,6 +2177,7 @@ public final class MacroFormRenderer imp
         this.appendTooltip(writer, context, modelFormField);
     }
 
+    @Override
     public void renderLookupField(Appendable writer, Map<String, Object> context, LookupField lookupField) throws IOException {
         ModelFormField modelFormField = lookupField.getModelFormField();
         String lookupFieldFormName = lookupField.getFormName(context);
@@ -2549,6 +2600,7 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFileField(Appendable writer, Map<String, Object> context, FileField textField) throws IOException {
         ModelFormField modelFormField = textField.getModelFormField();
         String className = "";
@@ -2598,6 +2650,7 @@ public final class MacroFormRenderer imp
         this.appendTooltip(writer, context, modelFormField);
     }
 
+    @Override
     public void renderPasswordField(Appendable writer, Map<String, Object> context, PasswordField passwordField) throws IOException {
         ModelFormField modelFormField = passwordField.getModelFormField();
         String className = "";
@@ -2668,6 +2721,7 @@ public final class MacroFormRenderer imp
         this.appendTooltip(writer, context, modelFormField);
     }
 
+    @Override
     public void renderImageField(Appendable writer, Map<String, Object> context, ImageField imageField) throws IOException {
         ModelFormField modelFormField = imageField.getModelFormField();
         String value = modelFormField.getEntry(context, imageField.getValue(context));
@@ -2712,6 +2766,7 @@ public final class MacroFormRenderer imp
         this.appendTooltip(writer, context, modelFormField);
     }
 
+    @Override
     public void renderFieldGroupOpen(Appendable writer, Map<String, Object> context, ModelForm.FieldGroup fieldGroup) throws IOException {
         String style = fieldGroup.getStyle();
         String id = fieldGroup.getId();
@@ -2755,6 +2810,7 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderFieldGroupClose(Appendable writer, Map<String, Object> context, ModelForm.FieldGroup fieldGroup) throws IOException {
         String style = fieldGroup.getStyle();
         String id = fieldGroup.getId();
@@ -2778,6 +2834,7 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderBanner(Appendable writer, Map<String, Object> context, ModelForm.Banner banner) throws IOException {
         String style = banner.getStyle(context);
         String leftStyle = banner.getLeftTextStyle(context);
@@ -3336,6 +3393,7 @@ public final class MacroFormRenderer imp
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderContainerFindField(Appendable writer, Map<String, Object> context, ContainerField containerField) throws IOException {
         String id = containerField.getModelFormField().getIdName();
         String className = UtilFormatOut.checkNull(containerField.getModelFormField().getWidgetStyle());

Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java Sat Apr 27 19:34:25 2019
@@ -144,18 +144,22 @@ public class MacroScreenRenderer impleme
         return environment;
     }
 
+    @Override
     public String getRendererName() {
         return rendererName;
     }
 
+    @Override
     public void renderScreenBegin(Appendable writer, Map<String, Object> context) throws IOException {
         executeMacro(writer, "renderScreenBegin", null);
     }
 
+    @Override
     public void renderScreenEnd(Appendable writer, Map<String, Object> context) throws IOException {
         executeMacro(writer, "renderScreenEnd", null);
     }
 
+    @Override
     public void renderSectionBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.Section section) throws IOException {
         if (section.isMainSection()) {
             this.widgetCommentsEnabled = ModelWidget.widgetBoundaryCommentsEnabled(context);
@@ -169,6 +173,7 @@ public class MacroScreenRenderer impleme
             executeMacro(writer, "renderSectionBegin", parameters);
         }
     }
+    @Override
     public void renderSectionEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.Section section) throws IOException {
         if (this.widgetCommentsEnabled) {
             Map<String, Object> parameters = new HashMap<>();
@@ -181,6 +186,7 @@ public class MacroScreenRenderer impleme
         }
     }
 
+    @Override
     public void renderContainerBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.Container container) throws IOException {
         String containerId = container.getId(context);
         String containerType = container.getType(context);
@@ -205,11 +211,13 @@ public class MacroScreenRenderer impleme
         executeMacro(writer, "renderContainerBegin", parameters);
     }
 
+    @Override
     public void renderContainerEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.Container container) throws IOException {
         String containerType = container.getType(context);
         executeMacro(writer, "renderContainerEnd", UtilMisc.toMap("type", containerType));
     }
 
+    @Override
     public void renderLabel(Appendable writer, Map<String, Object> context, ModelScreenWidget.Label label) throws IOException {
         Map<String, Object> parameters = new HashMap<>();
         parameters.put("text", label.getText(context));
@@ -218,6 +226,7 @@ public class MacroScreenRenderer impleme
         executeMacro(writer, "renderLabel", parameters);
     }
 
+    @Override
     public void renderHorizontalSeparator(Appendable writer, Map<String, Object> context, ModelScreenWidget.HorizontalSeparator separator) throws IOException {
         Map<String, Object> parameters = new HashMap<>();
         parameters.put("id", separator.getId(context));
@@ -225,6 +234,7 @@ public class MacroScreenRenderer impleme
         executeMacro(writer, "renderHorizontalSeparator", parameters);
     }
 
+    @Override
     public void renderLink(Appendable writer, Map<String, Object> context, ModelScreenWidget.ScreenLink link) throws IOException {
         HttpServletResponse response = (HttpServletResponse) context.get("response");
         HttpServletRequest request = (HttpServletRequest) context.get("request");
@@ -323,6 +333,7 @@ public class MacroScreenRenderer impleme
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderImage(Appendable writer, Map<String, Object> context, ModelScreenWidget.ScreenImage image) throws IOException {
         if (image == null) {
             return ;
@@ -366,6 +377,7 @@ public class MacroScreenRenderer impleme
         executeMacro(writer, "renderImage", parameters);
     }
 
+    @Override
     public void renderContentBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.Content content) throws IOException {
          String editRequest = content.getEditRequest(context);
          String enableEditName = content.getEnableEditName(context);
@@ -382,6 +394,7 @@ public class MacroScreenRenderer impleme
          executeMacro(writer, "renderContentBegin", parameters);
     }
 
+    @Override
     public void renderContentBody(Appendable writer, Map<String, Object> context, ModelScreenWidget.Content content) throws IOException {
         Locale locale = UtilMisc.ensureLocale(context.get("locale"));
         String mimeTypeId = "text/html";
@@ -442,6 +455,7 @@ public class MacroScreenRenderer impleme
         }
     }
 
+    @Override
     public void renderContentEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.Content content) throws IOException {
         String expandedContentId = content.getContentId(context);
         String editMode = "Edit";
@@ -478,6 +492,7 @@ public class MacroScreenRenderer impleme
         }
     }
 
+    @Override
     public void renderContentFrame(Appendable writer, Map<String, Object> context, ModelScreenWidget.Content content) throws IOException {
         String dataResourceId = content.getDataResourceId(context);
         String urlString = "/ViewSimpleContent?dataResourceId=" + dataResourceId;
@@ -498,6 +513,7 @@ public class MacroScreenRenderer impleme
         executeMacro(writer, "renderContentFrame", parameters);
     }
 
+    @Override
     public void renderSubContentBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.SubContent content) throws IOException {
          String enableEditName = content.getEnableEditName(context);
          String enableEditValue = (String)context.get(enableEditName);
@@ -509,6 +525,7 @@ public class MacroScreenRenderer impleme
          executeMacro(writer, "renderSubContentBegin", parameters);
     }
 
+    @Override
     public void renderSubContentBody(Appendable writer, Map<String, Object> context, ModelScreenWidget.SubContent content) throws IOException {
          Locale locale = UtilMisc.ensureLocale(context.get("locale"));
          String mimeTypeId = "text/html";
@@ -550,6 +567,7 @@ public class MacroScreenRenderer impleme
          }
     }
 
+    @Override
     public void renderSubContentEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.SubContent content) throws IOException {
          String editMode = "Edit";
          String editRequest = content.getEditRequest(context);
@@ -590,6 +608,7 @@ public class MacroScreenRenderer impleme
     }
 
 
+    @Override
     public void renderScreenletBegin(Appendable writer, Map<String, Object> context, boolean collapsed, ModelScreenWidget.Screenlet screenlet) throws IOException {
         HttpServletRequest request = (HttpServletRequest) context.get("request");
         HttpServletResponse response = (HttpServletResponse) context.get("response");
@@ -668,6 +687,7 @@ public class MacroScreenRenderer impleme
         executeMacro(writer, "renderScreenletBegin", parameters);
     }
 
+    @Override
     public void renderScreenletSubWidget(Appendable writer, Map<String, Object> context, ModelScreenWidget subWidget, ModelScreenWidget.Screenlet screenlet) throws GeneralException, IOException  {
         if (subWidget.equals(screenlet.getNavigationForm())) {
             HttpServletRequest request = (HttpServletRequest) context.get("request");
@@ -693,6 +713,7 @@ public class MacroScreenRenderer impleme
             subWidget.renderWidgetString(writer, context, this);
         }
     }
+    @Override
     public void renderScreenletEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.Screenlet screenlet) throws IOException {
         executeMacro(writer, "renderScreenletEnd", null);
     }
@@ -833,6 +854,7 @@ public class MacroScreenRenderer impleme
         executeMacro(writer, "renderScreenletPaginateMenu", parameters);
     }
 
+    @Override
     public void renderPortalPageBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.PortalPage portalPage) throws GeneralException, IOException {
         String portalPageId = portalPage.getActualPortalPageId(context);
         String originalPortalPageId = portalPage.getOriginalPortalPageId(context);
@@ -864,12 +886,14 @@ public class MacroScreenRenderer impleme
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderPortalPageEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.PortalPage portalPage) throws GeneralException, IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderPortalPageEnd/>");
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderPortalPageColumnBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.PortalPage portalPage, GenericValue portalPageColumn) throws GeneralException, IOException {
         String portalPageId = portalPage.getActualPortalPageId(context);
         String originalPortalPageId = portalPage.getOriginalPortalPageId(context);
@@ -934,12 +958,14 @@ public class MacroScreenRenderer impleme
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderPortalPageColumnEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.PortalPage portalPage, GenericValue portalPageColumn) throws GeneralException, IOException {
         StringWriter sr = new StringWriter();
         sr.append("<@renderPortalPageColumnEnd/>");
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderPortalPagePortletBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.PortalPage portalPage, GenericValue portalPortlet) throws GeneralException, IOException {
         String portalPageId = portalPage.getActualPortalPageId(context);
         String originalPortalPageId = portalPage.getOriginalPortalPageId(context);
@@ -1005,6 +1031,7 @@ public class MacroScreenRenderer impleme
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderPortalPagePortletEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.PortalPage portalPage, GenericValue portalPortlet) throws GeneralException, IOException {
         String confMode = portalPage.getConfMode(context);
 
@@ -1016,6 +1043,7 @@ public class MacroScreenRenderer impleme
         executeMacro(writer, sr.toString());
     }
 
+    @Override
     public void renderPortalPagePortletBody(Appendable writer, Map<String, Object> context, ModelScreenWidget.PortalPage portalPage, GenericValue portalPortlet) throws GeneralException, IOException {
         String portalPortletId = portalPortlet.getString("portalPortletId");
         String screenName = portalPortlet.getString("screenName");

Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java Sat Apr 27 19:34:25 2019
@@ -53,6 +53,7 @@ public class MacroScreenViewHandler exte
 
     protected ServletContext servletContext = null;
 
+    @Override
     public void init(ServletContext context) throws ViewHandlerException {
         this.servletContext = context;
     }
@@ -82,6 +83,7 @@ public class MacroScreenViewHandler exte
         return screenStringRenderer;
     }
 
+    @Override
     public void render(String name, String page, String info, String contentType, String encoding, HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException {
         try {
             Writer writer = response.getWriter();

Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java Sat Apr 27 19:34:25 2019
@@ -116,6 +116,7 @@ public class MacroTreeRenderer implement
         executeMacro(sr.toString());
     }
 
+    @Override
     public void renderNodeBegin(Appendable writer, Map<String, Object> context, ModelTree.ModelNode node, int depth) throws IOException {
         String currentNodeTrailPiped = null;
         List<String> currentNodeTrail = UtilGenerics.toList(context.get("currentNodeTrail"));
@@ -201,6 +202,7 @@ public class MacroTreeRenderer implement
         }
     }
 
+    @Override
     public void renderNodeEnd(Appendable writer, Map<String, Object> context, ModelTree.ModelNode node) throws IOException {
         Boolean processChildren = (Boolean) context.get("processChildren");
         StringWriter sr = new StringWriter();
@@ -218,6 +220,7 @@ public class MacroTreeRenderer implement
         }
     }
 
+    @Override
     public void renderLastElement(Appendable writer, Map<String, Object> context, ModelTree.ModelNode node) throws IOException {
         Boolean processChildren = (Boolean) context.get("processChildren");
         if (processChildren) {
@@ -230,6 +233,7 @@ public class MacroTreeRenderer implement
         }
     }
 
+    @Override
     public void renderLabel(Appendable writer, Map<String, Object> context, ModelTree.ModelNode.Label label) throws IOException {
         String id = label.getId(context);
         String style = label.getStyle(context);
@@ -247,6 +251,7 @@ public class MacroTreeRenderer implement
         executeMacro(sr.toString());
     }
 
+    @Override
     public void renderLink(Appendable writer, Map<String, Object> context, ModelTree.ModelNode.Link link) throws IOException {
         String target = link.getTarget(context);
         StringBuilder linkUrl = new StringBuilder();
@@ -295,6 +300,7 @@ public class MacroTreeRenderer implement
         executeMacro(sr.toString().replace("|", "%7C")); // Fix for OFBIZ-9191
     }
 
+    @Override
     public void renderImage(Appendable writer, Map<String, Object> context, ModelTree.ModelNode.Image image) throws IOException {
         if (image == null) {
             return;
@@ -356,6 +362,7 @@ public class MacroTreeRenderer implement
         executeMacro(sr.toString());
     }
 
+    @Override
     public ScreenStringRenderer getScreenStringRenderer(Map<String, Object> context) {
         ScreenRenderer screenRenderer = (ScreenRenderer)context.get("screens");
         if (screenRenderer != null) {