ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jler...@apache.org
Subject svn commit: r484972 - in /incubator/ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/ applications/content/src/org/ofbiz/content/ applications/content/src/org/ofbiz/content/content/ applications/content/src/org/o...
Date Sat, 09 Dec 2006 11:52:59 GMT
Author: jleroux
Date: Sat Dec  9 03:52:56 2006
New Revision: 484972

URL: http://svn.apache.org/viewvc?view=rev&rev=484972
Log:
A patch from Stefan Huehner "Code-Cleanup: remove unncessary return at end of void function"
(https://issues.apache.org/jira/browse/OFBIZ-536).

Modified:
    incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
    incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
    incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
    incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
    incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
    incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java
    incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java
    incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
    incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java
    incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java
    incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java
    incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java
    incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java
    incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
    incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/template/FreeMarkerWorker.java
    incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/template/FtlTransform.java
    incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
    incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestManager.java
    incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java
    incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
    incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
    incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java
    incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java
    incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java
    incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
    incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
    incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java

Modified: incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
(original)
+++ incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
Sat Dec  9 03:52:56 2006
@@ -338,13 +338,11 @@
             AIMRequest.put("x_Tran_Key",props.getProperty("trankey"));
         AIMRequest.put("x_Password",props.getProperty("password"));
         AIMRequest.put("x_Version", props.getProperty("ver"));
-        return;
     }
 
     private static void buildGatewayResponeConfig(Map params, Properties props, Map AIMRequest)
{
         AIMRequest.put("x_Delim_Data", props.getProperty("delimited"));
         AIMRequest.put("x_Delim_Char", props.getProperty("delimiter"));
-        return;
     }
 
     private static void buildCustomerBillingInfo(Map params, Properties props, Map AIMRequest)
{
@@ -396,7 +394,6 @@
 
         if (ea != null)
             AIMRequest.put("x_Email",UtilFormatOut.checkNull(ea.getString("infoString")));
-        return;
     }
 
     private static void buildInvoiceInfo(Map params, Properties props, Map AIMRequest) {
@@ -404,7 +401,6 @@
         String orderId = UtilFormatOut.checkNull((String)params.get("orderId"));
         AIMRequest.put("x_Invoice_Num","Order " + orderId);
         AIMRequest.put("x_Description", description);
-        return;
     }
 
     private static void buildAuthTransaction(Map params, Properties props, Map AIMRequest)
{

Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
(original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
Sat Dec  9 03:52:56 2006
@@ -1259,7 +1259,6 @@
                 updatePageNodeChildren(kidContent, context);
             }
         //}
-        return;
     }
 
     public static void updateOutlineNodeChildren(GenericValue content, boolean forceOutline,
Map context) throws GenericEntityException {
@@ -1304,7 +1303,6 @@
                 updateOutlineNodeChildren(kidContent, forceOutline, context);
             }
         }
