Author: adrianc
Date: Mon Apr 22 03:46:30 2013
New Revision: 1470383
URL:
http://svn.apache.org/r1470383Log:
Remove Javolution from GenericPK.java.
Modified:
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericPK.java
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericPK.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericPK.java?rev=1470383&r1=1470382&r2=1470383&view=diff==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericPK.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericPK.java Mon Apr 22 03:46:30 2013
@@ -20,8 +20,6 @@ package org.ofbiz.entity;
import java.util.Map;
-import javolution.context.ObjectFactory;
-
import org.ofbiz.entity.model.ModelEntity;
/**
@@ -31,39 +29,32 @@ import org.ofbiz.entity.model.ModelEntit
@SuppressWarnings("serial")
public class GenericPK extends GenericEntity {
- protected static final ObjectFactory<GenericPK> genericPKFactory = new ObjectFactory<GenericPK>() {
- @Override
- protected GenericPK create() {
- return new GenericPK();
- }
- };
-
protected GenericPK() { }
/** Creates new GenericPK */
public static GenericPK create(ModelEntity modelEntity) {
- GenericPK newPK = genericPKFactory.object();
+ GenericPK newPK = new GenericPK();
newPK.init(modelEntity);
return newPK;
}
/** Creates new GenericPK from existing Map */
public static GenericPK create(Delegator delegator, ModelEntity modelEntity, Map<String, ? extends Object> fields) {
- GenericPK newPK = genericPKFactory.object();
+ GenericPK newPK = new GenericPK();
newPK.init(delegator, modelEntity, fields);
return newPK;
}
/** Creates new GenericPK from existing Map */
public static GenericPK create(Delegator delegator, ModelEntity modelEntity, Object singlePkValue) {
- GenericPK newPK = genericPKFactory.object();
+ GenericPK newPK = new GenericPK();
newPK.init(delegator, modelEntity, singlePkValue);
return newPK;
}
/** Creates new GenericPK from existing GenericPK */
public static GenericPK create(GenericPK value) {
- GenericPK newPK = genericPKFactory.object();
+ GenericPK newPK = new GenericPK();
newPK.init(value);
return newPK;
}