svn commit: r821643 [10/15] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r821643 [10/15] - in /ofbiz/trunk: applications/accounting/script
 
|
Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java Mon Oct 5 00:08:27 2009 @@ -32,7 +32,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.condition.EntityCondition; @@ -53,7 +53,7 @@ @Deprecated public static void getWorkEffort(PageContext pageContext, String workEffortIdAttrName, String workEffortAttrName, String partyAssignsAttrName, String canViewAttrName, String tryEntityAttrName, String currentStatusAttrName) { - GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); + Delegator delegator = (Delegator) pageContext.getRequest().getAttribute("delegator"); Security security = (Security) pageContext.getRequest().getAttribute("security"); GenericValue userLogin = (GenericValue) pageContext.getSession().getAttribute("userLogin"); @@ -166,7 +166,7 @@ } } - public static List<GenericValue> getLowestLevelWorkEfforts(GenericDelegator delegator, String workEffortId, String workEffortAssocTypeId) { + public static List<GenericValue> getLowestLevelWorkEfforts(Delegator delegator, String workEffortId, String workEffortAssocTypeId) { List<GenericValue> workEfforts = FastList.newInstance(); try { EntityConditionList exprsLevelFirst = EntityCondition.makeCondition(UtilMisc.toList( Modified: ofbiz/trunk/framework/bi/src/org/ofbiz/bi/util/DimensionServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/src/org/ofbiz/bi/util/DimensionServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/bi/src/org/ofbiz/bi/util/DimensionServices.java (original) +++ ofbiz/trunk/framework/bi/src/org/ofbiz/bi/util/DimensionServices.java Mon Oct 5 00:08:27 2009 @@ -38,7 +38,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.util.EntityUtil; import org.ofbiz.entity.GenericEntityException; @@ -54,7 +54,7 @@ public static Map<String, Object> getDimensionIdFromNaturalKey(DispatchContext ctx, Map<String, ? extends Object> context) { Map<String, Object> resultMap = ServiceUtil.returnSuccess(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); String dimensionEntityName = (String) context.get("dimensionEntityName"); @@ -73,7 +73,7 @@ } public static Map<String, Object> storeGenericDimension(DispatchContext ctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); GenericValue dimensionValue = (GenericValue) context.get("dimensionValue"); Modified: ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemaFields.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemaFields.groovy?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemaFields.groovy (original) +++ ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemaFields.groovy Mon Oct 5 00:08:27 2009 @@ -22,7 +22,7 @@ import java.util.TreeSet; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.model.ModelReader; import org.ofbiz.entity.model.ModelEntity; import org.ofbiz.entity.model.ModelField; Modified: ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemas.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemas.groovy?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemas.groovy (original) +++ ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemas.groovy Mon Oct 5 00:08:27 2009 @@ -21,7 +21,7 @@ import java.util.Iterator; import java.util.TreeSet; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.model.ModelReader; import org.ofbiz.entity.model.ModelEntity; import org.ofbiz.entity.model.ModelViewEntity; Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original) +++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Mon Oct 5 00:08:27 2009 @@ -36,6 +36,7 @@ import org.ofbiz.base.container.ContainerException; import org.ofbiz.base.container.ContainerConfig.Container.Property; import org.ofbiz.base.util.*; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; import org.apache.catalina.Cluster; @@ -139,7 +140,7 @@ SSLUtil.loadJsseProperties(); } - protected GenericDelegator delegator = null; + protected Delegator delegator = null; protected Embedded embedded = null; protected Map<String, ContainerConfig.Container.Property> clusterConfig = new HashMap<String, ContainerConfig.Container.Property>(); protected Map<String, Engine> engines = new HashMap<String, Engine>(); Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java (original) +++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java Mon Oct 5 00:08:27 2009 @@ -28,7 +28,7 @@ import java.util.List; import java.util.Iterator; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.base.util.UtilMisc; @@ -50,9 +50,9 @@ protected static String info = "OfbizStore/1.0"; protected static String storeName = "OfbizStore"; - protected GenericDelegator delegator = null; + protected Delegator delegator = null; - public OfbizStore(GenericDelegator delegator) { + public OfbizStore(Delegator delegator) { this.delegator = delegator; } Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java Mon Oct 5 00:08:27 2009 @@ -36,7 +36,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.cache.UtilCache; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.security.Security; @@ -51,7 +51,7 @@ public static UtilCache<String, Map<String, String>> appletSessions = new UtilCache<String, Map<String, String>>("AppletSessions", 0, 600000, true); public static String checkAppletRequest(HttpServletRequest request, HttpServletResponse response) { - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); String sessionId = request.getParameter("sessionId"); String visitId = request.getParameter("visitId"); sessionId = sessionId.trim(); @@ -85,7 +85,7 @@ } public static String receiveAppletRequest(HttpServletRequest request, HttpServletResponse response) { - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); String sessionId = request.getParameter("sessionId"); String visitId = request.getParameter("visitId"); sessionId = sessionId.trim(); Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java Mon Oct 5 00:08:27 2009 @@ -37,7 +37,7 @@ import static org.ofbiz.base.util.UtilGenerics.checkList; import static org.ofbiz.base.util.UtilGenerics.checkMap; 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.model.ModelEntity; @@ -129,7 +129,7 @@ *@return Map with the result of the service, the output parameters */ public static Map<String, Object> createNote(DispatchContext ctx, Map<String, ?> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Timestamp noteDate = (Timestamp) context.get("noteDate"); String partyId = (String) context.get("partyId"); @@ -242,7 +242,7 @@ /** Cause a Referential Integrity Error */ public static Map<String, Object> entityFailTest(DispatchContext dctx, Map<String, ?> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); // attempt to create a DataSource entity w/ an invalid dataSourceTypeId GenericValue newEntity = delegator.makeValue("DataSource"); @@ -269,7 +269,7 @@ /** Test entity sorting */ public static Map<String, Object> entitySortTest(DispatchContext dctx, Map<String, ?> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); Set<ModelEntity> set = new TreeSet<ModelEntity>(); set.add(delegator.getModelEntity("Person")); @@ -291,7 +291,7 @@ } public static Map<String, Object> makeALotOfVisits(DispatchContext dctx, Map<String, ?> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); int count = ((Integer) context.get("count")).intValue(); for (int i = 0; i < count; i++) { @@ -478,7 +478,7 @@ } public static Map<String, Object> ping(DispatchContext dctx, Map<String, ?> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String message = (String) context.get("message"); if (message == null) { message = "PONG"; Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java Mon Oct 5 00:08:27 2009 @@ -26,7 +26,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; @@ -41,7 +41,7 @@ public final static String module = CommonWorkers.class.getName(); - public static List<GenericValue> getCountryList(GenericDelegator delegator) { + public static List<GenericValue> getCountryList(Delegator delegator) { List<GenericValue> geoList = FastList.newInstance(); String defaultCountry = UtilProperties.getPropertyValue("general.properties", "country.geo.id.default"); GenericValue defaultGeo = null; @@ -66,7 +66,7 @@ return geoList; } - public static List<GenericValue> getStateList(GenericDelegator delegator) { + public static List<GenericValue> getStateList(Delegator delegator) { List<GenericValue> geoList = FastList.newInstance(); EntityCondition condition = EntityCondition.makeCondition(EntityOperator.OR, EntityCondition.makeCondition("geoTypeId", "STATE"), EntityCondition.makeCondition("geoTypeId", "PROVINCE"), @@ -83,7 +83,7 @@ /** * Returns a list of regional geo associations. */ - public static List<GenericValue> getAssociatedStateList(GenericDelegator delegator, String country) { + public static List<GenericValue> getAssociatedStateList(Delegator delegator, String country) { if (country == null || country.length() == 0) { // Load the system default country country = UtilProperties.getPropertyValue("general.properties", "country.geo.id.default"); @@ -110,7 +110,7 @@ * A generic method to be used on Type enities, e.g. ProductType. Recurse to the root level in the type hierarchy * and checks if the specified type childType has parentType as its parent somewhere in the hierarchy. * - * @param delegator The GenericDelegator object. + * @param delegator The Delegator object. * @param entityName Name of the Type entity on which check is performed. * @param primaryKey Primary Key field of the Type entity. * @param childType Type value for which the check is performed. @@ -118,7 +118,7 @@ * @param parentType Value of the parent type against which check is performed. * @return boolean value based on the check results. */ - public static boolean hasParentType(GenericDelegator delegator, String entityName, String primaryKey, String childType, String parentTypeField, String parentType) { + public static boolean hasParentType(Delegator delegator, String entityName, String primaryKey, String childType, String parentTypeField, String parentType) { GenericValue childTypeValue = null; try { childTypeValue = delegator.findOne(entityName, UtilMisc.toMap(primaryKey, childType), true); Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java Mon Oct 5 00:08:27 2009 @@ -39,7 +39,7 @@ import org.ofbiz.base.util.UtilValidate; 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.EntityComparisonOperator; @@ -211,7 +211,7 @@ * @param normalizedFields list of field the user have populated * @return a arrayList usable to create an entityCondition */ - public static List<EntityCondition> createCondition(ModelEntity modelEntity, Map<String, Map<String, Map<String, Object>>> normalizedFields, Map<String, Object> queryStringMap, Map<String, List<Object[]>> origValueMap, GenericDelegator delegator, Map<String, ?> context) { + public static List<EntityCondition> createCondition(ModelEntity modelEntity, Map<String, Map<String, Map<String, Object>>> normalizedFields, Map<String, Object> queryStringMap, Map<String, List<Object[]>> origValueMap, Delegator delegator, Map<String, ?> context) { Map<String, Map<String, Object>> subMap = null; Map<String, Object> subMap2 = null; EntityOperator fieldOp = null; @@ -500,7 +500,7 @@ // Now use only the values that correspond to entity fields to build // an EntityConditionList - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); GenericValue entityValue = delegator.makeValue(entityName, FastMap.newInstance()); @@ -565,7 +565,7 @@ } Integer maxRows = (Integer) context.get("maxRows"); maxRows = maxRows != null ? maxRows : -1; - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); // Retrieve entities - an iterator over all the values EntityListIterator listIt = null; try { @@ -601,7 +601,7 @@ return retValue; } - public static Map<String, Object> buildReducedQueryString(Map<String, ?> inputFields, String entityName, GenericDelegator delegator) { + public static Map<String, Object> buildReducedQueryString(Map<String, ?> inputFields, String entityName, Delegator delegator) { // Strip the "_suffix" off of the parameter name and // build a three-level map of values keyed by fieldRoot name, // fld0 or fld1, and, then, "op" or "value" Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java Mon Oct 5 00:08:27 2009 @@ -31,7 +31,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; @@ -214,7 +214,7 @@ return keywords.keySet(); } - public static boolean expandKeywordForSearch(String enteredKeyword, Set<String> addToSet, GenericDelegator delegator) { + public static boolean expandKeywordForSearch(String enteredKeyword, Set<String> addToSet, Delegator delegator) { boolean replaceEnteredKeyword = false; try { Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/example/TestFailAuthenticator.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/example/TestFailAuthenticator.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/example/TestFailAuthenticator.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/example/TestFailAuthenticator.java Mon Oct 5 00:08:27 2009 @@ -22,7 +22,7 @@ import org.ofbiz.common.authentication.api.Authenticator; import org.ofbiz.common.authentication.api.AuthenticatorException; import org.ofbiz.service.LocalDispatcher; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.base.util.Debug; /** @@ -31,7 +31,7 @@ public class TestFailAuthenticator implements Authenticator { private static final String module = TestFailAuthenticator.class.getName(); - protected GenericDelegator delegator; + protected Delegator delegator; protected LocalDispatcher dispatcher; protected float weight = 1; Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/email/NotificationServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/email/NotificationServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/email/NotificationServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/email/NotificationServices.java Mon Oct 5 00:08:27 2009 @@ -35,7 +35,7 @@ import org.ofbiz.base.util.UtilURL; 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.service.DispatchContext; @@ -73,7 +73,7 @@ * An optional parameter available to all message templates is <code>baseUrl</code> * which can either be specified when the service is invoked or let the * <code>NotificationService</code> attempt to resolve it as best it can, - * see {@link #setBaseUrl(GenericDelegator, String, Map) setBaseUrl(Map)} for details on how this is achieved. + * see {@link #setBaseUrl(Delegator, String, Map) setBaseUrl(Map)} for details on how this is achieved. * <p> * The following example shows what a simple notification message template, * associated with the above service, might contain: @@ -184,7 +184,7 @@ * body generated from the template and the input parameters. */ public static Map<String, Object> prepareNotification(DispatchContext ctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); String templateName = (String) context.get("templateName"); Map<String, Object> templateData = UtilGenerics.checkMap(context.get("templateData")); String webSiteId = (String) context.get("webSiteId"); @@ -249,7 +249,7 @@ * @param context The context to check and, if necessary, set the * <code>baseUrl</code>. */ - public static void setBaseUrl(GenericDelegator delegator, String webSiteId, Map<String, Object> context) { + public static void setBaseUrl(Delegator delegator, String webSiteId, Map<String, Object> context) { // If the baseUrl was not specified we can do a best effort instead if (!context.containsKey("baseUrl")) { StringBuilder httpBase = null; Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/geo/GeoWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/geo/GeoWorker.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/geo/GeoWorker.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/geo/GeoWorker.java Mon Oct 5 00:08:27 2009 @@ -27,7 +27,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; @@ -39,7 +39,7 @@ public static final String module = GeoWorker.class.getName(); - public static List<GenericValue> expandGeoGroup(String geoId, GenericDelegator delegator) { + public static List<GenericValue> expandGeoGroup(String geoId, Delegator delegator) { GenericValue geo = null; try { geo = delegator.findByPrimaryKeyCache("Geo", UtilMisc.toMap("geoId", geoId)); @@ -85,7 +85,7 @@ return geoList; } - public static Set<String> expandGeoRegionDeep(Set<String> geoIdSet, GenericDelegator delegator) throws GenericEntityException { + public static Set<String> expandGeoRegionDeep(Set<String> geoIdSet, Delegator delegator) throws GenericEntityException { if (geoIdSet == null || geoIdSet.size() == 0) { return geoIdSet; } @@ -103,7 +103,7 @@ return geoIdSetNew; } - public static boolean containsGeo(List<GenericValue> geoList, String geoId, GenericDelegator delegator) { + public static boolean containsGeo(List<GenericValue> geoList, String geoId, Delegator delegator) { GenericValue geo = null; try { geo = delegator.findByPrimaryKeyCache("Geo", UtilMisc.toMap("geoId", geoId)); @@ -121,7 +121,7 @@ return geoList.contains(geo); } - public static GenericValue findLatestGeoPoint(GenericDelegator delegator, String Entity, String mainId, String mainValueId, String secondId, String secondValueId) { + public static GenericValue findLatestGeoPoint(Delegator delegator, String Entity, String mainId, String mainValueId, String secondId, String secondValueId) { List<GenericValue> gptList = null; if (UtilValidate.isNotEmpty(secondId) && UtilValidate.isNotEmpty(secondValueId)) { try { Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LdapAuthenticationServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LdapAuthenticationServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LdapAuthenticationServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LdapAuthenticationServices.java Mon Oct 5 00:08:27 2009 @@ -32,7 +32,7 @@ import org.ofbiz.base.util.Debug; 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.transaction.GenericTransactionException; @@ -57,7 +57,7 @@ password = (String) context.get("password"); } String dn = null; - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); boolean isServiceAuth = context.get("isServiceAuth") != null && ((Boolean) context.get("isServiceAuth")).booleanValue(); GenericValue userLogin = null; try { Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java Mon Oct 5 00:08:27 2009 @@ -36,7 +36,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.condition.EntityCondition; @@ -90,7 +90,7 @@ } Map<String, Object> result = FastMap.newInstance(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); // if isServiceAuth is not specified, default to not a service auth @@ -432,7 +432,7 @@ return result; } - private static void createUserLoginPasswordHistory(GenericDelegator delegator,String userLoginId, String currentPassword) throws GenericEntityException{ + private static void createUserLoginPasswordHistory(Delegator delegator,String userLoginId, String currentPassword) throws GenericEntityException{ int passwordChangeHistoryLimit = 0; try { passwordChangeHistoryLimit = Integer.parseInt(UtilProperties.getPropertyValue("security.properties", "password.change.history.limit", "0")); @@ -479,7 +479,7 @@ */ public static Map<String, Object> createUserLogin(DispatchContext ctx, Map<String, ?> context) { Map<String, Object> result = FastMap.newInstance(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue loggedInUserLogin = (GenericValue) context.get("userLogin"); List<String> errorMessageList = FastList.newInstance(); @@ -573,7 +573,7 @@ *@return Map with the result of the service, the output parameters */ public static Map<String, Object> updatePassword(DispatchContext ctx, Map<String, ?> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue loggedInUserLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); @@ -706,7 +706,7 @@ */ public static Map<String, Object> updateUserLoginId(DispatchContext ctx, Map<String, ?> context) { Map<String, Object> result = FastMap.newInstance(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); GenericValue loggedInUserLogin = (GenericValue) context.get("userLogin"); List<String> errorMessageList = FastList.newInstance(); Locale locale = (Locale) context.get("locale"); @@ -818,7 +818,7 @@ */ public static Map<String, Object> updateUserLoginSecurity(DispatchContext ctx, Map<String, ?> context) { Map<String, Object> result = FastMap.newInstance(); - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue loggedInUserLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); @@ -950,7 +950,7 @@ Debug.logInfo(" userLogin is set to " + userLogin, module); if (passwordChangeHistoryLimit > 0 && userLogin != null) { Debug.logInfo(" checkNewPassword Checking if user is tyring to use old password " + passwordChangeHistoryLimit, module); - GenericDelegator delegator = userLogin.getDelegator(); + Delegator delegator = userLogin.getDelegator(); String newPasswordHash = newPassword; if (useEncryption) { newPasswordHash = HashCrypt.getDigestHash(newPassword, getHashType()); Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/olap/CommonDimensionServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/olap/CommonDimensionServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/olap/CommonDimensionServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/olap/CommonDimensionServices.java Mon Oct 5 00:08:27 2009 @@ -36,7 +36,7 @@ import static org.ofbiz.base.util.UtilGenerics.checkList; import static org.ofbiz.base.util.UtilGenerics.checkMap; 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.model.ModelEntity; @@ -64,7 +64,7 @@ * the default strategy to handle data change is "Type 1" (i.e. overwrite the values). */ public static Map loadDateDimension(DispatchContext ctx, Map context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Date fromDate = (Date) context.get("fromDate"); Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java Mon Oct 5 00:08:27 2009 @@ -30,7 +30,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; @@ -65,7 +65,7 @@ if (!PreferenceWorker.isValidGetId(ctx, context)) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "getPreference.permissionError", locale)); } - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); String userPrefTypeId = (String) context.get("userPrefTypeId"); if (UtilValidate.isEmpty(userPrefTypeId)) { @@ -118,7 +118,7 @@ if (!PreferenceWorker.isValidGetId(ctx, context)) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "getPreference.permissionError", locale)); } - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); String userPrefGroupTypeId = (String) context.get("userPrefGroupTypeId"); if (UtilValidate.isEmpty(userPrefGroupTypeId)) { @@ -166,7 +166,7 @@ * @return Map with the result of the service, the output parameters. */ public static Map<String, Object> setUserPreference(DispatchContext ctx, Map<String, ?> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); Locale locale = (Locale) context.get("locale"); String userLoginId = PreferenceWorker.getUserLoginId(context, false); @@ -205,7 +205,7 @@ * @return Map with the result of the service, the output parameters. */ public static Map<String, Object> setUserPreferenceGroup(DispatchContext ctx, Map<String, ?> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); Locale locale = (Locale) context.get("locale"); String userLoginId = PreferenceWorker.getUserLoginId(context, false); @@ -242,7 +242,7 @@ * @return Map with the result of the service, the output parameters. */ public static Map<String, Object> copyUserPreferenceGroup(DispatchContext ctx, Map<String, ?> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); Locale locale = (Locale) context.get("locale"); String userLoginId = PreferenceWorker.getUserLoginId(context, false); Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/status/StatusServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/status/StatusServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/status/StatusServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/status/StatusServices.java Mon Oct 5 00:08:27 2009 @@ -27,7 +27,7 @@ import org.ofbiz.base.util.Debug; import static org.ofbiz.base.util.UtilGenerics.checkList; 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.service.DispatchContext; @@ -41,7 +41,7 @@ public static final String module = StatusServices.class.getName(); public static Map<String, Object> getStatusItems(DispatchContext ctx, Map<String, ?> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); List<String> statusTypes = checkList(context.get("statusTypeIds"), String.class); if (statusTypes == null || statusTypes.size() == 0) { return ServiceUtil.returnError("Parameter statusTypeIds can not be null and must contain at least one element"); @@ -62,7 +62,7 @@ } public static Map<String, Object> getStatusValidChangeToDetails(DispatchContext ctx, Map<String, ?> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); List<GenericValue> statusValidChangeToDetails = null; String statusId = (String) context.get("statusId"); try { Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/status/StatusWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/status/StatusWorker.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/status/StatusWorker.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/status/StatusWorker.java Mon Oct 5 00:08:27 2009 @@ -26,7 +26,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; @@ -38,7 +38,7 @@ public static final String module = StatusWorker.class.getName(); public static void getStatusItems(PageContext pageContext, String attributeName, String statusTypeId) { - GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); + Delegator delegator = (Delegator) pageContext.getRequest().getAttribute("delegator"); try { List<GenericValue> statusItems = delegator.findByAndCache("StatusItem", UtilMisc.toMap("statusTypeId", statusTypeId), UtilMisc.toList("sequenceId")); @@ -51,7 +51,7 @@ } public static void getStatusItems(PageContext pageContext, String attributeName, String statusTypeIdOne, String statusTypeIdTwo) { - GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); + Delegator delegator = (Delegator) pageContext.getRequest().getAttribute("delegator"); List<GenericValue> statusItems = FastList.newInstance(); try { @@ -76,7 +76,7 @@ } public static void getStatusValidChangeToDetails(PageContext pageContext, String attributeName, String statusId) { - GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); + Delegator delegator = (Delegator) pageContext.getRequest().getAttribute("delegator"); List<GenericValue> statusValidChangeToDetails = null; try { Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/uom/UomWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/uom/UomWorker.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/uom/UomWorker.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/uom/UomWorker.java Mon Oct 5 00:08:27 2009 @@ -20,7 +20,7 @@ package org.ofbiz.common.uom; import org.ofbiz.base.util.Debug; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; import org.ofbiz.service.ModelService; Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java Mon Oct 5 00:08:27 2009 @@ -44,6 +44,7 @@ import org.ofbiz.base.util.ObjectType; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilGenerics; +import org.ofbiz.base.util.UtilObject; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; @@ -75,7 +76,7 @@ protected String delegatorName = null; /** Reference to an instance of GenericDelegator used to do some basic operations on this entity value. If null various methods in this class will fail. This is automatically set by the GenericDelegator for all GenericValue objects instantiated through it. You may set this manually for objects you instantiate manually, but it is optional. */ - protected transient GenericDelegator internalDelegator = null; + protected transient Delegator internalDelegator = null; /** Contains the fields for this entity. Note that this should always be a * HashMap to allow for two things: non-synchronized reads (synchronized @@ -283,10 +284,15 @@ *@return GenericDelegator object */ @SuppressWarnings("deprecation") - public GenericDelegator getDelegator() { + public Delegator getDelegator() { if (internalDelegator == null) { if (delegatorName == null) delegatorName = "default"; - if (delegatorName != null) internalDelegator = GenericDelegator.getGenericDelegator(delegatorName); + if (delegatorName != null) + try { + internalDelegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName); + } catch (ClassNotFoundException e) { + Debug.logError(e, module); + } if (internalDelegator == null) { throw new IllegalStateException("[GenericEntity.getDelegator] could not find delegator with name " + delegatorName); } @@ -295,7 +301,7 @@ } /** Set the GenericDelegator instance that created this value object and that is responsible for it. */ - public void setDelegator(GenericDelegator internalDelegator) { + public void setDelegator(Delegator internalDelegator) { if (internalDelegator == null) return; this.delegatorName = internalDelegator.getDelegatorName(); this.internalDelegator = internalDelegator; Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/cache/AbstractCache.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/cache/AbstractCache.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/cache/AbstractCache.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/cache/AbstractCache.java Mon Oct 5 00:08:27 2009 @@ -19,6 +19,7 @@ package org.ofbiz.entity.cache; import org.ofbiz.base.util.cache.UtilCache; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; public abstract class AbstractCache<K, V> { @@ -31,7 +32,7 @@ } @SuppressWarnings("deprecation") - public GenericDelegator getDelegator() { + public Delegator getDelegator() { return GenericDelegator.getGenericDelegator(delegatorName); } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java Mon Oct 5 00:08:27 2009 @@ -32,7 +32,7 @@ import org.apache.oro.text.regex.Perl5Matcher; 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.GenericModelException; import org.ofbiz.entity.config.DatasourceInfo; import org.ofbiz.entity.model.ModelEntity; @@ -131,13 +131,13 @@ public abstract boolean compare(L lhs, R rhs); - public Boolean eval(GenericDelegator delegator, Map<String, ? extends Object> map, Object lhs, Object rhs) { + public Boolean eval(Delegator delegator, Map<String, ? extends Object> map, Object lhs, Object rhs) { return Boolean.valueOf(mapMatches(delegator, map, lhs, rhs)); } @Override @SuppressWarnings("unchecked") - public boolean mapMatches(GenericDelegator delegator, Map<String, ? extends Object> map, Object lhs, Object rhs) { + public boolean mapMatches(Delegator delegator, Map<String, ? extends Object> map, Object lhs, Object rhs) { Object leftValue; if (lhs instanceof EntityConditionValue) { EntityConditionValue ecv = (EntityConditionValue) lhs; Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java Mon Oct 5 00:08:27 2009 @@ -25,7 +25,7 @@ import javolution.util.FastList; import static org.ofbiz.base.util.UtilGenerics.cast; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.GenericModelException; import org.ofbiz.entity.config.DatasourceInfo; @@ -155,15 +155,15 @@ return eval(entity.getDelegator(), entity); } - public Boolean eval(GenericDelegator delegator, Map<String, ? extends Object> map) { + public Boolean eval(Delegator delegator, Map<String, ? extends Object> map) { return mapMatches(delegator, map) ? Boolean.TRUE : Boolean.FALSE; } - abstract public boolean mapMatches(GenericDelegator delegator, Map<String, ? extends Object> map); + abstract public boolean mapMatches(Delegator delegator, Map<String, ? extends Object> map); abstract public EntityCondition freeze(); - abstract public void encryptConditionFields(ModelEntity modelEntity, GenericDelegator delegator); + abstract public void encryptConditionFields(ModelEntity modelEntity, Delegator delegator); public void visit(EntityConditionVisitor visitor) { throw new IllegalArgumentException(getClass().getName() + ".visit not implemented"); Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java Mon Oct 5 00:08:27 2009 @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericModelException; import org.ofbiz.entity.config.DatasourceInfo; import org.ofbiz.entity.model.ModelEntity; @@ -38,7 +38,7 @@ public static class NOT extends EntityConditionFunction { public NOT(EntityCondition nested) { super(ID_NOT, "NOT", nested); } @Override - public boolean mapMatches(GenericDelegator delegator, Map<String, ? extends Object> map) { + public boolean mapMatches(Delegator delegator, Map<String, ? extends Object> map) { return !condition.mapMatches(delegator, map); } @Override @@ -46,7 +46,7 @@ return new NOT(condition.freeze()); } @Override - public void encryptConditionFields(ModelEntity modelEntity, GenericDelegator delegator) { + public void encryptConditionFields(ModelEntity modelEntity, Delegator delegator) { // nothing to do here... } }; Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java Mon Oct 5 00:08:27 2009 @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericModelException; import org.ofbiz.entity.config.DatasourceInfo; import org.ofbiz.entity.model.ModelEntity; @@ -99,7 +99,7 @@ } @Override - public boolean mapMatches(GenericDelegator delegator, Map<String, ? extends Object> map) { + public boolean mapMatches(Delegator delegator, Map<String, ? extends Object> map) { return operator.mapMatches(delegator, map, conditionList); } @@ -109,7 +109,7 @@ } @Override - public void encryptConditionFields(ModelEntity modelEntity, GenericDelegator delegator) { + public void encryptConditionFields(ModelEntity modelEntity, Delegator delegator) { for (T cond: this.conditionList) { cond.encryptConditionFields(modelEntity, delegator); } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java Mon Oct 5 00:08:27 2009 @@ -22,7 +22,7 @@ import java.util.Map; import org.ofbiz.base.util.Debug; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericModelException; import org.ofbiz.entity.config.DatasourceInfo; @@ -41,7 +41,7 @@ protected EntityConditionSubSelect() { } - public EntityConditionSubSelect(String entityName, String keyFieldName, EntityCondition whereCond, boolean requireAll, GenericDelegator delegator) { + public EntityConditionSubSelect(String entityName, String keyFieldName, EntityCondition whereCond, boolean requireAll, Delegator delegator) { this(delegator.getModelEntity(entityName), keyFieldName, whereCond, requireAll); } public EntityConditionSubSelect(ModelEntity localModelEntity, String keyFieldName, EntityCondition whereCond, boolean requireAll) { @@ -118,7 +118,7 @@ } @Override - public Comparable getValue(GenericDelegator delegator, Map<String, ? extends Object> map) { + public Comparable getValue(Delegator delegator, Map<String, ? extends Object> map) { // do nothing for now return null; } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java Mon Oct 5 00:08:27 2009 @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.GenericModelException; import org.ofbiz.entity.config.DatasourceInfo; @@ -55,7 +55,7 @@ return getValue(entity.getDelegator(), entity); } - public abstract Object getValue(GenericDelegator delegator, Map<String, ? extends Object> map); + public abstract Object getValue(Delegator delegator, Map<String, ? extends Object> map); public abstract EntityConditionValue freeze(); Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java Mon Oct 5 00:08:27 2009 @@ -25,7 +25,7 @@ import javolution.context.ObjectFactory; import org.ofbiz.base.util.UtilDateTime; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericModelException; import org.ofbiz.entity.config.DatasourceInfo; import org.ofbiz.entity.model.ModelEntity; @@ -73,7 +73,7 @@ } @Override - public boolean mapMatches(GenericDelegator delegator, Map<String, ? extends Object> map) { + public boolean mapMatches(Delegator delegator, Map<String, ? extends Object> map) { EntityCondition condition = makeCondition(); return condition.mapMatches(delegator, map); } @@ -106,7 +106,7 @@ } @Override - public void encryptConditionFields(ModelEntity modelEntity, GenericDelegator delegator) { + public void encryptConditionFields(ModelEntity modelEntity, Delegator delegator) { // nothing to do here... } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java Mon Oct 5 00:08:27 2009 @@ -27,6 +27,7 @@ import org.ofbiz.base.util.ObjectType; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.EntityCryptoException; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.GenericEntityException; @@ -179,7 +180,7 @@ } @Override - public boolean mapMatches(GenericDelegator delegator, Map<String, ? extends Object> map) { + public boolean mapMatches(Delegator delegator, Map<String, ? extends Object> map) { return operator.mapMatches(delegator, map, lhs, rhs); } @@ -208,7 +209,7 @@ } @Override - public void encryptConditionFields(ModelEntity modelEntity, GenericDelegator delegator) { + public void encryptConditionFields(ModelEntity modelEntity, Delegator delegator) { if (this.lhs instanceof String) { ModelField modelField = modelEntity.getField((String) this.lhs); if (modelField != null && modelField.getEncrypt()) { @@ -234,7 +235,7 @@ } @SuppressWarnings("deprecation") - public void checkRhsType(ModelEntity modelEntity, GenericDelegator delegator) { + public void checkRhsType(ModelEntity modelEntity, Delegator delegator) { if (this.rhs == null || this.rhs == GenericEntity.NULL_FIELD || modelEntity == null) return; Object value = this.rhs; Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.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.GenericEntity; import org.ofbiz.entity.GenericModelException; import org.ofbiz.entity.config.DatasourceInfo; @@ -180,7 +180,7 @@ } @Override - public Object getValue(GenericDelegator delegator, Map<String, ? extends Object> map) { + public Object getValue(Delegator delegator, Map<String, ? extends Object> map) { if (map == null) { return null; } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java Mon Oct 5 00:08:27 2009 @@ -25,7 +25,7 @@ import javolution.context.ObjectFactory; import javolution.lang.Reusable; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericModelException; import org.ofbiz.entity.config.DatasourceInfo; import org.ofbiz.entity.model.ModelEntity; @@ -294,7 +294,7 @@ } @Override - public Object getValue(GenericDelegator delegator, Map<String, ? extends Object> map) { + public Object getValue(Delegator delegator, Map<String, ? extends Object> map) { Object value = nested != null ? nested.getValue(delegator, map) : this.value; return value != null ? fetcher.getValue(value) : null; } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java Mon Oct 5 00:08:27 2009 @@ -25,7 +25,7 @@ import java.util.Map; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.GenericModelException; import org.ofbiz.entity.config.DatasourceInfo; @@ -126,22 +126,22 @@ return mapMatches(entity.getDelegator(), entity, conditionList); } - public Boolean eval(GenericDelegator delegator, Map<String, ? extends Object> map, Object lhs, Object rhs) { + public Boolean eval(Delegator delegator, Map<String, ? extends Object> map, Object lhs, Object rhs) { return castBoolean(mapMatches(delegator, map, lhs, rhs)); } @Override - public boolean mapMatches(GenericDelegator delegator, Map<String, ? extends Object> map, Object lhs, Object rhs) { + public boolean mapMatches(Delegator delegator, Map<String, ? extends Object> map, Object lhs, Object rhs) { if (((EntityCondition) lhs).mapMatches(delegator, map) == shortCircuitValue) return shortCircuitValue; if (((EntityCondition) rhs).mapMatches(delegator, map) == shortCircuitValue) return shortCircuitValue; return !shortCircuitValue; } - public Boolean eval(GenericDelegator delegator, Map<String, ? extends Object> map, List<? extends EntityCondition> conditionList) { + public Boolean eval(Delegator delegator, Map<String, ? extends Object> map, List<? extends EntityCondition> conditionList) { return castBoolean(mapMatches(delegator, map, conditionList)); } - public boolean mapMatches(GenericDelegator delegator, Map<String, ? extends Object> map, List<? extends EntityCondition> conditionList) { + public boolean mapMatches(Delegator delegator, Map<String, ? extends Object> map, List<? extends EntityCondition> conditionList) { if (UtilValidate.isNotEmpty(conditionList)) { for (EntityCondition condition: conditionList) { if (condition.mapMatches(delegator, map) == shortCircuitValue) return shortCircuitValue; Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java Mon Oct 5 00:08:27 2009 @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.GenericModelException; import org.ofbiz.entity.config.DatasourceInfo; @@ -261,12 +261,12 @@ /* - public T eval(GenericDelegator delegator, Map<String, ? extends Object> map, Object lhs, Object rhs) { + public T eval(Delegator delegator, Map<String, ? extends Object> map, Object lhs, Object rhs) { return castBoolean(mapMatches(delegator, map, lhs, rhs)); } */ - public abstract boolean mapMatches(GenericDelegator delegator, Map<String, ? extends Object> map, Object lhs, Object rhs); + public abstract boolean mapMatches(Delegator delegator, Map<String, ? extends Object> map, Object lhs, Object rhs); public abstract void validateSql(ModelEntity entity, Object lhs, Object rhs) throws GenericModelException; public void addSqlValue(StringBuilder sql, ModelEntity entity, List<EntityConditionParam> entityConditionParams, Object lhs, Object rhs, DatasourceInfo datasourceInfo) { addSqlValue(sql, entity, entityConditionParams, true, lhs, rhs, datasourceInfo); Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java Mon Oct 5 00:08:27 2009 @@ -23,7 +23,7 @@ import javolution.context.ObjectFactory; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.GenericModelException; import org.ofbiz.entity.config.DatasourceInfo; @@ -82,7 +82,7 @@ } @Override - public boolean mapMatches(GenericDelegator delegator, Map<String, ? extends Object> map) { + public boolean mapMatches(Delegator delegator, Map<String, ? extends Object> map) { throw new UnsupportedOperationException("Cannot do mapMatches on a WhereString, ie no SQL evaluation in EE; Where String is: " + sqlString); } @@ -96,7 +96,7 @@ } @Override - public void encryptConditionFields(ModelEntity modelEntity, GenericDelegator delegator) { + public void encryptConditionFields(ModelEntity modelEntity, Delegator delegator) { // nothing to do here... } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java Mon Oct 5 00:08:27 2009 @@ -350,7 +350,7 @@ * */ private int singleUpdateView(GenericEntity entity, ModelViewEntity modelViewEntity, List<ModelField> fieldsToSave, SQLProcessor sqlP) throws GenericEntityException { - GenericDelegator delegator = entity.getDelegator(); + Delegator delegator = entity.getDelegator(); int retVal = 0; ModelEntity memberModelEntity = null; @@ -927,7 +927,7 @@ // now execute the query List<GenericValue> retlist = FastList.newInstance(); - GenericDelegator gd = value.getDelegator(); + Delegator gd = value.getDelegator(); try { sqlP.prepareStatement(sqlsb.toString()); Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/eca/EntityEcaHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/eca/EntityEcaHandler.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/eca/EntityEcaHandler.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/eca/EntityEcaHandler.java Mon Oct 5 00:08:27 2009 @@ -40,7 +40,7 @@ public static final String OP_FIND = "find"; - public void setDelegator(GenericDelegator delegator); + public void setDelegator(Delegator delegator); public Map<String, List<T>> getEntityEventMap(String entityName); Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/Finder.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/Finder.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/Finder.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/Finder.java Mon Oct 5 00:08:27 2009 @@ -24,7 +24,7 @@ import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.string.FlexibleStringExpander; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; @SuppressWarnings("serial") public abstract class Finder implements Serializable { @@ -47,6 +47,6 @@ this.entityNameExdr = FlexibleStringExpander.getInstance(entityName); } - public abstract void runFind(Map<String, Object> context, GenericDelegator delegator) throws GeneralException; + public abstract void runFind(Map<String, Object> context, Delegator delegator) throws GeneralException; } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java Mon Oct 5 00:08:27 2009 @@ -32,6 +32,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.Delegator; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -116,7 +117,7 @@ @Override @SuppressWarnings("deprecation") - public void runFind(Map<String, Object> context, GenericDelegator delegator) throws GeneralException { + public void runFind(Map<String, Object> context, Delegator delegator) throws GeneralException { String entityName = this.entityNameExdr.expandString(context); String useCacheStr = this.useCacheStrExdr.expandString(context); String filterByDateStr = this.filterByDateStrExdr.expandString(context); Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java Mon Oct 5 00:08:27 2009 @@ -30,7 +30,7 @@ import org.ofbiz.base.util.UtilValidate; 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.GenericPK; import org.ofbiz.entity.GenericValue; @@ -66,7 +66,7 @@ } @Override - public void runFind(Map<String, Object> context, GenericDelegator delegator) throws GeneralException { + public void runFind(Map<String, Object> context, Delegator delegator) throws GeneralException { String entityName = this.entityNameExdr.expandString(context); String useCacheString = this.useCacheStrExdr.expandString(context); @@ -91,7 +91,7 @@ } } - public static GenericValue runFind(ModelEntity modelEntity, Map<String, Object> context, GenericDelegator delegator, boolean useCache, boolean autoFieldMap, + public static GenericValue runFind(ModelEntity modelEntity, Map<String, Object> context, Delegator delegator, boolean useCache, boolean autoFieldMap, Map<FlexibleMapAccessor<Object>, Object> fieldMap, List<FlexibleStringExpander> selectFieldExpanderList) throws GeneralException { // assemble the field map Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/DynamicViewEntity.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/DynamicViewEntity.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/DynamicViewEntity.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/DynamicViewEntity.java Mon Oct 5 00:08:27 2009 @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.model.ModelViewEntity.ComplexAliasMember; import org.ofbiz.entity.model.ModelViewEntity.ModelAlias; import org.ofbiz.entity.model.ModelViewEntity.ModelAliasAll; @@ -32,7 +32,7 @@ import org.ofbiz.entity.model.ModelViewEntity.ModelViewLink; /** * This class is used for declaring Dynamic View Entities, to be used and thrown away. - * A special method exists on the GenericDelegator to accept a DynamicViewEntity instead + * A special method exists on the Delegator to accept a DynamicViewEntity instead * of an entity-name. * */ @@ -69,7 +69,7 @@ public DynamicViewEntity() { } - public ModelViewEntity makeModelViewEntity(GenericDelegator delegator) { + public ModelViewEntity makeModelViewEntity(Delegator delegator) { ModelViewEntity modelViewEntity = new ModelViewEntity(this, delegator.getModelReader()); return modelViewEntity; } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java Mon Oct 5 00:08:27 2009 @@ -41,7 +41,7 @@ import org.ofbiz.base.util.UtilTimer; 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.GenericEntity; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -1245,7 +1245,7 @@ return this.getEntityName().compareTo(otherModelEntity.getEntityName()); } - public void convertFieldMapInPlace(Map<String, Object> inContext, GenericDelegator delegator) { + public void convertFieldMapInPlace(Map<String, Object> inContext, Delegator delegator) { convertFieldMapInPlace(inContext, delegator.getModelFieldTypeReader(this)); } public void convertFieldMapInPlace(Map<String, Object> inContext, ModelFieldTypeReader modelFieldTypeReader) { @@ -1260,7 +1260,7 @@ } } - public Object convertFieldValue(String fieldName, Object value, GenericDelegator delegator) { + public Object convertFieldValue(String fieldName, Object value, Delegator delegator) { ModelField modelField = this.getField(fieldName); if (modelField == null) { String errMsg = "Could not convert field value: could not find an entity field for the name: [" + fieldName + "] on the [" + this.getEntityName() + "] entity."; @@ -1269,7 +1269,7 @@ return convertFieldValue(modelField, value, delegator); } - public Object convertFieldValue(ModelField modelField, Object value, GenericDelegator delegator) { + public Object convertFieldValue(ModelField modelField, Object value, Delegator delegator) { if (value == null || value == GenericEntity.NULL_FIELD) { return null; } @@ -1295,7 +1295,7 @@ * require them). * @return the converted value */ - public Object convertFieldValue(ModelField modelField, Object value, GenericDelegator delegator, Map<String, ? extends Object> context) { + public Object convertFieldValue(ModelField modelField, Object value, Delegator delegator, Map<String, ? extends Object> context) { ModelFieldTypeReader modelFieldTypeReader = delegator.getModelFieldTypeReader(this); return this.convertFieldValue(modelField, value, modelFieldTypeReader, context); } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java Mon Oct 5 00:08:27 2009 @@ -28,7 +28,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; /** @@ -39,7 +39,7 @@ public static final String module = ModelEntityChecker.class.getName(); - public static void checkEntities(GenericDelegator delegator, List<String> warningList) throws GenericEntityException { + public static void checkEntities(Delegator delegator, List<String> warningList) throws GenericEntityException { ModelReader reader = delegator.getModelReader(); TreeSet<String> reservedWords = new TreeSet<String>(); Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java Mon Oct 5 00:08:27 2009 @@ -48,7 +48,7 @@ import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilObject; import org.ofbiz.base.util.StringUtil; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericPK; import org.ofbiz.entity.GenericValue; import org.w3c.dom.Document; @@ -74,7 +74,7 @@ return UtilXml.writeXmlDocument(document); } - public static Object deserialize(String content, GenericDelegator delegator) + public static Object deserialize(String content, Delegator delegator) throws SerializeException, SAXException, ParserConfigurationException, IOException { // readXmlDocument with false second parameter to disable validation Document document = UtilXml.readXmlDocument(content, false); @@ -244,7 +244,7 @@ return element; } - public static Object deserializeSingle(Element element, GenericDelegator delegator) throws SerializeException { + public static Object deserializeSingle(Element element, Delegator delegator) throws SerializeException { String tagName = element.getTagName(); if (tagName.equals("null")) return null; Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/testtools/EntityTestCase.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/testtools/EntityTestCase.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/testtools/EntityTestCase.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/testtools/EntityTestCase.java Mon Oct 5 00:08:27 2009 @@ -21,21 +21,21 @@ import junit.framework.TestCase; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; public class EntityTestCase extends TestCase { - protected GenericDelegator delegator = null; + protected Delegator delegator = null; public EntityTestCase(String name) { super(name); } - public void setDelegator(GenericDelegator delegator) { + public void setDelegator(Delegator delegator) { this.delegator = delegator; } - public GenericDelegator getDelegator() { + public Delegator getDelegator() { return delegator; } } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/DistributedCacheClear.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/DistributedCacheClear.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/DistributedCacheClear.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/DistributedCacheClear.java Mon Oct 5 00:08:27 2009 @@ -18,7 +18,7 @@ *******************************************************************************/ package org.ofbiz.entity.util; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.GenericPK; import org.ofbiz.entity.GenericValue; @@ -29,7 +29,7 @@ */ public interface DistributedCacheClear { - public void setDelegator(GenericDelegator delegator, String userLoginId); + public void setDelegator(Delegator delegator, String userLoginId); public void distributedClearCacheLine(GenericValue value); Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java Mon Oct 5 00:08:27 2009 @@ -33,7 +33,7 @@ import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilObject; import org.ofbiz.entity.EntityCryptoException; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.transaction.GenericTransactionException; @@ -43,11 +43,11 @@ public static final String module = EntityCrypto.class.getName(); - protected GenericDelegator delegator = null; + protected Delegator delegator = null; protected Map<String, SecretKey> keyMap = null; protected EntityCrypto() { } - public EntityCrypto(GenericDelegator delegator) { + public EntityCrypto(Delegator delegator) { this.delegator = delegator; this.keyMap = new HashMap<String, SecretKey>(); Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataAssert.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataAssert.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataAssert.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataAssert.java Mon Oct 5 00:08:27 2009 @@ -26,7 +26,7 @@ import javax.xml.parsers.ParserConfigurationException; import org.ofbiz.base.util.Debug; -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; @@ -40,7 +40,7 @@ public static final String module = EntityDataAssert.class.getName(); - public static int assertData(URL dataUrl, GenericDelegator delegator, List<Object> errorMessages) throws GenericEntityException, SAXException, ParserConfigurationException, IOException { + public static int assertData(URL dataUrl, Delegator delegator, List<Object> errorMessages) throws GenericEntityException, SAXException, ParserConfigurationException, IOException { int rowsChecked = 0; if (dataUrl == null) { @@ -68,7 +68,7 @@ return rowsChecked; } - public static void checkValueList(List valueList, GenericDelegator delegator, List<Object> errorMessages) throws GenericEntityException { + public static void checkValueList(List valueList, Delegator delegator, List<Object> errorMessages) throws GenericEntityException { if (valueList == null) return; Iterator valueIter = valueList.iterator(); @@ -78,7 +78,7 @@ } } - public static void checkSingleValue(GenericValue checkValue, GenericDelegator delegator, List<Object> errorMessages) throws GenericEntityException { + public static void checkSingleValue(GenericValue checkValue, Delegator delegator, List<Object> errorMessages) throws GenericEntityException { if (checkValue == null) { errorMessages.add("Got a value to check was null"); return; Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java Mon Oct 5 00:08:27 2009 @@ -35,7 +35,7 @@ import org.ofbiz.base.config.ResourceHandler; 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.config.DatasourceInfo; @@ -178,15 +178,15 @@ return urlList; } - public static int loadData(URL dataUrl, String helperName, GenericDelegator delegator, List<Object> errorMessages) throws GenericEntityException { + public static int loadData(URL dataUrl, String helperName, Delegator delegator, List<Object> errorMessages) throws GenericEntityException { return loadData(dataUrl, helperName, delegator, errorMessages, -1); } - public static int loadData(URL dataUrl, String helperName, GenericDelegator delegator, List<Object> errorMessages, int txTimeout) throws GenericEntityException { + public static int loadData(URL dataUrl, String helperName, Delegator delegator, List<Object> errorMessages, int txTimeout) throws GenericEntityException { return loadData(dataUrl, helperName, delegator, errorMessages, txTimeout, false, false, false); } - public static int loadData(URL dataUrl, String helperName, GenericDelegator delegator, List<Object> errorMessages, int txTimeout, boolean dummyFks, boolean maintainTxs, boolean tryInsert) throws GenericEntityException { + public static int loadData(URL dataUrl, String helperName, Delegator delegator, List<Object> errorMessages, int txTimeout, boolean dummyFks, boolean maintainTxs, boolean tryInsert) throws GenericEntityException { int rowsChanged = 0; if (dataUrl == null) { @@ -223,7 +223,7 @@ return rowsChanged; } - public static int generateData(GenericDelegator delegator, List<Object> errorMessages) throws GenericEntityException { + public static int generateData(Delegator delegator, List<Object> errorMessages) throws GenericEntityException { int rowsChanged = 0; ModelReader reader = delegator.getModelReader(); for (String entityName: reader.getEntityNames()) { |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |