Bug 581899 - Filter from dropdown filter not usable to extend a filter
Signed-off-by: Dirk Fauth <dirk.fauth@googlemail.com>
Change-Id: I2795a5011ac1e95b6b68b2ecff2e12303afaaff8
diff --git a/api-baseline/org.eclipse.nebula.widgets.nattable.core_2.0.0.202012161455.jar b/api-baseline/org.eclipse.nebula.widgets.nattable.core_2.1.0.202303310549.jar
similarity index 60%
rename from api-baseline/org.eclipse.nebula.widgets.nattable.core_2.0.0.202012161455.jar
rename to api-baseline/org.eclipse.nebula.widgets.nattable.core_2.1.0.202303310549.jar
index 4721dc4..9ee9e47 100644
--- a/api-baseline/org.eclipse.nebula.widgets.nattable.core_2.0.0.202012161455.jar
+++ b/api-baseline/org.eclipse.nebula.widgets.nattable.core_2.1.0.202303310549.jar
Binary files differ
diff --git a/api-baseline/org.eclipse.nebula.widgets.nattable.extension.e4_2.0.0.202012161455.jar b/api-baseline/org.eclipse.nebula.widgets.nattable.extension.e4_2.0.0.202012161455.jar
deleted file mode 100644
index a62bad5..0000000
--- a/api-baseline/org.eclipse.nebula.widgets.nattable.extension.e4_2.0.0.202012161455.jar
+++ /dev/null
Binary files differ
diff --git a/api-baseline/org.eclipse.nebula.widgets.nattable.extension.e4_2.1.0.202303310549.jar b/api-baseline/org.eclipse.nebula.widgets.nattable.extension.e4_2.1.0.202303310549.jar
new file mode 100644
index 0000000..a1d0348
--- /dev/null
+++ b/api-baseline/org.eclipse.nebula.widgets.nattable.extension.e4_2.1.0.202303310549.jar
Binary files differ
diff --git a/api-baseline/org.eclipse.nebula.widgets.nattable.extension.glazedlists_2.0.0.202012161455.jar b/api-baseline/org.eclipse.nebula.widgets.nattable.extension.glazedlists_2.0.0.202012161455.jar
deleted file mode 100644
index a8f92a7..0000000
--- a/api-baseline/org.eclipse.nebula.widgets.nattable.extension.glazedlists_2.0.0.202012161455.jar
+++ /dev/null
Binary files differ
diff --git a/api-baseline/org.eclipse.nebula.widgets.nattable.extension.glazedlists_2.1.0.202303310549.jar b/api-baseline/org.eclipse.nebula.widgets.nattable.extension.glazedlists_2.1.0.202303310549.jar
new file mode 100644
index 0000000..7f1c264
--- /dev/null
+++ b/api-baseline/org.eclipse.nebula.widgets.nattable.extension.glazedlists_2.1.0.202303310549.jar
Binary files differ
diff --git a/api-baseline/org.eclipse.nebula.widgets.nattable.extension.nebula_2.0.0.202012161455.jar b/api-baseline/org.eclipse.nebula.widgets.nattable.extension.nebula_2.0.0.202012161455.jar
deleted file mode 100644
index 14bd3b4..0000000
--- a/api-baseline/org.eclipse.nebula.widgets.nattable.extension.nebula_2.0.0.202012161455.jar
+++ /dev/null
Binary files differ
diff --git a/api-baseline/org.eclipse.nebula.widgets.nattable.extension.nebula_2.1.0.202303310549.jar b/api-baseline/org.eclipse.nebula.widgets.nattable.extension.nebula_2.1.0.202303310549.jar
new file mode 100644
index 0000000..56d47e0
--- /dev/null
+++ b/api-baseline/org.eclipse.nebula.widgets.nattable.extension.nebula_2.1.0.202303310549.jar
Binary files differ
diff --git a/api-baseline/org.eclipse.nebula.widgets.nattable.extension.poi_2.0.0.202012161455.jar b/api-baseline/org.eclipse.nebula.widgets.nattable.extension.poi_2.0.0.202012161455.jar
deleted file mode 100644
index 1c7c83b..0000000
--- a/api-baseline/org.eclipse.nebula.widgets.nattable.extension.poi_2.0.0.202012161455.jar
+++ /dev/null
Binary files differ
diff --git a/api-baseline/org.eclipse.nebula.widgets.nattable.extension.poi_2.1.0.202303310549.jar b/api-baseline/org.eclipse.nebula.widgets.nattable.extension.poi_2.1.0.202303310549.jar
new file mode 100644
index 0000000..424c9a8
--- /dev/null
+++ b/api-baseline/org.eclipse.nebula.widgets.nattable.extension.poi_2.1.0.202303310549.jar
Binary files differ
diff --git a/org.eclipse.nebula.widgets.nattable.core.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.core.feature/feature.xml
index dff0c83..602bc1f 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.1.0.qualifier"
+ version="2.1.1.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 6380747..ce9fcbb 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.1.0.qualifier"
+ version="2.1.1.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 1526429..353d18b 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: NatTable Core Tests
Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.core.tests
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.1.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 860069c..4331549 100644
--- a/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF
@@ -2,185 +2,185 @@
Bundle-ManifestVersion: 2
Bundle-Name: NatTable Core
Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.core
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-ExtensibleAPI: true
-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.event;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"
+Export-Package: org.eclipse.nebula.widgets.nattable;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.blink;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.blink.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.blink.event;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.columnCategories;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.columnCategories.gui;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.columnChooser;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.columnChooser.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.columnChooser.gui;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.columnRename;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.columnRename.event;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.conflation;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.coordinate;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.copy;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.copy.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.copy.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.copy.serializing;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.data;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.data.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.data.convert;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.data.validate;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.datachange;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.datachange.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.datachange.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.datachange.event;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.edit;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.edit.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.edit.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.edit.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.edit.editor;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.edit.event;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.edit.gui;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.export;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.export.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.export.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.export.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.export.csv;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.export.excel;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.export.image;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.export.image.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.fillhandle;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.fillhandle.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.fillhandle.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.fillhandle.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.fillhandle.event;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.filterrow;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.filterrow.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.filterrow.combobox;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.filterrow.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.filterrow.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.filterrow.event;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.formula;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.formula.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.formula.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.formula.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.formula.function;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.freeze;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.freeze.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.freeze.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.freeze.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.freeze.event;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.grid;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.grid.cell;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.grid.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.grid.data;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.grid.layer;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.grid.layer.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.grid.layer.event;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.group;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.group.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.group.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.group.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.group.event;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.group.gui;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.group.model;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.group.painter;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.group.performance;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.group.performance.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.group.performance.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.group.performance.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.group.performance.event;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.group.performance.gui;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.group.performance.painter;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.hideshow;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.hideshow.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.hideshow.event;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.hideshow.indicator;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.hierarchical;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.hierarchical.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.hierarchical.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.hierarchical.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.hover;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.hover.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.hover.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.hover.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.layer;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.layer.cell;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.layer.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.layer.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.layer.event;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.layer.stack;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.painter;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.painter.cell;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.painter.cell.decorator;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.painter.layer;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.persistence;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.persistence.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.persistence.gui;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.print;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.print.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.print.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.print.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.reorder;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.reorder.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.reorder.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.reorder.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.reorder.event;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.resize;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.resize.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.resize.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.resize.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.resize.event;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.resize.mode;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.search;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.search.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.search.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.search.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.search.event;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.search.gui;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.search.strategy;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.selection;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.selection.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.selection.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.selection.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.selection.event;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.selection.preserve;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.serializing;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.sort;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.sort.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.sort.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.sort.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.sort.event;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.sort.painter;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.style;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.style.editor;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.style.editor.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.style.theme;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.summaryrow;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.summaryrow.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.tickupdate;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.tickupdate.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.tickupdate.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.tickupdate.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.tooltip;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.tree;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.tree.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.tree.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.tree.config;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.tree.painter;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.ui;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.ui.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.ui.binding;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.ui.matcher;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.ui.menu;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.ui.mode;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.ui.rename;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.ui.scaling;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.ui.util;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.util;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.viewport;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.viewport.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.viewport.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.viewport.event;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.widget;version="2.1.1"
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 92c96ab..01a6e03 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.1.0-SNAPSHOT</version>
+ <version>2.1.1-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.1.0-SNAPSHOT</version>
+ <version>2.1.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<dependencies>
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/filterrow/combobox/FilterNatCombo.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/filterrow/combobox/FilterNatCombo.java
index 56f10a8..6b671e4 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/filterrow/combobox/FilterNatCombo.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/filterrow/combobox/FilterNatCombo.java
@@ -14,17 +14,14 @@
package org.eclipse.nebula.widgets.nattable.filterrow.combobox;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
+import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.CheckboxTableViewer;
import org.eclipse.jface.viewers.ICheckStateListener;
import org.eclipse.jface.viewers.ICheckStateProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.nebula.widgets.nattable.Messages;
import org.eclipse.nebula.widgets.nattable.style.CellStyleAttributes;
import org.eclipse.nebula.widgets.nattable.style.HorizontalAlignmentEnum;
@@ -58,7 +55,7 @@
public class FilterNatCombo extends NatCombo {
/**
- * The viewer that contains the select all item in the dropdown control.
+ * The viewer that contains the 'select all' item in the dropdown control.
*
* @since 1.4
*/
@@ -85,6 +82,38 @@
private Runnable filterModifyAction;
/**
+ * Flag to determine whether the content of the dropdown is filtered or not.
+ *
+ * @since 2.1
+ */
+ boolean filterActive = false;
+
+ /**
+ * The base style that is used to create the dropdown. Needed to use the
+ * same style for creating the additional viewer ('select all' and 'add to
+ * filter').
+ *
+ * @since 2.1
+ */
+ private int baseStyle;
+
+ /**
+ * The viewer that contains the 'add to filter' item in the dropdown
+ * control.
+ *
+ * @since 2.1
+ */
+ private CheckboxTableViewer addToFilterItemViewer;
+
+ /**
+ * The initial selection that was set when the FilterNatCombo was opened.
+ * Needed to restore the state on deactivating the 'add to filter' checkbox.
+ *
+ * @since 2.1
+ */
+ private String[] initialSelection;
+
+ /**
* Creates a new FilterNatCombo using the given IStyle for rendering,
* showing the default number of items at once in the dropdown.
*
@@ -232,11 +261,22 @@
this.dropdownTable.computeSize(SWT.DEFAULT, listHeight, true).x,
size.x);
- int viewerHeight = this.selectAllItemViewer.getTable().getItemHeight();
+ int selectAllViewerHeight = this.selectAllItemViewer.getTable().getItemHeight();
listWidth = Math.max(
- this.selectAllItemViewer.getTable().computeSize(SWT.DEFAULT, viewerHeight, true).x,
+ this.selectAllItemViewer.getTable().computeSize(SWT.DEFAULT, selectAllViewerHeight, true).x,
listWidth);
+ // calculate width with the 'add to filter' viewer
+ int addViewerHeight = 0;
+ if (this.addToFilterItemViewer != null && this.addToFilterItemViewer.getTable().isVisible()) {
+ this.addToFilterItemViewer.getTable().getColumn(0).pack();
+
+ addViewerHeight = this.addToFilterItemViewer.getTable().getItemHeight();
+ listWidth = Math.max(
+ this.addToFilterItemViewer.getTable().computeSize(SWT.DEFAULT, addViewerHeight, true).x,
+ listWidth);
+ }
+
Point textPosition = this.text.toDisplay(this.text.getLocation());
int filterTextBoxHeight = this.showDropdownFilter ? this.filterBox.computeSize(SWT.DEFAULT, SWT.DEFAULT).y : 0;
@@ -244,7 +284,7 @@
textPosition.x,
textPosition.y + this.text.getBounds().height,
listWidth + (this.dropdownTable.getGridLineWidth() * 2),
- listHeight + viewerHeight + filterTextBoxHeight);
+ listHeight + selectAllViewerHeight + addViewerHeight + filterTextBoxHeight);
// as we performed auto resize for the columns, we now need to
// ensure again that the columns
@@ -259,12 +299,19 @@
this.selectAllItemViewer.getTable().getColumn(0).setWidth(
this.dropdownTable.getColumn(0).getWidth());
+
+ if (this.addToFilterItemViewer != null) {
+ this.addToFilterItemViewer.getTable().getColumn(0).setWidth(
+ this.dropdownTable.getColumn(0).getWidth());
+ }
}
@Override
protected void createDropdownControl(int style) {
super.createDropdownControl(style);
+ this.baseStyle = style;
+
int dropdownListStyle = style | SWT.NO_SCROLL
| HorizontalAlignmentEnum.getSWTStyle(this.cellStyle)
| SWT.FULL_SELECTION;
@@ -292,61 +339,20 @@
data.bottom = new FormAttachment(100);
this.dropdownTable.setLayoutData(data);
- this.selectAllItemViewer.setContentProvider(new IStructuredContentProvider() {
+ this.selectAllItemViewer.setContentProvider(ArrayContentProvider.getInstance());
- @Override
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- // no action on inputChanged
- }
-
- @Override
- public void dispose() {
- // no action on dispose
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public Object[] getElements(Object inputElement) {
- return ((Collection<String>) inputElement).toArray();
- }
- });
-
- this.selectAllItemViewer.setLabelProvider(new ILabelProvider() {
-
- @Override
- public void removeListener(ILabelProviderListener listener) {
- // no additional listener support
- }
+ this.selectAllItemViewer.setLabelProvider(new LabelProvider() {
@Override
public boolean isLabelProperty(Object element, String property) {
return false;
}
-
- @Override
- public void dispose() {
- // no action on dispose
- }
-
- @Override
- public void addListener(ILabelProviderListener listener) {
- // no additional listener support
- }
-
- @Override
- public String getText(Object element) {
- return element.toString();
- }
-
- @Override
- public Image getImage(Object element) {
- return null;
- }
});
final String selectAllLabel = Messages.getString("FilterNatCombo.selectAll"); //$NON-NLS-1$
List<String> input = new ArrayList<>();
input.add(selectAllLabel);
+
this.selectAllItemViewer.setInput(input);
this.selectAllItemViewer.getTable().setBackground(
@@ -434,8 +440,9 @@
@Override
protected void setDropdownSelection(String[] selection) {
super.setDropdownSelection(selection);
- if (this.selectAllItemViewer != null)
+ if (this.selectAllItemViewer != null) {
this.selectAllItemViewer.refresh();
+ }
}
/**
@@ -499,6 +506,103 @@
}
}
this.filterText = textValue;
+
+ // if not all items are selected, it means there is already a filter
+ // active on opening the dropdown
+ if (this.selectAllItemViewer != null
+ && this.selectionStateMap.entrySet().stream().anyMatch(entry -> !entry.getValue())) {
+
+ // remember the initial selection to be able to restore it when
+ // the dropdown filter is cleared
+ this.initialSelection = getSelection();
+
+ // create the "add to filter" entry
+ createAddToFilterItemViewer();
+ }
+ }
+
+ /**
+ * Creates and adds the "add to filter" entry to the dropdown. Initially
+ * hidden and becomes visible once a dropdown filter is entered.
+ */
+ private void createAddToFilterItemViewer() {
+ int dropdownListStyle = this.baseStyle | SWT.NO_SCROLL
+ | HorizontalAlignmentEnum.getSWTStyle(this.cellStyle)
+ | SWT.FULL_SELECTION;
+ this.addToFilterItemViewer =
+ CheckboxTableViewer.newCheckList(this.dropdownShell, dropdownListStyle);
+
+ // add a column to be able to resize the item width in the dropdown
+ new TableColumn(this.addToFilterItemViewer.getTable(), SWT.NONE);
+ this.addToFilterItemViewer.getTable().addListener(SWT.Resize, event -> calculateColumnWidth());
+
+ FormData data = new FormData();
+ data.top = new FormAttachment(this.selectAllItemViewer.getControl(), 0, SWT.BOTTOM);
+ data.left = new FormAttachment(0);
+ data.right = new FormAttachment(100);
+ this.addToFilterItemViewer.getTable().setLayoutData(data);
+
+ this.addToFilterItemViewer.setContentProvider(ArrayContentProvider.getInstance());
+
+ this.addToFilterItemViewer.setLabelProvider(new LabelProvider() {
+
+ @Override
+ public boolean isLabelProperty(Object element, String property) {
+ return false;
+ }
+ });
+
+ final String addAllLabel = Messages.getString("FilterNatCombo.addToFilter"); //$NON-NLS-1$
+ List<String> input = new ArrayList<>();
+ input.add(addAllLabel);
+
+ this.addToFilterItemViewer.setInput(input);
+
+ this.addToFilterItemViewer.getTable().setBackground(
+ this.cellStyle.getAttributeValue(CellStyleAttributes.BACKGROUND_COLOR));
+ this.addToFilterItemViewer.getTable().setForeground(
+ this.cellStyle.getAttributeValue(CellStyleAttributes.FOREGROUND_COLOR));
+ this.addToFilterItemViewer.getTable().setFont(
+ this.cellStyle.getAttributeValue(CellStyleAttributes.FONT));
+
+ this.addToFilterItemViewer.getTable().addFocusListener(
+ new FocusAdapter() {
+ @Override
+ public void focusGained(FocusEvent e) {
+ showDropdownControl();
+ }
+ });
+
+ this.addToFilterItemViewer.addCheckStateListener(event -> {
+ boolean performCheck = event.getChecked();
+
+ if (performCheck) {
+ // add the current selection to the existing filter
+ TableItem[] items = FilterNatCombo.this.dropdownTableViewer.getTable().getItems();
+ for (int i = 0; i < items.length; i++) {
+ TableItem item = items[i];
+ this.selectionStateMap.put(item.getText(), item.getChecked());
+ }
+ } else {
+ // set back to previous state
+ for (Map.Entry<String, Boolean> entry : FilterNatCombo.this.selectionStateMap.entrySet()) {
+ entry.setValue(Boolean.FALSE);
+ }
+ for (String sel : this.initialSelection) {
+ this.selectionStateMap.put(sel, Boolean.TRUE);
+ }
+ }
+
+ if (this.filterModifyAction != null) {
+ this.filterActive = false;
+ this.filterModifyAction.run();
+ this.filterActive = true;
+ }
+
+ // also refresh the selectAllItemViewer to show a potential grayed
+ // checked state in case of an active filter
+ this.selectAllItemViewer.refresh();
+ });
}
@Override
@@ -597,26 +701,67 @@
@Override
protected void setSelection() {
- TableItem[] items = FilterNatCombo.this.dropdownTableViewer.getTable().getItems();
- String[] selection = new String[items.length];
- for (int i = 0; i < items.length; i++) {
- TableItem item = items[i];
- selection[i] = item.getText();
+
+ String[] selection = null;
+ if (FilterNatCombo.this.filterActive) {
+ TableItem[] items = FilterNatCombo.this.dropdownTableViewer.getTable().getItems();
+ selection = new String[items.length];
+ for (int i = 0; i < items.length; i++) {
+ TableItem item = items[i];
+ selection[i] = item.getText();
+ }
+ } else {
+ // if no dropdown filter is active, e.g. on clearing the
+ // dropdown filter, we restore the initial selection
+ // selection = FilterNatCombo.this.initialSelection;
+ selection = getSelection();
}
- // first clear the selection
- getDropdownTable().deselectAll();
- for (Map.Entry<String, Boolean> entry : FilterNatCombo.this.selectionStateMap.entrySet()) {
- entry.setValue(Boolean.FALSE);
- }
+ if (FilterNatCombo.this.initialSelection != null) {
+ // update layout to make the "add to filter" item visible
+ // or invisible if filter is cleared
+ FilterNatCombo.this.filterActive = !FilterNatCombo.this.filterBox.getText().isEmpty();
+ FilterNatCombo.this.addToFilterItemViewer.getTable().setVisible(FilterNatCombo.this.filterActive);
- // then update the selection based on what is currently visible in
- // the dropdown
- setDropdownSelection(selection);
- updateTextControl(false);
+ ((FormData) FilterNatCombo.this.dropdownTable.getLayoutData()).top =
+ new FormAttachment(
+ FilterNatCombo.this.filterActive
+ ? FilterNatCombo.this.addToFilterItemViewer.getControl()
+ : FilterNatCombo.this.selectAllItemViewer.getControl(),
+ 0,
+ SWT.BOTTOM);
- if (FilterNatCombo.this.filterModifyAction != null) {
- FilterNatCombo.this.filterModifyAction.run();
+ // only mark the visible items checked
+ if (FilterNatCombo.this.filterActive) {
+ for (TableItem item : getDropdownTable().getItems()) {
+ item.setChecked(true);
+ }
+ } else {
+ setDropdownSelection(getSelection());
+ }
+
+ if (FilterNatCombo.this.selectAllItemViewer != null) {
+ FilterNatCombo.this.selectAllItemViewer.refresh();
+ }
+ } else {
+ // first clear the selection
+ getDropdownTable().deselectAll();
+ for (Map.Entry<String, Boolean> entry : FilterNatCombo.this.selectionStateMap.entrySet()) {
+ entry.setValue(Boolean.FALSE);
+ }
+
+ // then update the selection based on what is currently visible
+ // in the dropdown
+ setDropdownSelection(selection);
+
+ // update the value in the underlying text control
+ updateTextControl(false);
+
+ // if the natcombo was opened with an initial filter (not all
+ // items selected) we do not directly apply
+ if (FilterNatCombo.this.filterModifyAction != null) {
+ FilterNatCombo.this.filterModifyAction.run();
+ }
}
}
}
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/filterrow/combobox/FilterRowComboBoxCellEditor.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/filterrow/combobox/FilterRowComboBoxCellEditor.java
index 40caa17..74ffd45 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/filterrow/combobox/FilterRowComboBoxCellEditor.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/filterrow/combobox/FilterRowComboBoxCellEditor.java
@@ -166,6 +166,15 @@
// the value gets committed again, which again results in filtering,
// which will lead to exceptions because the states are not synchronous
// anymore.
+
+ // avoid commit if combo filter is active
+ NatCombo editorControl = getEditorControl();
+ if (editorControl != null
+ && editorControl instanceof FilterNatCombo
+ && ((FilterNatCombo) editorControl).filterActive) {
+ return false;
+ }
+
if (!isClosed()) {
try {
// always do the conversion
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/messages.properties b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/messages.properties
index 742f16c..19120a0 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/messages.properties
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/messages.properties
@@ -90,6 +90,7 @@
FileOutputStreamProvider.errorMessage=Failed to open or create the file: {0}
FilterNatCombo.selectAll=Select All
+FilterNatCombo.addToFilter=Add current selection to filter
FontPicker.tooltip=Click to select font
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/messages_de.properties b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/messages_de.properties
index d3688d5..b0ae4ca 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/messages_de.properties
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/messages_de.properties
@@ -90,6 +90,7 @@
FileOutputStreamProvider.errorMessage=Fehler beim Erzeugen oder \u00D6ffnen der Datei: {0}
FilterNatCombo.selectAll=Alle ausw\u00E4hlen
+FilterNatCombo.addToFilter=Dem Filter die aktuelle Auswahl hinzuf\u00FCgen
FontPicker.tooltip=Anklicken um Schriftart zu w\u00E4hlen
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/widget/NatCombo.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/widget/NatCombo.java
index 4d2cbc6..a8f4247 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/widget/NatCombo.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/widget/NatCombo.java
@@ -1598,8 +1598,8 @@
public void modifyText(ModifyEvent e) {
if (null != NatCombo.this.dropdownTableViewer && !NatCombo.this.dropdownTable.isDisposed()) {
NatCombo.this.dropdownTableViewer.refresh();
- calculateBounds();
setSelection();
+ calculateBounds();
}
}
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 9ac4524..16d411b 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: NatTable Dataset Utilities (internal usage)
Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.dataset
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.1.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 331981f..e20a1f2 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.1.0.qualifier"
+ version="2.1.1.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 411d314..43a6dde 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.1.0.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.1.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 78f0bae..499af40 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.1.0-SNAPSHOT</version>
+ <version>2.1.1-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 f94eef5..b269f27 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.1.0.qualifier"
+ version="2.1.1.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 d407c7e..b725c24 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: NatTable Eclipse 4 Examples
Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.examples.e4;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.1.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 c7cb047..c2ba4b7 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: NatTable Examples
Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.examples
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.1.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 bea757c..d53c631 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.1.0-SNAPSHOT</version>
+ <version>2.1.1-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 00b59a0..446e812 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.1.0.qualifier"
+ version="2.1.1.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 4b25f51..6be3196 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.1.0.qualifier"
+ version="2.1.1.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 e018d3f..d6d65d5 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: NatTable extension for Eclipse 4
Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.extension.e4;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.1.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",
@@ -40,8 +40,8 @@
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.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"
+Export-Package: org.eclipse.nebula.widgets.nattable.extension.e4.css;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.extension.e4.painterfactory;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.extension.e4.selection;version="2.1.1"
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 7ae629c..617e270 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.1.0-SNAPSHOT</version>
+ <version>2.1.1-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.1.0-SNAPSHOT</version>
+ <version>2.1.1-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.1.0-SNAPSHOT</version>
+ <version>2.1.1-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 78d192f..e8836ea 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.1.0.qualifier"
+ version="2.1.1.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 0caefdc..5697419 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.1.0.qualifier"
+ version="2.1.1.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 e023f6c..2f1ce86 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: NatTable GlazedLists Extensions Test
Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.extension.glazedlists.tests
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.1.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 16db7a4..174d6a4 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: NatTable extension for GlazedLists
Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.extension.glazedlists
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-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"
+Export-Package: org.eclipse.nebula.widgets.nattable.extension.glazedlists;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.data.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.filterrow;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.groupBy;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.groupBy.action;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.groupBy.command;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.groupBy.summary;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.hideshow;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.hierarchical;version="2.1.1",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.tree;version="2.1.1"
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)",
diff --git a/org.eclipse.nebula.widgets.nattable.extension.glazedlists/pom.xml b/org.eclipse.nebula.widgets.nattable.extension.glazedlists/pom.xml
index ef82d06..894d14d 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.1.0-SNAPSHOT</version>
+ <version>2.1.1-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.1.0-SNAPSHOT</version>
+ <version>2.1.1-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.1.0-SNAPSHOT</version>
+ <version>2.1.1-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 872bd5f..5aec06d 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.1.0.qualifier"
+ version="2.1.1.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 5f46b42..894494b 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.1.0.qualifier"
+ version="2.1.1.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 48ce20c..65ddf05 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,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: NatTable extension for Nebula widgets
Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.extension.nebula
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.1.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.1.0"
+ org.eclipse.nebula.widgets.nattable.extension.nebula.richtext;version="2.1.1"
Import-Package: org.eclipse.nebula.cwt.base,
org.eclipse.nebula.cwt.v,
org.eclipse.nebula.widgets.cdatetime,
diff --git a/org.eclipse.nebula.widgets.nattable.extension.nebula/pom.xml b/org.eclipse.nebula.widgets.nattable.extension.nebula/pom.xml
index b9de982..f2f650e 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.1.0-SNAPSHOT</version>
+ <version>2.1.1-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.1.0-SNAPSHOT</version>
+ <version>2.1.1-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.1.0-SNAPSHOT</version>
+ <version>2.1.1-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 3c31472..6051632 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.1.0.qualifier"
+ version="2.1.1.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 ecdae47..de9c5c1 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.1.0.qualifier"
+ version="2.1.1.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 4adbae8..74a1527 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,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: NatTable extension for Apache POI
Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.extension.poi
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.nebula.widgets.nattable.extension.poi;version="2.1.0"
+Export-Package: org.eclipse.nebula.widgets.nattable.extension.poi;version="2.1.1"
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)",
diff --git a/org.eclipse.nebula.widgets.nattable.extension.poi/pom.xml b/org.eclipse.nebula.widgets.nattable.extension.poi/pom.xml
index 2fd2dd4..25bb99b 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.1.0-SNAPSHOT</version>
+ <version>2.1.1-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.1.0-SNAPSHOT</version>
+ <version>2.1.1-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.1.0-SNAPSHOT</version>
+ <version>2.1.1-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 017a7cb..c9e020c 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.1.0-SNAPSHOT</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 95c60d6..59d8eb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<groupId>org.eclipse.nebula.widgets.nattable</groupId>
<artifactId>parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.1-SNAPSHOT</version>
<packaging>pom</packaging>
