Skip to content

Sslb: add addition entry after filtered entry in table #2343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TruongQuangSB wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Sslb: add addition entry after filtered entry in table #2343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1cb4365
initial
TruongQuangSB Apr 14, 2026
b5f96f2
Sslb: add addition entry after filted table
TruongQuangSB Apr 14, 2026
bf1d1d8
Fix
TruongQuangSB Apr 14, 2026
815d708
fix missing table in overview
TruongQuangSB Apr 15, 2026
f3ac706
revert change by get cached errors
TruongQuangSB Apr 15, 2026
d249950
Merge branch 'main' into update-sslb
TruongQuangSB Apr 15, 2026
a75101d
fix empty row
TruongQuangSB Apr 15, 2026
6a5f4bc
Merge branch 'update-sslb' of https://github.com/eclipse-set/set into…
TruongQuangSB Apr 15, 2026
dd36951
fix filter object in control area
TruongQuangSB Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...ature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssbb/SsbbTransformationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.eclipse.set.model.planpro.Basisobjekte.Strecke_Km_TypeClass;
import org.eclipse.set.model.planpro.Verweise.ID_Strecke_TypeClass;
import org.eclipse.set.ppmodel.extensions.utils.TableNameInfo;
import org.eclipse.set.utils.table.TableInfo.Pt1TableCategory;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.event.EventAdmin;
Expand Down Expand Up @@ -85,4 +86,9 @@ protected Map<Class<?>, String> getFootnotesColumnReferences() {
SsbbColumns.Befestigung_km);
}

@Override
protected Pt1TableCategory getTableCategory() {
return Pt1TableCategory.ESTW;
}

}
6 changes: 6 additions & 0 deletions ...ature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssit/SsitTransformationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.eclipse.set.model.planpro.Verweise.ID_Strecke_TypeClass;
import org.eclipse.set.model.tablemodel.RowGroup;
import org.eclipse.set.ppmodel.extensions.utils.TableNameInfo;
import org.eclipse.set.utils.table.TableInfo.Pt1TableCategory;
import org.eclipse.set.utils.table.sorting.TableRowGroupComparator;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Expand Down Expand Up @@ -90,4 +91,9 @@ protected Map<Class<?>, String> getFootnotesColumnReferences() {
SsitColumns.Befestigung_km);
}

@Override
protected Pt1TableCategory getTableCategory() {
return Pt1TableCategory.ESTW;
}

}
5 changes: 5 additions & 0 deletions ...ature.table.pt1/src/org/eclipse/set/feature/table/pt1/sska/SskaTransformationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.eclipse.set.model.planpro.Verweise.ID_Strecke_TypeClass;
import org.eclipse.set.model.tablemodel.RowGroup;
import org.eclipse.set.ppmodel.extensions.utils.TableNameInfo;
import org.eclipse.set.utils.table.TableInfo.Pt1TableCategory;
import org.eclipse.set.utils.table.sorting.TableRowGroupComparator;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Expand Down Expand Up @@ -102,4 +103,8 @@ protected Map<Class<?>, String> getFootnotesColumnReferences() {
SskaColumns.Unterbringung_km);
}

@Override
protected Pt1TableCategory getTableCategory() {
return Pt1TableCategory.ESTW;
}
}
6 changes: 6 additions & 0 deletions ...ature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskf/SskfTransformationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.eclipse.set.feature.table.pt1.messages.Messages;
import org.eclipse.set.model.tablemodel.RowGroup;
import org.eclipse.set.ppmodel.extensions.utils.TableNameInfo;
import org.eclipse.set.utils.table.TableInfo.Pt1TableCategory;
import org.eclipse.set.utils.table.sorting.TableRowGroupComparator;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Expand Down Expand Up @@ -94,4 +95,9 @@ protected List<String> getTopologicalColumnPosition() {
protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Map.of();
}

@Override
protected Pt1TableCategory getTableCategory() {
return Pt1TableCategory.ESTW;
}
}
6 changes: 6 additions & 0 deletions ...ature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskg/SskgTransformationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.eclipse.set.model.planpro.Verweise.ID_Strecke_TypeClass;
import org.eclipse.set.model.tablemodel.RowGroup;
import org.eclipse.set.ppmodel.extensions.utils.TableNameInfo;
import org.eclipse.set.utils.table.TableInfo.Pt1TableCategory;
import org.eclipse.set.utils.table.sorting.TableRowGroupComparator;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Expand Down Expand Up @@ -91,6 +92,11 @@ protected String getTableHeading() {
return messages.SskgTableView_Heading;
}

