Bug 581248 - Hover styling does not work for header regions when

scrolled

Signed-off-by: Dirk Fauth <dirk.fauth@googlemail.com>

Change-Id: I8ef929a038e48757e6d7a8f0cae16997f823a384

41 files changed, 625 insertions, 378 deletions

diff --git a/org.eclipse.nebula.widgets.nattable.core.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.core.feature/feature.xml
index a645173f..dff0c83a 100644
--- a/org.eclipse.nebula.widgets.nattable.core.feature/feature.xml
+++ b/org.eclipse.nebula.widgets.nattable.core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.nebula.widgets.nattable.core.feature"
       label="%featureName"
-      version="2.0.4.qualifier"
+      version="2.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.nebula.widgets.nattable.core.source.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.core.source.feature/feature.xml
index 22ebca36..63807478 100644
--- a/org.eclipse.nebula.widgets.nattable.core.source.feature/feature.xml
+++ b/org.eclipse.nebula.widgets.nattable.core.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.nebula.widgets.nattable.core.source.feature"
       label="%featureName"
-      version="2.0.4.qualifier"
+      version="2.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.nebula.widgets.nattable.core.test/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.core.test/META-INF/MANIFEST.MF
index f923b840..9d88d34d 100644
--- a/org.eclipse.nebula.widgets.nattable.core.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NatTable Core Tests
 Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.core.tests
-Bundle-Version: 2.0.4.qualifier
+Bundle-Version: 2.1.0.qualifier
 Fragment-Host: org.eclipse.nebula.widgets.nattable.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.eclipse.core.commands.common,
diff --git a/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF
index cd33eb87..a68fe83e 100644
--- a/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF
@@ -2,184 +2,184 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NatTable Core
 Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.core
-Bundle-Version: 2.0.4.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-ExtensibleAPI: true
-Export-Package: org.eclipse.nebula.widgets.nattable;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.blink;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.blink.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.blink.event;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.columnCategories;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.columnCategories.gui;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.columnChooser;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.columnChooser.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.columnChooser.gui;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.columnRename;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.columnRename.event;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.conflation;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.coordinate;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.copy;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.copy.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.copy.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.copy.serializing;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.data;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.data.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.data.convert;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.data.validate;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.datachange;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.datachange.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.datachange.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.datachange.event;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.edit;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.edit.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.edit.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.edit.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.edit.editor;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.edit.event;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.edit.gui;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.export;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.export.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.export.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.export.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.export.csv;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.export.excel;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.export.image;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.export.image.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.fillhandle;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.fillhandle.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.fillhandle.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.fillhandle.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.fillhandle.event;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.filterrow;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.filterrow.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.filterrow.combobox;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.filterrow.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.filterrow.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.filterrow.event;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.formula;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.formula.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.formula.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.formula.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.formula.function;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.freeze;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.freeze.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.freeze.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.freeze.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.freeze.event;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.grid;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.grid.cell;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.grid.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.grid.data;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.grid.layer;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.grid.layer.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.grid.layer.event;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.group;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.group.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.group.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.group.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.group.event;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.group.gui;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.group.model;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.group.painter;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.group.performance;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.group.performance.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.group.performance.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.group.performance.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.group.performance.gui;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.group.performance.painter;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.hideshow;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.hideshow.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.hideshow.event;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.hideshow.indicator;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.hierarchical;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.hierarchical.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.hierarchical.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.hierarchical.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.hover;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.hover.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.hover.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.hover.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.layer;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.layer.cell;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.layer.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.layer.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.layer.event;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.layer.stack;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.painter;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.painter.cell;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.painter.cell.decorator;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.painter.layer;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.persistence;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.persistence.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.persistence.gui;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.print;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.print.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.print.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.print.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.reorder;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.reorder.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.reorder.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.reorder.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.reorder.event;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.resize;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.resize.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.resize.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.resize.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.resize.event;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.resize.mode;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.search;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.search.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.search.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.search.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.search.event;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.search.gui;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.search.strategy;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.selection;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.selection.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.selection.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.selection.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.selection.event;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.selection.preserve;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.serializing;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.sort;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.sort.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.sort.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.sort.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.sort.event;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.sort.painter;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.style;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.style.editor;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.style.editor.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.style.theme;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.summaryrow;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.summaryrow.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.tickupdate;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.tickupdate.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.tickupdate.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.tickupdate.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.tooltip;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.tree;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.tree.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.tree.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.tree.config;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.tree.painter;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.ui;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.ui.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.ui.binding;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.ui.matcher;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.ui.menu;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.ui.mode;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.ui.rename;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.ui.scaling;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.ui.util;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.util;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.viewport;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.viewport.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.viewport.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.viewport.event;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.widget;version="2.0.0"
+Export-Package: org.eclipse.nebula.widgets.nattable;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.blink;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.blink.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.blink.event;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.columnCategories;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.columnCategories.gui;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.columnChooser;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.columnChooser.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.columnChooser.gui;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.columnRename;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.columnRename.event;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.conflation;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.coordinate;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.copy;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.copy.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.copy.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.copy.serializing;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.data;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.data.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.data.convert;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.data.validate;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.datachange;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.datachange.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.datachange.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.datachange.event;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.edit;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.edit.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.edit.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.edit.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.edit.editor;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.edit.event;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.edit.gui;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.export;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.export.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.export.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.export.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.export.csv;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.export.excel;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.export.image;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.export.image.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.fillhandle;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.fillhandle.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.fillhandle.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.fillhandle.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.fillhandle.event;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.filterrow;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.filterrow.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.filterrow.combobox;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.filterrow.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.filterrow.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.filterrow.event;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.formula;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.formula.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.formula.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.formula.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.formula.function;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.freeze;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.freeze.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.freeze.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.freeze.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.freeze.event;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.grid;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.grid.cell;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.grid.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.grid.data;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.grid.layer;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.grid.layer.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.grid.layer.event;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.group;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.group.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.group.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.group.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.group.event;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.group.gui;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.group.model;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.group.painter;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.group.performance;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.group.performance.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.group.performance.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.group.performance.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.group.performance.gui;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.group.performance.painter;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.hideshow;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.hideshow.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.hideshow.event;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.hideshow.indicator;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.hierarchical;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.hierarchical.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.hierarchical.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.hierarchical.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.hover;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.hover.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.hover.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.hover.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.layer;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.layer.cell;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.layer.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.layer.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.layer.event;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.layer.stack;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.painter;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.painter.cell;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.painter.cell.decorator;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.painter.layer;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.persistence;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.persistence.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.persistence.gui;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.print;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.print.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.print.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.print.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.reorder;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.reorder.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.reorder.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.reorder.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.reorder.event;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.resize;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.resize.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.resize.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.resize.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.resize.event;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.resize.mode;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.search;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.search.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.search.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.search.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.search.event;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.search.gui;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.search.strategy;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.selection;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.selection.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.selection.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.selection.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.selection.event;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.selection.preserve;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.serializing;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.sort;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.sort.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.sort.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.sort.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.sort.event;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.sort.painter;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.style;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.style.editor;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.style.editor.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.style.theme;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.summaryrow;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.summaryrow.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.tickupdate;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.tickupdate.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.tickupdate.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.tickupdate.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.tooltip;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.tree;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.tree.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.tree.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.tree.config;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.tree.painter;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.ui;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.ui.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.ui.binding;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.ui.matcher;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.ui.menu;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.ui.mode;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.ui.rename;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.ui.scaling;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.ui.util;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.util;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.viewport;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.viewport.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.viewport.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.viewport.event;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.widget;version="2.1.0"
 Import-Package: org.eclipse.collections.api;version="10.1.0",
  org.eclipse.collections.api.block;version="10.1.0",
  org.eclipse.collections.api.block.function;version="10.1.0",
