diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslz/SslzTransformator.xtend b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslz/SslzTransformator.xtend index a6cf4c100..0fde46e97 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslz/SslzTransformator.xtend +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslz/SslzTransformator.xtend @@ -63,6 +63,7 @@ import static extension org.eclipse.set.ppmodel.extensions.SignalExtensions.* import static extension org.eclipse.set.ppmodel.extensions.SignalRahmenExtensions.* import static extension org.eclipse.set.ppmodel.extensions.SignalbegriffExtensions.* import static extension org.eclipse.set.ppmodel.extensions.utils.Debug.* +import java.util.Comparator /** * Table transformation for a Zugstraßentabelle (SSLZ). @@ -97,7 +98,7 @@ class SslzTransformator extends AbstractPlanPro2TableModelTransformator { return null } val instance = factory.newTableRow(fstrZugRangier) - val nextBlockFstr = fstrZugRangier.nextBlockFstrZugRangier + val nextBlockFstr = fstrZugRangier.recursiveNextBlockFstrZugRangier // A: Sslz.Grundsatzangaben.Bezeichnung fill( @@ -113,13 +114,11 @@ class SslzTransformator extends AbstractPlanPro2TableModelTransformator { ]) // C: Sslz.Grundsatzangaben.Fahrweg.Ziel - fillConditional( + fillIterable( instance, cols.getColumn(Ziel), fstrZugRangier, - [nextBlockFstr.nullOrEmpty], - [fahrwegZiel], - [fahrwegZielBlock(nextBlockFstr)] + [followBlocks([fahrwegZiel], nextBlockFstr)] ) // D: Sslz.Grundsatzangaben.Fahrweg.Nummer @@ -159,27 +158,30 @@ class SslzTransformator extends AbstractPlanPro2TableModelTransformator { ]) // G: Sslz.Grundsatzangaben.Art - fill( + fillIterable( instance, cols.getColumn(Art), fstrZugRangier, - [fstrZugArt] + [followBlocks([fstrZugArt], nextBlockFstr)] ) // H: Sslz.Einstellung.Autom_Einstellung - fill(instance, cols.getColumn(Autom_Einstellung), fstrZugRangier, [ - fstrZugRangier?.fstrZug?.automatischeEinstellung?. - translate ?: "" - ]) + fillIterable(instance, cols.getColumn(Autom_Einstellung), + fstrZugRangier, [ + followBlocks([ + fstrZug?.automatischeEinstellung?.translate ?: "" + ], nextBlockFstr) + ]) // I: Sslz.Einstellung.F_Bedienung - fill( + fillIterable( instance, cols.getColumn(F_Bedienung), fstrZugRangier, [ - fstrZugRangier?.fstrZugRangierAllg?.FBedienung?.wert?. - translate ?: "" + followBlocks([ + fstrZugRangierAllg?.FBedienung?.wert?.translate ?: "" + ], nextBlockFstr) ] ) @@ -187,10 +189,13 @@ class SslzTransformator extends AbstractPlanPro2TableModelTransformator { fillIterable( instance, cols.getColumn(Inselgleis), - fstrZugRangier?.fstrFahrweg?.zielSignal?. - zgFahrtGleichzeitigVerbot ?: Collections.emptySet, - [fillInselgleis], - MIXED_STRING_COMPARATOR + fstrZugRangier, + [ + followBlocksIterable([ + fstrFahrweg?.zielSignal?.zgFahrtGleichzeitigVerbot?. + fillInselgleis + ], nextBlockFstr) + ] ) // K: Sslz.Abhaengigkeiten.Ueberwachte_Ssp @@ -199,11 +204,13 @@ class SslzTransformator extends AbstractPlanPro2TableModelTransformator { cols.getColumn(Ueberwachte_Ssp), fstrZugRangier, [ - fstrFahrweg?.abhaengigkeiten?.map [ - schluesselsperre?.bezeichnung?.bezeichnungTabelle?.wert - ] - ], - MIXED_STRING_COMPARATOR + followBlocksIterable([ + fstrFahrweg?.abhaengigkeiten?.map [ + schluesselsperre?.bezeichnung?.bezeichnungTabelle?. + wert + ] + ], nextBlockFstr) + ] ) if (logger.debugEnabled) { @@ -217,16 +224,19 @@ class SslzTransformator extends AbstractPlanPro2TableModelTransformator { cols.getColumn(Abhaengiger_BUe), fstrZugRangier, [ - (fstrFahrweg.BUes + fstrZugRangier.BUesImGefahrraum).filter [ - !#{ - ENUMBUE_SICHERUNGSART_P, - ENUMBUE_SICHERUNGSART_PUND_LF, - ENUMBUE_SICHERUNGSART_UE, - ENUMBUE_SICHERUNGSART_UE_UND_P - }.contains(BUEAnlageAllg?.BUESicherungsart?.wert) - ].toSet.map[bezeichnung?.bezeichnungTabelle?.wert] - ], - MIXED_STRING_COMPARATOR + followBlocksIterable([ + (fstrFahrweg.BUes + BUesImGefahrraum). + filter [ + !#{ + ENUMBUE_SICHERUNGSART_P, + ENUMBUE_SICHERUNGSART_PUND_LF, + ENUMBUE_SICHERUNGSART_UE, + ENUMBUE_SICHERUNGSART_UE_UND_P + }.contains( + BUEAnlageAllg?.BUESicherungsart?.wert) + ].toSet.map[bezeichnung?.bezeichnungTabelle?.wert] + ], nextBlockFstr) + ] ) // M: Sslz.Abhaengigkeiten.Nichthaltfallabschnitt @@ -235,23 +245,26 @@ class SslzTransformator extends AbstractPlanPro2TableModelTransformator { cols.getColumn(Nichthaltfallabschnitt), fstrZugRangier, [ - fstrNichthaltfall.map [ - fmaAnlage?.IDGleisAbschnitt?.value?.bezeichnung?. - bezeichnungTabelle?.wert - ] - ], - MIXED_STRING_COMPARATOR + followBlocksIterable([ + fstrNichthaltfall.map [ + fmaAnlage?.IDGleisAbschnitt?.value?.bezeichnung?. + bezeichnungTabelle?.wert + ] + ], nextBlockFstr) + ] ) // N: Sslz.Abhaengigkeiten.Zweites_Haltfallkrit - fill( + fillIterable( instance, cols.getColumn(Zweites_Haltfallkrit), fstrZugRangier, [ - (fstrFahrweg?.start?.zweitesHaltfallkriterium?. - schalter as Zugeinwirkung)?.bezeichnung?. - bezeichnungTabelle?.wert + followBlocks([ + (fstrFahrweg?.start?.zweitesHaltfallkriterium?. + schalter as Zugeinwirkung)?.bezeichnung?. + bezeichnungTabelle?.wert + ], nextBlockFstr) ] ) @@ -259,68 +272,91 @@ class SslzTransformator extends AbstractPlanPro2TableModelTransformator { val schaltmittel = new Wrapper> val gleisabschnitte = new Wrapper> val zugeinwirkungen = new Wrapper> - fillSwitch( + fillIterable( instance, cols.getColumn(Anrueckverschluss), fstrZugRangier, - new Case( - [ - schaltmittel.value = fstrFahrweg?.start?. - anrueckverschluss?.map[schalter]?.toSet ?: - Collections.emptySet - gleisabschnitte.value = schaltmittel.value.filter( - FMA_Anlage).map[IDGleisAbschnitt?.value]. - filterNull.toSet - !gleisabschnitte.value.empty - ], - [ - gleisabschnitte.value.map [ - bezeichnung?.bezeichnungTabelle?.wert - ].filterNull - ], - ITERABLE_FILLING_SEPARATOR, - MIXED_STRING_COMPARATOR - ), - new Case( - [ - zugeinwirkungen.value = schaltmittel.value.filter( - Zugeinwirkung).map [ - bezeichnung?.bezeichnungTabelle?.wert - ].toSet - !zugeinwirkungen.value.empty - ], - [ - zugeinwirkungen.value - ], - ITERABLE_FILLING_SEPARATOR, - MIXED_STRING_COMPARATOR - ) + [ + followBlocks([ b | + val switchCase = b.getSwitchCase( + new Case( + [ + schaltmittel.value = fstrFahrweg?.start?. + anrueckverschluss?.map[schalter]?. + toSet ?: Collections.emptySet + gleisabschnitte.value = schaltmittel.value. + filter(FMA_Anlage).map [ + IDGleisAbschnitt?.value + ].filterNull.toSet + !gleisabschnitte.value.empty + ], + [ + gleisabschnitte.value.map [ + bezeichnung?.bezeichnungTabelle?.wert + ].filterNull + ], + ", ", + MIXED_STRING_COMPARATOR + ), + new Case( + [ + zugeinwirkungen.value = schaltmittel.value. + filter(Zugeinwirkung).map [ + bezeichnung?.bezeichnungTabelle?. + wert + ].toSet + !zugeinwirkungen.value.empty + ], + [ + zugeinwirkungen.value + ], + ", ", + MIXED_STRING_COMPARATOR + ) + ) + val content = switchCase?.filling?.apply(b) + return content?.filterNull?.sortWith( + switchCase?.comparator)?.join( + switchCase?.seperator === null + ? ITERABLE_FILLING_SEPARATOR + : switchCase.seperator) + ], nextBlockFstr) + ] ) // P: Sslz.Signalisierung.Geschwindigkeit_Startsignal.Hg - fill(instance, cols.getColumn(Hg), fstrZugRangier, [ - fstrZugRangier?.fstrFahrweg?.fstrVHg?.wert?.toString + fillIterable(instance, cols.getColumn(Hg), fstrZugRangier, [ + followBlocks([ + fstrFahrweg?.fstrVHg?.wert?.toString + ], nextBlockFstr) ]) // Q: Sslz.Signalisierung.Geschwindigkeit_Startsignal.Fahrweg - fill( + fillIterable( instance, cols.getColumn(Fahrweg), fstrZugRangier, [ - fstrZugRangier.geschwindigkeit.orElse(null)?.toString ?: "" + followBlocks([ + geschwindigkeit.orElse(null)?.toString ?: + "" + ], nextBlockFstr) ] ) // R: Sslz.Signalisierung.Geschwindigkeit_Startsignal.DWeg - fill(instance, cols.getColumn(DWeg), fstrZugRangier, [ - fstrZugRangier?.fstrDWeg?.fstrDWegSpezifisch?.DWegV?.wert?. - toString + fillIterable(instance, cols.getColumn(DWeg), fstrZugRangier, [ + followBlocks([ + fstrDWeg?.fstrDWegSpezifisch?.DWegV?.wert?. + toString + ], nextBlockFstr) ]) // S: Sslz.Signalisierung.Geschwindigkeit_Startsignal.Besonders - fill(instance, cols.getColumn(Besonders), fstrZugRangier, [ - fstrZugRangier?.fstrZugRangierAllg?.fstrV?.wert?.toString + fillIterable(instance, cols.getColumn(Besonders), fstrZugRangier, [ + followBlocks([ + fstrZugRangierAllg?.fstrV?.wert?.toString + ], nextBlockFstr) ]) // T: Sslz.Signalisierung.Geschwindigkeit_Startsignal.Zs3 @@ -328,35 +364,40 @@ class SslzTransformator extends AbstractPlanPro2TableModelTransformator { instance, cols.getColumn(Geschwindigkeit_Startsignal_Zs3), fstrZugRangier, - [signalBegriffZs3ByStartSignal], - SIGNALBEGRIFF_COMPARATOR + [ + followBlocksIterable([signalBegriffZs3ByStartSignal], + nextBlockFstr, SIGNALBEGRIFF_COMPARATOR, ", ") + ] ) // U: Sslz.Signalisierung.Geschwindigkeit_Startsignal.Aufwertung_Mwtfstr - fill( + fillIterable( instance, cols.getColumn(Aufwertung_Mwtfstr), fstrZugRangier, [ - fstrZugRangier?.fstrMittel?.fstrMittelVAufwertung?.wert?. - translate ?: "" + followBlocks([ + fstrMittel?.fstrMittelVAufwertung?. + wert?.translate ?: "" + ], nextBlockFstr) ] ) // V: Sslz.Signalisierung.Sonstiges_Startsignal.Zusatzlicht - fillConditional( + fillIterable( instance, cols.getColumn(Zusatzlicht), fstrZugRangier, - [ r | - r.fstrFahrweg.start.signalbegriffe.exists [ - hasSignalbegriffID(typeof(ZlO)) && - r.fstrSignalisierung.map [ - signalSignalbegriff - ].toList.contains(it) - ] - ], - ["x"] + [ + followBlocks([ fstr | + fstr.fstrFahrweg.start.signalbegriffe.exists [ + hasSignalbegriffID(typeof(ZlO)) && + fstr.fstrSignalisierung.map [ + signalSignalbegriff + ].toList.contains(it) + ] ? "x" : null + ], nextBlockFstr) + ] ) // W: Sslz.Signalisierung.Sonstiges_Startsignal.Zs3v @@ -365,11 +406,11 @@ class SslzTransformator extends AbstractPlanPro2TableModelTransformator { cols.getColumn(Zs3v), fstrZugRangier, [ - - getRelevantSignalBegriffAtSignal(fstrFahrweg.start, - typeof(Zs3v)).map[signalBegriffSymbol] - ], - SIGNALBEGRIFF_COMPARATOR + followBlocksIterable([ + getRelevantSignalBegriffAtSignal(fstrFahrweg.start, + typeof(Zs3v)).map[signalBegriffSymbol] + ], nextBlockFstr, SIGNALBEGRIFF_COMPARATOR, ", ") + ] ) // X: Sslz.Signalisierung.Sonstiges_Startsignal.Zs2 @@ -378,9 +419,11 @@ class SslzTransformator extends AbstractPlanPro2TableModelTransformator { cols.getColumn(Zs2), fstrZugRangier, [ - fstrSignalisierung.getFstrSignalisierungSymbol(typeof(Zs2)) - ], - SIGNALBEGRIFF_COMPARATOR + followBlocksIterable([ + fstrSignalisierung. + getFstrSignalisierungSymbol(typeof(Zs2)) + ], nextBlockFstr, SIGNALBEGRIFF_COMPARATOR, ", ") + ] ) // Y: Sslz.Signalisierung.Sonstiges_Startsignal.Zs2v* @@ -389,47 +432,53 @@ class SslzTransformator extends AbstractPlanPro2TableModelTransformator { cols.getColumn(Zs2v), fstrZugRangier, [ - getRelevantSignalBegriffAtSignal(fstrFahrweg.start, - typeof(Zs2v)).map [ - signalbegriffID.symbol - ] - ], - SIGNALBEGRIFF_COMPARATOR + followBlocksIterable([ + getRelevantSignalBegriffAtSignal(fstrFahrweg.start, + typeof(Zs2v)).map [ + signalbegriffID.symbol + ] + ], nextBlockFstr, SIGNALBEGRIFF_COMPARATOR, ", ") + ] ) // Z: Sslz.Signalisierung.Sonstiges_Startsignal.Zs6 - fillConditional( + fillIterable( instance, cols.getColumn(Sonstiges_Startsignal_Zs6), fstrZugRangier, [ - fstrFahrweg.start.signalbegriffe.exists [ - hasSignalbegriffID(typeof(Zs6)) - ] - ], - [ - val zs6Begriffes = fstrFahrweg.start.signalbegriffe.filter [ - hasSignalbegriffID(typeof(Zs6)) - ] - fstrSignalisierung.map[signalSignalbegriff].exists [ - zs6Begriffes.contains(it) - ].translate + followBlocks([ + if (fstrFahrweg.start.signalbegriffe.exists [ + hasSignalbegriffID(typeof(Zs6)) + ]) { + val zs6Begriffes = fstrFahrweg.start.signalbegriffe. + filter [ + hasSignalbegriffID(typeof(Zs6)) + ] + fstrSignalisierung.map[signalSignalbegriff].exists [ + zs6Begriffes.contains(it) + ].translate + } else { + return null + } + ], nextBlockFstr) ] ) // AA: Sslz.Signalisierung.Sonstiges_Startsignal.Zs13 - fillConditional( + fillIterable( instance, cols.getColumn(Zs13), fstrZugRangier, [ - fstrSignalisierung.map [ - signalSignalbegriff - ].exists [ - signalbegriffID instanceof Zs13 - ] - ], - ["x"] + followBlocks([ + fstrSignalisierung.map [ + signalSignalbegriff + ].exists [ + signalbegriffID instanceof Zs13 + ] ? "x" : null + ], nextBlockFstr) + ] ) // AB: Sslz.Signalisierung.Im_Fahrweg.Zs3 @@ -438,26 +487,25 @@ class SslzTransformator extends AbstractPlanPro2TableModelTransformator { cols.getColumn(Im_Fahrweg_Zs3), fstrZugRangier, [ - val zs3NichtStartZiel = fstrZugRangier.fstrSignalisierung. - filter [ - signalSignalbegriff !== null && - signalSignalbegriff. - hasSignalbegriffID(typeof(Zs3)) && - signalSignalbegriff.signalRahmen.signal !== - fstrZugRangier.fstrFahrweg.start && - signalSignalbegriff.signalRahmen.signal !== - fstrZugRangier.fstrFahrweg.zielSignal - ].sortBy [ - signalSignalbegriff?.signalbegriffID?.symbol - ] - zs3NichtStartZiel.map [ - '''«signalSignalbegriff?.signalRahmen?.signal?.bezeichnung?.bezeichnungTabelle?.wert»« + followBlocksIterable([ fstr | + val zs3NichtStartZiel = + fstr.fstrSignalisierung.filter [ + signalSignalbegriff !== null && + signalSignalbegriff. + hasSignalbegriffID(typeof(Zs3)) && + signalSignalbegriff.signalRahmen.signal !== + fstr.fstrFahrweg.start && + signalSignalbegriff.signalRahmen.signal !== + fstr.fstrFahrweg.zielSignal + ].sortBy [ + signalSignalbegriff?.signalbegriffID?.symbol + ] + zs3NichtStartZiel.map [ + '''«signalSignalbegriff?.signalRahmen?.signal?.bezeichnung?.bezeichnungTabelle?.wert»« »(«signalSignalbegriff?.signalBegriffSymbol»)''' - ] - ], - null, - [it], - ITERABLE_FILLING_SEPARATOR + ] + ], nextBlockFstr, null, ", ") + ] ) // Analysis: Sslz.Signalisierung.Im_Fahrweg.Zs6 @@ -472,18 +520,20 @@ class SslzTransformator extends AbstractPlanPro2TableModelTransformator { } } // AC: Sslz.Signalisierung.Im_Fahrweg.Zs6 - fill( + fillIterable( instance, cols.getColumn(Im_Fahrweg_Zs6), fstrZugRangier, [ - fstrFahrweg.signalbegriffeImFahrweg.findFirst [ b1 | - b1.hasSignalbegriffID(typeof(Zs6)) && - fstrZugRangier.fstrSignalisierung.exists [ b2 | - b2.signalSignalbegriff === b1 - ] - ]?.signalRahmen?.signal?.bezeichnung?. - bezeichnungTabelle?.wert + followBlocks([ + fstrFahrweg.signalbegriffeImFahrweg.findFirst [ b1 | + b1.hasSignalbegriffID(typeof(Zs6)) && + fstrSignalisierung.exists [ b2 | + b2.signalSignalbegriff === b1 + ] + ]?.signalRahmen?.signal?.bezeichnung?. + bezeichnungTabelle?.wert + ], nextBlockFstr) ] ) @@ -493,12 +543,14 @@ class SslzTransformator extends AbstractPlanPro2TableModelTransformator { cols.getColumn(Kennlicht), fstrZugRangier, [ - fstrSignalisierung.getSignalberiffsWithType(typeof(Kl)).map [ - signalRahmen.signal?.bezeichnung?. - bezeichnungTabelle?.wert - ] - ], - MIXED_STRING_COMPARATOR + followBlocksIterable([ + fstrSignalisierung.getSignalberiffsWithType(typeof(Kl)). + map [ + signalRahmen.signal?.bezeichnung?. + bezeichnungTabelle?.wert + ] + ], nextBlockFstr) + ] ) // AE: Sslz.Signalisierung.Im_Fahrweg.Vorsignalisierung @@ -507,42 +559,58 @@ class SslzTransformator extends AbstractPlanPro2TableModelTransformator { cols.getColumn(Vorsignalisierung), fstrZugRangier, [ - vorsignalisierung.map [ vorsignal | - getVorsignalBezeichnung(vorsignal) - ] - ], - MIXED_STRING_COMPARATOR + followBlocksIterable([ + vorsignalisierung.map [ vorsignal | + getVorsignalBezeichnung(vorsignal) + ] + ], nextBlockFstr) + ] ) // AF: Sslz.Bemerkung - fillSwitch( + fillIterable( instance, cols.getColumn(Bemerkung), fstrZugRangier, - new Case([ - fstrZugRangier.container.fstrAbhaengigkeit.map [ - IDBedienAnzeigeElement?.value?.bedienAnzeigeElementAllg - ].filterNull.findFirst [ - it?.taste !== null || it?.schalter !== null - ] !== null - ], [ - val bedAnzeigeElemente = fstrFahrweg?.abhaengigkeiten?.map [ - bedienAnzeigeElement - ]?.filterNull ?: Collections.emptyList - - '''«FOR bae : bedAnzeigeElemente»«bae.comment[translate]»«bae» «ENDFOR»'''. - toString.trim - ]), - new Case([ - !IDFstrAusschlussBesonders.empty - ], [ - val fstrAusschlussBesonders = IDFstrAusschlussBesonders.map [ - value?.getZugFstrBezeichnung([art|isZ(art)]) - ] - - '''«FOR fstr : fstrAusschlussBesonders»«fstr» «ENDFOR»'''. - toString.trim - ]) + [ + followBlocks([ fstr | + val switchCase = fstr.getSwitchCase( + new Case([ + it.container.fstrAbhaengigkeit.map [ + IDBedienAnzeigeElement?.value?. + bedienAnzeigeElementAllg + ].filterNull.findFirst [ + it?.taste !== null || it?.schalter !== null + ] !== null + ], [ + val bedAnzeigeElemente = fstrFahrweg?. + abhaengigkeiten?.map [ + bedienAnzeigeElement + ]?.filterNull ?: Collections.emptyList + + '''«FOR bae : bedAnzeigeElemente»«bae.comment[translate]»«bae» «ENDFOR»'''. + toString.trim + ]), new Case([ + !IDFstrAusschlussBesonders.empty + ], [ + val fstrAusschlussBesonders = IDFstrAusschlussBesonders. + map [ + value?.getZugFstrBezeichnung([ art | + isZ(art) + ]) + ] + + '''«FOR s : fstrAusschlussBesonders»«s» «ENDFOR»'''. + toString.trim + ])) + val content = switchCase?.filling?.apply(fstr) + return content?.filterNull?.sortWith( + switchCase?.comparator)?.join( + switchCase?.seperator === null + ? ITERABLE_FILLING_SEPARATOR + : switchCase.seperator) + ], nextBlockFstr) + ] ) fillFootnotes(instance, fstrZugRangier) @@ -583,17 +651,35 @@ class SslzTransformator extends AbstractPlanPro2TableModelTransformator { bezeichnungTabelle?.wert } - private def String fahrwegZielBlock( - Fstr_Zug_Rangier fstrZugRangier, - Iterable nextBlockFstr - ) { - val ziel = fstrZugRangier?.IDFstrFahrweg?.value?.IDZiel?.value as Signal - val blockSignale = nextBlockFstr.map [ - (IDFstrFahrweg?.value?.IDZiel?.value as Signal)?.bezeichnung?. - bezeichnungTabelle?.wert - ].filterNull.join(" ") + private def followBlocks(Fstr_Zug_Rangier fstrZugRangier, + (Fstr_Zug_Rangier)=>String fn, + Iterable nextBlockFstr) { + val rootContent = fn.apply(fstrZugRangier) + val blockContent = nextBlockFstr.map [ + val content = fn.apply(it) + if (content === null || content.trim.length === 0) { + return null; + } + return '''[«content.trim»]''' + ].filterNull + val contentList = #[#[rootContent], blockContent].flatten.toList + return contentList + } + + private def followBlocksIterable(Fstr_Zug_Rangier fstrZugRangier, + (Fstr_Zug_Rangier)=>Iterable fn, + Iterable nextBlockFstr) { + return fstrZugRangier.followBlocksIterable(fn, nextBlockFstr, + MIXED_STRING_COMPARATOR, ", ") + } - return '''«ziel?.bezeichnung?.bezeichnungTabelle?.wert» [«blockSignale»]''' + private def followBlocksIterable(Fstr_Zug_Rangier fstrZugRangier, + (Fstr_Zug_Rangier)=>Iterable fn, + Iterable nextBlockFstr, Comparator comparator, + String separator) { + return fstrZugRangier.followBlocks([ + fn.apply(it)?.filterNull?.sortWith(comparator)?.join(separator) + ], nextBlockFstr) } private def String fahrwegNummer( diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/pdf/content.xsl b/java/bundles/org.eclipse.set.feature/rootdir/data/export/pdf/content.xsl index 583c02043..5964d7fec 100644 --- a/java/bundles/org.eclipse.set.feature/rootdir/data/export/pdf/content.xsl +++ b/java/bundles/org.eclipse.set.feature/rootdir/data/export/pdf/content.xsl @@ -15,8 +15,9 @@ + + match="StringContent[contains(.,'□')]"> @@ -92,7 +93,8 @@ - + + @@ -126,7 +128,8 @@ - + + diff --git a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/FstrZugRangierExtensions.xtend b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/FstrZugRangierExtensions.xtend index f45b9a92b..c10c22736 100644 --- a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/FstrZugRangierExtensions.xtend +++ b/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 getRecursiveNextBlockFstrZugRangier( + Fstr_Zug_Rangier it) { + val it = new Iterator() { + 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 */ diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A Linksdorf/sslz_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A Linksdorf/sslz_reference.csv index 3ad915754..de946de3f 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A Linksdorf/sslz_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A Linksdorf/sslz_reference.csv @@ -1,6 +1,6 @@ -Row;A;B;C;D;E;F;G;H;I;J;K;L;M;N;O;P;Q;R;S;T;U;V;W;X;Y;Z;AA;AB;AC;AD;AE;AF -;Grundsatzangaben;Grundsatzangaben;Grundsatzangaben;Grundsatzangaben;Grundsatzangaben;Grundsatzangaben;Grundsatzangaben;Einstellung​​​​​​​;Einstellung​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​ -;Bezeichnung;Fahrweg​;Fahrweg​;Fahrweg​;Fahrweg​;D-Weg​​​​​;Art​​​​​​;Einstellung​​​​​​​;Einstellung​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Geschwindigkeit am Startsignal​​​​​​​​​​​​​​​;Geschwindigkeit am Startsignal​​​​​​​​​​​​​​​;Geschwindigkeit am Startsignal​​​​​​​​​​​​​​​;Geschwindigkeit am Startsignal​​​​​​​​​​​​​​​;Geschwindigkeit am Startsignal​​​​​​​​​​​​​​​;Geschwindigkeit am Startsignal​​​​​​​​​​​​​​​;Sonstiges am Startsignal​​​​​​​​​​​​​​​​​​​​​;Sonstiges am Startsignal​​​​​​​​​​​​​​​​​​​​​;Sonstiges am Startsignal​​​​​​​​​​​​​​​​​​​​​;Sonstiges am Startsignal​​​​​​​​​​​​​​​​​​​​​;Sonstiges am Startsignal​​​​​​​​​​​​​​​​​​​​​;Sonstiges am Startsignal​​​​​​​​​​​​​​​​​​​​​;Im Fahrweg​​​​​​​​​​​​​​​​​​​​​​​​​​​;Im Fahrweg​​​​​​​​​​​​​​​​​​​​​​​​​​​;Im Fahrweg​​​​​​​​​​​​​​​​​​​​​​​​​​​;Im Fahrweg​​​​​​​​​​​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​ +Row;A;B;C;D;E;F;G;H;I;J;K;L;M;N;O;P;Q;R;S;T;U;V;W;X;Y;Z;AA;AB;AC;AD;AE;AF +;Grundsatzangaben;Grundsatzangaben;Grundsatzangaben;Grundsatzangaben;Grundsatzangaben;Grundsatzangaben;Grundsatzangaben;Einstellung​​​​​​​;Einstellung​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​ +;Bezeichnung;Fahrweg​;Fahrweg​;Fahrweg​;Fahrweg​;D-Weg​​​​​;Art​​​​​​;Einstellung​​​​​​​;Einstellung​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Abhängigkeiten​​​​​​​​​;Geschwindigkeit am Startsignal​​​​​​​​​​​​​​​;Geschwindigkeit am Startsignal​​​​​​​​​​​​​​​;Geschwindigkeit am Startsignal​​​​​​​​​​​​​​​;Geschwindigkeit am Startsignal​​​​​​​​​​​​​​​;Geschwindigkeit am Startsignal​​​​​​​​​​​​​​​;Geschwindigkeit am Startsignal​​​​​​​​​​​​​​​;Sonstiges am Startsignal​​​​​​​​​​​​​​​​​​​​​;Sonstiges am Startsignal​​​​​​​​​​​​​​​​​​​​​;Sonstiges am Startsignal​​​​​​​​​​​​​​​​​​​​​;Sonstiges am Startsignal​​​​​​​​​​​​​​​​​​​​​;Sonstiges am Startsignal​​​​​​​​​​​​​​​​​​​​​;Sonstiges am Startsignal​​​​​​​​​​​​​​​​​​​​​;Im Fahrweg​​​​​​​​​​​​​​​​​​​​​​​​​​​;Im Fahrweg​​​​​​​​​​​​​​​​​​​​​​​​​​​;Im Fahrweg​​​​​​​​​​​​​​​​​​​​​​​​​​​;Im Fahrweg​​​​​​​​​​​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​ ;Bezeichnung;Start​;Ziel​​;Nr.​​​;"Entscheidungs- weiche mit Stellung​​​​";"Bezeich- @@ -17,18 +17,14 @@ weg​​​​​​​​​​​​​​​​";D-Weg​​​​​​​ ders​​​​​​​​​​​​​​​​​​";"Zs 3 (Zs 3 Ziel)​​​​​​​​​​​​​​​​​​​";"Aufwertung bei Mwtfstr​​​​​​​​​​​​​​​​​​​​";Zl​​​​​​​​​​​​​​​​​​​​​;Zs 3v​​​​​​​​​​​​​​​​​​​​​​;Zs 2​​​​​​​​​​​​​​​​​​​​​​​;Zs 2v​​​​​​​​​​​​​​​​​​​​​​​​;Zs 6​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 13​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 3​​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 6​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Kennlicht an​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;"Vorsigna- -lisierung Ziel​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​ -;;;;;;;;;;;;;;;;km/h;km/h;km/h;km/h;;;;;;;;;;;;; -1;"

