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 2009/10/09 19:44:25 UTC
svn commit: r823633 - in /ofbiz/trunk:
applications/order/src/org/ofbiz/order/shoppingcart/
applications/product/src/org/ofbiz/shipment/packing/
applications/product/src/org/ofbiz/shipment/verify/
applications/product/src/org/ofbiz/shipment/weightPacka...
Author: adrianc
Date: Fri Oct 9 17:44:24 2009
New Revision: 823633
URL: http://svn.apache.org/viewvc?rev=823633&view=rev
Log:
Updated client code to use the new Delegator factory method.
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java
ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java
ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java
ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java
ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/InstanceEntityObject.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/requester/AbstractRequester.java
ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java Fri Oct 9 17:44:24 2009
@@ -26,7 +26,6 @@
import javax.servlet.http.HttpSessionListener;
import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.webapp.stats.VisitHandler;
import org.ofbiz.entity.Delegator;
@@ -60,11 +59,7 @@
String delegatorName = (String) session.getAttribute("delegatorName");
Delegator delegator = null;
if (UtilValidate.isNotEmpty(delegatorName)) {
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ delegator = DelegatorFactory.getDelegator(delegatorName);
}
if (delegator == null) {
Debug.logError("Could not find delegator with delegatorName in session, not saving abandoned cart info.", module);
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Fri Oct 9 17:44:24 2009
@@ -277,11 +277,7 @@
public Delegator getDelegator() {
if (delegator == null) {
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ delegator = DelegatorFactory.getDelegator(delegatorName);
}
return delegator;
}
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Fri Oct 9 17:44:24 2009
@@ -39,7 +39,6 @@
import org.ofbiz.base.util.UtilDateTime;
import org.ofbiz.base.util.UtilFormatOut;
import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.Delegator;
@@ -2408,11 +2407,7 @@
if (UtilValidate.isEmpty(delegatorName)) {
throw new IllegalStateException("Bad delegator name");
}
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ delegator = DelegatorFactory.getDelegator(delegatorName);
}
return delegator;
}
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java Fri Oct 9 17:44:24 2009
@@ -34,7 +34,6 @@
import org.ofbiz.base.util.GeneralException;
import org.ofbiz.base.util.UtilFormatOut;
import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.DelegatorFactory;
@@ -502,11 +501,7 @@
public Delegator getDelegator() {
if (_delegator == null) {
- try {
- _delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ _delegator = DelegatorFactory.getDelegator(delegatorName);
}
return _delegator;
}
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java Fri Oct 9 17:44:24 2009
@@ -30,7 +30,6 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.Delegator;
@@ -78,11 +77,7 @@
public Delegator getDelegator() {
if (_delegator == null) {
- try {
- _delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ _delegator = DelegatorFactory.getDelegator(delegatorName);
}
return _delegator;
}
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java Fri Oct 9 17:44:24 2009
@@ -32,7 +32,6 @@
import org.ofbiz.base.util.UtilFormatOut;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilNumber;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.Delegator;
@@ -104,11 +103,7 @@
public Delegator getDelegator() {
if (_delegator == null) {
- try {
- _delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ _delegator = DelegatorFactory.getDelegator(delegatorName);
}
return _delegator;
}
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=823633&r1=823632&r2=823633&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 Fri Oct 9 17:44:24 2009
@@ -169,11 +169,7 @@
//int debug = ContainerConfig.getPropertyValue(cc, "debug", 0);
// grab some global context settings
- try {
- this.delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, ContainerConfig.getPropertyValue(cc, "delegator-name", "default"));
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ this.delegator = DelegatorFactory.getDelegator(ContainerConfig.getPropertyValue(cc, "delegator-name", "default"));
this.contextReloadable = ContainerConfig.getPropertyValue(cc, "apps-context-reloadable", false);
this.crossContext = ContainerConfig.getPropertyValue(cc, "apps-cross-context", true);
this.distribute = ContainerConfig.getPropertyValue(cc, "apps-distributable", true);
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Fri Oct 9 17:44:24 2009
@@ -40,7 +40,6 @@
import org.ofbiz.base.util.UtilDateTime;
import org.ofbiz.base.util.UtilFormatOut;
import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilXml;
import org.ofbiz.base.util.cache.UtilCache;
@@ -122,18 +121,13 @@
private String originalDelegatorName = null;
- /** @deprecated Use Delegator delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
+ /** @deprecated Use Delegator delegator = DelegatorFactory.getDelegator(delegatorName);
* @param delegatorName
* @return
*/
@Deprecated
public static GenericDelegator getGenericDelegator(String delegatorName) {
- try {
- return (GenericDelegator) UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
- return null;
+ return (GenericDelegator) DelegatorFactory.getDelegator(delegatorName);
}
protected static List<Object> getUserIdentifierStack() {
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=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java Fri Oct 9 17:44:24 2009
@@ -44,7 +44,6 @@
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;
@@ -288,11 +287,7 @@
if (internalDelegator == null) {
if (delegatorName == null) delegatorName = "default";
if (delegatorName != null)
- try {
- internalDelegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ internalDelegator = DelegatorFactory.getDelegator(delegatorName);
if (internalDelegator == null) {
throw new IllegalStateException("[GenericEntity.getDelegator] could not find delegator with name " + delegatorName);
}
Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java Fri Oct 9 17:44:24 2009
@@ -33,7 +33,6 @@
import org.ofbiz.base.container.ContainerException;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.StringUtil;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilURL;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.Delegator;
@@ -227,11 +226,7 @@
String delegatorNameToUse = overrideDelegator != null ? overrideDelegator : delegatorName;
String groupNameToUse = overrideGroup != null ? overrideGroup : entityGroupName;
Delegator delegator = null;
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorNameToUse);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ delegator = DelegatorFactory.getDelegator(delegatorNameToUse);
if (delegator == null) {
throw new ContainerException("Invalid delegator name!");
}
Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java Fri Oct 9 17:44:24 2009
@@ -34,7 +34,6 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilDateTime;
import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.DelegatorFactory;
@@ -150,11 +149,7 @@
// what to do with the delegatorName? this is the delegatorName to use in this service...
String delegatorName = (String) context.get("delegatorName");
if (UtilValidate.isNotEmpty(delegatorName)) {
- try {
- this.delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ this.delegator = DelegatorFactory.getDelegator(delegatorName);
}
Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java Fri Oct 9 17:44:24 2009
@@ -38,7 +38,6 @@
import org.ofbiz.base.util.Debug;
import static org.ofbiz.base.util.UtilGenerics.checkList;
import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilXml;
import org.ofbiz.base.util.UtilURL;
@@ -135,11 +134,7 @@
Delegator delegator = dctx.getDelegator();
String overrideDelegatorName = (String) context.get("delegatorName");
if (UtilValidate.isNotEmpty(overrideDelegatorName)) {
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, overrideDelegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ delegator = DelegatorFactory.getDelegator(overrideDelegatorName);
if (delegator == null) {
return ServiceUtil.returnError("Could not find delegator with specified name " + overrideDelegatorName);
}
Modified: ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java (original)
+++ ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java Fri Oct 9 17:44:24 2009
@@ -28,8 +28,6 @@
import org.ofbiz.base.container.Container;
import org.ofbiz.base.container.ContainerConfig;
import org.ofbiz.base.container.ContainerException;
-import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.DelegatorFactory;
@@ -64,11 +62,7 @@
// get the delegator
String delegatorName = ContainerConfig.getPropertyValue(cc, "delegator-name", "default");
Delegator delegator = null;
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ delegator = DelegatorFactory.getDelegator(delegatorName);
// get the dispatcher
String dispatcherName = ContainerConfig.getPropertyValue(cc, "dispatcher-name", "xui-dispatcher");
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java Fri Oct 9 17:44:24 2009
@@ -22,7 +22,6 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilXml;
import org.ofbiz.base.util.collections.FlexibleMapAccessor;
@@ -103,11 +102,7 @@
String delegatorName = this.delegatorNameExdr.expandString(context);
if (delegatorName != null && delegatorName.length() > 0) {
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ delegator = DelegatorFactory.getDelegator(delegatorName);
}
ModelEntity modelEntity = delegator.getModelEntity(entityName);
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java Fri Oct 9 17:44:24 2009
@@ -26,7 +26,6 @@
import org.ofbiz.base.location.FlexibleLocation;
import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.string.FlexibleStringExpander;
import org.ofbiz.entity.Delegator;
@@ -88,11 +87,7 @@
Delegator delegator = methodContext.getDelegator();
if (delegatorName != null && delegatorName.length() > 0) {
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ delegator = DelegatorFactory.getDelegator(delegatorName);
}
URL dataUrl = null;
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java Fri Oct 9 17:44:24 2009
@@ -22,7 +22,6 @@
import java.util.Map;
import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.DelegatorFactory;
import org.ofbiz.entity.GenericEntityException;
@@ -89,11 +88,7 @@
Delegator delegator = methodContext.getDelegator();
if (delegatorName != null && delegatorName.length() > 0) {
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ delegator = DelegatorFactory.getDelegator(delegatorName);
}
try {
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java Fri Oct 9 17:44:24 2009
@@ -24,7 +24,6 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.DelegatorFactory;
@@ -80,11 +79,7 @@
Delegator delegator = methodContext.getDelegator();
if (delegatorName != null && delegatorName.length() > 0) {
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ delegator = DelegatorFactory.getDelegator(delegatorName);
}
Map<String, ? extends Object> inMap = mapAcsr.get(methodContext);
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java Fri Oct 9 17:44:24 2009
@@ -30,7 +30,6 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralRuntimeException;
import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilTimer;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilXml;
@@ -107,11 +106,7 @@
try {
Delegator origDelegator = this.delegator;
if (!this.delegator.getOriginalDelegatorName().equals(this.delegator.getDelegatorName())) {
- try {
- origDelegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, this.delegator.getOriginalDelegatorName());
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ origDelegator = DelegatorFactory.getDelegator(this.delegator.getOriginalDelegatorName());
}
this.jm = JobManager.getInstance(origDelegator, enableJM);
} catch (GeneralRuntimeException e) {
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java Fri Oct 9 17:44:24 2009
@@ -33,7 +33,6 @@
import org.ofbiz.base.container.ContainerConfig;
import org.ofbiz.base.container.ContainerException;
import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.entity.Delegator;
@@ -87,11 +86,7 @@
String delegatorName = ContainerConfig.getPropertyValue(cfg, "delegator-name", "default");
this.deleteMail = "true".equals(ContainerConfig.getPropertyValue(cfg, "delete-mail", "false"));
- try {
- this.delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ this.delegator = DelegatorFactory.getDelegator(delegatorName);
this.dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, delegator);
this.timerDelay = (long) ContainerConfig.getPropertyValue(cfg, "poll-delay", 300000);
this.maxSize = (long) ContainerConfig.getPropertyValue(cfg, "maxSize", 1000000); // maximum size in bytes
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java Fri Oct 9 17:44:24 2009
@@ -29,8 +29,6 @@
import org.ofbiz.base.container.Container;
import org.ofbiz.base.container.ContainerConfig;
import org.ofbiz.base.container.ContainerException;
-import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.DelegatorFactory;
import org.ofbiz.service.GenericDispatcher;
@@ -123,12 +121,7 @@
}
// get the delegator for this container
- Delegator delegator = null;
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorProp.value);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ Delegator delegator = DelegatorFactory.getDelegator(delegatorProp.value);
// create the LocalDispatcher
LocalDispatcher dispatcher = GenericDispatcher.getLocalDispatcher(name, delegator);
Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java Fri Oct 9 17:44:24 2009
@@ -31,7 +31,6 @@
import org.ofbiz.base.util.ObjectType;
import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilXml;
import org.ofbiz.entity.Delegator;
@@ -70,11 +69,7 @@
String uniqueSuffix = "-" + RandomStringUtils.randomAlphanumeric(10);
- try {
- this.delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, this.originalDelegatorName).makeTestDelegator(this.originalDelegatorName + uniqueSuffix);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ this.delegator = DelegatorFactory.getDelegator(this.originalDelegatorName).makeTestDelegator(this.originalDelegatorName + uniqueSuffix);
this.dispatcher = GenericDispatcher.getLocalDispatcher(originalDispatcherName + uniqueSuffix, delegator);
for (Element testCaseElement : UtilXml.childElementList(mainElement, UtilMisc.toSet("test-case", "test-group"))) {
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java Fri Oct 9 17:44:24 2009
@@ -330,11 +330,7 @@
delegatorName = "default";
}
if (Debug.verboseOn()) Debug.logVerbose("Setup Entity Engine Delegator with name " + delegatorName, module);
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ delegator = DelegatorFactory.getDelegator(delegatorName);
config.getServletContext().setAttribute("delegator", delegator);
if (delegator == null) {
Debug.logError("[ContextFilter.init] ERROR: delegator factory returned null for delegatorName \"" + delegatorName + "\"", module);
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java Fri Oct 9 17:44:24 2009
@@ -34,7 +34,6 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilHttp;
import org.ofbiz.base.util.UtilJ2eeCompat;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilTimer;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.Delegator;
@@ -151,11 +150,7 @@
Delegator delegator = null;
String delegatorName = (String) session.getAttribute("delegatorName");
if (UtilValidate.isNotEmpty(delegatorName)) {
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ delegator = DelegatorFactory.getDelegator(delegatorName);
}
if (delegator == null) {
delegator = (Delegator) getServletContext().getAttribute("delegator");
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java Fri Oct 9 17:44:24 2009
@@ -119,12 +119,7 @@
return "error";
}
- Delegator delegator = null;
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ Delegator delegator = DelegatorFactory.getDelegator(delegatorName);
if (delegator == null) {
String errMsg = UtilProperties.getMessage(CoreEvents.err_resource, "coreEvents.no_delegator_name_defined", locale);
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java Fri Oct 9 17:44:24 2009
@@ -54,11 +54,7 @@
public void init(ServletContext context) throws EventHandlerException {
String delegatorName = context.getInitParameter("entityDelegatorName");
- try {
- this.delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ this.delegator = DelegatorFactory.getDelegator(delegatorName);
this.dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, delegator);
}
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java Fri Oct 9 17:44:24 2009
@@ -76,11 +76,7 @@
public void init(ServletContext context) throws EventHandlerException {
String delegatorName = context.getInitParameter("entityDelegatorName");
- try {
- this.delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ this.delegator = DelegatorFactory.getDelegator(delegatorName);
this.dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, delegator);
this.setHandlerMapping(new ServiceRpcHandler());
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java Fri Oct 9 17:44:24 2009
@@ -355,11 +355,7 @@
public Delegator getDelegator() {
if (this.delegator == null) {
- try {
- this.delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, this.delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ this.delegator = DelegatorFactory.getDelegator(this.delegatorName);
}
// if still null, then we have a problem
if (this.delegator == null) {
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java Fri Oct 9 17:44:24 2009
@@ -109,11 +109,7 @@
// first try the session attribute delegatorName
String delegatorName = (String) session.getAttribute("delegatorName");
if (UtilValidate.isNotEmpty(delegatorName)) {
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ delegator = DelegatorFactory.getDelegator(delegatorName);
}
// then try the ServletContext attribute delegator, should always be there...
@@ -205,11 +201,7 @@
String delegatorName = (String) session.getAttribute("delegatorName");
if (delegator == null && UtilValidate.isNotEmpty(delegatorName)) {
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ delegator = DelegatorFactory.getDelegator(delegatorName);
}
if (delegator == null) {
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java Fri Oct 9 17:44:24 2009
@@ -69,11 +69,7 @@
Thread.currentThread().setContextClassLoader(loader);
ServletContext context = this.getServletContext();
String delegatorName = context.getInitParameter("entityDelegatorName");
- try {
- this.delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ this.delegator = DelegatorFactory.getDelegator(delegatorName);
String dispatcherName = context.getInitParameter("localDispatcherName");
this.dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, this.delegator);
this.security = SecurityFactory.getInstance(this.delegator);
Modified: ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java (original)
+++ ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java Fri Oct 9 17:44:24 2009
@@ -31,9 +31,7 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.DelegatorFactory;
@@ -62,11 +60,7 @@
System.err.println(org.webslinger.commons.vfs.flat.FlatFileProvider.class);
servletContext = config.getServletContext();
String delegatorName = servletContext.getInitParameter("entityDelegatorName");
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, WebslingerContextMapper.class.getName());
- }
+ delegator = DelegatorFactory.getDelegator(delegatorName);
String readerFiles = servletContext.getInitParameter("serviceReaderUrls");
if (readerFiles != null) {
for (String reader: CollectionUtil.split(readerFiles, ";")) {
@@ -111,11 +105,7 @@
protected void initializeContext(WebslingerServletContext context, Layout layout) throws Exception {
OfbizLayout ofbizLayout = (OfbizLayout) layout;
Delegator delegator = null;
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, ofbizLayout.delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, WebslingerContextMapper.class.getName());
- }
+ delegator = DelegatorFactory.getDelegator(ofbizLayout.delegatorName);
context.setAttribute("delegator", delegator);
context.setAttribute("dispatcher", new WebslingerGenericDispatcher(context, layout.getTarget(), delegator, globalReaderURLs));
context.setAttribute("authz", AuthorizationFactory.getInstance(delegator));
Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java (original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java Fri Oct 9 17:44:24 2009
@@ -57,7 +57,6 @@
import org.ofbiz.base.util.UtilDateTime;
import org.ofbiz.base.util.UtilHttp;
import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilPlist;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilURL;
@@ -353,11 +352,7 @@
String groupNameToUse = overrideGroup != null ? overrideGroup : "org.ofbiz";
Delegator delegator = null;
if (UtilValidate.isNotEmpty(overrideDelegator)) {
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, overrideDelegator);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ delegator = DelegatorFactory.getDelegator(overrideDelegator);
} else {
delegator = dctx.getDelegator();
}
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/InstanceEntityObject.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/InstanceEntityObject.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/InstanceEntityObject.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/InstanceEntityObject.java Fri Oct 9 17:44:24 2009
@@ -44,7 +44,7 @@
public Delegator getGenericDelegator() {
if (this.delegator == null && delegatorName != null) {
try {
- this.delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, this.delegatorName);
+ this.delegator = DelegatorFactory.getDelegator(this.delegatorName);
} catch (ClassNotFoundException e) {
Debug.logError(e, module);
}
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/requester/AbstractRequester.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/requester/AbstractRequester.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/requester/AbstractRequester.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/requester/AbstractRequester.java Fri Oct 9 17:44:24 2009
@@ -150,7 +150,7 @@
protected synchronized Delegator getDelegator() {
if (this.delegator == null && this.delegatorName != null) {
try {
- this.delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, this.delegatorName);
+ this.delegator = DelegatorFactory.getDelegator(this.delegatorName);
} catch (ClassNotFoundException e) {
Debug.logError(e, module);
}
Modified: ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java (original)
+++ ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java Fri Oct 9 17:44:24 2009
@@ -148,11 +148,7 @@
public Delegator getDelegator() {
if (UtilValidate.isEmpty(delegator)) {
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- } catch (ClassNotFoundException e) {
- Debug.logError(e, module);
- }
+ delegator = DelegatorFactory.getDelegator(delegatorName);
}
return delegator;
}
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java?rev=823633&r1=823632&r2=823633&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java Fri Oct 9 17:44:24 2009
@@ -32,7 +32,6 @@
import org.ofbiz.base.util.StringUtil;
import org.ofbiz.base.util.UtilDateTime;
import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilURL;
import org.ofbiz.base.util.UtilXml;
import org.ofbiz.base.util.UtilValidate;
@@ -1314,7 +1313,7 @@
if (args.length > 0)
sampleFileName = args[0];
- List values = readXpdl(UtilURL.fromFilename(sampleFileName), UtilObject.getObjectFromFactory(DelegatorFactory.class, "default"));
+ List values = readXpdl(UtilURL.fromFilename(sampleFileName), DelegatorFactory.getDelegator("default"));
Iterator viter = values.iterator();
while (viter.hasNext())
Re: svn commit: r823633 - in /ofbiz/trunk: applications/order/src/org/ofbiz/order/shoppingcart/
applications/product/src/org/ofbiz/shipment/packing/ applications/product/src/org/ofbiz/shipment/verify/
applications/product/src/org/ofbiz/shipment/weightPacka...
Posted by Adam Heath <do...@brainfood.com>.
adrianc@apache.org wrote:
> Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java?rev=823633&r1=823632&r2=823633&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java (original)
> +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java Fri Oct 9 17:44:24 2009
> @@ -34,7 +34,6 @@
> import org.ofbiz.base.util.GeneralException;
> import org.ofbiz.base.util.UtilFormatOut;
> import org.ofbiz.base.util.UtilMisc;
> -import org.ofbiz.base.util.UtilObject;
> import org.ofbiz.base.util.UtilValidate;
> import org.ofbiz.entity.Delegator;
> import org.ofbiz.entity.DelegatorFactory;
> @@ -502,11 +501,7 @@
>
> public Delegator getDelegator() {
> if (_delegator == null) {
> - try {
> - _delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
> - } catch (ClassNotFoundException e) {
> - Debug.logError(e, module);
> - }
> + _delegator = DelegatorFactory.getDelegator(delegatorName);
> }
> return _delegator;
> }
>
This is not to Adrian, but why is the variable prefixed with '_'?
That's bad form.