diff --git a/org.eclipse.nebula.widgets.nattable.core/pom.xml b/org.eclipse.nebula.widgets.nattable.core/pom.xml
index 78b05712..92c96abf 100644
--- a/org.eclipse.nebula.widgets.nattable.core/pom.xml
+++ b/org.eclipse.nebula.widgets.nattable.core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.nebula.widgets.nattable</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.4-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -13,7 +13,7 @@
 
     <groupId>org.eclipse.nebula.widgets.nattable</groupId>
     <artifactId>org.eclipse.nebula.widgets.nattable.core</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     
     <dependencies>
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/HoverLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/HoverLayer.java
index 16589d2c..5764c551 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/HoverLayer.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/HoverLayer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2020 Dirk Fauth and others.
+ * Copyright (c) 2013, 2022 Dirk Fauth and others.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -13,6 +13,7 @@
 package org.eclipse.nebula.widgets.nattable.hover;
 
 import org.eclipse.nebula.widgets.nattable.hover.command.ClearHoverStylingCommandHandler;
+import org.eclipse.nebula.widgets.nattable.hover.command.HoverStylingByIndexCommandHandler;
 import org.eclipse.nebula.widgets.nattable.hover.command.HoverStylingCommandHandler;
 import org.eclipse.nebula.widgets.nattable.hover.config.BodyHoverStylingBindings;
 import org.eclipse.nebula.widgets.nattable.layer.AbstractIndexLayerTransform;
@@ -75,6 +76,7 @@ public class HoverLayer extends AbstractIndexLayerTransform {
         }
 
         registerCommandHandler(new HoverStylingCommandHandler(this));
+        registerCommandHandler(new HoverStylingByIndexCommandHandler(this));
         registerCommandHandler(new ClearHoverStylingCommandHandler(this));
     }
 
