Bug 539201 - New Option for AbstractPickList to hide the empty group
Change-Id: I584cbf5c2ae5bb215a520bd65d1a7b6232d90b9a
Signed-off-by: christof.joswig@sap.com <christof.joswig@sap.com>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index 28f48ff..893f6d2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -52,14 +52,15 @@
public abstract class AbstractPickList extends Composite {
public static enum PickListFeatures {
- NO_ORDER, NO_PICKER
+ NO_ORDER, NO_PICKER, NO_GROUP
}
protected ComboViewer picker;
protected TableViewer viewer;
- private final Group group;
+ private final Composite composite;
private final Composite toolBar;
+
protected final Button tiAdd;
protected final Button tiRemove;
protected final Button tiUp;
@@ -81,11 +82,14 @@
setLayout(new FillLayout());
- group = new Group(this, SWT.NONE);
- // gridData.horizontalIndent = 30;
- group.setLayout(new GridLayout(1, false));
+ if (listFeatures != null && listFeatures.contains(PickListFeatures.NO_GROUP)) {
+ composite = new Composite(this, SWT.NONE);
+ } else {
+ composite = new Group(this, SWT.NONE);
+ }
+ composite.setLayout(new GridLayout(1, false));
- final Composite comp = new Composite(group, SWT.NONE);
+ final Composite comp = new Composite(composite, SWT.NONE);
GridLayout layout = new GridLayout(2, false);
layout.marginHeight = 0;
@@ -121,7 +125,7 @@
layout.marginWidth = 0;
toolBar.setLayout(layout);
toolBar.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
- toolBar.setFont(group.getFont());
+ toolBar.setFont(composite.getFont());
picker.addOpenListener(event -> addPressed());
@@ -189,7 +193,7 @@
}
});
- viewer = new TableViewer(group);
+ viewer = new TableViewer(composite);
viewer.getControl().setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1));
viewer.addSelectionChangedListener(event -> updateUiState());
updateUiState();
@@ -209,7 +213,7 @@
}
protected Font getButtonFont() {
- return group.getFont();
+ return toolBar.getFont();
}
protected void addPressed() {
@@ -267,7 +271,9 @@
}
public void setText(String text) {
- group.setText(text);
+ if (composite instanceof Group) {
+ ((Group) composite).setText(text);
+ }
}
public void updateUiState() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index e607dfa..07b9f5d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -119,7 +119,7 @@
{
final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
- Arrays.asList(PickListFeatures.NO_PICKER), this,
+ Arrays.asList(PickListFeatures.NO_PICKER, PickListFeatures.NO_GROUP), this,
FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS) {
@Override
protected void addPressed() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 47862b2..88c0dea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -37,6 +37,7 @@
import org.eclipse.e4.tools.emf.ui.common.Util.InternalPackage;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FeatureSelectionDialog;
@@ -413,7 +414,7 @@
// ------------------------------------------------------------
{
- pickList = new E4PickList(parent, SWT.NONE, null, this,
+ pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_GROUP), this,
FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS) {
@Override
protected void addPressed() {
@@ -430,7 +431,6 @@
};
pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
- pickList.setText(""); //$NON-NLS-1$
pickList.setLabelProvider(new LabelProvider() {
@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index a1f3c78..63d88f2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -117,7 +117,7 @@
{
final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
- Arrays.asList(PickListFeatures.NO_PICKER), this,
+ Arrays.asList(PickListFeatures.NO_PICKER, PickListFeatures.NO_GROUP), this,
CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS) {
@Override
protected void addPressed() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
index b40f047..dcf5cd8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -110,7 +110,7 @@
{
final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
- Arrays.asList(PickListFeatures.NO_PICKER), this,
+ Arrays.asList(PickListFeatures.NO_PICKER, PickListFeatures.NO_GROUP), this,
MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS) {
@Override
protected void addPressed() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 92357b6..a11d587 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -15,6 +15,7 @@
package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import javax.annotation.PostConstruct;
@@ -26,6 +27,7 @@
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
@@ -130,7 +132,8 @@
parent = createScrollableContainer(folder);
item.setControl(parent.getParent());
- final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, this, feature) {
+ final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_GROUP),
+ this, feature) {
@Override
protected void addPressed() {
final Types t = (Types) getSelection().getFirstElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index 40c3f7e..0d520f2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -104,7 +104,7 @@
{
final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
- Arrays.asList(PickListFeatures.NO_PICKER), this,
+ Arrays.asList(PickListFeatures.NO_PICKER, PickListFeatures.NO_GROUP), this,
FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS) {
@Override
protected void addPressed() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index d28a25b..1f8c01c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -15,6 +15,7 @@
package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import javax.inject.Inject;
@@ -25,6 +26,7 @@
import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -97,7 +99,7 @@
parent = createScrollableContainer(folder);
item.setControl(parent.getParent());
- final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, this,
+ final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_GROUP), this,
FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
@Override
protected void addPressed() {
@@ -126,7 +128,6 @@
viewer = pickList.getList();
pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
- pickList.setText(""); //$NON-NLS-1$
pickList.setLabelProvider(new LabelProvider() {
@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index 9b4a053..5e74385 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -15,6 +15,7 @@
package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import javax.annotation.PostConstruct;
@@ -25,6 +26,7 @@
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -133,8 +135,8 @@
item.setControl(parent.getParent());
{
- final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, this,
- UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+ final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_GROUP),
+ this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
@Override
protected void addPressed() {
final EClass eClass = (EClass) getSelection().getFirstElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index 7019501..fb4e958 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -4,6 +4,7 @@
* Steven Spungin <steven@spungin.tv> - Ongoing maintenance
*/
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -14,6 +15,7 @@
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -179,7 +181,8 @@
parent = createScrollableContainer(folder);
item.setControl(parent.getParent());
- final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, this, targetFeature) {
+ final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_GROUP),
+ this, targetFeature) {
@Override
protected void addPressed() {
final EClass eClass = (EClass) getSelection().getFirstElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index bf565f8..f8d6556 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -15,6 +15,7 @@
package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -27,6 +28,7 @@
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
@@ -144,8 +146,8 @@
item.setControl(parent.getParent());
{
- final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, this,
- UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+ final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_GROUP),
+ this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
@Override
protected void addPressed() {
final EClass eClass = (EClass) getSelection().getFirstElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 4fc8d81..d7d3fae 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -15,6 +15,7 @@
package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import javax.annotation.PostConstruct;
@@ -24,6 +25,7 @@
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -109,7 +111,8 @@
parent = createScrollableContainer(folder);
item.setControl(parent.getParent());
- final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, this, targetFeature) {
+ final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_GROUP),
+ this, targetFeature) {
@Override
protected void addPressed() {
final EClass eClass = (EClass) getSelection().getFirstElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 4073e49..05ac6e5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -16,6 +16,7 @@
package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import javax.annotation.PostConstruct;
@@ -27,6 +28,7 @@
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -161,8 +163,8 @@
{
- final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, this,
- BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS) {
+ final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_GROUP),
+ this, BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS) {
@Override
protected void addPressed() {
final EClass eClass = (EClass) getSelection().getFirstElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index 27058a3..32426e9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -104,7 +104,7 @@
{
final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
- Arrays.asList(PickListFeatures.NO_PICKER), this,
+ Arrays.asList(PickListFeatures.NO_PICKER, PickListFeatures.NO_GROUP), this,
BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS) {
@Override
protected void addPressed() {