@@ -690,24 +690,23 @@ private void writeLines(List<String> lines, XMLStreamWriter writer) throws XMLSt
690690 }
691691
692692 private void writeBusNodeLegend (XMLStreamWriter writer , VoltageLevelNode vlNode ) throws XMLStreamException {
693- boolean isBusLegend = vlNode .getBusNodeStream (). anyMatch ( bus -> StringUtils . isNotEmpty ( labelProvider . getBusDescription ( bus )));
694- if ( isBusLegend ) {
695- writer . writeStartElement ( TABLE_ELEMENT_NAME );
693+ List < BusNode > notEmptyDescrBusNodes = vlNode .getBusNodeStream ()
694+ . filter ( busNode -> StringUtils . isNotEmpty ( labelProvider . getBusDescription ( busNode )))
695+ . toList ( );
696696
697- for (BusNode busNode : vlNode .getBusNodes ()) {
698- String busNodeLegend = labelProvider .getBusDescription (busNode );
699- if (!StringUtils .isEmpty (busNodeLegend )) {
700- writer .writeStartElement (TABLE_ROW_ELEMENT_NAME );
701- writer .writeStartElement (TABLE_DATA_ELEMENT_NAME );
702- writer .writeEmptyElement (DIV_ELEMENT_NAME );
703- writeStyleClasses (writer , styleProvider .getBusNodeStyleClasses (busNode ), StyleProvider .LEGEND_SQUARE_CLASS );
704- writeStyleAttribute (writer , styleProvider .getBusNodeStyle (busNode ));
705- writer .writeEndElement ();
706- writer .writeStartElement (TABLE_DATA_ELEMENT_NAME );
707- writer .writeCharacters (busNodeLegend );
708- writer .writeEndElement ();
709- writer .writeEndElement ();
710- }
697+ if (!notEmptyDescrBusNodes .isEmpty ()) {
698+ writer .writeStartElement (TABLE_ELEMENT_NAME );
699+ for (BusNode busNode : notEmptyDescrBusNodes ) {
700+ writer .writeStartElement (TABLE_ROW_ELEMENT_NAME );
701+ writer .writeStartElement (TABLE_DATA_ELEMENT_NAME );
702+ writer .writeEmptyElement (DIV_ELEMENT_NAME );
703+ writeStyleClasses (writer , styleProvider .getBusNodeStyleClasses (busNode ), StyleProvider .LEGEND_SQUARE_CLASS );
704+ writeStyleAttribute (writer , styleProvider .getBusNodeStyle (busNode ));
705+ writer .writeEndElement ();
706+ writer .writeStartElement (TABLE_DATA_ELEMENT_NAME );
707+ writer .writeCharacters (labelProvider .getBusDescription (busNode ));
708+ writer .writeEndElement ();
709+ writer .writeEndElement ();
711710 }
712711 writer .writeEndElement ();
713712 }
0 commit comments