Improve table cache

java/bundles/org.eclipse.set.application/src/org/eclipse/set/application/cacheservice/CacheServiceImpl.java

@@ -8,9 +8,11 @@
  */
 package org.eclipse.set.application.cacheservice;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
 import org.eclipse.e4.core.services.events.IEventBroker;
 import org.eclipse.set.basis.IModelSession;
@@ -58,10 +60,8 @@ public Cache getCache(final PlanPro_Schnittstelle schnittstelle,
 
 	@Override
 	public Cache getCache(final PlanPro_Schnittstelle schnittstelle,
-			final String cacheId, final String containerCacheId)
-			throws IllegalArgumentException {
-		return getCache(getSessionRole(schnittstelle), cacheId,
-				containerCacheId);
+			final String... cacheId) throws IllegalArgumentException {
+		return getCache(getSessionRole(schnittstelle), cacheId);
 	}
 
 	private void invalidate(final ToolboxFileRole role) {
@@ -126,9 +126,10 @@ public Cache getCache(final ToolboxFileRole role, final String cacheId)
 	}
 
 	@Override
-	public Cache getCache(final ToolboxFileRole role, final String cacheId,
-			final String containerCacheId) throws IllegalArgumentException {
-		final String cacheKey = cacheId + "/" + containerCacheId; //$NON-NLS-1$
+	public Cache getCache(final ToolboxFileRole role, final String... cacheId)
+			throws IllegalArgumentException {
+		final String cacheKey = Arrays.stream(cacheId)
+				.collect(Collectors.joining("/")); //$NON-NLS-1$
 		return getCache(role, cacheKey);
 	}
 

java/bundles/org.eclipse.set.core.services/src/org/eclipse/set/core/services/cache/CacheService.java

@@ -38,15 +38,13 @@ public Cache getCache(PlanPro_Schnittstelle schnittstelle, String cacheId)
 	 *            the {@link PlanPro_Schnittstelle}
 	 * @param cacheId
 	 *            the id for the cache
-	 * @param containerCacheId
-	 *            the id for the container to consider
 	 * @return the container cache
 	 * 
 	 * @throws IllegalArgumentException
 	 *             if no cache for the given id is found
 	 */
-	public Cache getCache(PlanPro_Schnittstelle schnittstelle, String cacheId,
-			String containerCacheId) throws IllegalArgumentException;
+	public Cache getCache(PlanPro_Schnittstelle schnittstelle,
+			String... cacheId) throws IllegalArgumentException;
 
 	/**
 	 * check if already storage cache
@@ -80,15 +78,13 @@ public Cache getCache(ToolboxFileRole role, String cacheId)
 	 *            {@link ToolboxFileRole}
 	 * @param cacheId
 	 *            the id for the cache
-	 * @param containerCacheId
-	 *            the id for the container to consider
 	 * @return the container cache
 	 * 
 	 * @throws IllegalArgumentException
 	 *             if no cache for the given id is found
 	 */
-	public Cache getCache(ToolboxFileRole role, String cacheId,
-			String containerCacheId) throws IllegalArgumentException;
+	public Cache getCache(ToolboxFileRole role, String... cacheId)
+			throws IllegalArgumentException;
 
 	/**
 	 * check if already storage cache

java/bundles/org.eclipse.set.core.services/src/org/eclipse/set/core/services/cache/NoCacheService.java

@@ -36,8 +36,7 @@ public Cache getCache(final PlanPro_Schnittstelle schnittStellle,
 
 	@Override
 	public Cache getCache(final PlanPro_Schnittstelle schnittStellle,
-			final String cacheId, final String containerCacheId)
-			throws IllegalArgumentException {
+			final String... cacheId) throws IllegalArgumentException {
 		return new NoCache();
 	}
 
@@ -54,8 +53,8 @@ public Cache getCache(final ToolboxFileRole role, final String cacheId)
 	}
 
 	@Override
-	public Cache getCache(final ToolboxFileRole role, final String cacheId,
-			final String containerCacheId) throws IllegalArgumentException {
+	public Cache getCache(final ToolboxFileRole role, final String... cacheId)
+			throws IllegalArgumentException {
 		return new NoCache();
 	}
 

java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/pdf/TableToTableDocument.xtend

@@ -17,13 +17,16 @@ import javax.imageio.ImageIO
 import javax.xml.parsers.DocumentBuilderFactory
 import javax.xml.parsers.ParserConfigurationException
 import org.eclipse.set.basis.FreeFieldInfo
+import org.eclipse.set.basis.constants.ToolboxConstants
 import org.eclipse.set.model.tablemodel.CellContent
-import org.eclipse.set.model.tablemodel.CompareCellContent
 import org.eclipse.set.model.tablemodel.CompareFootnoteContainer
+import org.eclipse.set.model.tablemodel.CompareStateCellContent
 import org.eclipse.set.model.tablemodel.CompareTableCellContent
+import org.eclipse.set.model.tablemodel.CompareTableFootnoteContainer
 import org.eclipse.set.model.tablemodel.FootnoteContainer
 import org.eclipse.set.model.tablemodel.MultiColorCellContent
 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.TableContent
@@ -41,15 +44,12 @@ import org.w3c.dom.Document
 import org.w3c.dom.Element
 
 import static extension org.eclipse.set.model.tablemodel.extensions.CellContentExtensions.*
+import static extension org.eclipse.set.model.tablemodel.extensions.TableCellExtensions.*
 import static extension org.eclipse.set.model.tablemodel.extensions.TableContentExtensions.*
 import static extension org.eclipse.set.model.tablemodel.extensions.TableExtensions.*
-import static extension org.eclipse.set.model.tablemodel.extensions.TableCellExtensions.*
 import static extension org.eclipse.set.model.tablemodel.extensions.TableRowExtensions.*
 import static extension org.eclipse.set.utils.StringExtensions.*
 import static extension org.eclipse.set.utils.export.xsl.siteplan.SiteplanXSL.pxToMilimeter
-import org.eclipse.set.basis.constants.ToolboxConstants
-import org.eclipse.set.model.tablemodel.PlanCompareRow
-import org.eclipse.set.model.tablemodel.CompareTableFootnoteContainer
 
 /**
  * Transformation from {@link Table} to TableDocument {@link Document}.
@@ -343,12 +343,12 @@ class TableToTableDocument {
 		}
 	}
 
-	private def dispatch Element createContent(CompareCellContent content,
+	private def dispatch Element createContent(CompareStateCellContent content,
 		FootnoteContainer fc, int columnNumber, boolean isRemarkColumn) {
 		val element = doc.createElement("DiffContent")
 		formatCompareContent(
-			content.oldValue,
-			content.newValue,
+			content.oldValue.stringValueIterable,
+			content.newValue.stringValueIterable,
 			[doc.createElement("OldValue")],
 			[doc.createElement("UnchangedValue")],
 			[doc.createElement("NewValue")],
@@ -487,8 +487,9 @@ 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
 	}
 

java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/AbstractPlanPro2TableModelTransformator.xtend

@@ -12,6 +12,7 @@ import java.util.ArrayList
 import java.util.Collections
 import java.util.Comparator
 import java.util.List
+import java.util.Map
 import java.util.Set
 import org.eclipse.emf.common.util.Enumerator
 import org.eclipse.set.basis.constants.ToolboxConstants
@@ -27,15 +28,13 @@ import org.eclipse.set.ppmodel.extensions.container.MultiContainer_AttributeGrou
 import org.eclipse.set.utils.events.TableDataChangeEvent
 import org.eclipse.set.utils.table.AbstractTableModelTransformator
 import org.eclipse.set.utils.table.Pt1TableChangeProperties
-import org.eclipse.set.utils.table.TMFactory
 import org.eclipse.set.utils.table.TableError
 import org.osgi.service.event.EventAdmin
 
-import static extension org.eclipse.set.model.tablemodel.extensions.TableExtensions.*
 import static extension org.eclipse.set.model.tablemodel.extensions.TableRowExtensions.*
 import static extension org.eclipse.set.ppmodel.extensions.BasisAttributExtensions.*
+import static extension org.eclipse.set.ppmodel.extensions.MultiContainer_AttributeGroupExtensions.*
 import static extension org.eclipse.set.ppmodel.extensions.utils.CacheUtils.*
-import java.util.Map
 
 abstract class AbstractPlanPro2TableModelTransformator extends AbstractTableModelTransformator<MultiContainer_AttributeGroup> {
 	protected val FootnoteTransformation footnoteTransformation = new FootnoteTransformation()
@@ -133,19 +132,6 @@ abstract class AbstractPlanPro2TableModelTransformator extends AbstractTableMode
 		return column;
 	}
 
-	override transformTableContent(MultiContainer_AttributeGroup container,
-		TMFactory factory) {
-		val table = transformTableContent(container, factory, null)
-		table.tableRows.forEach [ row |
-			row.cells.forEach [ cell, index |
-				if (cell.content === null) {
-					fillBlank(row, index)
-				}
-			]
-		]
-		return table
-	}
-
 	def <S, T extends Ur_Objekt> void fillSingleCellWhenAllowed(
 		TableRow row,
 		ColumnDescriptor column,
@@ -297,9 +283,12 @@ abstract class AbstractPlanPro2TableModelTransformator extends AbstractTableMode
 		ColumnDescriptor column, MultiContainer_AttributeGroup container,
 		Exception e) {
 		val errorMsg = createErrorMsg(e, row)
-		val guid = row.group.leadingObject?.identitaet?.wert
-		val leadingObject = getLeadingObjectIdentifier(row, guid)
-		tableErrors.add(new TableError(guid, leadingObject, "", errorMsg, row))
+		val leadingObject = row.group.leadingObject
+		val errorIdentiefer = getLeadingObjectIdentifier(row, leadingObject?.identitaet?.wert)
+		val tableType = container.containerType.defaultTableType
+		val error = new TableError(leadingObject, errorIdentiefer, "", errorMsg, row)
+		error.tableType = tableType
+		tableErrors.add(error)
 		return new Pt1TableChangeProperties(container, row, column,
 			#['''«ERROR_PREFIX»«errorMsg»'''], ITERABLE_FILLING_SEPARATOR)
 	}

java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/AbstractPlanPro2TableTransformationService.java

@@ -29,7 +29,6 @@
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.eclipse.set.feature.table.PlanPro2TableTransformationService;
-import org.eclipse.set.model.planpro.Ansteuerung_Element.Stell_Bereich;
 import org.eclipse.set.model.tablemodel.ColumnDescriptor;
 import org.eclipse.set.model.tablemodel.Table;
 import org.eclipse.set.model.tablemodel.extensions.ColumnDescriptorExtensions;
@@ -152,9 +151,8 @@ protected void setColumnTextAlignment(final Table table) {
 	}
 
 	@Override
-	public Table transform(final MultiContainer_AttributeGroup model,
-			final Stell_Bereich controlArea) {
-		final Table table = super.transform(model, controlArea);
+	public Table transform(final MultiContainer_AttributeGroup model) {
+		final Table table = super.transform(model);
 		if (transformator instanceof final AbstractPlanPro2TableModelTransformator pt1TableTransformator) {
 			pt1TableTransformator.updateWaitingFillCell(getShortcut());
 			pt1TableTransformator.getTopologicalCells()

java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssbb/SsbbTransformator.xtend

@@ -12,7 +12,6 @@ import com.google.common.collect.Lists
 import java.util.Set
 import org.eclipse.set.core.services.enumtranslation.EnumTranslationService
 import org.eclipse.set.feature.table.pt1.AbstractPlanPro2TableModelTransformator
-import org.eclipse.set.model.planpro.Ansteuerung_Element.Stell_Bereich
 import org.eclipse.set.model.planpro.Ansteuerung_Element.Stellelement
 import org.eclipse.set.model.planpro.Bedienung.Bedien_Einrichtung_Oertlich
 import org.eclipse.set.model.planpro.Ortung.FMA_Komponente
@@ -25,6 +24,7 @@ import org.eclipse.set.model.tablemodel.TableRow
 import org.eclipse.set.ppmodel.extensions.container.MultiContainer_AttributeGroup
 import org.eclipse.set.ppmodel.extensions.utils.Case
 import org.eclipse.set.utils.table.TMFactory
+import org.osgi.service.event.EventAdmin
 
 import static org.eclipse.set.feature.table.pt1.ssbb.SsbbColumns.*
 
@@ -35,9 +35,7 @@ import static extension org.eclipse.set.ppmodel.extensions.BueBedienAnzeigeExten
 import static extension org.eclipse.set.ppmodel.extensions.PunktObjektStreckeExtensions.*
 import static extension org.eclipse.set.ppmodel.extensions.SignalExtensions.*
 import static extension org.eclipse.set.ppmodel.extensions.StellelementExtensions.*
-import static extension org.eclipse.set.ppmodel.extensions.UrObjectExtensions.*
 import static extension org.eclipse.set.ppmodel.extensions.WKrGspElementExtensions.*
-import org.osgi.service.event.EventAdmin
 
 class SsbbTransformator extends AbstractPlanPro2TableModelTransformator {
 
@@ -50,15 +48,14 @@ class SsbbTransformator extends AbstractPlanPro2TableModelTransformator {
 	}
 
 	override transformTableContent(MultiContainer_AttributeGroup container,
-		TMFactory factory, Stell_Bereich controlArea) {
+		TMFactory factory) {
 		this.factory = factory
-		return container.transform(controlArea)
+		return container.transform
 	}
 
 	private def Table create factory.table transform(
-		MultiContainer_AttributeGroup container, Stell_Bereich controlArea) {
-		container.bedienEinrichtungOertlich.filter[isPlanningObject].
-			filterObjectsInControlArea(controlArea).filter [
+		MultiContainer_AttributeGroup container) {
+		container.bedienEinrichtungOertlich.filter [
 				!bedienAnzeigeElemente.map[bueBedienAnzeigeElemente].flatten.
 					filterNull.empty
 			].forEach [

java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssit/SsitTransformator.xtend

@@ -12,7 +12,6 @@ import com.google.common.collect.Lists
 import java.util.Set
 import org.eclipse.set.core.services.enumtranslation.EnumTranslationService
 import org.eclipse.set.feature.table.pt1.AbstractPlanPro2TableModelTransformator
-import org.eclipse.set.model.planpro.Ansteuerung_Element.Stell_Bereich
 import org.eclipse.set.model.planpro.Basisobjekte.Basis_Objekt
 import org.eclipse.set.model.planpro.Bedienung.Bedien_Einrichtung_Oertlich
 import org.eclipse.set.model.planpro.Schluesselabhaengigkeiten.Schluesselsperre
@@ -23,6 +22,7 @@ import org.eclipse.set.model.tablemodel.Table
 import org.eclipse.set.model.tablemodel.TableRow
 import org.eclipse.set.ppmodel.extensions.container.MultiContainer_AttributeGroup
 import org.eclipse.set.utils.table.TMFactory
+import org.osgi.service.event.EventAdmin
 
 import static org.eclipse.set.feature.table.pt1.ssit.SsitColumns.*
 
@@ -32,10 +32,8 @@ import static extension org.eclipse.set.ppmodel.extensions.NbBedienAnzeigeElemen
 import static extension org.eclipse.set.ppmodel.extensions.NbZoneElementExtensions.*
 import static extension org.eclipse.set.ppmodel.extensions.NbZoneExtensions.*
 import static extension org.eclipse.set.ppmodel.extensions.PunktObjektStreckeExtensions.*
-import static extension org.eclipse.set.ppmodel.extensions.UrObjectExtensions.*
 import static extension org.eclipse.set.ppmodel.extensions.WKrGspKomponenteExtensions.*
 import static extension org.eclipse.set.utils.math.BigDecimalExtensions.*
-import org.osgi.service.event.EventAdmin
 
 /**
  * Table transformation for a Bedieneinrichtungstabelle ESTW (Ssit).
@@ -52,22 +50,21 @@ class SsitTransformator extends AbstractPlanPro2TableModelTransformator {
 	}
 
 	override transformTableContent(MultiContainer_AttributeGroup container,
-		TMFactory factory, Stell_Bereich controlArea) {
+		TMFactory factory) {
 		this.factory = factory
-		return container.transform(controlArea)
+		return container.transform
 	}
 
 	private def Table create factory.table transform(
-		MultiContainer_AttributeGroup container, Stell_Bereich controlArea) {
-		container.bedienEinrichtungOertlich.filter[isPlanningObject].
-			filterObjectsInControlArea(controlArea).filter [
-				bedienAnzeigeElemente.forall[bueBedienAnzeigeElemente.empty]
-			].forEach [ it |
-				if (Thread.currentThread.interrupted) {
-					return
-				}
-				it.transform
-			]
+		MultiContainer_AttributeGroup container) {
+		container.bedienEinrichtungOertlich.filter [
+			bedienAnzeigeElemente.forall[bueBedienAnzeigeElemente.empty]
+		].forEach [ it |
+			if (Thread.currentThread.interrupted) {
+				return
+			}
+			it.transform
+		]
 		return
 	}
 

java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sska/SskaTransformator.xtend

@@ -17,7 +17,6 @@ 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
 import org.eclipse.set.model.planpro.Ansteuerung_Element.ESTW_Zentraleinheit
-import org.eclipse.set.model.planpro.Ansteuerung_Element.Stell_Bereich
 import org.eclipse.set.model.planpro.Ansteuerung_Element.Technik_Standort
 import org.eclipse.set.model.planpro.Ansteuerung_Element.Unterbringung
 import org.eclipse.set.model.planpro.Basisobjekte.Basis_Objekt
@@ -36,7 +35,6 @@ import static extension org.eclipse.set.ppmodel.extensions.BasisAttributExtensio
 import static extension org.eclipse.set.ppmodel.extensions.BedienBezirkExtensions.*
 import static extension org.eclipse.set.ppmodel.extensions.ESTW_ZentraleinheitExtensions.*
 import static extension org.eclipse.set.ppmodel.extensions.UnterbringungExtensions.*
-import static extension org.eclipse.set.ppmodel.extensions.UrObjectExtensions.*
 import static extension org.eclipse.set.ppmodel.extensions.utils.CollectionExtensions.*
 
 /**
@@ -52,7 +50,7 @@ class SskaTransformator extends AbstractPlanPro2TableModelTransformator {
 	}
 
 	override transformTableContent(MultiContainer_AttributeGroup container,
-		TMFactory factory, Stell_Bereich controlArea) {
+		TMFactory factory) {
 
 		val aussenelementansteuerungList = container.aussenelementansteuerung
 		val estwzentraleinheitList = container.ESTWZentraleinheit
@@ -61,8 +59,7 @@ class SskaTransformator extends AbstractPlanPro2TableModelTransformator {
 		elementList.addAll(estwzentraleinheitList);
 		elementList.addAll(aussenelementansteuerungList);
 		// Basis_Objekt
-		for (element : elementList.filter[isPlanningObject].
-			filterObjectsInControlArea(controlArea)) {
+		for (element : elementList) {
 			if (Thread.currentThread.interrupted) {
 				return null
 			}