You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/08/17 10:20:42 UTC
svn commit: r804895 [5/7] - in /ofbiz/trunk:
applications/accounting/src/org/ofbiz/accounting/agreement/
applications/accounting/src/org/ofbiz/accounting/invoice/
applications/accounting/src/org/ofbiz/accounting/payment/
applications/accounting/src/org...
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapper.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapper.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapper.java Mon Aug 17 08:20:38 2009
@@ -185,12 +185,12 @@
public void setRequest(HttpServletRequest request) {
this.request = request;
- ((HtmlMenuRenderer)renderer).setRequest( request );
+ ((HtmlMenuRenderer)renderer).setRequest(request);
}
public void setResponse(HttpServletResponse response) {
this.response = response;
- ((HtmlMenuRenderer)renderer).setResponse( response );
+ ((HtmlMenuRenderer)renderer).setResponse(response);
}
public HttpServletRequest getRequest() {
@@ -201,7 +201,7 @@
return ((HtmlMenuRenderer)renderer).response;
}
- public static HtmlMenuWrapper getMenuWrapper(HttpServletRequest request, HttpServletResponse response, HttpSession session, String menuDefFile, String menuName, String menuWrapperClassName ) {
+ public static HtmlMenuWrapper getMenuWrapper(HttpServletRequest request, HttpServletResponse response, HttpSession session, String menuDefFile, String menuName, String menuWrapperClassName) {
HtmlMenuWrapper menuWrapper = null;
@@ -232,7 +232,7 @@
menuWrapper.setRequest(request);
menuWrapper.setResponse(response);
Map parameterMap = UtilHttp.getParameterMap(request);
- menuWrapper.setParameters( parameterMap);
+ menuWrapper.setParameters(parameterMap);
GenericValue userLogin = (GenericValue)session.getAttribute("userLogin");
menuWrapper.putInContext("userLogin", userLogin);
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java Mon Aug 17 08:20:38 2009
@@ -360,7 +360,7 @@
appendWhitespace(writer);
if (listSize > 0) {
writer.append("<li>");
- writer.append(Integer.toString(lowIndex + 1)).append(" - ").append(Integer.toString(lowIndex + actualPageSize )).append(" ").append(ofLabel).append(" ").append(Integer.toString(listSize));
+ writer.append(Integer.toString(lowIndex + 1)).append(" - ").append(Integer.toString(lowIndex + actualPageSize)).append(" ").append(ofLabel).append(" ").append(Integer.toString(listSize));
writer.append("</li>");
appendWhitespace(writer);
}
@@ -437,7 +437,7 @@
// open tag
String style = label.getStyle(context);
String id = label.getId(context);
- if (UtilValidate.isNotEmpty(style) || UtilValidate.isNotEmpty(id) ) {
+ if (UtilValidate.isNotEmpty(style) || UtilValidate.isNotEmpty(id)) {
writer.append("<span");
if (UtilValidate.isNotEmpty(id)) {
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java Mon Aug 17 08:20:38 2009
@@ -210,7 +210,7 @@
if (this.defaultPrivilegeEnumId == null || menuElement.hasAttribute("defaultPrivilegeEnumId"))
this.defaultPrivilegeEnumId = menuElement.getAttribute("default-privilege-enum-id");
if (this.defaultAssociatedContentId == null || menuElement.hasAttribute("defaultAssociatedContentId"))
- this.setDefaultAssociatedContentId( menuElement.getAttribute("default-associated-content-id"));
+ this.setDefaultAssociatedContentId(menuElement.getAttribute("default-associated-content-id"));
if (this.orientation == null || menuElement.hasAttribute("orientation"))
this.orientation = menuElement.getAttribute("orientation");
if (this.menuWidth == null || menuElement.hasAttribute("menu-width"))
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java Mon Aug 17 08:20:38 2009
@@ -134,7 +134,7 @@
positionStr + "], using the default of the menu renderer", module);
}
- this.setAssociatedContentId( fieldElement.getAttribute("associated-content-id"));
+ this.setAssociatedContentId(fieldElement.getAttribute("associated-content-id"));
this.cellWidth = fieldElement.getAttribute("cell-width");
dataMap.put("name", this.name);
@@ -540,7 +540,7 @@
}
public String getCellWidth() {
- if (UtilValidate.isNotEmpty(this.cellWidth )) {
+ if (UtilValidate.isNotEmpty(this.cellWidth)) {
return this.cellWidth ;
} else {
return this.modelMenu.getDefaultCellWidth ();
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java Mon Aug 17 08:20:38 2009
@@ -111,12 +111,12 @@
return;
}
List theList = null;
- if (obj instanceof Map ) {
+ if (obj instanceof Map) {
Set entrySet = ((Map)obj).entrySet();
Object [] a = entrySet.toArray();
theList = Arrays.asList(a);
isEntrySet = true;
- } else if (obj instanceof List ) {
+ } else if (obj instanceof List) {
theList = (List)obj;
} else {
Debug.logError("Object not list or map type", module);
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java Mon Aug 17 08:20:38 2009
@@ -281,7 +281,7 @@
}
public void renderImage(Appendable writer, Map<String, Object> context, ModelScreenWidget.Image image) throws IOException {
- if ( image == null)
+ if (image == null)
return ;
String src = image.getSrc(context);
String id = image.getId(context);
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java Mon Aug 17 08:20:38 2009
@@ -1092,7 +1092,7 @@
}
if (UtilValidate.isNotEmpty(mimeTypeId)
- && ((mimeTypeId.indexOf("application") >= 0) || (mimeTypeId.indexOf("image")) >= 0) ) {
+ && ((mimeTypeId.indexOf("application") >= 0) || (mimeTypeId.indexOf("image")) >= 0)) {
screenStringRenderer.renderContentFrame(writer, context, this);
} else {
screenStringRenderer.renderContentBegin(writer, context, this);
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java Mon Aug 17 08:20:38 2009
@@ -233,7 +233,7 @@
initService(serviceElement);
}
- public void initService( Element serviceElement ) {
+ public void initService(Element serviceElement) {
this.serviceNameExdr = FlexibleStringExpander.getInstance(serviceElement.getAttribute("service-name"));
this.resultMapNameAcsr = FlexibleMapAccessor.getInstance(serviceElement.getAttribute("result-map"));
@@ -363,7 +363,7 @@
this.listName = UtilFormatOut.checkEmpty(entityAndElement.getAttribute("list"), entityAndElement.getAttribute("list-name"));
if (UtilValidate.isEmpty(this.listName)) this.listName = "_LIST_ITERATOR_";
- entityAndElement.setAttribute( "list-name", this.listName);
+ entityAndElement.setAttribute("list-name", this.listName);
finder = new ByAndFinder(entityAndElement);
}
@@ -403,7 +403,7 @@
this.listName = UtilFormatOut.checkEmpty(entityConditionElement.getAttribute("list"), entityConditionElement.getAttribute("list-name"));
if (UtilValidate.isEmpty(this.listName)) this.listName = "_LIST_ITERATOR_";
- entityConditionElement.setAttribute( "list-name", this.listName);
+ entityConditionElement.setAttribute("list-name", this.listName);
finder = new ByConditionFinder(entityConditionElement);
}
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/TreeStringRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/TreeStringRenderer.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/TreeStringRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/TreeStringRenderer.java Mon Aug 17 08:20:38 2009
@@ -34,5 +34,5 @@
public void renderLink(Appendable writer, Map<String, Object> context, ModelTree.ModelNode.Link link) throws IOException;
public void renderImage(Appendable writer, Map<String, Object> context, ModelTree.ModelNode.Image image) throws IOException;
public void renderLastElement(Appendable writer, Map<String, Object> context, ModelTree.ModelNode node) throws IOException;
- public ScreenStringRenderer getScreenStringRenderer( Map<String, Object> context);
+ public ScreenStringRenderer getScreenStringRenderer(Map<String, Object> context);
}