@@ -145,6 +147,25 @@ public class HoverLayer extends AbstractIndexLayerTransform {
     }
 
     /**
+     * Set the information about the cell identified by index that is currently
+     * hovered and fire an event to update a possible previous hovered cell to
+     * remove the hover styling and an event to update the newly hovered cell to
+     * apply the hover styling.
+     *
+     * @param columnIndex
+     *            The column index of the cell that is currently hovered.
+     * @param rowIndex
+     *            The row index of the cell that is currently hovered.
+     *
+     * @since 2.1
+     */
+    public void setCurrentHoveredCellByIndex(int columnIndex, int rowIndex) {
+        int columnPosition = getColumnPositionByIndex(columnIndex);
+        int rowPosition = getRowPositionByIndex(rowIndex);
+        setCurrentHoveredCellPosition(new Point(columnPosition, rowPosition));
+    }
+
+    /**
      * Set the information about the cell position that is currently hovered and
      * fire an event to update a possible previous hovered cell to remove the
      * hover styling and an event to update the newly hovered cell to apply the
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/action/HoverStylingByIndexAction.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/action/HoverStylingByIndexAction.java
new file mode 100644
index 00000000..d8c20150
--- /dev/null
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/action/HoverStylingByIndexAction.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2022 Dirk Fauth and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *    Dirk Fauth <dirk.fauth@googlemail.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.nebula.widgets.nattable.hover.action;
+
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.hover.HoverLayer;
+import org.eclipse.nebula.widgets.nattable.hover.command.ClearHoverStylingCommand;
+import org.eclipse.nebula.widgets.nattable.hover.command.HoverStylingByIndexCommand;
+import org.eclipse.nebula.widgets.nattable.ui.action.ClearCursorAction;
+import org.eclipse.swt.events.MouseEvent;
+
+/**
+ * Action that will execute the HoverStylingByIndexCommand which applies hover styling
+ * in a NatTable.
+ * <p>
+ * Will also clear any set cursor by default.
+ *
+ * @see HoverLayer
+ * @see HoverStylingByIndexCommand
+ *
+ * @since 2.1
+ */
+public class HoverStylingByIndexAction extends ClearCursorAction {
+
+    /**
+     * The HoverLayer that is responsible for handling the hover styling
+     * command.
+     */
+    private final HoverLayer hoverLayer;
+
+    /**
+     * @param hoverLayer
+     *            The HoverLayer that is responsible for handling the hover
+     *            styling command. Necessary to avoid that other HoverLayer
+     *            instances in a grid composition handle and consume the
+     *            command.
+     */
+    public HoverStylingByIndexAction(HoverLayer hoverLayer) {
+        this.hoverLayer = hoverLayer;
+    }
+
+    @Override
+    public void run(NatTable natTable, MouseEvent event) {
+        // clear the cursor on hovering
+        super.run(natTable, event);
+
+        // ensure to clear the hover styling in other possible HoverLayer in the
+        // composition
+        natTable.doCommand(new ClearHoverStylingCommand(this.hoverLayer));
+
+        int natColumnPos = natTable.getColumnPositionByX(event.x);
+        int natRowPos = natTable.getRowPositionByY(event.y);
+
+        natTable.doCommand(
+                new HoverStylingByIndexCommand(
+                        natTable.getColumnIndexByPosition(natColumnPos),
+                        natTable.getRowIndexByPosition(natRowPos),
+                        this.hoverLayer));
+    }
+}
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/command/HoverStylingByIndexCommand.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/command/HoverStylingByIndexCommand.java
new file mode 100644
index 00000000..df1a37f4
--- /dev/null
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/command/HoverStylingByIndexCommand.java
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2022 Dirk Fauth and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *    Dirk Fauth <dirk.fauth@googlemail.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.nebula.widgets.nattable.hover.command;
+
+import org.eclipse.nebula.widgets.nattable.command.AbstractContextFreeCommand;
+import org.eclipse.nebula.widgets.nattable.hover.HoverLayer;
+
+/**
+ * Command that is used to apply hover styling in a NatTable.
+ * <p>
+ * This command needs to know about the HoverLayer on which it is executed
+ * because there might be several HoverLayer involved in a grid composition and
+ * therefore the command might be consumed by the wrong HoverLayer if we
+ * wouldn't know about the layer to handle it.
+ *
+ * @see HoverLayer
+ * @see HoverStylingByIndexCommandHandler
+ *
+ * @since 2.1
+ */
+public class HoverStylingByIndexCommand extends AbstractContextFreeCommand {
+
+    /**
+     * The column index of the cell to apply the hover styling.
+     */
+    private final int columnIndex;
+    /**
+     * The row index of the cell to apply the hover styling.
+     */
+    private final int rowIndex;
+
+    /**
+     * The HoverLayer that should handle the command.
+     */
+    private final HoverLayer hoverLayer;
+
+    /**
+     * @param columnIndex
+     *            The column index of the cell to apply the hover styling.
+     * @param rowIndex
+     *            The row index of the cell to apply the hover styling.
+     * @param hoverLayer
+     *            The HoverLayer that should handle the command. Necessary to
+     *            avoid that other HoverLayer instances in a grid composition
+     *            handle and consume the command.
+     */
+    public HoverStylingByIndexCommand(int columnIndex, int rowIndex, HoverLayer hoverLayer) {
+        this.columnIndex = columnIndex;
+        this.rowIndex = rowIndex;
+        this.hoverLayer = hoverLayer;
+    }
+
+    /**
+     * Constructor used for cloning purposes.
+     *
+     * @param command
+     *            The command that should be used to create a new instance.
+     */
+    protected HoverStylingByIndexCommand(HoverStylingByIndexCommand command) {
+        this.columnIndex = command.getColumnIndex();
+        this.rowIndex = command.getRowIndex();
+        this.hoverLayer = command.getHoverLayer();
+    }
+
+    @Override
+    public HoverStylingByIndexCommand cloneCommand() {
+        return new HoverStylingByIndexCommand(this);
+    }
+
+    /**
+     * @return The column index of the cell to apply the hover styling.
+     */
+    public int getColumnIndex() {
+        return this.columnIndex;
+    }
+
+    /**
+     * @return The row index of the cell to apply the hover styling.
+     */
+    public int getRowIndex() {
+        return this.rowIndex;
+    }
+
+    /**
+     * @return The HoverLayer that should handle the command.
+     */
+    public HoverLayer getHoverLayer() {
+        return this.hoverLayer;
+    }
+
+}
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/command/HoverStylingByIndexCommandHandler.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/command/HoverStylingByIndexCommandHandler.java
new file mode 100644
index 00000000..fc4ff876
--- /dev/null
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/command/HoverStylingByIndexCommandHandler.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2022 Dirk Fauth and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *    Dirk Fauth <dirk.fauth@googlemail.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.nebula.widgets.nattable.hover.command;
+
+import org.eclipse.nebula.widgets.nattable.command.AbstractLayerCommandHandler;
+import org.eclipse.nebula.widgets.nattable.hover.HoverLayer;
+
+/**
+ * Command handler that is responsible for handling the HoverStylingByIndexCommand.
+ * Will set the current hovered cell position to the connected HoverLayer to
+ * apply hover styling accordingly.
+ *
+ * @see HoverLayer
+ * @see HoverStylingByIndexCommand
+ *
+ * @since 2.1
+ */
+public class HoverStylingByIndexCommandHandler extends AbstractLayerCommandHandler<HoverStylingByIndexCommand> {
+
+    /**
+     * The HoverLayer this command handler is connected to.
+     */
+    private final HoverLayer layer;
+
+    /**
+     *
+     * @param layer
+     *            The HoverLayer this command handler is connected to.
+     */
+    public HoverStylingByIndexCommandHandler(HoverLayer layer) {
+        this.layer = layer;
+    }
+
+    @Override
+    protected boolean doCommand(HoverStylingByIndexCommand command) {
+        if (this.layer.equals(command.getHoverLayer())) {
+            this.layer.setCurrentHoveredCellByIndex(command.getColumnIndex(), command.getRowIndex());
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public Class<HoverStylingByIndexCommand> getCommandClass() {
+        return HoverStylingByIndexCommand.class;
+    }
+
+}
\ No newline at end of file
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/command/HoverStylingCommand.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/command/HoverStylingCommand.java
index 77ff908e..3ebaffd7 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/command/HoverStylingCommand.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/command/HoverStylingCommand.java
@@ -25,8 +25,6 @@ import org.eclipse.nebula.widgets.nattable.layer.ILayer;
  * therefore the command might be consumed by the wrong HoverLayer if we
  * wouldn't know about the layer to handle it.
  *
- * @author Dirk Fauth
- *
  * @see HoverLayer
  * @see HoverStylingCommandHandler
  */
@@ -50,8 +48,7 @@ public class HoverStylingCommand extends AbstractPositionCommand {
      *            avoid that other HoverLayer instances in a grid composition
      *            handle and consume the command.
      */
-    public HoverStylingCommand(ILayer layer, int columnPosition,
-            int rowPosition, HoverLayer hoverLayer) {
+    public HoverStylingCommand(ILayer layer, int columnPosition, int rowPosition, HoverLayer hoverLayer) {
         super(layer, columnPosition, rowPosition);
         this.hoverLayer = hoverLayer;
     }
@@ -79,4 +76,4 @@ public class HoverStylingCommand extends AbstractPositionCommand {
         return this.hoverLayer;
     }
 
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/command/HoverStylingCommandHandler.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/command/HoverStylingCommandHandler.java
index 89f4e841..3fd5ce96 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/command/HoverStylingCommandHandler.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/command/HoverStylingCommandHandler.java
@@ -20,13 +20,10 @@ import org.eclipse.nebula.widgets.nattable.hover.HoverLayer;
  * Will set the current hovered cell position to the connected HoverLayer to
  * apply hover styling accordingly.
  *
- * @author Dirk Fauth
- *
  * @see HoverLayer
  * @see HoverStylingCommand
  */
-public class HoverStylingCommandHandler extends
-        AbstractLayerCommandHandler<HoverStylingCommand> {
+public class HoverStylingCommandHandler extends AbstractLayerCommandHandler<HoverStylingCommand> {
 
     /**
      * The HoverLayer this command handler is connected to.
@@ -45,8 +42,7 @@ public class HoverStylingCommandHandler extends
     @Override
     protected boolean doCommand(HoverStylingCommand command) {
         if (this.layer.equals(command.getHoverLayer())) {
-            this.layer.setCurrentHoveredCellPosition(
-                    command.getColumnPosition(), command.getRowPosition());
+            this.layer.setCurrentHoveredCellPosition(command.getColumnPosition(), command.getRowPosition());
             return true;
         }
         return false;
@@ -57,4 +53,4 @@ public class HoverStylingCommandHandler extends
         return HoverStylingCommand.class;
     }
 
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/config/ColumnHeaderResizeHoverBindings.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/config/ColumnHeaderResizeHoverBindings.java
index 13c9111a..31b3d1c2 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/config/ColumnHeaderResizeHoverBindings.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/config/ColumnHeaderResizeHoverBindings.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2020 Original authors and others.
+ * Copyright (c) 2012, 2022 Original authors and others.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -16,7 +16,7 @@ import org.eclipse.nebula.widgets.nattable.config.AbstractUiBindingConfiguration
 import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
 import org.eclipse.nebula.widgets.nattable.hover.HoverLayer;
 import org.eclipse.nebula.widgets.nattable.hover.action.ClearHoverStylingAction;
-import org.eclipse.nebula.widgets.nattable.hover.action.HoverStylingAction;
+import org.eclipse.nebula.widgets.nattable.hover.action.HoverStylingByIndexAction;
 import org.eclipse.nebula.widgets.nattable.resize.action.AutoResizeColumnAction;
 import org.eclipse.nebula.widgets.nattable.resize.action.ColumnResizeCursorAction;
 import org.eclipse.nebula.widgets.nattable.resize.event.ColumnResizeEventMatcher;
@@ -45,13 +45,14 @@ public class ColumnHeaderResizeHoverBindings extends AbstractUiBindingConfigurat
     public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {
         // Mouse move - Show resize cursor
         uiBindingRegistry.registerFirstMouseMoveBinding(
-                new ColumnResizeEventMatcher(SWT.NONE,
-                        GridRegion.COLUMN_HEADER, 0),
+                new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 0),
                 new ColumnResizeCursorAction());
+
         // apply a hover styling on moving the mouse over a NatTable and clear
         // the cursor
-        uiBindingRegistry.registerMouseMoveBinding(new MouseEventMatcher(
-                GridRegion.COLUMN_HEADER), new HoverStylingAction(this.layer));
+        uiBindingRegistry.registerMouseMoveBinding(
+                new MouseEventMatcher(GridRegion.COLUMN_HEADER),
+                new HoverStylingByIndexAction(this.layer));
 
         // clear any hover styling if the mouse is moved out of a NatTable
         // region
@@ -67,18 +68,15 @@ public class ColumnHeaderResizeHoverBindings extends AbstractUiBindingConfigurat
 
         // Column resize
         uiBindingRegistry.registerFirstMouseDragMode(
-                new ColumnResizeEventMatcher(SWT.NONE,
-                        GridRegion.COLUMN_HEADER, 1),
+                new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1),
                 new ColumnResizeDragMode());
 
         uiBindingRegistry.registerDoubleClickBinding(
-                new ColumnResizeEventMatcher(SWT.NONE,
-                        GridRegion.COLUMN_HEADER, 1),
+                new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1),
                 new AutoResizeColumnAction());
         uiBindingRegistry.registerSingleClickBinding(
-                new ColumnResizeEventMatcher(SWT.NONE,
-                        GridRegion.COLUMN_HEADER, 1),
+                new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1),
                 new NoOpMouseAction());
     }
 
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/config/RowHeaderResizeHoverBindings.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/config/RowHeaderResizeHoverBindings.java
index f98a2a44..db2ad297 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/config/RowHeaderResizeHoverBindings.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hover/config/RowHeaderResizeHoverBindings.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2020 Original authors and others.
+ * Copyright (c) 2012, 2022 Original authors and others.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -16,7 +16,7 @@ import org.eclipse.nebula.widgets.nattable.config.AbstractUiBindingConfiguration
 import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
 import org.eclipse.nebula.widgets.nattable.hover.HoverLayer;
 import org.eclipse.nebula.widgets.nattable.hover.action.ClearHoverStylingAction;
-import org.eclipse.nebula.widgets.nattable.hover.action.HoverStylingAction;
+import org.eclipse.nebula.widgets.nattable.hover.action.HoverStylingByIndexAction;
 import org.eclipse.nebula.widgets.nattable.resize.action.AutoResizeRowAction;
 import org.eclipse.nebula.widgets.nattable.resize.action.RowResizeCursorAction;
 import org.eclipse.nebula.widgets.nattable.resize.event.RowResizeEventMatcher;
@@ -26,8 +26,7 @@ import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
 import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;
 import org.eclipse.swt.SWT;
 
-public class RowHeaderResizeHoverBindings extends
-        AbstractUiBindingConfiguration {
+public class RowHeaderResizeHoverBindings extends AbstractUiBindingConfiguration {
 
     /**
      * The HoverLayer that is used to add hover styling.
@@ -48,10 +47,12 @@ public class RowHeaderResizeHoverBindings extends
         uiBindingRegistry.registerFirstMouseMoveBinding(
                 new RowResizeEventMatcher(SWT.NONE, 0),
                 new RowResizeCursorAction());
+
         // apply a hover styling on moving the mouse over a NatTable and clear
         // the cursor
-        uiBindingRegistry.registerMouseMoveBinding(new MouseEventMatcher(
-                GridRegion.ROW_HEADER), new HoverStylingAction(this.layer));
+        uiBindingRegistry.registerMouseMoveBinding(
+                new MouseEventMatcher(GridRegion.ROW_HEADER),
+                new HoverStylingByIndexAction(this.layer));
 
         // clear any hover styling if the mouse is moved out of the region area
         // uiBindingRegistry.registerMouseMoveBinding(
@@ -77,13 +78,16 @@ public class RowHeaderResizeHoverBindings extends
         uiBindingRegistry.registerMouseExitBinding((natTable, event, regionLabels) -> true, new ClearHoverStylingAction());
 
         // Row resize
-        uiBindingRegistry.registerFirstMouseDragMode(new RowResizeEventMatcher(
-                SWT.NONE, 1), new RowResizeDragMode());
+        uiBindingRegistry.registerFirstMouseDragMode(
+                new RowResizeEventMatcher(SWT.NONE, 1),
+                new RowResizeDragMode());
 
-        uiBindingRegistry.registerDoubleClickBinding(new RowResizeEventMatcher(
-                SWT.NONE, 1), new AutoResizeRowAction());
-        uiBindingRegistry.registerSingleClickBinding(new RowResizeEventMatcher(
-                SWT.NONE, 1), new NoOpMouseAction());
+        uiBindingRegistry.registerDoubleClickBinding(
+                new RowResizeEventMatcher(SWT.NONE, 1),
+                new AutoResizeRowAction());
+        uiBindingRegistry.registerSingleClickBinding(
+                new RowResizeEventMatcher(SWT.NONE, 1),
+                new NoOpMouseAction());
     }
 
 }
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/layer/event/CellVisualUpdateEvent.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/layer/event/CellVisualUpdateEvent.java
index 255bcb38..4e5e1654 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/layer/event/CellVisualUpdateEvent.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/layer/event/CellVisualUpdateEvent.java
@@ -14,8 +14,8 @@ package org.eclipse.nebula.widgets.nattable.layer.event;
 
 import org.eclipse.nebula.widgets.nattable.grid.layer.DimensionallyDependentLayer;
 import org.eclipse.nebula.widgets.nattable.layer.ILayer;
+import org.eclipse.nebula.widgets.nattable.layer.IUniqueIndexLayer;
 import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
-import org.eclipse.nebula.widgets.nattable.viewport.ViewportLayer;
 
 /**
  * Specialization of the CellVisualChangeEvent. The only difference is the
@@ -70,13 +70,15 @@ public class CellVisualUpdateEvent extends CellVisualChangeEvent {
         } else {
             DimensionallyDependentLayer ddl = (DimensionallyDependentLayer) localLayer;
 
-            if (ddl.getHorizontalLayerDependency() instanceof ViewportLayer) {
-                int columnIndex = this.layer.getColumnIndexByPosition(this.columnPosition);
-                columnPos = ((ViewportLayer) ddl.getHorizontalLayerDependency()).getColumnPositionByIndex(columnIndex);
+            if (ddl.getHorizontalLayerDependency() instanceof IUniqueIndexLayer) {
+                int columnIndex =
+                        this.layer.getColumnIndexByPosition(this.columnPosition);
+                columnPos = ((IUniqueIndexLayer) ddl.getHorizontalLayerDependency()).getColumnPositionByIndex(columnIndex);
             }
-            if (ddl.getVerticalLayerDependency() instanceof ViewportLayer) {
-                int rowIndex = this.layer.getRowIndexByPosition(this.rowPosition);
-                rowPos = ((ViewportLayer) ddl.getVerticalLayerDependency()).getRowPositionByIndex(rowIndex);
+            if (ddl.getVerticalLayerDependency() instanceof IUniqueIndexLayer) {
+                int rowIndex =
+                        this.layer.getRowIndexByPosition(this.rowPosition);
+                rowPos = ((IUniqueIndexLayer) ddl.getVerticalLayerDependency()).getRowPositionByIndex(rowIndex);
             }
         }
 
diff --git a/org.eclipse.nebula.widgets.nattable.dataset/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.dataset/META-INF/MANIFEST.MF
index 819da355..9ac45244 100644
--- a/org.eclipse.nebula.widgets.nattable.dataset/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.dataset/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NatTable Dataset Utilities (internal usage)
 Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.dataset
-Bundle-Version: 2.0.4.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.nebula.widgets.nattable.dataset;version="1.4.0",
  org.eclipse.nebula.widgets.nattable.dataset.car;version="1.5.0",
diff --git a/org.eclipse.nebula.widgets.nattable.examples.e4.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.examples.e4.feature/feature.xml
index 1a01e863..331981fa 100644
--- a/org.eclipse.nebula.widgets.nattable.examples.e4.feature/feature.xml
+++ b/org.eclipse.nebula.widgets.nattable.examples.e4.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.nebula.widgets.nattable.examples.e4.feature"
       label="%featureName"
-      version="2.0.4.qualifier"
+      version="2.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.nebula.widgets.nattable.examples.e4.product/org.eclipse.nebula.widgets.nattable.examples.e4.product b/org.eclipse.nebula.widgets.nattable.examples.e4.product/org.eclipse.nebula.widgets.nattable.examples.e4.product
index 629eb443..411d3148 100644
--- a/org.eclipse.nebula.widgets.nattable.examples.e4.product/org.eclipse.nebula.widgets.nattable.examples.e4.product
+++ b/org.eclipse.nebula.widgets.nattable.examples.e4.product/org.eclipse.nebula.widgets.nattable.examples.e4.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="org.eclipse.nebula.widgets.nattable.examples.e4" uid="org.eclipse.nebula.widgets.nattable.examples.e4.product" id="org.eclipse.nebula.widgets.nattable.examples.e4.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.0.4.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="org.eclipse.nebula.widgets.nattable.examples.e4" uid="org.eclipse.nebula.widgets.nattable.examples.e4.product" id="org.eclipse.nebula.widgets.nattable.examples.e4.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.1.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
diff --git a/org.eclipse.nebula.widgets.nattable.examples.e4.product/pom.xml b/org.eclipse.nebula.widgets.nattable.examples.e4.product/pom.xml
index d4c69f9f..214d35c8 100644
--- a/org.eclipse.nebula.widgets.nattable.examples.e4.product/pom.xml
+++ b/org.eclipse.nebula.widgets.nattable.examples.e4.product/pom.xml
@@ -8,7 +8,7 @@
   <parent>
 		<artifactId>parent</artifactId>
 		<groupId>org.eclipse.nebula.widgets.nattable</groupId>
-		<version>2.0.4-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
   </parent>
 
diff --git a/org.eclipse.nebula.widgets.nattable.examples.e4.rcp.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.examples.e4.rcp.feature/feature.xml
index 0fcd39fb..f94eef5d 100644
--- a/org.eclipse.nebula.widgets.nattable.examples.e4.rcp.feature/feature.xml
+++ b/org.eclipse.nebula.widgets.nattable.examples.e4.rcp.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.nebula.widgets.nattable.examples.e4.rcp.feature"
       label="%featureName"
-      version="2.0.4.qualifier"
+      version="2.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.nebula.widgets.nattable.examples.e4/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.examples.e4/META-INF/MANIFEST.MF
index a86c4562..d407c7ee 100644
--- a/org.eclipse.nebula.widgets.nattable.examples.e4/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.examples.e4/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NatTable Eclipse 4 Examples
 Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.examples.e4;singleton:=true
-Bundle-Version: 2.0.4.qualifier
+Bundle-Version: 2.1.0.qualifier
 Require-Bundle: javax.inject;bundle-version="0.0.0",
  org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.swt;bundle-version="0.0.0",
diff --git a/org.eclipse.nebula.widgets.nattable.examples/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.examples/META-INF/MANIFEST.MF
index 7a6fe597..c7cb047b 100644
--- a/org.eclipse.nebula.widgets.nattable.examples/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.examples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NatTable Examples
 Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.examples
-Bundle-Version: 2.0.4.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: ca.odell.glazedlists,
  org.eclipse.swt,
diff --git a/org.eclipse.nebula.widgets.nattable.examples/pom.xml b/org.eclipse.nebula.widgets.nattable.examples/pom.xml
index 00683677..bea757c1 100644
--- a/org.eclipse.nebula.widgets.nattable.examples/pom.xml
+++ b/org.eclipse.nebula.widgets.nattable.examples/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.nebula.widgets.nattable</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/org.eclipse.nebula.widgets.nattable.extension.e4.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.extension.e4.feature/feature.xml
index 0b0f436e..00b59a0a 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.e4.feature/feature.xml
+++ b/org.eclipse.nebula.widgets.nattable.extension.e4.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.nebula.widgets.nattable.extension.e4.feature"
       label="%featureName"
-      version="2.0.4.qualifier"
+      version="2.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.nebula.widgets.nattable.extension.e4.source.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.extension.e4.source.feature/feature.xml
index 36786eb2..4b25f51e 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.e4.source.feature/feature.xml
+++ b/org.eclipse.nebula.widgets.nattable.extension.e4.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature"
       label="%featureName"
-      version="2.0.4.qualifier"
+      version="2.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.nebula.widgets.nattable.extension.e4/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.extension.e4/META-INF/MANIFEST.MF
index e96cb56f..e018d3f5 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.e4/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.extension.e4/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NatTable extension for Eclipse 4
 Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.extension.e4;singleton:=true
-Bundle-Version: 2.0.4.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.swt;bundle-version="3.103.0",
  org.eclipse.e4.ui.css.core;bundle-version="0.11.0",
@@ -11,37 +11,37 @@ Require-Bundle: org.eclipse.swt;bundle-version="3.103.0",
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.e4.core.di.annotations,
  org.eclipse.e4.ui.workbench.modeling,
- org.eclipse.nebula.widgets.nattable;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.command;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.config;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.coordinate;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.data;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.data.convert;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.edit;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.fillhandle.config;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.freeze;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.group.painter;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.hideshow.indicator;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.layer;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.layer.command;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.layer.event;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.painter;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.painter.cell;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.painter.cell.decorator;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.resize.command;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.selection;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.selection.command;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.selection.event;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.sort.painter;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.style;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.tree.config;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.tree.painter;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.ui.util;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.util;version="[2.0.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.command;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.config;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.coordinate;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.data;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.data.convert;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.edit;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.fillhandle.config;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.freeze;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.group.painter;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.hideshow.indicator;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.layer;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.layer.command;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.layer.event;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.painter;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.painter.cell;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.painter.cell.decorator;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.resize.command;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.selection;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.selection.command;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.selection.event;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.sort.painter;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.style;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.tree.config;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.tree.painter;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.ui.util;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.util;version="[2.1.0,3.0.0)",
  org.slf4j;version="1.7.2"
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.nebula.widgets.nattable.extension.e4.css;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.extension.e4.painterfactory;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.extension.e4.selection;version="2.0.0"
+Export-Package: org.eclipse.nebula.widgets.nattable.extension.e4.css;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.extension.e4.painterfactory;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.extension.e4.selection;version="2.1.0"
 Automatic-Module-Name: org.eclipse.nebula.widgets.nattable.extension.e4
 Bundle-Vendor: Eclipse Nebula NatTable
diff --git a/org.eclipse.nebula.widgets.nattable.extension.e4/pom.xml b/org.eclipse.nebula.widgets.nattable.extension.e4/pom.xml
index 21d7d36d..7ae629cd 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.e4/pom.xml
+++ b/org.eclipse.nebula.widgets.nattable.extension.e4/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.nebula.widgets.nattable</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.4-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -13,7 +13,7 @@
 
     <groupId>org.eclipse.nebula.widgets.nattable</groupId>
     <artifactId>org.eclipse.nebula.widgets.nattable.extension.e4</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
     <dependencies>
@@ -61,7 +61,7 @@
     	<dependency>
 		    <groupId>org.eclipse.nebula.widgets.nattable</groupId>
 		    <artifactId>org.eclipse.nebula.widgets.nattable.core</artifactId>
-		    <version>2.0.4-SNAPSHOT</version>
+		    <version>2.1.0-SNAPSHOT</version>
 		</dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature/feature.xml
index bb0258f8..78d192f0 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature/feature.xml
+++ b/org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature"
       label="%featureName"
-      version="2.0.4.qualifier"
+      version="2.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature/feature.xml
index b3a9e73f..0caefdc8 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature/feature.xml
+++ b/org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature"
       label="%featureName"
-      version="2.0.4.qualifier"
+      version="2.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.nebula.widgets.nattable.extension.glazedlists.test/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.extension.glazedlists.test/META-INF/MANIFEST.MF
index 2c5c6fa1..0f6e96d8 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.glazedlists.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.extension.glazedlists.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NatTable GlazedLists Extensions Test
 Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.extension.glazedlists.tests
-Bundle-Version: 2.0.4.qualifier
+Bundle-Version: 2.1.0.qualifier
 Fragment-Host: org.eclipse.nebula.widgets.nattable.extension.glazedlists
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.eclipse.jface.viewers,
diff --git a/org.eclipse.nebula.widgets.nattable.extension.glazedlists/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.extension.glazedlists/META-INF/MANIFEST.MF
index a0177b89..1e87b7f0 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.glazedlists/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.extension.glazedlists/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NatTable extension for GlazedLists
 Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.extension.glazedlists
-Bundle-Version: 2.0.4.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.nebula.widgets.nattable.extension.glazedlists;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.extension.glazedlists.data.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.extension.glazedlists.filterrow;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.extension.glazedlists.groupBy;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.extension.glazedlists.groupBy.action;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.extension.glazedlists.groupBy.command;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.extension.glazedlists.groupBy.summary;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.extension.glazedlists.hideshow;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.extension.glazedlists.hierarchical;version="2.0.0",
- org.eclipse.nebula.widgets.nattable.extension.glazedlists.tree;version="2.0.0"
+Export-Package: org.eclipse.nebula.widgets.nattable.extension.glazedlists;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.data.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.filterrow;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.groupBy;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.groupBy.action;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.groupBy.command;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.groupBy.summary;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.hideshow;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.hierarchical;version="2.1.0",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.tree;version="2.1.0"
 Import-Package: ca.odell.glazedlists;version="[1.11.0,2.0.0)",
  ca.odell.glazedlists.event;version="[1.11.0,2.0.0)",
  ca.odell.glazedlists.gui;version="[1.11.0,2.0.0)",
@@ -21,58 +21,58 @@ Import-Package: ca.odell.glazedlists;version="[1.11.0,2.0.0)",
  ca.odell.glazedlists.util.concurrent;version="[1.11.0,2.0.0)",
  org.apache.commons.codec;version="[1.3.0,2.0.0)",
  org.apache.commons.codec.binary;version="[1.3.0,2.0.0)",
- org.eclipse.nebula.widgets.nattable;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.blink;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.command;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.config;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.coordinate;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.data;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.data.command;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.data.convert;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.edit;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.edit.action;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.edit.command;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.edit.editor;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.filterrow;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.filterrow.combobox;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.filterrow.command;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.filterrow.config;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.grid;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.grid.command;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.grid.data;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.grid.layer;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.group.performance;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.group.performance.action;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.hideshow;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.hideshow.command;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.hideshow.event;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.hierarchical;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.layer;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.layer.cell;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.layer.event;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.layer.stack;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.painter.cell;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.painter.cell.decorator;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.persistence;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.reorder.action;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.search.event;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.sort;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.sort.command;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.sort.config;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.sort.event;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.sort.painter;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.style;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.style.theme;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.summaryrow;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.summaryrow.command;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.tree;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.ui;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.ui.action;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.ui.binding;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.ui.matcher;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.ui.menu;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.ui.util;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.util;version="[2.0.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.blink;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.command;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.config;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.coordinate;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.data;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.data.command;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.data.convert;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.edit;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.edit.action;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.edit.command;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.edit.editor;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.filterrow;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.filterrow.combobox;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.filterrow.command;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.filterrow.config;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.grid;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.grid.command;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.grid.data;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.grid.layer;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.group.performance;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.group.performance.action;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.hideshow;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.hideshow.command;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.hideshow.event;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.hierarchical;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.layer;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.layer.cell;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.layer.event;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.layer.stack;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.painter.cell;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.painter.cell.decorator;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.persistence;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.reorder.action;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.search.event;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.sort;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.sort.command;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.sort.config;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.sort.event;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.sort.painter;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.style;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.style.theme;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.summaryrow;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.summaryrow.command;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.tree;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.ui;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.ui.action;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.ui.binding;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.ui.matcher;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.ui.menu;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.ui.util;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.util;version="[2.1.0,3.0.0)",
  org.eclipse.swt,
  org.eclipse.swt.custom,
  org.eclipse.swt.events,
diff --git a/org.eclipse.nebula.widgets.nattable.extension.glazedlists/pom.xml b/org.eclipse.nebula.widgets.nattable.extension.glazedlists/pom.xml
index cbe6091e..ef82d067 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.glazedlists/pom.xml
+++ b/org.eclipse.nebula.widgets.nattable.extension.glazedlists/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.nebula.widgets.nattable</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.4-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -13,7 +13,7 @@
 
     <groupId>org.eclipse.nebula.widgets.nattable</groupId>
     <artifactId>org.eclipse.nebula.widgets.nattable.extension.glazedlists</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
     <dependencies>
@@ -40,7 +40,7 @@
     	<dependency>
 		    <groupId>org.eclipse.nebula.widgets.nattable</groupId>
 		    <artifactId>org.eclipse.nebula.widgets.nattable.core</artifactId>
-		    <version>2.0.4-SNAPSHOT</version>
+		    <version>2.1.0-SNAPSHOT</version>
 		</dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/org.eclipse.nebula.widgets.nattable.extension.nebula.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.extension.nebula.feature/feature.xml
index 8eaf7770..872bd5f2 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.nebula.feature/feature.xml
+++ b/org.eclipse.nebula.widgets.nattable.extension.nebula.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature"
       label="%featureName"
-      version="2.0.4.qualifier"
+      version="2.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature/feature.xml
index 98bd3efd..5f46b420 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature/feature.xml
+++ b/org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature"
       label="%featureName"
-      version="2.0.4.qualifier"
+      version="2.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.nebula.widgets.nattable.extension.nebula/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.extension.nebula/META-INF/MANIFEST.MF
index 30378a76..48ce20ce 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.nebula/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.extension.nebula/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NatTable extension for Nebula widgets
 Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.extension.nebula
-Bundle-Version: 2.0.4.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.nebula.widgets.nattable.extension.nebula.cdatetime;version="1.1.0",
- org.eclipse.nebula.widgets.nattable.extension.nebula.richtext;version="2.0.0"
+ org.eclipse.nebula.widgets.nattable.extension.nebula.richtext;version="2.1.0"
 Import-Package: org.eclipse.nebula.cwt.base,
  org.eclipse.nebula.cwt.v,
  org.eclipse.nebula.widgets.cdatetime,
- org.eclipse.nebula.widgets.nattable.command;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.config;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.data.convert;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.edit.editor;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.layer;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.layer.cell;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.painter.cell;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.resize.command;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.search.command;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.selection;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.style;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.util;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.widget;version="[2.0.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.command;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.config;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.data.convert;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.edit.editor;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.layer;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.layer.cell;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.painter.cell;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.resize.command;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.search.command;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.selection;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.style;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.util;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.widget;version="[2.1.0,3.0.0)",
  org.eclipse.nebula.widgets.richtext;version="[1.3.0,2.0.0)",
  org.eclipse.nebula.widgets.richtext.toolbar;version="[1.2.0,2.0.0)",
  org.slf4j;version="1.7.2"
diff --git a/org.eclipse.nebula.widgets.nattable.extension.nebula/pom.xml b/org.eclipse.nebula.widgets.nattable.extension.nebula/pom.xml
index 9ebfb1d1..f2b5949a 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.nebula/pom.xml
+++ b/org.eclipse.nebula.widgets.nattable.extension.nebula/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.nebula.widgets.nattable</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.4-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -13,7 +13,7 @@
 
     <groupId>org.eclipse.nebula.widgets.nattable</groupId>
     <artifactId>org.eclipse.nebula.widgets.nattable.extension.nebula</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
     <dependencies>
@@ -39,7 +39,7 @@
     	<dependency>
 		    <groupId>org.eclipse.nebula.widgets.nattable</groupId>
 		    <artifactId>org.eclipse.nebula.widgets.nattable.core</artifactId>
-		    <version>2.0.4-SNAPSHOT</version>
+		    <version>2.1.0-SNAPSHOT</version>
 		</dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/org.eclipse.nebula.widgets.nattable.extension.poi.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.extension.poi.feature/feature.xml
index 35bd4409..3c314726 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.poi.feature/feature.xml
+++ b/org.eclipse.nebula.widgets.nattable.extension.poi.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.nebula.widgets.nattable.extension.poi.feature"
       label="%featureName"
-      version="2.0.4.qualifier"
+      version="2.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.nebula.widgets.nattable.extension.poi.source.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.extension.poi.source.feature/feature.xml
index fd1cd999..ecdae474 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.poi.source.feature/feature.xml
+++ b/org.eclipse.nebula.widgets.nattable.extension.poi.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature"
       label="%featureName"
-      version="2.0.4.qualifier"
+      version="2.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.nebula.widgets.nattable.extension.poi/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.extension.poi/META-INF/MANIFEST.MF
index c5ee04b3..4adbae8b 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.poi/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.extension.poi/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NatTable extension for Apache POI
 Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.extension.poi
-Bundle-Version: 2.0.4.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.nebula.widgets.nattable.extension.poi;version="2.0.0"
+Export-Package: org.eclipse.nebula.widgets.nattable.extension.poi;version="2.1.0"
 Import-Package: org.apache.poi.hssf.usermodel;version="[4.1.1,5.0.0)",
  org.apache.poi.ss.usermodel;version="[4.1.1,5.0.0)",
  org.apache.poi.ss.util;version="[4.1.1,5.0.0)",
  org.apache.poi.util;version="[4.1.1,5.0.0)",
- org.eclipse.nebula.widgets.nattable.config;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.export;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.formula;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.layer;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.layer.cell;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.painter.cell;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.painter.cell.decorator;version="[2.0.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.style;version="[2.0.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.config;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.export;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.formula;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.layer;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.layer.cell;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.painter.cell;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.painter.cell.decorator;version="[2.1.0,3.0.0)",
+ org.eclipse.nebula.widgets.nattable.style;version="[2.1.0,3.0.0)",
  org.eclipse.swt,
  org.eclipse.swt.graphics,
  org.eclipse.swt.widgets,
diff --git a/org.eclipse.nebula.widgets.nattable.extension.poi/pom.xml b/org.eclipse.nebula.widgets.nattable.extension.poi/pom.xml
index 56c564ee..2fd2dd43 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.poi/pom.xml
+++ b/org.eclipse.nebula.widgets.nattable.extension.poi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.nebula.widgets.nattable</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.4-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -13,7 +13,7 @@
 
     <groupId>org.eclipse.nebula.widgets.nattable</groupId>
     <artifactId>org.eclipse.nebula.widgets.nattable.extension.poi</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
     <dependencies>
@@ -35,7 +35,7 @@
     	<dependency>
 		    <groupId>org.eclipse.nebula.widgets.nattable</groupId>
 		    <artifactId>org.eclipse.nebula.widgets.nattable.core</artifactId>
-		    <version>2.0.4-SNAPSHOT</version>
+		    <version>2.1.0-SNAPSHOT</version>
 		</dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/org.eclipse.nebula.widgets.nattable.updatesite/pom.xml b/org.eclipse.nebula.widgets.nattable.updatesite/pom.xml
index ee226598..017a7cb5 100644
--- a/org.eclipse.nebula.widgets.nattable.updatesite/pom.xml
+++ b/org.eclipse.nebula.widgets.nattable.updatesite/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>parent</artifactId>
 		<groupId>org.eclipse.nebula.widgets.nattable</groupId>
-		<version>2.0.4-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
@@ -103,8 +103,8 @@
 									<goal>report-aggregate</goal>
 								</goals>
 								<configuration>
-									<title>APP4MC Tooling Platform</title>
-									<footer>Code Coverage Report for APP4MC Tooling Platform ${project.version}</footer>
+									<title>Nebula NatTable</title>
+									<footer>Code Coverage Report for Nebula NatTable ${project.version}</footer>
 								</configuration>
 							</execution>
 						</executions>
diff --git a/pom.xml b/pom.xml
index 77af58d9..3748449d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.eclipse.nebula.widgets.nattable</groupId>
 	<artifactId>parent</artifactId>
-	<version>2.0.4-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 
 	<packaging>pom</packaging>