Close #258

Author: Open Lowcode SAS

src/org/openlowcode/client/graphic/widget/CComponentBand.java

@@ -97,7 +97,7 @@ public CComponentBand(int direction, CPageSignifPath parentpath) {
 		super(parentpath, null);
 		this.direction = direction;
 		elements = new ArrayList<CPageNode>();
-
+		this.conditionalelements = new HashMap<Integer, ArrayList<ConditionalBlock>>();
 	}
 
 	/**
@@ -137,18 +137,18 @@ public CComponentBand(MessageReader reader, CPageSignifPath parentpath) throws O
 			int index = reader.returnNextIntegerField("IND");
 			CPageDataRef datareference = CPageDataRef.parseCPageDataRef(reader);
 			ArrayList<String> validvalues = new ArrayList<String>();
-
+			reader.startStructureArray("VLD");
 			while (reader.structureArrayHasNextElement("VLD")) {
 				validvalues.add(reader.returnNextStringField("PLD"));
 				reader.returnNextEndStructure("VLD");
 			}
 			ArrayList<CPageNode> conditionalelements = new ArrayList<CPageNode>();
+			reader.startStructureArray("ELT");
 			while (reader.structureArrayHasNextElement("ELT")) {
 				conditionalelements.add(CPageNode.parseNode(reader, this.nodepath));
 				reader.returnNextEndStructure("ELT");
 			}
-			ConditionalBlock conditionalblock = new ConditionalBlock( datareference, validvalues,
-					conditionalelements);
+			ConditionalBlock conditionalblock = new ConditionalBlock(datareference, validvalues, conditionalelements);
 			ArrayList<ConditionalBlock> elementsforindex = this.conditionalelements.get(new Integer(index));
 			if (elementsforindex == null) {
 				elementsforindex = new ArrayList<ConditionalBlock>();
@@ -221,10 +221,13 @@ private void checkConditionNode(
 				for (int j = 0; j < block.validvalues.size(); j++)
 					if (block.validvalues.get(j).equals(choice.getStoredValue()))
 						choicevalid = true;
-				for (int j = 0; j < block.conditionalelements.size(); j++) {
-					thispane.getChildren().add(block.conditionalelements.get(j).getNode(actionmanager, inputdata,
-							parentwindow, parenttabpanes, nodetocollapsewhenactiontriggered));
-				}
+				if (choicevalid)
+					for (int j = 0; j < block.conditionalelements.size(); j++) {
+						Node currentnode = block.conditionalelements.get(j).getNode(actionmanager, inputdata,
+								parentwindow, parenttabpanes, nodetocollapsewhenactiontriggered);
+						if (currentnode != null)
+							thispane.getChildren().add(currentnode);
+					}
 			}
 	}
 

src/org/openlowcode/server/graphic/widget/SComponentBand.java

@@ -130,7 +130,6 @@ public void addElement(SPageNode element) {
 
 	}
 
-
 	@Override
 	public void WritePayloadToCDL(MessageWriter writer, SPageData input, SecurityBuffer buffer) throws IOException {
 		writer.sendMessageElement(new MessageStringField("DIR", "" + direction));
@@ -143,36 +142,36 @@ public void WritePayloadToCDL(MessageWriter writer, SPageData input, SecurityBuf
 				writer.endStructure("ELT");
 			}
 		}
-		
+
 		writer.endStructure("ELTS");
 
 		writer.startStructure("CDNBLKS");
-		for (int i=0;i<this.conditionalblocks.size();i++) {
+		for (int i = 0; i < this.conditionalblocks.size(); i++) {
 			writer.startStructure("CDNBLK");
 			ConditionalBlock thisblock = this.conditionalblocks.get(i);
-			writer.addIntegerField("IND",thisblock.insertbeforeindex);
+			writer.addIntegerField("IND", thisblock.insertbeforeindex);
 			thisblock.conditionchoice.writeReferenceToCML(writer);
 			// values block
 			writer.startStructure("VLDS");
-			for (int j=0;j<thisblock.validchoices.length;j++) {
+			for (int j = 0; j < thisblock.validchoices.length; j++) {
 				writer.startStructure("VLD");
-				writer.addStringField("PLD",thisblock.validchoices[j].getStorageCode());
+				writer.addStringField("PLD", thisblock.validchoices[j].getStorageCode());
 				writer.endStructure("VLD");
 			}
 			writer.endStructure("VLDS");
-			// ------ Node block 
+			// ------ Node block
 			writer.startStructure("ELTS");
-			for (int j=0;j<thisblock.conditionalelements.length;j++) {
+			for (int j = 0; j < thisblock.conditionalelements.length; j++) {
 				writer.startStructure("ELT");
 				thisblock.conditionalelements[j].WriteToCDL(writer, input, buffer);
 				writer.endStructure("ELT");
 			}
 			writer.endStructure("ELTS");
-			
+
 			writer.endStructure("CDNBLK");
 		}
 		writer.endStructure("CDNBLKS");
-		
+
 	}
 
 	@Override
@@ -195,16 +194,21 @@ public void populateDown(SPageSignifPath parentpath, SPageNode[] widgetpathtoroo
 		SPageNode[] newwidgetpathtoroot = this.addCurrentWidgetToRoot(widgetpathtoroot);
 
 		for (int i = 0; i < this.elements.size(); i++) {
+
 			this.elements.get(i).populateDown(pathforelements, newwidgetpathtoroot);
 		}
+		for (int i = 0; i < this.conditionalblocks.size(); i++) {
+			ConditionalBlock block = this.conditionalblocks.get(i);
+			for (int j = 0; j < block.conditionalelements.length; j++)
+				block.conditionalelements[j].populateDown(pathforelements, newwidgetpathtoroot);
+		}
 	}
 
 	@Override
 	public String toString() {
 		return "SCOMPONENTBAND[" + callstackatcreation + "]";
 	}
 
-
 	/**
 	 * adds a conditional block in the page band
 	 *