59111/​60A

";"

59111

";"

60A

";"

";"

";"

";"

Z

";"

";"

□

";"

";"

";"

";"

";"

";"

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWa -

60Va

";"

" -2;"

60A/​60ZR1 ​(D1)​

";"

60A

";"

60ZR1

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

120

";"

160

";"

";"

";"

";"

";"

4 -

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -3;"

60A/​60ZR2 ​(D1)​

";"

60A

";"

60ZR2

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

160

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -4;"

60A/​60ZR2 ​(D2)​

";"

60A

";"

60ZR2

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

160

";"

";"

6

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -5;"

60A/​60ZR2 ​(D3)​

";"

60A

";"

60ZR2

";"

";"

";"

D3*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -6;"

60A/​60ZR3 ​(D1)​

";"

60A

";"

60ZR3

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -7;"

60A/​60ZR3 ​(D2)​

";"

60A

";"

60ZR3

";"

";"

";"

D2*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -8;"

60A/​60ZR4 ​(D1)​

";"

60A

";"

60ZR4

";"

";"

";"

D1

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -9;"

60A/​60ZR4 ​(D2)​

";"

60A

";"

60ZR4

";"

";"

";"

D2*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +lisierung Ziel​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​ +;;;;;;;;;;;;;;;;km/h;km/h;km/h;km/h;;;;;;;;;;;;; +1;"