-        return;
     }
 
     public static Map findSubNodes(DispatchContext dctx, Map context) throws GenericServiceException{

Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
(original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
Sat Dec  9 03:52:56 2006
@@ -82,7 +82,6 @@
         String entityName = pk.getEntityName();
 
         mruAddByEntityName( entityName, pk, lookupCaches);
-        return;
     }
 
    /**
@@ -104,7 +103,6 @@
         
         lkupCache.add(pk.getPrimaryKey());
         if (Debug.infoOn()) Debug.logInfo("in mruAddByEntityName, entityName:" + entityName
+ " lifoSet.size()" + lkupCache.size(), module);
-        return;
     }
 
     public static Iterator mostRecentlyViewedIterator(String entityName, Map lookupCaches)
{
@@ -229,7 +227,6 @@
         getCurrentValueWithCachedPK( request, delegator, cachedPK, entityName);
         GenericPK currentPK = (GenericPK)request.getAttribute("currentPK");
         currentEntityMap.put(entityName, currentPK);
-        return;
     }
 
     public static void getCurrentValueWithCachedPK(HttpServletRequest request, GenericDelegator
delegator, GenericPK cachedPK, String entityName) {
@@ -405,7 +402,6 @@
            publishPointMap.put(pub, webSitePublishPoint);
            getAllPublishPointMap(delegator, pub, publishPointMap);
         }
-        return;
     }
 
     public static Map getPublishPointMap(GenericDelegator delegator, List publishPointList
) {
@@ -814,7 +810,6 @@
             }
             
         
-        return ;
     }
     
 }

Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
(original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
Sat Dec  9 03:52:56 2006
@@ -274,7 +274,6 @@
         } catch (GenericEntityException e) {
             Debug.logError("Entity Error:" + e.getMessage(), null);
         }
-        return;
     }
 
     public static boolean traverseSubContent(Map ctx) {
@@ -465,7 +464,6 @@
                     currentNode.put("count", count);
             }
         }
-        return;
     }
 
     public static boolean checkWhen(Map context, String whenStr) {
@@ -680,7 +678,6 @@
         if (parentTypeId != null) {
             getContentTypeAncestry(delegator, parentTypeId, contentTypes);
         }
-        return;
     }
 
     public static void getContentAncestry(GenericDelegator delegator, String contentId, String
contentAssocTypeId, String direction, List contentAncestorList) throws GenericEntityException
{
@@ -716,7 +713,6 @@
             Debug.logError(e,module); 
             return;
         }
-        return;
     }
     
     public static void getContentAncestryAll(GenericDelegator delegator, String contentId,
String passedContentTypeId, String direction, List contentAncestorList) {
@@ -755,7 +751,6 @@
             Debug.logError(e,module); 
             return;
         }
-        return;
     }
 
     public static List getContentAncestryNodeTrail(GenericDelegator delegator, String contentId,
String contentAssocTypeId, String direction) throws GenericEntityException {
@@ -808,7 +803,6 @@
             Debug.logError(e,module); 
             return;
         }
-        return;
     }
 
     public static Map pullEntityValues(GenericDelegator delegator, String entityName, Map
context) {
@@ -1366,7 +1360,6 @@
         trailNode.put("isReturnAfter", new Boolean(isReturnAfter));
         trailNode.put("checked", new Boolean(true));
 
-        return;
     }
 
     public static boolean booleanDataType(Object boolObj) {
@@ -1775,6 +1768,5 @@
                     }
                 }
         */
-        return;
     }
 }

Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
(original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
Sat Dec  9 03:52:56 2006
@@ -146,7 +146,6 @@
         if (parentCategoryId != null) {
             getDataCategoryAncestry(delegator, parentCategoryId, categoryTypeIds);
         }
-        return;
     }
 
     /**
@@ -904,7 +903,6 @@
             }
             //out.flush();
         }
-        return;
     }
 
 

Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java
(original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java
Sat Dec  9 03:52:56 2006
@@ -169,7 +169,6 @@
 	    	deleteDataResourceDocument(dataResourceId, reader);
 	    }
 
-            return;
 	}
 	
 
@@ -179,7 +178,6 @@
 	    int qtyDeleted = reader.delete(term);
 	    if (Debug.infoOn()) Debug.logInfo("in indexContent, qtyDeleted:" + term, module);
 
-            return;
 	}
 
 	public static void indexContent(GenericDelegator delegator, Map context, GenericValue content,
String path) throws Exception {
@@ -196,7 +194,6 @@
 		indexContent(delegator, context, content, writer);
        	        writer.optimize();
     	        writer.close();
-		return;
 	}
 	
 	public static void indexContent(GenericDelegator delegator, Map context, GenericValue content,
IndexWriter writer) throws Exception {
@@ -216,7 +213,6 @@
             }
             */
         
-            return;
 	}
 	
 	public static void indexDataResource(GenericDelegator delegator, Map context, String id)
throws Exception {

Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java
(original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java
Sat Dec  9 03:52:56 2006
@@ -196,7 +196,6 @@
                 }
 
                 //if (Debug.infoOn()) Debug.logInfo("in Render(4), globalNodeTrail ." + getWrapped(env,
"globalNodeTrail") , module);
-                return;
             }
 
             public void openEditWrap(Writer out, String editStyle) throws IOException {

Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
(original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
Sat Dec  9 03:52:56 2006
@@ -176,7 +176,6 @@
                 }
 
                 //if (Debug.infoOn()) Debug.logInfo("in Render(4), globalNodeTrail ." + getWrapped(env,
"globalNodeTrail") , module);
-                return;
             }
 
             public void openEditWrap(Writer out, String editStyle) throws IOException {

Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java
(original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java
Sat Dec  9 03:52:56 2006
@@ -181,7 +181,6 @@
                 }
 
                 //if (Debug.infoOn()) Debug.logInfo("in Render(4), globalNodeTrail ." + getWrapped(env,
"globalNodeTrail") , module);
-                return;
             }
 
             public void openEditWrap(Writer out, String editStyle) throws IOException {

Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java
(original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java
Sat Dec  9 03:52:56 2006
@@ -144,7 +144,6 @@
                 templateContext.put("mimeTypeId", null);
                 templateContext.put("locale", locale);
 
-                return;
             }
         };
     }

Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java
(original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java
Sat Dec  9 03:52:56 2006
@@ -272,7 +272,6 @@
                 //if (Debug.infoOn()) Debug.logInfo("in TraverseSubContentCache, populateCtx,
trailCsv(2):" + trailCsv , module);
                 envWrap("nodeTrailCsv", trailCsv);
                 envWrap("globalNodeTrail", globalNodeTrail);
-                return;
             }
 
             public void envWrap(String varName, Object obj) {

Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java
(original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java
Sat Dec  9 03:52:56 2006
@@ -333,7 +333,6 @@
                     templateContext.put("parentContent", parentContent);
                     templateContext.put("nodeTrail", nodeTrail);
                 }
-                return;
             }
 
         };

Modified: incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java
(original)
+++ incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java
Sat Dec  9 03:52:56 2006
@@ -201,7 +201,6 @@
             componentQuantity = component.getDouble("estimatedQuantity").doubleValue();
             component.set("estimatedQuantity", new Double(componentQuantity / previousQuantity
* newQuantity.doubleValue()));
         }
-        return;
     }
     /**
      * get the estimatedStartDate property.

Modified: incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
(original)
+++ incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
Sat Dec  9 03:52:56 2006
@@ -443,7 +443,6 @@
                 }
             }
         }
-        return;
     }
     
     /**

Modified: incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/template/FreeMarkerWorker.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/template/FreeMarkerWorker.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/template/FreeMarkerWorker.java
(original)
+++ incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/template/FreeMarkerWorker.java
Sat Dec  9 03:52:56 2006
@@ -404,7 +404,6 @@
         }
         templateList.add(path);
         ctx.put("templateList", templateList);
-        return;
     }
 
     public static Map createEnvironmentMap(Environment env) {
@@ -439,7 +438,6 @@
                 o = new ArrayList((List)o);
             saveMap.put(key, o);
         }
-        return ;
     }
 
     public static Map saveValues(Map context, String [] saveKeyNames) {
@@ -476,7 +474,6 @@
             }
             env.setVariable(key, autoWrap(o, env));
         }
-        return;
     }
 
     public static void removeValues(Map context, String [] removeKeyNames ) {
@@ -484,7 +481,6 @@
             String key = removeKeyNames[i];
             context.remove(key);
         }
-        return;
     }
 
     public static void overrideWithArgs(Map ctx, Map args) {
@@ -507,7 +503,6 @@
                 ctx.put(key, null);
             }
         }
-        return;
     }
 
     public static void convertContext(Map ctx) {
@@ -523,7 +518,6 @@
                 }
             }
         }
-        return;
     }
 
     public static void getSiteParameters(HttpServletRequest request, Map ctx) {
@@ -549,7 +543,6 @@
             https = (String) servletContext.getAttribute("https");
             ctx.put("https", https);
         }
-        return;
     }
 
     public static TemplateModel autoWrap(Object obj, Environment env) {

Modified: incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/template/FtlTransform.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/template/FtlTransform.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/template/FtlTransform.java
(original)
+++ incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/template/FtlTransform.java
Sat Dec  9 03:52:56 2006
@@ -94,7 +94,6 @@
            }
         }
         template.process(templateContext, writer);
-        return; 
     }
     
     private static Template getTemplate( String inputUrl) throws IOException {

Modified: incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
(original)
+++ incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
Sat Dec  9 03:52:56 2006
@@ -98,7 +98,6 @@
         }
         permissionConditionGetter.setOperationList(targetOperationList);
 
-        return;
     }
 
     public boolean runPermissionCheck(Map context) {
@@ -1301,7 +1300,6 @@
             if (isOwner(entity, partyId)) {
                 this.roleIdList.add("OWNER");   
             }
-           return;
         }
         
         public void initWithAncestors(GenericDelegator delegator, GenericValue entity, String
partyId) throws GenericEntityException {
@@ -1312,7 +1310,6 @@
                List lst = getUserRolesFromList(delegator, ownedContentIdList, partyId, this.roleEntityIdName,
this.partyFieldName, this.roleTypeFieldName, this.roleEntityName);
                this.roleIdList.addAll(lst);
            }
-           return;
         }
         
         public boolean isOwner( GenericValue entity, String targetPartyId) {
@@ -1389,7 +1386,7 @@
                 getEntityOwners(delegator, ownerContent, contentOwnerList, entityName, ownerIdFieldName
);
             }
         }
-        return;
+
     }
 
     public static int getPrivilegeEnumSeq(GenericDelegator delegator, String privilegeEnumId)
throws GenericEntityException {

Modified: incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestManager.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestManager.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestManager.java
(original)
+++ incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestManager.java
Sat Dec  9 03:52:56 2006
@@ -157,6 +157,7 @@
         Map uri = getRequestMapMap(uriStr);
 
         if (uri != null) {
+            String EVENT_GLOBAL_TRANSACTION = "global-transaction";
             return new Boolean((String) uri.get(ConfigXMLReader.EVENT_GLOBAL_TRANSACTION)).booleanValue();
         } else {
             if (Debug.verboseOn()) {

Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java (original)
+++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java Sat Dec
 9 03:52:56 2006
@@ -57,8 +57,6 @@
             buffer.append(localRequestName);
         }
 
-    
-        return;
     }
 
     public static void appendOfbizUrl(StringBuffer buffer, String location, HttpServletRequest
request, HttpServletResponse response) {

Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
(original)
+++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
Sat Dec  9 03:52:56 2006
@@ -123,7 +123,6 @@
                buffer.append("*");
             }
         }
-        return;
     }
     
     /* (non-Javadoc)

Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
(original)
+++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
Sat Dec  9 03:52:56 2006
@@ -141,7 +141,6 @@
             currentMenuItem = (ModelMenuItem)menuItemIter.next();
             renderMenuItem(buffer, context, currentMenuItem);
         }
-        return;
     }
 
     public void renderMenuItem(StringBuffer buffer, Map context, ModelMenuItem menuItem)
{
@@ -176,7 +175,6 @@
         }
         
         this.appendWhitespace(buffer);
-        return;
     }
 
     public boolean isDisableIfEmpty(ModelMenuItem menuItem, Map context) {

Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java
(original)
+++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java
Sat Dec  9 03:52:56 2006
@@ -152,7 +152,6 @@
                 context.put("processChildren", new Boolean(false));
                 //currentNodeTrail.add(contentId);
         }
-        return;
     }
 
     public void renderNodeEnd(Writer writer, Map context, ModelTree.ModelNode node) throws
IOException {
@@ -160,7 +159,6 @@
         if (UtilValidate.isNotEmpty(style)) {
         writer.write("</div>");
         }
-        return;
     }
 
     public void renderLabel(Writer writer, Map context, ModelTree.ModelNode.Label label)
throws IOException {

Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java
(original)
+++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java
Sat Dec  9 03:52:56 2006
@@ -177,7 +177,6 @@
                 }
                 String menuStr = menuWrapper.renderMenuString();
                 out.write(menuStr);
-                return;
             }
                 
         };

Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java (original)
+++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java Sat Dec
 9 03:52:56 2006
@@ -739,7 +739,6 @@
             menuItem.dump(buffer);
         }
             
-        return;
     }
 
 }

Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java (original)
+++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java Sat
Dec  9 03:52:56 2006
@@ -205,7 +205,6 @@
         else
             hideIfSelected = null;
 
-        return;
     }
 
     public void setDisabled(boolean val) {
@@ -242,7 +241,6 @@
         if (overrideMenuItem.position != null)
             this.position = overrideMenuItem.position;
 */
