Bug 492560 - [Table][Properties View] The Table is offset to the right

for each selection of different stereotyped elements
https://bugs.eclipse.org/bugs/show_bug.cgi?id=492560

The group parent had some children controls which are not disposed.

Change-Id: If0bc3206403fbf609894f2b48a165fda4d32657a
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@all4tec.net>

1 files changed, 11 insertions, 0 deletions

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/NattablePropertyEditor.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/NattablePropertyEditor.java
index e6954419bd2..5ac553d7bf4 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/NattablePropertyEditor.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/NattablePropertyEditor.java
@@ -93,6 +93,7 @@ import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.uml2.uml.Element;
 
@@ -1105,7 +1106,17 @@ public class NattablePropertyEditor extends AbstractPropertyEditor {
 					if (null != natTableWidget) {
 						natTableWidget.dispose();
 						natTableWidget = null;
+					}
+					// Bug 492560: The self children control was not all disposed correclty
+					if(null != self){
+						if(self.getChildren().length > 0){
+							for(Control control: self.getChildren()){
+								control.dispose();
+							}
+						}
 						self.removeDisposeListener(getDisposeListener());
+						nattableDisposeListener = null;
+						self.layout();
 					}
 					// Get the datasource
 					final DataSource dataSource = event.getDataSource();