diff --git a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/StellBereichExtensions.java b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/StellBereichExtensions.java index e2e2bb4fd7..44652c3b78 100644 --- a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/StellBereichExtensions.java +++ b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/StellBereichExtensions.java @@ -97,7 +97,8 @@ public static String getStellBeteichBezeichnung(final Stell_Bereich area) { return aussenElementAnsteuerung.getBezeichnung() .getBezeichnungAEA() .getWert(); - }).orElse(null); + }).orElse(getNullableObject(area, + e -> e.getBezeichnungStellwerk().getWert()).orElse(null)); } /** diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 3/ssks_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Lorenztal/ssks_reference.csv similarity index 100% rename from java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 3/ssks_reference.csv rename to java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Lorenztal/ssks_reference.csv diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 3/sskx_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Lorenztal/sskx_reference.csv similarity index 93% rename from java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 3/sskx_reference.csv rename to java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Lorenztal/sskx_reference.csv index 7de2b6a9ff..225ad7ec19 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 3/sskx_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Lorenztal/sskx_reference.csv @@ -6,12 +6,12 @@ Signal";Standort​;Standort​;Standort​;Lichtraum-profil​​​​;Über-h Mastmitte - Gleismitte (Gleisabstand)​​​​​​";"Abstand/Lage Mastmitte - Gleismitte -(Gleisabstand)​​​​​​";Anordnung​​​​​​​​;Anordnung​​​​​​​​;Fundament​​​​​​​​​​;Fundament​​​​​​​​​​;Signalbegriff​​​​​​​​​​​​;Signalbegriff​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​ +(Gleisabstand)​​​​​​";Anordnung​​​​​​​​;Anordnung​​​​​​​​;Fundament​​​​​​​​​​;Fundament​​​​​​​​​​;Signalisierung​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​ ;"Bezeichnung Signal";Strecke​;km​​;Gleis​​​;Lichtraum-profil​​​​;Über-höhung​​​​​;Links​​​​​​;Rechts​​​​​​​;Befestigung​​​​​​​​;"Regelzeichnung Nr. (Bild)​​​​​​​​​";"Art/ Rz. Nr. (Bild)​​​​​​​​​​";"Höhe -u. SO​​​​​​​​​​​";Bezeichnung (Symbol)​​​​​​​​​​​​;"Regelzeichnung +u. SO​​​​​​​​​​​";Signalbegriff Bezeichnung (Symbol)​​​​​​​​​​​​;"Weitere Regelzeichnung Nr. (Bild)​​​​​​​​​​​​​";Bemerkung​​​​​​​​​​​​​​ ;;;;;;mm;mm;mm;;;;mm;;; 1;"

Vorsignalbake ​km: ​1,150

";"

8981

";"

1,150

";"

(1)​ diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 5/sskp_dm_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Rechtsheim/sskp_dm_reference.csv similarity index 100% rename from java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 5/sskp_dm_reference.csv rename to java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Rechtsheim/sskp_dm_reference.csv diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 5/sskp_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Rechtsheim/sskp_reference.csv similarity index 100% rename from java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 5/sskp_reference.csv rename to java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Rechtsheim/sskp_reference.csv diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 5/ssks_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Rechtsheim/ssks_reference.csv similarity index 98% rename from java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 5/ssks_reference.csv rename to java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Rechtsheim/ssks_reference.csv index 7c9d9f063b..ff0ceb52ee 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 5/ssks_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Rechtsheim/ssks_reference.csv @@ -1,10 +1,10 @@ -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;AG;AH;AI;AJ;AK;AL;AM;AN;AO;AP;AQ;AR;AS;AT;AU;AV;AW;AX -;Bezeichnung Signal;Signal-Art​;Signal-Art​;Signal-Art​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Konstruktive Merkmale​​​​​​​​​​​​​​​​;Konstruktive Merkmale​​​​​​​​​​​​​​​​;Konstruktive Merkmale​​​​​​​​​​​​​​​​;Konstruktive Merkmale​​​​​​​​​​​​​​​​;Konstruktive Merkmale​​​​​​​​​​​​​​​​;Konstruktive Merkmale​​​​​​​​​​​​​​​​;Konstruktive Merkmale​​​​​​​​​​​​​​​​;Anschluss​​​​​​​​​​​​​​​​​​​​​​​;Anschluss​​​​​​​​​​​​​​​​​​​​​​​;Anschluss​​​​​​​​​​​​​​​​​​​​​​​;Anschluss​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Sonstiges​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Sonstiges​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Sonstiges​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Sonstiges​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Sonstiges​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Sonstiges​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Sonstiges​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;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;AG;AH;AI;AJ;AK;AL;AM;AN;AO;AP;AQ;AR;AS;AT;AU;AV;AW;AX +;Bezeichnung Signal;Signal-Art​;Signal-Art​;Signal-Art​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Standortmerkmale​​​​;Konstruktive Merkmale​​​​​​​​​​​​​​​​;Konstruktive Merkmale​​​​​​​​​​​​​​​​;Konstruktive Merkmale​​​​​​​​​​​​​​​​;Konstruktive Merkmale​​​​​​​​​​​​​​​​;Konstruktive Merkmale​​​​​​​​​​​​​​​​;Konstruktive Merkmale​​​​​​​​​​​​​​​​;Konstruktive Merkmale​​​​​​​​​​​​​​​​;Anschluss​​​​​​​​​​​​​​​​​​​​​​​;Anschluss​​​​​​​​​​​​​​​​​​​​​​​;Anschluss​​​​​​​​​​​​​​​​​​​​​​​;Anschluss​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​​​​​​​​​​​​​​​​;Sonstiges​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Sonstiges​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Sonstiges​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Sonstiges​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Sonstiges​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Sonstiges​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Sonstiges​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​ ;Bezeichnung Signal;Signal-Art​;Signal-Art​;Signal-Art​;Standort​​​​;Standort​​​​;Sonstige zulässige Anordnung​​​​​​;"Lichtraum- profil​​​​​​​";"Über- -höhung​​​​​​​​";"Abstand +höhung​​​​​​​​";"Abstand/Lage Mastmitte - Gleismitte -(Gleisabstand)​​​​​​​​​";"Abstand +(Gleisabstand)​​​​​​​​​";"Abstand/Lage Mastmitte - Gleismitte (Gleisabstand)​​​​​​​​​";Sichtbarkeit​​​​​​​​​​​;Sichtbarkeit​​​​​​​​​​​;Sichtbarkeit​​​​​​​​​​​;Ausrichtung​​​​​​​​​​​​​​;Ausrichtung​​​​​​​​​​​​​​;Anordnung​​​​​​​​​​​​​​​​;Anordnung​​​​​​​​​​​​​​​​;"Obere Lichtpunkt- höhe​​​​​​​​​​​​​​​​​​";Streuscheibe​​​​​​​​​​​​​​​​​​​;Streuscheibe​​​​​​​​​​​​​​​​​​​;Fundament​​​​​​​​​​​​​​​​​​​​​;Fundament​​​​​​​​​​​​​​​​​​​​​;Schaltkasten​​​​​​​​​​​​​​​​​​​​​​​;Schaltkasten​​​​​​​​​​​​​​​​​​​​​​​;Separater Schaltkasten Steuerung​​​​​​​​​​​​​​​​​​​​​​​​​;"Dauerhaft Nacht- @@ -23,8 +23,8 @@ schaltung​​​​​​​​​​​​​​​​​​​​​​​ (Zusatzanzeiger)​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";"Nach- geordnetes Signal​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";Mastschild​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;"Weitere (z. B. ETCS-Halttafel, -Vorsignaltafel)​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";Automatische Fahrtstellung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;"Dunkel- -schaltung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";Durchfahrt erlaubt​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Besetzte Ausfahrt​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Löschung Zs 1/Zs 7​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Überwachung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Überwachung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​ +Lf-Signal)​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";Automatische Fahrtstellung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;"Dunkel- +schaltung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";Durchfahrt erlaubt​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Besetzte Ausfahrt​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Löschung Zs 1/Zs 7​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Überwachung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Überwachung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​ ;Bezeichnung Signal;Reales Signal​;Funktion ohne Signal​​;Fiktives Signal​​​;Strecke​​​​;km​​​​​;Sonstige zulässige Anordnung​​​​​​;"Lichtraum- profil​​​​​​​";"Über- höhung​​​​​​​​";Links​​​​​​​​​;Rechts​​​​​​​​​​;Soll​​​​​​​​​​​;Mindest​​​​​​​​​​​​;Ist​​​​​​​​​​​​​;Entfernung​​​​​​​​​​​​​​;Richtpunkt​​​​​​​​​​​​​​​;Befestigung​​​​​​​​​​​​​​​​;"Regelzeichnung @@ -37,7 +37,7 @@ Kl​​​​​​​​​​​​​​​​​​​​​​​​​​ Sh 1​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";Zs​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 2​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 2v​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 3​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 3v​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Zp​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Kombination​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;"Nach- geordnetes Signal​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";Mastschild​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;"Regelzeichnung Nr. (Bild)​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";Automatische Fahrtstellung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;"Dunkel- -schaltung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";Durchfahrt erlaubt​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Besetzte Ausfahrt​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Löschung Zs 1/Zs 7​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 2​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 2v​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​ -;;;;;;;;;mm;mm;mm;m;m;m;m;;;;mm;;;;mm;;m;;;;;;;;;;;;;;;;;;;;;;;;; -1;"

PH

";"

";"

";"

ZZS

";"

8980

";"

127,369

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" -2;"

PHG

";"

";"

";"

ZZS

";"

8980

";"

127,370

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +schaltung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";Durchfahrt erlaubt​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Besetzte Ausfahrt​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Löschung Zs 1/Zs 7​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 2​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Zs 2v​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​ +;;;;;;;;;mm;mm;mm;m;m;m;m;;;;mm;;;;mm;;m;;;;;;;;;;;;;;;;;;;;;;;;; +1;"

PH

";"

";"

";"

ZZS

";"

8980

";"

127,369

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" +2;"

PHG

";"

";"

";"

ZZS

";"

8980

";"

127,370

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

" diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 5/sskx_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Rechtsheim/sskx_reference.csv similarity index 89% rename from java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 5/sskx_reference.csv rename to java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Rechtsheim/sskx_reference.csv index 44f62e4b21..2cbe8f0870 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 5/sskx_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Rechtsheim/sskx_reference.csv @@ -6,12 +6,12 @@ Signal";Standort​;Standort​;Standort​;Lichtraum-profil​​​​;Über-h Mastmitte - Gleismitte (Gleisabstand)​​​​​​";"Abstand/Lage Mastmitte - Gleismitte -(Gleisabstand)​​​​​​";Anordnung​​​​​​​​;Anordnung​​​​​​​​;Fundament​​​​​​​​​​;Fundament​​​​​​​​​​;Signalbegriff​​​​​​​​​​​​;Signalbegriff​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​ +(Gleisabstand)​​​​​​";Anordnung​​​​​​​​;Anordnung​​​​​​​​;Fundament​​​​​​​​​​;Fundament​​​​​​​​​​;Signalisierung​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​ ;"Bezeichnung Signal";Strecke​;km​​;Gleis​​​;Lichtraum-profil​​​​;Über-höhung​​​​​;Links​​​​​​;Rechts​​​​​​​;Befestigung​​​​​​​​;"Regelzeichnung Nr. (Bild)​​​​​​​​​";"Art/ Rz. Nr. (Bild)​​​​​​​​​​";"Höhe -u. SO​​​​​​​​​​​";Bezeichnung (Symbol)​​​​​​​​​​​​;"Regelzeichnung +u. SO​​​​​​​​​​​";Signalbegriff Bezeichnung (Symbol)​​​​​​​​​​​​;"Weitere Regelzeichnung Nr. (Bild)​​​​​​​​​​​​​";Bemerkung​​​​​​​​​​​​​​ ;;;;;;mm;mm;mm;;;;mm;;; 1;"

Lf ​6 ​'9' ​km: ​124,570

";"

8980

";"

124,570

";"

(2)​

";"

GC

";"

0

";"

";"

x diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 5/sslb_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Rechtsheim/sslb_reference.csv similarity index 100% rename from java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 5/sslb_reference.csv rename to java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Rechtsheim/sslb_reference.csv diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 4/ssks_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Treumgart/ssks_reference.csv similarity index 100% rename from java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 4/ssks_reference.csv rename to java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Treumgart/ssks_reference.csv diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 4/sskx_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Treumgart/sskx_reference.csv similarity index 86% rename from java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 4/sskx_reference.csv rename to java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Treumgart/sskx_reference.csv index c99250e344..0e8d706119 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Stellbereich 4/sskx_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/Treumgart/sskx_reference.csv @@ -6,12 +6,12 @@ Signal";Standort​;Standort​;Standort​;Lichtraum-profil​​​​;Über-h Mastmitte - Gleismitte (Gleisabstand)​​​​​​";"Abstand/Lage Mastmitte - Gleismitte -(Gleisabstand)​​​​​​";Anordnung​​​​​​​​;Anordnung​​​​​​​​;Fundament​​​​​​​​​​;Fundament​​​​​​​​​​;Signalbegriff​​​​​​​​​​​​;Signalbegriff​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​ +(Gleisabstand)​​​​​​";Anordnung​​​​​​​​;Anordnung​​​​​​​​;Fundament​​​​​​​​​​;Fundament​​​​​​​​​​;Signalisierung​​​​​​​​​​​​;Signalisierung​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​ ;"Bezeichnung Signal";Strecke​;km​​;Gleis​​​;Lichtraum-profil​​​​;Über-höhung​​​​​;Links​​​​​​;Rechts​​​​​​​;Befestigung​​​​​​​​;"Regelzeichnung Nr. (Bild)​​​​​​​​​";"Art/ Rz. Nr. (Bild)​​​​​​​​​​";"Höhe -u. SO​​​​​​​​​​​";Bezeichnung (Symbol)​​​​​​​​​​​​;"Regelzeichnung +u. SO​​​​​​​​​​​";Signalbegriff Bezeichnung (Symbol)​​​​​​​​​​​​;"Weitere Regelzeichnung Nr. (Bild)​​​​​​​​​​​​​";Bemerkung​​​​​​​​​​​​​​ ;;;;;;mm;mm;mm;;;;mm;;; 1;"

Vorsignalbake ​km: ​17,027

";"

8982

";"

17,027

";"

(1)​

";"

GC

";"

80

";"

x

";"

";"

Pfahl

";"

S ​526.2.6 ​(1)​

";"

";"

";"

Ne ​3 ​1str

";"

";"

"