diff --git a/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/pdf/TableToTableDocument.xtend b/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/pdf/TableToTableDocument.xtend index 68519ecfa3..1808e5230e 100644 --- a/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/pdf/TableToTableDocument.xtend +++ b/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/pdf/TableToTableDocument.xtend @@ -21,6 +21,7 @@ import org.eclipse.set.basis.FreeFieldInfo.LoadedPlanInformation import org.eclipse.set.basis.FreeFieldInfo.SignificantInformation import org.eclipse.set.basis.constants.ToolboxConstants import org.eclipse.set.model.tablemodel.CellContent +import org.eclipse.set.model.tablemodel.ColumnDescriptor import org.eclipse.set.model.tablemodel.CompareFootnoteContainer import org.eclipse.set.model.tablemodel.CompareStateCellContent import org.eclipse.set.model.tablemodel.CompareTableCellContent @@ -31,6 +32,7 @@ import org.eclipse.set.model.tablemodel.MultiColorContent import org.eclipse.set.model.tablemodel.PlanCompareRow import org.eclipse.set.model.tablemodel.SimpleFootnoteContainer import org.eclipse.set.model.tablemodel.Table +import org.eclipse.set.model.tablemodel.TableCell import org.eclipse.set.model.tablemodel.TableContent import org.eclipse.set.model.tablemodel.TableRow import org.eclipse.set.model.tablemodel.extensions.TableExtensions.FootnoteInfo @@ -211,7 +213,7 @@ class TableToTableDocument { cells.indexed.forEach [ logger.debug('''column=«key»''') - val isRemarkColumn = value.isRemarkColumn(cells) + val isRemarkColumn = value.isRemarkColumn // Check for required span merges var rowSpan = 1 @@ -275,9 +277,22 @@ class TableToTableDocument { return cellElement } - private def boolean isRemarkColumn(CellContent content, - List rowContent) { - return rowContent.last === content + static def boolean isRemarkColumn(CellContent content) { + return isRemarkColumn((content.eContainer as TableCell)) + } + + static def boolean isRemarkColumn(TableCell cell) { + return isRemarkColumn(cell.columndescriptor) + } + + static def boolean isRemarkColumn(ColumnDescriptor columnDescriptor) { + if (columnDescriptor === null) { + return false; + } + if (columnDescriptor.isRemarkColumn) { + return true; + } + return isRemarkColumn(columnDescriptor.parent) } private def Attr create doc.createAttribute("group-number") transformToGroupNumber( @@ -432,17 +447,15 @@ class TableToTableDocument { if (!remarkTextInlnie) { element.setAttribute("keep-inline", "true") // Sort unchanged & new footnotes together, then the old foonotes - #[unchangedFootnotes, newFootnotes].flatten.distinctBy[toShorthand]. - sortBy[index].forEach [ - val remark = unchangedFootnotes.exists [ unchanged | - unchanged.bearbeitungsvermerk === - bearbeitungsvermerk && - toShorthand == toShorthand - ] ? WARNING_MARK_BLACK : WARNING_MARK_RED - element.addFootnoteChild(toShorthand, remark, columnNumber, - isRemarkColumn) - ] - oldFootnotes.distinctBy[toShorthand].sortBy[index].forEach [ + #[unchangedFootnotes, newFootnotes].flatten.processFootnotes.forEach [ + val remark = unchangedFootnotes.exists [ unchanged | + unchanged.bearbeitungsvermerk === bearbeitungsvermerk && + toShorthand == toShorthand + ] ? WARNING_MARK_BLACK : WARNING_MARK_RED + element.addFootnoteChild(toShorthand, remark, columnNumber, + isRemarkColumn) + ] + oldFootnotes.processFootnotes.forEach [ element.addFootnoteChild(toShorthand, WARNING_MARK_YELLOW, columnNumber, isRemarkColumn) ] @@ -463,11 +476,17 @@ class TableToTableDocument { isRemarkColumn) } + static def List processFootnotes(Iterable fn) { + return fn.filterNull.distinctBy[toShorthand].sortBy [ + index + ].toList + } + private def String footnotesToString(Iterable fn) { val separator = remarkTextInlnie ? FOOTNOTE_INLINE_TEXT_SEPARATOR : FOOTNOTE_MARK_SEPRATOR - return fn.filterNull.sortBy[index].map [ + return fn.processFootnotes.map [ remarkTextInlnie ? toText : toShorthand - ].toSet.iterableToString(separator) + ].iterableToString(separator) } private def Element createMultiColorElement(MultiColorContent content, @@ -512,9 +531,8 @@ class TableToTableDocument { private def Element addContentToElement(String content, Element element, int columnNumber, boolean isRemarkColumn) { val checkOutput = content.checkForTestOutput(columnNumber) - element.textContent = isRemarkColumn - ? checkOutput - : checkOutput.intersperseWithZeroSpacesSC + element.textContent = isRemarkColumn ? checkOutput : checkOutput. + intersperseWithZeroSpacesSC return element } @@ -577,19 +595,23 @@ class TableToTableDocument { private def Element create doc.createElement("SignificantInformation") transformToSignificantInformation( SignificantInformation significantInformation) { - appendChild(transformLoadedPlanInformation("MainPlan", significantInformation.mainPlan)) + appendChild( + transformLoadedPlanInformation("MainPlan", + significantInformation.mainPlan)) if (significantInformation.comparePlan !== null) { - appendChild(transformLoadedPlanInformation("ComparePlan", significantInformation.comparePlan)) + appendChild( + transformLoadedPlanInformation("ComparePlan", + significantInformation.comparePlan)) } } - - private def Element create doc.createElement("LoadedPlan") transformLoadedPlanInformation(String id, LoadedPlanInformation info) { + + private def Element create doc.createElement("LoadedPlan") transformLoadedPlanInformation( + String id, LoadedPlanInformation info) { val idAttr = doc.createAttribute("id") idAttr.value = id attributeNode = idAttr textContent = '''«info.name» «info.timestamp» MD5: «info.checksum»''' } - private def Element create doc.createElement("Footnotes") transformToFootnotes(Table table) { diff --git a/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/xlsx/ExcelExportBuilder.java b/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/xlsx/ExcelExportBuilder.java index b86fb5f8ff..fbf80f2d09 100644 --- a/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/xlsx/ExcelExportBuilder.java +++ b/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/xlsx/ExcelExportBuilder.java @@ -8,7 +8,10 @@ */ package org.eclipse.set.feature.export.xlsx; -import static org.eclipse.set.utils.excel.ExcelWorkbookExtension.*; +import static org.eclipse.set.utils.excel.ExcelWorkbookExtension.getCellAt; +import static org.eclipse.set.utils.excel.ExcelWorkbookExtension.getCellStringValue; +import static org.eclipse.set.utils.excel.ExcelWorkbookExtension.getHeaderLastColumnIndex; +import static org.eclipse.set.utils.excel.ExcelWorkbookExtension.getHeaderLastRowIndex; import java.awt.image.BufferedImage; import java.io.FileInputStream; @@ -20,7 +23,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; @@ -209,6 +211,7 @@ private static void fillFootnoteSheet(final Sheet footnoteSheet, } } + @SuppressWarnings("resource") private static void fillSheet(final Sheet sheet, final List rows, final int rowIndex, final int columnCount, final boolean inlineFootnote) { @@ -233,8 +236,20 @@ private static void fillSheet(final Sheet sheet, final List rows, if (cell == null) { cell = sheetRow.createCell(i + 1); + // in the excel template it might be the case that a certain + // cell is was never defined/styled. + // If that is the case we take at least the font from the + // definitely defined first cell from the header so that all + // the cells are using the same font. + cell.getCellStyle() + .setFont(sheet.getWorkbook() + .getFontAt(sheet.getRow(0) + .getCell(1) + .getCellStyle() + .getFontIndex())); } - if (i == columnCount - 1) { + if (TableToTableDocument + .isRemarkColumn(row.getCells().get(i))) { fillFootnoteCell(cell, content, allFootnotes, footnotes, inlineFootnote); continue; @@ -268,23 +283,22 @@ private static void fillFootnoteCell(final Cell cell, final String cellContent, final List allFootnotes, final FootnoteContainer fnContainer, final boolean inlineFootnote) { final List footnotes = getFootnotes(fnContainer); - final List fnInfo = footnotes.stream() - .map(fn -> TableExtensions.getFootnoteInfo(allFootnotes, fn)) - .filter(Objects::nonNull) - .toList(); + final List fnInfo = TableToTableDocument + .processFootnotes(footnotes.stream() + .map(fn -> TableExtensions.getFootnoteInfo(allFootnotes, + fn)) + .toList()); final StringBuilder builder = new StringBuilder(); if (!cellContent.isEmpty() && !cellContent.isBlank()) { builder.append(cellContent); builder.append(TableToTableDocument.FOOTNOTE_INLINE_TEXT_SEPARATOR); } - final String footnoteValue = inlineFootnote ? fnInfo.stream() - .map(FootnoteInfo::toText) - .collect(Collectors.joining( - TableToTableDocument.FOOTNOTE_INLINE_TEXT_SEPARATOR)) - : fnInfo.stream() - .map(fn -> "*" + fn.index) //$NON-NLS-1$ - .collect(Collectors.joining( - TableToTableDocument.FOOTNOTE_MARK_SEPRATOR)); + final String footnoteValue = fnInfo.stream() + .map(inlineFootnote ? FootnoteInfo::toText + : FootnoteInfo::toShorthand) + .collect(Collectors.joining(inlineFootnote + ? TableToTableDocument.FOOTNOTE_INLINE_TEXT_SEPARATOR + : TableToTableDocument.FOOTNOTE_MARK_SEPRATOR)); builder.append(footnoteValue); cell.setCellValue(builder.toString()); } @@ -318,6 +332,7 @@ private static void addTableSpans(final Sheet sheet, if (!spanUtils.isMergeAllowed(column, row)) { continue; } + final int sheetColumn = column + 1; final int spanUp = spanUtils.getRowSpanUp(column, row); final int spanDown = spanUtils.getRowSpanDown(column, row); @@ -334,7 +349,7 @@ private static void addTableSpans(final Sheet sheet, } sheet.addMergedRegion(new CellRangeAddress(sheetRowIndex, - sheetRowIndex + spanDown, column, column)); + sheetRowIndex + spanDown, sheetColumn, sheetColumn)); } sheetRowIndex++; 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..713b93479c 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 @@ -22,6 +22,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; @@ -98,9 +99,23 @@ public ColumnDescriptor fillHeaderDescriptions( throw new RuntimeException(e); } cols = getColumnsListe(root.getGroupRoot()); + + getColumnDescriptor(getRemarkColumnPosition()) + .ifPresent(col -> col.setIsRemarkColumn(true)); + return root.getGroupRoot(); } + protected Optional getColumnDescriptor( + final String position) { + if (position == null) { + return Optional.empty(); + } + return cols.stream() + .filter(col -> position.equals(col.getColumnPosition())) + .findFirst(); + } + @Override public Set getFixedColumnsPos() { final Set repeatingColumns = getRepeatingColumns( @@ -169,6 +184,12 @@ public Table transform(final MultiContainer_AttributeGroup model) { protected abstract List getTopologicalColumnPosition(); + /** + * @return the column position of the remark column or null if the table has + * no remark column + */ + protected abstract String getRemarkColumnPosition(); + protected abstract Map, String> getFootnotesColumnReferences(); protected void setTopologicalColumnHightlight(final Table table) { 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 254f62c06e..d7e95785f5 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 @@ -79,6 +79,11 @@ protected List getTopologicalColumnPosition() { return Collections.emptyList(); } + @Override + protected String getRemarkColumnPosition() { + return SsbbColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Map.of(ID_Strecke_TypeClass.class, 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 993e6d26da..e7fbc9192e 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 @@ -71,6 +71,11 @@ protected List getTopologicalColumnPosition() { return Collections.emptyList(); } + @Override + protected String getRemarkColumnPosition() { + return SsitColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Map.of(ID_Strecke_TypeClass.class, 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 f820294425..76e1991fd2 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 @@ -98,6 +98,11 @@ protected List getTopologicalColumnPosition() { return Collections.emptyList(); } + @Override + protected String getRemarkColumnPosition() { + return SskaColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Map.of(ID_Strecke_TypeClass.class, 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 dc54ddcf57..3bcb444c4c 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 @@ -93,6 +93,11 @@ protected List getTopologicalColumnPosition() { return Collections.emptyList(); } + @Override + protected String getRemarkColumnPosition() { + return SskfColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Map.of(); 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 7ede0b7b6d..2b19a2f682 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 @@ -112,6 +112,11 @@ protected List getTopologicalColumnPosition() { return List.of(SskgColumns.Bezugspunkt_Abstand); } + @Override + protected String getRemarkColumnPosition() { + return SskgColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Map.of(ID_Strecke_TypeClass.class, SskgColumns.Standort_Strecke, 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 0ae6d14cc5..3102f5d55f 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 @@ -80,6 +80,11 @@ protected List getTopologicalColumnPosition() { return Collections.emptyList(); } + @Override + protected String getRemarkColumnPosition() { + return SskoColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Map.of(ID_Strecke_TypeClass.class, 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 06961ec9c4..3927942223 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 @@ -176,10 +176,8 @@ public ColumnDescriptor fillHeaderDescriptions( SskpColumns.GeschwindigkeitsKlasse, // SskpColumns.PZB_Schutzstrecke_Soll, // SskpColumns.PZB_Schutzstrecke_Ist) - .forEach(it -> cols.forEach(col -> { - if (it.equals(col.getColumnPosition())) { - col.setMergeCommonValues(RowMergeMode.DISABLED); - } + .forEach(it -> getColumnDescriptor(it).ifPresent(col -> { + col.setMergeCommonValues(RowMergeMode.DISABLED); })); return cd; @@ -199,6 +197,11 @@ protected List getTopologicalColumnPosition() { Abstand_vorsignalWdh_GM_2000); } + @Override + protected String getRemarkColumnPosition() { + return SskpColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Collections.emptyMap(); 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 efa26201ea..2cfaa43ab6 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 @@ -140,6 +140,11 @@ protected List getTopologicalColumnPosition() { return List.of(Schaltkasten_Entfernung, Lichtraumprofil, Ueberhoehung); } + @Override + protected String getRemarkColumnPosition() { + return SsksColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Map.of(ID_Strecke_TypeClass.class, SsksColumns.Strecke, 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 039a2cc305..025d31013b 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 @@ -93,10 +93,8 @@ public ColumnDescriptor fillHeaderDescriptions( List.of(SsktColumns.IP_Teilsystem_Art, // SsktColumns.Teilsystem_TS_Blau, // SsktColumns.Teilsystem_TS_Grau) - .forEach(it -> cols.forEach(col -> { - if (it.equals(col.getColumnPosition())) { - col.setMergeCommonValues(RowMergeMode.DISABLED); - } + .forEach(it -> getColumnDescriptor(it).ifPresent(col -> { + col.setMergeCommonValues(RowMergeMode.DISABLED); })); return cd; @@ -112,6 +110,11 @@ protected List getTopologicalColumnPosition() { return Collections.emptyList(); } + @Override + protected String getRemarkColumnPosition() { + return SsktColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Map.of(ID_Strecke_TypeClass.class, 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 92d01eb604..3866a98811 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 @@ -99,6 +99,11 @@ protected List getTopologicalColumnPosition() { return List.of(Freimeldung_Fma); } + @Override + protected String getRemarkColumnPosition() { + return SskwColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Collections.emptyMap(); diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskx/SskxTransformationService.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskx/SskxTransformationService.java index 1422792be9..6bfb2da51e 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskx/SskxTransformationService.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskx/SskxTransformationService.java @@ -118,6 +118,11 @@ protected List getTopologicalColumnPosition() { return List.of(SskxColumns.Gleis, SskxColumns.Lichtraumprofil); } + @Override + protected String getRemarkColumnPosition() { + return SskxColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Collections.emptyMap(); 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 e3c11c8c56..8df826eb7e 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 @@ -108,6 +108,11 @@ protected List getTopologicalColumnPosition() { return List.of(SskzColumns.Ueberhoehung); } + @Override + protected String getRemarkColumnPosition() { + return SskzColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Collections.emptyMap(); 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 4040f6dfec..eb76971442 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 @@ -111,6 +111,11 @@ protected List getTopologicalColumnPosition() { Durchrutschweg_Ziel, Unterwegssignal); } + @Override + protected String getRemarkColumnPosition() { + return SslaColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Collections.emptyMap(); 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 1dc058e915..25ebe50a04 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 @@ -120,6 +120,11 @@ protected List getTopologicalColumnPosition() { SslbColumns.Anrueckabschnitt_Anordnung); } + @Override + protected String getRemarkColumnPosition() { + return SslbColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Collections.emptyMap(); 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 3bf9aeb3fa..0d79f03561 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 @@ -116,6 +116,11 @@ protected List getTopologicalColumnPosition() { massgebende_Neigung, v_Aufwertung_Verzicht); } + @Override + protected String getRemarkColumnPosition() { + return SsldColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Collections.emptyMap(); 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 22a3cf20bf..8c1a34ec6f 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 @@ -94,6 +94,11 @@ protected List getTopologicalColumnPosition() { return Collections.emptyList(); } + @Override + protected String getRemarkColumnPosition() { + return SslfColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Collections.emptyMap(); 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 a037235dd8..e86d685a32 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 @@ -90,6 +90,11 @@ protected List getTopologicalColumnPosition() { return List.of(SsliColumns.Laenge); } + @Override + protected String getRemarkColumnPosition() { + return SsliColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Collections.emptyMap(); 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 12debb3fd2..f3ec6cec04 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 @@ -86,6 +86,11 @@ protected List getTopologicalColumnPosition() { return Collections.emptyList(); } + @Override + protected String getRemarkColumnPosition() { + return SslnColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Collections.emptyMap(); 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 7cce9c6060..d52df7ef69 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 @@ -102,6 +102,11 @@ protected List getTopologicalColumnPosition() { return List.of(Fahrweg_Entscheidungsweiche, Abhaengiger_BUe); } + @Override + protected String getRemarkColumnPosition() { + return SslrColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Collections.emptyMap(); 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 08f9a6a664..15da263071 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 @@ -75,6 +75,12 @@ public TableModelTransformator createTransformato return new SslsTransformator(cols, enumTranslationService, eventAdmin); } + @Override + protected String getRemarkColumnPosition() { + // Ssls does not have a remark column + return null; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Collections.emptyMap(); 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 c14a278dfe..ede9ae3d09 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 @@ -93,6 +93,11 @@ protected List getTopologicalColumnPosition() { return Collections.emptyList(); } + @Override + protected String getRemarkColumnPosition() { + return SslwColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Collections.emptyMap(); 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 1ca5649cfe..b6624cf0e7 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 @@ -132,6 +132,11 @@ protected List getTopologicalColumnPosition() { Kennlicht, Vorsignalisierung); } + @Override + protected String getRemarkColumnPosition() { + return SslzColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Collections.emptyMap(); 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 5fac5f9c42..314b576df5 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 @@ -93,6 +93,11 @@ protected List getTopologicalColumnPosition() { return Collections.emptyList(); } + @Override + protected String getRemarkColumnPosition() { + return SsvuColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Collections.emptyMap(); 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 0cc04fcee8..52fddd1037 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 @@ -110,6 +110,11 @@ protected List getTopologicalColumnPosition() { return List.of(SszaColumns.DP_Standort_rel_Lage_zu_BP); } + @Override + protected String getRemarkColumnPosition() { + return SszaColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Map.of(ID_Strecke_TypeClass.class, 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 10ac7dcbd6..532f1da9ae 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 @@ -85,6 +85,11 @@ protected List getTopologicalColumnPosition() { return List.of(SszsColumns.D_End, SszsColumns.d_Haltfall); } + @Override + protected String getRemarkColumnPosition() { + return SszsColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Map.of(ID_Strecke_TypeClass.class, SszsColumns.Strecke, 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 6eabc12675..31cbd2d777 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 @@ -85,6 +85,11 @@ protected List getTopologicalColumnPosition() { return List.of(SszwColumns.Laenge_links, SszwColumns.Laaenge_rechts); } + @Override + protected String getRemarkColumnPosition() { + return SszwColumns.Bemerkung; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Map.of(ID_Strecke_TypeClass.class, SszwColumns.Strecke, 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 bffdab644b..7fc021779a 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 @@ -97,10 +97,8 @@ public ColumnDescriptor fillHeaderDescriptions( // only merge on column A cd.setMergeCommonValues(RowMergeMode.ENABLED); List.of(SxxxColumns.Reference_Object, SxxxColumns.Visualation_In_Table) - .forEach(it -> cols.forEach(col -> { - if (it.equals(col.getColumnPosition())) { - col.setMergeCommonValues(RowMergeMode.DISABLED); - } + .forEach(it -> getColumnDescriptor(it).ifPresent(col -> { + col.setMergeCommonValues(RowMergeMode.DISABLED); })); return cd; @@ -111,6 +109,12 @@ public boolean enableFiltering() { return true; } + @Override + protected String getRemarkColumnPosition() { + // Sxxx does not have a remark column + return null; + } + @Override protected Map, String> getFootnotesColumnReferences() { return Collections.emptyMap(); 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 c6541c25ce..e68e9ed05f 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.edit/plugin.properties b/java/bundles/org.eclipse.set.model.tablemodel.edit/plugin.properties index 280004d2e9..85474ef7cb 100644 --- a/java/bundles/org.eclipse.set.model.tablemodel.edit/plugin.properties +++ b/java/bundles/org.eclipse.set.model.tablemodel.edit/plugin.properties @@ -107,3 +107,4 @@ _UI_Footnote_type = Footnote _UI_Footnote_ownerObject_feature = Owner Object _UI_Footnote_bearbeitungsvermerk_feature = Bearbeitungsvermerk _UI_Footnote_referenceColumn_feature = Reference Column +_UI_ColumnDescriptor_isRemarkColumn_feature = Is Remark Column diff --git a/java/bundles/org.eclipse.set.model.tablemodel.edit/src/org/eclipse/set/model/tablemodel/provider/ColumnDescriptorItemProvider.java b/java/bundles/org.eclipse.set.model.tablemodel.edit/src/org/eclipse/set/model/tablemodel/provider/ColumnDescriptorItemProvider.java index 15389a2a19..a0af84ce2c 100644 --- a/java/bundles/org.eclipse.set.model.tablemodel.edit/src/org/eclipse/set/model/tablemodel/provider/ColumnDescriptorItemProvider.java +++ b/java/bundles/org.eclipse.set.model.tablemodel.edit/src/org/eclipse/set/model/tablemodel/provider/ColumnDescriptorItemProvider.java @@ -71,6 +71,7 @@ public List getPropertyDescriptors(Object object) { addHeightPropertyDescriptor(object); addMergeCommonValuesPropertyDescriptor(object); addColumnPositionPropertyDescriptor(object); + addIsRemarkColumnPropertyDescriptor(object); } return itemPropertyDescriptors; } @@ -272,6 +273,26 @@ protected void addColumnPositionPropertyDescriptor(Object object) { null, null)); } + /** + * This adds a property descriptor for the Is Remark Column feature. + * + * @generated + */ + protected void addIsRemarkColumnPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory) adapterFactory) + .getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ColumnDescriptor_isRemarkColumn_feature"), + getString("_UI_PropertyDescriptor_description", + "_UI_ColumnDescriptor_isRemarkColumn_feature", + "_UI_ColumnDescriptor_type"), + TablemodelPackage.Literals.COLUMN_DESCRIPTOR__IS_REMARK_COLUMN, + true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, null)); + } + /** * This returns ColumnDescriptor.gif. @@ -320,6 +341,7 @@ public void notifyChanged(Notification notification) { case TablemodelPackage.COLUMN_DESCRIPTOR__HEIGHT: case TablemodelPackage.COLUMN_DESCRIPTOR__MERGE_COMMON_VALUES: case TablemodelPackage.COLUMN_DESCRIPTOR__COLUMN_POSITION: + case TablemodelPackage.COLUMN_DESCRIPTOR__IS_REMARK_COLUMN: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; diff --git a/java/bundles/org.eclipse.set.model.tablemodel/model/tablemodel.ecore b/java/bundles/org.eclipse.set.model.tablemodel/model/tablemodel.ecore index cb69f16404..807d98b82e 100644 --- a/java/bundles/org.eclipse.set.model.tablemodel/model/tablemodel.ecore +++ b/java/bundles/org.eclipse.set.model.tablemodel/model/tablemodel.ecore @@ -74,6 +74,8 @@
+ diff --git a/java/bundles/org.eclipse.set.model.tablemodel/model/tablemodel.genmodel b/java/bundles/org.eclipse.set.model.tablemodel/model/tablemodel.genmodel index 6dca39dcea..385e0aaf70 100644 --- a/java/bundles/org.eclipse.set.model.tablemodel/model/tablemodel.genmodel +++ b/java/bundles/org.eclipse.set.model.tablemodel/model/tablemodel.genmodel @@ -38,6 +38,7 @@ + diff --git a/java/bundles/org.eclipse.set.model.tablemodel/src/org/eclipse/set/model/tablemodel/ColumnDescriptor.java b/java/bundles/org.eclipse.set.model.tablemodel/src/org/eclipse/set/model/tablemodel/ColumnDescriptor.java index e0716d624a..198ab2bde4 100644 --- a/java/bundles/org.eclipse.set.model.tablemodel/src/org/eclipse/set/model/tablemodel/ColumnDescriptor.java +++ b/java/bundles/org.eclipse.set.model.tablemodel/src/org/eclipse/set/model/tablemodel/ColumnDescriptor.java @@ -42,6 +42,8 @@ * Merge Common Values} *
  • {@link org.eclipse.set.model.tablemodel.ColumnDescriptor#getColumnPosition * Column Position}
    • + *
  • {@link org.eclipse.set.model.tablemodel.ColumnDescriptor#isIsRemarkColumn + * Is Remark Column}
    • * * * @see org.eclipse.set.model.tablemodel.TablemodelPackage#getColumnDescriptor() @@ -306,4 +308,30 @@ public interface ColumnDescriptor extends EObject { */ void setColumnPosition(String value); + /** + * Returns the value of the 'Is Remark Column' attribute. + * The default value is "false". + * + * @return the value of the 'Is Remark Column' attribute. + * @see #setIsRemarkColumn(boolean) + * @see org.eclipse.set.model.tablemodel.TablemodelPackage#getColumnDescriptor_IsRemarkColumn() + * @model default="false" dataType="org.eclipse.emf.ecore.xml.type.Boolean" + * @generated + */ + boolean isIsRemarkColumn(); + + /** + * Sets the value of the + * '{@link org.eclipse.set.model.tablemodel.ColumnDescriptor#isIsRemarkColumn + * Is Remark Column}' attribute. + * + * @param value + * the new value of the 'Is Remark Column' attribute. + * @see #isIsRemarkColumn() + * @generated + */ + void setIsRemarkColumn(boolean value); + } // ColumnDescriptor diff --git a/java/bundles/org.eclipse.set.model.tablemodel/src/org/eclipse/set/model/tablemodel/TablemodelPackage.java b/java/bundles/org.eclipse.set.model.tablemodel/src/org/eclipse/set/model/tablemodel/TablemodelPackage.java index a1ff241943..f47c168529 100644 --- a/java/bundles/org.eclipse.set.model.tablemodel/src/org/eclipse/set/model/tablemodel/TablemodelPackage.java +++ b/java/bundles/org.eclipse.set.model.tablemodel/src/org/eclipse/set/model/tablemodel/TablemodelPackage.java @@ -210,6 +210,15 @@ public interface TablemodelPackage extends EPackage { */ int COLUMN_DESCRIPTOR__COLUMN_POSITION = 9; + /** + * The feature id for the 'Is Remark Column' attribute. + * + * @generated + * @ordered + */ + int COLUMN_DESCRIPTOR__IS_REMARK_COLUMN = 10; + /** * The number of structural features of the 'Column Descriptor' * class. @@ -217,7 +226,7 @@ public interface TablemodelPackage extends EPackage { * @generated * @ordered */ - int COLUMN_DESCRIPTOR_FEATURE_COUNT = 10; + int COLUMN_DESCRIPTOR_FEATURE_COUNT = 11; /** * The number of operations of the 'Column Descriptor' class. + * + * @return the meta object for the attribute 'Is Remark Column'. + * @see org.eclipse.set.model.tablemodel.ColumnDescriptor#isIsRemarkColumn() + * @see #getColumnDescriptor() + * @generated + */ + EAttribute getColumnDescriptor_IsRemarkColumn(); + /** * Returns the meta object for class * '{@link org.eclipse.set.model.tablemodel.TableContent Table @@ -2083,6 +2105,15 @@ interface Literals { EAttribute COLUMN_DESCRIPTOR__COLUMN_POSITION = eINSTANCE .getColumnDescriptor_ColumnPosition(); + /** + * The meta object literal for the 'Is Remark Column' + * attribute feature. + * + * @generated + */ + EAttribute COLUMN_DESCRIPTOR__IS_REMARK_COLUMN = eINSTANCE + .getColumnDescriptor_IsRemarkColumn(); + /** * The meta object literal for the * '{@link org.eclipse.set.model.tablemodel.impl.TableContentImpl diff --git a/java/bundles/org.eclipse.set.model.tablemodel/src/org/eclipse/set/model/tablemodel/impl/ColumnDescriptorImpl.java b/java/bundles/org.eclipse.set.model.tablemodel/src/org/eclipse/set/model/tablemodel/impl/ColumnDescriptorImpl.java index 22229e707a..748ca2c0e3 100644 --- a/java/bundles/org.eclipse.set.model.tablemodel/src/org/eclipse/set/model/tablemodel/impl/ColumnDescriptorImpl.java +++ b/java/bundles/org.eclipse.set.model.tablemodel/src/org/eclipse/set/model/tablemodel/impl/ColumnDescriptorImpl.java @@ -56,6 +56,8 @@ * Merge Common Values} *
  • {@link org.eclipse.set.model.tablemodel.impl.ColumnDescriptorImpl#getColumnPosition * Column Position}
    • + *
  • {@link org.eclipse.set.model.tablemodel.impl.ColumnDescriptorImpl#isIsRemarkColumn + * Is Remark Column}
    • * * * @generated @@ -242,6 +244,26 @@ public class ColumnDescriptorImpl extends MinimalEObjectImpl.Container */ protected String columnPosition = COLUMN_POSITION_EDEFAULT; + /** + * The default value of the '{@link #isIsRemarkColumn() Is Remark + * Column}' attribute. + * + * @see #isIsRemarkColumn() + * @generated + * @ordered + */ + protected static final boolean IS_REMARK_COLUMN_EDEFAULT = false; + + /** + * The cached value of the '{@link #isIsRemarkColumn() Is Remark + * Column}' attribute. + * + * @see #isIsRemarkColumn() + * @generated + * @ordered + */ + protected boolean isRemarkColumn = IS_REMARK_COLUMN_EDEFAULT; + /** * * @@ -555,6 +577,31 @@ public void setColumnPosition(String newColumnPosition) { oldColumnPosition, columnPosition)); } + /** + * + * + * @generated + */ + @Override + public boolean isIsRemarkColumn() { + return isRemarkColumn; + } + + /** + * + * + * @generated + */ + @Override + public void setIsRemarkColumn(boolean newIsRemarkColumn) { + boolean oldIsRemarkColumn = isRemarkColumn; + isRemarkColumn = newIsRemarkColumn; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, + TablemodelPackage.COLUMN_DESCRIPTOR__IS_REMARK_COLUMN, + oldIsRemarkColumn, isRemarkColumn)); + } + /** * * @@ -626,6 +673,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { return getMergeCommonValues(); case TablemodelPackage.COLUMN_DESCRIPTOR__COLUMN_POSITION: return getColumnPosition(); + case TablemodelPackage.COLUMN_DESCRIPTOR__IS_REMARK_COLUMN: + return isIsRemarkColumn(); } return super.eGet(featureID, resolve, coreType); } @@ -671,6 +720,9 @@ public void eSet(int featureID, Object newValue) { case TablemodelPackage.COLUMN_DESCRIPTOR__COLUMN_POSITION: setColumnPosition((String) newValue); return; + case TablemodelPackage.COLUMN_DESCRIPTOR__IS_REMARK_COLUMN: + setIsRemarkColumn((Boolean) newValue); + return; } super.eSet(featureID, newValue); } @@ -713,6 +765,9 @@ public void eUnset(int featureID) { case TablemodelPackage.COLUMN_DESCRIPTOR__COLUMN_POSITION: setColumnPosition(COLUMN_POSITION_EDEFAULT); return; + case TablemodelPackage.COLUMN_DESCRIPTOR__IS_REMARK_COLUMN: + setIsRemarkColumn(IS_REMARK_COLUMN_EDEFAULT); + return; } super.eUnset(featureID); } @@ -748,6 +803,8 @@ public boolean eIsSet(int featureID) { case TablemodelPackage.COLUMN_DESCRIPTOR__COLUMN_POSITION: return COLUMN_POSITION_EDEFAULT == null ? columnPosition != null : !COLUMN_POSITION_EDEFAULT.equals(columnPosition); + case TablemodelPackage.COLUMN_DESCRIPTOR__IS_REMARK_COLUMN: + return isRemarkColumn != IS_REMARK_COLUMN_EDEFAULT; } return super.eIsSet(featureID); } @@ -779,6 +836,8 @@ public String toString() { result.append(mergeCommonValues); result.append(", columnPosition: "); result.append(columnPosition); + result.append(", isRemarkColumn: "); + result.append(isRemarkColumn); result.append(')'); return result.toString(); } diff --git a/java/bundles/org.eclipse.set.model.tablemodel/src/org/eclipse/set/model/tablemodel/impl/TablemodelPackageImpl.java b/java/bundles/org.eclipse.set.model.tablemodel/src/org/eclipse/set/model/tablemodel/impl/TablemodelPackageImpl.java index c5098ae812..2c44991fbf 100644 --- a/java/bundles/org.eclipse.set.model.tablemodel/src/org/eclipse/set/model/tablemodel/impl/TablemodelPackageImpl.java +++ b/java/bundles/org.eclipse.set.model.tablemodel/src/org/eclipse/set/model/tablemodel/impl/TablemodelPackageImpl.java @@ -481,6 +481,17 @@ public EAttribute getColumnDescriptor_ColumnPosition() { .get(9); } + /** + * + * + * @generated + */ + @Override + public EAttribute getColumnDescriptor_IsRemarkColumn() { + return (EAttribute) columnDescriptorEClass.getEStructuralFeatures() + .get(10); + } + /** * * @@ -1064,6 +1075,8 @@ public void createPackageContents() { COLUMN_DESCRIPTOR__MERGE_COMMON_VALUES); createEAttribute(columnDescriptorEClass, COLUMN_DESCRIPTOR__COLUMN_POSITION); + createEAttribute(columnDescriptorEClass, + COLUMN_DESCRIPTOR__IS_REMARK_COLUMN); tableContentEClass = createEClass(TABLE_CONTENT); createEReference(tableContentEClass, TABLE_CONTENT__ROWGROUPS); @@ -1179,10 +1192,10 @@ public void initializePackageContents() { setNsURI(eNS_URI); // Obtain other dependent packages - BasisobjektePackage theBasisobjektePackage = (BasisobjektePackage) EPackage.Registry.INSTANCE - .getEPackage(BasisobjektePackage.eNS_URI); XMLTypePackage theXMLTypePackage = (XMLTypePackage) EPackage.Registry.INSTANCE .getEPackage(XMLTypePackage.eNS_URI); + BasisobjektePackage theBasisobjektePackage = (BasisobjektePackage) EPackage.Registry.INSTANCE + .getEPackage(BasisobjektePackage.eNS_URI); // Create type parameters @@ -1265,6 +1278,11 @@ public void initializePackageContents() { ColumnDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getColumnDescriptor_IsRemarkColumn(), + theXMLTypePackage.getBoolean(), "isRemarkColumn", "false", 0, 1, + ColumnDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, + IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(tableContentEClass, TableContent.class, "TableContent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);