diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskw/SskwTransformator.xtend b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskw/SskwTransformator.xtend index 7a2886becf..1d8d48c9fe 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskw/SskwTransformator.xtend +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskw/SskwTransformator.xtend @@ -790,8 +790,9 @@ class SskwTransformator extends AbstractPlanPro2TableModelTransformator { ) } else { val actuatorCount = components. - map[actuatorNumberSelector.apply(it)].filterNull.map[intValue]. - reduce[p1, p2|p1.intValue + p2.intValue] + map[actuatorNumberSelector.apply(it)].filterNull.reduce [ p1, p2 | + p1 + p2 + ] val position = components.filter [ fillPositionSupplementCondition.apply(it) ].map [ @@ -799,7 +800,7 @@ class SskwTransformator extends AbstractPlanPro2TableModelTransformator { ].map[key.getPosition(value, actuatorPositionSelector)].filter [ !nullOrEmpty && !blank ].toSet.join(", ") - if (actuatorCount === null || actuatorCount === 0) { + if (actuatorCount === null) { return } fill(row, column, element, [ diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/sskw_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/sskw_reference.csv index b1614352dd..19f18b155c 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/sskw_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/sskw_reference.csv @@ -21,9 +21,9 @@ richtung​​​​​​​​​​​​​​​​​​​​";"Schutz- schiene​​​​​​​​​​​​​​​​​​​​​";"Regelzeichnung Nr. (Bild)​​​​​​​​​​​​​​​​​​​​​​";DWS​​​​​​​​​​​​​​​​​​​​​​​;Art​​​​​​​​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​ ;;;;;;;;;;;St;;St;km/h;km/h;km/h;km/h;St;St;;;;;;; -1;"

W41

";"

EW

";"

EW ​54-​190-​1:9

";"

60B114

";"

";"

";"

";"

";"

";"

□

";"

";"

reflekt.

";"

0

";"

40 ​

";"

120 ​(pmax)​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​3101.0001 ​(1)​ +1;"

W41

";"

EW

";"

EW ​54-​190-​1:9

";"

60B114

";"

";"

";"

";"

";"

";"

□

";"

0 ​

";"

reflekt.

";"

0

";"

40 ​

";"

120 ​(pmax)​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​3101.0001 ​(1)​

WSK_​2018_​W41

";"

x

";"

";"

" -2;"

W42

";"

EW

";"

EW ​54-​190-​1:9

";"

";"

";"

";"

";"

";"

";"

□

";"

";"

reflekt.

";"

0

";"

40 ​

";"

40 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​3101.0001 ​(1)​ +2;"

W42

";"

EW

";"

EW ​54-​190-​1:9

";"

";"

";"

";"

";"

";"

";"

□

";"

0 ​

";"

reflekt.

";"

0

";"

40 ​

";"

40 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​3101.0001 ​(1)​

WSK_​2018_​W42

";"

x

";"

";"

" 3;"

60W1

";"

IBW

";"

IBW ​60-​500-​1:12-​fb

";"

60W1

";"

60W2 ​L

";"

";"

";"

R

";"

x

";"

x

";"

1 ​

";"

reflekt.

";"

1

";"

60 ​

";"

120 ​(pmax)​

";"

";"

";"

1 ​

";"

";"

";"

";"

";"

Sw ​1262.0501 ​(1)​

Sw ​1262.0501 ​(1)​ diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/sskw_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/sskw_reference.csv index b1614352dd..19f18b155c 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/sskw_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/sskw_reference.csv @@ -21,9 +21,9 @@ richtung​​​​​​​​​​​​​​​​​​​​";"Schutz- schiene​​​​​​​​​​​​​​​​​​​​​";"Regelzeichnung Nr. (Bild)​​​​​​​​​​​​​​​​​​​​​​";DWS​​​​​​​​​​​​​​​​​​​​​​​;Art​​​​​​​​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​ ;;;;;;;;;;;St;;St;km/h;km/h;km/h;km/h;St;St;;;;;;; -1;"

W41

";"

EW

";"

EW ​54-​190-​1:9

";"

60B114

";"

";"

";"

";"

";"

";"

□

";"

";"

reflekt.

";"

0

";"

40 ​

";"

120 ​(pmax)​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​3101.0001 ​(1)​ +1;"

W41

";"

EW

";"

EW ​54-​190-​1:9

";"

60B114

";"

";"

";"

";"

";"

";"

□

";"

0 ​

";"

reflekt.

";"

0

";"

40 ​

";"

120 ​(pmax)​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​3101.0001 ​(1)​

WSK_​2018_​W41

";"

x

";"

";"

" -2;"

W42

";"

EW

";"

EW ​54-​190-​1:9

";"

";"

";"

";"

";"

";"

";"

□

";"

";"

reflekt.

";"

0

";"

40 ​

";"

40 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​3101.0001 ​(1)​ +2;"

W42

";"

EW

";"

EW ​54-​190-​1:9

";"

";"

";"

";"

";"

";"

";"

□

";"

0 ​

";"

reflekt.

";"

0

";"

40 ​

";"

40 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​3101.0001 ​(1)​

WSK_​2018_​W42

";"

x

";"

";"

" 3;"

60W1

";"

IBW

";"

IBW ​60-​500-​1:12-​fb

";"

60W1

";"

60W2 ​L

";"

";"

";"

R

";"

x

";"

x

";"

1 ​

";"

reflekt.

";"

1

";"

60 ​

";"

120 ​(pmax)​

";"

";"

";"

1 ​

";"

";"

";"

";"

";"

Sw ​1262.0501 ​(1)​

Sw ​1262.0501 ​(1)​ diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/finalState/sskw_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/finalState/sskw_reference.csv index b1614352dd..19f18b155c 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/finalState/sskw_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/finalState/sskw_reference.csv @@ -21,9 +21,9 @@ richtung​​​​​​​​​​​​​​​​​​​​";"Schutz- schiene​​​​​​​​​​​​​​​​​​​​​";"Regelzeichnung Nr. (Bild)​​​​​​​​​​​​​​​​​​​​​​";DWS​​​​​​​​​​​​​​​​​​​​​​​;Art​​​​​​​​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​ ;;;;;;;;;;;St;;St;km/h;km/h;km/h;km/h;St;St;;;;;;; -1;"

W41

";"

EW

";"

EW ​54-​190-​1:9

";"

60B114

";"

";"

";"

";"

";"

";"

□

";"

";"

reflekt.

";"

0

";"

40 ​

";"

120 ​(pmax)​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​3101.0001 ​(1)​ +1;"

W41

";"

EW

";"

EW ​54-​190-​1:9

";"

60B114

";"

";"

";"

";"

";"

";"

□

";"

0 ​

";"

reflekt.

";"

0

";"

40 ​

";"

120 ​(pmax)​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​3101.0001 ​(1)​

WSK_​2018_​W41

";"

x

";"

";"

" -2;"

W42

";"

EW

";"

EW ​54-​190-​1:9

";"

";"

";"

";"

";"

";"

";"

□

";"

";"

reflekt.

";"

0

";"

40 ​

";"

40 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​3101.0001 ​(1)​ +2;"

W42

";"

EW

";"

EW ​54-​190-​1:9

";"

";"

";"

";"

";"

";"

";"

□

";"

0 ​

";"

reflekt.

";"

0

";"

40 ​

";"

40 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​3101.0001 ​(1)​

WSK_​2018_​W42

";"

x

";"

";"

" 3;"

60W1

";"

IBW

";"

IBW ​60-​500-​1:12-​fb

";"

60W1

";"

60W2 ​L

";"

";"

";"

R

";"

x

";"

x

";"

1 ​

";"

reflekt.

";"

1

";"

60 ​

";"

120 ​(pmax)​

";"

";"

";"

1 ​

";"

";"

";"

";"

";"

Sw ​1262.0501 ​(1)​

Sw ​1262.0501 ​(1)​ diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/initialState/sskw_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/initialState/sskw_reference.csv index b1614352dd..19f18b155c 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/initialState/sskw_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/initialState/sskw_reference.csv @@ -21,9 +21,9 @@ richtung​​​​​​​​​​​​​​​​​​​​";"Schutz- schiene​​​​​​​​​​​​​​​​​​​​​";"Regelzeichnung Nr. (Bild)​​​​​​​​​​​​​​​​​​​​​​";DWS​​​​​​​​​​​​​​​​​​​​​​​;Art​​​​​​​​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​ ;;;;;;;;;;;St;;St;km/h;km/h;km/h;km/h;St;St;;;;;;; -1;"

W41

";"

EW

";"

EW ​54-​190-​1:9

";"

60B114

";"

";"

";"

";"

";"

";"

□

";"

";"

reflekt.

";"

0

";"

40 ​

";"

120 ​(pmax)​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​3101.0001 ​(1)​ +1;"

W41

";"

EW

";"

EW ​54-​190-​1:9

";"

60B114

";"

";"

";"

";"

";"

";"

□

";"

0 ​

";"

reflekt.

";"

0

";"

40 ​

";"

120 ​(pmax)​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​3101.0001 ​(1)​

WSK_​2018_​W41

";"

x

";"

";"

" -2;"

W42

";"

EW

";"

EW ​54-​190-​1:9

";"

";"

";"

";"

";"

";"

";"

□

";"

";"

reflekt.

";"

0

";"

40 ​

";"

40 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​3101.0001 ​(1)​ +2;"

W42

";"

EW

";"

EW ​54-​190-​1:9

";"

";"

";"

";"

";"

";"

";"

□

";"

0 ​

";"

reflekt.

";"

0

";"

40 ​

";"

40 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​3101.0001 ​(1)​

WSK_​2018_​W42

";"

x

";"

";"

" 3;"

60W1

";"

IBW

";"

IBW ​60-​500-​1:12-​fb

";"

60W1

";"

60W2 ​L

";"

";"

";"

R

";"

x

";"

x

";"

1 ​

";"

reflekt.

";"

1

";"

60 ​

";"

120 ​(pmax)​

";"

";"

";"

1 ​

";"

";"

";"

";"

";"

Sw ​1262.0501 ​(1)​

Sw ​1262.0501 ​(1)​