svn commit: r821643 [4/15] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r821643 [4/15] - in /ofbiz/trunk: applications/accounting/script
 
|
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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009 @@ -39,7 +39,7 @@ import org.ofbiz.base.util.UtilDateTime; 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.service.DispatchContext; @@ -91,7 +91,7 @@ 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(); + Delegator delegator = dctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); String userLoginId = (String) userLogin.get("userLoginId"); String createdByUserLogin = userLoginId; @@ -149,7 +149,7 @@ public static Map<String, Object> createElectronicTextMethod(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = FastMap.newInstance(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String dataResourceId = (String) context.get("dataResourceId"); String textData = (String) context.get("textData"); if (textData != null && textData.length() > 0) { @@ -284,7 +284,7 @@ public static Map<String, Object> updateDataResourceMethod(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = FastMap.newInstance(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); GenericValue dataResource = null; //Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -333,7 +333,7 @@ */ public static Map<String, Object> updateElectronicTextMethod(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = FastMap.newInstance(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); GenericValue electronicText = null; //Locale locale = (Locale) context.get("locale"); String dataResourceId = (String) context.get("dataResourceId"); @@ -456,7 +456,7 @@ public static Map<String, Object> renderDataResourceAsText(DispatchContext dctx, Map<String, ? extends Object> context) throws GeneralException, IOException { Map results = FastMap.newInstance(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); //LocalDispatcher dispatcher = dctx.getDispatcher(); Writer out = (Writer) context.get("outWriter"); Map templateContext = (Map) context.get("templateContext"); @@ -499,7 +499,7 @@ public static Map<String, Object> updateImageMethod(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = FastMap.newInstance(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); //Locale locale = (Locale) context.get("locale"); String dataResourceId = (String) context.get("dataResourceId"); ByteBuffer byteBuffer = (ByteBuffer)context.get("imageData"); @@ -533,7 +533,7 @@ public static Map<String, Object> createImageMethod(DispatchContext dctx, Map<String, ? extends Object> context) { Map result = FastMap.newInstance(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String dataResourceId = (String) context.get("dataResourceId"); ByteBuffer byteBuffer = (ByteBuffer)context.get("imageData"); if (byteBuffer != null) { Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java Mon Oct 5 00:08:27 2009 @@ -39,7 +39,7 @@ import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.content.ContentManagementWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericPK; import org.ofbiz.entity.GenericValue; @@ -61,7 +61,7 @@ Locale locale = UtilHttp.getLocale(request); try { - GenericDelegator delegator = (GenericDelegator)request.getAttribute("delegator"); + Delegator delegator = (Delegator)request.getAttribute("delegator"); LocalDispatcher dispatcher = (LocalDispatcher)request.getAttribute("dispatcher"); HttpSession session = request.getSession(); Map uploadResults = LayoutWorker.uploadImageAndParameters(request, "imageData"); @@ -175,7 +175,7 @@ public static String updateLayoutImage(HttpServletRequest request, HttpServletResponse response) { Locale locale = UtilHttp.getLocale(request); try { - GenericDelegator delegator = (GenericDelegator)request.getAttribute("delegator"); + Delegator delegator = (Delegator)request.getAttribute("delegator"); HttpSession session = request.getSession(); Map uploadResults = LayoutWorker.uploadImageAndParameters(request, "imageData"); Map context = (Map)uploadResults.get("formInput"); @@ -311,7 +311,7 @@ public static String cloneLayout(HttpServletRequest request, HttpServletResponse response) { - GenericDelegator delegator = (GenericDelegator)request.getAttribute("delegator"); + Delegator delegator = (Delegator)request.getAttribute("delegator"); LocalDispatcher dispatcher = (LocalDispatcher)request.getAttribute("dispatcher"); HttpSession session = request.getSession(); Locale locale = UtilHttp.getLocale(request); @@ -603,7 +603,7 @@ } public static String copyToClip(HttpServletRequest request, HttpServletResponse response) { - GenericDelegator delegator = (GenericDelegator)request.getAttribute("delegator"); + Delegator delegator = (Delegator)request.getAttribute("delegator"); Map paramMap = UtilHttp.getParameterMap(request); String entityName = (String)paramMap.get("entityName"); Locale locale = UtilHttp.getLocale(request); 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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009 @@ -36,7 +36,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilProperties; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.ServiceUtil; @@ -68,7 +68,7 @@ public static Map<String, Object> convertDocumentByteBuffer(DispatchContext dctx, Map<String, ? extends Object> context) { Map results = ServiceUtil.returnSuccess(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); XMultiComponentFactory xmulticomponentfactory = null; //String uniqueSeqNum = delegator.getNextSeqId("OOTempDir"); Timestamp ts = UtilDateTime.nowTimestamp(); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java Mon Oct 5 00:08:27 2009 @@ -34,7 +34,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.content.content.ContentWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.service.LocalDispatcher; @@ -54,7 +54,7 @@ static char dirSep = System.getProperty("file.separator").charAt(0); public static final String module = ContentDocument.class.getName(); - public static Document Document(String id, GenericDelegator delegator, LocalDispatcher dispatcher) throws InterruptedException { + public static Document Document(String id, Delegator delegator, LocalDispatcher dispatcher) throws InterruptedException { Document doc = null; GenericValue content; @@ -96,7 +96,7 @@ if (UtilValidate.isNotEmpty(description)) doc.add(new Field("description", description, Store.YES, Index.ANALYZED, TermVector.NO)); List ancestorList = FastList.newInstance(); - GenericDelegator delegator = content.getDelegator(); + Delegator delegator = content.getDelegator(); ContentWorker.getContentAncestryAll(delegator, contentId, "WEB_SITE_PUB_PT", "TO", ancestorList); String ancestorString = StringUtil.join(ancestorList, " "); //Debug.logInfo("in ContentDocument, ancestorString:" + ancestorString, @@ -116,7 +116,7 @@ } public static boolean indexDataResource(GenericValue content, Document doc, Map context, LocalDispatcher dispatcher) { - GenericDelegator delegator = content.getDelegator(); + Delegator delegator = content.getDelegator(); String contentId = content.getString("contentId"); //Debug.logInfo("in ContentDocument, contentId:" + contentId, // module); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java Mon Oct 5 00:08:27 2009 @@ -29,7 +29,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.content.data.DataResourceWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -47,7 +47,7 @@ static char dirSep = System.getProperty("file.separator").charAt(0); public static final String module = ContentDocument.class.getName(); - public static Document Document(String id, GenericDelegator delegator, Map context) throws InterruptedException { + public static Document Document(String id, Delegator delegator, Map context) throws InterruptedException { Document doc = null; GenericValue dataResource = null; 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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009 @@ -25,7 +25,7 @@ import javolution.util.FastMap; import org.ofbiz.base.util.Debug; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.ServiceUtil; import org.ofbiz.service.LocalDispatcher; @@ -40,7 +40,7 @@ public static Map<String, Object> indexTree(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String siteId = (String) context.get("contentId"); String path = (String) context.get("path"); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java Mon Oct 5 00:08:27 2009 @@ -32,7 +32,7 @@ import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.content.content.ContentWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.service.LocalDispatcher; @@ -52,7 +52,7 @@ public static final String module = SearchWorker.class.getName(); - public static Map indexTree(LocalDispatcher dispatcher, GenericDelegator delegator, String siteId, Map context, String path) throws Exception { + public static Map indexTree(LocalDispatcher dispatcher, Delegator delegator, String siteId, Map context, String path) throws Exception { Map results = FastMap.newInstance(); GenericValue content = delegator.makeValue("Content", UtilMisc.toMap("contentId", siteId)); @@ -93,12 +93,12 @@ return results; } - public static void indexContentList(List idList, GenericDelegator delegator, LocalDispatcher dispatcher, Map context) throws Exception { + public static void indexContentList(List idList, Delegator delegator, LocalDispatcher dispatcher, Map context) throws Exception { String path = null; indexContentList(dispatcher, delegator, context, idList, path); } - public static void indexContentList(LocalDispatcher dispatcher, GenericDelegator delegator, Map context, List idList, String path) throws Exception { + public static void indexContentList(LocalDispatcher dispatcher, Delegator delegator, Map context, List idList, String path) throws Exception { String indexAllPath = getIndexPath(path); if (Debug.infoOn()) Debug.logInfo("in indexContent, indexAllPath:" + indexAllPath, module); @@ -185,7 +185,7 @@ } - public static void indexContent(LocalDispatcher dispatcher, GenericDelegator delegator, Map context, GenericValue content, String path) throws Exception { + public static void indexContent(LocalDispatcher dispatcher, Delegator delegator, Map context, GenericValue content, String path) throws Exception { String indexAllPath = getIndexPath(path); IndexWriter writer = null; try { @@ -201,7 +201,7 @@ writer.close(); } - public static void indexContent(LocalDispatcher dispatcher, GenericDelegator delegator, Map context, GenericValue content, IndexWriter writer) throws Exception { + public static void indexContent(LocalDispatcher dispatcher, Delegator delegator, Map context, GenericValue content, IndexWriter writer) throws Exception { Document doc = ContentDocument.Document(content, context, dispatcher); //if (Debug.infoOn()) Debug.logInfo("in indexContent, content:" + content, module); if (doc != null) { @@ -220,12 +220,12 @@ } - public static void indexDataResource(GenericDelegator delegator, Map context, String id) throws Exception { + public static void indexDataResource(Delegator delegator, Map context, String id) throws Exception { String path = null; indexDataResource(delegator, context, id, path); } - public static void indexDataResource(GenericDelegator delegator, Map context, String id, String path) throws Exception { + public static void indexDataResource(Delegator delegator, Map context, String id, String path) throws Exception { String indexAllPath = getIndexPath(path); IndexWriter writer = null; try { @@ -239,7 +239,7 @@ } - public static void indexDataResource(GenericDelegator delegator, Map context, String id, IndexWriter writer) throws Exception { + public static void indexDataResource(Delegator delegator, Map context, String id, IndexWriter writer) throws Exception { Document doc = DataResourceDocument.Document(id, delegator, context); writer.addDocument(doc); } 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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009 @@ -41,7 +41,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.content.data.DataResourceWorker; -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; @@ -76,7 +76,7 @@ * */ public static Map<String, Object> buildSurveyFromPdf(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Timestamp nowTimestamp = UtilDateTime.nowTimestamp(); @@ -247,7 +247,7 @@ String surveyResponseId = null; try { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String partyId = (String)context.get("partyId"); String surveyId = (String)context.get("surveyId"); //String contentId = (String)context.get("contentId"); @@ -323,7 +323,7 @@ Map acroFieldMap = FastMap.newInstance(); try { ByteArrayOutputStream os = new ByteArrayOutputStream(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); ByteBuffer byteBuffer = getInputByteBuffer(context, delegator); PdfReader r = new PdfReader(byteBuffer.array()); PdfStamper s = new PdfStamper(r,os); @@ -365,7 +365,7 @@ public static Map<String, Object> setAcroFields(DispatchContext dctx, Map<String, ? extends Object> context) { Map results = ServiceUtil.returnSuccess(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); try { Map acroFieldMap = (Map)context.get("acroFieldMap"); ByteBuffer byteBuffer = getInputByteBuffer(context, delegator); @@ -433,7 +433,7 @@ */ public static Map<String, Object> buildPdfFromSurveyResponse(DispatchContext dctx, Map<String, ? extends Object> rcontext) { Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); //LocalDispatcher dispatcher = dctx.getDispatcher(); Map results = ServiceUtil.returnSuccess(); String surveyResponseId = (String)context.get("surveyResponseId"); @@ -505,7 +505,7 @@ * Returns list of maps with "question"->SurveyQuestion and "response"->SurveyResponseAnswer */ public static Map<String, Object> buildSurveyQuestionsAndAnswers(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); //LocalDispatcher dispatcher = dctx.getDispatcher(); Map results = ServiceUtil.returnSuccess(); String surveyResponseId = (String)context.get("surveyResponseId"); @@ -542,7 +542,7 @@ /** */ public static Map<String, Object> setAcroFieldsFromSurveyResponse(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Map results = ServiceUtil.returnSuccess(); Map acroFieldMap = FastMap.newInstance(); @@ -633,7 +633,7 @@ return results; } - public static ByteBuffer getInputByteBuffer(Map context, GenericDelegator delegator) throws GeneralException { + public static ByteBuffer getInputByteBuffer(Map context, Delegator delegator) throws GeneralException { ByteBuffer inputByteBuffer = (ByteBuffer)context.get("inputByteBuffer"); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java Mon Oct 5 00:08:27 2009 @@ -40,7 +40,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.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; @@ -61,7 +61,7 @@ public static final String module = SurveyWrapper.class.getName(); - protected GenericDelegator delegator = null; + protected Delegator delegator = null; protected String responseId = null; protected String partyId = null; protected String surveyId = null; @@ -72,7 +72,7 @@ protected SurveyWrapper() {} - public SurveyWrapper(GenericDelegator delegator, String responseId, String partyId, String surveyId, Map passThru, Map defaultValues) { + public SurveyWrapper(Delegator delegator, String responseId, String partyId, String surveyId, Map passThru, Map defaultValues) { this.delegator = delegator; this.responseId = responseId; this.partyId = partyId; @@ -82,11 +82,11 @@ this.checkParameters(); } - public SurveyWrapper(GenericDelegator delegator, String responseId, String partyId, String surveyId, Map passThru) { + public SurveyWrapper(Delegator delegator, String responseId, String partyId, String surveyId, Map passThru) { this(delegator, responseId, partyId, surveyId, passThru, null); } - public SurveyWrapper(GenericDelegator delegator, String surveyId) { + public SurveyWrapper(Delegator delegator, String surveyId) { this(delegator, null, null, surveyId, null); } Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java Mon Oct 5 00:08:27 2009 @@ -38,7 +38,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.content.content.ContentWorker; import org.ofbiz.content.data.DataResourceWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.webapp.view.AbstractViewHandler; @@ -85,7 +85,7 @@ } try { if (Debug.verboseOn()) Debug.logVerbose("SCVH(0a)- dataResourceId:" + dataResourceId, module); - GenericDelegator delegator = (GenericDelegator)request.getAttribute("delegator"); + Delegator delegator = (Delegator)request.getAttribute("delegator"); if (UtilValidate.isEmpty(dataResourceId)) { if (UtilValidate.isEmpty(contentRevisionSeqId)) { if (UtilValidate.isEmpty(mapKey) && UtilValidate.isEmpty(contentAssocTypeId)) { Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java Mon Oct 5 00:08:27 2009 @@ -34,7 +34,7 @@ import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.content.content.ContentWorker; import org.ofbiz.content.content.PermissionRecorder; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.entityext.permission.EntityPermissionChecker; import org.ofbiz.security.Security; @@ -77,7 +77,7 @@ final Environment env = Environment.getCurrentEnvironment(); final Map templateCtx = FreeMarkerWorker.createEnvironmentMap(env); //FreeMarkerWorker.convertContext(templateCtx); - 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 GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env); FreeMarkerWorker.getSiteParameters(request, templateCtx); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java Mon Oct 5 00:08:27 2009 @@ -36,7 +36,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.content.content.ContentWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.service.LocalDispatcher; @@ -74,7 +74,7 @@ final Environment env = Environment.getCurrentEnvironment(); final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env); final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", 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); FreeMarkerWorker.getSiteParameters(request, templateCtx); FreeMarkerWorker.overrideWithArgs(templateCtx, args); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java Mon Oct 5 00:08:27 2009 @@ -32,7 +32,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.content.content.ContentWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.service.LocalDispatcher; @@ -83,7 +83,7 @@ final String webSiteId = getArg(args, "webSiteId", ctx); final String https = getArg(args, "https", ctx); final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env); - final GenericDelegator delegator = (GenericDelegator) FreeMarkerWorker.getWrappedObject("delegator", env); + final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env); final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env); GenericValue subContentDataResourceViewTemp = (GenericValue) FreeMarkerWorker.getWrappedObject("subContentDataResourceView", env); //final HttpServletRequest request = (HttpServletRequest)FreeMarkerWorker.getWrappedObject("request", env); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java Mon Oct 5 00:08:27 2009 @@ -29,7 +29,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.content.content.ContentWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.webapp.ftl.LoopWriter; @@ -70,7 +70,7 @@ final Environment env = Environment.getCurrentEnvironment(); final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env); //FreeMarkerWorker.convertContext(templateCtx); - 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 GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env); FreeMarkerWorker.getSiteParameters(request, templateCtx); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java Mon Oct 5 00:08:27 2009 @@ -39,7 +39,7 @@ import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.content.content.ContentServicesComplex; import org.ofbiz.content.content.ContentWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.minilang.MiniLangException; @@ -81,7 +81,7 @@ final StringBuilder buf = new StringBuilder(); final Environment env = Environment.getCurrentEnvironment(); final Map templateRoot = FreeMarkerWorker.createEnvironmentMap(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); FreeMarkerWorker.getSiteParameters(request, templateRoot); final Map savedValuesUp = FastMap.newInstance(); @@ -226,7 +226,7 @@ //} } - public boolean prepCtx(GenericDelegator delegator, Map ctx, Environment env, GenericValue view) throws GeneralException { + public boolean prepCtx(Delegator delegator, Map ctx, Environment env, GenericValue view) throws GeneralException { String dataResourceId = (String) view.get("drDataResourceId"); String subContentIdSub = (String) view.get("contentId"); @@ -310,7 +310,7 @@ return pickEntity; } - public boolean getNextMatchingEntity(Map templateRoot, GenericDelegator delegator, Environment env) throws IOException { + public boolean getNextMatchingEntity(Map templateRoot, Delegator delegator, Environment env) throws IOException { boolean matchFound = false; GenericValue pickEntity = getRandomEntity(); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java Mon Oct 5 00:08:27 2009 @@ -33,7 +33,7 @@ import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.content.content.ContentServicesComplex; import org.ofbiz.content.content.ContentWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.webapp.ftl.LoopWriter; @@ -69,7 +69,7 @@ return FreeMarkerWorker.getArg(args, key, ctx); } - public static boolean prepCtx(GenericDelegator delegator, Map ctx) { + public static boolean prepCtx(Delegator delegator, Map ctx) { List lst = (List) ctx.get("entityList"); Integer idx = (Integer) ctx.get("entityIndex"); if (idx == null) idx = Integer.valueOf(0); @@ -140,7 +140,7 @@ final Environment env = Environment.getCurrentEnvironment(); final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env); final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env); - final GenericDelegator delegator = (GenericDelegator) FreeMarkerWorker.getWrappedObject("delegator", env); + final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env); final Map savedValues = FreeMarkerWorker.saveValues(templateCtx, saveKeyNames); FreeMarkerWorker.overrideWithArgs(templateCtx, args); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java Mon Oct 5 00:08:27 2009 @@ -39,7 +39,7 @@ import org.ofbiz.base.util.collections.MapStack; import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.content.content.ContentWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.widget.WidgetWorker; import org.ofbiz.service.LocalDispatcher; @@ -60,7 +60,7 @@ public Writer getWriter(final Writer out, Map args) { final Environment env = Environment.getCurrentEnvironment(); final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", 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 Map envMap = FreeMarkerWorker.createEnvironmentMap(env); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java Mon Oct 5 00:08:27 2009 @@ -39,7 +39,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.content.content.ContentWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.service.LocalDispatcher; import org.ofbiz.webapp.control.RequestHandler; import org.ofbiz.widget.WidgetWorker; @@ -62,7 +62,7 @@ //final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env); //final Map templateCtx = FastMap.newInstance(); final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", 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 Map templateRoot = FreeMarkerWorker.createEnvironmentMap(env); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java Mon Oct 5 00:08:27 2009 @@ -37,7 +37,7 @@ import org.ofbiz.base.util.collections.MapStack; import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.content.content.ContentWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.service.LocalDispatcher; import org.ofbiz.webapp.control.RequestHandler; @@ -54,7 +54,7 @@ public Writer getWriter(final Writer out, Map args) { final Environment env = Environment.getCurrentEnvironment(); - final GenericDelegator delegator = (GenericDelegator) FreeMarkerWorker.getWrappedObject("delegator", env); + final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env); final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env); final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env); final HttpServletResponse response = (HttpServletResponse) FreeMarkerWorker.getWrappedObject("response", env); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java Mon Oct 5 00:08:27 2009 @@ -40,7 +40,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.content.content.ContentWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.service.LocalDispatcher; import freemarker.core.Environment; @@ -61,7 +61,7 @@ //final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env); //final Map templateCtx = FastMap.newInstance(); final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", 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 Map templateRoot = FreeMarkerWorker.createEnvironmentMap(env); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java Mon Oct 5 00:08:27 2009 @@ -38,7 +38,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.content.content.ContentWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.model.ModelEntity; import org.ofbiz.service.LocalDispatcher; @@ -64,7 +64,7 @@ //final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env); //final Map templateCtx = FastMap.newInstance(); final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", 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 Map templateRoot = FreeMarkerWorker.createEnvironmentMap(env); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java Mon Oct 5 00:08:27 2009 @@ -36,7 +36,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.content.content.ContentWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.service.LocalDispatcher; @@ -82,7 +82,7 @@ final Locale locale = (Locale) FreeMarkerWorker.getWrappedObject("locale", env); final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env); final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env); - final GenericDelegator delegator = (GenericDelegator) FreeMarkerWorker.getWrappedObject("delegator", env); + final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env); final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env); GenericValue subContentDataResourceViewTemp = (GenericValue) FreeMarkerWorker.getWrappedObject("subContentDataResourceView", env); if (subContentDataResourceViewTemp == null) { Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java Mon Oct 5 00:08:27 2009 @@ -34,7 +34,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.content.content.ContentWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.webapp.ftl.LoopWriter; @@ -80,7 +80,7 @@ FreeMarkerWorker.overrideWithArgs(templateRoot, args); String startContentAssocTypeId = (String)templateRoot.get("contentAssocTypeId"); //if (Debug.infoOn()) Debug.logInfo("in TraverseSubContentCache, startContentAssocTypeId:" + startContentAssocTypeId, module); - final GenericDelegator delegator = (GenericDelegator) FreeMarkerWorker.getWrappedObject("delegator", env); + final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env); final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env); FreeMarkerWorker.getSiteParameters(request, templateRoot); final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java Mon Oct 5 00:08:27 2009 @@ -35,7 +35,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.content.content.ContentWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.webapp.ftl.LoopWriter; @@ -77,7 +77,7 @@ //FreeMarkerWorker.convertContext(templateCtx); final Map savedValues = FreeMarkerWorker.saveValues(templateCtx, saveKeyNames); FreeMarkerWorker.overrideWithArgs(templateCtx, args); - final GenericDelegator delegator = (GenericDelegator) FreeMarkerWorker.getWrappedObject("delegator", env); + final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env); /* final String editTemplate = getArg(args, "editTemplate", ctx); final String wrapTemplateId = getArg(args, "wrapTemplateId", ctx); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java Mon Oct 5 00:08:27 2009 @@ -34,7 +34,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.content.content.ContentWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.service.LocalDispatcher; @@ -79,7 +79,7 @@ templateCtx = envContext; } final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", 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); FreeMarkerWorker.getSiteParameters(request, templateCtx); final Map savedValuesUp = FastMap.newInstance(); Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java Mon Oct 5 00:08:27 2009 @@ -26,7 +26,7 @@ import java.util.ArrayList; import org.ofbiz.entity.util.EntityUtil; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.base.util.UtilMisc; @@ -63,7 +63,7 @@ * 3.for every parent the method is called recursively, the llc returned is incremented by one and the max of these number is saved as maxDepth * 4.the maxDepth value is returned */ - public static int getMaxDepth(String productId, String bomType, Date inDate, GenericDelegator delegator) throws GenericEntityException { + public static int getMaxDepth(String productId, String bomType, Date inDate, Delegator delegator) throws GenericEntityException { // If the date is null, set it to today. if (inDate == null) inDate = new Date(); int maxDepth = 0; @@ -101,11 +101,11 @@ * @return the ProductAssoc generic value for a duplicate productIdKey * ancestor if present, null otherwise. */ - public static GenericValue searchDuplicatedAncestor(String productId, String productIdKey, String bomType, Date inDate, GenericDelegator delegator, LocalDispatcher dispatcher, GenericValue userLogin) throws GenericEntityException { + public static GenericValue searchDuplicatedAncestor(String productId, String productIdKey, String bomType, Date inDate, Delegator delegator, LocalDispatcher dispatcher, GenericValue userLogin) throws GenericEntityException { return searchDuplicatedAncestor(productId, productIdKey, null, bomType, inDate, delegator, dispatcher, userLogin); } - private static GenericValue searchDuplicatedAncestor(String productId, String productIdKey, ArrayList productIdKeys, String bomType, Date inDate, GenericDelegator delegator, LocalDispatcher dispatcher, GenericValue userLogin) throws GenericEntityException { + private static GenericValue searchDuplicatedAncestor(String productId, String productIdKey, ArrayList productIdKeys, String bomType, Date inDate, Delegator delegator, LocalDispatcher dispatcher, GenericValue userLogin) throws GenericEntityException { // If the date is null, set it to today. if (inDate == null) inDate = new Date(); if (productIdKeys == null) { @@ -136,7 +136,7 @@ } public static String createProductionRunsForShipment(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response) { - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); GenericValue userLogin = (GenericValue)request.getSession().getAttribute("userLogin"); Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java Mon Oct 5 00:08:27 2009 @@ -32,7 +32,7 @@ import org.ofbiz.base.util.UtilDateTime; 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.util.EntityUtil; @@ -48,7 +48,7 @@ public static final String module = BOMNode.class.getName(); protected LocalDispatcher dispatcher = null; - protected GenericDelegator delegator = null; + protected Delegator delegator = null; protected GenericValue userLogin = null; private BOMTree tree; // the tree to which this node belongs @@ -84,7 +84,7 @@ quantity = BigDecimal.ZERO; } - public BOMNode(String productId, GenericDelegator delegator, LocalDispatcher dispatcher, GenericValue userLogin) throws GenericEntityException { + public BOMNode(String productId, Delegator delegator, LocalDispatcher dispatcher, GenericValue userLogin) throws GenericEntityException { this(delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId)), dispatcher, userLogin); } @@ -95,7 +95,7 @@ // If the date is null, set it to today. if (inDate == null) inDate = new Date(); bomTypeId = partBomTypeId; -// GenericDelegator delegator = product.getDelegator(); +// Delegator delegator = product.getDelegator(); List rows = delegator.findByAnd("ProductAssoc", UtilMisc.toMap("productId", product.get("productId"), "productAssocTypeId", partBomTypeId), @@ -321,7 +321,7 @@ if (inDate == null) inDate = new Date(); bomTypeId = partBomTypeId; -// GenericDelegator delegator = product.getDelegator(); +// Delegator delegator = product.getDelegator(); List rows = delegator.findByAnd("ProductAssoc", UtilMisc.toMap("productIdTo", product.get("productId"), "productAssocTypeId", partBomTypeId), Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java Mon Oct 5 00:08:27 2009 @@ -33,7 +33,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; @@ -63,7 +63,7 @@ public static Map getMaxDepth(DispatchContext dctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String productId = (String) context.get("productId"); String fromDateStr = (String) context.get("fromDate"); String bomType = (String) context.get("bomType"); @@ -122,7 +122,7 @@ */ public static Map updateLowLevelCode(DispatchContext dctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); String productId = (String) context.get("productIdTo"); Boolean alsoComponents = (Boolean) context.get("alsoComponents"); @@ -207,7 +207,7 @@ */ public static Map initLowLevelCode(DispatchContext dctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); try { @@ -250,7 +250,7 @@ */ public static Map searchDuplicatedAncestor(DispatchContext dctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue)context.get("userLogin"); @@ -284,7 +284,7 @@ public static Map getBOMTree(DispatchContext dctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue)context.get("userLogin"); String productId = (String) context.get("productId"); @@ -335,7 +335,7 @@ public static Map getManufacturingComponents(DispatchContext dctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue)context.get("userLogin"); @@ -421,7 +421,7 @@ public static Map getNotAssembledComponents(DispatchContext dctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); String productId = (String) context.get("productId"); BigDecimal quantity = (BigDecimal) context.get("quantity"); @@ -474,7 +474,7 @@ // public static Map createShipmentPackages(DispatchContext dctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue)context.get("userLogin"); @@ -749,7 +749,7 @@ public static Map getProductsInPackages(DispatchContext dctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue)context.get("userLogin"); Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java Mon Oct 5 00:08:27 2009 @@ -28,7 +28,7 @@ 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.util.EntityUtil; @@ -48,7 +48,7 @@ public static final int IMPLOSION = 3; protected LocalDispatcher dispatcher = null; - protected GenericDelegator delegator = null; + protected Delegator delegator = null; BOMNode root; BigDecimal rootQuantity; @@ -69,7 +69,7 @@ * @throws GenericEntityException If a db problem occurs. * */ - public BOMTree(String productId, String bomTypeId, Date inDate, GenericDelegator delegator, LocalDispatcher dispatcher, GenericValue userLogin) throws GenericEntityException { + public BOMTree(String productId, String bomTypeId, Date inDate, Delegator delegator, LocalDispatcher dispatcher, GenericValue userLogin) throws GenericEntityException { this(productId, bomTypeId, inDate, EXPLOSION, delegator, dispatcher, userLogin); } @@ -90,7 +90,7 @@ * @throws GenericEntityException If a db problem occurs. * */ - public BOMTree(String productId, String bomTypeId, Date inDate, int type, GenericDelegator delegator, LocalDispatcher dispatcher, GenericValue userLogin) throws GenericEntityException { + public BOMTree(String productId, String bomTypeId, Date inDate, int type, Delegator delegator, LocalDispatcher dispatcher, GenericValue userLogin) throws GenericEntityException { // If the parameters are not valid, return. if (productId == null || bomTypeId == null || delegator == null || dispatcher == null) return; // If the date is null, set it to today. Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java Mon Oct 5 00:08:27 2009 @@ -29,7 +29,7 @@ import org.ofbiz.base.util.Debug; 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.util.EntityUtil; @@ -71,7 +71,7 @@ */ private boolean quantityIsUpdated = false; - public ProductionRun(String productionRunId, GenericDelegator delegator, LocalDispatcher dispatcher) { + public ProductionRun(String productionRunId, Delegator delegator, LocalDispatcher dispatcher) { try { if (! UtilValidate.isEmpty(productionRunId)) { this.dispatcher = dispatcher; Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java Mon Oct 5 00:08:27 2009 @@ -33,7 +33,7 @@ import org.ofbiz.base.util.GeneralException; 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.GenericPK; import org.ofbiz.service.GenericServiceException; import org.ofbiz.entity.GenericValue; @@ -47,7 +47,7 @@ public static String productionRunDeclareAndProduce(HttpServletRequest request, HttpServletResponse response) { HttpSession session = request.getSession(); - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java Mon Oct 5 00:08:27 2009 @@ -24,7 +24,7 @@ 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.entity.util.EntityUtil; @@ -50,7 +50,7 @@ * <li> the productionRun * <li> the productionRunProduct */ - public static Map getProductionRun(GenericDelegator delegator, String productionRunId) { + public static Map getProductionRun(Delegator delegator, String productionRunId) { Map result = new HashMap(); // Timestamp now = UtilDateTime.nowTimestamp(); @@ -72,14 +72,14 @@ return result; } - public static boolean hasTask(GenericDelegator delegator, String taskName, String workEffortId) throws GenericEntityException { + public static boolean hasTask(Delegator delegator, String taskName, String workEffortId) throws GenericEntityException { List tasks = delegator.findByAnd("WorkEffort", UtilMisc.toMap("workEffortParentId", workEffortId, "workEffortTypeId", "PROD_ORDER_TASK", "workEffortName", taskName)); return (tasks != null && tasks.size() > 0); } - public static void getLinkedProductionRuns(GenericDelegator delegator, LocalDispatcher dispatcher, String productionRunId, List productionRuns) throws GenericEntityException { + public static void getLinkedProductionRuns(Delegator delegator, LocalDispatcher dispatcher, String productionRunId, List productionRuns) throws GenericEntityException { productionRuns.add(new ProductionRun(productionRunId, delegator, dispatcher)); List linkedWorkEfforts = EntityUtil.filterByDate(delegator.findByAnd("WorkEffortAssoc", UtilMisc.toMap("workEffortIdTo", productionRunId, "workEffortAssocTypeId", "WORK_EFF_PRECEDENCY"))); for (int i = 0; i < linkedWorkEfforts.size(); i++) { @@ -88,7 +88,7 @@ } } - public static String getRootProductionRun(GenericDelegator delegator, String productionRunId) throws GenericEntityException { + public static String getRootProductionRun(Delegator delegator, String productionRunId) throws GenericEntityException { List linkedWorkEfforts = delegator.findByAnd("WorkEffortAssoc", UtilMisc.toMap("workEffortIdFrom", productionRunId, "workEffortAssocTypeId", "WORK_EFF_PRECEDENCY")); GenericValue linkedWorkEffort = EntityUtil.getFirst(linkedWorkEfforts); if (linkedWorkEffort != null) { Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.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.common.CommonWorkers; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericPK; import org.ofbiz.entity.GenericValue; @@ -89,7 +89,7 @@ */ public static Map cancelProductionRun(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -181,7 +181,7 @@ */ public static Map createProductionRun(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -451,7 +451,7 @@ */ public static Map updateProductionRun(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -517,7 +517,7 @@ public static Map changeProductionRunStatus(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -694,7 +694,7 @@ public static Map changeProductionRunTaskStatus(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -884,7 +884,7 @@ public static Map getWorkEffortCosts(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); String workEffortId = (String)context.get("workEffortId"); try { GenericValue workEffort = delegator.findByPrimaryKey("WorkEffort", UtilMisc.toMap("workEffortId", workEffortId)); @@ -918,7 +918,7 @@ public static Map getProductionRunCost(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); String workEffortId = (String)context.get("workEffortId"); @@ -940,7 +940,7 @@ } public static Map createProductionRunTaskCosts(DispatchContext ctx, Map context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -1099,7 +1099,7 @@ */ public static Map checkUpdatePrunRoutingTask(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -1171,7 +1171,7 @@ public static Map addProductionRunComponent(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Timestamp now = UtilDateTime.nowTimestamp(); Locale locale = (Locale) context.get("locale"); @@ -1242,7 +1242,7 @@ public static Map updateProductionRunComponent(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -1317,7 +1317,7 @@ public static Map addProductionRunRoutingTask(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -1455,7 +1455,7 @@ public static Map productionRunProduce(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -1661,7 +1661,7 @@ public static Map productionRunDeclareAndProduce(DispatchContext ctx, Map context) { Map result = FastMap.newInstance(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -1726,7 +1726,7 @@ public static Map productionRunTaskProduce(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); // Mandatory input fields @@ -1832,7 +1832,7 @@ } public static Map productionRunTaskReturnMaterial(DispatchContext ctx, Map context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); // Mandatory input fields @@ -1895,7 +1895,7 @@ public static Map updateProductionRunTask(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -2069,7 +2069,7 @@ public static Map approveRequirement(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -2094,7 +2094,7 @@ public static Map createProductionRunFromRequirement(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -2154,7 +2154,7 @@ public static Map createProductionRunFromConfiguration(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -2320,7 +2320,7 @@ public static Map createProductionRunForMktgPkg(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -2425,7 +2425,7 @@ public static Map createProductionRunsForOrder(DispatchContext dctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue)context.get("userLogin"); @@ -2516,7 +2516,7 @@ public static Map createProductionRunsForProductBom(DispatchContext dctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin =(GenericValue)context.get("userLogin"); @@ -2559,7 +2559,7 @@ */ public static Map quickRunProductionRunTask(DispatchContext ctx, Map context) { Map result = ServiceUtil.returnSuccess(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -2603,7 +2603,7 @@ */ public static Map quickRunAllProductionRunTasks(DispatchContext ctx, Map context) { Map result = ServiceUtil.returnSuccess(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -2638,7 +2638,7 @@ public static Map quickStartAllProductionRunTasks(DispatchContext ctx, Map context) { Map result = ServiceUtil.returnSuccess(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -2748,7 +2748,7 @@ */ public static Map getProductionRunTotResQty(DispatchContext ctx, Map context) { Map result = ServiceUtil.returnSuccess(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); Locale locale = (Locale) context.get("locale"); String productId = (String) context.get("productId"); @@ -2790,7 +2790,7 @@ public static Map checkDecomposeInventoryItem(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); String inventoryItemId = (String)context.get("inventoryItemId"); @@ -2831,7 +2831,7 @@ public static Map decomposeInventoryItem(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Timestamp now = UtilDateTime.nowTimestamp(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -2938,7 +2938,7 @@ public static Map setEstimatedDeliveryDates(DispatchContext ctx, Map context) { Map result = new HashMap(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); Timestamp now = UtilDateTime.nowTimestamp(); Map products = FastMap.newInstance(); Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/InventoryEventPlannedServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/InventoryEventPlannedServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/InventoryEventPlannedServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/InventoryEventPlannedServices.java Mon Oct 5 00:08:27 2009 @@ -24,7 +24,7 @@ import org.ofbiz.base.util.Debug; 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.service.DispatchContext; @@ -45,7 +45,7 @@ * @return result: a map with service status */ public static Map createMrpEvent(DispatchContext ctx, Map context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); Map parameters = UtilMisc.toMap("mrpId", context.get("mrpId"), "productId", context.get("productId"), "eventDate", context.get("eventDate"), @@ -61,7 +61,7 @@ return ServiceUtil.returnSuccess(); } - public static void createOrUpdateMrpEvent(Map mrpEventKeyMap, BigDecimal newQuantity, String facilityId, String eventName, boolean isLate, GenericDelegator delegator) throws GenericEntityException { + public static void createOrUpdateMrpEvent(Map mrpEventKeyMap, BigDecimal newQuantity, String facilityId, String eventName, boolean isLate, Delegator delegator) throws GenericEntityException { GenericValue mrpEvent = null; mrpEvent = delegator.findByPrimaryKey("MrpEvent", mrpEventKeyMap); if (mrpEvent == null) { |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |