Bug 481761 - Regression: Message selection for MessageFlow should be a

combo box

Improve table sizing and redrawing.

3 files changed, 18 insertions, 15 deletions

diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/adapters/ExtendedPropertiesProvider.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/adapters/ExtendedPropertiesProvider.java
index a598c071..66c7d56c 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/adapters/ExtendedPropertiesProvider.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/adapters/ExtendedPropertiesProvider.java
@@ -235,8 +235,8 @@ public class ExtendedPropertiesProvider {
 				return ((Boolean) result);
 		}
 		
-		if (feature instanceof EReference && feature.isMany()) {
-			return !((EReference)feature).isContainment();
+		if (feature instanceof EReference && !((EReference)feature).isContainment()) {
+			return true;
 		}
 
 		return false;
diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/AbstractListComposite.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/AbstractListComposite.java
index fe303af4..35a2aced 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/AbstractListComposite.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/AbstractListComposite.java
@@ -66,7 +66,6 @@ import org.eclipse.ui.forms.events.ExpansionEvent;
 import org.eclipse.ui.forms.events.IExpansionListener;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.internal.preferences.PropertyUtil;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
  
 
@@ -609,9 +608,8 @@ public abstract class AbstractListComposite extends ListAndDetailCompositeBase i
 
 			final EList<EObject> list = getItemList();
 			tableViewer.setInput(list);
-
-			redrawPage();
 		}
+		redrawPageAsync();
 	}
 	
 	/**
@@ -709,8 +707,10 @@ public abstract class AbstractListComposite extends ListAndDetailCompositeBase i
 					remainingWidth -= tc.getWidth();
 				}
 				
-				gridData.heightHint = size.y;
+				gridData.heightHint = size.y + table.getHeaderHeight();
 				gridData.widthHint = 50;
+				
+				redrawPageAsync();
 			}
 		});
 		
@@ -726,8 +726,9 @@ public abstract class AbstractListComposite extends ListAndDetailCompositeBase i
 					editingDomain.getCommandStack().execute(new RecordingCommand(editingDomain) {
 						@Override
 						protected void doExecute() {
-							EObject newItem = addListItem(businessObject,feature);
-							if (newItem!=null) {
+
+							EObject newItem = addListItem(businessObject, feature);
+							if (newItem != null) {
 								final EList<EObject> list = getItemList();
 								tableViewer.setInput(list);
 								tableViewer.setSelection(new StructuredSelection(newItem));
@@ -773,13 +774,6 @@ public abstract class AbstractListComposite extends ListAndDetailCompositeBase i
 								if (i>=0)
 									tableViewer.setSelection(new StructuredSelection(item));
 							}
-							
-//							Display.getDefault().asyncExec( new Runnable() {
-//								@Override
-//								public void run() {
-//									showDetails(false);
-//								}
-//							});
 						}
 					});
 				}
diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/ListAndDetailCompositeBase.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/ListAndDetailCompositeBase.java
index f0067881..777a3f77 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/ListAndDetailCompositeBase.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/ListAndDetailCompositeBase.java
@@ -150,6 +150,15 @@ public class ListAndDetailCompositeBase extends Composite implements ResourceSet
 		return boDelegate;
 	}
 	
+	public void redrawPageAsync() {
+		Display.getDefault().asyncExec(new Runnable() {
+			@Override
+			public void run() {
+				redrawPage();
+			}
+		});
+	}
+	
 	public void redrawPage() {
 		Composite root = getParent();
 		while (!(root instanceof ScrolledComposite) && root.getParent()!=null) {