@Override
protected Pt1TableCategory getTableCategory() {
return Pt1TableCategory.ESTW;
}

@Override
protected String getShortcut() {
return messages.ToolboxTableNameSskgShort.toLowerCase();
Expand Down
6 changes: 6 additions & 0 deletions ...ature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssko/SskoTransformationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.eclipse.set.model.planpro.Basisobjekte.Strecke_Km_TypeClass;
import org.eclipse.set.model.planpro.Verweise.ID_Strecke_TypeClass;
import org.eclipse.set.ppmodel.extensions.utils.TableNameInfo;
import org.eclipse.set.utils.table.TableInfo.Pt1TableCategory;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.event.EventAdmin;
Expand Down Expand Up @@ -86,4 +87,9 @@ protected Map<Class<?>, String> getFootnotesColumnReferences() {
Strecke_Km_TypeClass.class,
SskoColumns.Sk_Ssp_Unterbringung_km);
}

@Override
protected Pt1TableCategory getTableCategory() {
return Pt1TableCategory.ESTW;
}
}
6 changes: 6 additions & 0 deletions ...ature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskp/SskpTransformationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.eclipse.set.ppmodel.extensions.PZBElementExtensions;
import org.eclipse.set.ppmodel.extensions.utils.TableNameInfo;
import org.eclipse.set.utils.table.ColumnDescriptorModelBuilder;
import org.eclipse.set.utils.table.TableInfo.Pt1TableCategory;
import org.eclipse.set.utils.table.sorting.ComparatorBuilder.CellComparatorType;
import org.eclipse.set.utils.table.sorting.TableRowGroupComparator;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
Expand Down Expand Up @@ -199,4 +200,9 @@ protected List<String> getTopologicalColumnPosition() {
protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Collections.emptyMap();
}

@Override
protected Pt1TableCategory getTableCategory() {
return Pt1TableCategory.ESTW;
}
}
24 changes: 24 additions & 0 deletions ...ature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,15 @@
import org.eclipse.set.feature.table.pt1.AbstractPlanPro2TableModelTransformator;
import org.eclipse.set.feature.table.pt1.AbstractPlanPro2TableTransformationService;
import org.eclipse.set.feature.table.pt1.messages.Messages;
import org.eclipse.set.model.planpro.Ansteuerung_Element.Stell_Bereich;
import org.eclipse.set.model.planpro.Basisobjekte.Strecke_Km_TypeClass;
import org.eclipse.set.model.planpro.Basisobjekte.Ur_Objekt;
import org.eclipse.set.model.planpro.Signale.Signal;
import org.eclipse.set.model.planpro.Verweise.ID_Strecke_TypeClass;
import org.eclipse.set.model.tablemodel.RowGroup;
import org.eclipse.set.ppmodel.extensions.SignalExtensions;
import org.eclipse.set.ppmodel.extensions.utils.TableNameInfo;
import org.eclipse.set.utils.table.TableInfo.Pt1TableCategory;
import org.eclipse.set.utils.table.sorting.TableRowGroupComparator;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Expand Down Expand Up @@ -139,4 +143,24 @@ protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Map.of(ID_Strecke_TypeClass.class, SsksColumns.Strecke,
Strecke_Km_TypeClass.class, SsksColumns.Km);
}

@Override
protected Pt1TableCategory getTableCategory() {
return Pt1TableCategory.ESTW;
}

@Override
public boolean isObjectBelongToRendereArea(final Ur_Objekt obj,
final List<Stell_Bereich> areas) {
if (areas.isEmpty()) {
return true;
}
if (obj instanceof final Signal signal) {
return areas.stream()
.anyMatch(area -> SignalExtensions
.isSsksSignalBelongToArea(signal, area));
}

return false;
}
}
6 changes: 6 additions & 0 deletions ...ature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskt/SsktTransformationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.eclipse.set.model.tablemodel.RowMergeMode;
import org.eclipse.set.ppmodel.extensions.utils.TableNameInfo;
import org.eclipse.set.utils.table.ColumnDescriptorModelBuilder;
import org.eclipse.set.utils.table.TableInfo.Pt1TableCategory;
import org.eclipse.set.utils.table.sorting.TableRowGroupComparator;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Expand Down Expand Up @@ -115,4 +116,9 @@ protected Map<Class<?>, String> getFootnotesColumnReferences() {
SsktColumns.Unterbringung_Strecke, Strecke_Km_TypeClass.class,
SsktColumns.Unterbringung_km);
}

