catch up with branch daily Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.xtext.table.common/META-INF/MANIFEST.MF b/org.eclipse.osbp.xtext.table.common/META-INF/MANIFEST.MF index d9f48fc..0716335 100644 --- a/org.eclipse.osbp.xtext.table.common/META-INF/MANIFEST.MF +++ b/org.eclipse.osbp.xtext.table.common/META-INF/MANIFEST.MF
@@ -15,10 +15,10 @@ org.eclipse.osbp.gitinfo;bundle-version="[0.9.0,0.10.0)", org.jsoup;bundle-version="1.7.2", filteringtable.osgi;bundle-version="0.9.13", - org.eclipse.osbp.blob;bundle-version="0.9.0", org.eclipse.osbp.ui.api, org.eclipse.e4.core.contexts, - org.apache.commons.lang;bundle-version="2.6.0" + org.apache.commons.lang;bundle-version="2.6.0", + org.eclipse.osbp.blob;bundle-version="0.9.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: mondrian.olap,
diff --git a/org.eclipse.osbp.xtext.table.common/src/org/eclipse/osbp/xtext/table/common/CellSetIndexedContainer.java b/org.eclipse.osbp.xtext.table.common/src/org/eclipse/osbp/xtext/table/common/CellSetIndexedContainer.java index c7c6f72..d8908d0 100644 --- a/org.eclipse.osbp.xtext.table.common/src/org/eclipse/osbp/xtext/table/common/CellSetIndexedContainer.java +++ b/org.eclipse.osbp.xtext.table.common/src/org/eclipse/osbp/xtext/table/common/CellSetIndexedContainer.java
@@ -52,10 +52,10 @@ private static final Logger log = LoggerFactory.getLogger(CellSetIndexedContainer.class); private transient Map<String, PropertyLookup> propertyLookupMap = new HashMap<>(); - private transient DerivedCellSet cellSet = null; private transient List<Integer> coordinateSystem = null; private transient Map<Integer, PositionInfo> positionMap = new HashMap<>(); + private transient Map<DerivedPosition, Class<?>> valueTypes = new HashMap<>(); private String rowStyle = null; @@ -191,6 +191,7 @@ if (value != null) { // change type if applied type = lookup.getPropertyType(value.getClass()); + valueTypes.put(column, type); } // add default styles lookup.setDefaultStyle(type, isHeader); @@ -306,7 +307,8 @@ Object value = null; value = cellSet.getCell(coordinates).getValue(); if (value != null || !columnIsNull(column)) { - if (getContainerProperty(row.getOrdinal(), column.getOrdinal()) == null) { + if(!valueTypes.containsKey(column)) { +// if (getContainerProperty(row.getOrdinal(), column.getOrdinal()) == null) { addCellSetContainerProperty(column, value, null, false); } setCellSetContainerValue(row, column, value);