From 07856bcf8c791969a550ba0cee64f6341b5b3b8e Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Mon, 30 Mar 2026 12:50:54 +0200 Subject: [PATCH 1/3] Pt1 Table: add Ril-Number by export --- .../OSGI-INF/l10n/bundle.properties | 27 +++- ...actPlanPro2TableTransformationService.java | 2 +- .../feature/table/pt1/messages/Messages.java | 131 ++++++++++++++++++ .../pt1/ssbb/SsbbTransformationService.java | 3 +- .../pt1/ssit/SsitTransformationService.java | 3 +- .../pt1/sska/SskaTransformationService.java | 3 +- .../pt1/sskf/SskfTransformationService.java | 3 +- .../pt1/sskg/SskgTransformationService.java | 3 +- .../pt1/ssko/SskoTransformationService.java | 3 +- .../pt1/sskp/SskpTransformationService.java | 3 +- .../sskp/dm/SskpDmTransformationService.java | 3 +- .../pt1/ssks/SsksTransformationService.java | 3 +- .../pt1/sskt/SsktTransformationService.java | 3 +- .../pt1/sskw/SskwTransformationService.java | 3 +- .../pt1/sskz/SskzTransformationService.java | 3 +- .../pt1/ssla/SslaTransformationService.java | 3 +- .../pt1/sslb/SslbTransformationService.java | 3 +- .../pt1/ssld/SsldTransformationService.java | 3 +- .../pt1/sslf/SslfTransformationService.java | 3 +- .../pt1/ssli/SsliTransformationService.java | 3 +- .../pt1/ssln/SslnTransformationService.java | 3 +- .../pt1/sslr/SslrTransformationService.java | 3 +- .../pt1/ssls/SslsTransformationService.java | 3 +- .../pt1/sslw/SslwTransformationService.java | 3 +- .../pt1/sslz/SslzTransformationService.java | 3 +- .../pt1/ssvu/SsvuTransformationService.java | 3 +- .../pt1/ssza/SszaTransformationService.java | 3 +- .../pt1/sszs/SszsTransformationService.java | 3 +- .../pt1/sszw/SszwTransformationService.java | 3 +- .../pt1/sxxx/SxxxTransformationService.java | 3 +- .../table/export/PlanProExportPart.java | 6 +- .../table/export/TableCheckboxTreeModel.java | 2 +- .../table/internal/TableServiceImpl.java | 4 +- .../table/overview/TableOverviewPart.java | 6 +- .../rootdir/data/export/pdf/titlebox.xsl | 2 +- .../PlanProToTitleboxTransformation.xtend | 3 +- .../extensions/utils/TableNameInfo.java | 78 ++--------- 37 files changed, 234 insertions(+), 108 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/OSGI-INF/l10n/bundle.properties b/java/bundles/org.eclipse.set.feature.table.pt1/OSGI-INF/l10n/bundle.properties index 99394c99a9..3fb5c71b8f 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/OSGI-INF/l10n/bundle.properties +++ b/java/bundles/org.eclipse.set.feature.table.pt1/OSGI-INF/l10n/bundle.properties @@ -4,6 +4,7 @@ SsbbDescriptionService_ViewTooltip=Bedieneinrichtungstabelle BÜ ToolboxTableNameSsbbLong=Bedieneinrichtungstabelle BÜ ToolboxTableNameSsbbPlanningNumber=23/13 ToolboxTableNameSsbbShort=Ssbb +ToolboxTableNameSsbbRil=819.0102A27 SskaDescriptionService_ViewName=Sska – Elementansteuertabelle SskaDescriptionService_ViewTooltip=Elementansteuertabelle @@ -11,6 +12,7 @@ ToolboxTableNameSskaLong=Elementansteuertabelle ToolboxTableNameSskaPlanningNumber=10/03 ToolboxTableNameSskaShort=Sska SskaTableView_Heading=Elementansteuertabelle – Sska +ToolboxTableNameSskaRil=819.0102A24 SskfDescriptionService_ViewName=Sskf – Freimeldetabelle SskfDescriptionService_ViewTooltip=Freimeldetabelle @@ -18,6 +20,7 @@ ToolboxTableNameSskfLong=Freimeldetabelle ToolboxTableNameSskfPlanningNumber=10/19 ToolboxTableNameSskfShort=Sskf SskfTableView_Heading=Freimeldetabelle – Sskf +ToolboxTableNameSskfRil=819.0102A12 SskgDescriptionService_ViewName=Sskg – Gleisschaltmitteltabelle SskgDescriptionService_ViewTooltip=Gleisschaltmitteltabelle @@ -25,6 +28,7 @@ ToolboxTableNameSskgLong=Gleisschaltmitteltabelle ToolboxTableNameSskgPlanningNumber=10/19 ToolboxTableNameSskgShort=Sskg SskgTableView_Heading=Gleisschaltmitteltabelle – Sskg +ToolboxTableNameSskgRil=819.0102A13 SskoDescriptionService_ViewName=Ssko – Schlosstabelle SskoDescriptionService_ViewTooltip=Schlosstabelle @@ -32,6 +36,7 @@ ToolboxTableNameSskoLong=Schlosstabelle ToolboxTableNameSskoPlanningNumber=10/27 ToolboxTableNameSskoShort=Ssko SskoTableView_Heading=Schlosstabelle – Ssko +ToolboxTableNameSskoRil=819.0102A28 SskpDescriptionService_ViewName=Sskp – PZB-Tabelle SskpDescriptionService_ViewTooltip=PZB-Tabelle @@ -39,6 +44,7 @@ ToolboxTableNameSskpLong=PZB-Tabelle ToolboxTableNameSskpPlanningNumber=10/38 ToolboxTableNameSskpShort=Sskp SskpTableView_Heading=PZB-Tabelle – Sskp +ToolboxTableNameSskpRil=819.0102A30 SsksDescriptionService_ViewName=Ssks – Signaltabelle SsksDescriptionService_ViewTooltip=Signaltabelle @@ -46,6 +52,7 @@ ToolboxTableNameSsksLong=Signaltabelle ToolboxTableNameSsksPlanningNumber=10/18 ToolboxTableNameSsksShort=Ssks SsksTableView_Heading=Signaltabelle – Ssks +ToolboxTableNameSsksRil=819.0102A11 SskwDescriptionService_ViewName=Sskw – Weichentabelle SskwDescriptionService_ViewTooltip=Weichentabelle @@ -53,6 +60,7 @@ ToolboxTableNameSskwLong=Weichentabelle ToolboxTableNameSskwPlanningNumber=10/23 ToolboxTableNameSskwShort=Sskw SskwTableView_Heading=Weichentabelle – Sskw +ToolboxTableNameSskwRil=819.0102A20 SslaDescriptionService_ViewName=Ssla – Tabelle der aneinandergereihten Fahrstraßen SslaDescriptionService_ViewTooltip=Tabelle der aneinandergereihten Fahrstraßen @@ -60,6 +68,7 @@ ToolboxTableNameSslaLong=Tabelle der aneinandergereihten Fahrstraßen ToolboxTableNameSslaPlanningNumber=10/21 ToolboxTableNameSslaShort=Ssla SslaTableView_Heading=Aneinandergereihte Fahrstraßentabelle – Ssla +ToolboxTableNameSslaRil=819.0102A16 SslbDescriptionService_ViewName=Sslb – Streckenblocktabelle SslbDescriptionService_ViewTooltip=Streckenblocktabelle @@ -67,6 +76,7 @@ ToolboxTableNameSslbLong=Streckenblocktabelle ToolboxTableNameSslbPlanningNumber=10/33 ToolboxTableNameSslbShort=Sslb SslbTableView_Heading=Streckenblocktabelle – Sslb +ToolboxTableNameSslbRil=819.0102A22 SsldDescriptionService_ViewName=Ssld – Durchrutschweg- und Gefahrpunkttabelle SsldDescriptionService_ViewTooltip=Durchrutschweg- und Gefahrpunkttabelle @@ -74,6 +84,7 @@ ToolboxTableNameSsldLong=Durchrutschweg- und Gefahrpunkttabelle ToolboxTableNameSsldPlanningNumber=10/20 ToolboxTableNameSsldShort=Ssld SsldTableView_Heading=Durchrutschwegtabelle – Ssld +ToolboxTableNameSsldRil=819.0102A14 SslfDescriptionService_ViewName=Sslf – Flankenschutztabelle SslfDescriptionService_ViewTooltip=Flankenschutztabelle @@ -81,6 +92,7 @@ ToolboxTableNameSslfLong=Flankenschutztabelle ToolboxTableNameSslfPlanningNumber=10/24 ToolboxTableNameSslfShort=Sslf SslfTableView_Heading=Flankenschutztabelle – Sslf +ToolboxTableNameSslfRil=819.0102A19 SsliDescriptionService_ViewName=Ssli – Inselgleistabelle SsliDescriptionService_ViewTooltip=Inselgleistabelle @@ -88,6 +100,7 @@ ToolboxTableNameSsliLong=Inselgleistabelle ToolboxTableNameSsliPlanningNumber=10/21 ToolboxTableNameSsliShort=Ssli Ssli_Heading=Inselgleistabelle – Ssli +ToolboxTableNameSsliRil=819.0102A18 SslnDescriptionService_ViewName=Ssln – Nahbedienungstabelle SslnDescriptionService_ViewTooltip=Nahbedienungstabelle @@ -95,6 +108,7 @@ ToolboxTableNameSslnLong=Nahbedienungstabelle ToolboxTableNameSslnPlanningNumber=10/30 ToolboxTableNameSslnShort=Ssln SslnTableView_Heading=Nahbedienungstabelle – Ssln +ToolboxTableNameSslnRil=819.0102A25 SslrDescriptionService_ViewName=Sslr – Rangierstraßentabelle SslrDescriptionService_ViewTooltip=Rangierstraßentabelle @@ -102,6 +116,7 @@ ToolboxTableNameSslrLong=Rangierstraßentabelle ToolboxTableNameSslrPlanningNumber=10/22 ToolboxTableNameSslrShort=Sslr Sslr_Heading=Rangierstraßentabelle – Sslr +ToolboxTableNameSslrRil=819.0102A17 SslwDescriptionService_ViewName=Sslw – Zwieschutzweichentabelle SslwDescriptionService_ViewTooltip=Zwieschutzweichentabelle @@ -116,6 +131,7 @@ ToolboxTableNameSslzLong=Zugstraßentabelle ToolboxTableNameSslzPlanningNumber=10/21 ToolboxTableNameSslzShort=Sslz SslzTableView_Heading=Zugstraßentabelle – Sslz +ToolboxTableNameSslzRil=819.0102A15 SsvuDescriptionService_ViewName=Ssvu – Übertragungswegtabelle SsvuDescriptionService_ViewTooltip=Übertragungswegtabelle @@ -123,6 +139,7 @@ ToolboxTableNameSsvuLong=Übertragungswegtabelle ToolboxTableNameSsvuPlanningNumber=10/39 ToolboxTableNameSsvuShort=Ssvu SsvuTableView_Heading=Übertragungswegtabelle – Ssvu +ToolboxTableNameSsvuRil=819.0102A23 SsitDescriptionService_ViewName=Ssit – Bedieneinrichtungstabelle Stw SsitDescriptionService_ViewTooltip=Bedieneinrichtungstabelle Stw @@ -130,6 +147,7 @@ ToolboxTableNameSsitLong=Bedieneinrichtungstabelle Stw ToolboxTableNameSsitPlanningNumber=10/46 ToolboxTableNameSsitShort=Ssit SsitTableView_Heading=Bedieneinrichtungstabelle Stw +ToolboxTableNameSsitRil=819.0102A26 SsktDescriptionService_ViewName=Sskt – Tabelle der Technik- und Bedienstandorte SsktDescriptionService_ViewTooltip=Tabelle der Technik- und Bedienstandorte @@ -137,6 +155,7 @@ ToolboxTableNameSsktLong=Tabelle der Technik- und Bedienstandorte ToolboxTableNameSsktPlanningNumber=10/03 ToolboxTableNameSsktShort=Sskt SsktTableView_Heading=Tabelle der Technik- und Bedienstandorte – Sskt +ToolboxTableNameSsktRil=819.0102A29 SslwDescriptionService_ViewName=Sslw – Zwieschutzweichentabelle SslwDescriptionService_ViewTooltip=Zwieschutzweichentabelle @@ -144,6 +163,7 @@ ToolboxTableNameSslwLong=Zwieschutzweichentabelle ToolboxTableNameSslwPlanningNumber=10/25 ToolboxTableNameSslwShort=Sslw SslwTableView_Heading=Zwieschutzweichentabelle – Sslz +ToolboxTableNameSslwRil=819.0102A21 SszaDescriptionService_ViewName=Ssza – ETCS-Datenpunkttabelle SszaDescriptionService_ViewTooltip=ETCS-Datenpunkttabelle @@ -151,6 +171,7 @@ ToolboxTableNameSszaLong=ETCS-Datenpunkttabelle ToolboxTableNameSszaPlanningNumber=42/11 ToolboxTableNameSszaShort=Ssza SszaTableView_Heading=ETCS-Datenpunkttabelle – Ssza +ToolboxTableNameSszaRil= SszsDescriptionService_ViewName=Sszs – ETCS Melde- und Kommandoanschaltung Signale SszsDescriptionService_ViewTooltip=ETCS Melde- und Kommandoanschaltung Signale @@ -158,6 +179,7 @@ ToolboxTableNameSszsLong=ETCS Melde- und Kommandoanschaltung Signale ToolboxTableNameSszsPlanningNumber=42/09 ToolboxTableNameSszsShort=Sszs SszsTableView_Heading=ETCS Melde- und Kommandoanschaltung Signale – Sszs +ToolboxTableNameSszsRil= SszwDescriptionService_ViewName=Sszw – ETCS Melde- und Kommandoanschaltung Weichen SszwDescriptionService_ViewTooltip=ETCS Melde- und Kommandoanschaltung Weichen @@ -165,6 +187,7 @@ ToolboxTableNameSszwLong=ETCS Melde- und Kommandoanschaltung Weichen ToolboxTableNameSszwPlanningNumber=42/10 ToolboxTableNameSszwShort=Sszw SszwTableView_Heading=ETCS Melde- und Kommandoanschaltung Weichen – Sszw +ToolboxTableNameSszwRil= SskzDescriptionService_ViewName=Sskz – Zuordnungstabelle FEAK/FEAS SskzDescriptionService_ViewTooltip=Zuordnungstabelle FEAK/FEAS @@ -172,6 +195,7 @@ ToolboxTableNameSskzLong=Zuordnungstabelle FEAK/FEAS ToolboxTableNameSskzPlanningNumber=??? ToolboxTableNameSskzShort=Sskz SskzTableView_Heading=Zuordnungstabelle FEAK/FEAS – Sskz +ToolboxTableNameSskzRil= SskpDmDescriptionService_ViewName=Sskp_dm – PZB-Tabelle ToolboxTableNameSskpDmShort=Sskp_dm @@ -183,6 +207,7 @@ SslsTableView_Heading=Signalisierungstabelle – Ssls ToolboxTableNameSslsShort=Ssls ToolboxTableNameSslsLong=Signalisierungstabelle ToolboxTableNameSslsPlanningNumber=?? +ToolboxTableNameSslsRil= SxxxDescriptionService_ViewName=Sxxx – Tabelle der Bearbeitungsvermerke SxxxDescriptionService_ViewTooltip=Tabelle der Bearbeitungsvermerke @@ -190,4 +215,4 @@ SxxxTableView_Heading=Tabelle der Bearbeitungsvermerke – Sxxx ToolboxTableNameSxxxShort=Sxxx ToolboxTableNameSxxxLong=Tabelle der Bearbeitungsvermerke ToolboxTableNameSxxxPlanningNumber=?? - +ToolboxTableNameSxxxRil= diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/AbstractPlanPro2TableTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/AbstractPlanPro2TableTransformationService.java index a2f51165d8..e9878af97a 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/AbstractPlanPro2TableTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/AbstractPlanPro2TableTransformationService.java @@ -80,7 +80,7 @@ protected Set getColumnsListe( public ColumnDescriptor fillHeaderDescriptions( final ColumnDescriptorModelBuilder builder) { final GroupBuilder root = builder.createRootColumn(getTableHeading()); - String tableShortcut = getTableNameInfo().getShortName().toLowerCase(); + String tableShortcut = getTableNameInfo().shortName().toLowerCase(); // IMPROVE: this is only a temporary situation for the table // Sskp_dm if (tableShortcut.equals("sskp_dm")) { //$NON-NLS-1$ diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/messages/Messages.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/messages/Messages.java index 57fb988a89..0f0f09bb72 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/messages/Messages.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/messages/Messages.java @@ -58,6 +58,11 @@ private void bindBundleLocalization( */ public String ToolboxTableNameSsbbShort; + /** + * 819.0102A27 + */ + public String ToolboxTableNameSsbbRil; + /** * Ssit (Bedieneinrichtungstabelle Stw) */ @@ -78,6 +83,11 @@ private void bindBundleLocalization( */ public String ToolboxTableNameSsitPlanningNumber; + /** + * 819.0102A26 + */ + public String ToolboxTableNameSsitRil; + /** * Bedieneinrichtungstabelle Stw */ @@ -118,6 +128,11 @@ private void bindBundleLocalization( */ public String SskaTableView_Heading; + /** + * 819.0102A24 + */ + public String ToolboxTableNameSskaRil; + /** * Sskf (Freimeldetabelle) */ @@ -148,6 +163,11 @@ private void bindBundleLocalization( */ public String SskfTableView_Heading; + /** + * 819.0102A12 + */ + public String ToolboxTableNameSskfRil; + /** * Sskg (Gleisschaltmitteltabelle) */ @@ -178,8 +198,14 @@ private void bindBundleLocalization( */ public String SskgTableView_Heading; + /** + * 819.0102A13 + */ + public String ToolboxTableNameSskgRil; + /** * Ssko (Schlosstabelle) + * */ public String SskoDescriptionService_ViewName; @@ -208,6 +234,11 @@ private void bindBundleLocalization( */ public String SskoTableView_Heading; + /** + * 819.0102A28 + */ + public String ToolboxTableNameSskoRil; + /** * Sskp – PZB-Tabelle */ @@ -238,6 +269,11 @@ private void bindBundleLocalization( */ public String SskpTableView_Heading; + /** + * 819.0102A30 + */ + public String ToolboxTableNameSskpRil; + /** * Ssks (Signaltabelle) */ @@ -268,6 +304,11 @@ private void bindBundleLocalization( */ public String SsksTableView_Heading; + /** + * 819.0102A11 + */ + public String ToolboxTableNameSsksRil; + /** * Sskt (Tabelle der Technik- und Bedienstandorte) */ @@ -298,6 +339,11 @@ private void bindBundleLocalization( */ public String SsktTableView_Heading; + /** + * 819.0102A29 + */ + public String ToolboxTableNameSsktRil; + /** * Sskw (Weichentabelle) */ @@ -328,6 +374,11 @@ private void bindBundleLocalization( */ public String SskwTableView_Heading; + /** + * 819.0102A20 + */ + public String ToolboxTableNameSskwRil; + /** * Ssla (Tabelle der aneinandergereihten Fahrstraßen) */ @@ -358,6 +409,11 @@ private void bindBundleLocalization( */ public String SslaTableView_Heading; + /** + * 819.0102A16 + */ + public String ToolboxTableNameSslaRil; + /** * Sslb (Streckenblocktabelle) */ @@ -393,6 +449,11 @@ private void bindBundleLocalization( */ public String SsldDescriptionService_ViewName; + /** + * 819.0102A22 + */ + public String ToolboxTableNameSslbRil; + /** * Durchrutschweg- und Gefahrpunkttabelle */ @@ -418,6 +479,11 @@ private void bindBundleLocalization( */ public String SsldTableView_Heading; + /** + * 819.0102A14 + */ + public String ToolboxTableNameSsldRil; + /** * Sslf (Flankenschutztabelle) */ @@ -448,6 +514,11 @@ private void bindBundleLocalization( */ public String SslfTableView_Heading; + /** + * 819.0102A19 + */ + public String ToolboxTableNameSslfRil; + /** * Ssli (Inselgleistabelle) */ @@ -478,6 +549,11 @@ private void bindBundleLocalization( */ public String Ssli_Heading; + /** + * 819.0102A18 + */ + public String ToolboxTableNameSsliRil; + /** * Ssln (Nahbedienungstabelle) */ @@ -508,6 +584,11 @@ private void bindBundleLocalization( */ public String SslnTableView_Heading; + /** + * 819.0102A25 + */ + public String ToolboxTableNameSslnRil; + /** * Sslr (Rangierstraßentabelle) */ @@ -538,6 +619,11 @@ private void bindBundleLocalization( */ public String Sslr_Heading; + /** + * 819.0102A17 + */ + public String ToolboxTableNameSslrRil; + /** * Sslw (Zwieschutzweichentabelle) */ @@ -568,6 +654,11 @@ private void bindBundleLocalization( */ public String SslwTableView_Heading; + /** + * 819.0102A21 + */ + public String ToolboxTableNameSslwRil; + /** * Sslz (Zugstraßentabelle) */ @@ -598,6 +689,11 @@ private void bindBundleLocalization( */ public String SslzTableView_Heading; + /** + * 819.0102A15 + */ + public String ToolboxTableNameSslzRil; + /** * Ssvu (Übertragungswegtabelle) */ @@ -628,6 +724,11 @@ private void bindBundleLocalization( */ public String SsvuTableView_Heading; + /** + * 819.0102A23 + */ + public String ToolboxTableNameSsvuRil; + /** * Ssza (Datenpunkttabelle) */ @@ -658,6 +759,11 @@ private void bindBundleLocalization( */ public String SszaTableView_Heading; + /** + * + */ + public String ToolboxTableNameSszaRil; + /** * ETCS Melde- und Kommandoanschaltung Signale */ @@ -688,6 +794,11 @@ private void bindBundleLocalization( */ public String SszsDescriptionService_ViewTooltip; + /** + * + */ + public String ToolboxTableNameSszsRil; + /** * Sszw – ETCS Melde- und Kommandoanschaltung Weichen */ @@ -718,6 +829,11 @@ private void bindBundleLocalization( */ public String SszwTableView_Heading; + /** + * + */ + public String ToolboxTableNameSszwRil; + /** * Sskz – Zuordnungstabelle FEAK/FEAS */ @@ -743,6 +859,11 @@ private void bindBundleLocalization( */ public String ToolboxTableNameSskzPlanningNumber; + /** + * + */ + public String ToolboxTableNameSskzRil; + /** * Zuordnungstabelle FEAK/FEAS – Sskz */ @@ -793,6 +914,11 @@ private void bindBundleLocalization( */ public String ToolboxTableNameSslsPlanningNumber; + /** + * + */ + public String ToolboxTableNameSslsRil; + /** * Sxxx */ @@ -823,4 +949,9 @@ private void bindBundleLocalization( */ public String SxxxDescriptionService_ViewTooltip; + /** + * + */ + public String ToolboxTableNameSxxxRil; + } diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssbb/SsbbTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssbb/SsbbTransformationService.java index 0b7f1d8aad..8f17e5a0ad 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssbb/SsbbTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssbb/SsbbTransformationService.java @@ -59,7 +59,8 @@ protected String getTableHeading() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSsbbLong, messages.ToolboxTableNameSsbbPlanningNumber, - messages.ToolboxTableNameSsbbShort); + messages.ToolboxTableNameSsbbShort, + messages.ToolboxTableNameSsbbRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssit/SsitTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssit/SsitTransformationService.java index da6d4f598e..c1bf0551f4 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssit/SsitTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssit/SsitTransformationService.java @@ -64,7 +64,8 @@ public Comparator getRowGroupComparator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSsitLong, messages.ToolboxTableNameSsitPlanningNumber, - messages.ToolboxTableNameSsitShort); + messages.ToolboxTableNameSsitShort, + messages.ToolboxTableNameSsitRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sska/SskaTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sska/SskaTransformationService.java index 61abb8c8de..f7e7d772cc 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sska/SskaTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sska/SskaTransformationService.java @@ -76,7 +76,8 @@ public Comparator getRowGroupComparator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSskaLong, messages.ToolboxTableNameSskaPlanningNumber, - messages.ToolboxTableNameSskaShort); + messages.ToolboxTableNameSskaShort, + messages.ToolboxTableNameSskaRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskf/SskfTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskf/SskfTransformationService.java index 9c114c9120..66f88b0b79 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskf/SskfTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskf/SskfTransformationService.java @@ -71,7 +71,8 @@ public Comparator getRowGroupComparator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSskfLong, messages.ToolboxTableNameSskfPlanningNumber, - messages.ToolboxTableNameSskfShort); + messages.ToolboxTableNameSskfShort, + messages.ToolboxTableNameSskfRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskg/SskgTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskg/SskgTransformationService.java index 2d60a33c63..8542e1044a 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskg/SskgTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskg/SskgTransformationService.java @@ -82,7 +82,8 @@ public Comparator getRowGroupComparator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSskgLong, messages.ToolboxTableNameSskgPlanningNumber, - messages.ToolboxTableNameSskgShort); + messages.ToolboxTableNameSskgShort, + messages.ToolboxTableNameSskgRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssko/SskoTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssko/SskoTransformationService.java index cb41084ce8..b50315cbea 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssko/SskoTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssko/SskoTransformationService.java @@ -60,7 +60,8 @@ public AbstractPlanPro2TableModelTransformator createTransformator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSskoLong, messages.ToolboxTableNameSskoPlanningNumber, - messages.ToolboxTableNameSskoShort); + messages.ToolboxTableNameSskoShort, + messages.ToolboxTableNameSskoRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskp/SskpTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskp/SskpTransformationService.java index 588be5fd88..81f79d77d2 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskp/SskpTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskp/SskpTransformationService.java @@ -88,7 +88,8 @@ public AbstractPlanPro2TableModelTransformator createTransformator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSskpLong, messages.ToolboxTableNameSskpPlanningNumber, - messages.ToolboxTableNameSskpShort); + messages.ToolboxTableNameSskpShort, + messages.ToolboxTableNameSskpRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskp/dm/SskpDmTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskp/dm/SskpDmTransformationService.java index 340adb266b..a30aeb3c8d 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskp/dm/SskpDmTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskp/dm/SskpDmTransformationService.java @@ -56,7 +56,8 @@ public AbstractPlanPro2TableModelTransformator createTransformator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSskpLong, messages.ToolboxTableNameSskpPlanningNumber, - messages.ToolboxTableNameSskpDmShort); + messages.ToolboxTableNameSskpDmShort, + messages.ToolboxTableNameSskpRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformationService.java index 90155e53c6..40ef7072a7 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformationService.java @@ -80,7 +80,8 @@ public AbstractPlanPro2TableModelTransformator createTransformator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSsksLong, messages.ToolboxTableNameSsksPlanningNumber, - messages.ToolboxTableNameSsksShort); + messages.ToolboxTableNameSsksShort, + messages.ToolboxTableNameSsksRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskt/SsktTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskt/SsktTransformationService.java index bde437b7f2..797a3887ee 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskt/SsktTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskt/SsktTransformationService.java @@ -72,7 +72,8 @@ public Comparator getRowGroupComparator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSsktLong, messages.ToolboxTableNameSsktPlanningNumber, - messages.ToolboxTableNameSsktShort); + messages.ToolboxTableNameSsktShort, + messages.ToolboxTableNameSsktRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskw/SskwTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskw/SskwTransformationService.java index 901c164aa2..906b5dac6c 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskw/SskwTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskw/SskwTransformationService.java @@ -77,7 +77,8 @@ public Comparator getRowGroupComparator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSskwLong, messages.ToolboxTableNameSskwPlanningNumber, - messages.ToolboxTableNameSskwShort); + messages.ToolboxTableNameSskwShort, + messages.ToolboxTableNameSskwRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskz/SskzTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskz/SskzTransformationService.java index 983e17a60d..597d834734 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskz/SskzTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskz/SskzTransformationService.java @@ -71,7 +71,8 @@ protected String getTableHeading() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSskzLong, messages.ToolboxTableNameSskzPlanningNumber, - messages.ToolboxTableNameSskzShort); + messages.ToolboxTableNameSskzShort, + messages.ToolboxTableNameSskzRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssla/SslaTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssla/SslaTransformationService.java index 31f9451f71..5d42c7240a 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssla/SslaTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssla/SslaTransformationService.java @@ -83,7 +83,8 @@ public Comparator getRowGroupComparator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSslaLong, messages.ToolboxTableNameSslaPlanningNumber, - messages.ToolboxTableNameSslaShort); + messages.ToolboxTableNameSslaShort, + messages.ToolboxTableNameSslaRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslb/SslbTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslb/SslbTransformationService.java index b3f453bf6d..a5dc8b6450 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslb/SslbTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslb/SslbTransformationService.java @@ -76,7 +76,8 @@ public Comparator getRowGroupComparator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSslbLong, messages.ToolboxTableNameSslbPlanningNumber, - messages.ToolboxTableNameSslbShort); + messages.ToolboxTableNameSslbShort, + messages.ToolboxTableNameSslbRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformationService.java index 0874f04287..bba72fc1c9 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformationService.java @@ -86,7 +86,8 @@ public Comparator getRowGroupComparator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSsldLong, messages.ToolboxTableNameSsldPlanningNumber, - messages.ToolboxTableNameSsldShort); + messages.ToolboxTableNameSsldShort, + messages.ToolboxTableNameSsldRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslf/SslfTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslf/SslfTransformationService.java index c8749531d3..148ec64eb4 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslf/SslfTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslf/SslfTransformationService.java @@ -72,7 +72,8 @@ public Comparator getRowGroupComparator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSslfLong, messages.ToolboxTableNameSslfPlanningNumber, - messages.ToolboxTableNameSslfShort); + messages.ToolboxTableNameSslfShort, + messages.ToolboxTableNameSslfRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssli/SsliTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssli/SsliTransformationService.java index 8e3a4d2dd5..9e7db10c45 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssli/SsliTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssli/SsliTransformationService.java @@ -68,7 +68,8 @@ public Comparator getRowGroupComparator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSsliLong, messages.ToolboxTableNameSsliPlanningNumber, - messages.ToolboxTableNameSsliShort); + messages.ToolboxTableNameSsliShort, + messages.ToolboxTableNameSsliRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssln/SslnTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssln/SslnTransformationService.java index bd2c715e30..03fcfc1412 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssln/SslnTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssln/SslnTransformationService.java @@ -64,7 +64,8 @@ public Comparator getRowGroupComparator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSslnLong, messages.ToolboxTableNameSslnPlanningNumber, - messages.ToolboxTableNameSslnShort); + messages.ToolboxTableNameSslnShort, + messages.ToolboxTableNameSslnRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslr/SslrTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslr/SslrTransformationService.java index b7e2aa9874..f80e4d2857 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslr/SslrTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslr/SslrTransformationService.java @@ -75,7 +75,8 @@ public Comparator getRowGroupComparator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSslrLong, messages.ToolboxTableNameSslrPlanningNumber, - messages.ToolboxTableNameSslrShort); + messages.ToolboxTableNameSslrShort, + messages.ToolboxTableNameSslrRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssls/SslsTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssls/SslsTransformationService.java index c17c7c617d..315cf015ee 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssls/SslsTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssls/SslsTransformationService.java @@ -65,7 +65,8 @@ protected List getTopologicalColumnPosition() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSslsLong, messages.ToolboxTableNameSslsPlanningNumber, - messages.ToolboxTableNameSslsShort); + messages.ToolboxTableNameSslsShort, + messages.ToolboxTableNameSslsRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslw/SslwTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslw/SslwTransformationService.java index 49bd7527ae..d3a59b87d0 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslw/SslwTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslw/SslwTransformationService.java @@ -71,7 +71,8 @@ public Comparator getRowGroupComparator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSslwLong, messages.ToolboxTableNameSslwPlanningNumber, - messages.ToolboxTableNameSslwShort); + messages.ToolboxTableNameSslwShort, + messages.ToolboxTableNameSslwRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslz/SslzTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslz/SslzTransformationService.java index 27493d1045..a19fb41326 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslz/SslzTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sslz/SslzTransformationService.java @@ -69,7 +69,8 @@ public AbstractPlanPro2TableModelTransformator createTransformator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSslzLong, messages.ToolboxTableNameSslzPlanningNumber, - messages.ToolboxTableNameSslzShort); + messages.ToolboxTableNameSslzShort, + messages.ToolboxTableNameSslzRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssvu/SsvuTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssvu/SsvuTransformationService.java index bc92ffde3e..d4d355640d 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssvu/SsvuTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssvu/SsvuTransformationService.java @@ -71,7 +71,8 @@ public Comparator getRowGroupComparator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSsvuLong, messages.ToolboxTableNameSsvuPlanningNumber, - messages.ToolboxTableNameSsvuShort); + messages.ToolboxTableNameSsvuShort, + messages.ToolboxTableNameSsvuRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssza/SszaTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssza/SszaTransformationService.java index 69d25e8f02..99de0a3fc5 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssza/SszaTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssza/SszaTransformationService.java @@ -71,7 +71,8 @@ public AbstractPlanPro2TableModelTransformator createTransformator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSszaLong, messages.ToolboxTableNameSszaPlanningNumber, - messages.ToolboxTableNameSszaShort); + messages.ToolboxTableNameSszaShort, + messages.ToolboxTableNameSszaRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformationService.java index f1df68e89c..f322145956 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformationService.java @@ -65,7 +65,8 @@ public AbstractPlanPro2TableModelTransformator createTransformator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSszsLong, messages.ToolboxTableNameSszsPlanningNumber, - messages.ToolboxTableNameSszsShort); + messages.ToolboxTableNameSszsShort, + messages.ToolboxTableNameSszsRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszw/SszwTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszw/SszwTransformationService.java index 972be98920..9699695093 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszw/SszwTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszw/SszwTransformationService.java @@ -65,7 +65,8 @@ public AbstractPlanPro2TableModelTransformator createTransformator() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSszwLong, messages.ToolboxTableNameSszwPlanningNumber, - messages.ToolboxTableNameSszwShort); + messages.ToolboxTableNameSszwShort, + messages.ToolboxTableNameSszwRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxTransformationService.java index c5e5509380..d408864245 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxTransformationService.java @@ -70,7 +70,8 @@ protected List getTopologicalColumnPosition() { public TableNameInfo getTableNameInfo() { return new TableNameInfo(messages.ToolboxTableNameSxxxLong, messages.ToolboxTableNameSxxxPlanningNumber, - messages.ToolboxTableNameSxxxShort); + messages.ToolboxTableNameSxxxShort, + messages.ToolboxTableNameSxxxRil); } @Override diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/PlanProExportPart.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/PlanProExportPart.java index 27ff6f859f..f240a58777 100644 --- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/PlanProExportPart.java +++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/PlanProExportPart.java @@ -200,9 +200,9 @@ protected CheckboxTreeModel createTreeModelData() { tableInfo.category().toString()); elements.add(parentElement); } - parentElement.addChild(new CheckBoxTreeElement( - nameInfo.getShortName().toLowerCase(), - nameInfo.getFullDisplayName())); + parentElement.addChild( + new CheckBoxTreeElement(nameInfo.shortName().toLowerCase(), + nameInfo.getFullDisplayName())); }); if (additionalExportService != null) { diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/TableCheckboxTreeModel.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/TableCheckboxTreeModel.java index 74210199bd..20519ecc57 100644 --- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/TableCheckboxTreeModel.java +++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/TableCheckboxTreeModel.java @@ -68,7 +68,7 @@ public CheckBoxTreeElement addElement(final TableInfo info) { } final TableNameInfo nameInfo = tableService.getTableNameInfo(info); final CheckBoxTreeElement newElement = new CheckBoxTreeElement( - nameInfo.getShortName().toLowerCase(), + nameInfo.shortName().toLowerCase(), nameInfo.getFullDisplayName()); tableInfoTreeElementMap.put(info, newElement); addElement(parent, newElement); diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java index 2b293b0a77..f8e75a3aef 100644 --- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java +++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java @@ -283,7 +283,7 @@ public Map> getTableErrors( private void saveTableError(final TableInfo tableInfo, final IModelSession modelSession, final Collection errors) { - final String shortName = getTableNameInfo(tableInfo).getShortName(); + final String shortName = getTableNameInfo(tableInfo).shortName(); final String shortCut = tableInfo.shortcut(); errors.forEach(error -> error.setSource(shortName)); getCacheService() @@ -419,7 +419,7 @@ private void storageFootnotes(final ToolboxFileRole sessionRole, } final Function createKeyValue = info -> { final TableNameInfo nameInfo = getTableNameInfo(info); - return sessionRole.toString() + "/" + nameInfo.getShortName(); //$NON-NLS-1$ + return sessionRole.toString() + "/" + nameInfo.shortName(); //$NON-NLS-1$ }; final UnaryOperator extractShortName = key -> key .substring(key.lastIndexOf("/") + 1); //$NON-NLS-1$ diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/overview/TableOverviewPart.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/overview/TableOverviewPart.java index 95ab92be03..8f7d9a8846 100644 --- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/overview/TableOverviewPart.java +++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/overview/TableOverviewPart.java @@ -8,9 +8,7 @@ */ package org.eclipse.set.feature.table.overview; -import static org.eclipse.set.basis.constants.ToolboxConstants.ESTW_SUPPLEMENT_PART_ID_PREFIX; -import static org.eclipse.set.basis.constants.ToolboxConstants.ESTW_TABLE_PART_ID_PREFIX; -import static org.eclipse.set.basis.constants.ToolboxConstants.ETCS_TABLE_PART_ID_PREFIX; +import static org.eclipse.set.basis.constants.ToolboxConstants.*; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; @@ -311,7 +309,7 @@ private String tableList2DisplayString(final Collection tables) { } final List shortNames = new ArrayList<>(tables.stream() .map(tableInfo -> tableService.getTableNameInfo(tableInfo) - .getShortName()) + .shortName()) .toList()); Collections.sort(shortNames); return shortNames.stream().collect(Collectors.joining(", ")); //$NON-NLS-1$ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/pdf/titlebox.xsl b/java/bundles/org.eclipse.set.feature/rootdir/data/export/pdf/titlebox.xsl index 6788f3db24..c54c94316b 100644 --- a/java/bundles/org.eclipse.set.feature/rootdir/data/export/pdf/titlebox.xsl +++ b/java/bundles/org.eclipse.set.feature/rootdir/data/export/pdf/titlebox.xsl @@ -411,7 +411,7 @@ http://www.eclipse.org/legal/epl-v20.html - + diff --git a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/utils/PlanProToTitleboxTransformation.xtend b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/utils/PlanProToTitleboxTransformation.xtend index 9c2250d758..0a16764a0c 100644 --- a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/utils/PlanProToTitleboxTransformation.xtend +++ b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/utils/PlanProToTitleboxTransformation.xtend @@ -167,7 +167,8 @@ class PlanProToTitleboxTransformation { it.set( 74, '''«mainSchnittstelle.oertlichkeit»«tableName?.planningNumber ?: EMPTY_PLANNING_NUMBER»''') - + + it.set(40, tableName.rilNumber) it.set(99, planungAllgemein.buildLastEditionNumber) if (compareSchnittstelle !== null) { // Fille compare plan information diff --git a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/utils/TableNameInfo.java b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/utils/TableNameInfo.java index 1949d71bd2..a1558e52a7 100644 --- a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/utils/TableNameInfo.java +++ b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/utils/TableNameInfo.java @@ -12,78 +12,22 @@ * Collect table name information. * * @author Schaefer + * @param longName + * the long name + * @param planningNumber + * the planning number + * @param shortName + * the short name + * @param rilNumber + * the ril number */ -public class TableNameInfo { - - private String longName; - - private String planningNumber; - private String shortName; - - /** - * @param longName - * the long name - * @param planningNumber - * the planning number - * @param shortName - * the short name - */ - public TableNameInfo(final String longName, final String planningNumber, - final String shortName) { - this.longName = longName; - this.planningNumber = planningNumber; - this.shortName = shortName; - } - - /** - * @return the long name - */ - public String getLongName() { - return longName; - } - - /** - * @return the planning number - */ - public String getPlanningNumber() { - return planningNumber; - } - - /** - * @return the short name - */ - public String getShortName() { - return shortName; - } +public record TableNameInfo(String longName, String planningNumber, + String shortName, String rilNumber) { /** * @return the full display name */ public String getFullDisplayName() { - return getShortName() + " – " + getLongName(); //$NON-NLS-1$ - } - - /** - * @param longName - * the long name to set - */ - public void setLongName(final String longName) { - this.longName = longName; - } - - /** - * @param planningNumber - * the planning number to set - */ - public void setPlanningNumber(final String planningNumber) { - this.planningNumber = planningNumber; - } - - /** - * @param shortName - * the short name to set - */ - public void setShortName(final String shortName) { - this.shortName = shortName; + return shortName() + " – " + longName(); //$NON-NLS-1$ } } From 5df0335425cafa12677bfcf239371010db41db69 Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Mon, 30 Mar 2026 13:22:09 +0200 Subject: [PATCH 2/3] Fix compile --- ...actPlanPro2TableTransformationService.java | 2 +- .../table/export/PlanProExportPart.java | 6 +- .../table/export/TableCheckboxTreeModel.java | 2 +- .../table/internal/TableServiceImpl.java | 4 +- .../table/overview/TableOverviewPart.java | 2 +- .../extensions/utils/TableNameInfo.java | 88 ++++++++++++++++--- 6 files changed, 85 insertions(+), 19 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/AbstractPlanPro2TableTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/AbstractPlanPro2TableTransformationService.java index e9878af97a..a2f51165d8 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/AbstractPlanPro2TableTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/AbstractPlanPro2TableTransformationService.java @@ -80,7 +80,7 @@ protected Set getColumnsListe( public ColumnDescriptor fillHeaderDescriptions( final ColumnDescriptorModelBuilder builder) { final GroupBuilder root = builder.createRootColumn(getTableHeading()); - String tableShortcut = getTableNameInfo().shortName().toLowerCase(); + String tableShortcut = getTableNameInfo().getShortName().toLowerCase(); // IMPROVE: this is only a temporary situation for the table // Sskp_dm if (tableShortcut.equals("sskp_dm")) { //$NON-NLS-1$ diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/PlanProExportPart.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/PlanProExportPart.java index f240a58777..27ff6f859f 100644 --- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/PlanProExportPart.java +++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/PlanProExportPart.java @@ -200,9 +200,9 @@ protected CheckboxTreeModel createTreeModelData() { tableInfo.category().toString()); elements.add(parentElement); } - parentElement.addChild( - new CheckBoxTreeElement(nameInfo.shortName().toLowerCase(), - nameInfo.getFullDisplayName())); + parentElement.addChild(new CheckBoxTreeElement( + nameInfo.getShortName().toLowerCase(), + nameInfo.getFullDisplayName())); }); if (additionalExportService != null) { diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/TableCheckboxTreeModel.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/TableCheckboxTreeModel.java index 20519ecc57..74210199bd 100644 --- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/TableCheckboxTreeModel.java +++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/TableCheckboxTreeModel.java @@ -68,7 +68,7 @@ public CheckBoxTreeElement addElement(final TableInfo info) { } final TableNameInfo nameInfo = tableService.getTableNameInfo(info); final CheckBoxTreeElement newElement = new CheckBoxTreeElement( - nameInfo.shortName().toLowerCase(), + nameInfo.getShortName().toLowerCase(), nameInfo.getFullDisplayName()); tableInfoTreeElementMap.put(info, newElement); addElement(parent, newElement); diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java index f8e75a3aef..2b293b0a77 100644 --- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java +++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java @@ -283,7 +283,7 @@ public Map> getTableErrors( private void saveTableError(final TableInfo tableInfo, final IModelSession modelSession, final Collection errors) { - final String shortName = getTableNameInfo(tableInfo).shortName(); + final String shortName = getTableNameInfo(tableInfo).getShortName(); final String shortCut = tableInfo.shortcut(); errors.forEach(error -> error.setSource(shortName)); getCacheService() @@ -419,7 +419,7 @@ private void storageFootnotes(final ToolboxFileRole sessionRole, } final Function createKeyValue = info -> { final TableNameInfo nameInfo = getTableNameInfo(info); - return sessionRole.toString() + "/" + nameInfo.shortName(); //$NON-NLS-1$ + return sessionRole.toString() + "/" + nameInfo.getShortName(); //$NON-NLS-1$ }; final UnaryOperator extractShortName = key -> key .substring(key.lastIndexOf("/") + 1); //$NON-NLS-1$ diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/overview/TableOverviewPart.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/overview/TableOverviewPart.java index 8f7d9a8846..047f613719 100644 --- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/overview/TableOverviewPart.java +++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/overview/TableOverviewPart.java @@ -309,7 +309,7 @@ private String tableList2DisplayString(final Collection tables) { } final List shortNames = new ArrayList<>(tables.stream() .map(tableInfo -> tableService.getTableNameInfo(tableInfo) - .shortName()) + .getShortName()) .toList()); Collections.sort(shortNames); return shortNames.stream().collect(Collectors.joining(", ")); //$NON-NLS-1$ diff --git a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/utils/TableNameInfo.java b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/utils/TableNameInfo.java index a1558e52a7..97a7ab5a5b 100644 --- a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/utils/TableNameInfo.java +++ b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/utils/TableNameInfo.java @@ -12,22 +12,88 @@ * Collect table name information. * * @author Schaefer - * @param longName - * the long name - * @param planningNumber - * the planning number - * @param shortName - * the short name - * @param rilNumber - * the ril number */ -public record TableNameInfo(String longName, String planningNumber, - String shortName, String rilNumber) { +public class TableNameInfo { + + private String longName; + + private String planningNumber; + private String shortName; + + private final String rilNumber; + + /** + * @param longName + * the long name + * @param planningNumber + * the planning number + * @param shortName + * the short name + */ + public TableNameInfo(final String longName, final String planningNumber, + final String shortName, final String rilNumber) { + this.longName = longName; + this.planningNumber = planningNumber; + this.shortName = shortName; + this.rilNumber = rilNumber; + } + + /** + * @return the long name + */ + public String getLongName() { + return longName; + } + + /** + * @return the planning number + */ + public String getPlanningNumber() { + return planningNumber; + } + + /** + * @return the short name + */ + public String getShortName() { + return shortName; + } + + /** + * @return the Ril number + */ + public String getRilNumber() { + return rilNumber; + } /** * @return the full display name */ public String getFullDisplayName() { - return shortName() + " – " + longName(); //$NON-NLS-1$ + return getShortName() + " – " + getLongName(); //$NON-NLS-1$ + } + + /** + * @param longName + * the long name to set + */ + public void setLongName(final String longName) { + this.longName = longName; + } + + /** + * @param planningNumber + * the planning number to set + */ + public void setPlanningNumber(final String planningNumber) { + this.planningNumber = planningNumber; + } + + /** + * @param shortName + * the short name to set + */ + public void setShortName(final String shortName) { + this.shortName = shortName; } } From 26a4d28551e953446960de97776e0bc8c383081c Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Mon, 30 Mar 2026 13:59:59 +0200 Subject: [PATCH 3/3] Add comment --- .../org/eclipse/set/ppmodel/extensions/utils/TableNameInfo.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/utils/TableNameInfo.java b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/utils/TableNameInfo.java index 97a7ab5a5b..29f3d3fe48 100644 --- a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/utils/TableNameInfo.java +++ b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/utils/TableNameInfo.java @@ -29,6 +29,8 @@ public class TableNameInfo { * the planning number * @param shortName * the short name + * @param rilNumber + * the Ril number */ public TableNameInfo(final String longName, final String planningNumber, final String shortName, final String rilNumber) {