59111/​60A

";"

59111

";"

60A

";"

";"

";"

";"

Z

";"

";"

□

";"

";"

";"

";"

";"

";"

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWa, ​60Va

";"

" +2;"

60A/​60ZR1 ​(D1)​

";"

60A

";"

60ZR1

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

120

";"

160

";"

";"

";"

";"

";"

4, ​6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +3;"

60A/​60ZR2 ​(D1)​

";"

60A

";"

60ZR2

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

160

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +4;"

60A/​60ZR2 ​(D2)​

";"

60A

";"

60ZR2

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

160

";"

";"

6

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +5;"

60A/​60ZR2 ​(D3)​

";"

60A

";"

60ZR2

";"

";"

";"

D3*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +6;"

60A/​60ZR3 ​(D1)​

";"

60A

";"

60ZR3

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +7;"

60A/​60ZR3 ​(D2)​

";"

60A

";"

60ZR3

";"

";"

";"

D2*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +8;"

60A/​60ZR4 ​(D1)​

";"

60A

";"

60ZR4

";"

";"

";"

D1

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +9;"

60A/​60ZR4 ​(D2)​

";"

60A

";"

60ZR4

";"

";"

";"

D2*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/sslz_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/sslz_reference.csv index bd788e5dd..256e8d002 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/sslz_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/sslz_reference.csv @@ -19,39 +19,35 @@ ders​​​​​​​​​​​​​​​​​​";"Zs 3 bei Mwtfstr​​​​​​​​​​​​​​​​​​​​";Zl​​​​​​​​​​​​​​​​​​​​​;Zs 3v​​​​​​​​​​​​​​​​​​​​​​;Zs 2​​​​​​​​​​​​​​​​​​​​​​​;Zs 2v​​​​​​​​​​​​​​​​​​​​​​​​;Zs 6​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 13​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 3​​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 6​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Kennlicht an​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;"Vorsigna- lisierung Ziel​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​ ;;;;;;;;;;;;;;;;km/h;km/h;km/h;km/h;;;;;;;;;;;;; -1;"

