Close #206

Author: Open Lowcode SAS

src/org/openlowcode/OLcVersionGenerator.java

@@ -27,8 +27,8 @@
  *
  */
 public class OLcVersionGenerator {
-	public final static String version = "1.11.2";
-	public final static String clientversion = "1.11.2";
+	public final static String version = "1.11.3";
+	public final static String clientversion = "1.11.3";
 	public final static boolean stable = false;
 
 	public static void main(String[] args) {

src/org/openlowcode/design/data/DataObjectDefinition.java

@@ -3693,7 +3693,7 @@ public void generateDefinitionToFile(SourceGenerator sg, Module module) throws I
 					sg.wl("	public DataObjectFieldMarker<" + classname + "> get"
 							+ StringFormatter.formatForJavaClass(element.getName()) + "FieldMarker()  {");
 					sg.wl("		return this.getPropertyFieldMarker(\"" + thisproperty.getName() + "\",\""
-							+ element.getGenericNameForProperty().toUpperCase() + "\");");
+							+ element.getNameElementForProperty().toUpperCase() + "\");");
 					sg.wl("	}");
 				}
 			}

src/org/openlowcode/design/data/Element.java

@@ -37,13 +37,24 @@ public Element(String name) {
 
 	/**
 	 * provides the generic name of the variable for properties that can be
-	 * instanciated multiple times
+	 * instanciated multiple times. THis is especially the name of the getter
+	 * in the property class
 	 * 
 	 * @return
 	 */
 	public String getGenericNameForProperty() {
 		return this.genericsname;
 	}
+	
+	/**
+	 * provides the element name inside the property. Especially, for properties
+	 * that can be instanciated multiple time, this may be typically property instance name + suffix
+	 * 
+	 * @return
+	 */
+	public String getNameElementForProperty() {
+		return this.genericsname;
+	}
 
 	/**
 	 * sets the generics name of the variable, typically, this will be the same even

src/org/openlowcode/design/data/ExternalElement.java

@@ -29,7 +29,7 @@ public class ExternalElement
 	@SuppressWarnings("unused")
 	private Property<?> referencedproperty;
 	private StoredElement referencedpropertyelement;
-
+	private String namelementforproperty;
 	public StoredElement getReferencedPropertyElement() {
 		return this.referencedpropertyelement;
 	}
@@ -92,12 +92,20 @@ public ExternalElement(
 			genericsname = genericsname + namesuffix;
 		genericsname = genericsname + StringFormatter.formatForJavaClass(this.referencedpropertyelement.getName());
 		this.setGenericsName(genericsname);
-
+		namelementforproperty = localproperty.getName();
+		if (namesuffix != null)
+			namelementforproperty = namelementforproperty+namesuffix;
+		namelementforproperty = namelementforproperty+ StringFormatter.formatForJavaClass(this.referencedpropertyelement.getName());
 	}
 
 	@Override
 	public String getJavaFieldName() {
 		return referencedpropertyelement.getJavaFieldName();
 	}
 
+	@Override
+	public String getNameElementForProperty() {
+		return this.namelementforproperty;
+	}
+
 }

src/org/openlowcode/server/data/properties/Hasmultidimensionalchild.java

@@ -104,7 +104,7 @@ F, E>> void postprocStoredobjectInsert(
 	public void postprocStoredobjectInsert(E object) {
 		MultidimensionchildHelper<F, E> multidimensionalchildhelper = this.casteddefinition.getHelper();
 		multidimensionalchildhelper.setContext(object);
-
+		logger.fine(" ---------------- start treating object for insert "+object.dropIdToString()+" ---------------- ");
 		// if versioned, get previous version children if it exists
 		F[] previouschildren = null;
 		if (object instanceof VersionedInterface<?>) {
@@ -113,15 +113,20 @@ public void postprocStoredobjectInsert(E object) {
 			E previousversion = versionedproperty.getpreviousversion();
 			if (previousversion != null)
 				previouschildren = this.casteddefinition.getChildren(previousversion.getId());
+			logger.fine("      got "+(previouschildren!=null?previouschildren.length:"null")+" children from previous version");
 		}
 		// get the blank objects
-
+		
 		ArrayList<F> blankobjects = multidimensionalchildhelper.generateObjectsForAllValueHelpers(object,
 				childobjectdefinition);
+		logger.fine("      blank objects created = "+blankobjects.size());
 		HashMap<String, F> objectsperkey = new HashMap<String, F>();
-		for (int i = 0; i < blankobjects.size(); i++)
-			objectsperkey.put(multidimensionalchildhelper.generateKeyForObject(blankobjects.get(i)),
-					blankobjects.get(i));
+		for (int i = 0; i < blankobjects.size(); i++) {
+			F thisobject = blankobjects.get(i);
+			String key =  multidimensionalchildhelper.generateKeyForObject(thisobject);
+			logger.finest("                  "+key);
+			objectsperkey.put(key,thisobject);
+		}
 
 		if (previouschildren != null) {
 			// replace children that are part of the list of blank objects
@@ -132,6 +137,7 @@ public void postprocStoredobjectInsert(E object) {
 				if (objectsperkey.get(childkey) != null) {
 					F newchild = oldchild.deepcopy();
 					objectsperkey.put(childkey, newchild);
+					logger.finest("              Replace key "+childkey+" with previous version");
 				}
 			}
 
@@ -143,21 +149,21 @@ public void postprocStoredobjectInsert(E object) {
 
 				if (objectsperkey.get(childkey) == null) {
 					F potentialnewchild = oldchild.deepcopy();
-					logger.severe(" -- Managing child in previous version key = "+childkey);
+					logger.finer(" -- Managing child in previous version key = "+childkey);
 					String value = multidimensionalchildhelper.getKeyForConsolidation(potentialnewchild, object);
-					logger.severe("          -> found new key for consolidation = "+value);
+					logger.finer("          -> found new key for consolidation = "+value);
 					if (value != null)
 						if (objectsperkey.get(value) != null) {
 							F childtoconsolidateinto = objectsperkey.get(value);
 							multidimensionalchildhelper.getConsolidator().accept(childtoconsolidateinto,
 									potentialnewchild);
-							logger.severe("          -> found object to consolidate into ");
+							logger.finer("          -> found object to consolidate into ");
 						} else {
 							objectsperkey.put(value, potentialnewchild);
-							logger.severe("          -> adds value directly to consolidation");
+							logger.finer("          -> adds value directly to consolidation");
 						}
 					if (value == null)
-						logger.severe ("              -> Discarding old data with key " + childkey);
+						logger.finer ("              -> Discarding old data with key " + childkey);
 				}
 			}
 
@@ -171,7 +177,10 @@ public void postprocStoredobjectInsert(E object) {
 			allobjectstoinsert.add(nextobject);
 
 		}
+		
 		F[] objectstoinsert = allobjectstoinsert.toArray(childobjectdefinition.generateArrayTemplate());
+		logger.finer("   inserting "+(objectstoinsert!=null?objectstoinsert.length:"null")+" objects");
+		if (objectstoinsert!=null) for (int i=0;i<objectstoinsert.length;i++) logger.finest("             "+multidimensionalchildhelper.generateKeyForObject(objectstoinsert[i]));
 		if (objectstoinsert != null)
 			if (objectstoinsert.length > 0) {
 				objectstoinsert[0].getMassiveInsert().insert(objectstoinsert);

src/org/openlowcode/server/data/properties/Linkedtoparent.java

@@ -61,12 +61,12 @@ public Linkedtoparent(LinkedtoparentDefinition<E, F> definition, DataObjectPaylo
 		pridfield = (StoredField<String>) this.field.lookupOnName(this.getName() + "ID");
 
 		if (parentdefinition.hasProperty("NAMED")) {
-			prname = (ExternalField<String>) this.field.lookupOnName(this.getName() + "NAME");
+			prname = (ExternalField<String>) this.field.lookupOnName(this.getName() + "OBJECTNAME");
 		}
 		if (parentdefinition.hasProperty("NUMBERED")) {
 			prnumber = (ExternalField<String>) this.field.lookupOnName(this.getName() + "NR");
 		}
-		if (parentdefinition.hasProperty("Located")) {
+		if (parentdefinition.hasProperty("LOCATED")) {
 			prlocation = (ExternalField<String>) this.field.lookupOnName(this.getName() + "LOCATIONDOMAINID");
 		}
 
@@ -230,7 +230,7 @@ public String getLinkedtoparentobjectname() {
 		if (parentdefinition.hasProperty("NAMEDPROPERTY")) {
 
 			for (int i = 0; i < this.field.getSize(); i++)
-				logger.info("field = " + this.field.get(i).getName());
+				logger.finer("field = " + this.field.get(i).getName());
 		}
 		if (prname == null)
 			return "#Name not present#";

src/org/openlowcode/server/data/properties/LinkedtoparentDefinition.java

@@ -164,7 +164,7 @@ public ArrayList<ExternalFieldSchema<?>> generateExternalSchema() {
 						.generateJoinQueryDefinition(this.parentobject.getTableschema(), id, "UNIQUEIDENTIFIED", "ID",
 								this.getName(), new QueryOperatorEqual<String>());
 				ExternalFieldSchema<?> externalfield = referenceobjectdefinition.generateExternalField(
-						this.getName() + "NAME", "Parent " + this.referenceobjectdefinition.getLabel(),
+						this.getName() + "OBJECTNAME", "Parent " + this.referenceobjectdefinition.getLabel(),
 						"Indicates the field the notes has been put in", "NAMED", "OBJECTNAME", joincondition,
 						this.displayprofilehideparentfields, -50, 40);
 				externalfieldlist.add(externalfield);