diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxColumns.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxColumns.java index 8d604585cc..fd6f9366db 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxColumns.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxColumns.java @@ -26,12 +26,17 @@ public class SxxxColumns { public static final String Text_Content = "B"; /** - * C: Referenziert von Objekt + * C: Referenziert von Objekt Art */ - public static final String Reference_Object = "C"; + public static final String Reference_Object_Art = "C"; /** - * D: Ausgabe in Plan + * D: Referenziert von Objekt Bezeichnung */ - public static final String Visualation_In_Table = "D"; + public static final String Reference_Object_Bezeichnung = "D"; + + /** + * E: Ausgabe in Plan + */ + public static final String Visualation_In_Table = "E"; } 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 7fc021779a..84a50e7045 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 @@ -86,7 +86,7 @@ public Comparator getRowGroupComparator( final TableType tableType) { return TableRowGroupComparator.builder(tableType) .sort(SxxxColumns.Text_Content, LEXICOGRAPHICAL, ASC) - .sort(SxxxColumns.Reference_Object, LEXICOGRAPHICAL, ASC) + .sort(SxxxColumns.Reference_Object_Art, LEXICOGRAPHICAL, ASC) .build(); } @@ -96,10 +96,11 @@ public ColumnDescriptor fillHeaderDescriptions( final ColumnDescriptor cd = super.fillHeaderDescriptions(builder); // only merge on column A cd.setMergeCommonValues(RowMergeMode.ENABLED); - List.of(SxxxColumns.Reference_Object, SxxxColumns.Visualation_In_Table) - .forEach(it -> getColumnDescriptor(it).ifPresent(col -> { - col.setMergeCommonValues(RowMergeMode.DISABLED); - })); + List.of(SxxxColumns.Reference_Object_Art, + SxxxColumns.Reference_Object_Bezeichnung, + SxxxColumns.Visualation_In_Table) + .forEach(it -> getColumnDescriptor(it).ifPresent(col -> col + .setMergeCommonValues(RowMergeMode.DISABLED))); return cd; } diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxTransformator.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxTransformator.java index 62c168c449..d6e11277f3 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxTransformator.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxTransformator.java @@ -17,6 +17,7 @@ import java.util.Set; import org.eclipse.emf.ecore.EObject; +import org.eclipse.set.basis.Pair; import org.eclipse.set.core.services.enumtranslation.EnumTranslationService; import org.eclipse.set.feature.table.pt1.AbstractPlanPro2TableModelTransformator; import org.eclipse.set.model.planpro.Ansteuerung_Element.Aussenelementansteuerung; @@ -116,12 +117,17 @@ public Table transformTableContent( row.setRowObject(referencedBy); fillBearbeitungsvermerkContent(row, bv); + final Pair refObjInfo = getReferenceObjDesignation( + referencedBy); + // C: Referenziert von Objects Art + fill(row, getColumn(cols, Reference_Object_Art), bv, + note -> refObjInfo.getFirst()); - // C: Referenziert von Objects - fill(row, getColumn(cols, Reference_Object), bv, - note -> getReferenceObjDesignation(referencedBy)); + // D: Referenziert von Objects Bezeichnung + fill(row, getColumn(cols, Reference_Object_Bezeichnung), bv, + note -> refObjInfo.getSecond()); - // D: Ausgabe in Plan + // E: Ausgabe in Plan // Will fill later in TableService } @@ -153,7 +159,8 @@ private void fillBearbeitungsvermerkContent(final TableRow row, } @SuppressWarnings("nls") - private static String getReferenceObjDesignation(final EObject refObj) { + private static Pair getReferenceObjDesignation( + final EObject refObj) { final String typeName = UrObjectExtensions.getTypeName(refObj) .replace("_TypeClass", ""); final String objDesignation = switch (refObj) { @@ -183,8 +190,8 @@ private static String getReferenceObjDesignation(final EObject refObj) { default -> ""; }; if (objDesignation != null && !objDesignation.isEmpty()) { - return typeName + " " + objDesignation; + return new Pair<>(typeName, objDesignation); } - return typeName; + return new Pair<>(typeName, ""); } } diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sxxx_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sxxx_vorlage.xlsx index e68e9ed05f..b363c1a0a7 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sxxx_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sxxx_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.model.tablemodel.extensions/src/org/eclipse/set/model/tablemodel/extensions/FootnoteExtensions.java b/java/bundles/org.eclipse.set.model.tablemodel.extensions/src/org/eclipse/set/model/tablemodel/extensions/FootnoteExtensions.java index 588ab6f9a4..18ef65f362 100644 --- a/java/bundles/org.eclipse.set.model.tablemodel.extensions/src/org/eclipse/set/model/tablemodel/extensions/FootnoteExtensions.java +++ b/java/bundles/org.eclipse.set.model.tablemodel.extensions/src/org/eclipse/set/model/tablemodel/extensions/FootnoteExtensions.java @@ -194,7 +194,7 @@ public static void fillSxxxTableColumnD(final Table sxxxTable, private static void fillValue(final TableRow row, final String value) { // IMPROVE: the get row cell is hard code - final CellContent content = row.getCells().get(3).getContent(); + final CellContent content = row.getCells().get(4).getContent(); if (content == null) { final StringCellContent cellContent = TablemodelFactory.eINSTANCE .createStringCellContent();