Sslz - Extension for recursive next block section

java/bundles/org.eclipse.set.feature/rootdir/data/export/pdf/content.xsl

@@ -15,8 +15,9 @@
 		</fo:block>
 	</xsl:template>
 
+	<!-- Switch to Arial if content contains □ because OpenSans does not know this glyphe -->
 	<xsl:template
-		match="StringContent[starts-with(.,'&#x25a1;')]">
+		match="StringContent[contains(.,'&#x25a1;')]">
 		<fo:block hyphenate="true" language="de" font-family="Arial">
 			<xsl:value-of select="." />
 		</fo:block>
@@ -92,7 +93,8 @@
 		</fo:inline>
 	</xsl:template>
 
-	<xsl:template match="OldValue[starts-with(.,'&#x25a1;')]">
+	<!-- Switch to Arial if content contains □ because OpenSans does not know this glyphe -->
+	<xsl:template match="OldValue[contains(.,'&#x25a1;')]">
 		<fo:inline font-family="Arial" background-color="yellow"
 			text-decoration="line-through">
 			<xsl:value-of select="." />
@@ -126,7 +128,8 @@
 		</fo:inline>
 	</xsl:template>
 
-	<xsl:template match="NewValue[starts-with(.,'&#x25a1;')]">
+	<!-- Switch to Arial if content contains □ because OpenSans does not know this glyphe -->
+	<xsl:template match="NewValue[contains(.,'&#x25a1;')]">
 		<fo:inline font-family="Arial" color="#cd0000">
 			<xsl:value-of select="." />
 		</fo:inline>

java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/FstrZugRangierExtensions.xtend

@@ -55,6 +55,7 @@ import static extension org.eclipse.set.ppmodel.extensions.SignalbegriffExtensio
 import static extension org.eclipse.set.ppmodel.extensions.WKrGspKomponenteExtensions.*
 import static extension org.eclipse.set.ppmodel.extensions.utils.IterableExtensions.*
 import static extension org.eclipse.set.utils.math.BigIntegerExtensions.*
+import java.util.Iterator
 
 /**
  * This class extends {@link Fstr_Zug_Rangier}.
@@ -481,6 +482,24 @@ class FstrZugRangierExtensions extends BasisObjektExtensions {
 		]
 	}
 
+	def static Iterable<Fstr_Zug_Rangier> getRecursiveNextBlockFstrZugRangier(
+		Fstr_Zug_Rangier it) {
+		val it = new Iterator<Fstr_Zug_Rangier>() {
+			var Fstr_Zug_Rangier next = it
+
+			override hasNext() {
+				val nextFstrZugRangier = getNextBlockFstrZugRangier(next)
+				next = nextFstrZugRangier?.firstOrNull // clarify if there be multiple blocks at the same signal
+				return next !== null
+			}
+
+			override next() {
+				next
+			}
+		}
+		return it.toList
+	}
+
 	/**
 	 * Return ENUmFstrZugArt
 	 */

java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/AbstractTableModelTransformator.xtend

@@ -225,9 +225,10 @@ abstract class AbstractTableModelTransformator<T> implements TableModelTransform
 				fill(row, column, object, [content.get(0)])
 			} else {
 				fillIterable(row, column, object, [content],
-					switchCase.comparator, [it], switchCase.seperator === null
-						? ITERABLE_FILLING_SEPARATOR
-						: switchCase.seperator)
+					switchCase.comparator, [it],
+					switchCase.seperator ===
+						null ? ITERABLE_FILLING_SEPARATOR : switchCase.
+						seperator)
 			}
 		} catch (Exception e) {
 			handleFillingException(e, row, column)
@@ -282,6 +283,26 @@ abstract class AbstractTableModelTransformator<T> implements TableModelTransform
 
 	}
 
+	/**
+	 * Fill a row with a sequence of string values and handle exceptions.
+	 * The filling preserves the order of the sequence.
+	 * 
+	 * @param row the row
+	 * @param column the column
+	 * @param object the object to be transformed
+	 * @param sequence the sequence
+	 */
+	def <S, T> void fillIterable(
+		TableRow row,
+		ColumnDescriptor column,
+		S object,
+		(S)=>Iterable<String> sequence
+	) {
+		row.
+			fillIterableWithSeparatorConditional(column, object, [true],
+				sequence, null, [it], [], ITERABLE_FILLING_SEPARATOR, true)
+	}
+
 	/**
 	 * Fill a row with a sequence of string values and handle exceptions.
 	 * 
@@ -380,7 +401,7 @@ abstract class AbstractTableModelTransformator<T> implements TableModelTransform
 		String separator
 	) {
 		row.fillIterableWithSeparatorConditional(column, object, [true],
-			sequence, comparator, elementFilling, [], separator)
+			sequence, comparator, elementFilling, [], separator, false)
 	}
 
 	/**
@@ -432,7 +453,7 @@ abstract class AbstractTableModelTransformator<T> implements TableModelTransform
 		String separator
 	) {
 		row.fillIterableWithSeparatorConditional(column, object, condition,
-			sequenceIfTrue, comparator, [it], fillingIfFalse, separator)
+			sequenceIfTrue, comparator, [it], fillingIfFalse, separator, false)
 	}
 
 	/**
@@ -459,13 +480,17 @@ abstract class AbstractTableModelTransformator<T> implements TableModelTransform
 		Comparator<T> comparator,
 		(T)=>String elementFilling,
 		(S)=>String fillingIfFalse,
-		String separator
+		String separator,
+		boolean disableSorting
 	) {
 		try {
 			if (condition.apply(object).booleanValue) {
-				val list = sequenceIfTrue.apply(object).filterNull.sortWith(
-					comparator).map(elementFilling).filterNull
-				row.set(column, list, separator)
+				val list = sequenceIfTrue.apply(object).filterNull
+				val sortedList = disableSorting
+						? list
+						: list.sortWith(comparator)
+				val result = sortedList.map(elementFilling).filterNull
+				row.set(column, result, separator)
 			} else {
 				fill(row, column, object, fillingIfFalse)
 			}

java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/sorting/AbstractCellComparator.xtend

@@ -146,8 +146,8 @@ package abstract class AbstractCellComparator implements Comparator<TableCell> {
 
 	def int compareCell(Iterable<String> iterable1,
 		Iterable<String> iterable2) {
-		return iterable1.iterableToString("").compareCell(
-			iterable2.iterableToString(""))
+		return iterable1.iterableToString(" ").compareCell(
+			iterable2.iterableToString(" "))
 	}
 
 	def int compareCell(String first, String second) {