60PMPH/​60AA

";"

60PMPH

";"

60AA

";"

";"

";"

";"

Z

";"

";"

□

";"

";"

";"

";"

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWaa -

60Vaa

";"

" -2;"

60A/​60ZR1 ​(D1)​

";"

60A

";"

60ZR1

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

120

";"

160

";"

";"

";"

";"

";"

4 -

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +1;"

60PMPH/​60AA

";"

60PMPH

";"

60AA

";"

";"

";"

";"

Z

";"

";"

□

";"

";"

";"

";"

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWaa, ​60Vaa

";"

" +2;"

60A/​60ZR1 ​(D1)​

";"

60A

";"

60ZR1

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

120

";"

160

";"

";"

";"

";"

";"

4, ​6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 3;"

60A/​60ZR2 ​(D1)​

";"

60A

";"

60ZR2

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

160

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -4;"

60A/​60ZR2 ​(D2)​

";"

60A

";"

60ZR2

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

160

";"

";"

6

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +4;"

60A/​60ZR2 ​(D2)​

";"

60A

";"

60ZR2

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

160

";"

";"

6

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 5;"

60A/​60ZR2 ​(D3)​

";"

60A

";"

60ZR2

";"

";"

";"

D3*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -6;"

60A/​60ZR3 ​(D1)​

";"

60A

";"

60ZR3

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +6;"

60A/​60ZR3 ​(D1)​

";"

60A

";"

60ZR3

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 7;"

60A/​60ZR3 ​(D2)​

";"

60A

";"

60ZR3

";"

";"

";"

D2*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 8;"

60A/​60ZR4 ​(D1)​

";"

60A

";"

60ZR4

";"

";"

";"

D1

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 9;"

60A/​60ZR4 ​(D2)​

";"

60A

";"

60ZR4

";"

";"

";"

D2*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -10;"

60AA/​60ZR2 ​(D1)​

";"

60AA

";"

60ZR2

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

160

";"

";"

4

";"

";"

";"

4 -

5 -

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -11;"

60AA/​60ZR2 ​(D2)​

";"

60AA

";"

60ZR2

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

160

";"

";"

4

";"

";"

";"

4 -

5 -

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -12;"

60AA/​60ZR2 ​(D3)​

";"

60AA

";"

60ZR2

";"

";"

";"

D3

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

40

";"

";"

4

";"

";"

";"

4 -

5 -

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -13;"

60AA/​60ZR3 ​(D1)​

";"

60AA

";"

60ZR3

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -14;"

60AA/​60ZR3 ​(D2)​

";"

60AA

";"

60ZR3

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +10;"

60AA/​60ZR2 ​(D1)​

";"

60AA

";"

60ZR2

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

160

";"

";"

4

";"

";"

";"

4, ​5, ​6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +11;"

60AA/​60ZR2 ​(D2)​

";"

60AA

";"

60ZR2

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

160

";"

";"

4

";"

";"

";"

4, ​5, ​6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +12;"

60AA/​60ZR2 ​(D3)​

";"

60AA

";"

60ZR2

";"

";"

";"

D3

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

40

";"

";"

4

";"

";"

";"

4, ​5, ​6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +13;"

60AA/​60ZR3 ​(D1)​

";"

60AA

";"

60ZR3

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +14;"

60AA/​60ZR3 ​(D2)​

";"

60AA

";"

60ZR3

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 15;"

60AA/​60ZR4 ​(D1)​

";"

60AA

";"

60ZR4

";"

";"

";"

D1*

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 16;"

60AA/​60ZR4 ​(D2)​

";"

60AA

";"

60ZR4

";"

";"

";"

D2

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 17;"

60P1/​60PHLIG

";"

60P1

";"

60PHLIG

";"

";"

";"

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G101

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

x

";"

";"

";"

";"

";"

";"

" -18;"

60P2/​60PHLI

";"

60P2

";"

