Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/DynamicBodyEditor.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/DynamicBodyEditor.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/DynamicBodyEditor.java
index 3a1fe1dfdfd..cf55f100fdb 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/DynamicBodyEditor.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/DynamicBodyEditor.java
@@ -136,8 +136,10 @@ public class DynamicBodyEditor extends AbstractValueEditor implements Listener {
private void disposeBodyEditor() {
currentEditor.removeChangeListener(this);
currentEditor.dispose();
- for (Control control : bodyEditorContainer.getChildren()) {
- control.dispose();
+ if (null != bodyEditorContainer && !bodyEditorContainer.isDisposed()) {
+ for (Control control : bodyEditorContainer.getChildren()) {
+ control.dispose();
+ }
}
}

Back to the top