diff options
| author | Pierre-Charles David | 2016-10-02 18:57:13 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2016-10-05 06:43:53 +0000 |
| commit | bef9f99f48af61c8a1ce5a5435fc98a9593886db (patch) | |
| tree | b2d46cf45bf97cca14ba3bce02dca05e2725a324 | |
| parent | 28884344a71a0e35f90f91d970519d1e06e8e522 (diff) | |
| download | org.eclipse.sirius-bef9f99f48af61c8a1ce5a5435fc98a9593886db.tar.gz org.eclipse.sirius-bef9f99f48af61c8a1ce5a5435fc98a9593886db.tar.xz org.eclipse.sirius-bef9f99f48af61c8a1ce5a5435fc98a9593886db.zip | |
[501836] Fix NPE in AbstractD{Table,Tree}PropertySection
Bug: 501836
Change-Id: Ic953a88fad8984781462b816c4d3c236add33902
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/properties/section/common/AbstractDTablePropertySection.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/properties/section/common/AbstractDTablePropertySection.java index 7dc9be2e9b..f25b9d704d 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/properties/section/common/AbstractDTablePropertySection.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/properties/section/common/AbstractDTablePropertySection.java @@ -291,7 +291,7 @@ public abstract class AbstractDTablePropertySection extends AbstractPropertySect * the event notification */ protected void update(final TransactionalEditingDomain domain, final Notification notification) { - if (parentPropertySheetPage.isUpdateEnabled()) { + if (parentPropertySheetPage == null || parentPropertySheetPage.isUpdateEnabled()) { final Object notifier = notification.getNotifier(); if (notifier instanceof EObject && contentPage != null && contentPage.getControl() != null) { diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/properties/section/common/AbstractDTreePropertySection.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/properties/section/common/AbstractDTreePropertySection.java index 8d0c2a4ec2..b2f34cbba6 100644 --- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/properties/section/common/AbstractDTreePropertySection.java +++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/properties/section/common/AbstractDTreePropertySection.java @@ -315,7 +315,7 @@ public abstract class AbstractDTreePropertySection extends AbstractPropertySecti * the event object */ protected void update(final ResourceSetChangeEvent event) { - if (parentPropertySheetPage.isUpdateEnabled()) { + if (parentPropertySheetPage == null || parentPropertySheetPage.isUpdateEnabled()) { Iterator<Notification> it = event.getNotifications().iterator(); boolean shouldUpdate = false; while (it.hasNext() && !shouldUpdate) { |