Author: doogie
Date: Wed Jan 27 19:49:16 2010
New Revision: 903796
URL:
http://svn.apache.org/viewvc?rev=903796&view=revLog:
Fix case of DynamicViewEntity vivification into ModelViewEntity not
storing the ModelReader.
Modified:
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java
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=903796&r1=903795&r2=903796&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 Wed Jan 27 19:49:16 2010
@@ -126,11 +126,19 @@
/** Default Constructor */
public ModelEntity() {}
+ protected ModelEntity(ModelReader reader) {
+ this.modelReader = reader;
+ }
+
+ protected ModelEntity(ModelReader reader, ModelInfo def) {
+ super(def);
+ this.modelReader = reader;
+ }
+
/** XML Constructor */
protected ModelEntity(ModelReader reader, Element entityElement, ModelInfo def) {
- super(def);
+ this(reader, def);
populateFromAttributes(entityElement);
- this.modelReader = reader;
}
/** XML Constructor */
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java?rev=903796&r1=903795&r2=903796&view=diff==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java Wed Jan 27 19:49:16 2010
@@ -145,6 +145,7 @@
}
public ModelViewEntity(DynamicViewEntity dynamicViewEntity, ModelReader modelReader) {
+ super(modelReader);
this.entityName = dynamicViewEntity.getEntityName();
this.packageName = dynamicViewEntity.getPackageName();
this.title = dynamicViewEntity.getTitle();