You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2014/08/30 11:36:33 UTC
svn commit: r1621440 - in /ofbiz/branches/release13.07: ./
applications/product/src/org/ofbiz/product/category/
framework/entity/src/org/ofbiz/entity/
framework/entity/src/org/ofbiz/entity/util/
framework/webapp/src/org/ofbiz/webapp/event/
Author: adrianc
Date: Sat Aug 30 09:36:32 2014
New Revision: 1621440
URL: http://svn.apache.org/r1621440
Log:
Merged revision(s) 1621436 from ofbiz/trunk:
Removed some references to GenericDelegator concrete class.
Merged revision(s) 1621439 from ofbiz/trunk:
Removed references to GenericDelegator from Delegator interface.
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/category/CategoryWorker.java
ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/Delegator.java
ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/util/SequenceUtil.java
ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1621436,1621439
Modified: ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/category/CategoryWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/category/CategoryWorker.java?rev=1621440&r1=1621439&r2=1621440&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/category/CategoryWorker.java (original)
+++ ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/category/CategoryWorker.java Sat Aug 30 09:36:32 2014
@@ -39,7 +39,6 @@ import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.Delegator;
-import org.ofbiz.entity.GenericDelegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
@@ -441,7 +440,7 @@ public class CategoryWorker {
public static Map getCategoryTrail(DispatchContext dctx, Map context) {
String productCategoryId = (String) context.get("productCategoryId");
Map<String, Object> results = ServiceUtil.returnSuccess();
- GenericDelegator delegator = (GenericDelegator) dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
List<String> trailElements = FastList.newInstance();
trailElements.add(productCategoryId);
String parentProductCategoryId = productCategoryId;
Modified: ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/Delegator.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/Delegator.java?rev=1621440&r1=1621439&r2=1621440&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/Delegator.java (original)
+++ ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/Delegator.java Sat Aug 30 09:36:32 2014
@@ -138,9 +138,9 @@ public interface Delegator {
public void clearCacheLineFlexible(GenericEntity dummyPK, boolean distribute);
- public GenericDelegator cloneDelegator();
+ public Delegator cloneDelegator();
- public GenericDelegator cloneDelegator(String delegatorName);
+ public Delegator cloneDelegator(String delegatorName);
/**
* Creates a Entity in the form of a GenericValue and write it to the
@@ -901,7 +901,7 @@ public interface Delegator {
/** Creates a Primary Key in the form of a GenericPK without persisting it */
public GenericPK makePKSingle(String entityName, Object singlePkValue);
- public GenericDelegator makeTestDelegator(String delegatorName);
+ public Delegator makeTestDelegator(String delegatorName);
/**
* Creates a Entity in the form of a GenericValue without persisting it;
Modified: ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/util/SequenceUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/util/SequenceUtil.java?rev=1621440&r1=1621439&r2=1621440&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/util/SequenceUtil.java (original)
+++ ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/util/SequenceUtil.java Sat Aug 30 09:36:32 2014
@@ -29,7 +29,7 @@ import javax.transaction.Transaction;
import org.ofbiz.base.util.Debug;
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.datasource.GenericHelperInfo;
import org.ofbiz.entity.jdbc.ConnectionFactory;
@@ -53,7 +53,7 @@ public class SequenceUtil {
private final String idColName;
private final boolean clustered;
- public SequenceUtil(GenericDelegator delegator, GenericHelperInfo helperInfo, ModelEntity seqEntity, String nameFieldName, String idFieldName) {
+ public SequenceUtil(Delegator delegator, GenericHelperInfo helperInfo, ModelEntity seqEntity, String nameFieldName, String idFieldName) {
this.helperInfo = helperInfo;
if (seqEntity == null) {
throw new IllegalArgumentException("The sequence model entity was null but is required.");
Modified: ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java?rev=1621440&r1=1621439&r2=1621440&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java (original)
+++ ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java Sat Aug 30 09:36:32 2014
@@ -47,7 +47,7 @@ import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilXml;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.LocalDispatcher;
@@ -77,7 +77,7 @@ public class SOAPEventHandler implements
*/
public String invoke(Event event, RequestMap requestMap, HttpServletRequest request, HttpServletResponse response) throws EventHandlerException {
LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
// first check for WSDL request
String wsdlReq = request.getParameter("wsdl");