-        return;
     }
 
     public void renderMenuItemString(StringBuffer buffer, Map context, MenuStringRenderer
menuStringRenderer) {
@@ -564,8 +562,6 @@
             + "\n     selectedStyle=" + this.selectedStyle
             + "\n\n");
      
-            
-        return;
     }
 
     public Link getLink() {

Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
(original)
+++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
Sat Dec  9 03:52:56 2006
@@ -287,7 +287,6 @@
             // read sub-widgets
             List subElementList = UtilXml.childElementList(containerElement);
             this.subWidgets = ModelScreenWidget.readSubWidgets(this.modelScreen, subElementList);
-            return;
         }
 
         public void renderWidgetString(Writer writer, Map context, ScreenStringRenderer screenStringRenderer)
throws GeneralException {
@@ -826,7 +825,6 @@
             this.height = subContentElement.getAttribute("height");
             if (UtilValidate.isEmpty(this.height)) this.width="400px";
             this.border = subContentElement.getAttribute("border");
-            return;
         }
 
         public void renderWidgetString(Writer writer, Map context, ScreenStringRenderer screenStringRenderer)
{

Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java?view=diff&rev=484972&r1=484971&r2=484972
==============================================================================
--- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java (original)
+++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java Sat Dec
 9 03:52:56 2006
@@ -603,7 +603,6 @@
                      }
                  }
              }
-             return;
         }
 
         public String getName() {



Mime
View raw message