diff options
Diffstat (limited to 'extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java')
| -rw-r--r-- | extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java index 7fd56632a9f..d3b387a026c 100644 --- a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java +++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java @@ -502,8 +502,12 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen @Override
public void dispose() {
if(this.tableEditingDomain != null && this.contextEditingDomain != null) {
- this.tableEditingDomain.getCommandStack().removeCommandStackListener(this.refreshListener);
- this.contextEditingDomain.getCommandStack().removeCommandStackListener(this.refreshListener);
+ if(this.tableEditingDomain.getCommandStack() != null) {
+ this.tableEditingDomain.getCommandStack().removeCommandStackListener(this.refreshListener);
+ }
+ if(this.contextEditingDomain.getCommandStack() != null) {
+ this.contextEditingDomain.getCommandStack().removeCommandStackListener(this.refreshListener);
+ }
this.columnManager.dispose();
this.rowManager.dispose();
Table table = getTable();
|