Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2015-06-11 11:59:26 -0400
committerVincent Lorenzo2015-06-11 11:59:26 -0400
commit760c1178c06d38461b80d67a53841bd3bd8e472a (patch)
treecb18af4131cd39a40c7bcbb937947c397408316a
parentd7778a41806230a618a00692229b85077abb0ff1 (diff)
downloadorg.eclipse.papyrus-bugs/469971-tableFormula.tar.gz
org.eclipse.papyrus-bugs/469971-tableFormula.tar.xz
org.eclipse.papyrus-bugs/469971-tableFormula.zip
bug 469971: [Table] Papyrus Table must integrate formula support provided by NatTable https://bugs.eclipse.org/bugs/show_bug.cgi?id=469971bugs/469971-tableFormula
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractIndexHeaderDataProvider.java2
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java6
2 files changed, 5 insertions, 3 deletions
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractIndexHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractIndexHeaderDataProvider.java
index a7ee74a4117..b8a1e67eab0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractIndexHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractIndexHeaderDataProvider.java
@@ -146,7 +146,7 @@ public abstract class AbstractIndexHeaderDataProvider extends AbstractDataProvid
case ALPHABETIC:
return IntegerAndSpreadsheetNumberConverter.toString(axisIndex + 1);
case NUMERIC:
- return axisIndex;
+ return axisIndex+1;
}
}
return null;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java
index 592f3ae43cf..4c74477c4bf 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java
@@ -51,6 +51,8 @@ import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
import org.eclipse.nebula.widgets.nattable.export.command.ExportCommand;
//import org.eclipse.nebula.widgets.nattable.filterrow.FilterRowHeaderComposite;
import org.eclipse.nebula.widgets.nattable.filterrow.IFilterStrategy;
+import org.eclipse.nebula.widgets.nattable.formula.FormulaDataProvider;
+import org.eclipse.nebula.widgets.nattable.formula.config.FormulaStyleLabels;
import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
import org.eclipse.nebula.widgets.nattable.grid.data.DefaultCornerDataProvider;
import org.eclipse.nebula.widgets.nattable.grid.layer.CornerLayer;
@@ -306,9 +308,9 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
@Override
public NatTable createNattable(final Composite parent, final int style, final IWorkbenchPartSite site) {
this.bodyDataProvider = new BodyDataProvider(this);
+ FormulaDataProvider formulaProvider = new FormulaDataProvider(bodyDataProvider);
-
- this.bodyLayerStack = new BodyLayerStack(this.bodyDataProvider, this);
+ this.bodyLayerStack = new BodyLayerStack(formulaProvider, this);
columnHeaderDataProvider = new CompositeColumnHeaderDataProvider(this);
final IDataProvider indexColumnProvider = new ColumnIndexHeaderDataProvider(this);

Back to the top