Close #294

Open Lowcode SAS · Open Lowcode SAS · commit a0e28c2648ee · 2021-03-17T10:23:34.000+01:00
diff --git a/src/org/openlowcode/design/data/DataObjectDefinition.java b/src/org/openlowcode/design/data/DataObjectDefinition.java
@@ -3548,7 +3548,7 @@ public void generateDefinitionToFile(SourceGenerator sg, Module module) throws I
 			if (classfilter == null)
 				throw new RuntimeException("No class defined");
 			sg.wl("	private ConditionalAliasListParentHelper<");
-			sg.wl("			" + classname + ", " + choiceclass + ",");
+			sg.wl("			" + classname + ", " + (choiceclass.equals("?")?"BooleanChoiceDefinition":choiceclass) + ",");
 			sg.wl("			" + classfilter + "> aliaslisthelper;");
 		} else if (this.categoryforextractor != null) {
 			sg.wl("	private ConditionalAliasListHelper<");
@@ -3780,7 +3780,7 @@ public void generateDefinitionToFile(SourceGenerator sg, Module module) throws I
 			sg.wl("");
 		}
 
-		if (this.categoryforextractor != null) {
+		if (this.categoryforextractor != null || this.dynamicloaderinsertionorder.size()>0) {
 			sg.wl("		this.initConditionalAliasList();");
 		}
 		sg.wl("	}");
@@ -4145,7 +4145,7 @@ public void generateDefinitionToFile(SourceGenerator sg, Module module) throws I
 
 		}
 
-		if (this.categoryforextractor != null) {
+		if (this.categoryforextractor != null || this.dynamicloaderinsertionorder.size()>0) {
 			sg.wl("	public void initConditionalAliasList() {");
 			Iterator<Entry<String, ChoiceValue[]>> restrictionset = restrictionforalias.entrySet().iterator();
 
diff --git a/src/org/openlowcode/server/data/properties/multichild/MultichildValueHelper.java b/src/org/openlowcode/server/data/properties/multichild/MultichildValueHelper.java
@@ -451,7 +451,7 @@ public String[] getValueRestriction() {
 
 		@Override
 		public boolean load(G object, Object value, PostUpdateProcessingStore<G> postupdateprocessingstore) {
-			logger.warning("Adding value in index " + index + " value = " + value.toString());
+			logger.fine("Adding value in index " + index + " value = " + (value!=null?value.toString():"NULL"));
 			parsedvalue = MultichildValueHelper.this.payloadparser.apply(value, applocale, extraattributes);
 			helper.setSecondaryValueForLoading(index, MultichildValueHelper.this
 					.print(parsedvalue));
