Update Table name: Sskx -> Sskl

java/bundles/org.eclipse.set.feature.table.pt1/META-INF/MANIFEST.MF

@@ -118,6 +118,8 @@ Service-Component: OSGI-INF/org.eclipse.set.feature.table.pt1.messages.Messages.
  OSGI-INF/org.eclipse.set.feature.table.pt1.sskf.SskfTransformationService.xml,
  OSGI-INF/org.eclipse.set.feature.table.pt1.sskg.SskgDescriptionService.xml,
  OSGI-INF/org.eclipse.set.feature.table.pt1.sskg.SskgTransformationService.xml,
+ OSGI-INF/org.eclipse.set.feature.table.pt1.sskl.SsklDescriptionService.xml,
+ OSGI-INF/org.eclipse.set.feature.table.pt1.sskl.SsklTransformationService.xml,
  OSGI-INF/org.eclipse.set.feature.table.pt1.ssko.SskoDescriptionService.xml,
  OSGI-INF/org.eclipse.set.feature.table.pt1.ssko.SskoTransformationService.xml,
  OSGI-INF/org.eclipse.set.feature.table.pt1.sskp.SskpDescriptionService.xml,
@@ -131,8 +133,6 @@ Service-Component: OSGI-INF/org.eclipse.set.feature.table.pt1.messages.Messages.
  OSGI-INF/org.eclipse.set.feature.table.pt1.sskt.SsktTransformationService.xml,
  OSGI-INF/org.eclipse.set.feature.table.pt1.sskw.SskwDescriptionService.xml,
  OSGI-INF/org.eclipse.set.feature.table.pt1.sskw.SskwTransformationService.xml,
- OSGI-INF/org.eclipse.set.feature.table.pt1.sskx.SskxDescriptionService.xml,
- OSGI-INF/org.eclipse.set.feature.table.pt1.sskx.SskxTransformationService.xml,
  OSGI-INF/org.eclipse.set.feature.table.pt1.sskz.SskzDescriptionService.xml,
  OSGI-INF/org.eclipse.set.feature.table.pt1.sskz.SskzTransformationService.xml,
  OSGI-INF/org.eclipse.set.feature.table.pt1.ssla.SslaDescriptionService.xml,

java/bundles/org.eclipse.set.feature.table.pt1/OSGI-INF/l10n/bundle.properties

@@ -210,10 +210,10 @@ ToolboxTableNameSxxxLong=Tabelle der Bearbeitungsvermerke
 ToolboxTableNameSxxxPlanningNumber=???
 ToolboxTableNameSxxxRil=
 
-SskxTableView_Heading=Tabelle der Tafeln – Sskx
-ToolboxTableNameSskxLong=Tabelle der Tafeln
-ToolboxTableNameSskxPlanningNumber=10/18
-ToolboxTableNameSskxShort=Sskx
-SskxDescriptionService_ViewTooltip=Tabelle der Tafeln
-SskxDescriptionService_ViewName=Sskx – Tabelle der Tafeln
-ToolboxTableNameSskxRil=
+SsklTableView_Heading=Signaltabelle der Tafeln – Sskl
+ToolboxTableNameSsklLong=Signaltabelle der Tafeln
+ToolboxTableNameSsklPlanningNumber=10/18
+ToolboxTableNameSsklShort=Sskl
+SsklDescriptionService_ViewTooltip=Signaltabelle der Tafeln
+SsklDescriptionService_ViewName=Sskl – Signaltabelle der Tafeln
+ToolboxTableNameSsklRil=

java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/messages/Messages.java

@@ -955,38 +955,38 @@ protected void bindBundleLocalization(
 	public String ToolboxTableNameSxxxRil;
 
 	/**
-	 * Tabelle der Tafeln – Sskx
+	 * Signaltabelle der Tafeln – Sskl
 	 */
-	public String SskxTableView_Heading;
+	public String SsklTableView_Heading;
 
 	/**
-	 * Tabelle der Tafeln
+	 * Signaltabelle der Tafeln
 	 */
-	public String ToolboxTableNameSskxLong;
+	public String ToolboxTableNameSsklLong;
 
 	/**
 	 * 10/18
 	 */
-	public String ToolboxTableNameSskxPlanningNumber;
+	public String ToolboxTableNameSsklPlanningNumber;
 
 	/**
-	 * Sskx
+	 * Sskl
 	 */
-	public String ToolboxTableNameSskxShort;
+	public String ToolboxTableNameSsklShort;
 
 	/**
-	 * Tabelle der Tafeln
+	 * Signaltabelle der Tafeln
 	 */
-	public String SskxDescriptionService_ViewTooltip;
+	public String SsklDescriptionService_ViewTooltip;
 
 	/**
-	 * Sskx – Tabelle der Tafeln
+	 * Sskl – Signaltabelle der Tafeln
 	 */
-	public String SskxDescriptionService_ViewName;
+	public String SsklDescriptionService_ViewName;
 
 	/**
 	 * 
 	 */
-	public String ToolboxTableNameSskxRil;
+	public String ToolboxTableNameSsklRil;
 
 }