60PHLI ​[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G202

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +18;"

60P2/​60PHLI

";"

60P2

";"

60PHLI +

[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□ +

[□]​

";"

";"

";"

60U1190

";"

60G202

";"

";"

";"

120 +

[120]​

";"

120 +

[120]​

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 19;"

60P2/​60PHLIG

";"

60P2

";"

60PHLIG

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G202

";"

";"

";"

120

";"

60

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

60Zp

";"

";"

";"

" 20;"

60P2/​60PHPM

";"

60P2

";"

60PHPM

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G202

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -21;"

60ZV4/​60PHLI

";"

60ZV4

";"

60PHLI ​[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W6

";"

";"

";"

120

";"

40

";"

";"

";"

4F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +21;"

60ZV4/​60PHLI

";"

60ZV4

";"

60PHLI +

[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□ +

[□]​

";"

";"

";"

60U1190

";"

60W6

";"

";"

";"

120 +

[120]​

";"

40 +

[120]​

";"

";"

";"

4F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 22;"

60ZV4/​60PHLIG

";"

60ZV4

";"

60PHLIG

";"

";"

";"

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W6

";"

";"

";"

120

";"

40

";"

";"

";"

4F

";"

";"

";"

";"

";"

";"

";"

";"

";"

60Zp

";"

60P13

";"

";"

" 23;"

60ZV4/​60PHPM

";"

60ZV4

";"

60PHPM

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60W6

";"

";"

";"

120

";"

40

";"

";"

";"

4F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 24;"

60ZR1/​60G220X

";"

60ZR1

";"

60G220X

";"

";"

";"

";"

R

";"

";"

x

";"

";"

";"

";"

";"

";"

";"

120

";"

50

";"

";"

";"

4

";"

";"

x

";"

";"

";"

";"

";"

x

";"

";"

";"

";"

";"

" @@ -89,12 +85,9 @@ lisierung Ziel​​​​​​​​​​​​​​​​​​​​​​ 56;"

60ZU22/​60ZV3 ​(D1)​

";"

60ZU22

";"

60ZV3

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60G122

";"

";"

";"

120

";"

50

";"

60

";"

";"

5

";"

";"

x

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 57;"

60ZU22/​60ZV4 ​(D1)​

";"

60ZU22

";"

60ZV4

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60W33

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

x

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 58;"

60N21/​60RE

";"

60N21

";"

60RE

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

";"

60G221

";"

";"

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -59;"

60F/​60ZU22 ​(D1)​

";"

60F

";"

60ZU22

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60G422

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

4 -

5 -

8

";"

";"

";"

";"

";"

";"

";"

";"

60VWzu22

";"

" +59;"

60F/​60ZU22 ​(D1)​

";"

60F

";"

60ZU22

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60G422

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

4, ​5, ​8

";"

";"

";"

";"

";"

";"

";"

";"

60VWzu22

";"

" 60;"

60F/​60ZU22 ​(D2)​

";"

60F

";"

60ZU22

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60G422

";"

";"

";"

120

";"

";"

60

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWzu22

";"

" -61;"

60FF/​60ZU21 ​(D1)​

";"

60FF

";"

60ZU21

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +61;"

60FF/​60ZU21 ​(D1)​

";"

60FF

";"

60ZU21

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 62;"

60FF/​60ZU21 ​(D2)​

";"

60FF

";"

60ZU21

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 63;"

60FF/​60ZU21 ​(D3)​

";"

60FF

";"

60ZU21

";"

";"

";"

D3*

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 64;"

60FF/​60ZU21 ​(D4)​

";"

60FF

";"

60ZU21

";"

";"

";"

D4

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" @@ -126,9 +119,17 @@ lisierung Ziel​​​​​​​​​​​​​​​​​​​​​​ 88;"

60ZR3/​60N21 ​(D1)​

";"

60ZR3

";"

60N21

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60W29

";"

";"

";"

50

";"

50

";"

160

";"

";"

5

";"

";"

x

";"

";"

R

";"

";"

";"

";"

";"

";"

";"

";"

" 89;"

60ZR3/​60N22 ​(D1)​

";"

60ZR3

";"

60N22

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60W29

";"

";"

";"

50

";"

50

";"

160

";"

";"

5

";"

";"

x

";"

";"

R

";"

";"

";"

";"

";"

";"

";"

";"

" 90;"

60ZR3/​60TR

";"

60ZR3

";"

60TR

";"

";"

";"

";"

R

";"

";"

x

";"

";"

";"

";"

60W29

";"

";"

";"

50

";"

50

";"

";"

";"

5

";"

";"

";"

";"

T

";"

";"

";"

";"

";"

";"

";"

";"

" -91;"

60ZV3/​60PHLI

";"

60ZV3

";"

60PHLI ​[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W5

";"

";"

";"

60

";"

60

";"

";"

";"

6F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +91;"

60ZV3/​60PHLI

";"

60ZV3

";"

60PHLI +

[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□ +

[□]​

";"

";"

";"

60U1190

";"

60W5

";"

";"

";"

60 +

[120]​

";"

60 +

[120]​

";"

";"

";"

6F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 92;"

60ZV3/​60PHLIG

";"

60ZV3

";"

60PHLIG

";"

";"

";"

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W5

";"

";"

";"

120

";"

60

";"

";"

";"

6F

";"

";"

";"

";"

";"

";"

";"

";"

";"

60Zp

";"

60P13

";"

";"

" 93;"

60ZV3/​60PHPM

";"

60ZV3

";"

60PHPM

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60W5

";"

";"

";"

120

";"

60

";"

";"

";"

6F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -94;"

60P13/​60PHLI

";"

60P13

";"

60PHLI ​[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W4

";"

";"

";"

60

";"

60

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +94;"

60P13/​60PHLI

";"

60P13

";"

60PHLI +

[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□ +

[□]​

";"

";"

";"

60U1190

";"

60W4

";"

";"

";"

60 +

[120]​

";"

60 +

[120]​

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 95;"

60P13/​60PHLIG

";"

60P13

";"

60PHLIG

";"

";"

";"

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W4

";"

";"

";"

60

";"

60

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

60Zp

";"

";"

";"

" 96;"

60P13/​60PHPM

";"

60P13

";"

60PHPM

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60W4

";"

";"

";"

120

";"

60

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/sslz_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/sslz_reference.csv index 99ed36423..cd020abe3 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/sslz_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/sslz_reference.csv @@ -19,41 +19,36 @@ ders​​​​​​​​​​​​​​​​​​";"Zs 3 bei Mwtfstr​​​​​​​​​​​​​​​​​​​​";Zl​​​​​​​​​​​​​​​​​​​​​;Zs 3v​​​​​​​​​​​​​​​​​​​​​​;Zs 2​​​​​​​​​​​​​​​​​​​​​​​;Zs 2v​​​​​​​​​​​​​​​​​​​​​​​​;Zs 6​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 13​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 3​​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 6​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Kennlicht an​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;"Vorsigna- lisierung Ziel​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​ ;;;;;;;;;;;;;;;;km/h;km/h;km/h;km/h;;;;;;;;;;;;; -1;"

59111/​60A

";"

59111

";"

60A

";"

";"

";"

";"

Z

";"

";"

□

";"

";"

";"

";"

";"

";"

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWa -

60Va

";"

" -2;"

60PMPH/​60AA

";"

60PMPH

";"

60AA

";"

";"

";"

";"

Z

";"

";"

□

";"

";"

";"

";"

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWaa -

60Vaa

";"

" -3;"

60A/​60ZR1 ​(D1)​

";"

60A

";"

60ZR1

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

120

";"

160

";"

";"

";"

";"

";"

4 -

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +1;"

59111/​60A

";"

59111

";"

60A

";"

";"

";"

";"

Z

";"

";"

□

";"

";"

";"

";"

";"

";"

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWa, ​60Va

";"

" +2;"

60PMPH/​60AA

";"

60PMPH

";"

60AA

";"

";"

";"

";"

Z

";"

";"

□

";"

";"

";"

";"

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWaa, ​60Vaa

";"

" +3;"

60A/​60ZR1 ​(D1)​

";"

60A

";"

60ZR1

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

120

";"

160

";"

";"

";"

";"

";"

4, ​6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 4;"

60A/​60ZR2 ​(D1)​

";"

60A

";"

60ZR2

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

160

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -5;"

60A/​60ZR2 ​(D2)​

";"

60A

";"

60ZR2

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

160

";"

";"

6

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +5;"

60A/​60ZR2 ​(D2)​

";"

60A

";"

60ZR2

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

160

";"

";"

6

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 6;"

60A/​60ZR2 ​(D3)​

";"

60A

";"

60ZR2

";"

";"

";"

D3*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -7;"

60A/​60ZR3 ​(D1)​

";"

60A

";"

60ZR3

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +7;"

60A/​60ZR3 ​(D1)​

";"

60A

";"

60ZR3

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 8;"

60A/​60ZR3 ​(D2)​

";"

60A

";"

60ZR3

";"

";"

";"

D2*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 9;"

60A/​60ZR4 ​(D1)​

";"

60A

";"

60ZR4

";"

";"

";"

D1

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 10;"

60A/​60ZR4 ​(D2)​

";"

60A

";"

60ZR4

";"

";"

";"

D2*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -11;"

60AA/​60ZR2 ​(D1)​

";"

60AA

";"

60ZR2

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

160

";"

";"

4

";"

";"

";"

4 -

5 -

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -12;"

60AA/​60ZR2 ​(D2)​

";"

60AA

";"

60ZR2

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

160

";"

";"

4

";"

";"

";"

4 -

5 -

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -13;"

60AA/​60ZR2 ​(D3)​

";"

60AA

";"

60ZR2

";"

";"

";"

D3

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

40

";"

";"

4

";"

";"

";"

4 -

5 -

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -14;"

60AA/​60ZR3 ​(D1)​

";"

60AA

";"

60ZR3

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -15;"

60AA/​60ZR3 ​(D2)​

";"

60AA

";"

60ZR3

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +11;"

60AA/​60ZR2 ​(D1)​

";"

60AA

";"

60ZR2

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

160

";"

";"

4

";"

";"

";"

4, ​5, ​6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +12;"

60AA/​60ZR2 ​(D2)​

";"

60AA

";"

60ZR2

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

160

";"

";"

4

";"

";"

";"

4, ​5, ​6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +13;"

60AA/​60ZR2 ​(D3)​

";"

60AA

";"

60ZR2

";"

";"

";"

D3

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

40

";"

";"

4

";"

";"

";"

4, ​5, ​6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +14;"

60AA/​60ZR3 ​(D1)​

";"

60AA

";"

60ZR3

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +15;"

60AA/​60ZR3 ​(D2)​

";"

60AA

";"

60ZR3

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 16;"

60AA/​60ZR4 ​(D1)​

";"

60AA

";"

60ZR4

";"

";"

";"

D1*

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 17;"

60AA/​60ZR4 ​(D2)​

";"

60AA

";"

60ZR4

";"

";"

";"

D2

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 18;"

60P1/​60PHLIG

";"

60P1

";"

60PHLIG

";"

";"

";"

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G101

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

x

";"

";"

";"

";"

";"

";"

" -19;"

60P2/​60PHLI

";"

60P2

";"

60PHLI ​[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G202

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +19;"

60P2/​60PHLI

";"

60P2

";"

60PHLI +

[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□ +

[□]​

";"

";"

";"

60U1190

";"

60G202

";"

";"

";"

120 +

[120]​

";"

120 +

[120]​

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 20;"

60P2/​60PHLIG

";"

60P2

";"

60PHLIG

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G202

";"

";"

";"

120

";"

60

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

60Zp

";"

";"

";"

" 21;"

60P2/​60PHPM

";"

60P2

";"

60PHPM

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G202

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -22;"

60ZV4/​60PHLI

";"

60ZV4

";"

60PHLI ​[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W6

";"

";"

";"

120

";"

40

";"

";"

";"

4F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +22;"

60ZV4/​60PHLI

";"

60ZV4

";"

60PHLI +

[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□ +

[□]​

";"

";"

";"

60U1190

";"

60W6

";"

";"

";"

120 +

[120]​

";"

40 +

[120]​

";"

";"

";"

4F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 23;"

60ZV4/​60PHLIG

";"

60ZV4

";"

60PHLIG

";"

";"

";"

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W6

";"

";"

";"

120

";"

40

";"

";"

";"

4F

";"

";"

";"

";"

";"

";"

";"

";"

";"

60Zp

";"

60P13

";"

";"

" 24;"

60ZV4/​60PHPM

";"

60ZV4

";"

60PHPM

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60W6

";"

";"

";"

120

";"

40

";"

";"

";"

4F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 25;"

60ZR1/​60G220X

";"

60ZR1

";"

60G220X

";"

";"

";"

";"

R

";"

";"

x

";"

";"

";"

";"

";"

";"

";"

120

";"

50

";"

";"

";"

4

";"

";"

x

";"

";"

";"

";"

";"

x

";"

";"

";"

";"

";"

" @@ -91,12 +86,9 @@ lisierung Ziel​​​​​​​​​​​​​​​​​​​​​​ 57;"

60ZU22/​60ZV3 ​(D1)​

";"

60ZU22

";"

60ZV3

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60G122

";"

";"

";"

120

";"

50

";"

60

";"

";"

5

";"

";"

x

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 58;"

60ZU22/​60ZV4 ​(D1)​

";"

60ZU22

";"

60ZV4

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60W33

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

x

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 59;"

60N21/​60RE

";"

60N21

";"

60RE

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

";"

60G221

";"

";"

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -60;"

60F/​60ZU22 ​(D1)​

";"

60F

";"

60ZU22

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60G422

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

4 -

5 -

8

";"

";"

";"

";"

";"

";"

";"

";"

60VWzu22

";"

" +60;"

60F/​60ZU22 ​(D1)​

";"

60F

";"

60ZU22

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60G422

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

4, ​5, ​8

";"

";"

";"

";"

";"

";"

";"

";"

60VWzu22

";"

" 61;"

60F/​60ZU22 ​(D2)​

";"

60F

";"

60ZU22

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60G422

";"

";"

";"

120

";"

";"

60

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWzu22

";"

" -62;"

60FF/​60ZU21 ​(D1)​

";"

60FF

";"

60ZU21

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +62;"

60FF/​60ZU21 ​(D1)​

";"

60FF

";"

60ZU21

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 63;"

60FF/​60ZU21 ​(D2)​

";"

60FF

";"

60ZU21

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 64;"

60FF/​60ZU21 ​(D3)​

";"

60FF

";"

60ZU21

";"

";"

";"

D3*

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 65;"

60FF/​60ZU21 ​(D4)​

";"

60FF

";"

60ZU21

";"

";"

";"

D4

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" @@ -128,9 +120,17 @@ lisierung Ziel​​​​​​​​​​​​​​​​​​​​​​ 89;"

60ZR3/​60N21 ​(D1)​

";"

60ZR3

";"

60N21

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60W29

";"

";"

";"

50

";"

50

";"

160

";"

";"

5

";"

";"

x

";"

";"

R

";"

";"

";"

";"

";"

";"

";"

";"

" 90;"

60ZR3/​60N22 ​(D1)​

";"

60ZR3

";"

60N22

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60W29

";"

";"

";"

50

";"

50

";"

160

";"

";"

5

";"

";"

x

";"

";"

R

";"

";"

";"

";"

";"

";"

";"

";"

" 91;"

60ZR3/​60TR

";"

60ZR3

";"

60TR

";"

";"

";"

";"

R

";"

";"

x

";"

";"

";"

";"

60W29

";"

";"

";"

50

";"

50

";"

";"

";"

5

";"

";"

";"

";"

T

";"

";"

";"

";"

";"

";"

";"

";"

" -92;"

60ZV3/​60PHLI

";"

60ZV3

";"

60PHLI ​[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W5

";"

";"

";"

60

";"

60

";"

";"

";"

6F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +92;"

60ZV3/​60PHLI

";"

60ZV3

";"

60PHLI +

[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□ +

[□]​

";"

";"

";"

60U1190

";"

60W5

";"

";"

";"

60 +

[120]​

";"

60 +

[120]​

";"

";"

";"

6F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 93;"

60ZV3/​60PHLIG

";"

60ZV3

";"

60PHLIG

";"

";"

";"

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W5

";"

";"

";"

120

";"

60

";"

";"

";"

6F

";"

";"

";"

";"

";"

";"

";"

";"

";"

60Zp

";"

60P13

";"

";"

" 94;"

60ZV3/​60PHPM

";"

60ZV3

";"

60PHPM

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60W5

";"

";"

";"

120

";"

60

";"

";"

";"

6F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -95;"

60P13/​60PHLI

";"

60P13

";"

60PHLI ​[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W4

";"

";"

";"

60

";"

60

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +95;"

60P13/​60PHLI

";"

60P13

";"

60PHLI +

[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□ +

[□]​

";"

";"

";"

60U1190

";"

60W4

";"

";"

";"

60 +

[120]​

";"

60 +

[120]​

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 96;"

60P13/​60PHLIG

";"

60P13

";"

60PHLIG

";"

";"

";"

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W4

";"

";"

";"

60

";"

60

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

60Zp

";"

";"

";"

" 97;"

60P13/​60PHPM

";"

60P13

";"

60PHPM

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60W4

";"

";"

";"

120

";"

60

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/finalState/sslz_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/finalState/sslz_reference.csv index 99ed36423..cd020abe3 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/finalState/sslz_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/finalState/sslz_reference.csv @@ -19,41 +19,36 @@ ders​​​​​​​​​​​​​​​​​​";"Zs 3 bei Mwtfstr​​​​​​​​​​​​​​​​​​​​";Zl​​​​​​​​​​​​​​​​​​​​​;Zs 3v​​​​​​​​​​​​​​​​​​​​​​;Zs 2​​​​​​​​​​​​​​​​​​​​​​​;Zs 2v​​​​​​​​​​​​​​​​​​​​​​​​;Zs 6​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 13​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 3​​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 6​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Kennlicht an​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;"Vorsigna- lisierung Ziel​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​ ;;;;;;;;;;;;;;;;km/h;km/h;km/h;km/h;;;;;;;;;;;;; -1;"

59111/​60A

";"

59111

";"

60A

";"

";"

";"

";"

Z

";"

";"

□

";"

";"

";"

";"

";"

";"

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWa -

60Va

";"

" -2;"

60PMPH/​60AA

";"

60PMPH

";"

60AA

";"

";"

";"

";"

Z

";"

";"

□

";"

";"

";"

";"

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWaa -

60Vaa

";"

" -3;"

60A/​60ZR1 ​(D1)​

";"

60A

";"

60ZR1

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

120

";"

160

";"

";"

";"

";"

";"

4 -

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +1;"

59111/​60A

";"

59111

";"

60A

";"

";"

";"

";"

Z

";"

";"

□

";"

";"

";"

";"

";"

";"

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWa, ​60Va

";"

" +2;"

60PMPH/​60AA

";"

60PMPH

";"

60AA

";"

";"

";"

";"

Z

";"

";"

□

";"

";"

";"

";"

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWaa, ​60Vaa

";"

" +3;"

60A/​60ZR1 ​(D1)​

";"

60A

";"

60ZR1

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

120

";"

160

";"

";"

";"

";"

";"

4, ​6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 4;"

60A/​60ZR2 ​(D1)​

";"

60A

";"

60ZR2

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

160

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -5;"

60A/​60ZR2 ​(D2)​

";"

60A

";"

60ZR2

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

160

";"

";"

6

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +5;"

60A/​60ZR2 ​(D2)​

";"

60A

";"

60ZR2

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

160

";"

";"

6

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 6;"

60A/​60ZR2 ​(D3)​

";"

60A

";"

60ZR2

";"

";"

";"

D3*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -7;"

60A/​60ZR3 ​(D1)​

";"

60A

";"

60ZR3

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +7;"

60A/​60ZR3 ​(D1)​

";"

60A

";"

60ZR3

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 8;"

60A/​60ZR3 ​(D2)​

";"

60A

";"

60ZR3

";"

";"

";"

D2*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 9;"

60A/​60ZR4 ​(D1)​

";"

60A

";"

60ZR4

";"

";"

";"

D1

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 10;"

60A/​60ZR4 ​(D2)​

";"

60A

";"

60ZR4

";"

";"

";"

D2*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -11;"

60AA/​60ZR2 ​(D1)​

";"

60AA

";"

60ZR2

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

160

";"

";"

4

";"

";"

";"

4 -

5 -

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -12;"

60AA/​60ZR2 ​(D2)​

";"

60AA

";"

60ZR2

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

160

";"

";"

4

";"

";"

";"

4 -

5 -

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -13;"

60AA/​60ZR2 ​(D3)​

";"

60AA

";"

60ZR2

";"

";"

";"

D3

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

40

";"

";"

4

";"

";"

";"

4 -

5 -

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -14;"

60AA/​60ZR3 ​(D1)​

";"

60AA

";"

60ZR3

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -15;"

60AA/​60ZR3 ​(D2)​

";"

60AA

";"

60ZR3

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +11;"

60AA/​60ZR2 ​(D1)​

";"

60AA

";"

60ZR2

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

160

";"

";"

4

";"

";"

";"

4, ​5, ​6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +12;"

60AA/​60ZR2 ​(D2)​

";"

60AA

";"

60ZR2

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

160

";"

";"

4

";"

";"

";"

4, ​5, ​6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +13;"

60AA/​60ZR2 ​(D3)​

";"

60AA

";"

60ZR2

";"

";"

";"

D3

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

40

";"

";"

4

";"

";"

";"

4, ​5, ​6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +14;"

60AA/​60ZR3 ​(D1)​

";"

60AA

";"

60ZR3

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +15;"

60AA/​60ZR3 ​(D2)​

";"

60AA

";"

60ZR3

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 16;"

60AA/​60ZR4 ​(D1)​

";"

60AA

";"

60ZR4

";"

";"

";"

D1*

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 17;"

60AA/​60ZR4 ​(D2)​

";"

60AA

";"

60ZR4

";"

";"

";"

D2

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 18;"

60P1/​60PHLIG

";"

60P1

";"

60PHLIG

";"

";"

";"

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G101

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

x

";"

";"

";"

";"

";"

";"

" -19;"

60P2/​60PHLI

";"

60P2

";"

60PHLI ​[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G202

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +19;"

60P2/​60PHLI

";"

60P2

";"

60PHLI +

[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□ +

[□]​

";"

";"

";"

60U1190

";"

60G202

";"

";"

";"

120 +

[120]​

";"

120 +

[120]​

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 20;"

60P2/​60PHLIG

";"

60P2

";"

60PHLIG

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G202

";"

";"

";"

120

";"

60

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

60Zp

";"

";"

";"

" 21;"

60P2/​60PHPM

";"

60P2

";"

60PHPM

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G202

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -22;"

60ZV4/​60PHLI

";"

60ZV4

";"

60PHLI ​[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W6

";"

";"

";"

120

";"

40

";"

";"

";"

4F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +22;"

60ZV4/​60PHLI

";"

60ZV4

";"

60PHLI +

[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□ +

[□]​

";"

";"

";"

60U1190

";"

60W6

";"

";"

";"

120 +

[120]​

";"

40 +

[120]​

";"

";"

";"

4F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 23;"

60ZV4/​60PHLIG

";"

60ZV4

";"

60PHLIG

";"

";"

";"

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W6

";"

";"

";"

120

";"

40

";"

";"

";"

4F

";"

";"

";"

";"

";"

";"

";"

";"

";"

60Zp

";"

60P13

";"

";"

" 24;"

60ZV4/​60PHPM

";"

60ZV4

";"

60PHPM

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60W6

";"

";"

";"

120

";"

40

";"

";"

";"

4F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 25;"

60ZR1/​60G220X

";"

60ZR1

";"

60G220X

";"

";"

";"

";"

R

";"

";"

x

";"

";"

";"

";"

";"

";"

";"

120

";"

50

";"

";"

";"

4

";"

";"

x

";"

";"

";"

";"

";"

x

";"

";"

";"

";"

";"

" @@ -91,12 +86,9 @@ lisierung Ziel​​​​​​​​​​​​​​​​​​​​​​ 57;"

60ZU22/​60ZV3 ​(D1)​

";"

60ZU22

";"

60ZV3

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60G122

";"

";"

";"

120

";"

50

";"

60

";"

";"

5

";"

";"

x

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 58;"

60ZU22/​60ZV4 ​(D1)​

";"

60ZU22

";"

60ZV4

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60W33

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

x

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 59;"

60N21/​60RE

";"

60N21

";"

60RE

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

";"

60G221

";"

";"

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -60;"

60F/​60ZU22 ​(D1)​

";"

60F

";"

60ZU22

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60G422

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

4 -

5 -

8

";"

";"

";"

";"

";"

";"

";"

";"

60VWzu22

";"

" +60;"

60F/​60ZU22 ​(D1)​

";"

60F

";"

60ZU22

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60G422

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

4, ​5, ​8

";"

";"

";"

";"

";"

";"

";"

";"

60VWzu22

";"

" 61;"

60F/​60ZU22 ​(D2)​

";"

60F

";"

60ZU22

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60G422

";"

";"

";"

120

";"

";"

60

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWzu22

";"

" -62;"

60FF/​60ZU21 ​(D1)​

";"

60FF

";"

60ZU21

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +62;"

60FF/​60ZU21 ​(D1)​

";"

60FF

";"

60ZU21

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 63;"

60FF/​60ZU21 ​(D2)​

";"

60FF

";"

60ZU21

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 64;"

60FF/​60ZU21 ​(D3)​

";"

60FF

";"

60ZU21

";"

";"

";"

D3*

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 65;"

60FF/​60ZU21 ​(D4)​

";"

60FF

";"

60ZU21

";"

";"

";"

D4

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" @@ -128,9 +120,17 @@ lisierung Ziel​​​​​​​​​​​​​​​​​​​​​​ 89;"

60ZR3/​60N21 ​(D1)​

";"

60ZR3

";"

60N21

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60W29

";"

";"

";"

50

";"

50

";"

160

";"

";"

5

";"

";"

x

";"

";"

R

";"

";"

";"

";"

";"

";"

";"

";"

" 90;"

60ZR3/​60N22 ​(D1)​

";"

60ZR3

";"

60N22

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60W29

";"

";"

";"

50

";"

50

";"

160

";"

";"

5

";"

";"

x

";"

";"

R

";"

";"

";"

";"

";"

";"

";"

";"

" 91;"

60ZR3/​60TR

";"

60ZR3

";"

60TR

";"

";"

";"

";"

R

";"

";"

x

";"

";"

";"

";"

60W29

";"

";"

";"

50

";"

50

";"

";"

";"

5

";"

";"

";"

";"

T

";"

";"

";"

";"

";"

";"

";"

";"

" -92;"

60ZV3/​60PHLI

";"

60ZV3

";"

60PHLI ​[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W5

";"

";"

";"

60

";"

60

";"

";"

";"

6F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +92;"

60ZV3/​60PHLI

";"

60ZV3

";"

60PHLI +

[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□ +

[□]​

";"

";"

";"

60U1190

";"

60W5

";"

";"

";"

60 +

[120]​

";"

60 +

[120]​

";"

";"

";"

6F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 93;"

60ZV3/​60PHLIG

";"

60ZV3

";"

60PHLIG

";"

";"

";"

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W5

";"

";"

";"

120

";"

60

";"

";"

";"

6F

";"

";"

";"

";"

";"

";"

";"

";"

";"

60Zp

";"

60P13

";"

";"

" 94;"

60ZV3/​60PHPM

";"

60ZV3

";"

60PHPM

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60W5

";"

";"

";"

120

";"

60

";"

";"

";"

6F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -95;"

60P13/​60PHLI

";"

60P13

";"

60PHLI ​[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W4

";"

";"

";"

60

";"

60

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +95;"

60P13/​60PHLI

";"

60P13

";"

60PHLI +

[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□ +

[□]​

";"

";"

";"

60U1190

";"

60W4

";"

";"

";"

60 +

[120]​

";"

60 +

[120]​

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 96;"

60P13/​60PHLIG

";"

60P13

";"

60PHLIG

";"

";"

";"

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W4

";"

";"

";"

60

";"

60

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

60Zp

";"

";"

";"

" 97;"

60P13/​60PHPM

";"

60P13

";"

60PHPM

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60W4

";"

";"

";"

120

";"

60

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/initialState/sslz_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/initialState/sslz_reference.csv index 99ed36423..cd020abe3 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/initialState/sslz_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/initialState/sslz_reference.csv @@ -19,41 +19,36 @@ ders​​​​​​​​​​​​​​​​​​";"Zs 3 bei Mwtfstr​​​​​​​​​​​​​​​​​​​​";Zl​​​​​​​​​​​​​​​​​​​​​;Zs 3v​​​​​​​​​​​​​​​​​​​​​​;Zs 2​​​​​​​​​​​​​​​​​​​​​​​;Zs 2v​​​​​​​​​​​​​​​​​​​​​​​​;Zs 6​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 13​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 3​​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 6​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Kennlicht an​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;"Vorsigna- lisierung Ziel​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​ ;;;;;;;;;;;;;;;;km/h;km/h;km/h;km/h;;;;;;;;;;;;; -1;"

59111/​60A

";"

59111

";"

60A

";"

";"

";"

";"

Z

";"

";"

□

";"

";"

";"

";"

";"

";"

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWa -

60Va

";"

" -2;"

60PMPH/​60AA

";"

60PMPH

";"

60AA

";"

";"

";"

";"

Z

";"

";"

□

";"

";"

";"

";"

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWaa -

60Vaa

";"

" -3;"

60A/​60ZR1 ​(D1)​

";"

60A

";"

60ZR1

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

120

";"

160

";"

";"

";"

";"

";"

4 -

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +1;"

59111/​60A

";"

59111

";"

60A

";"

";"

";"

";"

Z

";"

";"

□

";"

";"

";"

";"

";"

";"

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWa, ​60Va

";"

" +2;"

60PMPH/​60AA

";"

60PMPH

";"

60AA

";"

";"

";"

";"

Z

";"

";"

□

";"

";"

";"

";"

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWaa, ​60Vaa

";"

" +3;"

60A/​60ZR1 ​(D1)​

";"

60A

";"

60ZR1

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

120

";"

160

";"

";"

";"

";"

";"

4, ​6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 4;"

60A/​60ZR2 ​(D1)​

";"

60A

";"

60ZR2

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

160

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -5;"

60A/​60ZR2 ​(D2)​

";"

60A

";"

60ZR2

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

160

";"

";"

6

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +5;"

60A/​60ZR2 ​(D2)​

";"

60A

";"

60ZR2

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

160

";"

";"

6

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 6;"

60A/​60ZR2 ​(D3)​

";"

60A

";"

60ZR2

";"

";"

";"

D3*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -7;"

60A/​60ZR3 ​(D1)​

";"

60A

";"

60ZR3

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +7;"

60A/​60ZR3 ​(D1)​

";"

60A

";"

60ZR3

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 8;"

60A/​60ZR3 ​(D2)​

";"

60A

";"

60ZR3

";"

";"

";"

D2*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 9;"

60A/​60ZR4 ​(D1)​

";"

60A

";"

60ZR4

";"

";"

";"

D1

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 10;"

60A/​60ZR4 ​(D2)​

";"

60A

";"

60ZR4

";"

";"

";"

D2*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G111

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -11;"

60AA/​60ZR2 ​(D1)​

";"

60AA

";"

60ZR2

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

160

";"

";"

4

";"

";"

";"

4 -

5 -

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -12;"

60AA/​60ZR2 ​(D2)​

";"

60AA

";"

60ZR2

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

160

";"

";"

4

";"

";"

";"

4 -

5 -

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -13;"

60AA/​60ZR2 ​(D3)​

";"

60AA

";"

60ZR2

";"

";"

";"

D3

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

40

";"

";"

4

";"

";"

";"

4 -

5 -

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -14;"

60AA/​60ZR3 ​(D1)​

";"

60AA

";"

60ZR3

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -15;"

60AA/​60ZR3 ​(D2)​

";"

60AA

";"

60ZR3

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +11;"

60AA/​60ZR2 ​(D1)​

";"

60AA

";"

60ZR2

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

160

";"

";"

4

";"

";"

";"

4, ​5, ​6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +12;"

60AA/​60ZR2 ​(D2)​

";"

60AA

";"

60ZR2

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

160

";"

";"

4

";"

";"

";"

4, ​5, ​6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +13;"

60AA/​60ZR2 ​(D3)​

";"

60AA

";"

60ZR2

";"

";"

";"

D3

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

120

";"

40

";"

";"

4

";"

";"

";"

4, ​5, ​6

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +14;"

60AA/​60ZR3 ​(D1)​

";"

60AA

";"

60ZR3

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +15;"

60AA/​60ZR3 ​(D2)​

";"

60AA

";"

60ZR3

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

60

";"

60

";"

";"

6

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 16;"

60AA/​60ZR4 ​(D1)​

";"

60AA

";"

60ZR4

";"

";"

";"

D1*

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 17;"

60AA/​60ZR4 ​(D2)​

";"

60AA

";"

60ZR4

";"

";"

";"

D2

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G102

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 18;"

60P1/​60PHLIG

";"

60P1

";"

60PHLIG

";"

";"

";"

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G101

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

x

";"

";"

";"

";"

";"

";"

" -19;"

60P2/​60PHLI

";"

60P2

";"

60PHLI ​[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60G202

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +19;"

60P2/​60PHLI

";"

60P2

";"

60PHLI +

[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□ +

[□]​

";"

";"

";"

60U1190

";"

60G202

";"

";"

";"

120 +

[120]​

";"

120 +

[120]​

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 20;"

60P2/​60PHLIG

";"

60P2

";"

60PHLIG

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G202

";"

";"

";"

120

";"

60

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

60Zp

";"

";"

";"

" 21;"

60P2/​60PHPM

";"

60P2

";"

60PHPM

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60G202

";"

";"

";"

120

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -22;"

60ZV4/​60PHLI

";"

60ZV4

";"

60PHLI ​[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W6

";"

";"

";"

120

";"

40

";"

";"

";"

4F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +22;"

60ZV4/​60PHLI

";"

60ZV4

";"

60PHLI +

[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□ +

[□]​

";"

";"

";"

60U1190

";"

60W6

";"

";"

";"

120 +

[120]​

";"

40 +

[120]​

";"

";"

";"

4F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 23;"

60ZV4/​60PHLIG

";"

60ZV4

";"

60PHLIG

";"

";"

";"

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W6

";"

";"

";"

120

";"

40

";"

";"

";"

4F

";"

";"

";"

";"

";"

";"

";"

";"

";"

60Zp

";"

60P13

";"

";"

" 24;"

60ZV4/​60PHPM

";"

60ZV4

";"

60PHPM

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60W6

";"

";"

";"

120

";"

40

";"

";"

";"

4F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 25;"

60ZR1/​60G220X

";"

60ZR1

";"

60G220X

";"

";"

";"

";"

R

";"

";"

x

";"

";"

";"

";"

";"

";"

";"

120

";"

50

";"

";"

";"

4

";"

";"

x

";"

";"

";"

";"

";"

x

";"

";"

";"

";"

";"

" @@ -91,12 +86,9 @@ lisierung Ziel​​​​​​​​​​​​​​​​​​​​​​ 57;"

60ZU22/​60ZV3 ​(D1)​

";"

60ZU22

";"

60ZV3

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60G122

";"

";"

";"

120

";"

50

";"

60

";"

";"

5

";"

";"

x

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 58;"

60ZU22/​60ZV4 ​(D1)​

";"

60ZU22

";"

60ZV4

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60W33

";"

";"

";"

120

";"

40

";"

40

";"

";"

4

";"

";"

x

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 59;"

60N21/​60RE

";"

60N21

";"

60RE

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

";"

60G221

";"

";"

";"

120

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -60;"

60F/​60ZU22 ​(D1)​

";"

60F

";"

60ZU22

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60G422

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

4 -

5 -

8

";"

";"

";"

";"

";"

";"

";"

";"

60VWzu22

";"

" +60;"

60F/​60ZU22 ​(D1)​

";"

60F

";"

60ZU22

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60G422

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

4, ​5, ​8

";"

";"

";"

";"

";"

";"

";"

";"

60VWzu22

";"

" 61;"

60F/​60ZU22 ​(D2)​

";"

60F

";"

60ZU22

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60G422

";"

";"

";"

120

";"

";"

60

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

60VWzu22

";"

" -62;"

60FF/​60ZU21 ​(D1)​

";"

60FF

";"

60ZU21

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

4 -

5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +62;"

60FF/​60ZU21 ​(D1)​

";"

60FF

";"

60ZU21

";"

";"

";"

D1

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

4, ​5

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 63;"

60FF/​60ZU21 ​(D2)​

";"

60FF

";"

60ZU21

";"

";"

";"

D2

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 64;"

60FF/​60ZU21 ​(D3)​

";"

60FF

";"

60ZU21

";"

";"

";"

D3*

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 65;"

60FF/​60ZU21 ​(D4)​

";"

60FF

";"

60ZU21

";"

";"

";"

D4

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60G321

";"

";"

";"

120

";"

";"

160

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" @@ -128,9 +120,17 @@ lisierung Ziel​​​​​​​​​​​​​​​​​​​​​​ 89;"

60ZR3/​60N21 ​(D1)​

";"

60ZR3

";"

60N21

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

21

";"

";"

";"

60W29

";"

";"

";"

50

";"

50

";"

160

";"

";"

5

";"

";"

x

";"

";"

R

";"

";"

";"

";"

";"

";"

";"

";"

" 90;"

60ZR3/​60N22 ​(D1)​

";"

60ZR3

";"

60N22

";"

";"

";"

D1*

";"

R

";"

ZL

";"

□

";"

";"

";"

";"

60W29

";"

";"

";"

50

";"

50

";"

160

";"

";"

5

";"

";"

x

";"

";"

R

";"

";"

";"

";"

";"

";"

";"

";"

" 91;"

60ZR3/​60TR

";"

60ZR3

";"

60TR

";"

";"

";"

";"

R

";"

";"

x

";"

";"

";"

";"

60W29

";"

";"

";"

50

";"

50

";"

";"

";"

5

";"

";"

";"

";"

T

";"

";"

";"

";"

";"

";"

";"

";"

" -92;"

60ZV3/​60PHLI

";"

60ZV3

";"

60PHLI ​[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W5

";"

";"

";"

60

";"

60

";"

";"

";"

6F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +92;"

60ZV3/​60PHLI

";"

60ZV3

";"

60PHLI +

[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□ +

[□]​

";"

";"

";"

60U1190

";"

60W5

";"

";"

";"

60 +

[120]​

";"

60 +

[120]​

";"

";"

";"

6F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 93;"

60ZV3/​60PHLIG

";"

60ZV3

";"

60PHLIG

";"

";"

";"

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W5

";"

";"

";"

120

";"

60

";"

";"

";"

6F

";"

";"

";"

";"

";"

";"

";"

";"

";"

60Zp

";"

60P13

";"

";"

" 94;"

60ZV3/​60PHPM

";"

60ZV3

";"

60PHPM

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60W5

";"

";"

";"

120

";"

60

";"

";"

";"

6F

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -95;"

60P13/​60PHLI

";"

60P13

";"

60PHLI ​[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W4

";"

";"

";"

60

";"

60

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +95;"

60P13/​60PHLI

";"

60P13

";"

60PHLI +

[59112]​

";"

";"

";"

";"

RB

";"

ZL

";"

□ +

[□]​

";"

";"

";"

60U1190

";"

60W4

";"

";"

";"

60 +

[120]​

";"

60 +

[120]​

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" 96;"

60P13/​60PHLIG

";"

60P13

";"

60PHLIG

";"

";"

";"

";"

R

";"

ZL

";"

□

";"

";"

";"

60U1190

";"

60W4

";"

";"

";"

60

";"

60

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

60Zp

";"

";"

";"

" 97;"

60P13/​60PHPM

";"

60P13

";"

60PHPM

";"

";"

";"

";"

R

";"

";"

□

";"

";"

";"

60U1190

";"

60W4

";"

";"

";"

120

";"

60

";"

";"

";"

6

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" diff --git a/java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/AbstractTableModelTransformator.xtend b/java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/AbstractTableModelTransformator.xtend index 02958122e..35d15b281 100644 --- a/java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/AbstractTableModelTransformator.xtend +++ b/java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/AbstractTableModelTransformator.xtend @@ -225,9 +225,10 @@ abstract class AbstractTableModelTransformator 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 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 void fillIterable( + TableRow row, + ColumnDescriptor column, + S object, + (S)=>Iterable 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 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 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 implements TableModelTransform Comparator 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) } diff --git a/java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/sorting/AbstractCellComparator.xtend b/java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/sorting/AbstractCellComparator.xtend index 8d76063f7..969c8212b 100644 --- a/java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/sorting/AbstractCellComparator.xtend +++ b/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 { def int compareCell(Iterable iterable1, Iterable iterable2) { - return iterable1.iterableToString("").compareCell( - iterable2.iterableToString("")) + return iterable1.iterableToString(" ").compareCell( + iterable2.iterableToString(" ")) } def int compareCell(String first, String second) {