You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2009/06/18 12:15:37 UTC
svn commit: r786001 -
/ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
Author: jacopoc
Date: Thu Jun 18 10:15:33 2009
New Revision: 786001
URL: http://svn.apache.org/viewvc?rev=786001&view=rev
Log:
Applied fix from trunk for revision: 785955
Tabs to spaces.
Modified:
ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
Modified: ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=786001&r1=786000&r2=786001&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java (original)
+++ ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java Thu Jun 18 10:15:33 2009
@@ -175,7 +175,7 @@
}
public void renderLink(Appendable writer, Map<String, Object> context, ModelScreenWidget.Link link) throws IOException {
- HttpServletResponse response = (HttpServletResponse) context.get("response");
+ HttpServletResponse response = (HttpServletResponse) context.get("response");
HttpServletRequest request = (HttpServletRequest) context.get("request");
String targetWindow = link.getTargetWindow(context);
@@ -188,7 +188,7 @@
String actionUrl = "";
StringBuilder parameters=new StringBuilder();
if ("hidden-form".equals(linkType)) {
- StringBuilder sb = new StringBuilder();
+ StringBuilder sb = new StringBuilder();
WidgetWorker.buildHyperlinkUrl(sb, target, link.getUrlMode(), null, link.getPrefix(context),
link.getFullPath(), link.getSecure(), link.getEncode(), request, response, context);
actionUrl = sb.toString();
@@ -223,8 +223,8 @@
ModelScreenWidget.Image img = link.getImage();
if (img == null) {
StringBuilder sb = new StringBuilder();
- renderImage(sb,context,img);
- imgStr = sb.toString();
+ renderImage(sb,context,img);
+ imgStr = sb.toString();
}
StringWriter sr = new StringWriter();
sr.append("<@renderLink ");
@@ -257,8 +257,8 @@
}
public void renderImage(Appendable writer, Map<String, Object> context, ModelScreenWidget.Image image) throws IOException {
- if ( image == null)
- return ;
+ if ( image == null)
+ return ;
String src = image.getSrc(context);
String id = image.getId(context);
String style = image.getStyle(context);
@@ -280,7 +280,7 @@
RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
urlString = rh.makeLink(request, response, src, fullPath, secure, encode);
} else {
- urlString = src;
+ urlString = src;
}
} else if (urlMode != null && urlMode.equalsIgnoreCase("content")) {
if (request != null && response != null) {
@@ -290,7 +290,7 @@
urlString = newURL.toString();
}
} else {
- urlString = src;
+ urlString = src;
}
StringWriter sr = new StringWriter();
sr.append("<@renderImage ");
@@ -315,7 +315,7 @@
}
public void renderContentBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.Content content) throws IOException {
- String editRequest = content.getEditRequest(context);
+ String editRequest = content.getEditRequest(context);
String editContainerStyle = content.getEditContainerStyle(context);
String enableEditName = content.getEnableEditName(context);
String enableEditValue = (String)context.get(enableEditName);
@@ -335,7 +335,7 @@
}
public void renderContentBody(Appendable writer, Map<String, Object> context, ModelScreenWidget.Content content) throws IOException {
- Locale locale = UtilMisc.ensureLocale(context.get("locale"));
+ Locale locale = UtilMisc.ensureLocale(context.get("locale"));
//Boolean nullThruDatesOnly = Boolean.valueOf(false);
String mimeTypeId = "text/html";
String expandedContentId = content.getContentId(context);
@@ -468,7 +468,7 @@
}
public void renderSubContentBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.SubContent content) throws IOException {
- String editRequest = content.getEditRequest(context);
+ String editRequest = content.getEditRequest(context);
String editContainerStyle = content.getEditContainerStyle(context);
String enableEditName = content.getEnableEditName(context);
String enableEditValue = (String)context.get(enableEditName);
@@ -534,7 +534,7 @@
}
public void renderSubContentEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.SubContent content) throws IOException {
- String editMode = "Edit";
+ String editMode = "Edit";
String editRequest = content.getEditRequest(context);
String editContainerStyle = content.getEditContainerStyle(context);
String enableEditName = content.getEnableEditName(context);
@@ -599,7 +599,7 @@
String menuString = "";
boolean showMore = false;
if (UtilValidate.isNotEmpty(title) || navMenu != null || navForm != null || collapsible) {
- showMore = true;
+ showMore = true;
if (collapsible) {
collapsibleAreaId = this.getNextElementId();
Map<String, Object> uiLabelMap = UtilGenerics.checkMap(context.get("uiLabelMap"));
@@ -616,7 +616,7 @@
}
}
if (!collapsed) {
- StringWriter sb = new StringWriter();
+ StringWriter sb = new StringWriter();
if (navMenu != null) {
MenuStringRenderer savedRenderer = (MenuStringRenderer) context.get("menuStringRenderer");
MenuStringRenderer renderer = new ScreenletMenuRenderer(request, response);