java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskx/SskxColumns.java → java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskl/SsklColumns.java

@@ -8,87 +8,87 @@
  * SPDX-License-Identifier: EPL-2.0
  * 
  */
-package org.eclipse.set.feature.table.pt1.sskx;
+package org.eclipse.set.feature.table.pt1.sskl;
 
 /**
- * Symbolic addressing for Sskx columns.
+ * Symbolic addressing for Sskl columns.
  * 
  * @author Truong
  */
 @SuppressWarnings("nls")
-public class SskxColumns {
+public class SsklColumns {
 	/**
-	 * Sskx.Bezeichnung_Signal
+	 * Sskl.Bezeichnung_Signal
 	 */
 	public static final String Bezeichnung_Signal = "A";
 
 	/**
-	 * Sskx.Standortmerkmale.Standort.Strecke
+	 * Sskl.Standortmerkmale.Standort.Strecke
 	 */
 	public static final String Strecke = "B";
 
 	/**
-	 * Sskx.Standortmerkmale.Standort.km
+	 * Sskl.Standortmerkmale.Standort.km
 	 */
 	public static final String km = "C";
 
 	/**
-	 * Sskx.Standortmerkmale.Standort.Gleis
+	 * Sskl.Standortmerkmale.Standort.Gleis
 	 */
 	public static final String Gleis = "D";
 
 	/**
-	 * Sskx.Standortmerkmale.Lichtraumprofil
+	 * Sskl.Standortmerkmale.Lichtraumprofil
 	 */
 	public static final String Lichtraumprofil = "E";
 
 	/**
-	 * Sskx.Standortmerkmale.Ueberhoehung
+	 * Sskl.Standortmerkmale.Ueberhoehung
 	 */
 	public static final String Ueberhoehung = "F";
 
 	/**
-	 * Sskx.Standortmerkmale.Abstand_Mastmitte.links
+	 * Sskl.Standortmerkmale.Abstand_Mastmitte.links
 	 */
 	public static final String Abstand_Mastmitte_links = "G";
 
 	/**
-	 * Sskx.Standortmerkmale.Abstand_Mastmitte.rechts
+	 * Sskl.Standortmerkmale.Abstand_Mastmitte.rechts
 	 */
 	public static final String Abstand_Mastmitte_rechts = "H";
 
 	/**
-	 * Sskx.konstruktive_Merkmale.Anordnung.Befestigung
+	 * Sskl.konstruktive_Merkmale.Anordnung.Befestigung
 	 */
 	public static final String Befestigung = "I";
 
 	/**
-	 * Sskx.konstruktive_Merkmale.Anordnung.Regelzeichnung
+	 * Sskl.konstruktive_Merkmale.Anordnung.Regelzeichnung
 	 */
 	public static final String Regelzeichnung = "J";
 
 	/**
-	 * Sskx.konstruktive_Merkmale.Fundament.Art_Regelzeichnung
+	 * Sskl.konstruktive_Merkmale.Fundament.Art_Regelzeichnung
 	 */
 	public static final String Art_Regelzeichnung = "K";
 
 	/**
-	 * Sskx.konstruktive_Merkmale.Fundament.Hoehe
+	 * Sskl.konstruktive_Merkmale.Fundament.Hoehe
 	 */
 	public static final String Hoehe = "L";
 
 	/**
-	 * Sskx.Signalisierung.Signalbegriffe.Bezeichnung
+	 * Sskl.Signalisierung.Signalbegriffe.Bezeichnung
 	 */
 	public static final String Signalbegriffe_Bezeichnung = "M";
 
 	/**
-	 * Sskx.Signalisierung.Signalbegriffe.Regelzeichnung
+	 * Sskl.Signalisierung.Signalbegriffe.Regelzeichnung
 	 */
 	public static final String Signalbegriffe_Regelzeichnung = "N";
 
 	/**
-	 * Sskx.Bemerkung
+	 * Sskl.Bemerkung
 	 */
 	public static final String Bemerkung = "O";
 }

java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskx/SskxDescriptionService.java → java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskl/SsklDescriptionService.java

@@ -8,10 +8,10 @@
  * SPDX-License-Identifier: EPL-2.0
  * 
  */
-package org.eclipse.set.feature.table.pt1.sskx;
+package org.eclipse.set.feature.table.pt1.sskl;
 
 import org.eclipse.set.core.services.part.PartDescriptionService;
-import org.eclipse.set.feature.table.AbstractESTWSupplementTableDesciption;
+import org.eclipse.set.feature.table.AbstractESTWTableDescription;
 import org.eclipse.set.feature.table.pt1.messages.Messages;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
@@ -22,24 +22,23 @@
  * @author Truong
  */
 @Component(service = PartDescriptionService.class)
-public class SskxDescriptionService
-		extends AbstractESTWSupplementTableDesciption {
+public class SsklDescriptionService extends AbstractESTWTableDescription {
 	@Reference
 	Messages messages;
 
 	@Override
 	protected String getToolboxViewName() {
-		return messages.SskxDescriptionService_ViewName;
+		return messages.SsklDescriptionService_ViewName;
 	}
 
 	@Override
 	protected String getToolboxViewTooltip() {
-		return messages.SskxDescriptionService_ViewTooltip;
+		return messages.SsklDescriptionService_ViewTooltip;
 	}
 
 	@Override
 	protected String getTableShortcut() {
-		return messages.ToolboxTableNameSskxShort;
+		return messages.ToolboxTableNameSsklShort;
 	}
 
 }

java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskx/SskxTransformationService.java → java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskl/SsklTransformationService.java

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  * 
  */
-package org.eclipse.set.feature.table.pt1.sskx;
+package org.eclipse.set.feature.table.pt1.sskl;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -49,10 +49,10 @@
  */
 @Component(service = {
 		PlanPro2TableTransformationService.class }, immediate = true, property = {
-				"table.category=supplement-estw", "table.shortcut=sskx",
+				"table.category=estw", "table.shortcut=sskl",
 				EventConstants.EVENT_TOPIC + "=" + Events.CLOSE_PART,
 				EventConstants.EVENT_TOPIC + "=" + Events.CLOSE_SESSION })
-public class SskxTransformationService extends
+public class SsklTransformationService extends
 		AbstractPlanPro2TableTransformationService implements EventHandler {
 
 	@Reference
@@ -69,38 +69,38 @@ public class SskxTransformationService extends
 	/**
 	 * constructor.
 	 */
-	public SskxTransformationService() {
+	public SsklTransformationService() {
 		super();
 	}
 
 	@Override
 	protected String getTableHeading() {
-		return messages.SskxTableView_Heading;
+		return messages.SsklTableView_Heading;
 	}
 
 	@Override
 	public TableNameInfo getTableNameInfo() {
-		return new TableNameInfo(messages.ToolboxTableNameSskxLong,
-				messages.ToolboxTableNameSskxPlanningNumber,
-				messages.ToolboxTableNameSskxShort,
-				messages.ToolboxTableNameSskxRil);
+		return new TableNameInfo(messages.ToolboxTableNameSsklLong,
+				messages.ToolboxTableNameSsklPlanningNumber,
+				messages.ToolboxTableNameSsklShort,
+				messages.ToolboxTableNameSsklRil);
 	}
 
 	@Override
 	public TableModelTransformator<MultiContainer_AttributeGroup> createTransformator() {
-		return new SskxTransformator(cols, enumTranslationService, bankService,
-				eventAdmin, messages.ToolboxTableNameSskxShort);
+		return new SsklTransformator(cols, enumTranslationService, bankService,
+				eventAdmin, messages.ToolboxTableNameSsklShort);
 	}
 
 	@Override
 	public void handleEvent(final Event event) {
 		final String property = (String) event.getProperty(IEventBroker.DATA);
-		if (messages.ToolboxTableNameSskxShort.toLowerCase().equals(property)
+		if (messages.ToolboxTableNameSsklShort.toLowerCase().equals(property)
 				|| event.getTopic().equals(Events.CLOSE_SESSION)) {
 			Thread.getAllStackTraces().keySet().forEach(thread -> {
 				if (thread.getName()
 						.toLowerCase()
-						.startsWith(messages.ToolboxTableNameSskxShort
+						.startsWith(messages.ToolboxTableNameSsklShort
 								.toLowerCase())) {
 					thread.interrupt();
 				}
@@ -110,17 +110,17 @@ public void handleEvent(final Event event) {
 
 	@Override
 	protected String getShortcut() {
-		return messages.ToolboxTableNameSskxShort.toLowerCase();
+		return messages.ToolboxTableNameSsklShort.toLowerCase();
 	}
 
 	@Override
 	protected List<String> getTopologicalColumnPosition() {
-		return List.of(SskxColumns.Gleis, SskxColumns.Lichtraumprofil);
+		return List.of(SsklColumns.Gleis, SsklColumns.Lichtraumprofil);
 	}
 
 	@Override
 	protected String getRemarkColumnPosition() {
-		return SskxColumns.Bemerkung;
+		return SsklColumns.Bemerkung;
 	}
 
 	@Override
@@ -130,7 +130,7 @@ protected Map<Class<?>, String> getFootnotesColumnReferences() {
 
 	@Override
 	protected Pt1TableCategory getTableCategory() {
-		return Pt1TableCategory.ESTW_SUPPLEMENT;
+		return Pt1TableCategory.ESTW;
 	}
 
 	@Override
@@ -143,7 +143,7 @@ public Comparator<RowGroup> getRowGroupComparator(
 					}
 					return null;
 				})
-				.sort(SskxColumns.Bezeichnung_Signal,
+				.sort(SsklColumns.Bezeichnung_Signal,
 						CellComparatorType.LEXICOGRAPHICAL,
 						SortDirectionEnum.ASC)
 				.build();
@@ -158,7 +158,7 @@ public boolean isObjectBelongToRendereArea(final Ur_Objekt obj,
 		if (obj instanceof final Signal signal) {
 			return areas.stream()
 					.anyMatch(area -> SignalExtensions
-							.isSskxSignalBelongToArea(signal, area));
+							.isSsklSignalBelongToArea(signal, area));
 		}
 
 		return false;