svn commit: r682252 - in /ofbiz/trunk/applications/cont
Locked
 
|
Author: doogie
Date: Sun Aug 3 21:18:12 2008 New Revision: 682252 URL: http://svn.apache.org/viewvc?rev=682252&view=rev Log: Make all ServiceEngine method declarations have generics markup. Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogServices.java ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java ofbiz/trunk/applications/content/src/org/ofbiz/content/email/EmailServices.java ofbiz/trunk/applications/content/src/org/ofbiz/content/email/NotificationServices.java ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchServices.java ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java?rev=682252&r1=682251&r2=682252&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java Sun Aug 3 21:18:12 2008 @@ -70,7 +70,7 @@ * Finds the related subContent given the template Content and the mapKey. * This service calls a same-named method in ContentWorker to do the work. */ - public static Map getSubContent(DispatchContext dctx, Map context) { + public static Map<String, Object> getSubContent(DispatchContext dctx, Map<String, ? extends Object> context) { //Security security = dctx.getSecurity(); GenericDelegator delegator = dctx.getDelegator(); //LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -108,7 +108,7 @@ * getContent * This service calls a same-named method in ContentWorker to do the work. */ - public static Map getContent(DispatchContext dctx, Map context) { + public static Map<String, Object> getContent(DispatchContext dctx, Map<String, ? extends Object> context) { //Security security = dctx.getSecurity(); GenericDelegator delegator = dctx.getDelegator(); String contentId = (String) context.get("contentId"); @@ -132,7 +132,7 @@ * Entities make it to the most recently used list primarily by being selected for editing, * either by being created or being selected from a list. */ - public static Map addMostRecent(DispatchContext dctx, Map context) { + public static Map<String, Object> addMostRecent(DispatchContext dctx, Map<String, ? extends Object> context) { //Security security = dctx.getSecurity(); //GenericDelegator delegator = dctx.getDelegator(); //LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -160,9 +160,10 @@ * * This service does not accept straight ContentAssoc parameters. They must be prefaced with "ca" + cap first letter */ - public static Map persistContentAndAssoc(DispatchContext dctx, Map context) throws GenericServiceException { + public static Map<String, Object> persistContentAndAssoc(DispatchContext dctx, Map<String, ? extends Object> rcontext) throws GenericServiceException { GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); Debug.logInfo("=========== type:" + (String)context.get("dataresourceTypeId") , module); // Knowing why a request fails permission check is one of the more difficult @@ -449,7 +450,7 @@ Service for update publish sites with a ContentRole that will tie them to the passed in party. */ - public static Map updateSiteRoles(DispatchContext dctx, Map context) { + public static Map<String, Object> updateSiteRoles(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); GenericDelegator delegator = dctx.getDelegator(); GenericValue userLogin = (GenericValue)context.get("userLogin"); @@ -550,7 +551,7 @@ return results; } - public static Map persistDataResourceAndData(DispatchContext dctx, Map context) { + public static Map<String, Object> persistDataResourceAndData(DispatchContext dctx, Map<String, ? extends Object> context) { //GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); //String contentId = (String)context.get("contentId"); @@ -584,9 +585,10 @@ return result; } - public static Map persistDataResourceAndDataMethod(DispatchContext dctx, Map context) throws GenericServiceException, GenericEntityException, Exception { + public static Map<String, Object> persistDataResourceAndDataMethod(DispatchContext dctx, Map<String, ? extends Object> rcontext) throws GenericServiceException, GenericEntityException, Exception { GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); Map result = FastMap.newInstance(); Map newDrContext = FastMap.newInstance(); GenericValue dataResource = delegator.makeValue("DataResource"); @@ -772,7 +774,7 @@ } } - public static Map updateSiteRolesDyn(DispatchContext dctx, Map context) { + public static Map<String, Object> updateSiteRolesDyn(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); GenericDelegator delegator = dctx.getDelegator(); @@ -846,7 +848,7 @@ return results; } - public static Map updateOrRemove(DispatchContext dctx, Map context) { + public static Map<String, Object> updateOrRemove(DispatchContext dctx, Map<String, ? extends Object> context) { Map results = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); @@ -892,7 +894,7 @@ return results; } - public static Map resequence(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> resequence(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map result = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); @@ -973,7 +975,7 @@ return result; } - public static Map changeLeafToNode(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> changeLeafToNode(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map result = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -1040,7 +1042,7 @@ return result; } - public static Map updateLeafCount(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> updateLeafCount(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map result = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); @@ -1059,7 +1061,7 @@ } /* - public static Map updateLeafChange(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> updateLeafChange(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map result = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); @@ -1129,9 +1131,10 @@ * if pageMode == "page" then if the contentTypeId of children is not "PAGE_NODE" or "SUBPAGE_NODE" * (it could be DOCUMENT or OUTLINE_NODE) then it will get changed to SUBPAGE_NODE.` */ - public static Map updatePageType(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> updatePageType(DispatchContext dctx, Map<String, ? extends Object> rcontext) throws GenericServiceException{ GenericDelegator delegator = dctx.getDelegator(); + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); Map results = FastMap.newInstance(); Set visitedSet = (Set)context.get("visitedSet"); if (visitedSet == null) { @@ -1169,9 +1172,10 @@ return results; } - public static Map resetToOutlineMode(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> resetToOutlineMode(DispatchContext dctx, Map<String, ? extends Object> rcontext) throws GenericServiceException{ GenericDelegator delegator = dctx.getDelegator(); + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); Map results = FastMap.newInstance(); Set visitedSet = (Set)context.get("visitedSet"); if (visitedSet == null) { @@ -1215,7 +1219,7 @@ return results; } - public static Map clearContentAssocViewCache(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> clearContentAssocViewCache(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map results = FastMap.newInstance(); UtilCache utilCache = UtilCache.findCache("entitycache.entity-list.default.ContentAssocViewFrom"); @@ -1232,7 +1236,7 @@ return results; } - public static Map clearContentAssocDataResourceViewCache(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> clearContentAssocDataResourceViewCache(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map results = FastMap.newInstance(); @@ -1329,7 +1333,7 @@ } } - public static Map findSubNodes(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> findSubNodes(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map results = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); String contentIdTo = (String)context.get("contentId"); @@ -1367,7 +1371,7 @@ return retVal; } - public static Map initContentChildCounts(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> initContentChildCounts(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map result = FastMap.newInstance(); GenericValue content = (GenericValue)context.get("content"); @@ -1388,7 +1392,7 @@ return result; } - public static Map incrementContentChildStats(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> incrementContentChildStats(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map result = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); @@ -1414,7 +1418,7 @@ return result; } - public static Map decrementContentChildStats(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> decrementContentChildStats(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map result = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); @@ -1440,7 +1444,7 @@ return result; } - public static Map updateContentChildStats(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> updateContentChildStats(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map result = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); @@ -1461,7 +1465,7 @@ return result; } - public static Map updateContentSubscription(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> updateContentSubscription(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map result = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -1540,7 +1544,8 @@ return result; } - public static Map updateContentSubscriptionByProduct(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> updateContentSubscriptionByProduct(DispatchContext dctx, Map<String, ? extends Object> rcontext) throws GenericServiceException{ + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); Map result = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -1586,7 +1591,8 @@ return result; } - public static Map updateContentSubscriptionByOrder(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> updateContentSubscriptionByOrder(DispatchContext dctx, Map<String, ? extends Object> rcontext) throws GenericServiceException{ + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); Map result = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -1636,7 +1642,7 @@ return result; } - public static Map followNodeChildren(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> followNodeChildren(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map result = null; GenericDelegator delegator = dctx.getDelegator(); @@ -1702,7 +1708,7 @@ /** */ - public static Map persistContentWithRevision(DispatchContext dctx, Map context) { + public static Map<String, Object> persistContentWithRevision(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = null; GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java?rev=682252&r1=682251&r2=682252&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java Sun Aug 3 21:18:12 2008 @@ -56,7 +56,7 @@ public static final String mimeTypeId = "text/html"; public static final String mapKey = "SUMMARY"; - public static Map generateBlogRssFeed(DispatchContext dctx, Map context) { + public static Map<String, Object> generateBlogRssFeed(DispatchContext dctx, Map<String, ? extends Object> context) { GenericValue userLogin = (GenericValue) context.get("userLogin"); String contentId = (String) context.get("blogContentId"); String entryLink = (String) context.get("entryLink"); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogServices.java?rev=682252&r1=682251&r2=682252&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogServices.java Sun Aug 3 21:18:12 2008 @@ -44,7 +44,7 @@ * through a predefined screen widget template (ie. drDataTemplateTypeId="SCREEN_COMBINED"). */ - public static Map persistBlogAll(DispatchContext dctx, Map context) throws GenericServiceException { + public static Map<String, Object> persistBlogAll(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException { Map result = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java?rev=682252&r1=682251&r2=682252&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java Sun Aug 3 21:18:12 2008 @@ -75,7 +75,7 @@ * Creates ContentRevision/Item records for each, as well. */ - public static Map persistRootCompDoc(DispatchContext dctx, Map context) { + public static Map<String, Object> persistRootCompDoc(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -140,7 +140,7 @@ } } - public static Map renderCompDocPdf(DispatchContext dctx, Map context) { + public static Map<String, Object> renderCompDocPdf(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); @@ -297,7 +297,7 @@ } } - public static Map renderContentPdf(DispatchContext dctx, Map context) { + public static Map<String, Object> renderContentPdf(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); Map results = ServiceUtil.returnSuccess(); String dataResourceId = null; Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java?rev=682252&r1=682251&r2=682252&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java Sun Aug 3 21:18:12 2008 @@ -89,7 +89,7 @@ * ownerContentId, then the last step is recusively applied, using the ContentRoles * associated with the ownerContent entity. */ - public static Map checkContentPermission(DispatchContext dctx, Map context) { + public static Map<String, Object> checkContentPermission(DispatchContext dctx, Map<String, ? extends Object> context) { Debug.logWarning(new Exception(), "This service has been depricated in favor of [genericContentPermission]", module); Security security = dctx.getSecurity(); @@ -257,7 +257,7 @@ return results; } - public static Map checkAssocPermission(DispatchContext dctx, Map context) { + public static Map<String, Object> checkAssocPermission(DispatchContext dctx, Map<String, ? extends Object> context) { Map results = FastMap.newInstance(); Security security = dctx.getSecurity(); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java?rev=682252&r1=682251&r2=682252&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java Sun Aug 3 21:18:12 2008 @@ -62,7 +62,7 @@ /** * findRelatedContent Finds the related */ - public static Map findRelatedContent(DispatchContext dctx, Map context) { + public static Map<String, Object> findRelatedContent(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); Map results = FastMap.newInstance(); @@ -123,7 +123,7 @@ /** * This is a generic service for traversing a Content tree, typical of a blog response tree. It calls the ContentWorker.traverse method. */ - public static Map findContentParents(DispatchContext dctx, Map context) { + public static Map<String, Object> findContentParents(DispatchContext dctx, Map<String, ? extends Object> context) { Map results = FastMap.newInstance(); List parentList = FastList.newInstance(); results.put("parentList", parentList); @@ -166,7 +166,7 @@ /** * This is a generic service for traversing a Content tree, typical of a blog response tree. It calls the ContentWorker.traverse method. */ - public static Map traverseContent(DispatchContext dctx, Map context) { + public static Map<String, Object> traverseContent(DispatchContext dctx, Map<String, ? extends Object> context) { GenericDelegator delegator = dctx.getDelegator(); Map results = FastMap.newInstance(); @@ -226,7 +226,7 @@ * Create a Content service. The work is done in a separate method so that complex services that need this functionality do not need to incur the * reflection performance penalty. */ - public static Map createContent(DispatchContext dctx, Map context) { + public static Map<String, Object> createContent(DispatchContext dctx, Map<String, ? extends Object> context) { /* context.put("entityOperation", "_CREATE"); List targetOperationList = ContentWorker.prepTargetOperationList(context, "_CREATE"); @@ -245,7 +245,8 @@ * Create a Content method. The work is done in this separate method so that complex services that need this functionality do not need to incur the * reflection performance penalty. */ - public static Map createContentMethod(DispatchContext dctx, Map context) { + public static Map<String, Object> createContentMethod(DispatchContext dctx, Map<String, ? extends Object> rcontext) { + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); context.put("entityOperation", "_CREATE"); List targetOperationList = ContentWorker.prepTargetOperationList(context, "_CREATE"); if (Debug.infoOn()) Debug.logInfo("in createContentMethod, targetOperationList: " + targetOperationList, null); @@ -317,7 +318,8 @@ * Create a ContentAssoc service. The work is done in a separate method so that complex services that need this functionality do not need to incur the * reflection performance penalty. */ - public static Map createContentAssoc(DispatchContext dctx, Map context) { + public static Map<String, Object> createContentAssoc(DispatchContext dctx, Map<String, ? extends Object> rcontext) { + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); context.put("entityOperation", "_CREATE"); List targetOperationList = ContentWorker.prepTargetOperationList(context, "_CREATE"); @@ -343,7 +345,8 @@ * Create a ContentAssoc method. The work is done in this separate method so that complex services that need this functionality do not need to incur the * reflection performance penalty. */ - public static Map createContentAssocMethod(DispatchContext dctx, Map context) throws GenericServiceException, GenericEntityException { + public static Map<String, Object> createContentAssocMethod(DispatchContext dctx, Map<String, ? extends Object> rcontext) throws GenericServiceException, GenericEntityException { + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); List targetOperationList = ContentWorker.prepTargetOperationList(context, "_CREATE"); List contentPurposeList = ContentWorker.prepContentPurposeList(context); context.put("targetOperationList", targetOperationList); @@ -494,7 +497,8 @@ /** * A service wrapper for the updateContentMethod method. Forces permissions to be checked. */ - public static Map updateContent(DispatchContext dctx, Map context) { + public static Map<String, Object> updateContent(DispatchContext dctx, Map<String, ? extends Object> rcontext) { + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); context.put("entityOperation", "_UPDATE"); List targetOperationList = ContentWorker.prepTargetOperationList(context, "_UPDATE"); @@ -512,7 +516,8 @@ * reflection performance penalty of calling a service. * DEJ20060610: why is this being done? It's a bad design because the service call overhead is not very big, but not calling through the service engine breaks functionality possibilities like ECAs and such */ - public static Map updateContentMethod(DispatchContext dctx, Map context) { + public static Map<String, Object> updateContentMethod(DispatchContext dctx, Map<String, ? extends Object> rcontext) { + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Map result = FastMap.newInstance(); @@ -574,7 +579,8 @@ * Update a ContentAssoc service. The work is done in a separate method so that complex services that need this functionality do not need to incur the * reflection performance penalty. */ - public static Map updateContentAssoc(DispatchContext dctx, Map context) { + public static Map<String, Object> updateContentAssoc(DispatchContext dctx, Map<String, ? extends Object> rcontext) { + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); context.put("entityOperation", "_UPDATE"); List targetOperationList = ContentWorker.prepTargetOperationList(context, "_UPDATE"); @@ -591,7 +597,8 @@ * Update a ContentAssoc method. The work is done in this separate method so that complex services that need this functionality do not need to incur the * reflection performance penalty. */ - public static Map updateContentAssocMethod(DispatchContext dctx, Map context) { + public static Map<String, Object> updateContentAssocMethod(DispatchContext dctx, Map<String, ? extends Object> rcontext) { + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Map result = FastMap.newInstance(); @@ -685,7 +692,8 @@ * Update a ContentAssoc service. The work is done in a separate method so that complex services that need this functionality do not need to incur the * reflection performance penalty. */ - public static Map deactivateContentAssoc(DispatchContext dctx, Map context) { + public static Map<String, Object> deactivateContentAssoc(DispatchContext dctx, Map<String, ? extends Object> rcontext) { + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); context.put("entityOperation", "_UPDATE"); List targetOperationList = ContentWorker.prepTargetOperationList(context, "_UPDATE"); @@ -702,7 +710,8 @@ * Update a ContentAssoc method. The work is done in this separate method so that complex services that need this functionality do not need to incur the * reflection performance penalty. */ - public static Map deactivateContentAssocMethod(DispatchContext dctx, Map context) { + public static Map<String, Object> deactivateContentAssocMethod(DispatchContext dctx, Map<String, ? extends Object> rcontext) { + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Map result = FastMap.newInstance(); @@ -779,7 +788,7 @@ /** * Deactivates any active ContentAssoc (except the current one) that is associated with the passed in template/layout contentId and mapKey. */ - public static Map deactivateAssocs(DispatchContext dctx, Map context) { + public static Map<String, Object> deactivateAssocs(DispatchContext dctx, Map<String, ? extends Object> context) { GenericDelegator delegator = dctx.getDelegator(); String contentIdTo = (String) context.get("contentIdTo"); String mapKey = (String) context.get("mapKey"); @@ -844,7 +853,7 @@ * Get and render subcontent associated with template id and mapkey. If subContentId is supplied, that content will be rendered without searching for other * matching content. */ - public static Map renderSubContentAsText(DispatchContext dctx, Map context) { + public static Map<String, Object> renderSubContentAsText(DispatchContext dctx, Map<String, ? extends Object> context) { Map results = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -905,7 +914,7 @@ * Get and render subcontent associated with template id and mapkey. If subContentId is supplied, that content will be rendered without searching for other * matching content. */ - public static Map renderContentAsText(DispatchContext dctx, Map context) { + public static Map<String, Object> renderContentAsText(DispatchContext dctx, Map<String, ? extends Object> context) { Map results = FastMap.newInstance(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericDelegator delegator = dctx.getDelegator(); @@ -950,7 +959,7 @@ return results; } - public static Map linkContentToPubPt(DispatchContext dctx, Map context) { + public static Map<String, Object> linkContentToPubPt(DispatchContext dctx, Map<String, ? extends Object> context) { Map results = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -1029,7 +1038,7 @@ return results; } - public static Map publishContent(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> publishContent(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map result = FastMap.newInstance(); GenericValue content = (GenericValue)context.get("content"); @@ -1045,7 +1054,7 @@ return result; } - public static Map getPrefixedMembers(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> getPrefixedMembers(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map result = FastMap.newInstance(); Map mapIn = (Map)context.get("mapIn"); @@ -1068,7 +1077,7 @@ return result; } - public static Map splitString(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> splitString(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map result = FastMap.newInstance(); List outputList = FastList.newInstance(); String delimiter = UtilFormatOut.checkEmpty((String)context.get("delimiter"), "|"); @@ -1080,7 +1089,7 @@ return result; } - public static Map joinString(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> joinString(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map result = FastMap.newInstance(); String outputString = null; String delimiter = UtilFormatOut.checkEmpty((String)context.get("delimiter"), "|"); @@ -1092,7 +1101,7 @@ return result; } - public static Map urlEncodeArgs(DispatchContext dctx, Map context) throws GenericServiceException{ + public static Map<String, Object> urlEncodeArgs(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map result = FastMap.newInstance(); Map mapFiltered = FastMap.newInstance(); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java?rev=682252&r1=682251&r2=682252&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java Sun Aug 3 21:18:12 2008 @@ -62,7 +62,7 @@ * From and thru dates or date strings. * A mapKey value. */ - public static Map getAssocAndContentAndDataResource(DispatchContext dctx, Map context) { + public static Map<String, Object> getAssocAndContentAndDataResource(DispatchContext dctx, Map<String, ? extends Object> context) { GenericDelegator delegator = dctx.getDelegator(); List assocTypes = (List) context.get("assocTypes"); @@ -186,7 +186,7 @@ * From and thru dates or date strings. * A mapKey value. */ - public static Map getAssocAndContentAndDataResourceCache(DispatchContext dctx, Map context) { + public static Map<String, Object> getAssocAndContentAndDataResourceCache(DispatchContext dctx, Map<String, ? extends Object> context) { GenericDelegator delegator = dctx.getDelegator(); List assocTypes = (List) context.get("assocTypes"); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java?rev=682252&r1=682251&r2=682252&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java Sun Aug 3 21:18:12 2008 @@ -57,7 +57,8 @@ /** * A top-level service for creating a DataResource and ElectronicText together. */ - public static Map createDataResourceAndText(DispatchContext dctx, Map context) { + public static Map<String, Object> createDataResourceAndText(DispatchContext dctx, Map<String, ? extends Object> rcontext) { + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); Map result = FastMap.newInstance(); Map thisResult = createDataResourceMethod(dctx, context); @@ -82,12 +83,13 @@ /** * A service wrapper for the createDataResourceMethod method. Forces permissions to be checked. */ - public static Map createDataResource(DispatchContext dctx, Map context) { + public static Map<String, Object> createDataResource(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = createDataResourceMethod(dctx, context); return result; } - public static Map createDataResourceMethod(DispatchContext dctx, Map context) { + public static Map<String, Object> createDataResourceMethod(DispatchContext dctx, Map<String, ? extends Object> rcontext) { + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); Map result = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -140,12 +142,12 @@ /** * A service wrapper for the createElectronicTextMethod method. Forces permissions to be checked. */ - public static Map createElectronicText(DispatchContext dctx, Map context) { + public static Map<String, Object> createElectronicText(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = createElectronicTextMethod(dctx, context); return result; } - public static Map createElectronicTextMethod(DispatchContext dctx, Map context) { + public static Map<String, Object> createElectronicTextMethod(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); String dataResourceId = (String) context.get("dataResourceId"); @@ -166,17 +168,18 @@ /** * A service wrapper for the createFileMethod method. Forces permissions to be checked. */ - public static Map createFile(DispatchContext dctx, Map context) { + public static Map<String, Object> createFile(DispatchContext dctx, Map<String, ? extends Object> context) { return createFileMethod(dctx, context); } - public static Map createFileNoPerm(DispatchContext dctx, Map context) { + public static Map<String, Object> createFileNoPerm(DispatchContext dctx, Map<String, ? extends Object> rcontext) { + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); context.put("skipPermissionCheck", "true"); return createFileMethod(dctx, context); } - public static Map createFileMethod(DispatchContext dctx, Map context) { + public static Map<String, Object> createFileMethod(DispatchContext dctx, Map<String, ? extends Object> context) { //GenericValue dataResource = (GenericValue) context.get("dataResource"); String dataResourceTypeId = (String) context.get("dataResourceTypeId"); String objectInfo = (String) context.get("objectInfo"); @@ -249,7 +252,7 @@ /** * A top-level service for updating a DataResource and ElectronicText together. */ - public static Map updateDataResourceAndText(DispatchContext dctx, Map context) { + public static Map<String, Object> updateDataResourceAndText(DispatchContext dctx, Map<String, ? extends Object> context) { Map thisResult = updateDataResourceMethod(dctx, context); if (thisResult.get(ModelService.RESPONSE_MESSAGE) != null) { return ServiceUtil.returnError((String) thisResult.get(ModelService.ERROR_MESSAGE)); @@ -269,13 +272,13 @@ /** * A service wrapper for the updateDataResourceMethod method. Forces permissions to be checked. */ - public static Map updateDataResource(DispatchContext dctx, Map context) { + public static Map<String, Object> updateDataResource(DispatchContext dctx, Map<String, ? extends Object> context) { //context.put("skipPermissionCheck", null); Map result = updateDataResourceMethod(dctx, context); return result; } - public static Map updateDataResourceMethod(DispatchContext dctx, Map context) { + public static Map<String, Object> updateDataResourceMethod(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); @@ -313,7 +316,7 @@ /** * A service wrapper for the updateElectronicTextMethod method. Forces permissions to be checked. */ - public static Map updateElectronicText(DispatchContext dctx, Map context) { + public static Map<String, Object> updateElectronicText(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = updateElectronicTextMethod(dctx, context); return result; } @@ -325,7 +328,7 @@ * @param context * @return */ - public static Map updateElectronicTextMethod(DispatchContext dctx, Map context) { + public static Map<String, Object> updateElectronicTextMethod(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); GenericValue electronicText = null; @@ -364,7 +367,7 @@ /** * A service wrapper for the updateFileMethod method. Forces permissions to be checked. */ - public static Map updateFile(DispatchContext dctx, Map context) { + public static Map<String, Object> updateFile(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = null; try { result = updateFileMethod(dctx, context); @@ -374,7 +377,7 @@ return result; } - public static Map updateFileMethod(DispatchContext dctx, Map context) throws GenericServiceException { + public static Map<String, Object> updateFileMethod(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException { Map result = FastMap.newInstance(); //GenericValue fileText = null; //Locale locale = (Locale) context.get("locale"); @@ -448,7 +451,7 @@ return result; } - public static Map renderDataResourceAsText(DispatchContext dctx, Map context) throws GeneralException, IOException { + public static Map<String, Object> renderDataResourceAsText(DispatchContext dctx, Map<String, ? extends Object> context) throws GeneralException, IOException { Map results = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); //LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -486,12 +489,12 @@ /** * A service wrapper for the updateImageMethod method. Forces permissions to be checked. */ - public static Map updateImage(DispatchContext dctx, Map context) { + public static Map<String, Object> updateImage(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = updateImageMethod(dctx, context); return result; } - public static Map updateImageMethod(DispatchContext dctx, Map context) { + public static Map<String, Object> updateImageMethod(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); //Locale locale = (Locale) context.get("locale"); @@ -520,12 +523,12 @@ /** * A service wrapper for the createImageMethod method. Forces permissions to be checked. */ - public static Map createImage(DispatchContext dctx, Map context) { + public static Map<String, Object> createImage(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = createImageMethod(dctx, context); return result; } - public static Map createImageMethod(DispatchContext dctx, Map context) { + public static Map<String, Object> createImageMethod(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = FastMap.newInstance(); GenericDelegator delegator = dctx.getDelegator(); String dataResourceId = (String) context.get("dataResourceId"); @@ -549,7 +552,7 @@ /** * A service wrapper for the createBinaryFileMethod method. Forces permissions to be checked. */ - public static Map createBinaryFile(DispatchContext dctx, Map context) { + public static Map<String, Object> createBinaryFile(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = null; try { result = createBinaryFileMethod(dctx, context); @@ -559,7 +562,7 @@ return result; } - public static Map createBinaryFileMethod(DispatchContext dctx, Map context) throws GenericServiceException { + public static Map<String, Object> createBinaryFileMethod(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException { Map result = FastMap.newInstance(); GenericValue dataResource = (GenericValue) context.get("dataResource"); //String dataResourceId = (String) dataResource.get("dataResourceId"); @@ -601,7 +604,7 @@ /** * A service wrapper for the createBinaryFileMethod method. Forces permissions to be checked. */ - public static Map updateBinaryFile(DispatchContext dctx, Map context) { + public static Map<String, Object> updateBinaryFile(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = null; try { result = updateBinaryFileMethod(dctx, context); @@ -611,7 +614,7 @@ return result; } - public static Map updateBinaryFileMethod(DispatchContext dctx, Map context) throws GenericServiceException { + public static Map<String, Object> updateBinaryFileMethod(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException { Map result = FastMap.newInstance(); GenericValue dataResource = (GenericValue) context.get("dataResource"); //String dataResourceId = (String) dataResource.get("dataResourceId"); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/email/EmailServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/email/EmailServices.java?rev=682252&r1=682251&r2=682252&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/email/EmailServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/email/EmailServices.java Sun Aug 3 21:18:12 2008 @@ -78,7 +78,7 @@ *@param context Map containing the input parameters *@return Map with the result of the service, the output parameters */ - public static Map sendMail(DispatchContext ctx, Map context) { + public static Map<String, Object> sendMail(DispatchContext ctx, Map<String, ? extends Object> context) { Map results = ServiceUtil.returnSuccess(); String subject = (String) context.get("subject"); String partyId = (String) context.get("partyId"); @@ -277,7 +277,8 @@ *@param context Map containing the input parameters *@return Map with the result of the service, the output parameters */ - public static Map sendMailFromUrl(DispatchContext ctx, Map context) { + public static Map<String, Object> sendMailFromUrl(DispatchContext ctx, Map<String, ? extends Object> rcontext) { + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); // pretty simple, get the content and then call the sendMail method below String bodyUrl = (String) context.remove("bodyUrl"); Map bodyUrlParameters = (Map) context.remove("bodyUrlParameters"); @@ -315,7 +316,8 @@ *@param serviceContext Map containing the input parameters *@return Map with the result of the service, the output parameters */ - public static Map sendMailFromScreen(DispatchContext dctx, Map serviceContext) { + public static Map<String, Object> sendMailFromScreen(DispatchContext dctx, Map<String, ? extends Object> rServiceContext) { + Map<String, Object> serviceContext = UtilMisc.makeMapWritable(rServiceContext); LocalDispatcher dispatcher = dctx.getDispatcher(); String webSiteId = (String) serviceContext.remove("webSiteId"); String bodyText = (String) serviceContext.remove("bodyText"); @@ -490,7 +492,7 @@ *@param serviceContext Map containing the input parameters *@return Map with the result of the service, the output parameters */ - public static Map storeEmailAsCommunication(DispatchContext dctx, Map serviceContext) { + public static Map<String, Object> storeEmailAsCommunication(DispatchContext dctx, Map<String, ? extends Object> serviceContext) { LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) serviceContext.get("userLogin"); @@ -721,7 +723,7 @@ * @param context * @return */ - public static Map storeIncomingEmail(DispatchContext dctx, Map context) { + public static Map<String, Object> storeIncomingEmail(DispatchContext dctx, Map<String, ? extends Object> context) { GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/email/NotificationServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/email/NotificationServices.java?rev=682252&r1=682251&r2=682252&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/email/NotificationServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/email/NotificationServices.java Sun Aug 3 21:18:12 2008 @@ -117,7 +117,7 @@ * the sevice * @return A Map with the service response messages in it */ - public static Map sendNotification(DispatchContext ctx, Map context) { + public static Map<String, Object> sendNotification(DispatchContext ctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = ctx.getDispatcher(); Map result = null; @@ -183,7 +183,7 @@ * @return A new Map indicating success or error containing the * body generated from the template and the input parameters. */ - public static Map prepareNotification(DispatchContext ctx, Map context) { + public static Map<String, Object> prepareNotification(DispatchContext ctx, Map<String, ? extends Object> context) { GenericDelegator delegator = ctx.getDelegator(); String templateName = (String) context.get("templateName"); Map templateData = (Map) context.get("templateData"); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java?rev=682252&r1=682251&r2=682252&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java Sun Aug 3 21:18:12 2008 @@ -65,7 +65,7 @@ * This value should be operating system dependent with "\\" separators for Windows * and "/" for Linux/Unix. */ - public static Map convertDocumentByteBuffer(DispatchContext dctx, Map context) { + public static Map<String, Object> convertDocumentByteBuffer(DispatchContext dctx, Map<String, ? extends Object> context) { Map results = ServiceUtil.returnSuccess(); GenericDelegator delegator = dctx.getDelegator(); @@ -140,7 +140,7 @@ /** * Use OpenOffice to convert documents between types */ - public static Map convertDocument(DispatchContext dctx, Map context) { + public static Map<String, Object> convertDocument(DispatchContext dctx, Map<String, ? extends Object> context) { XMultiComponentFactory xmulticomponentfactory = null; String stringUrl = "file:///" + context.get("filenameFrom"); @@ -169,7 +169,7 @@ /** * Use OpenOffice to convert documents between types */ - public static Map convertDocumentFileToFile(DispatchContext dctx, Map context) { + public static Map<String, Object> convertDocumentFileToFile(DispatchContext dctx, Map<String, ? extends Object> context) { XMultiComponentFactory xmulticomponentfactory = null; String stringUrl = (String) context.get("filenameFrom"); @@ -214,7 +214,7 @@ /** * Use OpenOffice to convert documents between types */ - public static Map convertDocumentStreamToStream(DispatchContext dctx, Map context) { + public static Map<String, Object> convertDocumentStreamToStream(DispatchContext dctx, Map<String, ? extends Object> context) { XMultiComponentFactory xmulticomponentfactory = null; String stringUrl = "file:///" + context.get("filenameFrom"); @@ -259,7 +259,7 @@ /** * Use OpenOffice to compare documents */ - public static Map compareDocuments(DispatchContext dctx, Map context) { + public static Map<String, Object> compareDocuments(DispatchContext dctx, Map<String, ? extends Object> context) { XMultiComponentFactory xmulticomponentfactory = null; String stringUrl = "file:///" + context.get("filenameFrom"); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java?rev=682252&r1=682251&r2=682252&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java Sun Aug 3 21:18:12 2008 @@ -93,7 +93,7 @@ protected static final FoScreenRenderer foScreenRenderer = new FoScreenRenderer(); protected static final FoFormRenderer foFormRenderer = new FoFormRenderer(); - public static Map sendPrintFromScreen(DispatchContext dctx, Map serviceContext) { + public static Map<String, Object> sendPrintFromScreen(DispatchContext dctx, Map<String, ? extends Object> serviceContext) { LocalDispatcher dispatcher = dctx.getDispatcher(); Locale locale = (Locale) serviceContext.get("locale"); String screenLocation = (String) serviceContext.remove("screenLocation"); @@ -214,7 +214,7 @@ return result; } - public static Map createFileFromScreen(DispatchContext dctx, Map serviceContext) { + public static Map<String, Object> createFileFromScreen(DispatchContext dctx, Map<String, ? extends Object> serviceContext) { LocalDispatcher dispatcher = dctx.getDispatcher(); Locale locale = (Locale) serviceContext.get("locale"); String screenLocation = (String) serviceContext.remove("screenLocation"); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchServices.java?rev=682252&r1=682251&r2=682252&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchServices.java Sun Aug 3 21:18:12 2008 @@ -38,7 +38,7 @@ public static final String module = SearchServices.class.getName(); - public static Map indexTree(DispatchContext dctx, Map context) { + public static Map<String, Object> indexTree(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); GenericDelegator delegator = dctx.getDelegator(); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java?rev=682252&r1=682251&r2=682252&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java Sun Aug 3 21:18:12 2008 @@ -75,7 +75,7 @@ /** * */ - public static Map buildSurveyFromPdf(DispatchContext dctx, Map context) { + public static Map<String, Object> buildSurveyFromPdf(DispatchContext dctx, Map<String, ? extends Object> context) { GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -242,7 +242,7 @@ /** * */ - public static Map buildSurveyResponseFromPdf(DispatchContext dctx, Map context) { + public static Map<String, Object> buildSurveyResponseFromPdf(DispatchContext dctx, Map<String, ? extends Object> context) { String surveyResponseId = null; try { @@ -318,7 +318,7 @@ /** */ - public static Map getAcroFieldsFromPdf(DispatchContext dctx, Map context) { + public static Map<String, Object> getAcroFieldsFromPdf(DispatchContext dctx, Map<String, ? extends Object> context) { Map acroFieldMap = FastMap.newInstance(); try { @@ -362,7 +362,7 @@ /** */ - public static Map setAcroFields(DispatchContext dctx, Map context) { + public static Map<String, Object> setAcroFields(DispatchContext dctx, Map<String, ? extends Object> context) { Map results = ServiceUtil.returnSuccess(); GenericDelegator delegator = dctx.getDelegator(); @@ -431,7 +431,8 @@ /** */ - public static Map buildPdfFromSurveyResponse(DispatchContext dctx, Map context) { + public static Map<String, Object> buildPdfFromSurveyResponse(DispatchContext dctx, Map<String, ? extends Object> rcontext) { + Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); GenericDelegator delegator = dctx.getDelegator(); //LocalDispatcher dispatcher = dctx.getDispatcher(); Map results = ServiceUtil.returnSuccess(); @@ -503,7 +504,7 @@ /** * Returns list of maps with "question"->SurveyQuestion and "response"->SurveyResponseAnswer */ - public static Map buildSurveyQuestionsAndAnswers(DispatchContext dctx, Map context) { + public static Map<String, Object> buildSurveyQuestionsAndAnswers(DispatchContext dctx, Map<String, ? extends Object> context) { GenericDelegator delegator = dctx.getDelegator(); //LocalDispatcher dispatcher = dctx.getDispatcher(); Map results = ServiceUtil.returnSuccess(); @@ -540,7 +541,7 @@ /** */ - public static Map setAcroFieldsFromSurveyResponse(DispatchContext dctx, Map context) { + public static Map<String, Object> setAcroFieldsFromSurveyResponse(DispatchContext dctx, Map<String, ? extends Object> context) { GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Map results = ServiceUtil.returnSuccess(); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |