Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
Expand All @@ -32,6 +33,7 @@
import org.eclipse.set.model.tablemodel.ColumnDescriptor;
import org.eclipse.set.model.tablemodel.Table;
import org.eclipse.set.model.tablemodel.extensions.ColumnDescriptorExtensions;
import org.eclipse.set.model.tablemodel.extensions.FootnoteExtensions;
import org.eclipse.set.model.tablemodel.extensions.TableExtensions;
import org.eclipse.set.model.tablemodel.extensions.TableRowExtensions;
import org.eclipse.set.model.tablemodel.format.TextAlignment;
Expand Down Expand Up @@ -158,6 +160,7 @@ public Table transform(final MultiContainer_AttributeGroup model) {
pt1TableTransformator.getTopologicalCells()
.forEach(TableRowExtensions::setTopologicalCell);
setTopologicalColumnHightlight(table);
setReferencesColumnToFootnote(table);
}
return table;
}
Expand All @@ -166,8 +169,9 @@ public Table transform(final MultiContainer_AttributeGroup model) {

protected abstract List<String> getTopologicalColumnPosition();

protected void setTopologicalColumnHightlight(final Table table) {
protected abstract Map<Class<?>, String> getFootnotesColumnReferences();

protected void setTopologicalColumnHightlight(final Table table) {
final Set<ColumnDescriptor> topologicalCols = getTopologicalColumnPosition()
.stream()
.map(position -> cols.stream()
Expand All @@ -181,4 +185,23 @@ protected void setTopologicalColumnHightlight(final Table table) {
.forEach(row -> TableRowExtensions.setTopologicalCell(row,
topologicalCols));
}

protected void setReferencesColumnToFootnote(final Table table) {
final Map<Class<?>, String> footnotesColumnReferences = getFootnotesColumnReferences();
FootnoteExtensions.getNotesInTable(table)
.stream()
.filter(fn -> footnotesColumnReferences.keySet()
.stream()
.anyMatch(ref -> ref.isInstance(fn.getOwnerObject())))
.forEach(fn -> {
footnotesColumnReferences.entrySet()
.stream()
.forEach(entry -> {
if (entry.getKey()
.isInstance(fn.getOwnerObject())) {
fn.setReferenceColumn(entry.getValue());
}
});
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,15 @@

import java.util.Collections;
import java.util.List;
import java.util.Map;

import org.eclipse.set.core.services.enumtranslation.EnumTranslationService;
import org.eclipse.set.feature.table.PlanPro2TableTransformationService;
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.Basisobjekte.Strecke_Km_TypeClass;
import org.eclipse.set.model.planpro.Verweise.ID_Strecke_TypeClass;
import org.eclipse.set.ppmodel.extensions.utils.TableNameInfo;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Expand Down Expand Up @@ -74,4 +77,11 @@ protected List<String> getTopologicalColumnPosition() {
return Collections.emptyList();
}

@Override
protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Map.of(ID_Strecke_TypeClass.class,
SsbbColumns.Befestigung_Strecke, Strecke_Km_TypeClass.class,
SsbbColumns.Befestigung_km);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;

import org.eclipse.set.core.services.enumtranslation.EnumTranslationService;
import org.eclipse.set.feature.table.PlanPro2TableTransformationService;
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.Basisobjekte.Strecke_Km_TypeClass;
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.sorting.TableRowGroupComparator;
Expand Down Expand Up @@ -79,4 +82,11 @@ protected List<String> getTopologicalColumnPosition() {
return Collections.emptyList();
}

@Override
protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Map.of(ID_Strecke_TypeClass.class,
SsitColumns.Befestigung_Strecke, Strecke_Km_TypeClass.class,
SsitColumns.Befestigung_km);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;

import org.eclipse.set.core.services.enumtranslation.EnumTranslationService;
import org.eclipse.set.feature.table.PlanPro2TableTransformationService;
Expand All @@ -22,6 +23,8 @@
import org.eclipse.set.feature.table.pt1.messages.Messages;
import org.eclipse.set.model.planpro.Ansteuerung_Element.Aussenelementansteuerung;
import org.eclipse.set.model.planpro.Ansteuerung_Element.ESTW_Zentraleinheit;
import org.eclipse.set.model.planpro.Basisobjekte.Strecke_Km_TypeClass;
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.sorting.TableRowGroupComparator;
Expand Down Expand Up @@ -91,4 +94,11 @@ protected List<String> getTopologicalColumnPosition() {
return Collections.emptyList();
}

@Override
protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Map.of(ID_Strecke_TypeClass.class,
SskaColumns.Unterbringung_Strecke, Strecke_Km_TypeClass.class,
SskaColumns.Unterbringung_km);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;

import org.eclipse.set.core.services.enumtranslation.EnumTranslationService;
import org.eclipse.set.feature.table.PlanPro2TableTransformationService;
Expand Down Expand Up @@ -87,4 +88,9 @@ protected String getShortcut() {
protected List<String> getTopologicalColumnPosition() {
return Collections.emptyList();
}

@Override
protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Map.of();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

import java.util.Comparator;
import java.util.List;
import java.util.Map;

import org.eclipse.set.core.services.enumtranslation.EnumTranslationService;
import org.eclipse.set.core.services.graph.TopologicalGraphService;
Expand All @@ -21,6 +22,8 @@
import org.eclipse.set.feature.table.pt1.AbstractPlanPro2TableTransformationService;
import org.eclipse.set.feature.table.pt1.messages.Messages;
import org.eclipse.set.model.planpro.Basisobjekte.Punkt_Objekt;
import org.eclipse.set.model.planpro.Basisobjekte.Strecke_Km_TypeClass;
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.sorting.TableRowGroupComparator;
Expand Down Expand Up @@ -96,4 +99,10 @@ protected String getShortcut() {
protected List<String> getTopologicalColumnPosition() {
return List.of(SskgColumns.Bezugspunkt_Abstand);
}

@Override
protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Map.of(ID_Strecke_TypeClass.class, SskgColumns.Standort_Strecke,
Strecke_Km_TypeClass.class, SskgColumns.Standort_km);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@

import java.util.Collections;
import java.util.List;
import java.util.Map;

import org.eclipse.set.core.services.enumtranslation.EnumTranslationService;
import org.eclipse.set.feature.table.PlanPro2TableTransformationService;
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.Basisobjekte.Strecke_Km_TypeClass;
import org.eclipse.set.model.planpro.Verweise.ID_Strecke_TypeClass;
import org.eclipse.set.ppmodel.extensions.utils.TableNameInfo;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Expand Down Expand Up @@ -74,4 +77,12 @@ protected String getShortcut() {
protected List<String> getTopologicalColumnPosition() {
return Collections.emptyList();
}

@Override
protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Map.of(ID_Strecke_TypeClass.class,
SskoColumns.Sk_Ssp_Unterbringung_Strecke,
Strecke_Km_TypeClass.class,
SskoColumns.Sk_Ssp_Unterbringung_km);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
import static org.eclipse.set.feature.table.pt1.sskp.SskpColumns.*;
import static org.eclipse.set.ppmodel.extensions.utils.IterableExtensions.getFirstOrNull;

import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;

Expand Down Expand Up @@ -191,4 +193,9 @@ protected List<String> getTopologicalColumnPosition() {
Abstand_GM_2000_Bahnsteig_Ende, H_Tafel_Abstand,
Abstand_vorsignalWdh_GM_2000);
}

@Override
protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Collections.emptyMap();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import java.util.Comparator;
import java.util.List;
import java.util.Map;

import org.eclipse.e4.core.services.events.IEventBroker;
import org.eclipse.set.basis.constants.Events;
Expand All @@ -24,7 +25,9 @@
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.Basisobjekte.Strecke_Km_TypeClass;
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.utils.TableNameInfo;
import org.eclipse.set.utils.table.sorting.TableRowGroupComparator;
Expand Down Expand Up @@ -129,4 +132,10 @@ protected String getShortcut() {
protected List<String> getTopologicalColumnPosition() {
return List.of(Schaltkasten_Entfernung, Lichtraumprofil, Ueberhoehung);
}

@Override
protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Map.of(ID_Strecke_TypeClass.class, SsksColumns.Strecke,
Strecke_Km_TypeClass.class, SsksColumns.Km);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,17 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;

import org.eclipse.set.core.services.enumtranslation.EnumTranslationService;
import org.eclipse.set.feature.table.PlanPro2TableTransformationService;
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.Technik_Standort;
import org.eclipse.set.model.planpro.Basisobjekte.Strecke_Km_TypeClass;
import org.eclipse.set.model.planpro.Bedienung.Bedien_Standort;
import org.eclipse.set.model.planpro.Verweise.ID_Strecke_TypeClass;
import org.eclipse.set.model.tablemodel.ColumnDescriptor;
import org.eclipse.set.model.tablemodel.RowGroup;
import org.eclipse.set.model.tablemodel.RowMergeMode;
Expand Down Expand Up @@ -104,4 +107,11 @@ protected String getShortcut() {
protected List<String> getTopologicalColumnPosition() {
return Collections.emptyList();
}

@Override
protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Map.of(ID_Strecke_TypeClass.class,
SsktColumns.Unterbringung_Strecke, Strecke_Km_TypeClass.class,
SsktColumns.Unterbringung_km);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
import static org.eclipse.set.feature.table.pt1.sskw.SskwColumns.Freimeldung_Fma;
import static org.eclipse.set.utils.table.sorting.ComparatorBuilder.CellComparatorType.MIXED_STRING;

import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;

import org.eclipse.set.core.services.enumtranslation.EnumTranslationService;
import org.eclipse.set.core.services.session.SessionService;
Expand Down Expand Up @@ -93,4 +95,9 @@ protected List<String> getTopologicalColumnPosition() {
return List.of(Freimeldung_Fma);
}

@Override
protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Collections.emptyMap();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
*/
package org.eclipse.set.feature.table.pt1.sskz;

import java.util.Collections;
import java.util.List;
import java.util.Map;

import org.eclipse.e4.core.services.events.IEventBroker;
import org.eclipse.set.basis.constants.Events;
Expand Down Expand Up @@ -103,4 +105,9 @@ protected String getShortcut() {
protected List<String> getTopologicalColumnPosition() {
return List.of(SskzColumns.Ueberhoehung);
}

@Override
protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Collections.emptyMap();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
import static org.eclipse.set.feature.table.pt1.ssla.SslaColumns.*;
import static org.eclipse.set.utils.table.sorting.ComparatorBuilder.CellComparatorType.LEXICOGRAPHICAL;

import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;

import org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum;
import org.eclipse.set.core.services.enumtranslation.EnumTranslationService;
Expand Down Expand Up @@ -100,4 +102,9 @@ protected List<String> getTopologicalColumnPosition() {
Durchrutschweg_Ziel, Unterwegssignal);
}

@Override
protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Collections.emptyMap();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
import static org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum.ASC;
import static org.eclipse.set.utils.table.sorting.ComparatorBuilder.CellComparatorType.LEXICOGRAPHICAL;

import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;

import org.eclipse.set.core.services.enumtranslation.EnumTranslationService;
import org.eclipse.set.core.services.graph.TopologicalGraphService;
Expand Down Expand Up @@ -94,4 +96,8 @@ protected List<String> getTopologicalColumnPosition() {
SslbColumns.Anrueckabschnitt_Anordnung);
}

}
@Override
protected Map<Class<?>, String> getFootnotesColumnReferences() {
return Collections.emptyMap();
}
}
Loading
Loading