svn commit: r821643 [13/15] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r821643 [13/15] - in /ofbiz/trunk: applications/accounting/script
 
|
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Mon Oct 5 00:08:27 2009 @@ -48,7 +48,7 @@ import org.ofbiz.base.util.collections.FlexibleMapAccessor; import org.ofbiz.base.util.collections.MapStack; import org.ofbiz.base.util.string.FlexibleStringExpander; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -1520,7 +1520,7 @@ } } - public List<OptionValue> getAllOptionValues(Map<String, Object> context, GenericDelegator delegator) { + public List<OptionValue> getAllOptionValues(Map<String, Object> context, Delegator delegator) { List<OptionValue> optionValues = new LinkedList<OptionValue>(); for (OptionSource optionSource: this.optionSources) { optionSource.addOptionValues(optionValues, context, delegator); @@ -1584,7 +1584,7 @@ public static abstract class OptionSource { protected FieldInfo fieldInfo; - public abstract void addOptionValues(List<OptionValue> optionValues, Map<String, Object> context, GenericDelegator delegator); + public abstract void addOptionValues(List<OptionValue> optionValues, Map<String, Object> context, Delegator delegator); } public static class SingleOption extends OptionSource { @@ -1604,7 +1604,7 @@ } @Override - public void addOptionValues(List<OptionValue> optionValues, Map<String, Object> context, GenericDelegator delegator) { + public void addOptionValues(List<OptionValue> optionValues, Map<String, Object> context, Delegator delegator) { optionValues.add(new OptionValue(key.expandString(context), description.expandString(context))); } } @@ -1633,7 +1633,7 @@ } @Override - public void addOptionValues(List<OptionValue> optionValues, Map<String, Object> context, GenericDelegator delegator) { + public void addOptionValues(List<OptionValue> optionValues, Map<String, Object> context, Delegator delegator) { List<? extends Object> dataList = UtilGenerics.checkList(this.listAcsr.get(context)); if (dataList != null && dataList.size() != 0) { for (Object data: dataList) { @@ -1713,7 +1713,7 @@ } @Override - public void addOptionValues(List<OptionValue> optionValues, Map<String, Object> context, GenericDelegator delegator) { + public void addOptionValues(List<OptionValue> optionValues, Map<String, Object> context, Delegator delegator) { // first expand any conditions that need expanding based on the current context EntityCondition findCondition = null; if (UtilValidate.isNotEmpty(this.constraintList)) { @@ -2188,7 +2188,7 @@ if (UtilValidate.isEmpty(fieldKey)) { fieldKey = this.modelFormField.fieldName; } - GenericDelegator delegator = this.modelFormField.modelForm.getDelegator(context); + Delegator delegator = this.modelFormField.modelForm.getDelegator(context); String fieldValue = modelFormField.getEntry(context); try { value = delegator.findOne(this.entityName, this.cache, fieldKey, fieldValue); Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormWrapper.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormWrapper.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormWrapper.java Mon Oct 5 00:08:27 2009 @@ -30,7 +30,7 @@ import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.collections.MapStack; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.service.LocalDispatcher; import org.ofbiz.widget.form.FormFactory; import org.ofbiz.widget.form.FormStringRenderer; @@ -64,7 +64,7 @@ this.response = response; try { - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); this.modelForm = FormFactory.getFormFromLocation(resourceName, formName, delegator.getModelReader(), dispatcher.getDispatchContext()); } catch (IllegalArgumentException iae) { Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java Mon Oct 5 00:08:27 2009 @@ -31,7 +31,7 @@ import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.webapp.control.RequestHandler; import org.ofbiz.webapp.taglib.ContentUrlTag; @@ -77,7 +77,7 @@ } //if (Debug.infoOn()) Debug.logInfo("in appendOfbizUrl, ctx is NOT null(2)", ""); } - GenericDelegator delegator = (GenericDelegator)request.getAttribute("delegator"); + Delegator delegator = (Delegator)request.getAttribute("delegator"); if (delegator == null) { //if (Debug.infoOn()) Debug.logInfo("in appendOfbizUrl, delegator is null(5)", ""); } @@ -106,7 +106,7 @@ //if (Debug.infoOn()) Debug.logInfo("in appendContentUrl, ctx is NOT null(2)", ""); this.request.setAttribute("servletContext", ctx); } - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); if (delegator == null) { //if (Debug.infoOn()) Debug.logInfo("in appendContentUrl, delegator is null(6)", ""); } Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRendererImage.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRendererImage.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRendererImage.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRendererImage.java Mon Oct 5 00:08:27 2009 @@ -27,7 +27,7 @@ import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.widget.WidgetContentWorker; @@ -50,7 +50,7 @@ StringBuilder imgStr = new StringBuilder("<img src=\""); String contentId = menuItem.getAssociatedContentId(context); - GenericDelegator delegator = (GenericDelegator)request.getAttribute("delegator"); + Delegator delegator = (Delegator)request.getAttribute("delegator"); GenericValue webSitePublishPoint = null; //Debug.logInfo("in HtmlMenuRendererImage, contentId:" + contentId,""); try { Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapperImage.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapperImage.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapperImage.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapperImage.java Mon Oct 5 00:08:27 2009 @@ -30,7 +30,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.widget.menu.MenuStringRenderer; import org.ofbiz.widget.menu.ModelMenuItem; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -63,7 +63,7 @@ //String pubPt = (String)request.getAttribute("pubPt"); //if (Debug.infoOn()) Debug.logInfo("in init, pubPt:" + pubPt, module); Map<String, Object> dummyMap = new HashMap<String, Object>(); - GenericDelegator delegator = (GenericDelegator)request.getAttribute("delegator"); + Delegator delegator = (Delegator)request.getAttribute("delegator"); //if (Debug.infoOn()) Debug.logInfo("in init, delegator:" + delegator, module); try { List menuItemList = modelMenu.getMenuItemList(); 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=821643&r1=821642&r2=821643&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 Oct 5 00:08:27 2009 @@ -38,7 +38,7 @@ import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.service.LocalDispatcher; import org.ofbiz.webapp.control.RequestHandler; import org.ofbiz.webapp.taglib.ContentUrlTag; @@ -657,7 +657,7 @@ String expandedDataResourceId = content.getDataResourceId(context); String renderedContent = null; LocalDispatcher dispatcher = (LocalDispatcher) context.get("dispatcher"); - GenericDelegator delegator = (GenericDelegator) context.get("delegator"); + Delegator delegator = (Delegator) context.get("delegator"); // make a new map for content rendering; so our current map does not get clobbered Map<String, Object> contentContext = FastMap.newInstance(); @@ -790,7 +790,7 @@ String expandedMapKey = content.getMapKey(context); String renderedContent = null; LocalDispatcher dispatcher = (LocalDispatcher) context.get("dispatcher"); - GenericDelegator delegator = (GenericDelegator) context.get("delegator"); + Delegator delegator = (Delegator) context.get("delegator"); // create a new map for the content rendering; so our current context does not get overwritten! Map<String, Object> contentContext = FastMap.newInstance(); @@ -856,7 +856,7 @@ //HttpSession session = request.getSession(); //GenericValue userLogin = (GenericValue)session.getAttribute("userLogin"); /* don't know why this is here. might come to me later. -amb - GenericDelegator delegator = (GenericDelegator)request.getAttribute("delegator"); + Delegator delegator = (Delegator)request.getAttribute("delegator"); String contentIdTo = content.getContentId(context); String mapKey = content.getAssocName(context); GenericValue view = null; Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java Mon Oct 5 00:08:27 2009 @@ -33,7 +33,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.cache.UtilCache; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.service.LocalDispatcher; import org.w3c.dom.Document; @@ -63,7 +63,7 @@ modelMenuMap = menuWebappCache.get(cacheKey); if (modelMenuMap == null) { ServletContext servletContext = (ServletContext) request.getAttribute("servletContext"); - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); URL menuFileUrl = servletContext.getResource(resourceName); @@ -85,7 +85,7 @@ return modelMenu; } - public static Map<String, ModelMenu> readMenuDocument(Document menuFileDoc, GenericDelegator delegator, LocalDispatcher dispatcher, String menuLocation) { + public static Map<String, ModelMenu> readMenuDocument(Document menuFileDoc, Delegator delegator, LocalDispatcher dispatcher, String menuLocation) { Map<String, ModelMenu> modelMenuMap = new HashMap<String, ModelMenu>(); if (menuFileDoc != null) { // read document and construct ModelMenu for each menu element @@ -102,7 +102,7 @@ return modelMenuMap; } - public static ModelMenu getMenuFromLocation(String resourceName, String menuName, GenericDelegator delegator, LocalDispatcher dispatcher) + public static ModelMenu getMenuFromLocation(String resourceName, String menuName, Delegator delegator, LocalDispatcher dispatcher) throws IOException, SAXException, ParserConfigurationException { Map<String, ModelMenu> modelMenuMap = menuLocationCache.get(resourceName); if (modelMenuMap == null) { Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java Mon Oct 5 00:08:27 2009 @@ -33,7 +33,7 @@ import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.template.FreeMarkerWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.webapp.ftl.LoopWriter; import org.ofbiz.widget.WidgetContentWorker; @@ -76,7 +76,7 @@ final StringBuilder buf = new StringBuilder(); final Environment env = Environment.getCurrentEnvironment(); final Map<String, Object> templateCtx = UtilGenerics.checkMap(FreeMarkerWorker.getWrappedObject("context", env)); - final GenericDelegator delegator = (GenericDelegator) FreeMarkerWorker.getWrappedObject("delegator", env); + final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env); final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env); final HttpServletResponse response = (HttpServletResponse) FreeMarkerWorker.getWrappedObject("response", env); final HttpSession session = (HttpSession) FreeMarkerWorker.getWrappedObject("session", env); 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=821643&r1=821642&r2=821643&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 Oct 5 00:08:27 2009 @@ -31,7 +31,7 @@ import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.collections.FlexibleMapAccessor; import org.ofbiz.base.util.string.FlexibleStringExpander; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; @@ -53,7 +53,7 @@ public static final String module = ModelMenu.class.getName(); - protected GenericDelegator delegator; + protected Delegator delegator; protected LocalDispatcher dispatcher; protected String menuLocation; @@ -109,7 +109,7 @@ public ModelMenu() {} /** XML Constructor */ - public ModelMenu(Element menuElement, GenericDelegator delegator, LocalDispatcher dispatcher) { + public ModelMenu(Element menuElement, Delegator delegator, LocalDispatcher dispatcher) { super(menuElement); this.delegator = delegator; this.dispatcher = dispatcher; @@ -359,7 +359,7 @@ return this.dispatcher; } - public GenericDelegator getDelegator() { + public Delegator getDelegator() { return this.delegator; } 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=821643&r1=821642&r2=821643&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 Oct 5 00:08:27 2009 @@ -36,7 +36,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.string.FlexibleStringExpander; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; @@ -385,7 +385,7 @@ List<GenericValue> portalPages = null; String parentPortalPageId = this.getParentPortalPageId(context); if (UtilValidate.isNotEmpty(parentPortalPageId)) { - GenericDelegator delegator = modelMenu.getDelegator(); + Delegator delegator = modelMenu.getDelegator(); try { // first get public pages EntityCondition cond = 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=821643&r1=821642&r2=821643&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 Oct 5 00:08:27 2009 @@ -42,7 +42,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.template.FreeMarkerWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.service.LocalDispatcher; import org.ofbiz.webapp.control.RequestHandler; import org.ofbiz.webapp.taglib.ContentUrlTag; @@ -366,7 +366,7 @@ String expandedDataResourceId = content.getDataResourceId(context); String renderedContent = null; LocalDispatcher dispatcher = (LocalDispatcher) context.get("dispatcher"); - GenericDelegator delegator = (GenericDelegator) context.get("delegator"); + Delegator delegator = (Delegator) context.get("delegator"); // make a new map for content rendering; so our current map does not get clobbered Map<String, Object> contentContext = FastMap.newInstance(); @@ -516,7 +516,7 @@ String expandedMapKey = content.getMapKey(context); String renderedContent = ""; LocalDispatcher dispatcher = (LocalDispatcher) context.get("dispatcher"); - GenericDelegator delegator = (GenericDelegator) context.get("delegator"); + Delegator delegator = (Delegator) context.get("delegator"); // create a new map for the content rendering; so our current context does not get overwritten! Map<String, Object> contentContext = FastMap.newInstance(); Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java Mon Oct 5 00:08:27 2009 @@ -31,7 +31,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.string.FlexibleStringExpander; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.transaction.TransactionUtil; @@ -433,8 +433,8 @@ return dispatcher; } - public GenericDelegator getDelegator(Map<String, Object> context) { - GenericDelegator delegator = (GenericDelegator) context.get("delegator"); + public Delegator getDelegator(Map<String, Object> context) { + Delegator delegator = (Delegator) context.get("delegator"); return delegator; } } 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=821643&r1=821642&r2=821643&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 Oct 5 00:08:27 2009 @@ -69,7 +69,7 @@ import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.collections.MapStack; import org.ofbiz.base.util.string.FlexibleStringExpander; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.widget.ModelWidget; @@ -1091,7 +1091,7 @@ // because many times there will be embedded "subcontent" elements // that use the syntax: <subcontent content-id="${contentId}"... // and this is a step to make sure that it is there. - GenericDelegator delegator = (GenericDelegator) context.get("delegator"); + Delegator delegator = (Delegator) context.get("delegator"); GenericValue content = null; String expandedDataResourceId = getDataResourceId(context); String expandedContentId = getContentId(context); Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java Mon Oct 5 00:08:27 2009 @@ -44,7 +44,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.collections.MapStack; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.GenericValue; import org.ofbiz.security.Security; @@ -144,11 +144,11 @@ return this.screenStringRenderer; } - public void populateBasicContext(Map<String, Object> parameters, GenericDelegator delegator, LocalDispatcher dispatcher, Authorization authz, Security security, Locale locale, GenericValue userLogin) { + public void populateBasicContext(Map<String, Object> parameters, Delegator delegator, LocalDispatcher dispatcher, Authorization authz, Security security, Locale locale, GenericValue userLogin) { populateBasicContext(context, this, parameters, delegator, dispatcher, authz, security, locale, userLogin); } - public static void populateBasicContext(MapStack<String> context, ScreenRenderer screens, Map<String, Object> parameters, GenericDelegator delegator, LocalDispatcher dispatcher, Authorization authz, Security security, Locale locale, GenericValue userLogin) { + public static void populateBasicContext(MapStack<String> context, ScreenRenderer screens, Map<String, Object> parameters, Delegator delegator, LocalDispatcher dispatcher, Authorization authz, Security security, Locale locale, GenericValue userLogin) { // ========== setup values that should always be in a screen context // include an object to more easily render screens context.put("screens", screens); @@ -196,7 +196,7 @@ GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); - populateBasicContext(context, screens, parameterMap, (GenericDelegator) request.getAttribute("delegator"), + populateBasicContext(context, screens, parameterMap, (Delegator) request.getAttribute("delegator"), (LocalDispatcher) request.getAttribute("dispatcher"), (Authorization) request.getAttribute("authz"), (Security) request.getAttribute("security"), UtilHttp.getLocale(request), userLogin); Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java Mon Oct 5 00:08:27 2009 @@ -46,7 +46,7 @@ import org.ofbiz.widget.screen.ScreenFactory; import org.ofbiz.widget.screen.ScreenStringRenderer; import org.ofbiz.widget.screen.ScreenRenderException; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.model.ModelEntity; @@ -71,7 +71,7 @@ protected FlexibleStringExpander defaultWrapStyleExdr; protected List<ModelNode> nodeList = FastList.newInstance(); protected Map<String, ModelNode> nodeMap = FastMap.newInstance(); - protected GenericDelegator delegator; + protected Delegator delegator; protected LocalDispatcher dispatcher; protected FlexibleStringExpander expandCollapseRequestExdr; protected FlexibleStringExpander trailNameExdr; @@ -87,7 +87,7 @@ /** XML Constructor */ public ModelTree() {} - public ModelTree(Element treeElement, GenericDelegator delegator, LocalDispatcher dispatcher) { + public ModelTree(Element treeElement, Delegator delegator, LocalDispatcher dispatcher) { super(treeElement); this.rootNodeName = treeElement.getAttribute("root-node-name"); this.defaultRenderStyle = UtilFormatOut.checkEmpty(treeElement.getAttribute("default-render-style"), "simple"); @@ -247,7 +247,7 @@ return this.dispatcher; } - public GenericDelegator getDelegator() { + public Delegator getDelegator() { return this.delegator; } @@ -470,7 +470,7 @@ nodeCount = (Long) obj; } String entName = this.getEntityName(); - GenericDelegator delegator = modelTree.getDelegator(); + Delegator delegator = modelTree.getDelegator(); ModelEntity modelEntity = delegator.getModelEntity(entName); ModelField modelField = null; if (modelEntity.isField(countFieldName)) { Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/TreeFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/TreeFactory.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/TreeFactory.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/TreeFactory.java Mon Oct 5 00:08:27 2009 @@ -32,7 +32,7 @@ import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.cache.UtilCache; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.service.LocalDispatcher; import org.w3c.dom.Document; @@ -50,7 +50,7 @@ public static final UtilCache<String, Map<String, ModelTree>> treeLocationCache = new UtilCache<String, Map<String, ModelTree>>("widget.tree.locationResource", 0, 0, false); public static final UtilCache<String, Map<String, ModelTree>> treeWebappCache = new UtilCache<String, Map<String, ModelTree>>("widget.tree.webappResource", 0, 0, false); - public static ModelTree getTreeFromLocation(String resourceName, String treeName, GenericDelegator delegator, LocalDispatcher dispatcher) + public static ModelTree getTreeFromLocation(String resourceName, String treeName, Delegator delegator, LocalDispatcher dispatcher) throws IOException, SAXException, ParserConfigurationException { Map<String, ModelTree> modelTreeMap = treeLocationCache.get(resourceName); if (modelTreeMap == null) { @@ -90,7 +90,7 @@ modelTreeMap = treeWebappCache.get(cacheKey); if (modelTreeMap == null) { ServletContext servletContext = (ServletContext) request.getAttribute("servletContext"); - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); URL treeFileUrl = servletContext.getResource(resourceName); @@ -108,7 +108,7 @@ return modelTree; } - public static Map<String, ModelTree> readTreeDocument(Document treeFileDoc, GenericDelegator delegator, LocalDispatcher dispatcher, String treeLocation) { + public static Map<String, ModelTree> readTreeDocument(Document treeFileDoc, Delegator delegator, LocalDispatcher dispatcher, String treeLocation) { Map<String, ModelTree> modelTreeMap = new HashMap<String, ModelTree>(); if (treeFileDoc != null) { // read document and construct ModelTree for each tree element Modified: ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java (original) +++ ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java Mon Oct 5 00:08:27 2009 @@ -28,7 +28,7 @@ import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; @@ -47,7 +47,7 @@ public static Map addPartFixedAssetMaint(DispatchContext ctx, Map context) { LocalDispatcher dispatcher = ctx.getDispatcher(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); Locale locale = (Locale) context.get("locale"); String fixedAssetId = (String)context.get("fixedAssetId"); String maintHistSeqId = (String)context.get("maintHistSeqId"); Modified: ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java Mon Oct 5 00:08:27 2009 @@ -31,7 +31,7 @@ import org.ofbiz.service.LocalDispatcher; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.ServiceUtil; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.transaction.TransactionUtil; @@ -52,7 +52,7 @@ private static final String props = "crowd.properties"; protected LocalDispatcher dispatcher; - protected GenericDelegator delegator; + protected Delegator delegator; /** * Method called when authenticator is first initialized (the delegator Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java (original) +++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java Mon Oct 5 00:08:27 2009 @@ -44,7 +44,7 @@ import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityUtil; @@ -62,7 +62,7 @@ private static final String module = EbayHelper.class.getName(); public static final String resource = "EbayUiLabels"; - public static Map<String, Object> buildEbayConfig(Map<String, Object> context, GenericDelegator delegator) { + public static Map<String, Object> buildEbayConfig(Map<String, Object> context, Delegator delegator) { Map<String, Object> buildEbayConfigContext = FastMap.newInstance(); Locale locale = (Locale) context.get("locale"); String productStoreId = (String) context.get("productStoreId"); @@ -165,7 +165,7 @@ return outputBuilder.toString(); } - public static void setShipmentMethodType(ShoppingCart cart, String shippingService, String productStoreId, GenericDelegator delegator) { + public static void setShipmentMethodType(ShoppingCart cart, String shippingService, String productStoreId, Delegator delegator) { String partyId = "_NA_"; String shipmentMethodTypeId = "NO_SHIPPING"; try { @@ -181,7 +181,7 @@ cart.setShipmentMethodTypeId(shipmentMethodTypeId); } - public static boolean createPaymentFromPaymentPreferences(GenericDelegator delegator, LocalDispatcher dispatcher, GenericValue userLogin, + public static boolean createPaymentFromPaymentPreferences(Delegator delegator, LocalDispatcher dispatcher, GenericValue userLogin, String orderId, String externalId, Timestamp orderDate, String partyIdFrom) { List<GenericValue> paymentPreferences = null; try { @@ -208,7 +208,7 @@ public static boolean createPayment(LocalDispatcher dispatcher, GenericValue userLogin, GenericValue paymentPreference, String orderId, String externalId, Timestamp orderDate, String partyIdFrom) { try { - GenericDelegator delegator = paymentPreference.getDelegator(); + Delegator delegator = paymentPreference.getDelegator(); // create the PaymentGatewayResponse String responseId = delegator.getNextSeqId("PaymentGatewayResponse"); @@ -239,7 +239,7 @@ } } - public static GenericValue makeOrderAdjustment(GenericDelegator delegator, String orderAdjustmentTypeId, + public static GenericValue makeOrderAdjustment(Delegator delegator, String orderAdjustmentTypeId, String orderId, String orderItemSeqId, String shipGroupSeqId, double amount, double sourcePercentage) { GenericValue orderAdjustment = null; @@ -442,7 +442,7 @@ } } - public static Map<String, Object> getCountryGeoId(GenericDelegator delegator, String geoCode) { + public static Map<String, Object> getCountryGeoId(Delegator delegator, String geoCode) { GenericValue geo = null; try { Debug.logInfo("geocode: " + geoCode, module); @@ -471,7 +471,7 @@ return result; } - public static String setShippingAddressContactMech(LocalDispatcher dispatcher, GenericDelegator delegator, + public static String setShippingAddressContactMech(LocalDispatcher dispatcher, Delegator delegator, GenericValue party, GenericValue userLogin, Map<String, Object> context) { String contactMechId = null; String partyId = (String) party.get("partyId"); @@ -519,7 +519,7 @@ return createAddress(dispatcher, partyId, userLogin, "SHIPPING_LOCATION", context); } - public static String setEmailContactMech(LocalDispatcher dispatcher, GenericDelegator delegator, + public static String setEmailContactMech(LocalDispatcher dispatcher, Delegator delegator, GenericValue party, GenericValue userLogin, Map<String, Object> context) { String contactMechId = null; String partyId = (String) party.get("partyId"); @@ -544,7 +544,7 @@ return createPartyEmail(dispatcher, partyId, (String) context.get("emailBuyer"), userLogin); } - public static String setPhoneContactMech(LocalDispatcher dispatcher, GenericDelegator delegator, + public static String setPhoneContactMech(LocalDispatcher dispatcher, Delegator delegator, GenericValue party, GenericValue userLogin, Map<String, Object> context) { String contactMechId = null; String partyId = (String) party.get("partyId"); @@ -579,7 +579,7 @@ return createPartyPhone(dispatcher, partyId, (String) context.get("shippingAddressPhone"), userLogin); } - public static String retrieveProductIdFromTitle(GenericDelegator delegator, String title) { + public static String retrieveProductIdFromTitle(Delegator delegator, String title) { String productId = ""; try { // First try to get an exact match: title == internalName Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java (original) +++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java Mon Oct 5 00:08:27 2009 @@ -37,7 +37,7 @@ import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityUtil; @@ -66,7 +66,7 @@ private static List<String> orderImportFailureMessageList = FastList.newInstance(); public static Map<String, Object> getEbayOrders(DispatchContext dctx, Map<String, Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); orderImportSuccessMessageList.clear(); @@ -113,7 +113,7 @@ } public static Map<String, Object> importEbayOrders(DispatchContext dctx, Map<String, Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); Map<String, Object> result = FastMap.newInstance(); @@ -252,7 +252,7 @@ return ServiceUtil.returnSuccess(); } - private static Map<String, Object> checkOrders(GenericDelegator delegator, LocalDispatcher dispatcher, Locale locale, Map<String, Object> context, String responseMsg) { + private static Map<String, Object> checkOrders(Delegator delegator, LocalDispatcher dispatcher, Locale locale, Map<String, Object> context, String responseMsg) { StringBuffer errorMessage = new StringBuffer(); Map<String, Object> result = FastMap.newInstance(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -415,7 +415,7 @@ //</GetOrdersResponse> - private static List<Map<String, Object>> readGetOrdersResponse(String responseMsg, Locale locale, String productStoreId, GenericDelegator delegator, LocalDispatcher dispatcher, StringBuffer errorMessage, GenericValue userLogin) { + private static List<Map<String, Object>> readGetOrdersResponse(String responseMsg, Locale locale, String productStoreId, Delegator delegator, LocalDispatcher dispatcher, StringBuffer errorMessage, GenericValue userLogin) { List<Map<String, Object>> fetchedOrders = FastList.newInstance(); try { Document docResponse = UtilXml.readXmlDocument(responseMsg, true); @@ -624,7 +624,7 @@ return fetchedOrders; } - private static List<Map<String, Object>> readGetSellerTransactionResponse(String responseMsg, Locale locale, String productStoreId, GenericDelegator delegator, LocalDispatcher dispatcher, StringBuffer errorMessage, GenericValue userLogin) { + private static List<Map<String, Object>> readGetSellerTransactionResponse(String responseMsg, Locale locale, String productStoreId, Delegator delegator, LocalDispatcher dispatcher, StringBuffer errorMessage, GenericValue userLogin) { List<Map<String, Object>> fetchedOrders = FastList.newInstance(); try { Document docResponse = UtilXml.readXmlDocument(responseMsg, true); @@ -901,7 +901,7 @@ return fetchedOrders; } - private static List<String> readGetMyeBaySellingResponse(String responseMsg, Locale locale, String productStoreId, GenericDelegator delegator, LocalDispatcher dispatcher, StringBuffer errorMessage, GenericValue userLogin) { + private static List<String> readGetMyeBaySellingResponse(String responseMsg, Locale locale, String productStoreId, Delegator delegator, LocalDispatcher dispatcher, StringBuffer errorMessage, GenericValue userLogin) { List<String> fetchDeletedOrdersAndTransactions = FastList.newInstance(); try { Document docResponse = UtilXml.readXmlDocument(responseMsg, true); @@ -966,7 +966,7 @@ return fetchDeletedOrdersAndTransactions; } - private static Map<String, Object> createShoppingCart(GenericDelegator delegator, LocalDispatcher dispatcher, Locale locale, Map<String, Object> context, boolean create) { + private static Map<String, Object> createShoppingCart(Delegator delegator, LocalDispatcher dispatcher, Locale locale, Map<String, Object> context, boolean create) { try { String productStoreId = (String) context.get("productStoreId"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -1215,7 +1215,7 @@ } // Made some changes transactionId removed. - private static GenericValue externalOrderExists(GenericDelegator delegator, String externalId) throws GenericEntityException { + private static GenericValue externalOrderExists(Delegator delegator, String externalId) throws GenericEntityException { Debug.logInfo("Checking for existing externalId: " + externalId, module); GenericValue orderHeader = null; List<GenericValue> orderHeaderList = delegator.findByAnd("OrderHeader", UtilMisc.toMap("externalId", externalId)); @@ -1225,7 +1225,7 @@ return orderHeader; } - private static void addItem(ShoppingCart cart, Map<String, Object> orderItem, LocalDispatcher dispatcher, GenericDelegator delegator, int groupIdx) throws GeneralException { + private static void addItem(ShoppingCart cart, Map<String, Object> orderItem, LocalDispatcher dispatcher, Delegator delegator, int groupIdx) throws GeneralException { String productId = (String) orderItem.get("productId"); GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), false); if (UtilValidate.isEmpty(product)) { Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java (original) +++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java Mon Oct 5 00:08:27 2009 @@ -37,7 +37,7 @@ import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityUtil; @@ -57,7 +57,7 @@ private static final String module = ImportOrdersFromEbay.class.getName(); public static Map<String, Object> importOrdersSearchFromEbay(DispatchContext dctx, Map<String, Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); Map<String, Object> result = FastMap.newInstance(); @@ -81,7 +81,7 @@ } public static Map<String, Object> importOrderFromEbay(DispatchContext dctx, Map<String, Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); Map<String, Object> order = FastMap.newInstance(); @@ -125,7 +125,7 @@ } public static Map<String, Object> setEbayOrderToComplete(DispatchContext dctx, Map<String, Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); Locale locale = (Locale) context.get("locale"); String orderId = (String) context.get("orderId"); String externalId = (String) context.get("externalId"); @@ -181,7 +181,7 @@ return ServiceUtil.returnSuccess(); } - private static Map<String, Object> checkOrders(GenericDelegator delegator, LocalDispatcher dispatcher, Locale locale, Map<String, Object> context, String response) { + private static Map<String, Object> checkOrders(Delegator delegator, LocalDispatcher dispatcher, Locale locale, Map<String, Object> context, String response) { StringBuffer errorMessage = new StringBuffer(); List<Map<String, Object>> orders = readResponseFromEbay(response, locale, (String)context.get("productStoreId"), delegator, errorMessage); if (orders == null) { @@ -249,7 +249,7 @@ return ServiceUtil.returnSuccess(); } - public static Map<String, Object> buildCompleteSaleRequest(GenericDelegator delegator, Locale locale, String itemId, String transactionId, Map<String, Object> context, StringBuffer dataItemsXml, String token) { + public static Map<String, Object> buildCompleteSaleRequest(Delegator delegator, Locale locale, String itemId, String transactionId, Map<String, Object> context, StringBuffer dataItemsXml, String token) { String paid = (String)context.get("paid"); String shipped = (String)context.get("shipped"); @@ -323,7 +323,7 @@ return ServiceUtil.returnSuccess(); } - private static List<Map<String, Object>> readResponseFromEbay(String msg, Locale locale, String productStoreId, GenericDelegator delegator, StringBuffer errorMessage) { + private static List<Map<String, Object>> readResponseFromEbay(String msg, Locale locale, String productStoreId, Delegator delegator, StringBuffer errorMessage) { List<Map<String, Object>> orders = null; try { Document docResponse = UtilXml.readXmlDocument(msg, true); @@ -571,7 +571,7 @@ return orders; } - private static Map<String, Object> createShoppingCart(GenericDelegator delegator, LocalDispatcher dispatcher, Locale locale, Map<String, Object> parameters, boolean create) { + private static Map<String, Object> createShoppingCart(Delegator delegator, LocalDispatcher dispatcher, Locale locale, Map<String, Object> parameters, boolean create) { try { String productStoreId = (String) parameters.get("productStoreId"); GenericValue userLogin = (GenericValue) parameters.get("userLogin"); @@ -809,7 +809,7 @@ } - private static GenericValue externalOrderExists(GenericDelegator delegator, String externalId, String transactionId) throws GenericEntityException { + private static GenericValue externalOrderExists(Delegator delegator, String externalId, String transactionId) throws GenericEntityException { Debug.logInfo("Checking for existing externalId: " + externalId +" and transactionId: " + transactionId, module); GenericValue orderHeader = null; List<GenericValue> entities = delegator.findByAnd("OrderHeader", UtilMisc.toMap("externalId", externalId, "transactionId", transactionId)); Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java (original) +++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java Mon Oct 5 00:08:27 2009 @@ -41,7 +41,7 @@ import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; @@ -67,7 +67,7 @@ public static Map exportToEbay(DispatchContext dctx, Map context) { Locale locale = (Locale) context.get("locale"); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); productExportSuccessMessageList.clear(); productExportFailureMessageList.clear(); Map<String, Object> result = FastMap.newInstance(); @@ -180,7 +180,7 @@ private static Map buildDataItemsXml(DispatchContext dctx, Map context, StringBuffer dataItemsXml, String token, GenericValue prod) { Locale locale = (Locale)context.get("locale"); try { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String webSiteUrl = (String)context.get("webSiteUrl"); List selectResult = (List)context.get("selectResult"); @@ -458,7 +458,7 @@ } } - private static void setMiscDetails(Document itemDocument, Element itemElem, Map context, GenericDelegator delegator) throws Exception { + private static void setMiscDetails(Document itemDocument, Element itemElem, Map context, Delegator delegator) throws Exception { String customXmlFromUI = (String) context.get("customXml"); String customXml = ""; if (UtilValidate.isNotEmpty(customXmlFromUI)) { @@ -480,7 +480,7 @@ } public static Map getEbayCategories(DispatchContext dctx, Map context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); Locale locale = (Locale) context.get("locale"); String categoryCode = (String)context.get("categoryCode"); Map result = null; Modified: ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy Mon Oct 5 00:08:27 2009 @@ -24,7 +24,7 @@ import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.order.shoppingcart.CheckOutHelper; import org.ofbiz.order.shoppingcart.ShoppingCart; Modified: ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/misc/ThirdPartyEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/misc/ThirdPartyEvents.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/misc/ThirdPartyEvents.java (original) +++ ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/misc/ThirdPartyEvents.java Mon Oct 5 00:08:27 2009 @@ -32,7 +32,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityUtil; @@ -103,7 +103,7 @@ *@return String specifying the exit status of this event */ public static String updateAssociatedDistributor(HttpServletRequest request, HttpServletResponse response) { - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin"); GenericValue party = null; @@ -183,7 +183,7 @@ *@return String specifying the exit status of this event */ public static String updateAssociatedAffiliate(HttpServletRequest request, HttpServletResponse response) { - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin"); GenericValue party = null; Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy Mon Oct 5 00:08:27 2009 @@ -18,7 +18,7 @@ */ import org.ofbiz.base.util.*; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.product.store.ProductStoreSurveyWrapper; Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy Mon Oct 5 00:08:27 2009 @@ -18,7 +18,7 @@ */ import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.*; import org.ofbiz.entity.condition.*; import org.ofbiz.entity.util.*; Modified: ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java (original) +++ ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java Mon Oct 5 00:08:27 2009 @@ -42,7 +42,7 @@ import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; @@ -68,7 +68,7 @@ public static Map<String, Object> exportToGoogle(DispatchContext dctx, Map<String, Object> context) { Locale locale = (Locale) context.get("locale"); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Map<String, Object> result = null; @@ -245,7 +245,7 @@ } private static Map postItem(String token, String postItemsUrl, String developerKey, StringBuffer dataItems, - Locale locale, String testMode, List newProductsInGoogle, List productsRemovedFromGoogle, LocalDispatcher dispatcher, GenericDelegator delegator) throws IOException { + Locale locale, String testMode, List newProductsInGoogle, List productsRemovedFromGoogle, LocalDispatcher dispatcher, Delegator delegator) throws IOException { if (Debug.verboseOn()) { Debug.logVerbose("Request To Google Base :\n" + dataItems.toString(), module); } @@ -301,7 +301,7 @@ List<Object> newProductsInGoogle = FastList.newInstance(); List<Object> productsRemovedFromGoogle = FastList.newInstance(); try { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); List selectResult = (List)context.get("selectResult"); String webSiteUrl = (String)context.get("webSiteUrl"); @@ -531,7 +531,7 @@ return priceString; } - private static Map<String, Object> readResponseFromGoogle(String msg, List<Object> newProductsInGoogle, List<Object> productsRemovedFromGoogle, LocalDispatcher dispatcher, GenericDelegator delegator, Locale locale) { + private static Map<String, Object> readResponseFromGoogle(String msg, List<Object> newProductsInGoogle, List<Object> productsRemovedFromGoogle, LocalDispatcher dispatcher, Delegator delegator, Locale locale) { List message = FastList.newInstance(); // Debug.log("====get xml response from google: " + msg); try { @@ -589,7 +589,7 @@ return ServiceUtil.returnSuccess(); } - private static Map<String, Object> buildGoogleBaseConfig(Map<String, Object> context, GenericDelegator delegator) { + private static Map<String, Object> buildGoogleBaseConfig(Map<String, Object> context, Delegator delegator) { String productStoreId = (String) context.get("productStoreId"); Map<String, Object> buildGoogleBaseConfigContext = FastMap.newInstance(); Modified: ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java (original) +++ ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java Mon Oct 5 00:08:27 2009 @@ -31,7 +31,7 @@ import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; @@ -73,10 +73,10 @@ public static final int BILLING_ADDRESS = 50; protected LocalDispatcher dispatcher; - protected GenericDelegator delegator; + protected Delegator delegator; protected GenericValue system; - public GoogleCheckoutHelper(LocalDispatcher dispatcher, GenericDelegator delegator) { + public GoogleCheckoutHelper(LocalDispatcher dispatcher, Delegator delegator) { this.dispatcher = dispatcher; this.delegator = delegator; Modified: ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutResponseEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutResponseEvents.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutResponseEvents.java (original) +++ ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutResponseEvents.java Mon Oct 5 00:08:27 2009 @@ -25,7 +25,7 @@ import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.product.store.ProductStoreWorker; import org.ofbiz.service.LocalDispatcher; import org.w3c.dom.Document; @@ -46,7 +46,7 @@ public static String checkNotification(HttpServletRequest request, HttpServletResponse response) { LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); GoogleCheckoutHelper helper = new GoogleCheckoutHelper(dispatcher, delegator); Modified: ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java (original) +++ ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java Mon Oct 5 00:08:27 2009 @@ -32,7 +32,7 @@ import org.ofbiz.base.util.UtilNumber; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityUtil; @@ -70,7 +70,7 @@ public static Map<String, Object> sendShoppingCartRequest(DispatchContext dctx, Map<String, ? extends Object> context) { ShoppingCart cart = (ShoppingCart) context.get("shoppingCart"); String productStoreId = cart.getProductStoreId(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); GenericValue googleCfg = getGoogleConfiguration(delegator, productStoreId); MerchantInfo mInfo = getMerchantInfo(delegator, productStoreId); if (mInfo == null) { @@ -225,7 +225,7 @@ } public static Map<String, Object> sendOrderNumberRequest(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String orderId = (String) context.get("orderId"); GenericValue order = findGoogleOrder(delegator, orderId); if (order != null) { @@ -245,7 +245,7 @@ } public static Map<String, Object> sendAuthorizeRequest(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String orderId = (String) context.get("orderId"); GenericValue order = findGoogleOrder(delegator, orderId); if (order != null) { @@ -266,7 +266,7 @@ // trigger on captureOrderPayments public static Map<String, Object> sendChargeRequest(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String orderId = (String) context.get("orderId"); GenericValue order = findGoogleOrder(delegator, orderId); if (order != null) { @@ -292,7 +292,7 @@ } public static Map<String, Object> sendReturnRequest(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String returnId = (String) context.get("returnId"); // sort by order @@ -393,7 +393,7 @@ } public static Map<String, Object> sendShipRequest(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String shipmentId = (String) context.get("shipmentId"); try { sendItemsShipped(delegator, shipmentId); @@ -405,7 +405,7 @@ } public static Map<String, Object> sendOrderCancelRequest(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String orderId = (String) context.get("orderId"); GenericValue order = findGoogleOrder(delegator, orderId); if (order != null) { @@ -425,7 +425,7 @@ } public static Map<String, Object> sendOrderItemCancelRequest(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String orderId = (String) context.get("orderId"); String orderItemSeqId = (String) context.get("orderItemSeqId"); GenericValue order = findGoogleOrder(delegator, orderId); @@ -456,7 +456,7 @@ } public static Map<String, Object> sendArchiveOrderRequest(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String orderId = (String) context.get("orderId"); GenericValue order = findGoogleOrder(delegator, orderId); if (order != null) { @@ -476,7 +476,7 @@ } public static Map<String, Object> sendUnarchiveOrderRequest(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String orderId = (String) context.get("orderId"); GenericValue order = findGoogleOrder(delegator, orderId); if (order != null) { @@ -497,7 +497,7 @@ // special service to tigger off of events which prevent editing orders public static Map<String, Object> catchEditGoogleOrder(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String orderId = (String) context.get("orderId"); GenericValue order = findGoogleOrder(delegator, orderId); if (order != null) { @@ -507,7 +507,7 @@ return ServiceUtil.returnSuccess(); } - private static void sendItemsShipped(GenericDelegator delegator, String shipmentId) throws GeneralException { + private static void sendItemsShipped(Delegator delegator, String shipmentId) throws GeneralException { List<GenericValue> issued = delegator.findByAnd("ItemIssuance", UtilMisc.toMap("shipmentId", shipmentId)); if (issued != null && issued.size() > 0) { for (GenericValue issue : issued) { @@ -573,7 +573,7 @@ } } - public static GenericValue findGoogleOrder(GenericDelegator delegator, String orderId) { + public static GenericValue findGoogleOrder(Delegator delegator, String orderId) { GenericValue order = null; try { order = delegator.findOne("OrderHeader", false, "orderId", orderId); @@ -591,7 +591,7 @@ return null; } - public static String getProductStoreFromShipment(GenericDelegator delegator, String shipmentId) { + public static String getProductStoreFromShipment(Delegator delegator, String shipmentId) { GenericValue shipment = null; try { shipment = delegator.findOne("Shipment", false, "shipmentId", shipmentId); @@ -612,7 +612,7 @@ return null; } - public static GenericValue getGoogleConfiguration(GenericDelegator delegator, String productStoreId) { + public static GenericValue getGoogleConfiguration(Delegator delegator, String productStoreId) { if (productStoreId == null) return null; GenericValue config = null; try { @@ -623,7 +623,7 @@ return config; } - public static MerchantInfo getMerchantInfo(GenericDelegator delegator, String productStoreId) { + public static MerchantInfo getMerchantInfo(Delegator delegator, String productStoreId) { // google configuration GenericValue config = getGoogleConfiguration(delegator, productStoreId); if (config == null) { Modified: ofbiz/trunk/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java (original) +++ ofbiz/trunk/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java Mon Oct 5 00:08:27 2009 @@ -29,7 +29,7 @@ import org.ofbiz.base.util.GeneralRuntimeException; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.product.product.ProductWorker; @@ -43,7 +43,7 @@ public static final String module = FacilityServices.class.getName(); public static Map findProductsById(DispatchContext dctx, Map context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String facilityId = (String) context.get("facilityId"); String idValue = (String) context.get("idValue"); GenericValue product = null; @@ -65,7 +65,7 @@ } public static Map fixProductNegativeQOH(DispatchContext dctx, Map context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); String facilityId = (String) context.get("facilityId"); @@ -109,7 +109,7 @@ } public static Map updateProductStocktake(DispatchContext dctx, Map context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); String facilityId = (String) context.get("facilityId"); Modified: ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/commons/AbstractOFBizAuthenticationHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/commons/AbstractOFBizAuthenticationHandler.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/commons/AbstractOFBizAuthenticationHandler.java (original) +++ ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/commons/AbstractOFBizAuthenticationHandler.java Mon Oct 5 00:08:27 2009 @@ -36,7 +36,7 @@ import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilXml; import org.ofbiz.common.login.LoginServices; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.ldap.LdapLoginWorker; @@ -95,7 +95,7 @@ // get the visit id to pass to the userLogin for history String visitId = VisitHandler.getVisitId(session); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); - GenericDelegator delegator = dispatcher.getDelegator(); + Delegator delegator = dispatcher.getDelegator(); boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); GenericValue userLoginToCreate = delegator.makeValue("UserLogin", UtilMisc.toMap("userLoginId", username)); userLoginToCreate.set("passwordHint", ""); Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java (original) +++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java Mon Oct 5 00:08:27 2009 @@ -36,7 +36,7 @@ import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; @@ -67,7 +67,7 @@ Document doc = (Document) context.get("document"); boolean isErrorRetry = Boolean.TRUE.equals(context.get("isErrorRetry")); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); List errorMapList = FastList.newInstance(); @@ -364,7 +364,7 @@ boolean isErrorRetry = Boolean.TRUE.equals(context.get("isErrorRetry")); LocalDispatcher dispatcher = ctx.getDispatcher(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); List errorMapList = FastList.newInstance(); Map comiCtx = FastMap.newInstance(); @@ -658,7 +658,7 @@ boolean isErrorRetry = Boolean.TRUE.equals(context.get("isErrorRetry")); LocalDispatcher dispatcher = ctx.getDispatcher(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); List errorMapList = FastList.newInstance(); GenericValue userLogin = null; @@ -1193,7 +1193,7 @@ boolean isErrorRetry = Boolean.TRUE.equals(context.get("isErrorRetry")); LocalDispatcher dispatcher = ctx.getDispatcher(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); List errorMapList = FastList.newInstance(); GenericValue userLogin = null; Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java (original) +++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java Mon Oct 5 00:08:27 2009 @@ -55,7 +55,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.collections.MapStack; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.service.DispatchContext; @@ -102,7 +102,7 @@ } public static Map oagisSendConfirmBod(DispatchContext ctx, Map context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); String errorReferenceId = (String) context.get("referenceId"); @@ -238,7 +238,7 @@ } public static Map oagisReceiveConfirmBod(DispatchContext ctx, Map context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Document doc = (Document) context.get("document"); List errorMapList = FastList.newInstance(); @@ -439,7 +439,7 @@ } public static Map oagisReReceiveMessage(DispatchContext ctx, Map context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); String logicalId = (String) context.get("logicalId"); @@ -487,7 +487,7 @@ } public static Map oagisMessageHandler(DispatchContext ctx, Map context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); InputStream in = (InputStream) context.get("inputStream"); List errorList = FastList.newInstance(); Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java (original) +++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java Mon Oct 5 00:08:27 2009 @@ -44,7 +44,7 @@ import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.collections.MapStack; import org.ofbiz.base.util.StringUtil; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; @@ -94,7 +94,7 @@ boolean isErrorRetry = Boolean.TRUE.equals(context.get("isErrorRetry")); LocalDispatcher dispatcher = ctx.getDispatcher(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); Timestamp nowTimestamp = UtilDateTime.nowTimestamp(); List errorMapList = FastList.newInstance(); @@ -661,7 +661,7 @@ public static Map oagisSendProcessShipment(DispatchContext ctx, Map context) { LocalDispatcher dispatcher = ctx.getDispatcher(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); String orderId = (String) context.get("orderId"); // Check if order is not on back order before processing shipment @@ -1005,7 +1005,7 @@ public static Map oagisSendReceiveDelivery(DispatchContext dctx, Map context) { LocalDispatcher dispatcher = dctx.getDispatcher(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String returnId = (String) context.get("returnId"); String sendToUrl = (String) context.get("sendToUrl"); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |