| commit | 7e904b1c3694adf4f47f259a956dedf6a511f25b | [log] [tgz] |
|---|---|---|
| author | Stéphane Bégaudeau <stephane.begaudeau@obeo.fr> | Wed Oct 12 14:27:59 2016 +0200 |
| committer | Stéphane Bégaudeau <stephane.begaudeau@obeo.fr> | Fri Oct 14 16:29:08 2016 +0200 |
| tree | 8da70ab661a5041fd2172c65ce618d1c8f78ce4f | |
| parent | 16f0326138fb99bc6f46ba440cf62ba1b244751a [diff] |
[505776] Fix an issue with the enablement of the reference widget Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=505776 Change-Id: Ief0b480b9221e3769dd65f6ccbe3f06f675ab652 Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
diff --git a/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/AbstractEEFExtReferenceLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/AbstractEEFExtReferenceLifecycleManager.java index 90713de..ea70350 100644 --- a/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/AbstractEEFExtReferenceLifecycleManager.java +++ b/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/AbstractEEFExtReferenceLifecycleManager.java
@@ -291,6 +291,16 @@ /** * {@inheritDoc} * + * @see org.eclipse.eef.ide.ui.api.widgets.AbstractEEFWidgetLifecycleManager#isEnabled() + */ + @Override + protected boolean isEnabled() { + return super.isEnabled() && this.eReference.isChangeable(); + } + + /** + * {@inheritDoc} + * * @see org.eclipse.eef.ide.ui.api.widgets.AbstractEEFWidgetLifecycleManager#aboutToBeHidden() */ @Override
diff --git a/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/EEFExtSingleReferenceLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/EEFExtSingleReferenceLifecycleManager.java index b857266..43c3fb7 100644 --- a/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/EEFExtSingleReferenceLifecycleManager.java +++ b/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/EEFExtSingleReferenceLifecycleManager.java
@@ -208,6 +208,10 @@ this.image.setImage(null); this.text.setText(Messages.SingleReference_noValue); } + + if (this.browseButton != null && !this.browseButton.isDisposed()) { + this.browseButton.setEnabled(this.isEnabled()); + } } /**