diff options
85 files changed, 3285 insertions, 958 deletions
diff --git a/plugins/org.eclipse.eef.edit/icons/full/obj16/EEFFillLayoutDescription.gif b/plugins/org.eclipse.eef.edit/icons/full/obj16/EEFFillLayoutDescription.gif Binary files differnew file mode 100644 index 000000000..7c2aaac84 --- /dev/null +++ b/plugins/org.eclipse.eef.edit/icons/full/obj16/EEFFillLayoutDescription.gif diff --git a/plugins/org.eclipse.eef.edit/icons/full/obj16/EEFGridLayoutDescription.gif b/plugins/org.eclipse.eef.edit/icons/full/obj16/EEFGridLayoutDescription.gif Binary files differnew file mode 100644 index 000000000..a17dc7d88 --- /dev/null +++ b/plugins/org.eclipse.eef.edit/icons/full/obj16/EEFGridLayoutDescription.gif diff --git a/plugins/org.eclipse.eef.edit/plugin.properties b/plugins/org.eclipse.eef.edit/plugin.properties index 16baa1623..b5b262f15 100644 --- a/plugins/org.eclipse.eef.edit/plugin.properties +++ b/plugins/org.eclipse.eef.edit/plugin.properties @@ -45,10 +45,7 @@ _UI_EEFGroupDescription_identifier_feature = Identifier _UI_EEFGroupDescription_labelExpression_feature = Label Expression _UI_EEFGroupDescription_semanticCandidateExpression_feature = Semantic Candidate Expression _UI_EEFGroupDescription_preconditionExpression_feature = Precondition Expression -_UI_EEFGroupDescription_container_feature = Container _UI_EEFContainerDescription_identifier_feature = Identifier -_UI_EEFContainerDescription_widgets_feature = Widgets -_UI_EEFContainerDescription_dynamicMappings_feature = Dynamic Mappings _UI_EEFWidgetDescription_identifier_feature = Identifier _UI_EEFWidgetDescription_labelExpression_feature = Label Expression _UI_EEFTextDescription_valueExpression_feature = Value Expression @@ -164,3 +161,17 @@ _UI_EEFCustomWidgetStyle_type = EEF Custom Widget Style _UI_EEFCustomWidgetConditionalStyle_type = EEF Custom Widget Conditional Style _UI_EEFCustomWidgetDescription_conditionalStyles_feature = Conditional Styles _UI_EEFCustomWidgetConditionalStyle_style_feature = Style +_UI_EEFContainerDescription_orientation_feature = Orientation +_UI_EEFControlDescription_type = EEF Control Description +_UI_EEFGroupDescription_controls_feature = Controls +_UI_EEFContainerDescription_controls_feature = Controls +_UI_EEFControlDescription_identifier_feature = Identifier +_UI_EEFLayoutDescription_type = EEF Layout Description +_UI_EEFFillLayoutDescription_type = EEF Fill Layout Description +_UI_EEFGridLayoutDescription_type = EEF Grid Layout Description +_UI_EEFContainerDescription_layout_feature = Layout +_UI_EEFFillLayoutDescription_orientation_feature = Orientation +_UI_EEFGridLayoutDescription_numberOfColumns_feature = Number Of Columns +_UI_EEFGridLayoutDescription_makeColumnsWithEqualWidth_feature = Make Columns With Equal Width +_UI_EEF_FILL_LAYOUT_ORIENTATION_VERTICAL_literal = VERTICAL +_UI_EEF_FILL_LAYOUT_ORIENTATION_HORIZONTAL_literal = HORIZONTAL diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFContainerDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFContainerDescriptionItemProvider.java index 8a0412f4f..a1e7a2c09 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFContainerDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFContainerDescriptionItemProvider.java @@ -16,17 +16,8 @@ import org.eclipse.eef.EefFactory; import org.eclipse.eef.EefPackage; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; /** @@ -35,8 +26,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification; * * @generated */ -public class EEFContainerDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, -ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { +public class EEFContainerDescriptionItemProvider extends EEFControlDescriptionItemProvider { /** * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -56,29 +46,11 @@ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addIdentifierPropertyDescriptor(object); } return itemPropertyDescriptors; } /** - * This adds a property descriptor for the Identifier feature. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - protected void addIdentifierPropertyDescriptor(Object object) { - itemPropertyDescriptors - .add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_EEFContainerDescription_identifier_feature"), //$NON-NLS-1$ - getString( - "_UI_PropertyDescriptor_description", "_UI_EEFContainerDescription_identifier_feature", "_UI_EEFContainerDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, null)); - } - - /** * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!-- @@ -90,8 +62,9 @@ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { if (childrenFeatures == null) { super.getChildrenFeatures(object); - childrenFeatures.add(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__WIDGETS); + childrenFeatures.add(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__CONTROLS); childrenFeatures.add(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS); + childrenFeatures.add(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__LAYOUT); } return childrenFeatures; } @@ -153,11 +126,9 @@ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { updateChildren(notification); switch (notification.getFeatureID(EEFContainerDescription.class)) { - case EefPackage.EEF_CONTAINER_DESCRIPTION__IDENTIFIER: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - case EefPackage.EEF_CONTAINER_DESCRIPTION__WIDGETS: + case EefPackage.EEF_CONTAINER_DESCRIPTION__CONTROLS: case EefPackage.EEF_CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS: + case EefPackage.EEF_CONTAINER_DESCRIPTION__LAYOUT: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); return; } @@ -174,39 +145,62 @@ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__WIDGETS, + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__CONTROLS, + EefFactory.eINSTANCE.createEEFContainerDescription())); + + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__CONTROLS, EefFactory.eINSTANCE.createEEFTextDescription())); - newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__WIDGETS, + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__CONTROLS, EefFactory.eINSTANCE.createEEFLabelDescription())); - newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__WIDGETS, + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__CONTROLS, EefFactory.eINSTANCE.createEEFButtonDescription())); - newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__WIDGETS, + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__CONTROLS, EefFactory.eINSTANCE.createEEFCheckboxDescription())); - newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__WIDGETS, + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__CONTROLS, EefFactory.eINSTANCE.createEEFSelectDescription())); - newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__WIDGETS, + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__CONTROLS, EefFactory.eINSTANCE.createEEFRadioDescription())); - newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__WIDGETS, + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__CONTROLS, + EefFactory.eINSTANCE.createEEFDynamicMappingFor())); + + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__CONTROLS, EefFactory.eINSTANCE.createEEFCustomWidgetDescription())); newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS, EefFactory.eINSTANCE.createEEFDynamicMappingFor())); + + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__LAYOUT, + EefFactory.eINSTANCE.createEEFFillLayoutDescription())); + + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__LAYOUT, + EefFactory.eINSTANCE.createEEFGridLayoutDescription())); } /** - * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc --> + * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc --> + * <!-- end-user-doc --> * * @generated */ @Override - public ResourceLocator getResourceLocator() { - return EefEditPlugin.INSTANCE; + public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { + Object childFeature = feature; + Object childObject = child; + + boolean qualify = childFeature == EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__CONTROLS + || childFeature == EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS; + + if (qualify) { + return getString("_UI_CreateChild_text2", //$NON-NLS-1$ + new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); + } + return super.getCreateChildText(owner, feature, child, selection); } } diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFControlDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFControlDescriptionItemProvider.java new file mode 100644 index 000000000..bf5a56f1f --- /dev/null +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFControlDescriptionItemProvider.java @@ -0,0 +1,136 @@ +/** + * Copyright (c) 2015 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.htm + * Contributors: Obeo - initial API and implementation + */ +package org.eclipse.eef.provider; + +import java.util.Collection; +import java.util.List; + +import org.eclipse.eef.EEFControlDescription; +import org.eclipse.eef.EefPackage; +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; +import org.eclipse.emf.edit.provider.ViewerNotification; + +/** + * This is the item provider adapter for a {@link org.eclipse.eef.EEFControlDescription} object. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ +public class EEFControlDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, +ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { + /** + * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public EEFControlDescriptionItemProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); + + addIdentifierPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Identifier feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected void addIdentifierPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_EEFControlDescription_identifier_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_EEFControlDescription_identifier_feature", "_UI_EEFControlDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + EefPackage.Literals.EEF_CONTROL_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + protected boolean shouldComposeCreationImage() { + return true; + } + + /** + * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public String getText(Object object) { + String label = ((EEFControlDescription) object).getIdentifier(); + return label == null || label.length() == 0 ? getString("_UI_EEFControlDescription_type") : //$NON-NLS-1$ + getString("_UI_EEFControlDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating + * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @generated + */ + @Override + public void notifyChanged(Notification notification) { + updateChildren(notification); + + switch (notification.getFeatureID(EEFControlDescription.class)) { + case EefPackage.EEF_CONTROL_DESCRIPTION__IDENTIFIER: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created + * under this object. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + + /** + * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public ResourceLocator getResourceLocator() { + return EefEditPlugin.INSTANCE; + } + +} diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFDynamicMappingForItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFDynamicMappingForItemProvider.java index 1947dfab1..7398db44b 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFDynamicMappingForItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFDynamicMappingForItemProvider.java @@ -16,17 +16,10 @@ import org.eclipse.eef.EefFactory; import org.eclipse.eef.EefPackage; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; /** @@ -35,8 +28,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification; * * @generated */ -public class EEFDynamicMappingForItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, -ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { +public class EEFDynamicMappingForItemProvider extends EEFControlDescriptionItemProvider { /** * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -149,7 +141,7 @@ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { */ @Override public String getText(Object object) { - String label = ((EEFDynamicMappingFor) object).getIterator(); + String label = ((EEFDynamicMappingFor) object).getIdentifier(); return label == null || label.length() == 0 ? getString("_UI_EEFDynamicMappingFor_type") : //$NON-NLS-1$ getString("_UI_EEFDynamicMappingFor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -191,14 +183,4 @@ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { EefFactory.eINSTANCE.createEEFDynamicMappingIf())); } - /** - * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override - public ResourceLocator getResourceLocator() { - return EefEditPlugin.INSTANCE; - } - } diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFFillLayoutDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFFillLayoutDescriptionItemProvider.java new file mode 100644 index 000000000..f0dedb30c --- /dev/null +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFFillLayoutDescriptionItemProvider.java @@ -0,0 +1,135 @@ +/** + * Copyright (c) 2015 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.htm + * Contributors: Obeo - initial API and implementation + */ +package org.eclipse.eef.provider; + +import java.util.Collection; +import java.util.List; + +import org.eclipse.eef.EEFFillLayoutDescription; +import org.eclipse.eef.EEF_FILL_LAYOUT_ORIENTATION; +import org.eclipse.eef.EefPackage; +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ViewerNotification; + +/** + * This is the item provider adapter for a {@link org.eclipse.eef.EEFFillLayoutDescription} object. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @generated + */ +public class EEFFillLayoutDescriptionItemProvider extends EEFLayoutDescriptionItemProvider { + /** + * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public EEFFillLayoutDescriptionItemProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); + + addOrientationPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Orientation feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected void addOrientationPropertyDescriptor(Object object) { + itemPropertyDescriptors + .add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_EEFFillLayoutDescription_orientation_feature"), //$NON-NLS-1$ + getString( + "_UI_PropertyDescriptor_description", "_UI_EEFFillLayoutDescription_orientation_feature", "_UI_EEFFillLayoutDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + EefPackage.Literals.EEF_FILL_LAYOUT_DESCRIPTION__ORIENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, null)); + } + + /** + * This returns EEFFillLayoutDescription.gif. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public Object getImage(Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/EEFFillLayoutDescription")); //$NON-NLS-1$ + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + protected boolean shouldComposeCreationImage() { + return true; + } + + /** + * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public String getText(Object object) { + EEF_FILL_LAYOUT_ORIENTATION labelValue = ((EEFFillLayoutDescription) object).getOrientation(); + String label = labelValue == null ? null : labelValue.toString(); + return label == null || label.length() == 0 ? getString("_UI_EEFFillLayoutDescription_type") : //$NON-NLS-1$ + getString("_UI_EEFFillLayoutDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating + * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @generated + */ + @Override + public void notifyChanged(Notification notification) { + updateChildren(notification); + + switch (notification.getFeatureID(EEFFillLayoutDescription.class)) { + case EefPackage.EEF_FILL_LAYOUT_DESCRIPTION__ORIENTATION: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created + * under this object. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + +} diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGridLayoutDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGridLayoutDescriptionItemProvider.java new file mode 100644 index 000000000..8ce8287ae --- /dev/null +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGridLayoutDescriptionItemProvider.java @@ -0,0 +1,152 @@ +/** + * Copyright (c) 2015 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.htm + * Contributors: Obeo - initial API and implementation + */ +package org.eclipse.eef.provider; + +import java.util.Collection; +import java.util.List; + +import org.eclipse.eef.EEFGridLayoutDescription; +import org.eclipse.eef.EefPackage; +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ViewerNotification; + +/** + * This is the item provider adapter for a {@link org.eclipse.eef.EEFGridLayoutDescription} object. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @generated + */ +public class EEFGridLayoutDescriptionItemProvider extends EEFLayoutDescriptionItemProvider { + /** + * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public EEFGridLayoutDescriptionItemProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); + + addNumberOfColumnsPropertyDescriptor(object); + addMakeColumnsWithEqualWidthPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Number Of Columns feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected void addNumberOfColumnsPropertyDescriptor(Object object) { + itemPropertyDescriptors + .add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_EEFGridLayoutDescription_numberOfColumns_feature"), //$NON-NLS-1$ + getString( + "_UI_PropertyDescriptor_description", "_UI_EEFGridLayoutDescription_numberOfColumns_feature", "_UI_EEFGridLayoutDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + EefPackage.Literals.EEF_GRID_LAYOUT_DESCRIPTION__NUMBER_OF_COLUMNS, true, false, false, + ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); + } + + /** + * This adds a property descriptor for the Make Columns With Equal Width feature. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @generated + */ + protected void addMakeColumnsWithEqualWidthPropertyDescriptor(Object object) { + itemPropertyDescriptors + .add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_EEFGridLayoutDescription_makeColumnsWithEqualWidth_feature"), //$NON-NLS-1$ + getString( + "_UI_PropertyDescriptor_description", "_UI_EEFGridLayoutDescription_makeColumnsWithEqualWidth_feature", "_UI_EEFGridLayoutDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + EefPackage.Literals.EEF_GRID_LAYOUT_DESCRIPTION__MAKE_COLUMNS_WITH_EQUAL_WIDTH, true, false, false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); + } + + /** + * This returns EEFGridLayoutDescription.gif. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public Object getImage(Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/EEFGridLayoutDescription")); //$NON-NLS-1$ + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + protected boolean shouldComposeCreationImage() { + return true; + } + + /** + * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public String getText(Object object) { + EEFGridLayoutDescription eefGridLayoutDescription = (EEFGridLayoutDescription) object; + return getString("_UI_EEFGridLayoutDescription_type") + " " + eefGridLayoutDescription.getNumberOfColumns(); //$NON-NLS-1$ //$NON-NLS-2$ + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating + * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @generated + */ + @Override + public void notifyChanged(Notification notification) { + updateChildren(notification); + + switch (notification.getFeatureID(EEFGridLayoutDescription.class)) { + case EefPackage.EEF_GRID_LAYOUT_DESCRIPTION__NUMBER_OF_COLUMNS: + case EefPackage.EEF_GRID_LAYOUT_DESCRIPTION__MAKE_COLUMNS_WITH_EQUAL_WIDTH: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created + * under this object. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + +} diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGroupDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGroupDescriptionItemProvider.java index 7589dd189..044497408 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGroupDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGroupDescriptionItemProvider.java @@ -151,7 +151,7 @@ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { if (childrenFeatures == null) { super.getChildrenFeatures(object); - childrenFeatures.add(EefPackage.Literals.EEF_GROUP_DESCRIPTION__CONTAINER); + childrenFeatures.add(EefPackage.Literals.EEF_GROUP_DESCRIPTION__CONTROLS); childrenFeatures.add(EefPackage.Literals.EEF_GROUP_DESCRIPTION__SEMANTIC_VALIDATION_RULES); childrenFeatures.add(EefPackage.Literals.EEF_GROUP_DESCRIPTION__PROPERTY_VALIDATION_RULES); } @@ -222,7 +222,7 @@ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { case EefPackage.EEF_GROUP_DESCRIPTION__PRECONDITION_EXPRESSION: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; - case EefPackage.EEF_GROUP_DESCRIPTION__CONTAINER: + case EefPackage.EEF_GROUP_DESCRIPTION__CONTROLS: case EefPackage.EEF_GROUP_DESCRIPTION__SEMANTIC_VALIDATION_RULES: case EefPackage.EEF_GROUP_DESCRIPTION__PROPERTY_VALIDATION_RULES: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); @@ -241,9 +241,33 @@ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_GROUP_DESCRIPTION__CONTAINER, + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_GROUP_DESCRIPTION__CONTROLS, EefFactory.eINSTANCE.createEEFContainerDescription())); + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_GROUP_DESCRIPTION__CONTROLS, + EefFactory.eINSTANCE.createEEFTextDescription())); + + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_GROUP_DESCRIPTION__CONTROLS, + EefFactory.eINSTANCE.createEEFLabelDescription())); + + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_GROUP_DESCRIPTION__CONTROLS, + EefFactory.eINSTANCE.createEEFButtonDescription())); + + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_GROUP_DESCRIPTION__CONTROLS, + EefFactory.eINSTANCE.createEEFCheckboxDescription())); + + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_GROUP_DESCRIPTION__CONTROLS, + EefFactory.eINSTANCE.createEEFSelectDescription())); + + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_GROUP_DESCRIPTION__CONTROLS, + EefFactory.eINSTANCE.createEEFRadioDescription())); + + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_GROUP_DESCRIPTION__CONTROLS, + EefFactory.eINSTANCE.createEEFDynamicMappingFor())); + + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_GROUP_DESCRIPTION__CONTROLS, + EefFactory.eINSTANCE.createEEFCustomWidgetDescription())); + newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_GROUP_DESCRIPTION__SEMANTIC_VALIDATION_RULES, EefFactory.eINSTANCE.createEEFSemanticValidationRuleDescription())); diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFLayoutDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFLayoutDescriptionItemProvider.java new file mode 100644 index 000000000..64c1a47ce --- /dev/null +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFLayoutDescriptionItemProvider.java @@ -0,0 +1,110 @@ +/** + * Copyright (c) 2015 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.htm + * Contributors: Obeo - initial API and implementation + */ +package org.eclipse.eef.provider; + +import java.util.Collection; +import java.util.List; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; + +/** + * This is the item provider adapter for a {@link org.eclipse.eef.EEFLayoutDescription} object. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ +public class EEFLayoutDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, +ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { + /** + * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public EEFLayoutDescriptionItemProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); + + } + return itemPropertyDescriptors; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + protected boolean shouldComposeCreationImage() { + return true; + } + + /** + * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public String getText(Object object) { + return getString("_UI_EEFLayoutDescription_type"); //$NON-NLS-1$ + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating + * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @generated + */ + @Override + public void notifyChanged(Notification notification) { + updateChildren(notification); + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created + * under this object. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + + /** + * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public ResourceLocator getResourceLocator() { + return EefEditPlugin.INSTANCE; + } + +} diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFWidgetDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFWidgetDescriptionItemProvider.java index 6dc49a687..fff75b033 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFWidgetDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFWidgetDescriptionItemProvider.java @@ -15,16 +15,9 @@ import org.eclipse.eef.EEFWidgetDescription; import org.eclipse.eef.EefPackage; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; /** @@ -33,8 +26,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification; * * @generated */ -public class EEFWidgetDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, -ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { +public class EEFWidgetDescriptionItemProvider extends EEFControlDescriptionItemProvider { /** * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -54,7 +46,6 @@ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addIdentifierPropertyDescriptor(object); addLabelExpressionPropertyDescriptor(object); addHelpExpressionPropertyDescriptor(object); addPropertyValidationRulesPropertyDescriptor(object); @@ -63,18 +54,6 @@ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { } /** - * This adds a property descriptor for the Identifier feature. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - protected void addIdentifierPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), getString("_UI_EEFWidgetDescription_identifier_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_EEFWidgetDescription_identifier_feature", "_UI_EEFWidgetDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - EefPackage.Literals.EEF_WIDGET_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); - } - - /** * This adds a property descriptor for the Label Expression feature. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -162,7 +141,6 @@ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { updateChildren(notification); switch (notification.getFeatureID(EEFWidgetDescription.class)) { - case EefPackage.EEF_WIDGET_DESCRIPTION__IDENTIFIER: case EefPackage.EEF_WIDGET_DESCRIPTION__LABEL_EXPRESSION: case EefPackage.EEF_WIDGET_DESCRIPTION__HELP_EXPRESSION: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); @@ -182,14 +160,4 @@ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override - public ResourceLocator getResourceLocator() { - return EefEditPlugin.INSTANCE; - } - } diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EefItemProviderAdapterFactory.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EefItemProviderAdapterFactory.java index d38a43ce2..7ac5fd033 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EefItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EefItemProviderAdapterFactory.java @@ -258,6 +258,52 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory implements } /** + * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFFillLayoutDescription} instances. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected EEFFillLayoutDescriptionItemProvider eefFillLayoutDescriptionItemProvider; + + /** + * This creates an adapter for a {@link org.eclipse.eef.EEFFillLayoutDescription}. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @generated + */ + @Override + public Adapter createEEFFillLayoutDescriptionAdapter() { + if (eefFillLayoutDescriptionItemProvider == null) { + eefFillLayoutDescriptionItemProvider = new EEFFillLayoutDescriptionItemProvider(this); + } + + return eefFillLayoutDescriptionItemProvider; + } + + /** + * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFGridLayoutDescription} instances. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected EEFGridLayoutDescriptionItemProvider eefGridLayoutDescriptionItemProvider; + + /** + * This creates an adapter for a {@link org.eclipse.eef.EEFGridLayoutDescription}. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @generated + */ + @Override + public Adapter createEEFGridLayoutDescriptionAdapter() { + if (eefGridLayoutDescriptionItemProvider == null) { + eefGridLayoutDescriptionItemProvider = new EEFGridLayoutDescriptionItemProvider(this); + } + + return eefGridLayoutDescriptionItemProvider; + } + + /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFTextDescription} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -932,6 +978,12 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory implements if (eefContainerDescriptionItemProvider != null) { eefContainerDescriptionItemProvider.dispose(); } + if (eefFillLayoutDescriptionItemProvider != null) { + eefFillLayoutDescriptionItemProvider.dispose(); + } + if (eefGridLayoutDescriptionItemProvider != null) { + eefGridLayoutDescriptionItemProvider.dispose(); + } if (eefTextDescriptionItemProvider != null) { eefTextDescriptionItemProvider.dispose(); } diff --git a/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF index a5a05e516..565e88787 100644 --- a/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF @@ -18,7 +18,6 @@ Import-Package: com.google.common.base;version="15.0.0", Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.emf.common;bundle-version="[2.8.0,3.0.0)", org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)", - org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)", org.eclipse.swt;bundle-version="[3.0.0,4.0.0)", org.eclipse.ui.forms;bundle-version="[3.5.200,4.0.0)", org.eclipse.jface;bundle-version="[3.1.0,4.0.0)", diff --git a/plugins/org.eclipse.eef.ide.ui/build.properties b/plugins/org.eclipse.eef.ide.ui/build.properties index c113aab40..9d25f52af 100644 --- a/plugins/org.eclipse.eef.ide.ui/build.properties +++ b/plugins/org.eclipse.eef.ide.ui/build.properties @@ -14,4 +14,3 @@ bin.includes = META-INF/,\ plugin.xml,\ icons/ javacProjectSettings = true -additional.bundles = org.eclipse.emf.transaction diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/EEFTab.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/EEFTab.java index 7bd1be623..8b53e6650 100644 --- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/EEFTab.java +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/EEFTab.java @@ -111,6 +111,8 @@ public class EEFTab { IStructuredSelection iStructuredSelection = (IStructuredSelection) selection; Object object = iStructuredSelection.getFirstElement(); + // This "unecessary" cast is used to keep the compatibility with Eclipse Luna + @SuppressWarnings("cast") InputDescriptor input = (InputDescriptor) Platform.getAdapterManager().getAdapter(object, InputDescriptor.class); if (input != null) { @@ -138,7 +140,7 @@ public class EEFTab { EAttribute imageExpressionEAttribute = EefPackage.Literals.EEF_VIEW_DESCRIPTION__IMAGE_EXPRESSION; String imageExpression = eefView.getDescription().getImageExpression(); Object object = new Eval(eefView.getInterpreter(), eefView.getVariableManager()) - .get(imageExpressionEAttribute, imageExpression, Object.class); + .get(imageExpressionEAttribute, imageExpression, Object.class); if (object instanceof URL) { Image image = EEFIdeUiPlugin.getPlugin().getImage((URL) object); this.formContainer.getForm().setImage(image); diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/widgets/AbstractEEFWidgetLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/widgets/AbstractEEFWidgetLifecycleManager.java index ed5984d73..1ac836e2c 100644 --- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/widgets/AbstractEEFWidgetLifecycleManager.java +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/widgets/AbstractEEFWidgetLifecycleManager.java @@ -15,6 +15,7 @@ import com.google.common.base.Objects; import java.util.List; import org.eclipse.eef.EEFConditionalStyle; +import org.eclipse.eef.EEFGroupDescription; import org.eclipse.eef.EEFTextStyle; import org.eclipse.eef.EEFWidgetDescription; import org.eclipse.eef.EEFWidgetStyle; @@ -43,11 +44,9 @@ import org.eclipse.swt.custom.StyleRange; import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.FontData; -import org.eclipse.swt.layout.FormAttachment; -import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; /** * Parent of all the lifecycle managers. @@ -57,30 +56,6 @@ import org.eclipse.swt.widgets.Control; public abstract class AbstractEEFWidgetLifecycleManager extends AbstractEEFLifecycleManager { /** - * Horizontal space to leave between related widgets. Each section should use these values for spacing its widgets. - * For example, you can use +/- HSPACE as the offset of a left or right FlatFormAttachment. - * - * The tabbed property composite also inserts VSPACE pixels between section composites if more than one section is - * displayed. - */ - public static final int HSPACE = 5; - - /** - * The label width that will be used for section names. - **/ - public static final int LABEL_WIDTH = 232; - - /** - * The gap between the label and the widget with the help icon. - */ - public static final int GAP_WITH_HELP = 25; - - /** - * The gap between the label and the widget without the help icon. - */ - public static final int GAP_WITHOUT_HELP = 20; - - /** * The variable manager. */ protected IVariableManager variableManager; @@ -133,38 +108,66 @@ public abstract class AbstractEEFWidgetLifecycleManager extends AbstractEEFLifec EEFWidgetFactory widgetFactory = formContainer.getWidgetFactory(); - Composite composite = widgetFactory.createFlatFormComposite(parent); - GridData gridData = new GridData(GridData.FILL_HORIZONTAL); - composite.setLayoutData(gridData); + Composite composite = parent; - this.createMainControl(composite, formContainer); + // If we are in a group, we will always create a label (empty or not) for the 3 columns layout of the group. + boolean isInGroup = this.getWidgetDescription().eContainer() instanceof EEFGroupDescription; + + // Some widgets (like a checkbox) will not have a separated "label" widget for their label. Those widgets will + // thus never create another widget expect in the group (for the layout). + boolean needsSeparatedLabel = this.needSeparatedLabel(); - Control control = this.getValidationControl(); + // Finally if the label expression is blank, we will not create a label inside of a group (for the layout). + boolean isBlankLabel = Util.isBlank(this.getWidgetDescription().getLabelExpression()); - boolean hasHelp = !Util.isBlank(this.getWidgetDescription().getHelpExpression()); + boolean needsLabel = isInGroup || (!isBlankLabel && needsSeparatedLabel); + boolean needsHelp = isInGroup || !Util.isBlank(this.getWidgetDescription().getHelpExpression()); - int gap = GAP_WITHOUT_HELP; - if (hasHelp) { - gap = GAP_WITH_HELP; + // If we are not in a group, we will create a composite to hold all the label and help of the widget if + // necessary + if (!isInGroup && (needsLabel || needsHelp)) { + composite = widgetFactory.createComposite(parent); + + // We will only create the necessary number of columns for this "invisible" composite + int numColumn = 1; + if (needsLabel) { + numColumn = numColumn + 1; + } + if (needsHelp) { + numColumn = numColumn + 1; + } + GridLayout layout = new GridLayout(numColumn, false); + composite.setLayout(layout); + + GridData layoutData = new GridData(GridData.FILL_HORIZONTAL); + layoutData.horizontalSpan = 1; + composite.setLayoutData(layoutData); } - this.label = widgetFactory.createStyledText(composite, SWT.NONE); - this.label.setEditable(false); - FormData labelFormData = new FormData(); - labelFormData.left = new FormAttachment(0, 0); - labelFormData.right = new FormAttachment(control, -HSPACE - gap); - labelFormData.top = new FormAttachment(control, 0, SWT.TOP); - this.label.setLayoutData(labelFormData); + if (needsLabel) { + this.label = widgetFactory.createStyledText(composite, SWT.NONE); + this.label.setEditable(false); + this.label.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); + } - if (hasHelp) { + if (needsHelp) { this.help = widgetFactory.createCLabel(composite, ""); //$NON-NLS-1$ - FormData helpFormData = new FormData(); - helpFormData.top = new FormAttachment(control, 0, SWT.TOP); - helpFormData.left = new FormAttachment(this.label); - this.help.setLayoutData(helpFormData); - this.help.setImage(EEFIdeUiPlugin.getPlugin().getImageRegistry().get(Icons.HELP)); - this.help.setToolTipText(""); //$NON-NLS-1$ + if (!Util.isBlank(this.getWidgetDescription().getHelpExpression())) { + this.help.setImage(EEFIdeUiPlugin.getPlugin().getImageRegistry().get(Icons.HELP)); + this.help.setToolTipText(""); //$NON-NLS-1$ + } } + + this.createMainControl(composite, formContainer); + } + + /** + * Indicates if the widget should create a label widget for its label. + * + * @return <code>true</code> if a label should be created, <code>false</code> otherwise. + */ + protected boolean needSeparatedLabel() { + return true; } /** diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFButtonLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFButtonLifecycleManager.java index 0d7ff67ac..19bc415bc 100644 --- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFButtonLifecycleManager.java +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFButtonLifecycleManager.java @@ -34,8 +34,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.FormAttachment; -import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -94,14 +93,11 @@ public class EEFButtonLifecycleManager extends AbstractEEFWidgetLifecycleManager protected void createMainControl(Composite parent, IEEFFormContainer formContainer) { EEFWidgetFactory widgetFactory = formContainer.getWidgetFactory(); - final int buttonWidth = 80; + this.button = widgetFactory.createButton(parent, "", SWT.NONE); //$NON-NLS-1$ - FormData buttonFormData = new FormData(); - buttonFormData.left = new FormAttachment(0, LABEL_WIDTH); - buttonFormData.width = buttonWidth; - - this.button = widgetFactory.createButton(parent, "DO IT", SWT.NONE); //$NON-NLS-1$ - this.button.setLayoutData(buttonFormData); + final int minimumWidth = 80; + GridData layoutData = new GridData(minimumWidth, SWT.DEFAULT); + this.button.setLayoutData(layoutData); widgetFactory.paintBordersFor(parent); diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFCheckboxLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFCheckboxLifecycleManager.java index fc6738fc5..0846d5998 100644 --- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFCheckboxLifecycleManager.java +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFCheckboxLifecycleManager.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.eef.ide.ui.internal.widgets; +import com.google.common.base.Objects; + import java.util.ArrayList; import java.util.List; @@ -31,8 +33,6 @@ import org.eclipse.sirius.common.interpreter.api.IVariableManager; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.FormAttachment; -import org.eclipse.swt.layout.FormData; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -91,11 +91,7 @@ public class EEFCheckboxLifecycleManager extends AbstractEEFWidgetLifecycleManag protected void createMainControl(Composite parent, IEEFFormContainer formContainer) { EEFWidgetFactory widgetFactory = formContainer.getWidgetFactory(); - FormData buttonFormData = new FormData(); - buttonFormData.left = new FormAttachment(0, LABEL_WIDTH); - this.checkbox = widgetFactory.createButton(parent, "", SWT.CHECK); //$NON-NLS-1$ - this.checkbox.setLayoutData(buttonFormData); this.controller = new EEFControllersFactory().createCheckboxController(this.description, this.variableManager, this.interpreter, this.contextAdapter); } @@ -103,6 +99,16 @@ public class EEFCheckboxLifecycleManager extends AbstractEEFWidgetLifecycleManag /** * {@inheritDoc} * + * @see org.eclipse.eef.ide.ui.api.widgets.AbstractEEFWidgetLifecycleManager#needSeparatedLabel() + */ + @Override + protected boolean needSeparatedLabel() { + return false; + } + + /** + * {@inheritDoc} + * * @see org.eclipse.eef.ide.ui.api.widgets.AbstractEEFWidgetLifecycleManager#getController() */ @Override @@ -174,6 +180,15 @@ public class EEFCheckboxLifecycleManager extends AbstractEEFWidgetLifecycleManag public void aboutToBeShown() { super.aboutToBeShown(); + this.getController().onNewLabel(new IConsumer<String>() { + @Override + public void apply(String value) { + if (!checkbox.isDisposed() && !(checkbox.getText() != null && checkbox.getText().equals(value))) { + checkbox.setText(Objects.firstNonNull(value, "")); //$NON-NLS-1$ + } + } + }); + this.selectionListener = new SelectionListener() { @Override public void widgetSelected(SelectionEvent event) { diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFContainerLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFContainerLifecycleManager.java index 7781c6f34..2e4c3f8cd 100644 --- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFContainerLifecycleManager.java +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFContainerLifecycleManager.java @@ -10,36 +10,24 @@ *******************************************************************************/ package org.eclipse.eef.ide.ui.internal.widgets; -import java.text.MessageFormat; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import org.eclipse.eef.EEFButtonDescription; -import org.eclipse.eef.EEFCheckboxDescription; import org.eclipse.eef.EEFContainerDescription; -import org.eclipse.eef.EEFCustomWidgetDescription; -import org.eclipse.eef.EEFDynamicMappingFor; -import org.eclipse.eef.EEFDynamicMappingIf; -import org.eclipse.eef.EEFLabelDescription; -import org.eclipse.eef.EEFRadioDescription; -import org.eclipse.eef.EEFSelectDescription; -import org.eclipse.eef.EEFTextDescription; -import org.eclipse.eef.EEFWidgetDescription; -import org.eclipse.eef.EefPackage; -import org.eclipse.eef.common.api.utils.Util; +import org.eclipse.eef.EEFControlDescription; +import org.eclipse.eef.EEFFillLayoutDescription; +import org.eclipse.eef.EEFGridLayoutDescription; +import org.eclipse.eef.EEFGroupDescription; +import org.eclipse.eef.EEFLayoutDescription; +import org.eclipse.eef.EEF_FILL_LAYOUT_ORIENTATION; +import org.eclipse.eef.common.ui.api.EEFWidgetFactory; import org.eclipse.eef.common.ui.api.IEEFFormContainer; -import org.eclipse.eef.core.api.EEFExpressionUtils; import org.eclipse.eef.core.api.EditingContextAdapter; -import org.eclipse.eef.core.api.utils.Eval; import org.eclipse.eef.ide.ui.api.ILifecycleManager; -import org.eclipse.eef.ide.ui.internal.EEFIdeUiPlugin; -import org.eclipse.eef.ide.ui.internal.Messages; -import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.common.interpreter.api.IInterpreter; import org.eclipse.sirius.common.interpreter.api.IVariableManager; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; /** @@ -102,132 +90,42 @@ public class EEFContainerLifecycleManager implements ILifecycleManager { */ @Override public void createControl(Composite parent, IEEFFormContainer formContainer) { - List<EEFWidgetDescription> widgets = this.description.getWidgets(); - for (EEFWidgetDescription eefWidgetDescription : widgets) { - this.createWidgetControl(parent, formContainer, eefWidgetDescription, this.variableManager.createChild()); - } - - List<EEFDynamicMappingFor> dynamicMappings = this.description.getDynamicMappings(); - for (EEFDynamicMappingFor dynamicMappingFor : dynamicMappings) { - this.createDynamicMappingControl(parent, formContainer, dynamicMappingFor); - } - } - - /** - * Creates the control for the widget with the given {@link EEFWidgetDescription}. - * - * @param parent - * The composite parent - * @param formContainer - * The form container - * @param eefWidgetDescription - * The description of the widget to create - * @param childVariableManager - * The variable manager to use for the widget to create - */ - private void createWidgetControl(Composite parent, IEEFFormContainer formContainer, EEFWidgetDescription eefWidgetDescription, - IVariableManager childVariableManager) { - if (eefWidgetDescription instanceof EEFTextDescription) { - EEFTextDescription eefTextDescription = (EEFTextDescription) eefWidgetDescription; - - EEFTextLifecycleManager eefTextLifecycleManager = new EEFTextLifecycleManager(eefTextDescription, childVariableManager, interpreter, contextAdapter); - eefTextLifecycleManager.createControl(parent, formContainer); - - this.lifecycleManagers.add(eefTextLifecycleManager); - } else if (eefWidgetDescription instanceof EEFLabelDescription) { - EEFLabelDescription eefLabelDescription = (EEFLabelDescription) eefWidgetDescription; - - EEFLabelLifecycleManager eefLabelLifecycleManager = new EEFLabelLifecycleManager(eefLabelDescription, childVariableManager, interpreter, - contextAdapter); - eefLabelLifecycleManager.createControl(parent, formContainer); - - this.lifecycleManagers.add(eefLabelLifecycleManager); - } else if (eefWidgetDescription instanceof EEFSelectDescription) { - EEFSelectDescription eefSelectDescription = (EEFSelectDescription) eefWidgetDescription; - - EEFSelectLifecycleManager eefSelectLifecycleManager = new EEFSelectLifecycleManager(eefSelectDescription, childVariableManager, - interpreter, contextAdapter); - eefSelectLifecycleManager.createControl(parent, formContainer); - - this.lifecycleManagers.add(eefSelectLifecycleManager); - } else if (eefWidgetDescription instanceof EEFRadioDescription) { - EEFRadioDescription eefRadioDescription = (EEFRadioDescription) eefWidgetDescription; - - EEFRadioLifecycleManager eefRadioLifecycleManager = new EEFRadioLifecycleManager(eefRadioDescription, childVariableManager, interpreter, - contextAdapter); - eefRadioLifecycleManager.createControl(parent, formContainer); + EEFWidgetFactory widgetFactory = formContainer.getWidgetFactory(); - this.lifecycleManagers.add(eefRadioLifecycleManager); - } else if (eefWidgetDescription instanceof EEFCheckboxDescription) { - EEFCheckboxDescription eefCheckboxDescription = (EEFCheckboxDescription) eefWidgetDescription; + Composite composite = null; - EEFCheckboxLifecycleManager eefCheckboxLifecycleManager = new EEFCheckboxLifecycleManager(eefCheckboxDescription, childVariableManager, - interpreter, contextAdapter); - eefCheckboxLifecycleManager.createControl(parent, formContainer); - - this.lifecycleManagers.add(eefCheckboxLifecycleManager); - } else if (eefWidgetDescription instanceof EEFButtonDescription) { - EEFButtonDescription eefButtonDescription = (EEFButtonDescription) eefWidgetDescription; - - EEFButtonLifecycleManager eefButtonLifecycleManager = new EEFButtonLifecycleManager(eefButtonDescription, childVariableManager, - interpreter, contextAdapter); - eefButtonLifecycleManager.createControl(parent, formContainer); - - this.lifecycleManagers.add(eefButtonLifecycleManager); - } else if (eefWidgetDescription instanceof EEFCustomWidgetDescription) { - EEFCustomWidgetDescription eefCustomDescription = (EEFCustomWidgetDescription) eefWidgetDescription; - ILifecycleManager eefCustomWidgetLifecycleManager = EEFIdeUiPlugin.getPlugin().getEEFLifecycleManager(eefCustomDescription, - childVariableManager, interpreter, contextAdapter); - if (eefCustomWidgetLifecycleManager != null) { - eefCustomWidgetLifecycleManager.createControl(parent, formContainer); - this.lifecycleManagers.add(eefCustomWidgetLifecycleManager); - } else { - String message = MessageFormat.format(Messages.EEFIdeUiPlugin_lifecycleManagerNotFound, eefCustomDescription.getIdentifier()); - EEFIdeUiPlugin.getPlugin().error(message); - } + // If the container is directly under a group, we will create two empty labels for the first two columns of the + // layout (label & help) + if (this.description.eContainer() instanceof EEFGroupDescription) { + widgetFactory.createLabel(parent, ""); //$NON-NLS-1$ + widgetFactory.createLabel(parent, ""); //$NON-NLS-1$ } - } - - /** - * Creates the widgets for the dynamic mapping defined in the description. - * - * @param parent - * The composite parent - * @param formContainer - * The form container - * @param dynamicMappingFor - * The root of a dynamic mapping definition - */ - private void createDynamicMappingControl(Composite parent, IEEFFormContainer formContainer, EEFDynamicMappingFor dynamicMappingFor) { - String domainClassExpression = dynamicMappingFor.getDomainClassExpression(); - EAttribute domainClassEAttribute = EefPackage.Literals.EEF_DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION; - String iterator = dynamicMappingFor.getIterator(); - - EAttribute ifExpressionEAttribute = EefPackage.Literals.EEF_DYNAMIC_MAPPING_IF__PREDICATE_EXPRESSION; - - Object domainClassExpressionResult = new Eval(this.interpreter, this.variableManager).get(domainClassEAttribute, domainClassExpression, - Object.class); - for (EObject eObject : Util.asIterable(domainClassExpressionResult, EObject.class)) { - Map<String, Object> switchExpressionVariables = new HashMap<String, Object>(); - switchExpressionVariables.put(EEFExpressionUtils.SELF, this.variableManager.getVariables().get(EEFExpressionUtils.SELF)); - switchExpressionVariables.put(iterator, eObject); - - EEFWidgetDescription eefWidgetDescription = null; - List<EEFDynamicMappingIf> dynamicMappingIfs = dynamicMappingFor.getIfs(); - for (EEFDynamicMappingIf dynamicMappingIf : dynamicMappingIfs) { - Boolean isValid = new Eval(this.interpreter, switchExpressionVariables).get(ifExpressionEAttribute, - dynamicMappingIf.getPredicateExpression(), Boolean.class); - if (isValid != null && isValid.booleanValue()) { - eefWidgetDescription = dynamicMappingIf.getWidget(); - break; - } + composite = widgetFactory.createComposite(parent); + GridData gridData = new GridData(GridData.FILL_HORIZONTAL); + composite.setLayoutData(gridData); + + GridLayout compositeLayout = new GridLayout(1, true); + compositeLayout.marginWidth = 1; + + EEFLayoutDescription layout = this.description.getLayout(); + if (layout instanceof EEFFillLayoutDescription) { + // The vertical layout is the default one, we will thus only handle the horizontal one + EEFFillLayoutDescription fillLayoutDescription = (EEFFillLayoutDescription) layout; + if (fillLayoutDescription.getOrientation() == EEF_FILL_LAYOUT_ORIENTATION.HORIZONTAL) { + compositeLayout = new GridLayout(this.description.getControls().size(), false); + compositeLayout.marginWidth = 1; } + } else if (layout instanceof EEFGridLayoutDescription) { + EEFGridLayoutDescription gridLayoutDescription = (EEFGridLayoutDescription) layout; + compositeLayout = new GridLayout(gridLayoutDescription.getNumberOfColumns(), gridLayoutDescription.isMakeColumnsWithEqualWidth()); + compositeLayout.marginWidth = 1; + } + composite.setLayout(compositeLayout); - if (eefWidgetDescription != null) { - IVariableManager childVariableManager = this.variableManager.createChild(); - childVariableManager.put(iterator, eObject); - this.createWidgetControl(parent, formContainer, eefWidgetDescription, childVariableManager); - } + EEFControlSwitch eefControlSwitch = new EEFControlSwitch(this.interpreter, this.contextAdapter); + List<EEFControlDescription> controls = this.description.getControls(); + for (EEFControlDescription eefControlDescription : controls) { + this.lifecycleManagers.addAll(eefControlSwitch.doCreate(composite, formContainer, eefControlDescription, this.variableManager)); } } diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFControlSwitch.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFControlSwitch.java new file mode 100644 index 000000000..412702dc8 --- /dev/null +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFControlSwitch.java @@ -0,0 +1,235 @@ +/******************************************************************************* + * Copyright (c) 2016 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.eef.ide.ui.internal.widgets; + +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.eclipse.eef.EEFButtonDescription; +import org.eclipse.eef.EEFCheckboxDescription; +import org.eclipse.eef.EEFContainerDescription; +import org.eclipse.eef.EEFControlDescription; +import org.eclipse.eef.EEFCustomWidgetDescription; +import org.eclipse.eef.EEFDynamicMappingFor; +import org.eclipse.eef.EEFDynamicMappingIf; +import org.eclipse.eef.EEFLabelDescription; +import org.eclipse.eef.EEFRadioDescription; +import org.eclipse.eef.EEFSelectDescription; +import org.eclipse.eef.EEFTextDescription; +import org.eclipse.eef.EEFWidgetDescription; +import org.eclipse.eef.EefPackage; +import org.eclipse.eef.common.api.utils.Util; +import org.eclipse.eef.common.ui.api.IEEFFormContainer; +import org.eclipse.eef.core.api.EEFExpressionUtils; +import org.eclipse.eef.core.api.EditingContextAdapter; +import org.eclipse.eef.core.api.utils.Eval; +import org.eclipse.eef.ide.ui.api.ILifecycleManager; +import org.eclipse.eef.ide.ui.internal.EEFIdeUiPlugin; +import org.eclipse.eef.ide.ui.internal.Messages; +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.sirius.common.interpreter.api.IInterpreter; +import org.eclipse.sirius.common.interpreter.api.IVariableManager; +import org.eclipse.swt.widgets.Composite; + +/** + * Utility class used to dispatch the creation of the control to create. + * + * @author sbegaudeau + */ +public class EEFControlSwitch { + /** + * The interpreter. + */ + private IInterpreter interpreter; + + /** + * The editing context adapter. + */ + private EditingContextAdapter contextAdapter; + + /** + * The constructor. + * + * @param interpreter + * The interpreter + * @param contextAdapter + * The editing context adapter + */ + public EEFControlSwitch(IInterpreter interpreter, EditingContextAdapter contextAdapter) { + this.interpreter = interpreter; + this.contextAdapter = contextAdapter; + } + + /** + * Creates the control from the given description in the given parent. + * + * @param parent + * The parent in which the control should be created + * @param formContainer + * The container of the form + * @param controlDescription + * The description of the control to be created + * @param variableManager + * The variable manager + * @return The list of all the lifecycle manager that have been created. One description can create multiple + * controls and thus multiple lifecycle managers (for example dynamic mappings). + */ + public List<ILifecycleManager> doCreate(Composite parent, IEEFFormContainer formContainer, EEFControlDescription controlDescription, + IVariableManager variableManager) { + List<ILifecycleManager> lifecycleManagers = new ArrayList<ILifecycleManager>(); + if (controlDescription instanceof EEFContainerDescription) { + EEFContainerLifecycleManager containerLifecycleManager = new EEFContainerLifecycleManager((EEFContainerDescription) controlDescription, + variableManager.createChild(), this.interpreter, this.contextAdapter); + containerLifecycleManager.createControl(parent, formContainer); + lifecycleManagers.add(containerLifecycleManager); + } else if (controlDescription instanceof EEFWidgetDescription) { + lifecycleManagers.addAll(this.createWidgetControl(parent, formContainer, (EEFWidgetDescription) controlDescription, + variableManager.createChild())); + } else if (controlDescription instanceof EEFDynamicMappingFor) { + lifecycleManagers.addAll(this.createDynamicMappingControl(parent, formContainer, (EEFDynamicMappingFor) controlDescription, + variableManager)); + } + return lifecycleManagers; + } + + /** + * Creates the control for the widget with the given {@link EEFWidgetDescription}. + * + * @param parent + * The composite parent + * @param formContainer + * The form container + * @param widgetDescription + * The description of the widget to create + * @param childVariableManager + * The child variable manager + * @return The lifecycle managers created for the widget(s) + */ + private List<ILifecycleManager> createWidgetControl(Composite parent, IEEFFormContainer formContainer, EEFWidgetDescription widgetDescription, + IVariableManager childVariableManager) { + List<ILifecycleManager> lifecycleManagers = new ArrayList<ILifecycleManager>(); + if (widgetDescription instanceof EEFTextDescription) { + EEFTextDescription eefTextDescription = (EEFTextDescription) widgetDescription; + + EEFTextLifecycleManager eefTextLifecycleManager = new EEFTextLifecycleManager(eefTextDescription, childVariableManager, interpreter, + contextAdapter); + eefTextLifecycleManager.createControl(parent, formContainer); + + lifecycleManagers.add(eefTextLifecycleManager); + } else if (widgetDescription instanceof EEFLabelDescription) { + EEFLabelDescription eefLabelDescription = (EEFLabelDescription) widgetDescription; + + EEFLabelLifecycleManager eefLabelLifecycleManager = new EEFLabelLifecycleManager(eefLabelDescription, childVariableManager, interpreter, + contextAdapter); + eefLabelLifecycleManager.createControl(parent, formContainer); + + lifecycleManagers.add(eefLabelLifecycleManager); + } else if (widgetDescription instanceof EEFSelectDescription) { + EEFSelectDescription eefSelectDescription = (EEFSelectDescription) widgetDescription; + + EEFSelectLifecycleManager eefSelectLifecycleManager = new EEFSelectLifecycleManager(eefSelectDescription, childVariableManager, + interpreter, contextAdapter); + eefSelectLifecycleManager.createControl(parent, formContainer); + + lifecycleManagers.add(eefSelectLifecycleManager); + } else if (widgetDescription instanceof EEFRadioDescription) { + EEFRadioDescription eefRadioDescription = (EEFRadioDescription) widgetDescription; + + EEFRadioLifecycleManager eefRadioLifecycleManager = new EEFRadioLifecycleManager(eefRadioDescription, childVariableManager, interpreter, + contextAdapter); + eefRadioLifecycleManager.createControl(parent, formContainer); + + lifecycleManagers.add(eefRadioLifecycleManager); + } else if (widgetDescription instanceof EEFCheckboxDescription) { + EEFCheckboxDescription eefCheckboxDescription = (EEFCheckboxDescription) widgetDescription; + + EEFCheckboxLifecycleManager eefCheckboxLifecycleManager = new EEFCheckboxLifecycleManager(eefCheckboxDescription, childVariableManager, + interpreter, contextAdapter); + eefCheckboxLifecycleManager.createControl(parent, formContainer); + + lifecycleManagers.add(eefCheckboxLifecycleManager); + } else if (widgetDescription instanceof EEFButtonDescription) { + EEFButtonDescription eefButtonDescription = (EEFButtonDescription) widgetDescription; + + EEFButtonLifecycleManager eefButtonLifecycleManager = new EEFButtonLifecycleManager(eefButtonDescription, childVariableManager, + interpreter, contextAdapter); + eefButtonLifecycleManager.createControl(parent, formContainer); + + lifecycleManagers.add(eefButtonLifecycleManager); + } else if (widgetDescription instanceof EEFCustomWidgetDescription) { + EEFCustomWidgetDescription eefCustomDescription = (EEFCustomWidgetDescription) widgetDescription; + ILifecycleManager eefCustomWidgetLifecycleManager = EEFIdeUiPlugin.getPlugin().getEEFLifecycleManager(eefCustomDescription, + childVariableManager, interpreter, contextAdapter); + if (eefCustomWidgetLifecycleManager != null) { + eefCustomWidgetLifecycleManager.createControl(parent, formContainer); + lifecycleManagers.add(eefCustomWidgetLifecycleManager); + } else { + String message = MessageFormat.format(Messages.EEFIdeUiPlugin_lifecycleManagerNotFound, eefCustomDescription.getIdentifier()); + EEFIdeUiPlugin.getPlugin().error(message); + } + } + return lifecycleManagers; + } + + /** + * Creates the widgets for the dynamic mapping defined in the description. + * + * @param parent + * The composite parent + * @param formContainer + * The form container + * @param dynamicMappingFor + * The root of a dynamic mapping definition + * @param variableManager + * The variable manager + * @return The list of the lifecycle manager created + */ + private List<ILifecycleManager> createDynamicMappingControl(Composite parent, IEEFFormContainer formContainer, + EEFDynamicMappingFor dynamicMappingFor, IVariableManager variableManager) { + List<ILifecycleManager> lifecycleManagers = new ArrayList<ILifecycleManager>(); + + String domainClassExpression = dynamicMappingFor.getDomainClassExpression(); + EAttribute domainClassEAttribute = EefPackage.Literals.EEF_DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION; + String iterator = dynamicMappingFor.getIterator(); + + EAttribute ifExpressionEAttribute = EefPackage.Literals.EEF_DYNAMIC_MAPPING_IF__PREDICATE_EXPRESSION; + + Object domainClassExpressionResult = new Eval(this.interpreter, variableManager).get(domainClassEAttribute, domainClassExpression, + Object.class); + for (Object object : Util.asIterable(domainClassExpressionResult, Object.class)) { + Map<String, Object> switchExpressionVariables = new HashMap<String, Object>(); + switchExpressionVariables.put(EEFExpressionUtils.SELF, variableManager.getVariables().get(EEFExpressionUtils.SELF)); + switchExpressionVariables.put(iterator, object); + + EEFWidgetDescription eefWidgetDescription = null; + List<EEFDynamicMappingIf> dynamicMappingIfs = dynamicMappingFor.getIfs(); + for (EEFDynamicMappingIf dynamicMappingIf : dynamicMappingIfs) { + Boolean isValid = new Eval(this.interpreter, switchExpressionVariables).get(ifExpressionEAttribute, + dynamicMappingIf.getPredicateExpression(), Boolean.class); + if (isValid != null && isValid.booleanValue()) { + eefWidgetDescription = dynamicMappingIf.getWidget(); + break; + } + } + + if (eefWidgetDescription != null) { + IVariableManager childVariableManager = variableManager.createChild(); + childVariableManager.put(iterator, object); + lifecycleManagers.addAll(this.createWidgetControl(parent, formContainer, eefWidgetDescription, childVariableManager)); + } + } + + return lifecycleManagers; + } +} diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFGroupLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFGroupLifecycleManager.java index da61614bd..a15ea7380 100644 --- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFGroupLifecycleManager.java +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFGroupLifecycleManager.java @@ -15,7 +15,7 @@ import com.google.common.base.Objects; import java.util.ArrayList; import java.util.List; -import org.eclipse.eef.EEFContainerDescription; +import org.eclipse.eef.EEFControlDescription; import org.eclipse.eef.EEFGroupDescription; import org.eclipse.eef.common.ui.api.EEFWidgetFactory; import org.eclipse.eef.common.ui.api.IEEFFormContainer; @@ -126,24 +126,23 @@ public class EEFGroupLifecycleManager extends AbstractEEFLifecycleManager { GridData sectionLayoutData = new GridData(GridData.FILL_HORIZONTAL); sectionLayoutData.horizontalSpan = 1; this.section.setLayoutData(sectionLayoutData); + Composite group = widgetFactory.createComposite(this.section); - GridLayout groupLayout = new GridLayout(); - groupLayout.numColumns = 1; + + // Three columns: label, help, widget + GridLayout groupLayout = new GridLayout(3, false); group.setLayout(groupLayout); this.section.setClient(group); this.controller = new EEFControllersFactory().createGroupController(this.description, this.variableManager, this.interpreter); - EEFContainerDescription containerDescription = this.description.getContainer(); - if (containerDescription != null) { - EEFContainerLifecycleManager containerLifecycleManager = new EEFContainerLifecycleManager(containerDescription, - this.variableManager.createChild(), this.interpreter, this.contextAdapter); - containerLifecycleManager.createControl(group, formContainer); - - parent.layout(); - - this.lifecycleManagers.add(containerLifecycleManager); + EEFControlSwitch eefControlSwitch = new EEFControlSwitch(this.interpreter, this.contextAdapter); + List<EEFControlDescription> controls = this.description.getControls(); + for (EEFControlDescription eefControlDescription : controls) { + this.lifecycleManagers.addAll(eefControlSwitch.doCreate(group, formContainer, eefControlDescription, this.variableManager)); } + + parent.layout(); } /** diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFLabelLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFLabelLifecycleManager.java index 8d02e07c1..c7e5e07ab 100644 --- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFLabelLifecycleManager.java +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFLabelLifecycleManager.java @@ -22,6 +22,7 @@ import org.eclipse.eef.EEFLabelStyle; import org.eclipse.eef.EEFWidgetDescription; import org.eclipse.eef.EEFWidgetStyle; import org.eclipse.eef.EefPackage; +import org.eclipse.eef.common.ui.api.EEFWidgetFactory; import org.eclipse.eef.common.ui.api.IEEFFormContainer; import org.eclipse.eef.core.api.EditingContextAdapter; import org.eclipse.eef.core.api.controllers.EEFControllersFactory; @@ -34,8 +35,6 @@ import org.eclipse.sirius.common.interpreter.api.IInterpreter; import org.eclipse.sirius.common.interpreter.api.IVariableManager; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyledText; -import org.eclipse.swt.layout.FormAttachment; -import org.eclipse.swt.layout.FormData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -86,11 +85,8 @@ public class EEFLabelLifecycleManager extends AbstractEEFWidgetLifecycleManager */ @Override protected void createMainControl(Composite parent, IEEFFormContainer formContainer) { - FormData buttonFormData = new FormData(); - buttonFormData.left = new FormAttachment(0, LABEL_WIDTH); - - this.body = new StyledText(parent, SWT.WRAP); - this.body.setLayoutData(buttonFormData); + EEFWidgetFactory widgetFactory = formContainer.getWidgetFactory(); + this.body = widgetFactory.createStyledText(parent, SWT.WRAP); this.controller = new EEFControllersFactory().createLabelController(this.description, this.variableManager, this.interpreter); } diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFRadioLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFRadioLifecycleManager.java index 07552fff4..c38566cf6 100644 --- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFRadioLifecycleManager.java +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFRadioLifecycleManager.java @@ -42,8 +42,6 @@ import org.eclipse.sirius.common.interpreter.api.IInterpreter; import org.eclipse.sirius.common.interpreter.api.IVariableManager; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.FormAttachment; -import org.eclipse.swt.layout.FormData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.FormToolkit; @@ -116,11 +114,8 @@ public class EEFRadioLifecycleManager extends AbstractEEFWidgetLifecycleManager this.radioGroupViewer.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER); widgetFactory.paintBordersFor(parent); - FormData radioGroupFormData = new FormData(); - radioGroupFormData.left = new FormAttachment(0, LABEL_WIDTH); - this.radioGroup.setLayoutData(radioGroupFormData); - - this.controller = new EEFControllersFactory().createRadioController(this.description, this.variableManager, this.interpreter, this.contextAdapter); + this.controller = new EEFControllersFactory().createRadioController(this.description, this.variableManager, this.interpreter, + this.contextAdapter); } /** diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFSelectLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFSelectLifecycleManager.java index c16b2206b..ee1c58f2d 100644 --- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFSelectLifecycleManager.java +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFSelectLifecycleManager.java @@ -44,8 +44,6 @@ import org.eclipse.sirius.common.interpreter.api.IVariableManager; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.FormAttachment; -import org.eclipse.swt.layout.FormData; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -118,12 +116,8 @@ public class EEFSelectLifecycleManager extends AbstractEEFWidgetLifecycleManager this.comboViewer.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER); widgetFactory.paintBordersFor(parent); - FormData comboFormData = new FormData(); - comboFormData.left = new FormAttachment(0, LABEL_WIDTH); - comboFormData.right = new FormAttachment(100, 0); - this.comboViewer.getCombo().setLayoutData(comboFormData); - - this.controller = new EEFControllersFactory().createSelectController(this.description, this.variableManager, this.interpreter, this.contextAdapter); + this.controller = new EEFControllersFactory().createSelectController(this.description, this.variableManager, this.interpreter, + this.contextAdapter); } /** diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFTextLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFTextLifecycleManager.java index a6f405a76..e0348633f 100644 --- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFTextLifecycleManager.java +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFTextLifecycleManager.java @@ -36,8 +36,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.layout.FormAttachment; -import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.FormToolkit; @@ -97,27 +96,25 @@ public class EEFTextLifecycleManager extends AbstractEEFWidgetLifecycleManager { protected void createMainControl(Composite parent, IEEFFormContainer formContainer) { EEFWidgetFactory widgetFactory = formContainer.getWidgetFactory(); - FormData formData = new FormData(); - formData.left = new FormAttachment(0, LABEL_WIDTH); - formData.right = new FormAttachment(100, 0); - // Get text area line count int lineCount = description.getLineCount(); // Create text or text area according to the defined line count if (lineCount > 1) { - this.text = widgetFactory.createStyledText(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.WRAP); - formData.height = lineCount * text.getLineHeight(); + this.text = widgetFactory.createStyledText(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.WRAP | SWT.MULTI); + GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, true); + gridData.minimumHeight = lineCount * text.getLineHeight(); + this.text.setLayoutData(gridData); } else { this.text = widgetFactory.createStyledText(parent, SWT.NONE); + this.text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); } this.text.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER); widgetFactory.paintBordersFor(parent); - this.text.setLayoutData(formData); - - this.controller = new EEFControllersFactory().createTextController(this.description, this.variableManager, this.interpreter, this.contextAdapter); + this.controller = new EEFControllersFactory().createTextController(this.description, this.variableManager, this.interpreter, + this.contextAdapter); } /** diff --git a/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/api/EEFTabbedPropertySheetPage.java b/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/api/EEFTabbedPropertySheetPage.java index 71fa7ddf1..d6ce7b0b3 100644 --- a/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/api/EEFTabbedPropertySheetPage.java +++ b/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/api/EEFTabbedPropertySheetPage.java @@ -456,6 +456,8 @@ public class EEFTabbedPropertySheetPage extends Page implements IPropertySheetPa * @param part * the new activated part. */ + // Used to keep the compatibility with luna + @SuppressWarnings("cast") private void handlePartActivated(IWorkbenchPart part) { EEFTabbedPropertyViewPlugin.getPlugin().debug("EEFTabbedPropertySheetPage#partActivated(...)"); //$NON-NLS-1$ diff --git a/plugins/org.eclipse.eef/model/eef.ecore b/plugins/org.eclipse.eef/model/eef.ecore index 4c2baaf54..aee6b91e0 100644 --- a/plugins/org.eclipse.eef/model/eef.ecore +++ b/plugins/org.eclipse.eef/model/eef.ecore @@ -185,10 +185,10 @@ <details key="documentation" value="Indicates if the group should be displayed."/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="container" lowerBound="1" - eType="#//EEFContainerDescription" containment="true"> + <eStructuralFeatures xsi:type="ecore:EReference" name="controls" lowerBound="1" + upperBound="-1" eType="#//EEFControlDescription" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="Contains the container related to a group."/> + <details key="documentation" value="Contains the controls related to a group."/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="semanticValidationRules" @@ -204,15 +204,17 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="EEFContainerDescription"> + <eClassifiers xsi:type="ecore:EClass" name="EEFControlDescription" abstract="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="Used to identify a specific Container in a Group."/> + <details key="documentation" value="Used to identify a specific control."/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="widgets" lowerBound="1" - upperBound="-1" eType="#//EEFWidgetDescription" containment="true"> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="EEFContainerDescription" eSuperTypes="#//EEFControlDescription"> + <eStructuralFeatures xsi:type="ecore:EReference" name="controls" lowerBound="1" + upperBound="-1" eType="#//EEFControlDescription" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="References the widgets to hold."/> </eAnnotations> @@ -223,17 +225,46 @@ <details key="documentation" value="References the dynamic mappings to hold."/> </eAnnotations> </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="layout" eType="#//EEFLayoutDescription" + containment="true"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The layout of the container."/> + </eAnnotations> + </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="EEFWidgetDescription" abstract="true"> - <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="Graphical element."/> - </eAnnotations> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> + <eClassifiers xsi:type="ecore:EClass" name="EEFLayoutDescription" abstract="true"/> + <eClassifiers xsi:type="ecore:EClass" name="EEFFillLayoutDescription" eSuperTypes="#//EEFLayoutDescription"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="orientation" eType="#//EEF_FILL_LAYOUT_ORIENTATION" + defaultValueLiteral="VERTICAL"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="Used to identify a specific widget."/> + <details key="documentation" value="The orientation of the fill layout."/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="EEFGridLayoutDescription" eSuperTypes="#//EEFLayoutDescription"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="numberOfColumns" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EInt" + defaultValueLiteral="1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The number of columns used inside the grid layout."/> </eAnnotations> </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="makeColumnsWithEqualWidth" + eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean" + defaultValueLiteral="1"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Indicates if the columns should have an equal width."/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> + <eClassifiers xsi:type="ecore:EEnum" name="EEF_FILL_LAYOUT_ORIENTATION"> + <eLiterals name="VERTICAL"/> + <eLiterals name="HORIZONTAL" value="1"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="EEFWidgetDescription" abstract="true" + eSuperTypes="#//EEFControlDescription"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Graphical element."/> + </eAnnotations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelExpression" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="The label of the Widget visible by the end-users."/> @@ -443,7 +474,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="EEFDynamicMappingFor"> + <eClassifiers xsi:type="ecore:EClass" name="EEFDynamicMappingFor" eSuperTypes="#//EEFControlDescription"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="iterator" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFButtonDescription.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFButtonDescription.java index 25d40c27a..b7a5fe8a1 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFButtonDescription.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFButtonDescription.java @@ -81,7 +81,7 @@ public interface EEFButtonDescription extends EEFWidgetDescription { /** * Returns the value of the '<em><b>Style</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc - * --> <!-- begin-model-doc --> Defines the text style <!-- end-model-doc --> + * --> <!-- begin-model-doc --> Defines the button style <!-- end-model-doc --> * * @return the value of the '<em>Style</em>' containment reference. * @see #setStyle(EEFButtonStyle) diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFCheckboxDescription.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFCheckboxDescription.java index dfbc86a1c..1e9e5560f 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFCheckboxDescription.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFCheckboxDescription.java @@ -80,7 +80,7 @@ public interface EEFCheckboxDescription extends EEFWidgetDescription { /** * Returns the value of the '<em><b>Style</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc - * --> <!-- begin-model-doc --> Defines the text style <!-- end-model-doc --> + * --> <!-- begin-model-doc --> Defines the checkbox style <!-- end-model-doc --> * * @return the value of the '<em>Style</em>' containment reference. * @see #setStyle(EEFCheckboxStyle) diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFContainerDescription.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFContainerDescription.java index 115c0a265..266382be2 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFContainerDescription.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFContainerDescription.java @@ -9,7 +9,6 @@ package org.eclipse.eef; import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>EEF Container Description</b></em>'. <!-- @@ -18,9 +17,9 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.eef.EEFContainerDescription#getIdentifier <em>Identifier</em>}</li> - * <li>{@link org.eclipse.eef.EEFContainerDescription#getWidgets <em>Widgets</em>}</li> + * <li>{@link org.eclipse.eef.EEFContainerDescription#getControls <em>Controls</em>}</li> * <li>{@link org.eclipse.eef.EEFContainerDescription#getDynamicMappings <em>Dynamic Mappings</em>}</li> + * <li>{@link org.eclipse.eef.EEFContainerDescription#getLayout <em>Layout</em>}</li> * </ul> * </p> * @@ -28,52 +27,52 @@ import org.eclipse.emf.ecore.EObject; * @model * @generated */ -public interface EEFContainerDescription extends EObject { +public interface EEFContainerDescription extends EEFControlDescription { /** - * Returns the value of the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * <!-- begin-model-doc --> Used to identify a specific Container in a Group. <!-- end-model-doc --> + * Returns the value of the '<em><b>Controls</b></em>' containment reference list. The list contents are of type + * {@link org.eclipse.eef.EEFControlDescription}. <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc + * --> References the widgets to hold. <!-- end-model-doc --> * - * @return the value of the '<em>Identifier</em>' attribute. - * @see #setIdentifier(String) - * @see org.eclipse.eef.EefPackage#getEEFContainerDescription_Identifier() - * @model required="true" + * @return the value of the '<em>Controls</em>' containment reference list. + * @see org.eclipse.eef.EefPackage#getEEFContainerDescription_Controls() + * @model containment="true" resolveProxies="true" required="true" * @generated */ - String getIdentifier(); + EList<EEFControlDescription> getControls(); /** - * Sets the value of the '{@link org.eclipse.eef.EEFContainerDescription#getIdentifier <em>Identifier</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the value of the '<em><b>Dynamic Mappings</b></em>' containment reference list. The list contents are of + * type {@link org.eclipse.eef.EEFDynamicMappingFor}. <!-- begin-user-doc --> <!-- end-user-doc --> <!-- + * begin-model-doc --> References the dynamic mappings to hold. <!-- end-model-doc --> * - * @param value - * the new value of the '<em>Identifier</em>' attribute. - * @see #getIdentifier() + * @return the value of the '<em>Dynamic Mappings</em>' containment reference list. + * @see org.eclipse.eef.EefPackage#getEEFContainerDescription_DynamicMappings() + * @model containment="true" resolveProxies="true" * @generated */ - void setIdentifier(String value); + EList<EEFDynamicMappingFor> getDynamicMappings(); /** - * Returns the value of the '<em><b>Widgets</b></em>' containment reference list. The list contents are of type - * {@link org.eclipse.eef.EEFWidgetDescription}. <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc - * --> References the widgets to hold. <!-- end-model-doc --> + * Returns the value of the '<em><b>Layout</b></em>' containment reference. <!-- begin-user-doc --> <!-- + * end-user-doc --> <!-- begin-model-doc --> The layout of the container. <!-- end-model-doc --> * - * @return the value of the '<em>Widgets</em>' containment reference list. - * @see org.eclipse.eef.EefPackage#getEEFContainerDescription_Widgets() - * @model containment="true" resolveProxies="true" required="true" + * @return the value of the '<em>Layout</em>' containment reference. + * @see #setLayout(EEFLayoutDescription) + * @see org.eclipse.eef.EefPackage#getEEFContainerDescription_Layout() + * @model containment="true" resolveProxies="true" * @generated */ - EList<EEFWidgetDescription> getWidgets(); + EEFLayoutDescription getLayout(); /** - * Returns the value of the '<em><b>Dynamic Mappings</b></em>' containment reference list. The list contents are of - * type {@link org.eclipse.eef.EEFDynamicMappingFor}. <!-- begin-user-doc --> <!-- end-user-doc --> <!-- - * begin-model-doc --> References the dynamic mappings to hold. <!-- end-model-doc --> + * Sets the value of the '{@link org.eclipse.eef.EEFContainerDescription#getLayout <em>Layout</em>}' containment + * reference. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @return the value of the '<em>Dynamic Mappings</em>' containment reference list. - * @see org.eclipse.eef.EefPackage#getEEFContainerDescription_DynamicMappings() - * @model containment="true" resolveProxies="true" + * @param value + * the new value of the '<em>Layout</em>' containment reference. + * @see #getLayout() * @generated */ - EList<EEFDynamicMappingFor> getDynamicMappings(); + void setLayout(EEFLayoutDescription value); } // EEFContainerDescription diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFControlDescription.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFControlDescription.java new file mode 100644 index 000000000..9d2f4529c --- /dev/null +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFControlDescription.java @@ -0,0 +1,52 @@ +/** + * Copyright (c) 2015 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.htm + * Contributors: Obeo - initial API and implementation + */ +package org.eclipse.eef; + +import org.eclipse.emf.ecore.EObject; + +/** + * <!-- begin-user-doc --> A representation of the model object '<em><b>EEF Control Description</b></em>'. <!-- + * end-user-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.eef.EEFControlDescription#getIdentifier <em>Identifier</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.eef.EefPackage#getEEFControlDescription() + * @model abstract="true" + * @generated + */ +public interface EEFControlDescription extends EObject { + /** + * Returns the value of the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * <!-- begin-model-doc --> Used to identify a specific control. <!-- end-model-doc --> + * + * @return the value of the '<em>Identifier</em>' attribute. + * @see #setIdentifier(String) + * @see org.eclipse.eef.EefPackage#getEEFControlDescription_Identifier() + * @model required="true" + * @generated + */ + String getIdentifier(); + + /** + * Sets the value of the '{@link org.eclipse.eef.EEFControlDescription#getIdentifier <em>Identifier</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Identifier</em>' attribute. + * @see #getIdentifier() + * @generated + */ + void setIdentifier(String value); + +} // EEFControlDescription diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFCustomExpression.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFCustomExpression.java index 1bf18e9cb..1caed3c4b 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFCustomExpression.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFCustomExpression.java @@ -52,7 +52,7 @@ public interface EEFCustomExpression extends EObject { /** * Returns the value of the '<em><b>Custom Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc - * --> <!-- begin-model-doc --> The label of the Widget visible by the end-users. <!-- end-model-doc --> + * --> <!-- begin-model-doc --> Defines the behavior associated to a custom expression. <!-- end-model-doc --> * * @return the value of the '<em>Custom Expression</em>' attribute. * @see #setCustomExpression(String) diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFCustomWidgetDescription.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFCustomWidgetDescription.java index b6af1e736..cc1bc22c4 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFCustomWidgetDescription.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFCustomWidgetDescription.java @@ -51,7 +51,7 @@ public interface EEFCustomWidgetDescription extends EEFWidgetDescription { * --> <!-- begin-model-doc --> Defines the custom widget style <!-- end-model-doc --> * * @return the value of the '<em>Style</em>' containment reference. - * @see #setStyle(EEFCustomStyle) + * @see #setStyle(EEFCustomWidgetStyle) * @see org.eclipse.eef.EefPackage#getEEFCustomWidgetDescription_Style() * @model containment="true" resolveProxies="true" * @generated diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFDynamicMappingFor.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFDynamicMappingFor.java index e863b623d..3308f4ce4 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFDynamicMappingFor.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFDynamicMappingFor.java @@ -9,7 +9,6 @@ package org.eclipse.eef; import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>EEF Dynamic Mapping For</b></em>'. <!-- @@ -28,7 +27,7 @@ import org.eclipse.emf.ecore.EObject; * @model * @generated */ -public interface EEFDynamicMappingFor extends EObject { +public interface EEFDynamicMappingFor extends EEFControlDescription { /** * Returns the value of the '<em><b>Iterator</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!-- * begin-model-doc --> The name of the variable which contain the current value of the iteration. <!-- end-model-doc diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFFillLayoutDescription.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFFillLayoutDescription.java new file mode 100644 index 000000000..0cd7b9f66 --- /dev/null +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFFillLayoutDescription.java @@ -0,0 +1,53 @@ +/** + * Copyright (c) 2015 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.htm + * Contributors: Obeo - initial API and implementation + */ +package org.eclipse.eef; + +/** + * <!-- begin-user-doc --> A representation of the model object '<em><b>EEF Fill Layout Description</b></em>'. <!-- + * end-user-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.eef.EEFFillLayoutDescription#getOrientation <em>Orientation</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.eef.EefPackage#getEEFFillLayoutDescription() + * @model + * @generated + */ +public interface EEFFillLayoutDescription extends EEFLayoutDescription { + /** + * Returns the value of the '<em><b>Orientation</b></em>' attribute. The default value is <code>"VERTICAL"</code>. + * The literals are from the enumeration {@link org.eclipse.eef.EEF_FILL_LAYOUT_ORIENTATION}. <!-- begin-user-doc + * --> <!-- end-user-doc --> <!-- begin-model-doc --> The orientation of the fill layout. <!-- end-model-doc --> + * + * @return the value of the '<em>Orientation</em>' attribute. + * @see org.eclipse.eef.EEF_FILL_LAYOUT_ORIENTATION + * @see #setOrientation(EEF_FILL_LAYOUT_ORIENTATION) + * @see org.eclipse.eef.EefPackage#getEEFFillLayoutDescription_Orientation() + * @model default="VERTICAL" + * @generated + */ + EEF_FILL_LAYOUT_ORIENTATION getOrientation(); + + /** + * Sets the value of the '{@link org.eclipse.eef.EEFFillLayoutDescription#getOrientation <em>Orientation</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Orientation</em>' attribute. + * @see org.eclipse.eef.EEF_FILL_LAYOUT_ORIENTATION + * @see #getOrientation() + * @generated + */ + void setOrientation(EEF_FILL_LAYOUT_ORIENTATION value); + +} // EEFFillLayoutDescription diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFGridLayoutDescription.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFGridLayoutDescription.java new file mode 100644 index 000000000..638cada1a --- /dev/null +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFGridLayoutDescription.java @@ -0,0 +1,77 @@ +/** + * Copyright (c) 2015 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.htm + * Contributors: Obeo - initial API and implementation + */ +package org.eclipse.eef; + +/** + * <!-- begin-user-doc --> A representation of the model object '<em><b>EEF Grid Layout Description</b></em>'. <!-- + * end-user-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.eef.EEFGridLayoutDescription#getNumberOfColumns <em>Number Of Columns</em>}</li> + * <li>{@link org.eclipse.eef.EEFGridLayoutDescription#isMakeColumnsWithEqualWidth <em>Make Columns With Equal Width + * </em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.eef.EefPackage#getEEFGridLayoutDescription() + * @model + * @generated + */ +public interface EEFGridLayoutDescription extends EEFLayoutDescription { + /** + * Returns the value of the '<em><b>Number Of Columns</b></em>' attribute. The default value is <code>"1"</code>. + * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> The number of columns used inside the grid + * layout. <!-- end-model-doc --> + * + * @return the value of the '<em>Number Of Columns</em>' attribute. + * @see #setNumberOfColumns(int) + * @see org.eclipse.eef.EefPackage#getEEFGridLayoutDescription_NumberOfColumns() + * @model default="1" + * @generated + */ + int getNumberOfColumns(); + + /** + * Sets the value of the '{@link org.eclipse.eef.EEFGridLayoutDescription#getNumberOfColumns + * <em>Number Of Columns</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Number Of Columns</em>' attribute. + * @see #getNumberOfColumns() + * @generated + */ + void setNumberOfColumns(int value); + + /** + * Returns the value of the '<em><b>Make Columns With Equal Width</b></em>' attribute. The default value is + * <code>"1"</code>. <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> Indicates if the columns + * should have an equal width. <!-- end-model-doc --> + * + * @return the value of the '<em>Make Columns With Equal Width</em>' attribute. + * @see #setMakeColumnsWithEqualWidth(boolean) + * @see org.eclipse.eef.EefPackage#getEEFGridLayoutDescription_MakeColumnsWithEqualWidth() + * @model default="1" + * @generated + */ + boolean isMakeColumnsWithEqualWidth(); + + /** + * Sets the value of the '{@link org.eclipse.eef.EEFGridLayoutDescription#isMakeColumnsWithEqualWidth + * <em>Make Columns With Equal Width</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Make Columns With Equal Width</em>' attribute. + * @see #isMakeColumnsWithEqualWidth() + * @generated + */ + void setMakeColumnsWithEqualWidth(boolean value); + +} // EEFGridLayoutDescription diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFGroupDescription.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFGroupDescription.java index 5dfc98608..1b60d7526 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFGroupDescription.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFGroupDescription.java @@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject; * <li>{@link org.eclipse.eef.EEFGroupDescription#getSemanticCandidateExpression <em>Semantic Candidate Expression</em>} * </li> * <li>{@link org.eclipse.eef.EEFGroupDescription#getPreconditionExpression <em>Precondition Expression</em>}</li> - * <li>{@link org.eclipse.eef.EEFGroupDescription#getContainer <em>Container</em>}</li> + * <li>{@link org.eclipse.eef.EEFGroupDescription#getControls <em>Controls</em>}</li> * <li>{@link org.eclipse.eef.EEFGroupDescription#getSemanticValidationRules <em>Semantic Validation Rules</em>}</li> * <li>{@link org.eclipse.eef.EEFGroupDescription#getPropertyValidationRules <em>Property Validation Rules</em>}</li> * </ul> @@ -153,27 +153,16 @@ public interface EEFGroupDescription extends EObject { void setPreconditionExpression(String value); /** - * Returns the value of the '<em><b>Container</b></em>' containment reference. <!-- begin-user-doc --> <!-- - * end-user-doc --> <!-- begin-model-doc --> Contains the container related to a group. <!-- end-model-doc --> + * Returns the value of the '<em><b>Controls</b></em>' containment reference list. The list contents are of type + * {@link org.eclipse.eef.EEFControlDescription}. <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc + * --> Contains the controls related to a group. <!-- end-model-doc --> * - * @return the value of the '<em>Container</em>' containment reference. - * @see #setContainer(EEFContainerDescription) - * @see org.eclipse.eef.EefPackage#getEEFGroupDescription_Container() + * @return the value of the '<em>Controls</em>' containment reference list. + * @see org.eclipse.eef.EefPackage#getEEFGroupDescription_Controls() * @model containment="true" resolveProxies="true" required="true" * @generated */ - EEFContainerDescription getContainer(); - - /** - * Sets the value of the '{@link org.eclipse.eef.EEFGroupDescription#getContainer <em>Container</em>}' containment - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Container</em>' containment reference. - * @see #getContainer() - * @generated - */ - void setContainer(EEFContainerDescription value); + EList<EEFControlDescription> getControls(); /** * Returns the value of the '<em><b>Semantic Validation Rules</b></em>' containment reference list. The list diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFLabelDescription.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFLabelDescription.java index b4c527f93..07a80759a 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFLabelDescription.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFLabelDescription.java @@ -55,10 +55,10 @@ public interface EEFLabelDescription extends EEFWidgetDescription { /** * Returns the value of the '<em><b>Style</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc - * --> <!-- begin-model-doc --> Defines the text style <!-- end-model-doc --> + * --> <!-- begin-model-doc --> Defines the label style <!-- end-model-doc --> * * @return the value of the '<em>Style</em>' containment reference. - * @see #setStyle(EEFTextStyle) + * @see #setStyle(EEFLabelStyle) * @see org.eclipse.eef.EefPackage#getEEFLabelDescription_Style() * @model containment="true" resolveProxies="true" * @generated @@ -78,7 +78,7 @@ public interface EEFLabelDescription extends EEFWidgetDescription { /** * Returns the value of the '<em><b>Conditional Styles</b></em>' containment reference list. The list contents are - * of type {@link org.eclipse.eef.EEFButtonConditionalStyle}. <!-- begin-user-doc --> <!-- end-user-doc --> <!-- + * of type {@link org.eclipse.eef.EEFLabelConditionalStyle}. <!-- begin-user-doc --> <!-- end-user-doc --> <!-- * begin-model-doc --> Defines the label style associated to a precondition <!-- end-model-doc --> * * @return the value of the '<em>Conditional Styles</em>' containment reference list. diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFLayoutDescription.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFLayoutDescription.java new file mode 100644 index 000000000..800f2b568 --- /dev/null +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFLayoutDescription.java @@ -0,0 +1,23 @@ +/** + * Copyright (c) 2015 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.htm + * Contributors: Obeo - initial API and implementation + */ +package org.eclipse.eef; + +import org.eclipse.emf.ecore.EObject; + +/** + * <!-- begin-user-doc --> A representation of the model object '<em><b>EEF Layout Description</b></em>'. <!-- + * end-user-doc --> + * + * + * @see org.eclipse.eef.EefPackage#getEEFLayoutDescription() + * @model abstract="true" + * @generated + */ +public interface EEFLayoutDescription extends EObject { +} // EEFLayoutDescription diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFPropertyValidationRuleDescription.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFPropertyValidationRuleDescription.java index 66e1c291a..44d3b8fbd 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFPropertyValidationRuleDescription.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFPropertyValidationRuleDescription.java @@ -30,7 +30,7 @@ public interface EEFPropertyValidationRuleDescription extends EEFValidationRuleD * Returns the value of the '<em><b>Targets</b></em>' reference list. The list contents are of type * {@link org.eclipse.eef.EEFWidgetDescription}. It is bidirectional and its opposite is ' * {@link org.eclipse.eef.EEFWidgetDescription#getPropertyValidationRules <em>Property Validation Rules</em>}'. <!-- - * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> The widgets involved in this validation rules. + * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> The widgets involved in this validation rule. * <!-- end-model-doc --> * * @return the value of the '<em>Targets</em>' reference list. diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFSelectDescription.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFSelectDescription.java index 640b1fcc5..f1708ec99 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFSelectDescription.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFSelectDescription.java @@ -129,7 +129,7 @@ public interface EEFSelectDescription extends EEFWidgetDescription { /** * Returns the value of the '<em><b>Style</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc - * --> <!-- begin-model-doc --> Defines the text style <!-- end-model-doc --> + * --> <!-- begin-model-doc --> Defines the select style <!-- end-model-doc --> * * @return the value of the '<em>Style</em>' containment reference. * @see #setStyle(EEFSelectStyle) diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFTextDescription.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFTextDescription.java index a5458b66e..12afe1b56 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFTextDescription.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFTextDescription.java @@ -104,12 +104,8 @@ public interface EEFTextDescription extends EEFWidgetDescription { void setLineCount(int value); /** - * Returns the value of the '<em><b>Style</b></em>' containment reference. <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Style</em>' containment reference isn't clear, there really should be more of a - * description here... - * </p> - * <!-- end-user-doc --> <!-- begin-model-doc --> Defines the text style <!-- end-model-doc --> + * Returns the value of the '<em><b>Style</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc + * --> <!-- begin-model-doc --> Defines the text style <!-- end-model-doc --> * * @return the value of the '<em>Style</em>' containment reference. * @see #setStyle(EEFTextStyle) diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFTextStyle.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFTextStyle.java index c82455bfc..62c244f21 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFTextStyle.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFTextStyle.java @@ -30,13 +30,9 @@ package org.eclipse.eef; */ public interface EEFTextStyle extends EEFWidgetStyle { /** - * Returns the value of the '<em><b>Background Color Expression</b></em>' attribute. <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Background Color Expression</em>' attribute isn't clear, there really should be more - * of a description here... - * </p> - * <!-- end-user-doc --> <!-- begin-model-doc --> Defines the background color of the widget. It must be defined as - * hex (#000000) or RGB (rgb(0,0,0)). <!-- end-model-doc --> + * Returns the value of the '<em><b>Background Color Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> <!-- begin-model-doc --> Defines the background color of the widget. It must be defined as hex + * (#000000) or RGB (rgb(0,0,0)). <!-- end-model-doc --> * * @return the value of the '<em>Background Color Expression</em>' attribute. * @see #setBackgroundColorExpression(String) diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFWidgetDescription.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFWidgetDescription.java index bc05d8d80..9d7cf5cc3 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFWidgetDescription.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFWidgetDescription.java @@ -9,7 +9,6 @@ package org.eclipse.eef; import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>EEF Widget Description</b></em>'. <!-- @@ -20,7 +19,6 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.eef.EEFWidgetDescription#getIdentifier <em>Identifier</em>}</li> * <li>{@link org.eclipse.eef.EEFWidgetDescription#getLabelExpression <em>Label Expression</em>}</li> * <li>{@link org.eclipse.eef.EEFWidgetDescription#getHelpExpression <em>Help Expression</em>}</li> * <li>{@link org.eclipse.eef.EEFWidgetDescription#getPropertyValidationRules <em>Property Validation Rules</em>}</li> @@ -31,30 +29,7 @@ import org.eclipse.emf.ecore.EObject; * @model abstract="true" * @generated */ -public interface EEFWidgetDescription extends EObject { - /** - * Returns the value of the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * <!-- begin-model-doc --> Used to identify a specific widget. <!-- end-model-doc --> - * - * @return the value of the '<em>Identifier</em>' attribute. - * @see #setIdentifier(String) - * @see org.eclipse.eef.EefPackage#getEEFWidgetDescription_Identifier() - * @model required="true" - * @generated - */ - String getIdentifier(); - - /** - * Sets the value of the '{@link org.eclipse.eef.EEFWidgetDescription#getIdentifier <em>Identifier</em>}' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Identifier</em>' attribute. - * @see #getIdentifier() - * @generated - */ - void setIdentifier(String value); - +public interface EEFWidgetDescription extends EEFControlDescription { /** * Returns the value of the '<em><b>Label Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> <!-- begin-model-doc --> The label of the Widget visible by the end-users. <!-- end-model-doc --> diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFWidgetStyle.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFWidgetStyle.java index 145d75246..54d3870df 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFWidgetStyle.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFWidgetStyle.java @@ -14,13 +14,26 @@ import org.eclipse.emf.ecore.EObject; * <!-- begin-user-doc --> A representation of the model object '<em><b>EEF Widget Style</b></em>'. <!-- end-user-doc * --> * + * <!-- begin-model-doc --> Represents a style that can be applied on widgets. <!-- end-model-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.eef.EEFWidgetStyle#getLabelBackgroundColorExpression <em>Label Background Color Expression + * </em>}</li> + * <li>{@link org.eclipse.eef.EEFWidgetStyle#getLabelForegroundColorExpression <em>Label Foreground Color Expression + * </em>}</li> + * <li>{@link org.eclipse.eef.EEFWidgetStyle#getLabelFontNameExpression <em>Label Font Name Expression</em>}</li> + * <li>{@link org.eclipse.eef.EEFWidgetStyle#getLabelFontSizeExpression <em>Label Font Size Expression</em>}</li> + * <li>{@link org.eclipse.eef.EEFWidgetStyle#getLabelFontStyleExpression <em>Label Font Style Expression</em>}</li> + * </ul> + * </p> * * @see org.eclipse.eef.EefPackage#getEEFWidgetStyle() - * @model + * @model abstract="true" * @generated */ public interface EEFWidgetStyle extends EObject { - /** * Returns the value of the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc --> * <!-- end-user-doc --> <!-- begin-model-doc --> Defines the background color of the widget. It must be defined as @@ -137,4 +150,5 @@ public interface EEFWidgetStyle extends EObject { * @generated */ void setLabelFontStyleExpression(String value); + } // EEFWidgetStyle diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEF_FILL_LAYOUT_ORIENTATION.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEF_FILL_LAYOUT_ORIENTATION.java new file mode 100644 index 000000000..ca9f0d643 --- /dev/null +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEF_FILL_LAYOUT_ORIENTATION.java @@ -0,0 +1,210 @@ +/** + * Copyright (c) 2015 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.htm + * Contributors: Obeo - initial API and implementation + */ +package org.eclipse.eef; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.eclipse.emf.common.util.Enumerator; + +/** + * <!-- begin-user-doc --> A representation of the literals of the enumeration ' + * <em><b>EEF FILL LAYOUT ORIENTATION</b></em>', and utility methods for working with them. <!-- end-user-doc --> + * + * @see org.eclipse.eef.EefPackage#getEEF_FILL_LAYOUT_ORIENTATION() + * @model + * @generated + */ +public enum EEF_FILL_LAYOUT_ORIENTATION implements Enumerator { + /** + * The '<em><b>VERTICAL</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #VERTICAL_VALUE + * @generated + * @ordered + */ + VERTICAL(0, "VERTICAL", "VERTICAL"), //$NON-NLS-1$ //$NON-NLS-2$ + + /** + * The '<em><b>HORIZONTAL</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #HORIZONTAL_VALUE + * @generated + * @ordered + */ + HORIZONTAL(1, "HORIZONTAL", "HORIZONTAL"); //$NON-NLS-1$ //$NON-NLS-2$ + + /** + * The '<em><b>VERTICAL</b></em>' literal value. <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>VERTICAL</b></em>' literal object isn't clear, there really should be more of a + * description here... + * </p> + * <!-- end-user-doc --> + * + * @see #VERTICAL + * @model + * @generated + * @ordered + */ + public static final int VERTICAL_VALUE = 0; + + /** + * The '<em><b>HORIZONTAL</b></em>' literal value. <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>HORIZONTAL</b></em>' literal object isn't clear, there really should be more of a + * description here... + * </p> + * <!-- end-user-doc --> + * + * @see #HORIZONTAL + * @model + * @generated + * @ordered + */ + public static final int HORIZONTAL_VALUE = 1; + + /** + * An array of all the '<em><b>EEF FILL LAYOUT ORIENTATION</b></em>' enumerators. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @generated + */ + private static final EEF_FILL_LAYOUT_ORIENTATION[] VALUES_ARRAY = new EEF_FILL_LAYOUT_ORIENTATION[] { VERTICAL, HORIZONTAL, }; + + /** + * A public read-only list of all the '<em><b>EEF FILL LAYOUT ORIENTATION</b></em>' enumerators. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @generated + */ + public static final List<EEF_FILL_LAYOUT_ORIENTATION> VALUES = Collections.unmodifiableList(Arrays + .asList(EEF_FILL_LAYOUT_ORIENTATION.VALUES_ARRAY)); + + /** + * Returns the '<em><b>EEF FILL LAYOUT ORIENTATION</b></em>' literal with the specified literal value. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public static EEF_FILL_LAYOUT_ORIENTATION get(String literal) { + for (EEF_FILL_LAYOUT_ORIENTATION result : EEF_FILL_LAYOUT_ORIENTATION.VALUES_ARRAY) { + if (result.toString().equals(literal)) { + return result; + } + } + return null; + } + + /** + * Returns the '<em><b>EEF FILL LAYOUT ORIENTATION</b></em>' literal with the specified name. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @generated + */ + public static EEF_FILL_LAYOUT_ORIENTATION getByName(String name) { + for (EEF_FILL_LAYOUT_ORIENTATION result : EEF_FILL_LAYOUT_ORIENTATION.VALUES_ARRAY) { + if (result.getName().equals(name)) { + return result; + } + } + return null; + } + + /** + * Returns the '<em><b>EEF FILL LAYOUT ORIENTATION</b></em>' literal with the specified integer value. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public static EEF_FILL_LAYOUT_ORIENTATION get(int value) { + switch (value) { + case VERTICAL_VALUE: + return VERTICAL; + case HORIZONTAL_VALUE: + return HORIZONTAL; + } + return null; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + private final int value; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + private final String name; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + private final String literal; + + /** + * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + private EEF_FILL_LAYOUT_ORIENTATION(int value, String name, String literal) { + this.value = value; + this.name = name; + this.literal = literal; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public int getValue() { + return value; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public String getName() { + return name; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public String getLiteral() { + return literal; + } + + /** + * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @generated + */ + @Override + public String toString() { + return literal; + } + +} // EEF_FILL_LAYOUT_ORIENTATION diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EefFactory.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EefFactory.java index b8179eb4c..f76876fa7 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EefFactory.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EefFactory.java @@ -94,6 +94,24 @@ public interface EefFactory extends EFactory { EEFContainerDescription createEEFContainerDescription(); /** + * Returns a new object of class '<em>EEF Fill Layout Description</em>'. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @return a new object of class '<em>EEF Fill Layout Description</em>'. + * @generated + */ + EEFFillLayoutDescription createEEFFillLayoutDescription(); + + /** + * Returns a new object of class '<em>EEF Grid Layout Description</em>'. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @return a new object of class '<em>EEF Grid Layout Description</em>'. + * @generated + */ + EEFGridLayoutDescription createEEFGridLayoutDescription(); + + /** * Returns a new object of class '<em>EEF Text Description</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return a new object of class '<em>EEF Text Description</em>'. diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EefPackage.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EefPackage.java index 88e837660..3f903e0b8 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EefPackage.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EefPackage.java @@ -502,13 +502,13 @@ public interface EefPackage extends EPackage { int EEF_GROUP_DESCRIPTION__PRECONDITION_EXPRESSION = 4; /** - * The feature id for the '<em><b>Container</b></em>' containment reference. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Controls</b></em>' containment reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> * * @generated * @ordered */ - int EEF_GROUP_DESCRIPTION__CONTAINER = 5; + int EEF_GROUP_DESCRIPTION__CONTROLS = 5; /** * The feature id for the '<em><b>Semantic Validation Rules</b></em>' containment reference list. <!-- @@ -538,6 +538,33 @@ public interface EefPackage extends EPackage { int EEF_GROUP_DESCRIPTION_FEATURE_COUNT = 8; /** + * The meta object id for the '{@link org.eclipse.eef.impl.EEFControlDescriptionImpl + * <em>EEF Control Description</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.eef.impl.EEFControlDescriptionImpl + * @see org.eclipse.eef.impl.EefPackageImpl#getEEFControlDescription() + * @generated + */ + int EEF_CONTROL_DESCRIPTION = 8; + + /** + * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int EEF_CONTROL_DESCRIPTION__IDENTIFIER = 0; + + /** + * The number of structural features of the '<em>EEF Control Description</em>' class. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @generated + * @ordered + */ + int EEF_CONTROL_DESCRIPTION_FEATURE_COUNT = 1; + + /** * The meta object id for the '{@link org.eclipse.eef.impl.EEFContainerDescriptionImpl * <em>EEF Container Description</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -545,7 +572,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFContainerDescription() * @generated */ - int EEF_CONTAINER_DESCRIPTION = 8; + int EEF_CONTAINER_DESCRIPTION = 9; /** * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -553,16 +580,16 @@ public interface EefPackage extends EPackage { * @generated * @ordered */ - int EEF_CONTAINER_DESCRIPTION__IDENTIFIER = 0; + int EEF_CONTAINER_DESCRIPTION__IDENTIFIER = EefPackage.EEF_CONTROL_DESCRIPTION__IDENTIFIER; /** - * The feature id for the '<em><b>Widgets</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Controls</b></em>' containment reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> * * @generated * @ordered */ - int EEF_CONTAINER_DESCRIPTION__WIDGETS = 1; + int EEF_CONTAINER_DESCRIPTION__CONTROLS = EefPackage.EEF_CONTROL_DESCRIPTION_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Dynamic Mappings</b></em>' containment reference list. <!-- begin-user-doc --> @@ -571,7 +598,16 @@ public interface EefPackage extends EPackage { * @generated * @ordered */ - int EEF_CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS = 2; + int EEF_CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS = EefPackage.EEF_CONTROL_DESCRIPTION_FEATURE_COUNT + 1; + + /** + * The feature id for the '<em><b>Layout</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @generated + * @ordered + */ + int EEF_CONTAINER_DESCRIPTION__LAYOUT = EefPackage.EEF_CONTROL_DESCRIPTION_FEATURE_COUNT + 2; /** * The number of structural features of the '<em>EEF Container Description</em>' class. <!-- begin-user-doc --> <!-- @@ -580,7 +616,90 @@ public interface EefPackage extends EPackage { * @generated * @ordered */ - int EEF_CONTAINER_DESCRIPTION_FEATURE_COUNT = 3; + int EEF_CONTAINER_DESCRIPTION_FEATURE_COUNT = EefPackage.EEF_CONTROL_DESCRIPTION_FEATURE_COUNT + 3; + + /** + * The meta object id for the '{@link org.eclipse.eef.impl.EEFLayoutDescriptionImpl <em>EEF Layout Description</em>} + * ' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.eef.impl.EEFLayoutDescriptionImpl + * @see org.eclipse.eef.impl.EefPackageImpl#getEEFLayoutDescription() + * @generated + */ + int EEF_LAYOUT_DESCRIPTION = 10; + + /** + * The number of structural features of the '<em>EEF Layout Description</em>' class. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @generated + * @ordered + */ + int EEF_LAYOUT_DESCRIPTION_FEATURE_COUNT = 0; + + /** + * The meta object id for the '{@link org.eclipse.eef.impl.EEFFillLayoutDescriptionImpl + * <em>EEF Fill Layout Description</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.eef.impl.EEFFillLayoutDescriptionImpl + * @see org.eclipse.eef.impl.EefPackageImpl#getEEFFillLayoutDescription() + * @generated + */ + int EEF_FILL_LAYOUT_DESCRIPTION = 11; + + /** + * The feature id for the '<em><b>Orientation</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int EEF_FILL_LAYOUT_DESCRIPTION__ORIENTATION = EefPackage.EEF_LAYOUT_DESCRIPTION_FEATURE_COUNT + 0; + + /** + * The number of structural features of the '<em>EEF Fill Layout Description</em>' class. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int EEF_FILL_LAYOUT_DESCRIPTION_FEATURE_COUNT = EefPackage.EEF_LAYOUT_DESCRIPTION_FEATURE_COUNT + 1; + + /** + * The meta object id for the '{@link org.eclipse.eef.impl.EEFGridLayoutDescriptionImpl + * <em>EEF Grid Layout Description</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.eef.impl.EEFGridLayoutDescriptionImpl + * @see org.eclipse.eef.impl.EefPackageImpl#getEEFGridLayoutDescription() + * @generated + */ + int EEF_GRID_LAYOUT_DESCRIPTION = 12; + + /** + * The feature id for the '<em><b>Number Of Columns</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @generated + * @ordered + */ + int EEF_GRID_LAYOUT_DESCRIPTION__NUMBER_OF_COLUMNS = EefPackage.EEF_LAYOUT_DESCRIPTION_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Make Columns With Equal Width</b></em>' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @generated + * @ordered + */ + int EEF_GRID_LAYOUT_DESCRIPTION__MAKE_COLUMNS_WITH_EQUAL_WIDTH = EefPackage.EEF_LAYOUT_DESCRIPTION_FEATURE_COUNT + 1; + + /** + * The number of structural features of the '<em>EEF Grid Layout Description</em>' class. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int EEF_GRID_LAYOUT_DESCRIPTION_FEATURE_COUNT = EefPackage.EEF_LAYOUT_DESCRIPTION_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.eef.impl.EEFWidgetDescriptionImpl <em>EEF Widget Description</em>} @@ -590,7 +709,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFWidgetDescription() * @generated */ - int EEF_WIDGET_DESCRIPTION = 9; + int EEF_WIDGET_DESCRIPTION = 13; /** * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -598,7 +717,7 @@ public interface EefPackage extends EPackage { * @generated * @ordered */ - int EEF_WIDGET_DESCRIPTION__IDENTIFIER = 0; + int EEF_WIDGET_DESCRIPTION__IDENTIFIER = EefPackage.EEF_CONTROL_DESCRIPTION__IDENTIFIER; /** * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc @@ -607,7 +726,7 @@ public interface EefPackage extends EPackage { * @generated * @ordered */ - int EEF_WIDGET_DESCRIPTION__LABEL_EXPRESSION = 1; + int EEF_WIDGET_DESCRIPTION__LABEL_EXPRESSION = EefPackage.EEF_CONTROL_DESCRIPTION_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Help Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -615,7 +734,7 @@ public interface EefPackage extends EPackage { * @generated * @ordered */ - int EEF_WIDGET_DESCRIPTION__HELP_EXPRESSION = 2; + int EEF_WIDGET_DESCRIPTION__HELP_EXPRESSION = EefPackage.EEF_CONTROL_DESCRIPTION_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Property Validation Rules</b></em>' reference list. <!-- begin-user-doc --> <!-- @@ -624,7 +743,7 @@ public interface EefPackage extends EPackage { * @generated * @ordered */ - int EEF_WIDGET_DESCRIPTION__PROPERTY_VALIDATION_RULES = 3; + int EEF_WIDGET_DESCRIPTION__PROPERTY_VALIDATION_RULES = EefPackage.EEF_CONTROL_DESCRIPTION_FEATURE_COUNT + 2; /** * The number of structural features of the '<em>EEF Widget Description</em>' class. <!-- begin-user-doc --> <!-- @@ -633,7 +752,7 @@ public interface EefPackage extends EPackage { * @generated * @ordered */ - int EEF_WIDGET_DESCRIPTION_FEATURE_COUNT = 4; + int EEF_WIDGET_DESCRIPTION_FEATURE_COUNT = EefPackage.EEF_CONTROL_DESCRIPTION_FEATURE_COUNT + 3; /** * The meta object id for the '{@link org.eclipse.eef.impl.EEFTextDescriptionImpl <em>EEF Text Description</em>}' @@ -643,7 +762,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFTextDescription() * @generated */ - int EEF_TEXT_DESCRIPTION = 10; + int EEF_TEXT_DESCRIPTION = 14; /** * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -739,7 +858,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFLabelDescription() * @generated */ - int EEF_LABEL_DESCRIPTION = 11; + int EEF_LABEL_DESCRIPTION = 15; /** * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -818,7 +937,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFButtonDescription() * @generated */ - int EEF_BUTTON_DESCRIPTION = 12; + int EEF_BUTTON_DESCRIPTION = 16; /** * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -906,7 +1025,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFCheckboxDescription() * @generated */ - int EEF_CHECKBOX_DESCRIPTION = 13; + int EEF_CHECKBOX_DESCRIPTION = 17; /** * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -994,7 +1113,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFSelectDescription() * @generated */ - int EEF_SELECT_DESCRIPTION = 14; + int EEF_SELECT_DESCRIPTION = 18; /** * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -1100,7 +1219,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFRadioDescription() * @generated */ - int EEF_RADIO_DESCRIPTION = 15; + int EEF_RADIO_DESCRIPTION = 19; /** * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -1215,7 +1334,15 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFDynamicMappingFor() * @generated */ - int EEF_DYNAMIC_MAPPING_FOR = 16; + int EEF_DYNAMIC_MAPPING_FOR = 20; + + /** + * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int EEF_DYNAMIC_MAPPING_FOR__IDENTIFIER = EefPackage.EEF_CONTROL_DESCRIPTION__IDENTIFIER; /** * The feature id for the '<em><b>Iterator</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -1223,7 +1350,7 @@ public interface EefPackage extends EPackage { * @generated * @ordered */ - int EEF_DYNAMIC_MAPPING_FOR__ITERATOR = 0; + int EEF_DYNAMIC_MAPPING_FOR__ITERATOR = EefPackage.EEF_CONTROL_DESCRIPTION_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Domain Class Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- @@ -1232,7 +1359,7 @@ public interface EefPackage extends EPackage { * @generated * @ordered */ - int EEF_DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION = 1; + int EEF_DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION = EefPackage.EEF_CONTROL_DESCRIPTION_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Ifs</b></em>' containment reference list. <!-- begin-user-doc --> <!-- @@ -1241,7 +1368,7 @@ public interface EefPackage extends EPackage { * @generated * @ordered */ - int EEF_DYNAMIC_MAPPING_FOR__IFS = 2; + int EEF_DYNAMIC_MAPPING_FOR__IFS = EefPackage.EEF_CONTROL_DESCRIPTION_FEATURE_COUNT + 2; /** * The number of structural features of the '<em>EEF Dynamic Mapping For</em>' class. <!-- begin-user-doc --> <!-- @@ -1250,7 +1377,7 @@ public interface EefPackage extends EPackage { * @generated * @ordered */ - int EEF_DYNAMIC_MAPPING_FOR_FEATURE_COUNT = 3; + int EEF_DYNAMIC_MAPPING_FOR_FEATURE_COUNT = EefPackage.EEF_CONTROL_DESCRIPTION_FEATURE_COUNT + 3; /** * The meta object id for the '{@link org.eclipse.eef.impl.EEFDynamicMappingIfImpl <em>EEF Dynamic Mapping If</em>}' @@ -1260,7 +1387,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFDynamicMappingIf() * @generated */ - int EEF_DYNAMIC_MAPPING_IF = 17; + int EEF_DYNAMIC_MAPPING_IF = 21; /** * The feature id for the '<em><b>Predicate Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- @@ -1297,7 +1424,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFCustomWidgetDescription() * @generated */ - int EEF_CUSTOM_WIDGET_DESCRIPTION = 18; + int EEF_CUSTOM_WIDGET_DESCRIPTION = 22; /** * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -1377,7 +1504,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFCustomExpression() * @generated */ - int EEF_CUSTOM_EXPRESSION = 19; + int EEF_CUSTOM_EXPRESSION = 23; /** * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -1413,7 +1540,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFWidgetStyle() * @generated */ - int EEF_WIDGET_STYLE = 20; + int EEF_WIDGET_STYLE = 24; /** * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc --> @@ -1477,7 +1604,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFTextStyle() * @generated */ - int EEF_TEXT_STYLE = 21; + int EEF_TEXT_STYLE = 25; /** * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc --> @@ -1586,7 +1713,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFLabelStyle() * @generated */ - int EEF_LABEL_STYLE = 22; + int EEF_LABEL_STYLE = 26; /** * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc --> @@ -1695,7 +1822,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFButtonStyle() * @generated */ - int EEF_BUTTON_STYLE = 23; + int EEF_BUTTON_STYLE = 27; /** * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc --> @@ -1759,7 +1886,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFCheckboxStyle() * @generated */ - int EEF_CHECKBOX_STYLE = 24; + int EEF_CHECKBOX_STYLE = 28; /** * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc --> @@ -1823,7 +1950,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFSelectStyle() * @generated */ - int EEF_SELECT_STYLE = 25; + int EEF_SELECT_STYLE = 29; /** * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc --> @@ -1887,7 +2014,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFRadioStyle() * @generated */ - int EEF_RADIO_STYLE = 26; + int EEF_RADIO_STYLE = 30; /** * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc --> @@ -1951,7 +2078,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFCustomWidgetStyle() * @generated */ - int EEF_CUSTOM_WIDGET_STYLE = 27; + int EEF_CUSTOM_WIDGET_STYLE = 31; /** * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc --> @@ -2015,7 +2142,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFConditionalStyle() * @generated */ - int EEF_CONDITIONAL_STYLE = 28; + int EEF_CONDITIONAL_STYLE = 32; /** * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- @@ -2043,7 +2170,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFTextConditionalStyle() * @generated */ - int EEF_TEXT_CONDITIONAL_STYLE = 29; + int EEF_TEXT_CONDITIONAL_STYLE = 33; /** * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- @@ -2080,7 +2207,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFButtonConditionalStyle() * @generated */ - int EEF_BUTTON_CONDITIONAL_STYLE = 30; + int EEF_BUTTON_CONDITIONAL_STYLE = 34; /** * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- @@ -2117,7 +2244,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFLabelConditionalStyle() * @generated */ - int EEF_LABEL_CONDITIONAL_STYLE = 31; + int EEF_LABEL_CONDITIONAL_STYLE = 35; /** * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- @@ -2154,7 +2281,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFCheckboxConditionalStyle() * @generated */ - int EEF_CHECKBOX_CONDITIONAL_STYLE = 32; + int EEF_CHECKBOX_CONDITIONAL_STYLE = 36; /** * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- @@ -2191,7 +2318,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFSelectConditionalStyle() * @generated */ - int EEF_SELECT_CONDITIONAL_STYLE = 33; + int EEF_SELECT_CONDITIONAL_STYLE = 37; /** * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- @@ -2228,7 +2355,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFRadioConditionalStyle() * @generated */ - int EEF_RADIO_CONDITIONAL_STYLE = 34; + int EEF_RADIO_CONDITIONAL_STYLE = 38; /** * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- @@ -2265,7 +2392,7 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEFCustomWidgetConditionalStyle() * @generated */ - int EEF_CUSTOM_WIDGET_CONDITIONAL_STYLE = 35; + int EEF_CUSTOM_WIDGET_CONDITIONAL_STYLE = 39; /** * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- @@ -2302,7 +2429,17 @@ public interface EefPackage extends EPackage { * @see org.eclipse.eef.impl.EefPackageImpl#getEEF_VALIDATION_SEVERITY_DESCRIPTION() * @generated */ - int EEF_VALIDATION_SEVERITY_DESCRIPTION = 36; + int EEF_VALIDATION_SEVERITY_DESCRIPTION = 40; + + /** + * The meta object id for the '{@link org.eclipse.eef.EEF_FILL_LAYOUT_ORIENTATION + * <em>EEF FILL LAYOUT ORIENTATION</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.eef.EEF_FILL_LAYOUT_ORIENTATION + * @see org.eclipse.eef.impl.EefPackageImpl#getEEF_FILL_LAYOUT_ORIENTATION() + * @generated + */ + int EEF_FILL_LAYOUT_ORIENTATION = 41; /** * Returns the meta object for class '{@link org.eclipse.eef.EEFViewDescription <em>EEF View Description</em>}'. @@ -2690,15 +2827,16 @@ public interface EefPackage extends EPackage { EAttribute getEEFGroupDescription_PreconditionExpression(); /** - * Returns the meta object for the containment reference '{@link org.eclipse.eef.EEFGroupDescription#getContainer - * <em>Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the containment reference list ' + * {@link org.eclipse.eef.EEFGroupDescription#getControls <em>Controls</em>}'. <!-- begin-user-doc --> <!-- + * end-user-doc --> * - * @return the meta object for the containment reference '<em>Container</em>'. - * @see org.eclipse.eef.EEFGroupDescription#getContainer() + * @return the meta object for the containment reference list '<em>Controls</em>'. + * @see org.eclipse.eef.EEFGroupDescription#getControls() * @see #getEEFGroupDescription() * @generated */ - EReference getEEFGroupDescription_Container(); + EReference getEEFGroupDescription_Controls(); /** * Returns the meta object for the containment reference list ' @@ -2725,37 +2863,47 @@ public interface EefPackage extends EPackage { EReference getEEFGroupDescription_PropertyValidationRules(); /** - * Returns the meta object for class '{@link org.eclipse.eef.EEFContainerDescription - * <em>EEF Container Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for class '{@link org.eclipse.eef.EEFControlDescription <em>EEF Control Description</em>} + * '. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @return the meta object for class '<em>EEF Container Description</em>'. - * @see org.eclipse.eef.EEFContainerDescription + * @return the meta object for class '<em>EEF Control Description</em>'. + * @see org.eclipse.eef.EEFControlDescription * @generated */ - EClass getEEFContainerDescription(); + EClass getEEFControlDescription(); /** - * Returns the meta object for the attribute '{@link org.eclipse.eef.EEFContainerDescription#getIdentifier + * Returns the meta object for the attribute '{@link org.eclipse.eef.EEFControlDescription#getIdentifier * <em>Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for the attribute '<em>Identifier</em>'. - * @see org.eclipse.eef.EEFContainerDescription#getIdentifier() - * @see #getEEFContainerDescription() + * @see org.eclipse.eef.EEFControlDescription#getIdentifier() + * @see #getEEFControlDescription() + * @generated + */ + EAttribute getEEFControlDescription_Identifier(); + + /** + * Returns the meta object for class '{@link org.eclipse.eef.EEFContainerDescription + * <em>EEF Container Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for class '<em>EEF Container Description</em>'. + * @see org.eclipse.eef.EEFContainerDescription * @generated */ - EAttribute getEEFContainerDescription_Identifier(); + EClass getEEFContainerDescription(); /** * Returns the meta object for the containment reference list ' - * {@link org.eclipse.eef.EEFContainerDescription#getWidgets <em>Widgets</em>}'. <!-- begin-user-doc --> <!-- + * {@link org.eclipse.eef.EEFContainerDescription#getControls <em>Controls</em>}'. <!-- begin-user-doc --> <!-- * end-user-doc --> * - * @return the meta object for the containment reference list '<em>Widgets</em>'. - * @see org.eclipse.eef.EEFContainerDescription#getWidgets() + * @return the meta object for the containment reference list '<em>Controls</em>'. + * @see org.eclipse.eef.EEFContainerDescription#getControls() * @see #getEEFContainerDescription() * @generated */ - EReference getEEFContainerDescription_Widgets(); + EReference getEEFContainerDescription_Controls(); /** * Returns the meta object for the containment reference list ' @@ -2770,25 +2918,89 @@ public interface EefPackage extends EPackage { EReference getEEFContainerDescription_DynamicMappings(); /** - * Returns the meta object for class '{@link org.eclipse.eef.EEFWidgetDescription <em>EEF Widget Description</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.eef.EEFContainerDescription#getLayout + * <em>Layout</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for the containment reference '<em>Layout</em>'. + * @see org.eclipse.eef.EEFContainerDescription#getLayout() + * @see #getEEFContainerDescription() + * @generated + */ + EReference getEEFContainerDescription_Layout(); + + /** + * Returns the meta object for class '{@link org.eclipse.eef.EEFLayoutDescription <em>EEF Layout Description</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> * - * @return the meta object for class '<em>EEF Widget Description</em>'. - * @see org.eclipse.eef.EEFWidgetDescription + * @return the meta object for class '<em>EEF Layout Description</em>'. + * @see org.eclipse.eef.EEFLayoutDescription * @generated */ - EClass getEEFWidgetDescription(); + EClass getEEFLayoutDescription(); /** - * Returns the meta object for the attribute '{@link org.eclipse.eef.EEFWidgetDescription#getIdentifier - * <em>Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for class '{@link org.eclipse.eef.EEFFillLayoutDescription + * <em>EEF Fill Layout Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @return the meta object for the attribute '<em>Identifier</em>'. - * @see org.eclipse.eef.EEFWidgetDescription#getIdentifier() - * @see #getEEFWidgetDescription() + * @return the meta object for class '<em>EEF Fill Layout Description</em>'. + * @see org.eclipse.eef.EEFFillLayoutDescription + * @generated + */ + EClass getEEFFillLayoutDescription(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.eef.EEFFillLayoutDescription#getOrientation + * <em>Orientation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for the attribute '<em>Orientation</em>'. + * @see org.eclipse.eef.EEFFillLayoutDescription#getOrientation() + * @see #getEEFFillLayoutDescription() + * @generated + */ + EAttribute getEEFFillLayoutDescription_Orientation(); + + /** + * Returns the meta object for class '{@link org.eclipse.eef.EEFGridLayoutDescription + * <em>EEF Grid Layout Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for class '<em>EEF Grid Layout Description</em>'. + * @see org.eclipse.eef.EEFGridLayoutDescription + * @generated + */ + EClass getEEFGridLayoutDescription(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.eef.EEFGridLayoutDescription#getNumberOfColumns + * <em>Number Of Columns</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for the attribute '<em>Number Of Columns</em>'. + * @see org.eclipse.eef.EEFGridLayoutDescription#getNumberOfColumns() + * @see #getEEFGridLayoutDescription() * @generated */ - EAttribute getEEFWidgetDescription_Identifier(); + EAttribute getEEFGridLayoutDescription_NumberOfColumns(); + + /** + * Returns the meta object for the attribute ' + * {@link org.eclipse.eef.EEFGridLayoutDescription#isMakeColumnsWithEqualWidth + * <em>Make Columns With Equal Width</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for the attribute '<em>Make Columns With Equal Width</em>'. + * @see org.eclipse.eef.EEFGridLayoutDescription#isMakeColumnsWithEqualWidth() + * @see #getEEFGridLayoutDescription() + * @generated + */ + EAttribute getEEFGridLayoutDescription_MakeColumnsWithEqualWidth(); + + /** + * Returns the meta object for class '{@link org.eclipse.eef.EEFWidgetDescription <em>EEF Widget Description</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for class '<em>EEF Widget Description</em>'. + * @see org.eclipse.eef.EEFWidgetDescription + * @generated + */ + EClass getEEFWidgetDescription(); /** * Returns the meta object for the attribute '{@link org.eclipse.eef.EEFWidgetDescription#getLabelExpression @@ -3792,6 +4004,16 @@ public interface EefPackage extends EPackage { EEnum getEEF_VALIDATION_SEVERITY_DESCRIPTION(); /** + * Returns the meta object for enum '{@link org.eclipse.eef.EEF_FILL_LAYOUT_ORIENTATION + * <em>EEF FILL LAYOUT ORIENTATION</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for enum '<em>EEF FILL LAYOUT ORIENTATION</em>'. + * @see org.eclipse.eef.EEF_FILL_LAYOUT_ORIENTATION + * @generated + */ + EEnum getEEF_FILL_LAYOUT_ORIENTATION(); + + /** * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return the factory that creates the instances of the model. @@ -4110,12 +4332,12 @@ public interface EefPackage extends EPackage { EAttribute EEF_GROUP_DESCRIPTION__PRECONDITION_EXPRESSION = EefPackage.eINSTANCE.getEEFGroupDescription_PreconditionExpression(); /** - * The meta object literal for the '<em><b>Container</b></em>' containment reference feature. <!-- + * The meta object literal for the '<em><b>Controls</b></em>' containment reference list feature. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated */ - EReference EEF_GROUP_DESCRIPTION__CONTAINER = EefPackage.eINSTANCE.getEEFGroupDescription_Container(); + EReference EEF_GROUP_DESCRIPTION__CONTROLS = EefPackage.eINSTANCE.getEEFGroupDescription_Controls(); /** * The meta object literal for the '<em><b>Semantic Validation Rules</b></em>' containment reference list @@ -4134,14 +4356,14 @@ public interface EefPackage extends EPackage { EReference EEF_GROUP_DESCRIPTION__PROPERTY_VALIDATION_RULES = EefPackage.eINSTANCE.getEEFGroupDescription_PropertyValidationRules(); /** - * The meta object literal for the '{@link org.eclipse.eef.impl.EEFContainerDescriptionImpl - * <em>EEF Container Description</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '{@link org.eclipse.eef.impl.EEFControlDescriptionImpl + * <em>EEF Control Description</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see org.eclipse.eef.impl.EEFContainerDescriptionImpl - * @see org.eclipse.eef.impl.EefPackageImpl#getEEFContainerDescription() + * @see org.eclipse.eef.impl.EEFControlDescriptionImpl + * @see org.eclipse.eef.impl.EefPackageImpl#getEEFControlDescription() * @generated */ - EClass EEF_CONTAINER_DESCRIPTION = EefPackage.eINSTANCE.getEEFContainerDescription(); + EClass EEF_CONTROL_DESCRIPTION = EefPackage.eINSTANCE.getEEFControlDescription(); /** * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature. <!-- begin-user-doc --> <!-- @@ -4149,15 +4371,25 @@ public interface EefPackage extends EPackage { * * @generated */ - EAttribute EEF_CONTAINER_DESCRIPTION__IDENTIFIER = EefPackage.eINSTANCE.getEEFContainerDescription_Identifier(); + EAttribute EEF_CONTROL_DESCRIPTION__IDENTIFIER = EefPackage.eINSTANCE.getEEFControlDescription_Identifier(); /** - * The meta object literal for the '<em><b>Widgets</b></em>' containment reference list feature. <!-- + * The meta object literal for the '{@link org.eclipse.eef.impl.EEFContainerDescriptionImpl + * <em>EEF Container Description</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.eef.impl.EEFContainerDescriptionImpl + * @see org.eclipse.eef.impl.EefPackageImpl#getEEFContainerDescription() + * @generated + */ + EClass EEF_CONTAINER_DESCRIPTION = EefPackage.eINSTANCE.getEEFContainerDescription(); + + /** + * The meta object literal for the '<em><b>Controls</b></em>' containment reference list feature. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated */ - EReference EEF_CONTAINER_DESCRIPTION__WIDGETS = EefPackage.eINSTANCE.getEEFContainerDescription_Widgets(); + EReference EEF_CONTAINER_DESCRIPTION__CONTROLS = EefPackage.eINSTANCE.getEEFContainerDescription_Controls(); /** * The meta object literal for the '<em><b>Dynamic Mappings</b></em>' containment reference list feature. <!-- @@ -4168,22 +4400,77 @@ public interface EefPackage extends EPackage { EReference EEF_CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS = EefPackage.eINSTANCE.getEEFContainerDescription_DynamicMappings(); /** - * The meta object literal for the '{@link org.eclipse.eef.impl.EEFWidgetDescriptionImpl - * <em>EEF Widget Description</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Layout</b></em>' containment reference feature. <!-- begin-user-doc + * --> <!-- end-user-doc --> * - * @see org.eclipse.eef.impl.EEFWidgetDescriptionImpl - * @see org.eclipse.eef.impl.EefPackageImpl#getEEFWidgetDescription() * @generated */ - EClass EEF_WIDGET_DESCRIPTION = EefPackage.eINSTANCE.getEEFWidgetDescription(); + EReference EEF_CONTAINER_DESCRIPTION__LAYOUT = EefPackage.eINSTANCE.getEEFContainerDescription_Layout(); /** - * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '{@link org.eclipse.eef.impl.EEFLayoutDescriptionImpl + * <em>EEF Layout Description</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.eef.impl.EEFLayoutDescriptionImpl + * @see org.eclipse.eef.impl.EefPackageImpl#getEEFLayoutDescription() + * @generated + */ + EClass EEF_LAYOUT_DESCRIPTION = EefPackage.eINSTANCE.getEEFLayoutDescription(); + + /** + * The meta object literal for the '{@link org.eclipse.eef.impl.EEFFillLayoutDescriptionImpl + * <em>EEF Fill Layout Description</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.eef.impl.EEFFillLayoutDescriptionImpl + * @see org.eclipse.eef.impl.EefPackageImpl#getEEFFillLayoutDescription() + * @generated + */ + EClass EEF_FILL_LAYOUT_DESCRIPTION = EefPackage.eINSTANCE.getEEFFillLayoutDescription(); + + /** + * The meta object literal for the '<em><b>Orientation</b></em>' attribute feature. <!-- begin-user-doc --> <!-- * end-user-doc --> * * @generated */ - EAttribute EEF_WIDGET_DESCRIPTION__IDENTIFIER = EefPackage.eINSTANCE.getEEFWidgetDescription_Identifier(); + EAttribute EEF_FILL_LAYOUT_DESCRIPTION__ORIENTATION = EefPackage.eINSTANCE.getEEFFillLayoutDescription_Orientation(); + + /** + * The meta object literal for the '{@link org.eclipse.eef.impl.EEFGridLayoutDescriptionImpl + * <em>EEF Grid Layout Description</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.eef.impl.EEFGridLayoutDescriptionImpl + * @see org.eclipse.eef.impl.EefPackageImpl#getEEFGridLayoutDescription() + * @generated + */ + EClass EEF_GRID_LAYOUT_DESCRIPTION = EefPackage.eINSTANCE.getEEFGridLayoutDescription(); + + /** + * The meta object literal for the '<em><b>Number Of Columns</b></em>' attribute feature. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @generated + */ + EAttribute EEF_GRID_LAYOUT_DESCRIPTION__NUMBER_OF_COLUMNS = EefPackage.eINSTANCE.getEEFGridLayoutDescription_NumberOfColumns(); + + /** + * The meta object literal for the '<em><b>Make Columns With Equal Width</b></em>' attribute feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EAttribute EEF_GRID_LAYOUT_DESCRIPTION__MAKE_COLUMNS_WITH_EQUAL_WIDTH = EefPackage.eINSTANCE + .getEEFGridLayoutDescription_MakeColumnsWithEqualWidth(); + + /** + * The meta object literal for the '{@link org.eclipse.eef.impl.EEFWidgetDescriptionImpl + * <em>EEF Widget Description</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.eef.impl.EEFWidgetDescriptionImpl + * @see org.eclipse.eef.impl.EefPackageImpl#getEEFWidgetDescription() + * @generated + */ + EClass EEF_WIDGET_DESCRIPTION = EefPackage.eINSTANCE.getEEFWidgetDescription(); /** * The meta object literal for the '<em><b>Label Expression</b></em>' attribute feature. <!-- begin-user-doc --> @@ -4975,6 +5262,16 @@ public interface EefPackage extends EPackage { */ EEnum EEF_VALIDATION_SEVERITY_DESCRIPTION = EefPackage.eINSTANCE.getEEF_VALIDATION_SEVERITY_DESCRIPTION(); + /** + * The meta object literal for the '{@link org.eclipse.eef.EEF_FILL_LAYOUT_ORIENTATION + * <em>EEF FILL LAYOUT ORIENTATION</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.eef.EEF_FILL_LAYOUT_ORIENTATION + * @see org.eclipse.eef.impl.EefPackageImpl#getEEF_FILL_LAYOUT_ORIENTATION() + * @generated + */ + EEnum EEF_FILL_LAYOUT_ORIENTATION = EefPackage.eINSTANCE.getEEF_FILL_LAYOUT_ORIENTATION(); + } } // EefPackage diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFContainerDescriptionImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFContainerDescriptionImpl.java index 5d5f64dd2..9408961b4 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFContainerDescriptionImpl.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFContainerDescriptionImpl.java @@ -11,8 +11,9 @@ package org.eclipse.eef.impl; import java.util.Collection; import org.eclipse.eef.EEFContainerDescription; +import org.eclipse.eef.EEFControlDescription; import org.eclipse.eef.EEFDynamicMappingFor; -import org.eclipse.eef.EEFWidgetDescription; +import org.eclipse.eef.EEFLayoutDescription; import org.eclipse.eef.EefPackage; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -20,7 +21,6 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; @@ -30,62 +30,62 @@ import org.eclipse.emf.ecore.util.InternalEList; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.eef.impl.EEFContainerDescriptionImpl#getIdentifier <em>Identifier</em>}</li> - * <li>{@link org.eclipse.eef.impl.EEFContainerDescriptionImpl#getWidgets <em>Widgets</em>}</li> + * <li>{@link org.eclipse.eef.impl.EEFContainerDescriptionImpl#getControls <em>Controls</em>}</li> * <li>{@link org.eclipse.eef.impl.EEFContainerDescriptionImpl#getDynamicMappings <em>Dynamic Mappings</em>}</li> + * <li>{@link org.eclipse.eef.impl.EEFContainerDescriptionImpl#getLayout <em>Layout</em>}</li> * </ul> * </p> * * @generated */ -public class EEFContainerDescriptionImpl extends MinimalEObjectImpl.Container implements EEFContainerDescription { +public class EEFContainerDescriptionImpl extends EEFControlDescriptionImpl implements EEFContainerDescription { /** - * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * The cached value of the '{@link #getControls() <em>Controls</em>}' containment reference list. <!-- + * begin-user-doc --> <!-- end-user-doc --> * - * @see #getIdentifier() + * @see #getControls() * @generated * @ordered */ - protected static final String IDENTIFIER_EDEFAULT = null; + protected EList<EEFControlDescription> controls; /** - * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * The cached value of the '{@link #getDynamicMappings() <em>Dynamic Mappings</em>}' containment reference list. + * <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see #getIdentifier() + * @see #getDynamicMappings() * @generated * @ordered */ - protected String identifier = EEFContainerDescriptionImpl.IDENTIFIER_EDEFAULT; + protected EList<EEFDynamicMappingFor> dynamicMappings; /** - * The cached value of the '{@link #getWidgets() <em>Widgets</em>}' containment reference list. <!-- begin-user-doc - * --> <!-- end-user-doc --> + * The cached value of the '{@link #getLayout() <em>Layout</em>}' containment reference. <!-- begin-user-doc --> + * <!-- end-user-doc --> * - * @see #getWidgets() + * @see #getLayout() * @generated * @ordered */ - protected EList<EEFWidgetDescription> widgets; + protected EEFLayoutDescription layout; /** - * The cached value of the '{@link #getDynamicMappings() <em>Dynamic Mappings</em>}' containment reference list. * <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see #getDynamicMappings() * @generated - * @ordered */ - protected EList<EEFDynamicMappingFor> dynamicMappings; + protected EEFContainerDescriptionImpl() { + super(); + } /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - protected EEFContainerDescriptionImpl() { - super(); + @Override + protected EClass eStaticClass() { + return EefPackage.Literals.EEF_CONTAINER_DESCRIPTION; } /** @@ -94,8 +94,12 @@ public class EEFContainerDescriptionImpl extends MinimalEObjectImpl.Container im * @generated */ @Override - protected EClass eStaticClass() { - return EefPackage.Literals.EEF_CONTAINER_DESCRIPTION; + public EList<EEFControlDescription> getControls() { + if (controls == null) { + controls = new EObjectContainmentEList.Resolving<EEFControlDescription>(EEFControlDescription.class, this, + EefPackage.EEF_CONTAINER_DESCRIPTION__CONTROLS); + } + return controls; } /** @@ -104,8 +108,12 @@ public class EEFContainerDescriptionImpl extends MinimalEObjectImpl.Container im * @generated */ @Override - public String getIdentifier() { - return identifier; + public EList<EEFDynamicMappingFor> getDynamicMappings() { + if (dynamicMappings == null) { + dynamicMappings = new EObjectContainmentEList.Resolving<EEFDynamicMappingFor>(EEFDynamicMappingFor.class, this, + EefPackage.EEF_CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS); + } + return dynamicMappings; } /** @@ -114,12 +122,27 @@ public class EEFContainerDescriptionImpl extends MinimalEObjectImpl.Container im * @generated */ @Override - public void setIdentifier(String newIdentifier) { - String oldIdentifier = identifier; - identifier = newIdentifier; - if (eNotificationRequired()) { - eNotify(new ENotificationImpl(this, Notification.SET, EefPackage.EEF_CONTAINER_DESCRIPTION__IDENTIFIER, oldIdentifier, identifier)); + public EEFLayoutDescription getLayout() { + if (layout != null && layout.eIsProxy()) { + InternalEObject oldLayout = (InternalEObject) layout; + layout = (EEFLayoutDescription) eResolveProxy(oldLayout); + if (layout != oldLayout) { + InternalEObject newLayout = (InternalEObject) layout; + NotificationChain msgs = oldLayout.eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE + - EefPackage.EEF_CONTAINER_DESCRIPTION__LAYOUT, null, null); + if (newLayout.eInternalContainer() == null) { + msgs = newLayout.eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - EefPackage.EEF_CONTAINER_DESCRIPTION__LAYOUT, null, + msgs); + } + if (msgs != null) { + msgs.dispatch(); + } + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.RESOLVE, EefPackage.EEF_CONTAINER_DESCRIPTION__LAYOUT, oldLayout, layout)); + } + } } + return layout; } /** @@ -127,13 +150,28 @@ public class EEFContainerDescriptionImpl extends MinimalEObjectImpl.Container im * * @generated */ - @Override - public EList<EEFWidgetDescription> getWidgets() { - if (widgets == null) { - widgets = new EObjectContainmentEList.Resolving<EEFWidgetDescription>(EEFWidgetDescription.class, this, - EefPackage.EEF_CONTAINER_DESCRIPTION__WIDGETS); + public EEFLayoutDescription basicGetLayout() { + return layout; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public NotificationChain basicSetLayout(EEFLayoutDescription newLayout, NotificationChain msgs) { + EEFLayoutDescription oldLayout = layout; + layout = newLayout; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EefPackage.EEF_CONTAINER_DESCRIPTION__LAYOUT, oldLayout, + newLayout); + if (msgs == null) { + msgs = notification; + } else { + msgs.add(notification); + } } - return widgets; + return msgs; } /** @@ -142,12 +180,24 @@ public class EEFContainerDescriptionImpl extends MinimalEObjectImpl.Container im * @generated */ @Override - public EList<EEFDynamicMappingFor> getDynamicMappings() { - if (dynamicMappings == null) { - dynamicMappings = new EObjectContainmentEList.Resolving<EEFDynamicMappingFor>(EEFDynamicMappingFor.class, this, - EefPackage.EEF_CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS); + public void setLayout(EEFLayoutDescription newLayout) { + if (newLayout != layout) { + NotificationChain msgs = null; + if (layout != null) { + msgs = ((InternalEObject) layout).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE + - EefPackage.EEF_CONTAINER_DESCRIPTION__LAYOUT, null, msgs); + } + if (newLayout != null) { + msgs = ((InternalEObject) newLayout).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE + - EefPackage.EEF_CONTAINER_DESCRIPTION__LAYOUT, null, msgs); + } + msgs = basicSetLayout(newLayout, msgs); + if (msgs != null) { + msgs.dispatch(); + } + } else if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, EefPackage.EEF_CONTAINER_DESCRIPTION__LAYOUT, newLayout, newLayout)); } - return dynamicMappings; } /** @@ -158,10 +208,12 @@ public class EEFContainerDescriptionImpl extends MinimalEObjectImpl.Container im @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { - case EefPackage.EEF_CONTAINER_DESCRIPTION__WIDGETS: - return ((InternalEList<?>) getWidgets()).basicRemove(otherEnd, msgs); + case EefPackage.EEF_CONTAINER_DESCRIPTION__CONTROLS: + return ((InternalEList<?>) getControls()).basicRemove(otherEnd, msgs); case EefPackage.EEF_CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS: return ((InternalEList<?>) getDynamicMappings()).basicRemove(otherEnd, msgs); + case EefPackage.EEF_CONTAINER_DESCRIPTION__LAYOUT: + return basicSetLayout(null, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -174,12 +226,15 @@ public class EEFContainerDescriptionImpl extends MinimalEObjectImpl.Container im @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case EefPackage.EEF_CONTAINER_DESCRIPTION__IDENTIFIER: - return getIdentifier(); - case EefPackage.EEF_CONTAINER_DESCRIPTION__WIDGETS: - return getWidgets(); + case EefPackage.EEF_CONTAINER_DESCRIPTION__CONTROLS: + return getControls(); case EefPackage.EEF_CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS: return getDynamicMappings(); + case EefPackage.EEF_CONTAINER_DESCRIPTION__LAYOUT: + if (resolve) { + return getLayout(); + } + return basicGetLayout(); } return super.eGet(featureID, resolve, coreType); } @@ -193,17 +248,17 @@ public class EEFContainerDescriptionImpl extends MinimalEObjectImpl.Container im @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case EefPackage.EEF_CONTAINER_DESCRIPTION__IDENTIFIER: - setIdentifier((String) newValue); - return; - case EefPackage.EEF_CONTAINER_DESCRIPTION__WIDGETS: - getWidgets().clear(); - getWidgets().addAll((Collection<? extends EEFWidgetDescription>) newValue); + case EefPackage.EEF_CONTAINER_DESCRIPTION__CONTROLS: + getControls().clear(); + getControls().addAll((Collection<? extends EEFControlDescription>) newValue); return; case EefPackage.EEF_CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS: getDynamicMappings().clear(); getDynamicMappings().addAll((Collection<? extends EEFDynamicMappingFor>) newValue); return; + case EefPackage.EEF_CONTAINER_DESCRIPTION__LAYOUT: + setLayout((EEFLayoutDescription) newValue); + return; } super.eSet(featureID, newValue); } @@ -216,15 +271,15 @@ public class EEFContainerDescriptionImpl extends MinimalEObjectImpl.Container im @Override public void eUnset(int featureID) { switch (featureID) { - case EefPackage.EEF_CONTAINER_DESCRIPTION__IDENTIFIER: - setIdentifier(EEFContainerDescriptionImpl.IDENTIFIER_EDEFAULT); - return; - case EefPackage.EEF_CONTAINER_DESCRIPTION__WIDGETS: - getWidgets().clear(); + case EefPackage.EEF_CONTAINER_DESCRIPTION__CONTROLS: + getControls().clear(); return; case EefPackage.EEF_CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS: getDynamicMappings().clear(); return; + case EefPackage.EEF_CONTAINER_DESCRIPTION__LAYOUT: + setLayout((EEFLayoutDescription) null); + return; } super.eUnset(featureID); } @@ -237,33 +292,14 @@ public class EEFContainerDescriptionImpl extends MinimalEObjectImpl.Container im @Override public boolean eIsSet(int featureID) { switch (featureID) { - case EefPackage.EEF_CONTAINER_DESCRIPTION__IDENTIFIER: - return EEFContainerDescriptionImpl.IDENTIFIER_EDEFAULT == null ? identifier != null : !EEFContainerDescriptionImpl.IDENTIFIER_EDEFAULT - .equals(identifier); - case EefPackage.EEF_CONTAINER_DESCRIPTION__WIDGETS: - return widgets != null && !widgets.isEmpty(); + case EefPackage.EEF_CONTAINER_DESCRIPTION__CONTROLS: + return controls != null && !controls.isEmpty(); case EefPackage.EEF_CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS: return dynamicMappings != null && !dynamicMappings.isEmpty(); + case EefPackage.EEF_CONTAINER_DESCRIPTION__LAYOUT: + return layout != null; } return super.eIsSet(featureID); } - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override - public String toString() { - if (eIsProxy()) { - return super.toString(); - } - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (identifier: "); //$NON-NLS-1$ - result.append(identifier); - result.append(')'); - return result.toString(); - } - } // EEFContainerDescriptionImpl diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFControlDescriptionImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFControlDescriptionImpl.java new file mode 100644 index 000000000..992eea569 --- /dev/null +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFControlDescriptionImpl.java @@ -0,0 +1,171 @@ +/** + * Copyright (c) 2015 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.htm + * Contributors: Obeo - initial API and implementation + */ +package org.eclipse.eef.impl; + +import org.eclipse.eef.EEFControlDescription; +import org.eclipse.eef.EefPackage; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +/** + * <!-- begin-user-doc --> An implementation of the model object '<em><b>EEF Control Description</b></em>'. <!-- + * end-user-doc --> + * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.eef.impl.EEFControlDescriptionImpl#getIdentifier <em>Identifier</em>}</li> + * </ul> + * </p> + * + * @generated + */ +public abstract class EEFControlDescriptionImpl extends MinimalEObjectImpl.Container implements EEFControlDescription { + /** + * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #getIdentifier() + * @generated + * @ordered + */ + protected static final String IDENTIFIER_EDEFAULT = null; + + /** + * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #getIdentifier() + * @generated + * @ordered + */ + protected String identifier = EEFControlDescriptionImpl.IDENTIFIER_EDEFAULT; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected EEFControlDescriptionImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return EefPackage.Literals.EEF_CONTROL_DESCRIPTION; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public String getIdentifier() { + return identifier; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void setIdentifier(String newIdentifier) { + String oldIdentifier = identifier; + identifier = newIdentifier; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, EefPackage.EEF_CONTROL_DESCRIPTION__IDENTIFIER, oldIdentifier, identifier)); + } + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case EefPackage.EEF_CONTROL_DESCRIPTION__IDENTIFIER: + return getIdentifier(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case EefPackage.EEF_CONTROL_DESCRIPTION__IDENTIFIER: + setIdentifier((String) newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case EefPackage.EEF_CONTROL_DESCRIPTION__IDENTIFIER: + setIdentifier(EEFControlDescriptionImpl.IDENTIFIER_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case EefPackage.EEF_CONTROL_DESCRIPTION__IDENTIFIER: + return EEFControlDescriptionImpl.IDENTIFIER_EDEFAULT == null ? identifier != null : !EEFControlDescriptionImpl.IDENTIFIER_EDEFAULT + .equals(identifier); + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) { + return super.toString(); + } + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (identifier: "); //$NON-NLS-1$ + result.append(identifier); + result.append(')'); + return result.toString(); + } + +} // EEFControlDescriptionImpl diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFDynamicMappingForImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFDynamicMappingForImpl.java index aa20feae8..5e2c09d69 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFDynamicMappingForImpl.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFDynamicMappingForImpl.java @@ -19,7 +19,6 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; @@ -37,7 +36,7 @@ import org.eclipse.emf.ecore.util.InternalEList; * * @generated */ -public class EEFDynamicMappingForImpl extends MinimalEObjectImpl.Container implements EEFDynamicMappingFor { +public class EEFDynamicMappingForImpl extends EEFControlDescriptionImpl implements EEFDynamicMappingFor { /** * The default value of the '{@link #getIterator() <em>Iterator</em>}' attribute. <!-- begin-user-doc --> <!-- * end-user-doc --> diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFFillLayoutDescriptionImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFFillLayoutDescriptionImpl.java new file mode 100644 index 000000000..847d3eef6 --- /dev/null +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFFillLayoutDescriptionImpl.java @@ -0,0 +1,170 @@ +/** + * Copyright (c) 2015 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.htm + * Contributors: Obeo - initial API and implementation + */ +package org.eclipse.eef.impl; + +import org.eclipse.eef.EEFFillLayoutDescription; +import org.eclipse.eef.EEF_FILL_LAYOUT_ORIENTATION; +import org.eclipse.eef.EefPackage; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * <!-- begin-user-doc --> An implementation of the model object '<em><b>EEF Fill Layout Description</b></em>'. <!-- + * end-user-doc --> + * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.eef.impl.EEFFillLayoutDescriptionImpl#getOrientation <em>Orientation</em>}</li> + * </ul> + * </p> + * + * @generated + */ +public class EEFFillLayoutDescriptionImpl extends EEFLayoutDescriptionImpl implements EEFFillLayoutDescription { + /** + * The default value of the '{@link #getOrientation() <em>Orientation</em>}' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #getOrientation() + * @generated + * @ordered + */ + protected static final EEF_FILL_LAYOUT_ORIENTATION ORIENTATION_EDEFAULT = EEF_FILL_LAYOUT_ORIENTATION.VERTICAL; + + /** + * The cached value of the '{@link #getOrientation() <em>Orientation</em>}' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #getOrientation() + * @generated + * @ordered + */ + protected EEF_FILL_LAYOUT_ORIENTATION orientation = EEFFillLayoutDescriptionImpl.ORIENTATION_EDEFAULT; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected EEFFillLayoutDescriptionImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return EefPackage.Literals.EEF_FILL_LAYOUT_DESCRIPTION; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public EEF_FILL_LAYOUT_ORIENTATION getOrientation() { + return orientation; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void setOrientation(EEF_FILL_LAYOUT_ORIENTATION newOrientation) { + EEF_FILL_LAYOUT_ORIENTATION oldOrientation = orientation; + orientation = newOrientation == null ? EEFFillLayoutDescriptionImpl.ORIENTATION_EDEFAULT : newOrientation; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, EefPackage.EEF_FILL_LAYOUT_DESCRIPTION__ORIENTATION, oldOrientation, orientation)); + } + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case EefPackage.EEF_FILL_LAYOUT_DESCRIPTION__ORIENTATION: + return getOrientation(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case EefPackage.EEF_FILL_LAYOUT_DESCRIPTION__ORIENTATION: + setOrientation((EEF_FILL_LAYOUT_ORIENTATION) newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case EefPackage.EEF_FILL_LAYOUT_DESCRIPTION__ORIENTATION: + setOrientation(EEFFillLayoutDescriptionImpl.ORIENTATION_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case EefPackage.EEF_FILL_LAYOUT_DESCRIPTION__ORIENTATION: + return orientation != EEFFillLayoutDescriptionImpl.ORIENTATION_EDEFAULT; + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) { + return super.toString(); + } + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (orientation: "); //$NON-NLS-1$ + result.append(orientation); + result.append(')'); + return result.toString(); + } + +} // EEFFillLayoutDescriptionImpl diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFGridLayoutDescriptionImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFGridLayoutDescriptionImpl.java new file mode 100644 index 000000000..a5e5fa460 --- /dev/null +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFGridLayoutDescriptionImpl.java @@ -0,0 +1,229 @@ +/** + * Copyright (c) 2015 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.htm + * Contributors: Obeo - initial API and implementation + */ +package org.eclipse.eef.impl; + +import org.eclipse.eef.EEFGridLayoutDescription; +import org.eclipse.eef.EefPackage; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * <!-- begin-user-doc --> An implementation of the model object '<em><b>EEF Grid Layout Description</b></em>'. <!-- + * end-user-doc --> + * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.eef.impl.EEFGridLayoutDescriptionImpl#getNumberOfColumns <em>Number Of Columns</em>}</li> + * <li>{@link org.eclipse.eef.impl.EEFGridLayoutDescriptionImpl#isMakeColumnsWithEqualWidth <em>Make Columns With Equal + * Width</em>}</li> + * </ul> + * </p> + * + * @generated + */ +public class EEFGridLayoutDescriptionImpl extends EEFLayoutDescriptionImpl implements EEFGridLayoutDescription { + /** + * The default value of the '{@link #getNumberOfColumns() <em>Number Of Columns</em>}' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @see #getNumberOfColumns() + * @generated + * @ordered + */ + protected static final int NUMBER_OF_COLUMNS_EDEFAULT = 1; + + /** + * The cached value of the '{@link #getNumberOfColumns() <em>Number Of Columns</em>}' attribute. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @see #getNumberOfColumns() + * @generated + * @ordered + */ + protected int numberOfColumns = EEFGridLayoutDescriptionImpl.NUMBER_OF_COLUMNS_EDEFAULT; + + /** + * The default value of the '{@link #isMakeColumnsWithEqualWidth() <em>Make Columns With Equal Width</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #isMakeColumnsWithEqualWidth() + * @generated + * @ordered + */ + protected static final boolean MAKE_COLUMNS_WITH_EQUAL_WIDTH_EDEFAULT = false; + + /** + * The cached value of the '{@link #isMakeColumnsWithEqualWidth() <em>Make Columns With Equal Width</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #isMakeColumnsWithEqualWidth() + * @generated + * @ordered + */ + protected boolean makeColumnsWithEqualWidth = EEFGridLayoutDescriptionImpl.MAKE_COLUMNS_WITH_EQUAL_WIDTH_EDEFAULT; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected EEFGridLayoutDescriptionImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return EefPackage.Literals.EEF_GRID_LAYOUT_DESCRIPTION; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public int getNumberOfColumns() { + return numberOfColumns; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void setNumberOfColumns(int newNumberOfColumns) { + int oldNumberOfColumns = numberOfColumns; + numberOfColumns = newNumberOfColumns; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, EefPackage.EEF_GRID_LAYOUT_DESCRIPTION__NUMBER_OF_COLUMNS, oldNumberOfColumns, + numberOfColumns)); + } + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public boolean isMakeColumnsWithEqualWidth() { + return makeColumnsWithEqualWidth; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void setMakeColumnsWithEqualWidth(boolean newMakeColumnsWithEqualWidth) { + boolean oldMakeColumnsWithEqualWidth = makeColumnsWithEqualWidth; + makeColumnsWithEqualWidth = newMakeColumnsWithEqualWidth; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, EefPackage.EEF_GRID_LAYOUT_DESCRIPTION__MAKE_COLUMNS_WITH_EQUAL_WIDTH, + oldMakeColumnsWithEqualWidth, makeColumnsWithEqualWidth)); + } + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case EefPackage.EEF_GRID_LAYOUT_DESCRIPTION__NUMBER_OF_COLUMNS: + return getNumberOfColumns(); + case EefPackage.EEF_GRID_LAYOUT_DESCRIPTION__MAKE_COLUMNS_WITH_EQUAL_WIDTH: + return isMakeColumnsWithEqualWidth(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case EefPackage.EEF_GRID_LAYOUT_DESCRIPTION__NUMBER_OF_COLUMNS: + setNumberOfColumns((Integer) newValue); + return; + case EefPackage.EEF_GRID_LAYOUT_DESCRIPTION__MAKE_COLUMNS_WITH_EQUAL_WIDTH: + setMakeColumnsWithEqualWidth((Boolean) newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case EefPackage.EEF_GRID_LAYOUT_DESCRIPTION__NUMBER_OF_COLUMNS: + setNumberOfColumns(EEFGridLayoutDescriptionImpl.NUMBER_OF_COLUMNS_EDEFAULT); + return; + case EefPackage.EEF_GRID_LAYOUT_DESCRIPTION__MAKE_COLUMNS_WITH_EQUAL_WIDTH: + setMakeColumnsWithEqualWidth(EEFGridLayoutDescriptionImpl.MAKE_COLUMNS_WITH_EQUAL_WIDTH_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case EefPackage.EEF_GRID_LAYOUT_DESCRIPTION__NUMBER_OF_COLUMNS: + return numberOfColumns != EEFGridLayoutDescriptionImpl.NUMBER_OF_COLUMNS_EDEFAULT; + case EefPackage.EEF_GRID_LAYOUT_DESCRIPTION__MAKE_COLUMNS_WITH_EQUAL_WIDTH: + return makeColumnsWithEqualWidth != EEFGridLayoutDescriptionImpl.MAKE_COLUMNS_WITH_EQUAL_WIDTH_EDEFAULT; + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) { + return super.toString(); + } + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (numberOfColumns: "); //$NON-NLS-1$ + result.append(numberOfColumns); + result.append(", makeColumnsWithEqualWidth: "); //$NON-NLS-1$ + result.append(makeColumnsWithEqualWidth); + result.append(')'); + return result.toString(); + } + +} // EEFGridLayoutDescriptionImpl diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFGroupDescriptionImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFGroupDescriptionImpl.java index c126fa4d9..81ace8d07 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFGroupDescriptionImpl.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFGroupDescriptionImpl.java @@ -10,7 +10,7 @@ package org.eclipse.eef.impl; import java.util.Collection; -import org.eclipse.eef.EEFContainerDescription; +import org.eclipse.eef.EEFControlDescription; import org.eclipse.eef.EEFGroupDescription; import org.eclipse.eef.EEFPropertyValidationRuleDescription; import org.eclipse.eef.EEFSemanticValidationRuleDescription; @@ -37,7 +37,7 @@ import org.eclipse.emf.ecore.util.InternalEList; * <li>{@link org.eclipse.eef.impl.EEFGroupDescriptionImpl#getSemanticCandidateExpression <em>Semantic Candidate * Expression</em>}</li> * <li>{@link org.eclipse.eef.impl.EEFGroupDescriptionImpl#getPreconditionExpression <em>Precondition Expression</em>}</li> - * <li>{@link org.eclipse.eef.impl.EEFGroupDescriptionImpl#getContainer <em>Container</em>}</li> + * <li>{@link org.eclipse.eef.impl.EEFGroupDescriptionImpl#getControls <em>Controls</em>}</li> * <li>{@link org.eclipse.eef.impl.EEFGroupDescriptionImpl#getSemanticValidationRules <em>Semantic Validation Rules * </em>}</li> * <li>{@link org.eclipse.eef.impl.EEFGroupDescriptionImpl#getPropertyValidationRules <em>Property Validation Rules @@ -149,14 +149,14 @@ public class EEFGroupDescriptionImpl extends MinimalEObjectImpl.Container implem protected String preconditionExpression = EEFGroupDescriptionImpl.PRECONDITION_EXPRESSION_EDEFAULT; /** - * The cached value of the '{@link #getContainer() <em>Container</em>}' containment reference. <!-- begin-user-doc - * --> <!-- end-user-doc --> + * The cached value of the '{@link #getControls() <em>Controls</em>}' containment reference list. <!-- + * begin-user-doc --> <!-- end-user-doc --> * - * @see #getContainer() + * @see #getControls() * @generated * @ordered */ - protected EEFContainerDescription container; + protected EList<EEFControlDescription> controls; /** * The cached value of the '{@link #getSemanticValidationRules() <em>Semantic Validation Rules</em>}' containment @@ -326,82 +326,12 @@ public class EEFGroupDescriptionImpl extends MinimalEObjectImpl.Container implem * @generated */ @Override - public EEFContainerDescription getContainer() { - if (container != null && container.eIsProxy()) { - InternalEObject oldContainer = (InternalEObject) container; - container = (EEFContainerDescription) eResolveProxy(oldContainer); - if (container != oldContainer) { - InternalEObject newContainer = (InternalEObject) container; - NotificationChain msgs = oldContainer.eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - - EefPackage.EEF_GROUP_DESCRIPTION__CONTAINER, null, null); - if (newContainer.eInternalContainer() == null) { - msgs = newContainer.eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - EefPackage.EEF_GROUP_DESCRIPTION__CONTAINER, null, - msgs); - } - if (msgs != null) { - msgs.dispatch(); - } - if (eNotificationRequired()) { - eNotify(new ENotificationImpl(this, Notification.RESOLVE, EefPackage.EEF_GROUP_DESCRIPTION__CONTAINER, oldContainer, container)); - } - } - } - return container; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public EEFContainerDescription basicGetContainer() { - return container; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public NotificationChain basicSetContainer(EEFContainerDescription newContainer, NotificationChain msgs) { - EEFContainerDescription oldContainer = container; - container = newContainer; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EefPackage.EEF_GROUP_DESCRIPTION__CONTAINER, oldContainer, - newContainer); - if (msgs == null) { - msgs = notification; - } else { - msgs.add(notification); - } - } - return msgs; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override - public void setContainer(EEFContainerDescription newContainer) { - if (newContainer != container) { - NotificationChain msgs = null; - if (container != null) { - msgs = ((InternalEObject) container).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - - EefPackage.EEF_GROUP_DESCRIPTION__CONTAINER, null, msgs); - } - if (newContainer != null) { - msgs = ((InternalEObject) newContainer).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - - EefPackage.EEF_GROUP_DESCRIPTION__CONTAINER, null, msgs); - } - msgs = basicSetContainer(newContainer, msgs); - if (msgs != null) { - msgs.dispatch(); - } - } else if (eNotificationRequired()) { - eNotify(new ENotificationImpl(this, Notification.SET, EefPackage.EEF_GROUP_DESCRIPTION__CONTAINER, newContainer, newContainer)); + public EList<EEFControlDescription> getControls() { + if (controls == null) { + controls = new EObjectContainmentEList.Resolving<EEFControlDescription>(EEFControlDescription.class, this, + EefPackage.EEF_GROUP_DESCRIPTION__CONTROLS); } + return controls; } /** @@ -440,8 +370,8 @@ public class EEFGroupDescriptionImpl extends MinimalEObjectImpl.Container implem @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { - case EefPackage.EEF_GROUP_DESCRIPTION__CONTAINER: - return basicSetContainer(null, msgs); + case EefPackage.EEF_GROUP_DESCRIPTION__CONTROLS: + return ((InternalEList<?>) getControls()).basicRemove(otherEnd, msgs); case EefPackage.EEF_GROUP_DESCRIPTION__SEMANTIC_VALIDATION_RULES: return ((InternalEList<?>) getSemanticValidationRules()).basicRemove(otherEnd, msgs); case EefPackage.EEF_GROUP_DESCRIPTION__PROPERTY_VALIDATION_RULES: @@ -468,11 +398,8 @@ public class EEFGroupDescriptionImpl extends MinimalEObjectImpl.Container implem return getSemanticCandidateExpression(); case EefPackage.EEF_GROUP_DESCRIPTION__PRECONDITION_EXPRESSION: return getPreconditionExpression(); - case EefPackage.EEF_GROUP_DESCRIPTION__CONTAINER: - if (resolve) { - return getContainer(); - } - return basicGetContainer(); + case EefPackage.EEF_GROUP_DESCRIPTION__CONTROLS: + return getControls(); case EefPackage.EEF_GROUP_DESCRIPTION__SEMANTIC_VALIDATION_RULES: return getSemanticValidationRules(); case EefPackage.EEF_GROUP_DESCRIPTION__PROPERTY_VALIDATION_RULES: @@ -505,8 +432,9 @@ public class EEFGroupDescriptionImpl extends MinimalEObjectImpl.Container implem case EefPackage.EEF_GROUP_DESCRIPTION__PRECONDITION_EXPRESSION: setPreconditionExpression((String) newValue); return; - case EefPackage.EEF_GROUP_DESCRIPTION__CONTAINER: - setContainer((EEFContainerDescription) newValue); + case EefPackage.EEF_GROUP_DESCRIPTION__CONTROLS: + getControls().clear(); + getControls().addAll((Collection<? extends EEFControlDescription>) newValue); return; case EefPackage.EEF_GROUP_DESCRIPTION__SEMANTIC_VALIDATION_RULES: getSemanticValidationRules().clear(); @@ -543,8 +471,8 @@ public class EEFGroupDescriptionImpl extends MinimalEObjectImpl.Container implem case EefPackage.EEF_GROUP_DESCRIPTION__PRECONDITION_EXPRESSION: setPreconditionExpression(EEFGroupDescriptionImpl.PRECONDITION_EXPRESSION_EDEFAULT); return; - case EefPackage.EEF_GROUP_DESCRIPTION__CONTAINER: - setContainer((EEFContainerDescription) null); + case EefPackage.EEF_GROUP_DESCRIPTION__CONTROLS: + getControls().clear(); return; case EefPackage.EEF_GROUP_DESCRIPTION__SEMANTIC_VALIDATION_RULES: getSemanticValidationRules().clear(); @@ -579,8 +507,8 @@ public class EEFGroupDescriptionImpl extends MinimalEObjectImpl.Container implem case EefPackage.EEF_GROUP_DESCRIPTION__PRECONDITION_EXPRESSION: return EEFGroupDescriptionImpl.PRECONDITION_EXPRESSION_EDEFAULT == null ? preconditionExpression != null : !EEFGroupDescriptionImpl.PRECONDITION_EXPRESSION_EDEFAULT.equals(preconditionExpression); - case EefPackage.EEF_GROUP_DESCRIPTION__CONTAINER: - return container != null; + case EefPackage.EEF_GROUP_DESCRIPTION__CONTROLS: + return controls != null && !controls.isEmpty(); case EefPackage.EEF_GROUP_DESCRIPTION__SEMANTIC_VALIDATION_RULES: return semanticValidationRules != null && !semanticValidationRules.isEmpty(); case EefPackage.EEF_GROUP_DESCRIPTION__PROPERTY_VALIDATION_RULES: diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFLayoutDescriptionImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFLayoutDescriptionImpl.java new file mode 100644 index 000000000..dd11860fd --- /dev/null +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFLayoutDescriptionImpl.java @@ -0,0 +1,44 @@ +/** + * Copyright (c) 2015 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.htm + * Contributors: Obeo - initial API and implementation + */ +package org.eclipse.eef.impl; + +import org.eclipse.eef.EEFLayoutDescription; +import org.eclipse.eef.EefPackage; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +/** + * <!-- begin-user-doc --> An implementation of the model object '<em><b>EEF Layout Description</b></em>'. <!-- + * end-user-doc --> + * <p> + * </p> + * + * @generated + */ +public abstract class EEFLayoutDescriptionImpl extends MinimalEObjectImpl.Container implements EEFLayoutDescription { + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected EEFLayoutDescriptionImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return EefPackage.Literals.EEF_LAYOUT_DESCRIPTION; + } + +} // EEFLayoutDescriptionImpl diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFTextStyleImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFTextStyleImpl.java index 1de50c8a7..069fe558a 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFTextStyleImpl.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFTextStyleImpl.java @@ -301,7 +301,6 @@ public class EEFTextStyleImpl extends EEFWidgetStyleImpl implements EEFTextStyle * * @generated */ - @SuppressWarnings("unchecked") @Override public void eSet(int featureID, Object newValue) { switch (featureID) { diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFWidgetDescriptionImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFWidgetDescriptionImpl.java index 6ce5a4e56..91c614173 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFWidgetDescriptionImpl.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFWidgetDescriptionImpl.java @@ -19,7 +19,6 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; @@ -29,7 +28,6 @@ import org.eclipse.emf.ecore.util.InternalEList; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.eef.impl.EEFWidgetDescriptionImpl#getIdentifier <em>Identifier</em>}</li> * <li>{@link org.eclipse.eef.impl.EEFWidgetDescriptionImpl#getLabelExpression <em>Label Expression</em>}</li> * <li>{@link org.eclipse.eef.impl.EEFWidgetDescriptionImpl#getHelpExpression <em>Help Expression</em>}</li> * <li>{@link org.eclipse.eef.impl.EEFWidgetDescriptionImpl#getPropertyValidationRules <em>Property Validation Rules @@ -39,27 +37,7 @@ import org.eclipse.emf.ecore.util.InternalEList; * * @generated */ -public abstract class EEFWidgetDescriptionImpl extends MinimalEObjectImpl.Container implements EEFWidgetDescription { - /** - * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @see #getIdentifier() - * @generated - * @ordered - */ - protected static final String IDENTIFIER_EDEFAULT = null; - - /** - * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @see #getIdentifier() - * @generated - * @ordered - */ - protected String identifier = EEFWidgetDescriptionImpl.IDENTIFIER_EDEFAULT; - +public abstract class EEFWidgetDescriptionImpl extends EEFControlDescriptionImpl implements EEFWidgetDescription { /** * The default value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute. <!-- begin-user-doc * --> <!-- end-user-doc --> @@ -135,30 +113,6 @@ public abstract class EEFWidgetDescriptionImpl extends MinimalEObjectImpl.Contai * @generated */ @Override - public String getIdentifier() { - return identifier; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override - public void setIdentifier(String newIdentifier) { - String oldIdentifier = identifier; - identifier = newIdentifier; - if (eNotificationRequired()) { - eNotify(new ENotificationImpl(this, Notification.SET, EefPackage.EEF_WIDGET_DESCRIPTION__IDENTIFIER, oldIdentifier, identifier)); - } - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override public String getLabelExpression() { return labelExpression; } @@ -255,8 +209,6 @@ public abstract class EEFWidgetDescriptionImpl extends MinimalEObjectImpl.Contai @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case EefPackage.EEF_WIDGET_DESCRIPTION__IDENTIFIER: - return getIdentifier(); case EefPackage.EEF_WIDGET_DESCRIPTION__LABEL_EXPRESSION: return getLabelExpression(); case EefPackage.EEF_WIDGET_DESCRIPTION__HELP_EXPRESSION: @@ -276,9 +228,6 @@ public abstract class EEFWidgetDescriptionImpl extends MinimalEObjectImpl.Contai @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case EefPackage.EEF_WIDGET_DESCRIPTION__IDENTIFIER: - setIdentifier((String) newValue); - return; case EefPackage.EEF_WIDGET_DESCRIPTION__LABEL_EXPRESSION: setLabelExpression((String) newValue); return; @@ -301,9 +250,6 @@ public abstract class EEFWidgetDescriptionImpl extends MinimalEObjectImpl.Contai @Override public void eUnset(int featureID) { switch (featureID) { - case EefPackage.EEF_WIDGET_DESCRIPTION__IDENTIFIER: - setIdentifier(EEFWidgetDescriptionImpl.IDENTIFIER_EDEFAULT); - return; case EefPackage.EEF_WIDGET_DESCRIPTION__LABEL_EXPRESSION: setLabelExpression(EEFWidgetDescriptionImpl.LABEL_EXPRESSION_EDEFAULT); return; @@ -325,9 +271,6 @@ public abstract class EEFWidgetDescriptionImpl extends MinimalEObjectImpl.Contai @Override public boolean eIsSet(int featureID) { switch (featureID) { - case EefPackage.EEF_WIDGET_DESCRIPTION__IDENTIFIER: - return EEFWidgetDescriptionImpl.IDENTIFIER_EDEFAULT == null ? identifier != null : !EEFWidgetDescriptionImpl.IDENTIFIER_EDEFAULT - .equals(identifier); case EefPackage.EEF_WIDGET_DESCRIPTION__LABEL_EXPRESSION: return EEFWidgetDescriptionImpl.LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !EEFWidgetDescriptionImpl.LABEL_EXPRESSION_EDEFAULT.equals(labelExpression); @@ -352,9 +295,7 @@ public abstract class EEFWidgetDescriptionImpl extends MinimalEObjectImpl.Contai } StringBuffer result = new StringBuffer(super.toString()); - result.append(" (identifier: "); //$NON-NLS-1$ - result.append(identifier); - result.append(", labelExpression: "); //$NON-NLS-1$ + result.append(" (labelExpression: "); //$NON-NLS-1$ result.append(labelExpression); result.append(", helpExpression: "); //$NON-NLS-1$ result.append(helpExpression); diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFWidgetStyleImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFWidgetStyleImpl.java index 656bfac7d..68a510c32 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFWidgetStyleImpl.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFWidgetStyleImpl.java @@ -19,6 +19,16 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <!-- begin-user-doc --> An implementation of the model object '<em><b>EEF Widget Style</b></em>'. <!-- end-user-doc * --> * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.eef.impl.EEFWidgetStyleImpl#getLabelBackgroundColorExpression <em>Label Background Color + * Expression</em>}</li> + * <li>{@link org.eclipse.eef.impl.EEFWidgetStyleImpl#getLabelForegroundColorExpression <em>Label Foreground Color + * Expression</em>}</li> + * <li>{@link org.eclipse.eef.impl.EEFWidgetStyleImpl#getLabelFontNameExpression <em>Label Font Name Expression</em>}</li> + * <li>{@link org.eclipse.eef.impl.EEFWidgetStyleImpl#getLabelFontSizeExpression <em>Label Font Size Expression</em>}</li> + * <li>{@link org.eclipse.eef.impl.EEFWidgetStyleImpl#getLabelFontStyleExpression <em>Label Font Style Expression</em>}</li> + * </ul> * </p> * * @generated @@ -33,6 +43,7 @@ public abstract class EEFWidgetStyleImpl extends MinimalEObjectImpl.Container im * @ordered */ protected static final String LABEL_BACKGROUND_COLOR_EXPRESSION_EDEFAULT = null; + /** * The cached value of the '{@link #getLabelBackgroundColorExpression() <em>Label Background Color Expression</em>}' * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -42,6 +53,7 @@ public abstract class EEFWidgetStyleImpl extends MinimalEObjectImpl.Container im * @ordered */ protected String labelBackgroundColorExpression = EEFWidgetStyleImpl.LABEL_BACKGROUND_COLOR_EXPRESSION_EDEFAULT; + /** * The default value of the '{@link #getLabelForegroundColorExpression() <em>Label Foreground Color Expression</em>} * ' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -51,6 +63,7 @@ public abstract class EEFWidgetStyleImpl extends MinimalEObjectImpl.Container im * @ordered */ protected static final String LABEL_FOREGROUND_COLOR_EXPRESSION_EDEFAULT = null; + /** * The cached value of the '{@link #getLabelForegroundColorExpression() <em>Label Foreground Color Expression</em>}' * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -60,6 +73,7 @@ public abstract class EEFWidgetStyleImpl extends MinimalEObjectImpl.Container im * @ordered */ protected String labelForegroundColorExpression = EEFWidgetStyleImpl.LABEL_FOREGROUND_COLOR_EXPRESSION_EDEFAULT; + /** * The default value of the '{@link #getLabelFontNameExpression() <em>Label Font Name Expression</em>}' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -69,6 +83,7 @@ public abstract class EEFWidgetStyleImpl extends MinimalEObjectImpl.Container im * @ordered */ protected static final String LABEL_FONT_NAME_EXPRESSION_EDEFAULT = null; + /** * The cached value of the '{@link #getLabelFontNameExpression() <em>Label Font Name Expression</em>}' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -78,6 +93,7 @@ public abstract class EEFWidgetStyleImpl extends MinimalEObjectImpl.Container im * @ordered */ protected String labelFontNameExpression = EEFWidgetStyleImpl.LABEL_FONT_NAME_EXPRESSION_EDEFAULT; + /** * The default value of the '{@link #getLabelFontSizeExpression() <em>Label Font Size Expression</em>}' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -87,6 +103,7 @@ public abstract class EEFWidgetStyleImpl extends MinimalEObjectImpl.Container im * @ordered */ protected static final String LABEL_FONT_SIZE_EXPRESSION_EDEFAULT = null; + /** * The cached value of the '{@link #getLabelFontSizeExpression() <em>Label Font Size Expression</em>}' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -96,6 +113,7 @@ public abstract class EEFWidgetStyleImpl extends MinimalEObjectImpl.Container im * @ordered */ protected String labelFontSizeExpression = EEFWidgetStyleImpl.LABEL_FONT_SIZE_EXPRESSION_EDEFAULT; + /** * The default value of the '{@link #getLabelFontStyleExpression() <em>Label Font Style Expression</em>}' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -105,6 +123,7 @@ public abstract class EEFWidgetStyleImpl extends MinimalEObjectImpl.Container im * @ordered */ protected static final String LABEL_FONT_STYLE_EXPRESSION_EDEFAULT = null; + /** * The cached value of the '{@link #getLabelFontStyleExpression() <em>Label Font Style Expression</em>}' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EefFactoryImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EefFactoryImpl.java index 255c48227..c4f4ccdd3 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EefFactoryImpl.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EefFactoryImpl.java @@ -21,6 +21,8 @@ import org.eclipse.eef.EEFCustomWidgetDescription; import org.eclipse.eef.EEFCustomWidgetStyle; import org.eclipse.eef.EEFDynamicMappingFor; import org.eclipse.eef.EEFDynamicMappingIf; +import org.eclipse.eef.EEFFillLayoutDescription; +import org.eclipse.eef.EEFGridLayoutDescription; import org.eclipse.eef.EEFGroupDescription; import org.eclipse.eef.EEFLabelConditionalStyle; import org.eclipse.eef.EEFLabelDescription; @@ -40,6 +42,7 @@ import org.eclipse.eef.EEFTextDescription; import org.eclipse.eef.EEFTextStyle; import org.eclipse.eef.EEFValidationFixDescription; import org.eclipse.eef.EEFViewDescription; +import org.eclipse.eef.EEF_FILL_LAYOUT_ORIENTATION; import org.eclipse.eef.EEF_VALIDATION_SEVERITY_DESCRIPTION; import org.eclipse.eef.EefFactory; import org.eclipse.eef.EefPackage; @@ -106,6 +109,10 @@ public class EefFactoryImpl extends EFactoryImpl implements EefFactory { return createEEFGroupDescription(); case EefPackage.EEF_CONTAINER_DESCRIPTION: return createEEFContainerDescription(); + case EefPackage.EEF_FILL_LAYOUT_DESCRIPTION: + return createEEFFillLayoutDescription(); + case EefPackage.EEF_GRID_LAYOUT_DESCRIPTION: + return createEEFGridLayoutDescription(); case EefPackage.EEF_TEXT_DESCRIPTION: return createEEFTextDescription(); case EefPackage.EEF_LABEL_DESCRIPTION: @@ -169,6 +176,8 @@ public class EefFactoryImpl extends EFactoryImpl implements EefFactory { switch (eDataType.getClassifierID()) { case EefPackage.EEF_VALIDATION_SEVERITY_DESCRIPTION: return createEEF_VALIDATION_SEVERITY_DESCRIPTIONFromString(eDataType, initialValue); + case EefPackage.EEF_FILL_LAYOUT_ORIENTATION: + return createEEF_FILL_LAYOUT_ORIENTATIONFromString(eDataType, initialValue); default: throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -184,6 +193,8 @@ public class EefFactoryImpl extends EFactoryImpl implements EefFactory { switch (eDataType.getClassifierID()) { case EefPackage.EEF_VALIDATION_SEVERITY_DESCRIPTION: return convertEEF_VALIDATION_SEVERITY_DESCRIPTIONToString(eDataType, instanceValue); + case EefPackage.EEF_FILL_LAYOUT_ORIENTATION: + return convertEEF_FILL_LAYOUT_ORIENTATIONToString(eDataType, instanceValue); default: throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -283,6 +294,28 @@ public class EefFactoryImpl extends EFactoryImpl implements EefFactory { * @generated */ @Override + public EEFFillLayoutDescription createEEFFillLayoutDescription() { + EEFFillLayoutDescriptionImpl eefFillLayoutDescription = new EEFFillLayoutDescriptionImpl(); + return eefFillLayoutDescription; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public EEFGridLayoutDescription createEEFGridLayoutDescription() { + EEFGridLayoutDescriptionImpl eefGridLayoutDescription = new EEFGridLayoutDescriptionImpl(); + return eefGridLayoutDescription; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public EEFTextDescription createEEFTextDescription() { EEFTextDescriptionImpl eefTextDescription = new EEFTextDescriptionImpl(); return eefTextDescription; @@ -568,6 +601,28 @@ public class EefFactoryImpl extends EFactoryImpl implements EefFactory { * * @generated */ + public EEF_FILL_LAYOUT_ORIENTATION createEEF_FILL_LAYOUT_ORIENTATIONFromString(EDataType eDataType, String initialValue) { + EEF_FILL_LAYOUT_ORIENTATION result = EEF_FILL_LAYOUT_ORIENTATION.get(initialValue); + if (result == null) { + throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + return result; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public String convertEEF_FILL_LAYOUT_ORIENTATIONToString(EDataType eDataType, Object instanceValue) { + return instanceValue == null ? null : instanceValue.toString(); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ @Override public EefPackage getEefPackage() { return (EefPackage) getEPackage(); diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EefPackageImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EefPackageImpl.java index ef152d4af..a2493885c 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EefPackageImpl.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EefPackageImpl.java @@ -16,16 +16,20 @@ import org.eclipse.eef.EEFCheckboxDescription; import org.eclipse.eef.EEFCheckboxStyle; import org.eclipse.eef.EEFConditionalStyle; import org.eclipse.eef.EEFContainerDescription; +import org.eclipse.eef.EEFControlDescription; import org.eclipse.eef.EEFCustomExpression; import org.eclipse.eef.EEFCustomWidgetConditionalStyle; import org.eclipse.eef.EEFCustomWidgetDescription; import org.eclipse.eef.EEFCustomWidgetStyle; import org.eclipse.eef.EEFDynamicMappingFor; import org.eclipse.eef.EEFDynamicMappingIf; +import org.eclipse.eef.EEFFillLayoutDescription; +import org.eclipse.eef.EEFGridLayoutDescription; import org.eclipse.eef.EEFGroupDescription; import org.eclipse.eef.EEFLabelConditionalStyle; import org.eclipse.eef.EEFLabelDescription; import org.eclipse.eef.EEFLabelStyle; +import org.eclipse.eef.EEFLayoutDescription; import org.eclipse.eef.EEFPageDescription; import org.eclipse.eef.EEFPropertyValidationRuleDescription; import org.eclipse.eef.EEFRadioConditionalStyle; @@ -121,6 +125,13 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { * * @generated */ + private EClass eefControlDescriptionEClass = null; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ private EClass eefContainerDescriptionEClass = null; /** @@ -128,6 +139,27 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { * * @generated */ + private EClass eefLayoutDescriptionEClass = null; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + private EClass eefFillLayoutDescriptionEClass = null; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + private EClass eefGridLayoutDescriptionEClass = null; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ private EClass eefWidgetDescriptionEClass = null; /** @@ -320,6 +352,13 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { private EEnum eeF_VALIDATION_SEVERITY_DESCRIPTIONEEnum = null; /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + private EEnum eeF_FILL_LAYOUT_ORIENTATIONEEnum = null; + + /** * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry * EPackage.Registry} by the package package URI value. * <p> @@ -740,7 +779,7 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { * @generated */ @Override - public EReference getEEFGroupDescription_Container() { + public EReference getEEFGroupDescription_Controls() { return (EReference) eefGroupDescriptionEClass.getEStructuralFeatures().get(5); } @@ -770,6 +809,26 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { * @generated */ @Override + public EClass getEEFControlDescription() { + return eefControlDescriptionEClass; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public EAttribute getEEFControlDescription_Identifier() { + return (EAttribute) eefControlDescriptionEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public EClass getEEFContainerDescription() { return eefContainerDescriptionEClass; } @@ -780,8 +839,8 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { * @generated */ @Override - public EAttribute getEEFContainerDescription_Identifier() { - return (EAttribute) eefContainerDescriptionEClass.getEStructuralFeatures().get(0); + public EReference getEEFContainerDescription_Controls() { + return (EReference) eefContainerDescriptionEClass.getEStructuralFeatures().get(0); } /** @@ -790,7 +849,7 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { * @generated */ @Override - public EReference getEEFContainerDescription_Widgets() { + public EReference getEEFContainerDescription_DynamicMappings() { return (EReference) eefContainerDescriptionEClass.getEStructuralFeatures().get(1); } @@ -800,7 +859,7 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { * @generated */ @Override - public EReference getEEFContainerDescription_DynamicMappings() { + public EReference getEEFContainerDescription_Layout() { return (EReference) eefContainerDescriptionEClass.getEStructuralFeatures().get(2); } @@ -810,8 +869,8 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { * @generated */ @Override - public EClass getEEFWidgetDescription() { - return eefWidgetDescriptionEClass; + public EClass getEEFLayoutDescription() { + return eefLayoutDescriptionEClass; } /** @@ -820,8 +879,58 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { * @generated */ @Override - public EAttribute getEEFWidgetDescription_Identifier() { - return (EAttribute) eefWidgetDescriptionEClass.getEStructuralFeatures().get(0); + public EClass getEEFFillLayoutDescription() { + return eefFillLayoutDescriptionEClass; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public EAttribute getEEFFillLayoutDescription_Orientation() { + return (EAttribute) eefFillLayoutDescriptionEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public EClass getEEFGridLayoutDescription() { + return eefGridLayoutDescriptionEClass; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public EAttribute getEEFGridLayoutDescription_NumberOfColumns() { + return (EAttribute) eefGridLayoutDescriptionEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public EAttribute getEEFGridLayoutDescription_MakeColumnsWithEqualWidth() { + return (EAttribute) eefGridLayoutDescriptionEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public EClass getEEFWidgetDescription() { + return eefWidgetDescriptionEClass; } /** @@ -831,7 +940,7 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { */ @Override public EAttribute getEEFWidgetDescription_LabelExpression() { - return (EAttribute) eefWidgetDescriptionEClass.getEStructuralFeatures().get(1); + return (EAttribute) eefWidgetDescriptionEClass.getEStructuralFeatures().get(0); } /** @@ -841,7 +950,7 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { */ @Override public EAttribute getEEFWidgetDescription_HelpExpression() { - return (EAttribute) eefWidgetDescriptionEClass.getEStructuralFeatures().get(2); + return (EAttribute) eefWidgetDescriptionEClass.getEStructuralFeatures().get(1); } /** @@ -851,7 +960,7 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { */ @Override public EReference getEEFWidgetDescription_PropertyValidationRules() { - return (EReference) eefWidgetDescriptionEClass.getEStructuralFeatures().get(3); + return (EReference) eefWidgetDescriptionEClass.getEStructuralFeatures().get(2); } /** @@ -1750,6 +1859,16 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { * @generated */ @Override + public EEnum getEEF_FILL_LAYOUT_ORIENTATION() { + return eeF_FILL_LAYOUT_ORIENTATIONEEnum; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public EefFactory getEefFactory() { return (EefFactory) getEFactoryInstance(); } @@ -1816,17 +1935,28 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { createEAttribute(eefGroupDescriptionEClass, EefPackage.EEF_GROUP_DESCRIPTION__DOMAIN_CLASS); createEAttribute(eefGroupDescriptionEClass, EefPackage.EEF_GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION); createEAttribute(eefGroupDescriptionEClass, EefPackage.EEF_GROUP_DESCRIPTION__PRECONDITION_EXPRESSION); - createEReference(eefGroupDescriptionEClass, EefPackage.EEF_GROUP_DESCRIPTION__CONTAINER); + createEReference(eefGroupDescriptionEClass, EefPackage.EEF_GROUP_DESCRIPTION__CONTROLS); createEReference(eefGroupDescriptionEClass, EefPackage.EEF_GROUP_DESCRIPTION__SEMANTIC_VALIDATION_RULES); createEReference(eefGroupDescriptionEClass, EefPackage.EEF_GROUP_DESCRIPTION__PROPERTY_VALIDATION_RULES); + eefControlDescriptionEClass = createEClass(EefPackage.EEF_CONTROL_DESCRIPTION); + createEAttribute(eefControlDescriptionEClass, EefPackage.EEF_CONTROL_DESCRIPTION__IDENTIFIER); + eefContainerDescriptionEClass = createEClass(EefPackage.EEF_CONTAINER_DESCRIPTION); - createEAttribute(eefContainerDescriptionEClass, EefPackage.EEF_CONTAINER_DESCRIPTION__IDENTIFIER); - createEReference(eefContainerDescriptionEClass, EefPackage.EEF_CONTAINER_DESCRIPTION__WIDGETS); + createEReference(eefContainerDescriptionEClass, EefPackage.EEF_CONTAINER_DESCRIPTION__CONTROLS); createEReference(eefContainerDescriptionEClass, EefPackage.EEF_CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS); + createEReference(eefContainerDescriptionEClass, EefPackage.EEF_CONTAINER_DESCRIPTION__LAYOUT); + + eefLayoutDescriptionEClass = createEClass(EefPackage.EEF_LAYOUT_DESCRIPTION); + + eefFillLayoutDescriptionEClass = createEClass(EefPackage.EEF_FILL_LAYOUT_DESCRIPTION); + createEAttribute(eefFillLayoutDescriptionEClass, EefPackage.EEF_FILL_LAYOUT_DESCRIPTION__ORIENTATION); + + eefGridLayoutDescriptionEClass = createEClass(EefPackage.EEF_GRID_LAYOUT_DESCRIPTION); + createEAttribute(eefGridLayoutDescriptionEClass, EefPackage.EEF_GRID_LAYOUT_DESCRIPTION__NUMBER_OF_COLUMNS); + createEAttribute(eefGridLayoutDescriptionEClass, EefPackage.EEF_GRID_LAYOUT_DESCRIPTION__MAKE_COLUMNS_WITH_EQUAL_WIDTH); eefWidgetDescriptionEClass = createEClass(EefPackage.EEF_WIDGET_DESCRIPTION); - createEAttribute(eefWidgetDescriptionEClass, EefPackage.EEF_WIDGET_DESCRIPTION__IDENTIFIER); createEAttribute(eefWidgetDescriptionEClass, EefPackage.EEF_WIDGET_DESCRIPTION__LABEL_EXPRESSION); createEAttribute(eefWidgetDescriptionEClass, EefPackage.EEF_WIDGET_DESCRIPTION__HELP_EXPRESSION); createEReference(eefWidgetDescriptionEClass, EefPackage.EEF_WIDGET_DESCRIPTION__PROPERTY_VALIDATION_RULES); @@ -1947,6 +2077,7 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { // Create enums eeF_VALIDATION_SEVERITY_DESCRIPTIONEEnum = createEEnum(EefPackage.EEF_VALIDATION_SEVERITY_DESCRIPTION); + eeF_FILL_LAYOUT_ORIENTATIONEEnum = createEEnum(EefPackage.EEF_FILL_LAYOUT_ORIENTATION); } /** @@ -1983,12 +2114,17 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { // Add supertypes to classes eefPropertyValidationRuleDescriptionEClass.getESuperTypes().add(this.getEEFValidationRuleDescription()); eefSemanticValidationRuleDescriptionEClass.getESuperTypes().add(this.getEEFValidationRuleDescription()); + eefContainerDescriptionEClass.getESuperTypes().add(this.getEEFControlDescription()); + eefFillLayoutDescriptionEClass.getESuperTypes().add(this.getEEFLayoutDescription()); + eefGridLayoutDescriptionEClass.getESuperTypes().add(this.getEEFLayoutDescription()); + eefWidgetDescriptionEClass.getESuperTypes().add(this.getEEFControlDescription()); eefTextDescriptionEClass.getESuperTypes().add(this.getEEFWidgetDescription()); eefLabelDescriptionEClass.getESuperTypes().add(this.getEEFWidgetDescription()); eefButtonDescriptionEClass.getESuperTypes().add(this.getEEFWidgetDescription()); eefCheckboxDescriptionEClass.getESuperTypes().add(this.getEEFWidgetDescription()); eefSelectDescriptionEClass.getESuperTypes().add(this.getEEFWidgetDescription()); eefRadioDescriptionEClass.getESuperTypes().add(this.getEEFWidgetDescription()); + eefDynamicMappingForEClass.getESuperTypes().add(this.getEEFControlDescription()); eefCustomWidgetDescriptionEClass.getESuperTypes().add(this.getEEFWidgetDescription()); eefTextStyleEClass.getESuperTypes().add(this.getEEFWidgetStyle()); eefLabelStyleEClass.getESuperTypes().add(this.getEEFWidgetStyle()); @@ -2150,10 +2286,10 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { theEcorePackage.getEString(), "preconditionExpression", null, 0, 1, EEFGroupDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ initEReference( - getEEFGroupDescription_Container(), - this.getEEFContainerDescription(), + getEEFGroupDescription_Controls(), + this.getEEFControlDescription(), null, - "container", null, 1, 1, EEFGroupDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ + "controls", null, 1, -1, EEFGroupDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ initEReference( getEEFGroupDescription_SemanticValidationRules(), this.getEEFSemanticValidationRuleDescription(), @@ -2165,30 +2301,55 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { null, "propertyValidationRules", null, 0, -1, EEFGroupDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ - initEClass(eefContainerDescriptionEClass, EEFContainerDescription.class, - "EEFContainerDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEClass(eefControlDescriptionEClass, EEFControlDescription.class, + "EEFControlDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEAttribute( - getEEFContainerDescription_Identifier(), + getEEFControlDescription_Identifier(), ecorePackage.getEString(), - "identifier", null, 1, 1, EEFContainerDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ + "identifier", null, 1, 1, EEFControlDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ + + initEClass(eefContainerDescriptionEClass, EEFContainerDescription.class, + "EEFContainerDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEReference( - getEEFContainerDescription_Widgets(), - this.getEEFWidgetDescription(), + getEEFContainerDescription_Controls(), + this.getEEFControlDescription(), null, - "widgets", null, 1, -1, EEFContainerDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ + "controls", null, 1, -1, EEFContainerDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ initEReference( getEEFContainerDescription_DynamicMappings(), this.getEEFDynamicMappingFor(), null, "dynamicMappings", null, 0, -1, EEFContainerDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ + initEReference( + getEEFContainerDescription_Layout(), + this.getEEFLayoutDescription(), + null, + "layout", null, 0, 1, EEFContainerDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ + + initEClass(eefLayoutDescriptionEClass, EEFLayoutDescription.class, + "EEFLayoutDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + + initEClass(eefFillLayoutDescriptionEClass, EEFFillLayoutDescription.class, + "EEFFillLayoutDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEAttribute( + getEEFFillLayoutDescription_Orientation(), + this.getEEF_FILL_LAYOUT_ORIENTATION(), + "orientation", "VERTICAL", 0, 1, EEFFillLayoutDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ + + initEClass(eefGridLayoutDescriptionEClass, EEFGridLayoutDescription.class, + "EEFGridLayoutDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEAttribute( + getEEFGridLayoutDescription_NumberOfColumns(), + theEcorePackage.getEInt(), + "numberOfColumns", "1", 0, 1, EEFGridLayoutDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ + initEAttribute( + getEEFGridLayoutDescription_MakeColumnsWithEqualWidth(), + theEcorePackage.getEBoolean(), + "makeColumnsWithEqualWidth", "1", 0, 1, EEFGridLayoutDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ initEClass(eefWidgetDescriptionEClass, EEFWidgetDescription.class, "EEFWidgetDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEAttribute( - getEEFWidgetDescription_Identifier(), - ecorePackage.getEString(), - "identifier", null, 1, 1, EEFWidgetDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ - initEAttribute( getEEFWidgetDescription_LabelExpression(), ecorePackage.getEString(), "labelExpression", null, 0, 1, EEFWidgetDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ @@ -2559,6 +2720,10 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { addEEnumLiteral(eeF_VALIDATION_SEVERITY_DESCRIPTIONEEnum, org.eclipse.eef.EEF_VALIDATION_SEVERITY_DESCRIPTION.WARNING); addEEnumLiteral(eeF_VALIDATION_SEVERITY_DESCRIPTIONEEnum, org.eclipse.eef.EEF_VALIDATION_SEVERITY_DESCRIPTION.ERROR); + initEEnum(eeF_FILL_LAYOUT_ORIENTATIONEEnum, org.eclipse.eef.EEF_FILL_LAYOUT_ORIENTATION.class, "EEF_FILL_LAYOUT_ORIENTATION"); //$NON-NLS-1$ + addEEnumLiteral(eeF_FILL_LAYOUT_ORIENTATIONEEnum, org.eclipse.eef.EEF_FILL_LAYOUT_ORIENTATION.VERTICAL); + addEEnumLiteral(eeF_FILL_LAYOUT_ORIENTATIONEEnum, org.eclipse.eef.EEF_FILL_LAYOUT_ORIENTATION.HORIZONTAL); + // Create resource createResource(EefPackage.eNS_URI); } diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/util/EefAdapterFactory.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/util/EefAdapterFactory.java index bdd97daf1..e6ea1e47b 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/util/EefAdapterFactory.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/util/EefAdapterFactory.java @@ -16,16 +16,20 @@ import org.eclipse.eef.EEFCheckboxDescription; import org.eclipse.eef.EEFCheckboxStyle; import org.eclipse.eef.EEFConditionalStyle; import org.eclipse.eef.EEFContainerDescription; +import org.eclipse.eef.EEFControlDescription; import org.eclipse.eef.EEFCustomExpression; import org.eclipse.eef.EEFCustomWidgetConditionalStyle; import org.eclipse.eef.EEFCustomWidgetDescription; import org.eclipse.eef.EEFCustomWidgetStyle; import org.eclipse.eef.EEFDynamicMappingFor; import org.eclipse.eef.EEFDynamicMappingIf; +import org.eclipse.eef.EEFFillLayoutDescription; +import org.eclipse.eef.EEFGridLayoutDescription; import org.eclipse.eef.EEFGroupDescription; import org.eclipse.eef.EEFLabelConditionalStyle; import org.eclipse.eef.EEFLabelDescription; import org.eclipse.eef.EEFLabelStyle; +import org.eclipse.eef.EEFLayoutDescription; import org.eclipse.eef.EEFPageDescription; import org.eclipse.eef.EEFPropertyValidationRuleDescription; import org.eclipse.eef.EEFRadioConditionalStyle; @@ -142,11 +146,31 @@ public class EefAdapterFactory extends AdapterFactoryImpl { } @Override + public Adapter caseEEFControlDescription(EEFControlDescription object) { + return createEEFControlDescriptionAdapter(); + } + + @Override public Adapter caseEEFContainerDescription(EEFContainerDescription object) { return createEEFContainerDescriptionAdapter(); } @Override + public Adapter caseEEFLayoutDescription(EEFLayoutDescription object) { + return createEEFLayoutDescriptionAdapter(); + } + + @Override + public Adapter caseEEFFillLayoutDescription(EEFFillLayoutDescription object) { + return createEEFFillLayoutDescriptionAdapter(); + } + + @Override + public Adapter caseEEFGridLayoutDescription(EEFGridLayoutDescription object) { + return createEEFGridLayoutDescriptionAdapter(); + } + + @Override public Adapter caseEEFWidgetDescription(EEFWidgetDescription object) { return createEEFWidgetDescriptionAdapter(); } @@ -413,6 +437,20 @@ public class EefAdapterFactory extends AdapterFactoryImpl { } /** + * Creates a new adapter for an object of class '{@link org.eclipse.eef.EEFControlDescription + * <em>EEF Control Description</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we + * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- + * end-user-doc --> + * + * @return the new adapter. + * @see org.eclipse.eef.EEFControlDescription + * @generated + */ + public Adapter createEEFControlDescriptionAdapter() { + return null; + } + + /** * Creates a new adapter for an object of class '{@link org.eclipse.eef.EEFContainerDescription * <em>EEF Container Description</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- @@ -427,6 +465,48 @@ public class EefAdapterFactory extends AdapterFactoryImpl { } /** + * Creates a new adapter for an object of class '{@link org.eclipse.eef.EEFLayoutDescription + * <em>EEF Layout Description</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we + * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- + * end-user-doc --> + * + * @return the new adapter. + * @see org.eclipse.eef.EEFLayoutDescription + * @generated + */ + public Adapter createEEFLayoutDescriptionAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.eef.EEFFillLayoutDescription + * <em>EEF Fill Layout Description</em>}'. <!-- begin-user-doc --> This default implementation returns null so that + * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- + * end-user-doc --> + * + * @return the new adapter. + * @see org.eclipse.eef.EEFFillLayoutDescription + * @generated + */ + public Adapter createEEFFillLayoutDescriptionAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.eef.EEFGridLayoutDescription + * <em>EEF Grid Layout Description</em>}'. <!-- begin-user-doc --> This default implementation returns null so that + * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- + * end-user-doc --> + * + * @return the new adapter. + * @see org.eclipse.eef.EEFGridLayoutDescription + * @generated + */ + public Adapter createEEFGridLayoutDescriptionAdapter() { + return null; + } + + /** * Creates a new adapter for an object of class '{@link org.eclipse.eef.EEFWidgetDescription * <em>EEF Widget Description</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/util/EefSwitch.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/util/EefSwitch.java index 22f12d0b9..de3bb4ef3 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/util/EefSwitch.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/util/EefSwitch.java @@ -16,16 +16,20 @@ import org.eclipse.eef.EEFCheckboxDescription; import org.eclipse.eef.EEFCheckboxStyle; import org.eclipse.eef.EEFConditionalStyle; import org.eclipse.eef.EEFContainerDescription; +import org.eclipse.eef.EEFControlDescription; import org.eclipse.eef.EEFCustomExpression; import org.eclipse.eef.EEFCustomWidgetConditionalStyle; import org.eclipse.eef.EEFCustomWidgetDescription; import org.eclipse.eef.EEFCustomWidgetStyle; import org.eclipse.eef.EEFDynamicMappingFor; import org.eclipse.eef.EEFDynamicMappingIf; +import org.eclipse.eef.EEFFillLayoutDescription; +import org.eclipse.eef.EEFGridLayoutDescription; import org.eclipse.eef.EEFGroupDescription; import org.eclipse.eef.EEFLabelConditionalStyle; import org.eclipse.eef.EEFLabelDescription; import org.eclipse.eef.EEFLabelStyle; +import org.eclipse.eef.EEFLayoutDescription; import org.eclipse.eef.EEFPageDescription; import org.eclipse.eef.EEFPropertyValidationRuleDescription; import org.eclipse.eef.EEFRadioConditionalStyle; @@ -169,10 +173,51 @@ public class EefSwitch<T> extends Switch<T> { } return result; } + case EefPackage.EEF_CONTROL_DESCRIPTION: { + EEFControlDescription eefControlDescription = (EEFControlDescription) theEObject; + T result = caseEEFControlDescription(eefControlDescription); + if (result == null) { + result = defaultCase(theEObject); + } + return result; + } case EefPackage.EEF_CONTAINER_DESCRIPTION: { EEFContainerDescription eefContainerDescription = (EEFContainerDescription) theEObject; T result = caseEEFContainerDescription(eefContainerDescription); if (result == null) { + result = caseEEFControlDescription(eefContainerDescription); + } + if (result == null) { + result = defaultCase(theEObject); + } + return result; + } + case EefPackage.EEF_LAYOUT_DESCRIPTION: { + EEFLayoutDescription eefLayoutDescription = (EEFLayoutDescription) theEObject; + T result = caseEEFLayoutDescription(eefLayoutDescription); + if (result == null) { + result = defaultCase(theEObject); + } + return result; + } + case EefPackage.EEF_FILL_LAYOUT_DESCRIPTION: { + EEFFillLayoutDescription eefFillLayoutDescription = (EEFFillLayoutDescription) theEObject; + T result = caseEEFFillLayoutDescription(eefFillLayoutDescription); + if (result == null) { + result = caseEEFLayoutDescription(eefFillLayoutDescription); + } + if (result == null) { + result = defaultCase(theEObject); + } + return result; + } + case EefPackage.EEF_GRID_LAYOUT_DESCRIPTION: { + EEFGridLayoutDescription eefGridLayoutDescription = (EEFGridLayoutDescription) theEObject; + T result = caseEEFGridLayoutDescription(eefGridLayoutDescription); + if (result == null) { + result = caseEEFLayoutDescription(eefGridLayoutDescription); + } + if (result == null) { result = defaultCase(theEObject); } return result; @@ -181,6 +226,9 @@ public class EefSwitch<T> extends Switch<T> { EEFWidgetDescription eefWidgetDescription = (EEFWidgetDescription) theEObject; T result = caseEEFWidgetDescription(eefWidgetDescription); if (result == null) { + result = caseEEFControlDescription(eefWidgetDescription); + } + if (result == null) { result = defaultCase(theEObject); } return result; @@ -192,6 +240,9 @@ public class EefSwitch<T> extends Switch<T> { result = caseEEFWidgetDescription(eefTextDescription); } if (result == null) { + result = caseEEFControlDescription(eefTextDescription); + } + if (result == null) { result = defaultCase(theEObject); } return result; @@ -203,6 +254,9 @@ public class EefSwitch<T> extends Switch<T> { result = caseEEFWidgetDescription(eefLabelDescription); } if (result == null) { + result = caseEEFControlDescription(eefLabelDescription); + } + if (result == null) { result = defaultCase(theEObject); } return result; @@ -214,6 +268,9 @@ public class EefSwitch<T> extends Switch<T> { result = caseEEFWidgetDescription(eefButtonDescription); } if (result == null) { + result = caseEEFControlDescription(eefButtonDescription); + } + if (result == null) { result = defaultCase(theEObject); } return result; @@ -225,6 +282,9 @@ public class EefSwitch<T> extends Switch<T> { result = caseEEFWidgetDescription(eefCheckboxDescription); } if (result == null) { + result = caseEEFControlDescription(eefCheckboxDescription); + } + if (result == null) { result = defaultCase(theEObject); } return result; @@ -236,6 +296,9 @@ public class EefSwitch<T> extends Switch<T> { result = caseEEFWidgetDescription(eefSelectDescription); } if (result == null) { + result = caseEEFControlDescription(eefSelectDescription); + } + if (result == null) { result = defaultCase(theEObject); } return result; @@ -247,6 +310,9 @@ public class EefSwitch<T> extends Switch<T> { result = caseEEFWidgetDescription(eefRadioDescription); } if (result == null) { + result = caseEEFControlDescription(eefRadioDescription); + } + if (result == null) { result = defaultCase(theEObject); } return result; @@ -255,6 +321,9 @@ public class EefSwitch<T> extends Switch<T> { EEFDynamicMappingFor eefDynamicMappingFor = (EEFDynamicMappingFor) theEObject; T result = caseEEFDynamicMappingFor(eefDynamicMappingFor); if (result == null) { + result = caseEEFControlDescription(eefDynamicMappingFor); + } + if (result == null) { result = defaultCase(theEObject); } return result; @@ -274,6 +343,9 @@ public class EefSwitch<T> extends Switch<T> { result = caseEEFWidgetDescription(eefCustomWidgetDescription); } if (result == null) { + result = caseEEFControlDescription(eefCustomWidgetDescription); + } + if (result == null) { result = defaultCase(theEObject); } return result; @@ -584,6 +656,21 @@ public class EefSwitch<T> extends Switch<T> { } /** + * Returns the result of interpreting the object as an instance of '<em>EEF Control Description</em>'. <!-- + * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!-- + * end-user-doc --> + * + * @param object + * the target of the switch. + * @return the result of interpreting the object as an instance of '<em>EEF Control Description</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseEEFControlDescription(EEFControlDescription object) { + return null; + } + + /** * Returns the result of interpreting the object as an instance of '<em>EEF Container Description</em>'. <!-- * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!-- * end-user-doc --> @@ -599,6 +686,51 @@ public class EefSwitch<T> extends Switch<T> { } /** + * Returns the result of interpreting the object as an instance of '<em>EEF Layout Description</em>'. <!-- + * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!-- + * end-user-doc --> + * + * @param object + * the target of the switch. + * @return the result of interpreting the object as an instance of '<em>EEF Layout Description</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseEEFLayoutDescription(EEFLayoutDescription object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>EEF Fill Layout Description</em>'. <!-- + * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!-- + * end-user-doc --> + * + * @param object + * the target of the switch. + * @return the result of interpreting the object as an instance of '<em>EEF Fill Layout Description</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseEEFFillLayoutDescription(EEFFillLayoutDescription object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>EEF Grid Layout Description</em>'. <!-- + * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!-- + * end-user-doc --> + * + * @param object + * the target of the switch. + * @return the result of interpreting the object as an instance of '<em>EEF Grid Layout Description</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseEEFGridLayoutDescription(EEFGridLayoutDescription object) { + return null; + } + + /** * Returns the result of interpreting the object as an instance of '<em>EEF Widget Description</em>'. <!-- * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!-- * end-user-doc --> diff --git a/samples/org.eclipse.eef.sample.custom.widget.colorpicker/META-INF/MANIFEST.MF b/samples/org.eclipse.eef.sample.custom.widget.colorpicker/META-INF/MANIFEST.MF index 15c4c1814..93feae582 100644 --- a/samples/org.eclipse.eef.sample.custom.widget.colorpicker/META-INF/MANIFEST.MF +++ b/samples/org.eclipse.eef.sample.custom.widget.colorpicker/META-INF/MANIFEST.MF @@ -15,7 +15,6 @@ Import-Package: org.eclipse.eef;version="[1.6.0,2.0.0)", Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.emf.common;bundle-version="[2.8.0,3.0.0)", org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)", - org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)", org.eclipse.eef.properties.ui;bundle-version="[1.6.0,2.0.0)", org.eclipse.swt;bundle-version="[3.0.0,4.0.0)", org.eclipse.ui.forms;bundle-version="[3.5.200,4.0.0)", diff --git a/samples/org.eclipse.eef.sample.custom.widget.colorpicker/build.properties b/samples/org.eclipse.eef.sample.custom.widget.colorpicker/build.properties index bb85c49f5..3d0697db5 100644 --- a/samples/org.eclipse.eef.sample.custom.widget.colorpicker/build.properties +++ b/samples/org.eclipse.eef.sample.custom.widget.colorpicker/build.properties @@ -14,4 +14,3 @@ bin.includes = META-INF/,\ plugin.xml,\ icons/ javacProjectSettings = true -additional.bundles = org.eclipse.emf.transaction diff --git a/samples/org.eclipse.eef.sample.custom.widget.colorpicker/src/org/eclipse/eef/sample/custom/widget/colorpicker/ColorPickerLifecycleManager.java b/samples/org.eclipse.eef.sample.custom.widget.colorpicker/src/org/eclipse/eef/sample/custom/widget/colorpicker/ColorPickerLifecycleManager.java index 87a8e114c..90651fd6c 100644 --- a/samples/org.eclipse.eef.sample.custom.widget.colorpicker/src/org/eclipse/eef/sample/custom/widget/colorpicker/ColorPickerLifecycleManager.java +++ b/samples/org.eclipse.eef.sample.custom.widget.colorpicker/src/org/eclipse/eef/sample/custom/widget/colorpicker/ColorPickerLifecycleManager.java @@ -31,8 +31,6 @@ import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; -import org.eclipse.swt.layout.FormAttachment; -import org.eclipse.swt.layout.FormData; import org.eclipse.swt.widgets.ColorDialog; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -87,16 +85,10 @@ public class ColorPickerLifecycleManager extends AbstractEEFWidgetLifecycleManag protected void createMainControl(Composite parent, IEEFFormContainer formContainer) { EEFWidgetFactory widgetFactory = formContainer.getWidgetFactory(); - FormData formData = new FormData(); - formData.left = new FormAttachment(0, LABEL_WIDTH); - formData.right = new FormAttachment(100, 0); - // Create the color picker this.colorPicker = new ColorPicker(parent); widgetFactory.paintBordersFor(parent); - this.colorPicker.setLayoutData(formData); - this.controller = new ColorPickerController(this.description, this.variableManager, this.interpreter, this.contextAdapter); } diff --git a/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF index 63e2ec39b..e5ca143f5 100644 --- a/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF @@ -12,7 +12,6 @@ Export-Package: org.eclipse.eef.tests.internal;version="1.6.0";x-internal:=true, Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)", org.eclipse.eef;bundle-version="[1.6.0,2.0.0)", org.eclipse.eef.core;bundle-version="[1.6.0,2.0.0)", - org.eclipse.emf.transaction;bundle-version="[1.8.0,2.0.0)", org.eclipse.sirius.common.interpreter;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.ecore.xmi;bundle-version="[2.8.0,3.0.0)", org.eclipse.acceleo.query;bundle-version="[5.0.0,6.0.0)", diff --git a/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-ButtonLabel.xmi b/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-ButtonLabel.xmi index 306641952..99325c920 100644 --- a/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-ButtonLabel.xmi +++ b/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-ButtonLabel.xmi @@ -6,12 +6,10 @@ xmlns:eef="http://www.eclipse.org/eef" xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore"> <groups> - <container> - <widgets - xsi:type="eef:EEFButtonDescription" - labelExpression="" - buttonLabelExpression="aql:'OK'"/> - </container> + <controls + xsi:type="eef:EEFButtonDescription" + labelExpression="" + buttonLabelExpression="aql:'OK'"/> </groups> <pages groups="//@groups.0"/> </eef:EEFViewDescription> diff --git a/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-Help.xmi b/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-Help.xmi index 86936be28..82d1d002f 100644 --- a/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-Help.xmi +++ b/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-Help.xmi @@ -6,12 +6,10 @@ xmlns:eef="http://www.eclipse.org/eef" xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore"> <groups> - <container> - <widgets - xsi:type="eef:EEFButtonDescription" - labelExpression="" - helpExpression="aql:'Click on the button'"/> - </container> + <controls + xsi:type="eef:EEFButtonDescription" + labelExpression="" + helpExpression="aql:'Click on the button'"/> </groups> <pages groups="//@groups.0"/> </eef:EEFViewDescription> diff --git a/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-Label.xmi b/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-Label.xmi index ca0312626..5d47be7ac 100644 --- a/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-Label.xmi +++ b/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-Label.xmi @@ -6,11 +6,9 @@ xmlns:eef="http://www.eclipse.org/eef" xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore"> <groups> - <container> - <widgets - xsi:type="eef:EEFButtonDescription" - labelExpression="aql:'Click:'"/> - </container> + <controls + xsi:type="eef:EEFButtonDescription" + labelExpression="aql:'Click:'"/> </groups> <pages groups="//@groups.0"/> </eef:EEFViewDescription> diff --git a/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Help.xmi b/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Help.xmi index 979608fe0..b664ebf5a 100644 --- a/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Help.xmi +++ b/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Help.xmi @@ -6,12 +6,9 @@ xmlns:eef="http://www.eclipse.org/eef" xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore"> <groups> - <container> - <widgets - xsi:type="eef:EEFCheckboxDescription" - labelExpression="" - helpExpression="aql:'Abstract Help'"/> - </container> + <controls + xsi:type="eef:EEFCheckboxDescription" + helpExpression="aql:'Abstract Help'"/> </groups> <pages groups="//@groups.0"/> </eef:EEFViewDescription> diff --git a/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Label.xmi b/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Label.xmi index 91b4d939f..f47c3b986 100644 --- a/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Label.xmi +++ b/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Label.xmi @@ -6,11 +6,9 @@ xmlns:eef="http://www.eclipse.org/eef" xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore"> <groups> - <container> - <widgets - xsi:type="eef:EEFCheckboxDescription" - labelExpression="aql:'Abstract:'"/> - </container> + <controls + xsi:type="eef:EEFCheckboxDescription" + labelExpression="aql:'Abstract:'"/> </groups> <pages groups="//@groups.0"/> </eef:EEFViewDescription> diff --git a/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Value.xmi b/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Value.xmi index 60077d60e..8a9dbd408 100644 --- a/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Value.xmi +++ b/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Value.xmi @@ -6,13 +6,9 @@ xmlns:eef="http://www.eclipse.org/eef" xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore"> <groups> - <container> - <widgets - xsi:type="eef:EEFCheckboxDescription" - labelExpression="" - helpExpression="" - valueExpression="aql:true"/> - </container> + <controls + xsi:type="eef:EEFCheckboxDescription" + valueExpression="aql:true"/> </groups> <pages groups="//@groups.0"/> </eef:EEFViewDescription> diff --git a/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Body.xmi b/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Body.xmi index 9d194df32..dc57ec1a0 100644 --- a/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Body.xmi +++ b/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Body.xmi @@ -6,14 +6,9 @@ xmlns:eef="http://www.eclipse.org/eef" xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore"> <groups> - <container> - <widgets - xsi:type="eef:EEFLabelDescription" - identifier="" - labelExpression="" - helpExpression="" - bodyExpression="aql:'This is the documentation of the project'"/> - </container> + <controls + xsi:type="eef:EEFLabelDescription" + bodyExpression="aql:'This is the documentation of the project'"/> </groups> <pages groups="//@groups.0"/> </eef:EEFViewDescription> diff --git a/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Help.xmi b/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Help.xmi index 0ea5d6c68..a73b24943 100644 --- a/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Help.xmi +++ b/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Help.xmi @@ -6,11 +6,9 @@ xmlns:eef="http://www.eclipse.org/eef" xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore"> <groups> - <container> - <widgets - xsi:type="eef:EEFLabelDescription" - helpExpression="aql:'Documentation Help'"/> - </container> + <controls + xsi:type="eef:EEFLabelDescription" + helpExpression="aql:'Documentation Help'"/> </groups> <pages groups="//@groups.0"/> </eef:EEFViewDescription> diff --git a/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Label.xmi b/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Label.xmi index e9728cdc3..f9a93b5a1 100644 --- a/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Label.xmi +++ b/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Label.xmi @@ -6,13 +6,9 @@ xmlns:eef="http://www.eclipse.org/eef" xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore"> <groups> - <container> - <widgets - xsi:type="eef:EEFLabelDescription" - identifier="" - labelExpression="aql:'Documentation:'" - helpExpression=""/> - </container> + <controls + xsi:type="eef:EEFLabelDescription" + labelExpression="aql:'Documentation:'"/> </groups> <pages groups="//@groups.0"/> </eef:EEFViewDescription> diff --git a/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Help.xmi b/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Help.xmi index fa6549192..ecaef9dbd 100644 --- a/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Help.xmi +++ b/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Help.xmi @@ -6,13 +6,9 @@ xmlns:eef="http://www.eclipse.org/eef" xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore"> <groups> - <container> - <widgets - xsi:type="eef:EEFRadioDescription" - labelExpression="" - helpExpression="aql:'Visibility Help'" - editExpression=""/> - </container> + <controls + xsi:type="eef:EEFRadioDescription" + helpExpression="aql:'Visibility Help'"/> </groups> <pages groups="//@groups.0"/> </eef:EEFViewDescription> diff --git a/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Label.xmi b/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Label.xmi index 1796c5e4f..fa33b720f 100644 --- a/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Label.xmi +++ b/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Label.xmi @@ -6,11 +6,9 @@ xmlns:eef="http://www.eclipse.org/eef" xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore"> <groups> - <container> - <widgets - xsi:type="eef:EEFRadioDescription" - labelExpression="aql:'Visibility:'"/> - </container> + <controls + xsi:type="eef:EEFRadioDescription" + labelExpression="aql:'Visibility:'"/> </groups> <pages groups="//@groups.0"/> </eef:EEFViewDescription> diff --git a/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Value.xmi b/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Value.xmi index a45003da3..555335357 100644 --- a/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Value.xmi +++ b/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Value.xmi @@ -6,12 +6,9 @@ xmlns:eef="http://www.eclipse.org/eef" xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore"> <groups> - <container> - <widgets - xsi:type="eef:EEFRadioDescription" - labelExpression="" - valueExpression="aql:'public'"/> - </container> + <controls + xsi:type="eef:EEFRadioDescription" + valueExpression="aql:'public'"/> </groups> <pages groups="//@groups.0"/> </eef:EEFViewDescription> diff --git a/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Help.xmi b/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Help.xmi index 55e938547..511f1e7ff 100644 --- a/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Help.xmi +++ b/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Help.xmi @@ -6,11 +6,9 @@ xmlns:eef="http://www.eclipse.org/eef" xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore"> <groups> - <container> - <widgets - xsi:type="eef:EEFSelectDescription" - helpExpression="aql:'Visibility Help'"/> - </container> + <controls + xsi:type="eef:EEFSelectDescription" + helpExpression="aql:'Visibility Help'"/> </groups> <pages groups="//@groups.0"/> </eef:EEFViewDescription> diff --git a/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Label.xmi b/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Label.xmi index fbf6b4f38..959dcfab7 100644 --- a/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Label.xmi +++ b/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Label.xmi @@ -6,11 +6,9 @@ xmlns:eef="http://www.eclipse.org/eef" xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore"> <groups> - <container> - <widgets - xsi:type="eef:EEFSelectDescription" - labelExpression="aql:'Visibility:'"/> - </container> + <controls + xsi:type="eef:EEFSelectDescription" + labelExpression="aql:'Visibility:'"/> </groups> <pages groups="//@groups.0"/> </eef:EEFViewDescription> diff --git a/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Value.xmi b/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Value.xmi index 755d59692..99824acb7 100644 --- a/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Value.xmi +++ b/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Value.xmi @@ -6,11 +6,9 @@ xmlns:eef="http://www.eclipse.org/eef" xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore"> <groups> - <container> - <widgets - xsi:type="eef:EEFSelectDescription" - valueExpression="aql:'public'"/> - </container> + <controls + xsi:type="eef:EEFSelectDescription" + valueExpression="aql:'public'"/> </groups> <pages groups="//@groups.0"/> </eef:EEFViewDescription> diff --git a/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Help.xmi b/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Help.xmi index e47bbdadb..505a77b91 100644 --- a/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Help.xmi +++ b/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Help.xmi @@ -6,13 +6,9 @@ xmlns:eef="http://www.eclipse.org/eef" xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore"> <groups> - <container> - <widgets - xsi:type="eef:EEFTextDescription" - labelExpression="" - helpExpression="aql:'Project Help'" - valueExpression=""/> - </container> + <controls + xsi:type="eef:EEFTextDescription" + helpExpression="aql:'Project Help'"/> </groups> <pages groups="//@groups.0"/> </eef:EEFViewDescription> diff --git a/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Label.xmi b/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Label.xmi index c1cb5b7be..266374fd7 100644 --- a/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Label.xmi +++ b/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Label.xmi @@ -6,12 +6,9 @@ xmlns:eef="http://www.eclipse.org/eef" xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore"> <groups> - <container> - <widgets - xsi:type="eef:EEFTextDescription" - labelExpression="aql:self.name.toUpperFirst() + ':'" - valueExpression=""/> - </container> + <controls + xsi:type="eef:EEFTextDescription" + labelExpression="aql:self.name.toUpperFirst() + ':'"/> </groups> <pages groups="//@groups.0"/> </eef:EEFViewDescription> diff --git a/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Value.xmi b/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Value.xmi index 5fb060d8a..b62ecf094 100644 --- a/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Value.xmi +++ b/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Value.xmi @@ -6,11 +6,9 @@ xmlns:eef="http://www.eclipse.org/eef" xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore"> <groups> - <container> - <widgets - xsi:type="eef:EEFTextDescription" - valueExpression="aql:self.name"/> - </container> + <controls + xsi:type="eef:EEFTextDescription" + valueExpression="aql:self.name"/> </groups> <pages groups="//@groups.0"/> </eef:EEFViewDescription> diff --git a/tests/org.eclipse.eef.tests/src/org/eclipse/eef/tests/internal/controllers/AbstractEEFControllerTests.java b/tests/org.eclipse.eef.tests/src/org/eclipse/eef/tests/internal/controllers/AbstractEEFControllerTests.java index 8ce854aa7..75982dc20 100644 --- a/tests/org.eclipse.eef.tests/src/org/eclipse/eef/tests/internal/controllers/AbstractEEFControllerTests.java +++ b/tests/org.eclipse.eef.tests/src/org/eclipse/eef/tests/internal/controllers/AbstractEEFControllerTests.java @@ -24,7 +24,6 @@ import org.eclipse.eef.core.api.EditingContextAdapter; import org.eclipse.eef.core.api.controllers.IEEFWidgetController; import org.eclipse.eef.tests.internal.AQLInterpreter; import org.eclipse.eef.tests.internal.EEFDataTests; -import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; @@ -32,7 +31,6 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl; import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; -import org.eclipse.emf.edit.provider.ComposedAdapterFactory; import org.eclipse.sirius.common.interpreter.api.IInterpreter; import org.eclipse.sirius.common.interpreter.api.IVariableManager; import org.eclipse.sirius.common.interpreter.api.VariableManagerFactory; @@ -41,6 +39,7 @@ import org.junit.Before; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.notNullValue; + import static org.junit.Assert.assertTrue; /** @@ -76,8 +75,6 @@ public abstract class AbstractEEFControllerTests { this.resourceSet.getPackageRegistry().put(EefPackage.eNS_URI, EefPackage.eINSTANCE); this.resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("xmi", new XMIResourceFactoryImpl()); //$NON-NLS-1$ this.resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("ecore", new EcoreResourceFactoryImpl()); //$NON-NLS-1$ - - AdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE); this.interpreter = new AQLInterpreter(); } @@ -101,8 +98,8 @@ public abstract class AbstractEEFControllerTests { } protected <T extends EEFWidgetDescription> T widget(EEFGroupDescription eefGroupDescription, Class<T> clazz, int widgetIndex) { - List<T> list = eefGroupDescription.getContainer().getWidgets().stream().filter(w -> clazz.isAssignableFrom(w.getClass())) - .map(w -> clazz.cast(w)).collect(Collectors.toList()); + List<T> list = eefGroupDescription.getControls().stream().filter(w -> clazz.isAssignableFrom(w.getClass())).map(w -> clazz.cast(w)) + .collect(Collectors.toList()); return list.get(widgetIndex); } |
