diff options
69 files changed, 819 insertions, 142 deletions
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IEEFButtonController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IEEFButtonController.java index 0e67a7054..61bfc6479 100644 --- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IEEFButtonController.java +++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IEEFButtonController.java @@ -35,6 +35,19 @@ public interface IEEFButtonController extends IEEFWidgetController { void removeNewButtonLabelConsumer(); /** + * Register a consumer which will be called with the new value of the button's image when it will change. + * + * @param consumer + * The consumer of the new value of the button's image + */ + void onNewButtonImage(Consumer<Object> consumer); + + /** + * Remove the consumer of the new value of the button's image. + */ + void removeNewButtonImageConsumer(); + + /** * Invoked when the user pushes the button. * * @return the status of the pushed execution. diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFButtonController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFButtonController.java index 428c57d8e..a7a4f89e1 100644 --- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFButtonController.java +++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFButtonController.java @@ -41,6 +41,11 @@ public class EEFButtonController extends AbstractEEFWidgetController implements private Consumer<String> newButtonLabelConsumer; /** + * The consumer of a new value of the button's image. + */ + private Consumer<Object> newButtonImageConsumer; + + /** * The constructor. * * @param description @@ -69,6 +74,16 @@ public class EEFButtonController extends AbstractEEFWidgetController implements } @Override + public void onNewButtonImage(Consumer<Object> consumer) { + this.newButtonImageConsumer = consumer; + } + + @Override + public void removeNewButtonImageConsumer() { + this.newButtonImageConsumer = null; + } + + @Override protected EEFWidgetDescription getDescription() { return this.description; } @@ -77,10 +92,17 @@ public class EEFButtonController extends AbstractEEFWidgetController implements public void refresh() { super.refresh(); + String imageExpression = Optional.ofNullable(this.description.getImageExpression()).orElse(""); //$NON-NLS-1$ + if (!imageExpression.isEmpty()) { + this.newEval().logIfInvalidType(Object.class).call(imageExpression, this.newButtonImageConsumer); + } + String buttonLabelExpression = this.description.getButtonLabelExpression(); - Optional.ofNullable(this.newButtonLabelConsumer).ifPresent(consumer -> { - this.newEval().logIfInvalidType(String.class).defaultValue("...").call(buttonLabelExpression, consumer); //$NON-NLS-1$ - }); + if (!imageExpression.isEmpty()) { + this.newEval().logIfInvalidType(String.class).call(buttonLabelExpression, this.newButtonLabelConsumer); + } else { + this.newEval().logIfInvalidType(String.class).defaultValue("...").call(buttonLabelExpression, this.newButtonLabelConsumer); //$NON-NLS-1$ + } } @Override diff --git a/plugins/org.eclipse.eef.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.edit/META-INF/MANIFEST.MF index 68e9848ff..ed21e4313 100644 --- a/plugins/org.eclipse.eef.edit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.eef.edit/META-INF/MANIFEST.MF @@ -10,8 +10,8 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.eef.provider;version="2.0.0" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", - org.eclipse.eef;bundle-version="[2.0.0, 3.0.0)", - org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)", - org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)", - org.eclipse.emf.ecore.edit;bundle-version="[2.8.0,3.0.0)" + org.eclipse.eef;bundle-version="[2.0.0, 3.0.0)";visibility:=reexport, + org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.eef.edit/plugin.properties b/plugins/org.eclipse.eef.edit/plugin.properties index 741e917f4..5f3d65484 100644 --- a/plugins/org.eclipse.eef.edit/plugin.properties +++ b/plugins/org.eclipse.eef.edit/plugin.properties @@ -229,3 +229,5 @@ _UI_EEFListDescription_conditionalStyles_feature = Conditional Styles _UI_EEFListConditionalStyle_style_feature = Style _UI_EEFDynamicMappingFor_forceRefresh_feature = Force Refresh _UI_EEFPageDescription_indented_feature = Indented +_UI_EEFButtonDescription_imageExpression_feature = Image Expression +_UI_EEFWidgetAction_imageExpression_feature = Image Expression diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFButtonConditionalStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFButtonConditionalStyleItemProvider.java index d9b27a60b..1426321c1 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFButtonConditionalStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFButtonConditionalStyleItemProvider.java @@ -116,7 +116,7 @@ public class EEFButtonConditionalStyleItemProvider extends EEFConditionalStyleIt * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFButtonDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFButtonDescriptionItemProvider.java index 91de9009f..a86af029b 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFButtonDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFButtonDescriptionItemProvider.java @@ -49,6 +49,7 @@ public class EEFButtonDescriptionItemProvider extends EEFWidgetDescriptionItemPr super.getPropertyDescriptors(object); addButtonLabelExpressionPropertyDescriptor(object); + addImageExpressionPropertyDescriptor(object); addPushExpressionPropertyDescriptor(object); } return itemPropertyDescriptors; @@ -70,6 +71,19 @@ public class EEFButtonDescriptionItemProvider extends EEFWidgetDescriptionItemPr } /** + * This adds a property descriptor for the Image Expression feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected void addImageExpressionPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_EEFButtonDescription_imageExpression_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_EEFButtonDescription_imageExpression_feature", "_UI_EEFButtonDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + EefPackage.Literals.EEF_BUTTON_DESCRIPTION__IMAGE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, + null)); + } + + /** * This adds a property descriptor for the Push Expression feature. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -149,7 +163,7 @@ public class EEFButtonDescriptionItemProvider extends EEFWidgetDescriptionItemPr * 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 @@ -158,6 +172,7 @@ public class EEFButtonDescriptionItemProvider extends EEFWidgetDescriptionItemPr switch (notification.getFeatureID(EEFButtonDescription.class)) { case EefPackage.EEF_BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION: + case EefPackage.EEF_BUTTON_DESCRIPTION__IMAGE_EXPRESSION: case EefPackage.EEF_BUTTON_DESCRIPTION__PUSH_EXPRESSION: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFButtonStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFButtonStyleItemProvider.java index e18994bfc..2572189d3 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFButtonStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFButtonStyleItemProvider.java @@ -82,7 +82,7 @@ public class EEFButtonStyleItemProvider extends EEFWidgetStyleItemProvider { * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCheckboxConditionalStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCheckboxConditionalStyleItemProvider.java index a7c0f7545..2f6f23daa 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCheckboxConditionalStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCheckboxConditionalStyleItemProvider.java @@ -23,7 +23,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification; /** * This is the item provider adapter for a {@link org.eclipse.eef.EEFCheckboxConditionalStyle} object. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ public class EEFCheckboxConditionalStyleItemProvider extends EEFConditionalStyleItemProvider { @@ -116,7 +116,7 @@ public class EEFCheckboxConditionalStyleItemProvider extends EEFConditionalStyle * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCheckboxDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCheckboxDescriptionItemProvider.java index eab85d2d1..44195295b 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCheckboxDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCheckboxDescriptionItemProvider.java @@ -149,7 +149,7 @@ public class EEFCheckboxDescriptionItemProvider extends EEFWidgetDescriptionItem * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCheckboxStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCheckboxStyleItemProvider.java index 71112e531..c43ded9c5 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCheckboxStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCheckboxStyleItemProvider.java @@ -82,7 +82,7 @@ public class EEFCheckboxStyleItemProvider extends EEFWidgetStyleItemProvider { * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFConditionalStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFConditionalStyleItemProvider.java index 805e24bc7..08416cdda 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFConditionalStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFConditionalStyleItemProvider.java @@ -101,7 +101,7 @@ public class EEFConditionalStyleItemProvider extends ItemProviderAdapter * 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 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 5e3a91871..d3447dcfe 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 @@ -117,7 +117,7 @@ public class EEFContainerDescriptionItemProvider extends EEFControlDescriptionIt * 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 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 index 961ebcab1..89553462e 100644 --- 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 @@ -98,7 +98,7 @@ public class EEFControlDescriptionItemProvider extends ItemProviderAdapter * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCustomExpressionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCustomExpressionItemProvider.java index a3f0451dc..1bdfb6afa 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCustomExpressionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCustomExpressionItemProvider.java @@ -122,7 +122,7 @@ public class EEFCustomExpressionItemProvider extends ItemProviderAdapter * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCustomWidgetConditionalStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCustomWidgetConditionalStyleItemProvider.java index 22abbdd57..98461646d 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCustomWidgetConditionalStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCustomWidgetConditionalStyleItemProvider.java @@ -23,7 +23,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification; /** * This is the item provider adapter for a {@link org.eclipse.eef.EEFCustomWidgetConditionalStyle} object. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ public class EEFCustomWidgetConditionalStyleItemProvider extends EEFConditionalStyleItemProvider { @@ -116,7 +116,7 @@ public class EEFCustomWidgetConditionalStyleItemProvider extends EEFConditionalS * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCustomWidgetDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCustomWidgetDescriptionItemProvider.java index f79f5c95a..8a5bb4d3b 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCustomWidgetDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCustomWidgetDescriptionItemProvider.java @@ -23,7 +23,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification; /** * This is the item provider adapter for a {@link org.eclipse.eef.EEFCustomWidgetDescription} object. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ public class EEFCustomWidgetDescriptionItemProvider extends EEFWidgetDescriptionItemProvider { @@ -118,7 +118,7 @@ public class EEFCustomWidgetDescriptionItemProvider extends EEFWidgetDescription * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCustomWidgetStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCustomWidgetStyleItemProvider.java index f144f3779..16a9da4bc 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCustomWidgetStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFCustomWidgetStyleItemProvider.java @@ -82,7 +82,7 @@ public class EEFCustomWidgetStyleItemProvider extends EEFWidgetStyleItemProvider * 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 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 0002c49e3..0885eb2f5 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 @@ -70,7 +70,7 @@ public class EEFDynamicMappingForItemProvider extends EEFControlDescriptionItemP /** * This adds a property descriptor for the Iterable Expression feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addIterableExpressionPropertyDescriptor(Object object) { @@ -161,7 +161,7 @@ public class EEFDynamicMappingForItemProvider extends EEFControlDescriptionItemP * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFDynamicMappingIfItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFDynamicMappingIfItemProvider.java index a34647fd5..899a1c526 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFDynamicMappingIfItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFDynamicMappingIfItemProvider.java @@ -65,7 +65,7 @@ public class EEFDynamicMappingIfItemProvider extends ItemProviderAdapter /** * This adds a property descriptor for the Predicate Expression feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addPredicateExpressionPropertyDescriptor(Object object) { @@ -143,7 +143,7 @@ public class EEFDynamicMappingIfItemProvider extends ItemProviderAdapter * 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 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 index e3504f770..a3778849c 100644 --- 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 @@ -103,7 +103,7 @@ public class EEFFillLayoutDescriptionItemProvider extends EEFLayoutDescriptionIt * 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 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 index 647f1fcce..4905be0a8 100644 --- 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 @@ -116,7 +116,7 @@ public class EEFGridLayoutDescriptionItemProvider extends EEFLayoutDescriptionIt * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGroupConditionalStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGroupConditionalStyleItemProvider.java index 9c84439c6..935ca875e 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGroupConditionalStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGroupConditionalStyleItemProvider.java @@ -116,7 +116,7 @@ public class EEFGroupConditionalStyleItemProvider extends EEFConditionalStyleIte * 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 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 83b742784..ab57dc08e 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 @@ -203,7 +203,7 @@ public class EEFGroupDescriptionItemProvider extends ItemProviderAdapter * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGroupStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGroupStyleItemProvider.java index 74cba1134..6520342a3 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGroupStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGroupStyleItemProvider.java @@ -97,7 +97,7 @@ public class EEFGroupStyleItemProvider extends ItemProviderAdapter /** * This adds a property descriptor for the Font Name Expression feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addFontNameExpressionPropertyDescriptor(Object object) { @@ -111,7 +111,7 @@ public class EEFGroupStyleItemProvider extends ItemProviderAdapter /** * This adds a property descriptor for the Font Size Expression feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addFontSizeExpressionPropertyDescriptor(Object object) { @@ -149,7 +149,7 @@ public class EEFGroupStyleItemProvider extends ItemProviderAdapter /** * This adds a property descriptor for the Expanded By Default feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addExpandedByDefaultPropertyDescriptor(Object object) { @@ -196,7 +196,7 @@ public class EEFGroupStyleItemProvider extends ItemProviderAdapter * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFHyperlinkConditionalStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFHyperlinkConditionalStyleItemProvider.java index a2a226011..377177ec0 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFHyperlinkConditionalStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFHyperlinkConditionalStyleItemProvider.java @@ -23,7 +23,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification; /** * This is the item provider adapter for a {@link org.eclipse.eef.EEFHyperlinkConditionalStyle} object. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ public class EEFHyperlinkConditionalStyleItemProvider extends EEFConditionalStyleItemProvider { @@ -116,7 +116,7 @@ public class EEFHyperlinkConditionalStyleItemProvider extends EEFConditionalStyl * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFHyperlinkDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFHyperlinkDescriptionItemProvider.java index 9bb8052f8..eeb93c0d4 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFHyperlinkDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFHyperlinkDescriptionItemProvider.java @@ -86,7 +86,7 @@ public class EEFHyperlinkDescriptionItemProvider extends EEFWidgetDescriptionIte /** * This adds a property descriptor for the On Click Expression feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addOnClickExpressionPropertyDescriptor(Object object) { @@ -166,7 +166,7 @@ public class EEFHyperlinkDescriptionItemProvider extends EEFWidgetDescriptionIte * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFHyperlinkStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFHyperlinkStyleItemProvider.java index 87d75eb0b..9738a809a 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFHyperlinkStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFHyperlinkStyleItemProvider.java @@ -72,7 +72,7 @@ public class EEFHyperlinkStyleItemProvider extends EEFWidgetStyleItemProvider { /** * This adds a property descriptor for the Font Name Expression feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addFontNameExpressionPropertyDescriptor(Object object) { @@ -86,7 +86,7 @@ public class EEFHyperlinkStyleItemProvider extends EEFWidgetStyleItemProvider { /** * This adds a property descriptor for the Font Size Expression feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addFontSizeExpressionPropertyDescriptor(Object object) { @@ -100,7 +100,7 @@ public class EEFHyperlinkStyleItemProvider extends EEFWidgetStyleItemProvider { /** * This adds a property descriptor for the Font Style Expression feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addFontStyleExpressionPropertyDescriptor(Object object) { @@ -147,7 +147,7 @@ public class EEFHyperlinkStyleItemProvider extends EEFWidgetStyleItemProvider { * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFLabelConditionalStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFLabelConditionalStyleItemProvider.java index 0671eb2ed..266215e63 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFLabelConditionalStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFLabelConditionalStyleItemProvider.java @@ -116,7 +116,7 @@ public class EEFLabelConditionalStyleItemProvider extends EEFConditionalStyleIte * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFLabelDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFLabelDescriptionItemProvider.java index a702527a0..a4951b090 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFLabelDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFLabelDescriptionItemProvider.java @@ -148,7 +148,7 @@ public class EEFLabelDescriptionItemProvider extends EEFWidgetDescriptionItemPro * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFLabelStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFLabelStyleItemProvider.java index e4e31107a..dda1f0cc4 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFLabelStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFLabelStyleItemProvider.java @@ -86,7 +86,7 @@ public class EEFLabelStyleItemProvider extends EEFWidgetStyleItemProvider { /** * This adds a property descriptor for the Font Name Expression feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addFontNameExpressionPropertyDescriptor(Object object) { @@ -100,7 +100,7 @@ public class EEFLabelStyleItemProvider extends EEFWidgetStyleItemProvider { /** * This adds a property descriptor for the Font Size Expression feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addFontSizeExpressionPropertyDescriptor(Object object) { @@ -114,7 +114,7 @@ public class EEFLabelStyleItemProvider extends EEFWidgetStyleItemProvider { /** * This adds a property descriptor for the Font Style Expression feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addFontStyleExpressionPropertyDescriptor(Object object) { @@ -161,7 +161,7 @@ public class EEFLabelStyleItemProvider extends EEFWidgetStyleItemProvider { * 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 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 index 71d43c899..be533c24b 100644 --- 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 @@ -78,7 +78,7 @@ public class EEFLayoutDescriptionItemProvider extends ItemProviderAdapter * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListConditionalStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListConditionalStyleItemProvider.java index 5c438b1dd..0a45189ef 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListConditionalStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListConditionalStyleItemProvider.java @@ -116,7 +116,7 @@ public class EEFListConditionalStyleItemProvider extends EEFConditionalStyleItem * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListDescriptionItemProvider.java index 4a1663c5f..e9d9bbafc 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListDescriptionItemProvider.java @@ -84,7 +84,7 @@ public class EEFListDescriptionItemProvider extends EEFWidgetDescriptionItemProv /** * This adds a property descriptor for the On Click Expression feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addOnClickExpressionPropertyDescriptor(Object object) { @@ -163,7 +163,7 @@ public class EEFListDescriptionItemProvider extends EEFWidgetDescriptionItemProv * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListStyleItemProvider.java index 0e9103a35..c5395440b 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListStyleItemProvider.java @@ -82,7 +82,7 @@ public class EEFListStyleItemProvider extends EEFWidgetStyleItemProvider { * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFPageDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFPageDescriptionItemProvider.java index 891c834a7..7e51488ab 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFPageDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFPageDescriptionItemProvider.java @@ -225,7 +225,7 @@ public class EEFPageDescriptionItemProvider extends ItemProviderAdapter * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFPropertyValidationRuleDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFPropertyValidationRuleDescriptionItemProvider.java index c2c133e6b..1b4c16a9f 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFPropertyValidationRuleDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFPropertyValidationRuleDescriptionItemProvider.java @@ -22,7 +22,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; /** * This is the item provider adapter for a {@link org.eclipse.eef.EEFPropertyValidationRuleDescription} object. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ public class EEFPropertyValidationRuleDescriptionItemProvider extends EEFValidationRuleDescriptionItemProvider { @@ -100,7 +100,7 @@ public class EEFPropertyValidationRuleDescriptionItemProvider extends EEFValidat * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFRadioConditionalStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFRadioConditionalStyleItemProvider.java index 459e08e01..0e6288392 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFRadioConditionalStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFRadioConditionalStyleItemProvider.java @@ -116,7 +116,7 @@ public class EEFRadioConditionalStyleItemProvider extends EEFConditionalStyleIte * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFRadioDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFRadioDescriptionItemProvider.java index a0315d844..17b990984 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFRadioDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFRadioDescriptionItemProvider.java @@ -86,7 +86,7 @@ public class EEFRadioDescriptionItemProvider extends EEFWidgetDescriptionItemPro /** * This adds a property descriptor for the Candidates Expression feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addCandidatesExpressionPropertyDescriptor(Object object) { @@ -193,7 +193,7 @@ public class EEFRadioDescriptionItemProvider extends EEFWidgetDescriptionItemPro * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFRadioStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFRadioStyleItemProvider.java index 66a72f884..e77e11429 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFRadioStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFRadioStyleItemProvider.java @@ -82,7 +82,7 @@ public class EEFRadioStyleItemProvider extends EEFWidgetStyleItemProvider { * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFRuleAuditDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFRuleAuditDescriptionItemProvider.java index 694541ef2..2b5d54a1a 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFRuleAuditDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFRuleAuditDescriptionItemProvider.java @@ -110,7 +110,7 @@ public class EEFRuleAuditDescriptionItemProvider extends ItemProviderAdapter * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFSelectConditionalStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFSelectConditionalStyleItemProvider.java index fc2c66bcd..725e71a8a 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFSelectConditionalStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFSelectConditionalStyleItemProvider.java @@ -116,7 +116,7 @@ public class EEFSelectConditionalStyleItemProvider extends EEFConditionalStyleIt * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFSelectDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFSelectDescriptionItemProvider.java index 28ae87442..43f7e01e7 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFSelectDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFSelectDescriptionItemProvider.java @@ -85,7 +85,7 @@ public class EEFSelectDescriptionItemProvider extends EEFWidgetDescriptionItemPr /** * This adds a property descriptor for the Candidates Expression feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addCandidatesExpressionPropertyDescriptor(Object object) { @@ -179,7 +179,7 @@ public class EEFSelectDescriptionItemProvider extends EEFWidgetDescriptionItemPr * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFSelectStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFSelectStyleItemProvider.java index f6398a96e..347fb9759 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFSelectStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFSelectStyleItemProvider.java @@ -82,7 +82,7 @@ public class EEFSelectStyleItemProvider extends EEFWidgetStyleItemProvider { * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFSemanticValidationRuleDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFSemanticValidationRuleDescriptionItemProvider.java index 910452689..cdfe8633f 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFSemanticValidationRuleDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFSemanticValidationRuleDescriptionItemProvider.java @@ -24,7 +24,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification; /** * This is the item provider adapter for a {@link org.eclipse.eef.EEFSemanticValidationRuleDescription} object. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ public class EEFSemanticValidationRuleDescriptionItemProvider extends EEFValidationRuleDescriptionItemProvider { @@ -103,7 +103,7 @@ public class EEFSemanticValidationRuleDescriptionItemProvider extends EEFValidat * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFTextConditionalStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFTextConditionalStyleItemProvider.java index bb6a57ce9..1565f57df 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFTextConditionalStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFTextConditionalStyleItemProvider.java @@ -116,7 +116,7 @@ public class EEFTextConditionalStyleItemProvider extends EEFConditionalStyleItem * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFTextDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFTextDescriptionItemProvider.java index a04e687f0..52f08aade 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFTextDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFTextDescriptionItemProvider.java @@ -160,7 +160,7 @@ public class EEFTextDescriptionItemProvider extends EEFWidgetDescriptionItemProv * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFTextStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFTextStyleItemProvider.java index 465c9157d..0f507da46 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFTextStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFTextStyleItemProvider.java @@ -86,7 +86,7 @@ public class EEFTextStyleItemProvider extends EEFWidgetStyleItemProvider { /** * This adds a property descriptor for the Font Name Expression feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addFontNameExpressionPropertyDescriptor(Object object) { @@ -100,7 +100,7 @@ public class EEFTextStyleItemProvider extends EEFWidgetStyleItemProvider { /** * This adds a property descriptor for the Font Size Expression feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addFontSizeExpressionPropertyDescriptor(Object object) { @@ -114,7 +114,7 @@ public class EEFTextStyleItemProvider extends EEFWidgetStyleItemProvider { /** * This adds a property descriptor for the Font Style Expression feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addFontStyleExpressionPropertyDescriptor(Object object) { @@ -161,7 +161,7 @@ public class EEFTextStyleItemProvider extends EEFWidgetStyleItemProvider { * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFValidationFixDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFValidationFixDescriptionItemProvider.java index 17c46cdd2..b690e3000 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFValidationFixDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFValidationFixDescriptionItemProvider.java @@ -31,7 +31,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification; /** * This is the item provider adapter for a {@link org.eclipse.eef.EEFValidationFixDescription} object. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ public class EEFValidationFixDescriptionItemProvider extends ItemProviderAdapter @@ -125,7 +125,7 @@ public class EEFValidationFixDescriptionItemProvider extends ItemProviderAdapter * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFValidationRuleDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFValidationRuleDescriptionItemProvider.java index 22e3888c3..124b46a13 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFValidationRuleDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFValidationRuleDescriptionItemProvider.java @@ -34,7 +34,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification; /** * This is the item provider adapter for a {@link org.eclipse.eef.EEFValidationRuleDescription} object. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ public class EEFValidationRuleDescriptionItemProvider extends ItemProviderAdapter @@ -150,7 +150,7 @@ public class EEFValidationRuleDescriptionItemProvider extends ItemProviderAdapte * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFViewDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFViewDescriptionItemProvider.java index a065e5f89..ff27153c9 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFViewDescriptionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFViewDescriptionItemProvider.java @@ -182,7 +182,7 @@ public class EEFViewDescriptionItemProvider extends ItemProviderAdapter * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFWidgetActionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFWidgetActionItemProvider.java index 8bbed5f92..1684e11b2 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFWidgetActionItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFWidgetActionItemProvider.java @@ -56,6 +56,7 @@ public class EEFWidgetActionItemProvider extends ItemProviderAdapter super.getPropertyDescriptors(object); addLabelExpressionPropertyDescriptor(object); + addImageExpressionPropertyDescriptor(object); addActionExpressionPropertyDescriptor(object); } return itemPropertyDescriptors; @@ -74,6 +75,18 @@ public class EEFWidgetActionItemProvider extends ItemProviderAdapter } /** + * This adds a property descriptor for the Image Expression feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected void addImageExpressionPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_EEFWidgetAction_imageExpression_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_EEFWidgetAction_imageExpression_feature", "_UI_EEFWidgetAction_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + EefPackage.Literals.EEF_WIDGET_ACTION__IMAGE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** * This adds a property descriptor for the Action Expression feature. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -122,7 +135,7 @@ public class EEFWidgetActionItemProvider extends ItemProviderAdapter * 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 @@ -131,6 +144,7 @@ public class EEFWidgetActionItemProvider extends ItemProviderAdapter switch (notification.getFeatureID(EEFWidgetAction.class)) { case EefPackage.EEF_WIDGET_ACTION__LABEL_EXPRESSION: + case EefPackage.EEF_WIDGET_ACTION__IMAGE_EXPRESSION: case EefPackage.EEF_WIDGET_ACTION__ACTION_EXPRESSION: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; 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 bb9a7d356..3307875b3 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 @@ -83,7 +83,7 @@ public class EEFWidgetDescriptionItemProvider extends EEFControlDescriptionItemP /** * This adds a property descriptor for the Is Enabled Expression feature. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected void addIsEnabledExpressionPropertyDescriptor(Object object) { @@ -145,7 +145,7 @@ public class EEFWidgetDescriptionItemProvider extends EEFControlDescriptionItemP * 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 diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFWidgetStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFWidgetStyleItemProvider.java index 736da8919..505dec77e 100644 --- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFWidgetStyleItemProvider.java +++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFWidgetStyleItemProvider.java @@ -162,7 +162,7 @@ public class EEFWidgetStyleItemProvider extends ItemProviderAdapter * 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 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 27cffeb8f..396803f5b 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 @@ -38,7 +38,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; * factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters * also support Eclipse property sheets. Note that most of the adapters are shared among multiple instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ public class EefItemProviderAdapterFactory extends EefAdapterFactory @@ -70,7 +70,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected Collection<Object> supportedTypes = new ArrayList<Object>(); @@ -91,7 +91,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFViewDescription} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFViewDescriptionItemProvider eefViewDescriptionItemProvider; @@ -114,7 +114,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFPageDescription} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFPageDescriptionItemProvider eefPageDescriptionItemProvider; @@ -137,7 +137,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFRuleAuditDescription} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFRuleAuditDescriptionItemProvider eefRuleAuditDescriptionItemProvider; @@ -229,7 +229,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFGroupDescription} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFGroupDescriptionItemProvider eefGroupDescriptionItemProvider; @@ -252,7 +252,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFContainerDescription} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFContainerDescriptionItemProvider eefContainerDescriptionItemProvider; @@ -275,7 +275,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * 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; @@ -298,7 +298,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * 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; @@ -321,7 +321,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFTextDescription} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFTextDescriptionItemProvider eefTextDescriptionItemProvider; @@ -344,7 +344,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFLabelDescription} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFLabelDescriptionItemProvider eefLabelDescriptionItemProvider; @@ -367,7 +367,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFButtonDescription} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFButtonDescriptionItemProvider eefButtonDescriptionItemProvider; @@ -390,7 +390,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFCheckboxDescription} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFCheckboxDescriptionItemProvider eefCheckboxDescriptionItemProvider; @@ -413,7 +413,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFSelectDescription} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFSelectDescriptionItemProvider eefSelectDescriptionItemProvider; @@ -436,7 +436,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFRadioDescription} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFRadioDescriptionItemProvider eefRadioDescriptionItemProvider; @@ -459,7 +459,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFHyperlinkDescription} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFHyperlinkDescriptionItemProvider eefHyperlinkDescriptionItemProvider; @@ -482,7 +482,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFDynamicMappingFor} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFDynamicMappingForItemProvider eefDynamicMappingForItemProvider; @@ -505,7 +505,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFDynamicMappingIf} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFDynamicMappingIfItemProvider eefDynamicMappingIfItemProvider; @@ -551,7 +551,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFCustomExpression} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFCustomExpressionItemProvider eefCustomExpressionItemProvider; @@ -574,7 +574,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFListDescription} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFListDescriptionItemProvider eefListDescriptionItemProvider; @@ -597,7 +597,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFTextStyle} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFTextStyleItemProvider eefTextStyleItemProvider; @@ -619,7 +619,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFLabelStyle} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFLabelStyleItemProvider eefLabelStyleItemProvider; @@ -627,7 +627,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This creates an adapter for a {@link org.eclipse.eef.EEFLabelStyle}. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ @Override @@ -642,7 +642,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFButtonStyle} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFButtonStyleItemProvider eefButtonStyleItemProvider; @@ -650,7 +650,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This creates an adapter for a {@link org.eclipse.eef.EEFButtonStyle}. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ @Override @@ -665,7 +665,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFCheckboxStyle} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFCheckboxStyleItemProvider eefCheckboxStyleItemProvider; @@ -673,7 +673,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This creates an adapter for a {@link org.eclipse.eef.EEFCheckboxStyle}. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ @Override @@ -688,7 +688,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFSelectStyle} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFSelectStyleItemProvider eefSelectStyleItemProvider; @@ -696,7 +696,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This creates an adapter for a {@link org.eclipse.eef.EEFSelectStyle}. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ @Override @@ -711,7 +711,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFRadioStyle} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFRadioStyleItemProvider eefRadioStyleItemProvider; @@ -719,7 +719,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This creates an adapter for a {@link org.eclipse.eef.EEFRadioStyle}. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ @Override @@ -734,7 +734,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFHyperlinkStyle} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFHyperlinkStyleItemProvider eefHyperlinkStyleItemProvider; @@ -757,7 +757,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFCustomWidgetStyle} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFCustomWidgetStyleItemProvider eefCustomWidgetStyleItemProvider; @@ -780,7 +780,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFListStyle} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFListStyleItemProvider eefListStyleItemProvider; @@ -802,7 +802,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFGroupStyle} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFGroupStyleItemProvider eefGroupStyleItemProvider; @@ -810,7 +810,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This creates an adapter for a {@link org.eclipse.eef.EEFGroupStyle}. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ @Override @@ -825,7 +825,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFTextConditionalStyle} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFTextConditionalStyleItemProvider eefTextConditionalStyleItemProvider; @@ -871,7 +871,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFLabelConditionalStyle} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFLabelConditionalStyleItemProvider eefLabelConditionalStyleItemProvider; @@ -940,7 +940,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFRadioConditionalStyle} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFRadioConditionalStyleItemProvider eefRadioConditionalStyleItemProvider; @@ -1009,7 +1009,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFWidgetAction} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFWidgetActionItemProvider eefWidgetActionItemProvider; @@ -1017,7 +1017,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This creates an adapter for a {@link org.eclipse.eef.EEFWidgetAction}. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ @Override @@ -1032,7 +1032,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFListConditionalStyle} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFListConditionalStyleItemProvider eefListConditionalStyleItemProvider; @@ -1055,7 +1055,7 @@ public class EefItemProviderAdapterFactory extends EefAdapterFactory /** * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFGroupConditionalStyle} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected EEFGroupConditionalStyleItemProvider eefGroupConditionalStyleItemProvider; 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 d5ee84517..ab28fe3bf 100644 --- a/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF @@ -19,14 +19,17 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.eef.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.eef.common;bundle-version="[2.0.0,3.0.0)", org.eclipse.eef.common.ui;bundle-version="[2.0.0,3.0.0)", - org.eclipse.eef.ide;bundle-version="[2.0.0,3.0.0)" + org.eclipse.eef.ide;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.edit.ui;bundle-version="[2.8.0,3.0.0)", + org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)" Export-Package: org.eclipse.eef.ide.ui.api;version="2.0.0", org.eclipse.eef.ide.ui.api.widgets;version="2.0.0", org.eclipse.eef.ide.ui.internal;version="2.0.0";x-internal:=true, org.eclipse.eef.ide.ui.internal.preferences;version="2.0.0";x-internal:=true, org.eclipse.eef.ide.ui.internal.widgets;version="2.0.0";x-internal:=true, org.eclipse.eef.ide.ui.internal.widgets.quickfix;version="2.0.0";x-internal:=true, - org.eclipse.eef.ide.ui.internal.widgets.styles;version="2.0.0";x-internal:=true + org.eclipse.eef.ide.ui.internal.widgets.styles;version="2.0.0";x-internal:=true, + org.eclipse.eef.ide.ui.internal.resource;version="2.0.0";x-internal:=true Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.eef.ide.ui.internal.EEFIdeUiPlugin$Implementation diff --git a/plugins/org.eclipse.eef.ide.ui/plugin.properties b/plugins/org.eclipse.eef.ide.ui/plugin.properties index 07bb99c2a..113a8b444 100644 --- a/plugins/org.eclipse.eef.ide.ui/plugin.properties +++ b/plugins/org.eclipse.eef.ide.ui/plugin.properties @@ -17,6 +17,7 @@ additional messages regarding the state of the\n\ application EEFIdeUiPlugin_lifecycleManagerNotFound=No lifecycle manager can be found for the custom widget : {0} EEFIdeUiPlugin_lifecycleManagerInvalid=A lifecycle manager exists for the custom widget {0} but is invalid +EEFIdeUiPlugin_fileNotFound=File "{0}" not found EEFColor_invalidColorCode=The color code {0} is invalid AbstractEEFWidgetLifecycleManager_invalidSelectionType = StructuredViewer should return an instance of IStructuredSelection from its getSelection() method. diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/EEFImageUtils.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/EEFImageUtils.java new file mode 100644 index 000000000..95fd56480 --- /dev/null +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/EEFImageUtils.java @@ -0,0 +1,62 @@ +/******************************************************************************* + * Copyright (c) 2017 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; + +import java.net.MalformedURLException; +import java.text.MessageFormat; +import java.util.Optional; + +import org.eclipse.core.runtime.Path; +import org.eclipse.eef.ide.ui.internal.resource.FileProvider; +import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; + +/** + * Utility class to manage images. + * + * @author mbats + */ +public final class EEFImageUtils { + /** + * The constructor. + */ + private EEFImageUtils() { + // prevent instantiation + } + + /** + * Retrieve an image from a string path as '/resource/folder/image.png'. + * + * @param imgPath + * The image path + * @return The image + */ + public static Optional<Image> getImage(String imgPath) { + return FileProvider.getDefault().getFile(new Path(imgPath)).flatMap(imageFile -> { + Optional<Image> optionalImage = Optional.empty(); + + if (imageFile.exists() && imageFile.canRead()) { + try { + ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(imageFile.toURI().toURL()); + optionalImage = Optional.ofNullable(ExtendedImageRegistry.INSTANCE.getImage(imageDescriptor)); + } catch (MalformedURLException e) { + EEFIdeUiPlugin.INSTANCE.log(e); + } + } else { + String message = MessageFormat.format(Messages.EEFIdeUiPlugin_fileNotFound, imgPath); + EEFIdeUiPlugin.getPlugin().error(message); + } + + return optionalImage; + }); + } +} diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/Messages.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/Messages.java index 8a930b27a..a54c1d05a 100644 --- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/Messages.java +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/Messages.java @@ -38,6 +38,9 @@ public final class Messages { public static String EEFIdeUiPlugin_lifecycleManagerInvalid; @TranslatableMessage + public static String EEFIdeUiPlugin_fileNotFound; + + @TranslatableMessage public static String EEFColor_invalidColorCode; @TranslatableMessage diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/resource/FileProvider.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/resource/FileProvider.java new file mode 100644 index 000000000..019af54f9 --- /dev/null +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/resource/FileProvider.java @@ -0,0 +1,245 @@ +/******************************************************************************* + * Copyright (c) 2005, 2017 THALES GLOBAL SERVICES. + * 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.resource; + +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.StringTokenizer; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Platform; +import org.eclipse.eef.ide.ui.internal.EEFIdeUiPlugin; +import org.osgi.framework.Bundle; +import org.osgi.framework.Constants; + +/** + * To find a file in the workspace or in the plugins. + * + * @author cbrun + */ +public class FileProvider { + + /** + * The sole instance. + */ + private static FileProvider instance; + + /** + * Saves the plugin for each file. + */ + private Map<File, String> file2plugin = new HashMap<File, String>(); + + /** + * Saves the relative path for each file. + */ + private Map<File, String> file2path = new HashMap<File, String>(); + + /** + * Gets the sole instance. + * + * @return the sole instance + */ + public static FileProvider getDefault() { + if (FileProvider.instance == null) { + FileProvider.instance = new FileProvider(); + } + return FileProvider.instance; + } + + /** + * Gets the file for the given full path in the workspace or in the plugins. + * + * @param fullPath + * is the full path of the file + * @return An optional containing the file found or an empty optional if none found + */ + public Optional<File> getFile(final IPath fullPath) { + Optional<File> optionalFile = Optional.empty(); + + if (fullPath != null && fullPath.segmentCount() > 0) { + Optional<IFile> iFile = FileProvider.findFile(fullPath); + if (iFile.isPresent()) { + optionalFile = iFile.map(IFile::getLocation).map(IPath::toFile); + } else { + String pluginId = fullPath.segment(0); + optionalFile = this.getFile(pluginId, fullPath.removeFirstSegments(1)); // remove '/Project' + } + + } + return optionalFile; + } + + /** + * Gets the file for the relative path in the given plugin. + * + * @param pluginId + * is the plugin + * @param relativePath + * is the relative path in the plugin + * @return An optional containing the file found or an empty optional if none found + */ + private Optional<File> getFile(final String pluginId, final IPath relativePath) { + return this.getFile(pluginId, relativePath, true); + } + + /** + * Gets the file for the relative path in the given plugin. + * + * @param pluginId + * is the plugin + * @param relativePath + * is the relative path in the plugin + * @param requiredSearch + * true to search in the required bundles + * @return An optional containing the file found or an empty optional if none found + */ + private Optional<File> getFile(final String pluginId, final IPath relativePath, final boolean requiredSearch) { + return Optional.ofNullable(Platform.getBundle(pluginId)).flatMap(bundle -> { + Optional<File> optionalFile = Optional.ofNullable(bundle.getEntry(relativePath.toString())).flatMap(url -> { + return this.getFileFromUrl(url, pluginId, relativePath, bundle); + }); + + if (!optionalFile.isPresent() && requiredSearch) { + optionalFile = getFileFromBundles(relativePath, bundle); + } + + return optionalFile; + }); + } + + /** + * Gets the file for the given URL in the plugin with the given pluginId. + * + * @param url + * The URL + * @param pluginId + * The pluginId + * @param relativePath + * The relative path + * @param bundle + * The bundle + * @return An optional with the file found or an empty optional if none found + */ + private Optional<File> getFileFromUrl(final URL url, final String pluginId, final IPath relativePath, final Bundle bundle) { + File file = new File(FileProvider.transformToAbsolutePath(url)); + if (file.exists()) { + if (!this.file2plugin.containsKey(file)) { + this.file2plugin.put(file, pluginId); + this.file2path.put(file, relativePath.toString()); + + // Copy the properties in the bundle area + Enumeration<?> allProperties = bundle.findEntries(relativePath.removeLastSegments(1).toString(), "*.properties", true); //$NON-NLS-1$ + while (allProperties != null && allProperties.hasMoreElements()) { + // @formatter:off + Optional.ofNullable(allProperties.nextElement()) + .filter(URL.class::isInstance) + .map(URL.class::cast) + .ifPresent(propertyFileURL -> { + File propertyFile = new File(FileProvider.transformToAbsolutePath(propertyFileURL)); + if (propertyFile.exists()) { + this.file2plugin.put(propertyFile, pluginId); + } + }); + // @formatter:on + } + } + return Optional.of(file); + } + return Optional.empty(); + } + + /** + * Gets the file with the relative path from the given bundle. + * + * @param relativePath + * The relative path of the file + * @param bundle + * The bundle + * @return An optional containing the file found or an empty optional if none found + */ + private Optional<File> getFileFromBundles(final IPath relativePath, final Bundle bundle) { + String requiredBundles = bundle.getHeaders().get(Constants.REQUIRE_BUNDLE); + if (requiredBundles != null) { + final StringTokenizer st = new StringTokenizer(requiredBundles, ","); //$NON-NLS-1$ + while (st.hasMoreTokens()) { + String id = st.nextToken().trim(); + int iDot = id.indexOf(';'); + if (iDot > -1) { + id = id.substring(0, iDot).trim(); + } + if (id.length() > 0) { + Optional<File> optionalScriptFile = getFile(id, relativePath, false); + if (optionalScriptFile.isPresent()) { + return optionalScriptFile; + } + } + } + } + return Optional.empty(); + } + + /** + * Finds and returns the file identified by the given path in the workspace, or null if no such file exists. + * + * @param path + * is the path of the desired resource + * @return An optional containing the member file, or an empty optional if no such resource exists + */ + private static Optional<IFile> findFile(final IPath path) { + return FileProvider.findResource(path).filter(IFile.class::isInstance).map(IFile.class::cast); + } + + /** + * Finds and returns the member resource identified by the given path in the workspace, or null if no such resource + * exists. + * + * @param path + * is the path of the desired resource + * @return An optional containing the member resource, or an empty optional if no such resource exists + */ + private static Optional<IResource> findResource(final IPath path) { + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + if (workspace.getRoot().exists(path)) { + return Optional.ofNullable(workspace.getRoot().findMember(path)); + } + return Optional.empty(); + } + + /** + * Creates the absolute path. + * + * @param url + * is the relative path + * @return the absolute file path + */ + private static String transformToAbsolutePath(final URL url) { + String absolutePath; + try { + URL transformedUrl = FileLocator.toFileURL(url); + File file = new File(transformedUrl.getFile()); + absolutePath = file.getAbsolutePath(); + } catch (final IOException e) { + absolutePath = ""; //$NON-NLS-1$ + EEFIdeUiPlugin.getPlugin().error(e.getMessage(), e); + } + return absolutePath; + } +} diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/ActionButton.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/ActionButton.java index ec4f6e9c9..5e7b03752 100644 --- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/ActionButton.java +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/ActionButton.java @@ -10,9 +10,13 @@ *******************************************************************************/ package org.eclipse.eef.ide.ui.internal.widgets; +import java.util.Optional; + import org.eclipse.eef.EEFWidgetAction; import org.eclipse.eef.common.ui.api.EEFWidgetFactory; import org.eclipse.eef.core.api.utils.EvalFactory; +import org.eclipse.eef.core.api.utils.EvalFactory.Eval; +import org.eclipse.eef.ide.ui.internal.EEFImageUtils; import org.eclipse.sirius.common.interpreter.api.IInterpreter; import org.eclipse.sirius.common.interpreter.api.IVariableManager; import org.eclipse.swt.SWT; @@ -75,9 +79,29 @@ public class ActionButton { this.button.setLayoutData(gridData); - String expression = action.getLabelExpression(); - String buttonLabel = EvalFactory.of(interpreter, variableManager).logIfInvalidType(String.class).defaultValue("...").evaluate(expression); //$NON-NLS-1$ - button.setText(buttonLabel); + String imageExpression = Optional.ofNullable(action.getImageExpression()).orElse(""); //$NON-NLS-1$ + Object buttonImage = EvalFactory.of(interpreter, variableManager).logIfInvalidType(Object.class).evaluate(imageExpression); + + // @formatter:off + Optional.ofNullable(buttonImage).filter(String.class::isInstance) + .map(String.class::cast) + .flatMap(EEFImageUtils::getImage) + .ifPresent(button::setImage); + // @formatter:on + + // If the button has an image, do not put label default value + boolean labelDefaultValue = true; + if (!imageExpression.isEmpty()) { + labelDefaultValue = false; + } + + String labelExpression = action.getLabelExpression(); + Eval<String> eval = EvalFactory.of(interpreter, variableManager).logIfInvalidType(String.class); + if (labelDefaultValue) { + eval = eval.defaultValue("..."); //$NON-NLS-1$ + } + String buttonLabel = eval.evaluate(labelExpression); + button.setText(Optional.ofNullable(buttonLabel).orElse("")); //$NON-NLS-1$ } /** 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 695e6a64b..916dbab3b 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 @@ -23,6 +23,7 @@ import org.eclipse.eef.core.api.controllers.IEEFButtonController; import org.eclipse.eef.core.api.controllers.IEEFWidgetController; import org.eclipse.eef.ide.ui.api.widgets.AbstractEEFWidgetLifecycleManager; import org.eclipse.eef.ide.ui.internal.EEFIdeUiPlugin; +import org.eclipse.eef.ide.ui.internal.EEFImageUtils; import org.eclipse.sirius.common.interpreter.api.IInterpreter; import org.eclipse.sirius.common.interpreter.api.IVariableManager; import org.eclipse.swt.SWT; @@ -161,6 +162,17 @@ public class EEFButtonLifecycleManager extends AbstractEEFWidgetLifecycleManager button.setText(Optional.ofNullable(value).orElse("")); //$NON-NLS-1$ } }); + + this.controller.onNewButtonImage((value) -> { + if (!button.isDisposed()) { + //@formatter:off + Optional.ofNullable(value).filter(String.class::isInstance) + .map(String.class::cast) + .flatMap(EEFImageUtils::getImage) + .ifPresent(button::setImage); + //@formatter:on + } + }); } /** @@ -181,6 +193,7 @@ public class EEFButtonLifecycleManager extends AbstractEEFWidgetLifecycleManager this.button.removeSelectionListener(this.selectionListener); } this.controller.removeNewButtonLabelConsumer(); + this.controller.removeNewButtonImageConsumer(); } /** diff --git a/plugins/org.eclipse.eef/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef/META-INF/MANIFEST.MF index cc13c8940..b69daa010 100644 --- a/plugins/org.eclipse.eef/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.eef/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Export-Package: org.eclipse.eef;version="2.0.0", org.eclipse.eef.impl;version="2.0.0", org.eclipse.eef.util;version="2.0.0" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", - org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)" + org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.eef/model/eef.ecore b/plugins/org.eclipse.eef/model/eef.ecore index 6fb04f937..53711261b 100644 --- a/plugins/org.eclipse.eef/model/eef.ecore +++ b/plugins/org.eclipse.eef/model/eef.ecore @@ -363,6 +363,11 @@ <details key="documentation" value="Label of the button visible in the user interface."/> </eAnnotations> </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="imageExpression" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Image of the button visible in the user interface."/> + </eAnnotations> + </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="pushExpression" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="Defines the behavior executed when the end-user pushed the button."/> @@ -878,6 +883,11 @@ <details key="documentation" value="The label of the action visible by the end-users."/> </eAnnotations> </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="imageExpression" 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 image of the action visible by the end-users."/> + </eAnnotations> + </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="actionExpression" 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 behavior of the action."/> 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 4102c5276..0baf8427b 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 @@ -21,6 +21,7 @@ import org.eclipse.emf.common.util.EList; * </p> * <ul> * <li>{@link org.eclipse.eef.EEFButtonDescription#getButtonLabelExpression <em>Button Label Expression</em>}</li> + * <li>{@link org.eclipse.eef.EEFButtonDescription#getImageExpression <em>Image Expression</em>}</li> * <li>{@link org.eclipse.eef.EEFButtonDescription#getPushExpression <em>Push Expression</em>}</li> * <li>{@link org.eclipse.eef.EEFButtonDescription#getStyle <em>Style</em>}</li> * <li>{@link org.eclipse.eef.EEFButtonDescription#getConditionalStyles <em>Conditional Styles</em>}</li> @@ -56,6 +57,29 @@ public interface EEFButtonDescription extends EEFWidgetDescription { void setButtonLabelExpression(String value); /** + * Returns the value of the '<em><b>Image Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc + * --> <!-- begin-model-doc --> Image of the button visible in the user interface. <!-- end-model-doc --> + * + * @return the value of the '<em>Image Expression</em>' attribute. + * @see #setImageExpression(String) + * @see org.eclipse.eef.EefPackage#getEEFButtonDescription_ImageExpression() + * @model + * @generated + */ + String getImageExpression(); + + /** + * Sets the value of the '{@link org.eclipse.eef.EEFButtonDescription#getImageExpression <em>Image Expression</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Image Expression</em>' attribute. + * @see #getImageExpression() + * @generated + */ + void setImageExpression(String value); + + /** * Returns the value of the '<em><b>Push Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> <!-- begin-model-doc --> Defines the behavior executed when the end-user pushed the button. <!-- * end-model-doc --> diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFWidgetAction.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFWidgetAction.java index b769e42cb..35482b2a6 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFWidgetAction.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFWidgetAction.java @@ -19,6 +19,7 @@ import org.eclipse.emf.ecore.EObject; * </p> * <ul> * <li>{@link org.eclipse.eef.EEFWidgetAction#getLabelExpression <em>Label Expression</em>}</li> + * <li>{@link org.eclipse.eef.EEFWidgetAction#getImageExpression <em>Image Expression</em>}</li> * <li>{@link org.eclipse.eef.EEFWidgetAction#getActionExpression <em>Action Expression</em>}</li> * </ul> * @@ -51,6 +52,29 @@ public interface EEFWidgetAction extends EObject { void setLabelExpression(String value); /** + * Returns the value of the '<em><b>Image Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc + * --> <!-- begin-model-doc --> The image of the action visible by the end-users. <!-- end-model-doc --> + * + * @return the value of the '<em>Image Expression</em>' attribute. + * @see #setImageExpression(String) + * @see org.eclipse.eef.EefPackage#getEEFWidgetAction_ImageExpression() + * @model + * @generated + */ + String getImageExpression(); + + /** + * Sets the value of the '{@link org.eclipse.eef.EEFWidgetAction#getImageExpression <em>Image Expression</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Image Expression</em>' attribute. + * @see #getImageExpression() + * @generated + */ + void setImageExpression(String value); + + /** * Returns the value of the '<em><b>Action Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> <!-- begin-model-doc --> The behavior of the action. <!-- end-model-doc --> * 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 8dcc8c1b6..9b024dbb5 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 @@ -1055,12 +1055,21 @@ public interface EefPackage extends EPackage { int EEF_BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION = EefPackage.EEF_WIDGET_DESCRIPTION_FEATURE_COUNT + 0; /** + * The feature id for the '<em><b>Image Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @generated + * @ordered + */ + int EEF_BUTTON_DESCRIPTION__IMAGE_EXPRESSION = EefPackage.EEF_WIDGET_DESCRIPTION_FEATURE_COUNT + 1; + + /** * The feature id for the '<em><b>Push Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int EEF_BUTTON_DESCRIPTION__PUSH_EXPRESSION = EefPackage.EEF_WIDGET_DESCRIPTION_FEATURE_COUNT + 1; + int EEF_BUTTON_DESCRIPTION__PUSH_EXPRESSION = EefPackage.EEF_WIDGET_DESCRIPTION_FEATURE_COUNT + 2; /** * The feature id for the '<em><b>Style</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc @@ -1069,7 +1078,7 @@ public interface EefPackage extends EPackage { * @generated * @ordered */ - int EEF_BUTTON_DESCRIPTION__STYLE = EefPackage.EEF_WIDGET_DESCRIPTION_FEATURE_COUNT + 2; + int EEF_BUTTON_DESCRIPTION__STYLE = EefPackage.EEF_WIDGET_DESCRIPTION_FEATURE_COUNT + 3; /** * The feature id for the '<em><b>Conditional Styles</b></em>' containment reference list. <!-- begin-user-doc --> @@ -1078,7 +1087,7 @@ public interface EefPackage extends EPackage { * @generated * @ordered */ - int EEF_BUTTON_DESCRIPTION__CONDITIONAL_STYLES = EefPackage.EEF_WIDGET_DESCRIPTION_FEATURE_COUNT + 3; + int EEF_BUTTON_DESCRIPTION__CONDITIONAL_STYLES = EefPackage.EEF_WIDGET_DESCRIPTION_FEATURE_COUNT + 4; /** * The number of structural features of the '<em>EEF Button Description</em>' class. <!-- begin-user-doc --> <!-- @@ -1087,7 +1096,7 @@ public interface EefPackage extends EPackage { * @generated * @ordered */ - int EEF_BUTTON_DESCRIPTION_FEATURE_COUNT = EefPackage.EEF_WIDGET_DESCRIPTION_FEATURE_COUNT + 4; + int EEF_BUTTON_DESCRIPTION_FEATURE_COUNT = EefPackage.EEF_WIDGET_DESCRIPTION_FEATURE_COUNT + 5; /** * The meta object id for the '{@link org.eclipse.eef.impl.EEFCheckboxDescriptionImpl @@ -3070,13 +3079,22 @@ public interface EefPackage extends EPackage { int EEF_WIDGET_ACTION__LABEL_EXPRESSION = 0; /** + * The feature id for the '<em><b>Image Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @generated + * @ordered + */ + int EEF_WIDGET_ACTION__IMAGE_EXPRESSION = 1; + + /** * The feature id for the '<em><b>Action Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> * * @generated * @ordered */ - int EEF_WIDGET_ACTION__ACTION_EXPRESSION = 1; + int EEF_WIDGET_ACTION__ACTION_EXPRESSION = 2; /** * The number of structural features of the '<em>EEF Widget Action</em>' class. <!-- begin-user-doc --> <!-- @@ -3085,7 +3103,7 @@ public interface EefPackage extends EPackage { * @generated * @ordered */ - int EEF_WIDGET_ACTION_FEATURE_COUNT = 2; + int EEF_WIDGET_ACTION_FEATURE_COUNT = 3; /** * The meta object id for the '{@link org.eclipse.eef.impl.EEFListConditionalStyleImpl @@ -3983,6 +4001,17 @@ public interface EefPackage extends EPackage { EAttribute getEEFButtonDescription_ButtonLabelExpression(); /** + * Returns the meta object for the attribute '{@link org.eclipse.eef.EEFButtonDescription#getImageExpression + * <em>Image Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for the attribute '<em>Image Expression</em>'. + * @see org.eclipse.eef.EEFButtonDescription#getImageExpression() + * @see #getEEFButtonDescription() + * @generated + */ + EAttribute getEEFButtonDescription_ImageExpression(); + + /** * Returns the meta object for the attribute '{@link org.eclipse.eef.EEFButtonDescription#getPushExpression * <em>Push Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -5168,6 +5197,17 @@ public interface EefPackage extends EPackage { EAttribute getEEFWidgetAction_LabelExpression(); /** + * Returns the meta object for the attribute '{@link org.eclipse.eef.EEFWidgetAction#getImageExpression + * <em>Image Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for the attribute '<em>Image Expression</em>'. + * @see org.eclipse.eef.EEFWidgetAction#getImageExpression() + * @see #getEEFWidgetAction() + * @generated + */ + EAttribute getEEFWidgetAction_ImageExpression(); + + /** * Returns the meta object for the attribute '{@link org.eclipse.eef.EEFWidgetAction#getActionExpression * <em>Action Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -5886,6 +5926,14 @@ public interface EefPackage extends EPackage { EAttribute EEF_BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION = EefPackage.eINSTANCE.getEEFButtonDescription_ButtonLabelExpression(); /** + * The meta object literal for the '<em><b>Image Expression</b></em>' attribute feature. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EAttribute EEF_BUTTON_DESCRIPTION__IMAGE_EXPRESSION = EefPackage.eINSTANCE.getEEFButtonDescription_ImageExpression(); + + /** * The meta object literal for the '<em><b>Push Expression</b></em>' attribute feature. <!-- begin-user-doc --> * <!-- end-user-doc --> * @@ -6818,6 +6866,14 @@ public interface EefPackage extends EPackage { EAttribute EEF_WIDGET_ACTION__LABEL_EXPRESSION = EefPackage.eINSTANCE.getEEFWidgetAction_LabelExpression(); /** + * The meta object literal for the '<em><b>Image Expression</b></em>' attribute feature. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EAttribute EEF_WIDGET_ACTION__IMAGE_EXPRESSION = EefPackage.eINSTANCE.getEEFWidgetAction_ImageExpression(); + + /** * The meta object literal for the '<em><b>Action Expression</b></em>' attribute feature. <!-- begin-user-doc * --> <!-- end-user-doc --> * diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFButtonDescriptionImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFButtonDescriptionImpl.java index ad71fb4f0..f12185cbe 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFButtonDescriptionImpl.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFButtonDescriptionImpl.java @@ -32,6 +32,7 @@ import org.eclipse.emf.ecore.util.InternalEList; * <ul> * <li>{@link org.eclipse.eef.impl.EEFButtonDescriptionImpl#getButtonLabelExpression <em>Button Label Expression</em>} * </li> + * <li>{@link org.eclipse.eef.impl.EEFButtonDescriptionImpl#getImageExpression <em>Image Expression</em>}</li> * <li>{@link org.eclipse.eef.impl.EEFButtonDescriptionImpl#getPushExpression <em>Push Expression</em>}</li> * <li>{@link org.eclipse.eef.impl.EEFButtonDescriptionImpl#getStyle <em>Style</em>}</li> * <li>{@link org.eclipse.eef.impl.EEFButtonDescriptionImpl#getConditionalStyles <em>Conditional Styles</em>}</li> @@ -61,6 +62,26 @@ public class EEFButtonDescriptionImpl extends EEFWidgetDescriptionImpl implement protected String buttonLabelExpression = EEFButtonDescriptionImpl.BUTTON_LABEL_EXPRESSION_EDEFAULT; /** + * The default value of the '{@link #getImageExpression() <em>Image Expression</em>}' attribute. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @see #getImageExpression() + * @generated + * @ordered + */ + protected static final String IMAGE_EXPRESSION_EDEFAULT = null; + + /** + * The cached value of the '{@link #getImageExpression() <em>Image Expression</em>}' attribute. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @see #getImageExpression() + * @generated + * @ordered + */ + protected String imageExpression = EEFButtonDescriptionImpl.IMAGE_EXPRESSION_EDEFAULT; + + /** * The default value of the '{@link #getPushExpression() <em>Push Expression</em>}' attribute. <!-- begin-user-doc * --> <!-- end-user-doc --> * @@ -150,6 +171,31 @@ public class EEFButtonDescriptionImpl extends EEFWidgetDescriptionImpl implement * @generated */ @Override + public String getImageExpression() { + return imageExpression; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void setImageExpression(String newImageExpression) { + String oldImageExpression = imageExpression; + imageExpression = newImageExpression; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, EefPackage.EEF_BUTTON_DESCRIPTION__IMAGE_EXPRESSION, oldImageExpression, + imageExpression)); + } + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public String getPushExpression() { return pushExpression; } @@ -292,6 +338,8 @@ public class EEFButtonDescriptionImpl extends EEFWidgetDescriptionImpl implement switch (featureID) { case EefPackage.EEF_BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION: return getButtonLabelExpression(); + case EefPackage.EEF_BUTTON_DESCRIPTION__IMAGE_EXPRESSION: + return getImageExpression(); case EefPackage.EEF_BUTTON_DESCRIPTION__PUSH_EXPRESSION: return getPushExpression(); case EefPackage.EEF_BUTTON_DESCRIPTION__STYLE: @@ -317,6 +365,9 @@ public class EEFButtonDescriptionImpl extends EEFWidgetDescriptionImpl implement case EefPackage.EEF_BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION: setButtonLabelExpression((String) newValue); return; + case EefPackage.EEF_BUTTON_DESCRIPTION__IMAGE_EXPRESSION: + setImageExpression((String) newValue); + return; case EefPackage.EEF_BUTTON_DESCRIPTION__PUSH_EXPRESSION: setPushExpression((String) newValue); return; @@ -342,6 +393,9 @@ public class EEFButtonDescriptionImpl extends EEFWidgetDescriptionImpl implement case EefPackage.EEF_BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION: setButtonLabelExpression(EEFButtonDescriptionImpl.BUTTON_LABEL_EXPRESSION_EDEFAULT); return; + case EefPackage.EEF_BUTTON_DESCRIPTION__IMAGE_EXPRESSION: + setImageExpression(EEFButtonDescriptionImpl.IMAGE_EXPRESSION_EDEFAULT); + return; case EefPackage.EEF_BUTTON_DESCRIPTION__PUSH_EXPRESSION: setPushExpression(EEFButtonDescriptionImpl.PUSH_EXPRESSION_EDEFAULT); return; @@ -366,6 +420,9 @@ public class EEFButtonDescriptionImpl extends EEFWidgetDescriptionImpl implement case EefPackage.EEF_BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION: return EEFButtonDescriptionImpl.BUTTON_LABEL_EXPRESSION_EDEFAULT == null ? buttonLabelExpression != null : !EEFButtonDescriptionImpl.BUTTON_LABEL_EXPRESSION_EDEFAULT.equals(buttonLabelExpression); + case EefPackage.EEF_BUTTON_DESCRIPTION__IMAGE_EXPRESSION: + return EEFButtonDescriptionImpl.IMAGE_EXPRESSION_EDEFAULT == null ? imageExpression != null + : !EEFButtonDescriptionImpl.IMAGE_EXPRESSION_EDEFAULT.equals(imageExpression); case EefPackage.EEF_BUTTON_DESCRIPTION__PUSH_EXPRESSION: return EEFButtonDescriptionImpl.PUSH_EXPRESSION_EDEFAULT == null ? pushExpression != null : !EEFButtonDescriptionImpl.PUSH_EXPRESSION_EDEFAULT.equals(pushExpression); @@ -391,6 +448,8 @@ public class EEFButtonDescriptionImpl extends EEFWidgetDescriptionImpl implement StringBuffer result = new StringBuffer(super.toString()); result.append(" (buttonLabelExpression: "); //$NON-NLS-1$ result.append(buttonLabelExpression); + result.append(", imageExpression: "); //$NON-NLS-1$ + result.append(imageExpression); result.append(", pushExpression: "); //$NON-NLS-1$ result.append(pushExpression); result.append(')'); diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFWidgetActionImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFWidgetActionImpl.java index 3f343e6d1..fc73f2410 100644 --- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFWidgetActionImpl.java +++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFWidgetActionImpl.java @@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * </p> * <ul> * <li>{@link org.eclipse.eef.impl.EEFWidgetActionImpl#getLabelExpression <em>Label Expression</em>}</li> + * <li>{@link org.eclipse.eef.impl.EEFWidgetActionImpl#getImageExpression <em>Image Expression</em>}</li> * <li>{@link org.eclipse.eef.impl.EEFWidgetActionImpl#getActionExpression <em>Action Expression</em>}</li> * </ul> * @@ -50,6 +51,26 @@ public class EEFWidgetActionImpl extends MinimalEObjectImpl.Container implements protected String labelExpression = EEFWidgetActionImpl.LABEL_EXPRESSION_EDEFAULT; /** + * The default value of the '{@link #getImageExpression() <em>Image Expression</em>}' attribute. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @see #getImageExpression() + * @generated + * @ordered + */ + protected static final String IMAGE_EXPRESSION_EDEFAULT = null; + + /** + * The cached value of the '{@link #getImageExpression() <em>Image Expression</em>}' attribute. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @see #getImageExpression() + * @generated + * @ordered + */ + protected String imageExpression = EEFWidgetActionImpl.IMAGE_EXPRESSION_EDEFAULT; + + /** * The default value of the '{@link #getActionExpression() <em>Action Expression</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -119,6 +140,31 @@ public class EEFWidgetActionImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override + public String getImageExpression() { + return imageExpression; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void setImageExpression(String newImageExpression) { + String oldImageExpression = imageExpression; + imageExpression = newImageExpression; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, EefPackage.EEF_WIDGET_ACTION__IMAGE_EXPRESSION, oldImageExpression, + imageExpression)); + } + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public String getActionExpression() { return actionExpression; } @@ -148,6 +194,8 @@ public class EEFWidgetActionImpl extends MinimalEObjectImpl.Container implements switch (featureID) { case EefPackage.EEF_WIDGET_ACTION__LABEL_EXPRESSION: return getLabelExpression(); + case EefPackage.EEF_WIDGET_ACTION__IMAGE_EXPRESSION: + return getImageExpression(); case EefPackage.EEF_WIDGET_ACTION__ACTION_EXPRESSION: return getActionExpression(); } @@ -165,6 +213,9 @@ public class EEFWidgetActionImpl extends MinimalEObjectImpl.Container implements case EefPackage.EEF_WIDGET_ACTION__LABEL_EXPRESSION: setLabelExpression((String) newValue); return; + case EefPackage.EEF_WIDGET_ACTION__IMAGE_EXPRESSION: + setImageExpression((String) newValue); + return; case EefPackage.EEF_WIDGET_ACTION__ACTION_EXPRESSION: setActionExpression((String) newValue); return; @@ -183,6 +234,9 @@ public class EEFWidgetActionImpl extends MinimalEObjectImpl.Container implements case EefPackage.EEF_WIDGET_ACTION__LABEL_EXPRESSION: setLabelExpression(EEFWidgetActionImpl.LABEL_EXPRESSION_EDEFAULT); return; + case EefPackage.EEF_WIDGET_ACTION__IMAGE_EXPRESSION: + setImageExpression(EEFWidgetActionImpl.IMAGE_EXPRESSION_EDEFAULT); + return; case EefPackage.EEF_WIDGET_ACTION__ACTION_EXPRESSION: setActionExpression(EEFWidgetActionImpl.ACTION_EXPRESSION_EDEFAULT); return; @@ -201,6 +255,9 @@ public class EEFWidgetActionImpl extends MinimalEObjectImpl.Container implements case EefPackage.EEF_WIDGET_ACTION__LABEL_EXPRESSION: return EEFWidgetActionImpl.LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !EEFWidgetActionImpl.LABEL_EXPRESSION_EDEFAULT.equals(labelExpression); + case EefPackage.EEF_WIDGET_ACTION__IMAGE_EXPRESSION: + return EEFWidgetActionImpl.IMAGE_EXPRESSION_EDEFAULT == null ? imageExpression != null + : !EEFWidgetActionImpl.IMAGE_EXPRESSION_EDEFAULT.equals(imageExpression); case EefPackage.EEF_WIDGET_ACTION__ACTION_EXPRESSION: return EEFWidgetActionImpl.ACTION_EXPRESSION_EDEFAULT == null ? actionExpression != null : !EEFWidgetActionImpl.ACTION_EXPRESSION_EDEFAULT.equals(actionExpression); @@ -222,6 +279,8 @@ public class EEFWidgetActionImpl extends MinimalEObjectImpl.Container implements StringBuffer result = new StringBuffer(super.toString()); result.append(" (labelExpression: "); //$NON-NLS-1$ result.append(labelExpression); + result.append(", imageExpression: "); //$NON-NLS-1$ + result.append(imageExpression); result.append(", actionExpression: "); //$NON-NLS-1$ result.append(actionExpression); result.append(')'); 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 6bf5b4bfe..c5a9fa648 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 @@ -1225,7 +1225,7 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { * @generated */ @Override - public EAttribute getEEFButtonDescription_PushExpression() { + public EAttribute getEEFButtonDescription_ImageExpression() { return (EAttribute) eefButtonDescriptionEClass.getEStructuralFeatures().get(1); } @@ -1235,8 +1235,18 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { * @generated */ @Override + public EAttribute getEEFButtonDescription_PushExpression() { + return (EAttribute) eefButtonDescriptionEClass.getEStructuralFeatures().get(2); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public EReference getEEFButtonDescription_Style() { - return (EReference) eefButtonDescriptionEClass.getEStructuralFeatures().get(2); + return (EReference) eefButtonDescriptionEClass.getEStructuralFeatures().get(3); } /** @@ -1246,7 +1256,7 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { */ @Override public EReference getEEFButtonDescription_ConditionalStyles() { - return (EReference) eefButtonDescriptionEClass.getEStructuralFeatures().get(3); + return (EReference) eefButtonDescriptionEClass.getEStructuralFeatures().get(4); } /** @@ -2315,7 +2325,7 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { * @generated */ @Override - public EAttribute getEEFWidgetAction_ActionExpression() { + public EAttribute getEEFWidgetAction_ImageExpression() { return (EAttribute) eefWidgetActionEClass.getEStructuralFeatures().get(1); } @@ -2325,6 +2335,16 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { * @generated */ @Override + public EAttribute getEEFWidgetAction_ActionExpression() { + return (EAttribute) eefWidgetActionEClass.getEStructuralFeatures().get(2); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public EClass getEEFListConditionalStyle() { return eefListConditionalStyleEClass; } @@ -2516,6 +2536,7 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { eefButtonDescriptionEClass = createEClass(EefPackage.EEF_BUTTON_DESCRIPTION); createEAttribute(eefButtonDescriptionEClass, EefPackage.EEF_BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION); + createEAttribute(eefButtonDescriptionEClass, EefPackage.EEF_BUTTON_DESCRIPTION__IMAGE_EXPRESSION); createEAttribute(eefButtonDescriptionEClass, EefPackage.EEF_BUTTON_DESCRIPTION__PUSH_EXPRESSION); createEReference(eefButtonDescriptionEClass, EefPackage.EEF_BUTTON_DESCRIPTION__STYLE); createEReference(eefButtonDescriptionEClass, EefPackage.EEF_BUTTON_DESCRIPTION__CONDITIONAL_STYLES); @@ -2655,6 +2676,7 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { eefWidgetActionEClass = createEClass(EefPackage.EEF_WIDGET_ACTION); createEAttribute(eefWidgetActionEClass, EefPackage.EEF_WIDGET_ACTION__LABEL_EXPRESSION); + createEAttribute(eefWidgetActionEClass, EefPackage.EEF_WIDGET_ACTION__IMAGE_EXPRESSION); createEAttribute(eefWidgetActionEClass, EefPackage.EEF_WIDGET_ACTION__ACTION_EXPRESSION); eefListConditionalStyleEClass = createEClass(EefPackage.EEF_LIST_CONDITIONAL_STYLE); @@ -2974,6 +2996,9 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { initEAttribute(getEEFButtonDescription_ButtonLabelExpression(), theEcorePackage.getEString(), "buttonLabelExpression", null, 0, 1, //$NON-NLS-1$ EEFButtonDescription.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); + initEAttribute(getEEFButtonDescription_ImageExpression(), ecorePackage.getEString(), "imageExpression", null, 0, 1, //$NON-NLS-1$ + EEFButtonDescription.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); initEAttribute(getEEFButtonDescription_PushExpression(), theEcorePackage.getEString(), "pushExpression", null, 0, 1, //$NON-NLS-1$ EEFButtonDescription.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); @@ -3328,6 +3353,9 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage { initEAttribute(getEEFWidgetAction_LabelExpression(), ecorePackage.getEString(), "labelExpression", null, 0, 1, EEFWidgetAction.class, //$NON-NLS-1$ !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); + initEAttribute(getEEFWidgetAction_ImageExpression(), ecorePackage.getEString(), "imageExpression", null, 0, 1, EEFWidgetAction.class, //$NON-NLS-1$ + !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, + EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); initEAttribute(getEEFWidgetAction_ActionExpression(), ecorePackage.getEString(), "actionExpression", null, 0, 1, EEFWidgetAction.class, //$NON-NLS-1$ !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); |