@Override
protected Pt1TableCategory getTableCategory() {
return Pt1TableCategory.ETCS;
}
}
6 changes: 6 additions & 0 deletions ...ature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskw/SskwTransformationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.eclipse.set.feature.table.pt1.messages.Messages;
import org.eclipse.set.model.tablemodel.RowGroup;
import org.eclipse.set.ppmodel.extensions.utils.TableNameInfo;
import org.eclipse.set.utils.table.TableInfo.Pt1TableCategory;
import org.eclipse.set.utils.table.sorting.TableRowGroupComparator;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Expand Down Expand Up @@ -101,4 +102,9 @@ protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Collections.emptyMap();
}

@Override
protected Pt1TableCategory getTableCategory() {
return Pt1TableCategory.ESTW;
}

}
25 changes: 25 additions & 0 deletions ...ature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskx/SskxTransformationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,13 @@
import org.eclipse.set.feature.table.PlanPro2TableTransformationService;
import org.eclipse.set.feature.table.pt1.AbstractPlanPro2TableTransformationService;
import org.eclipse.set.feature.table.pt1.messages.Messages;
import org.eclipse.set.model.planpro.Ansteuerung_Element.Stell_Bereich;
import org.eclipse.set.model.planpro.Basisobjekte.Ur_Objekt;
import org.eclipse.set.model.planpro.Signale.Signal;
import org.eclipse.set.ppmodel.extensions.SignalExtensions;
import org.eclipse.set.ppmodel.extensions.container.MultiContainer_AttributeGroup;
import org.eclipse.set.ppmodel.extensions.utils.TableNameInfo;
import org.eclipse.set.utils.table.TableInfo.Pt1TableCategory;
import org.eclipse.set.utils.table.TableModelTransformator;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Expand Down Expand Up @@ -111,4 +116,24 @@ protected List<String> getTopologicalColumnPosition() {
protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Collections.emptyMap();
}

@Override
protected Pt1TableCategory getTableCategory() {
return Pt1TableCategory.ESTW_SUPPLEMENT;
}

@Override
public boolean isObjectBelongToRendereArea(final Ur_Objekt obj,
final List<Stell_Bereich> areas) {
if (areas.isEmpty()) {
return true;
}
if (obj instanceof final Signal signal) {
return areas.stream()
.anyMatch(area -> SignalExtensions
.isSskxSignalBelongToArea(signal, area));
}

return false;
}
}
6 changes: 6 additions & 0 deletions ...ature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskz/SskzTransformationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.eclipse.set.feature.table.pt1.messages.Messages;
import org.eclipse.set.ppmodel.extensions.container.MultiContainer_AttributeGroup;
import org.eclipse.set.ppmodel.extensions.utils.TableNameInfo;
import org.eclipse.set.utils.table.TableInfo.Pt1TableCategory;
import org.eclipse.set.utils.table.TableModelTransformator;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Expand Down Expand Up @@ -111,4 +112,9 @@ protected List<String> getTopologicalColumnPosition() {
protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Collections.emptyMap();
}

@Override
protected Pt1TableCategory getTableCategory() {
return Pt1TableCategory.ESTW_SUPPLEMENT;
}
}
5 changes: 5 additions & 0 deletions ...ature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssla/SslaTransformationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.eclipse.set.model.tablemodel.RowGroup;
import org.eclipse.set.ppmodel.extensions.FstrAneinanderExtensions;
import org.eclipse.set.ppmodel.extensions.utils.TableNameInfo;
import org.eclipse.set.utils.table.TableInfo.Pt1TableCategory;
import org.eclipse.set.utils.table.sorting.TableRowGroupComparator;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Expand Down Expand Up @@ -108,4 +109,8 @@ protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Collections.emptyMap();
}

@Override
protected Pt1TableCategory getTableCategory() {
return Pt1TableCategory.ESTW;
}
}
Loading