Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMélanie Bats2016-09-22 12:07:43 +0000
committerMélanie Bats2016-09-26 13:55:53 +0000
commit4e21ca9e6ddd5fa3b0d9b72ebc09a720bdde5e93 (patch)
tree682439b13feb2b91c545d6e3d759315f07097882
parent9b20ebca3a0e4b23b062cb33d81894b28c279967 (diff)
downloadorg.eclipse.eef-4e21ca9e6ddd5fa3b0d9b72ebc09a720bdde5e93.tar.gz
org.eclipse.eef-4e21ca9e6ddd5fa3b0d9b72ebc09a720bdde5e93.tar.xz
org.eclipse.eef-4e21ca9e6ddd5fa3b0d9b72ebc09a720bdde5e93.zip
[501903] Review the value of the selection variable on hyperlink widget
Set the selection variable to the value of the hyperlink instead of self. Bug: 501903 Change-Id: I55adc5fc90cafa7db828a4da5fe58cc8e9bf90a8 Signed-off-by: Mélanie Bats <melanie.bats@obeo.fr>
-rw-r--r--doc/org.eclipse.eef.documentation/pages/releasenotes.html1
-rw-r--r--doc/org.eclipse.eef.documentation/pages/releasenotes.textile1
-rw-r--r--plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFHyperlinkLifecycleManager.java3
3 files changed, 3 insertions, 2 deletions
diff --git a/doc/org.eclipse.eef.documentation/pages/releasenotes.html b/doc/org.eclipse.eef.documentation/pages/releasenotes.html
index 312ca9826..53a1a190e 100644
--- a/doc/org.eclipse.eef.documentation/pages/releasenotes.html
+++ b/doc/org.eclipse.eef.documentation/pages/releasenotes.html
@@ -36,6 +36,7 @@
<li><span class="label label-success">Added</span> A new widget named List has been added, it has the same behavior as the multiple reference widget of the previous release.</li>
<li><span class="label label-info">Modified</span> The edit operation of a text field can now be triggered by the loss of focus on the text field.</li>
<li><span class="label label-info">Modified</span> The edit operation of a mono-line text field can now be triggered by pressing enter.</li>
+ <li><span class="label label-info">Modified</span> A selection variable is available in the hyperlink widget, it is equals to the value of the hyperlink instead of self.</li>
</ul>
<h4 id="DeveloperVisibleChanges">Developer-Visible Changes</h4>
<ul>
diff --git a/doc/org.eclipse.eef.documentation/pages/releasenotes.textile b/doc/org.eclipse.eef.documentation/pages/releasenotes.textile
index 4689b18e1..3296cbde8 100644
--- a/doc/org.eclipse.eef.documentation/pages/releasenotes.textile
+++ b/doc/org.eclipse.eef.documentation/pages/releasenotes.textile
@@ -19,6 +19,7 @@ h4. Specifier-Visible Changes
* <span class="label label-success">Added</span> A new widget named List has been added, it has the same behavior as the multiple reference widget of the previous release.
* <span class="label label-info">Modified</span> The edit operation of a text field can now be triggered by the loss of focus on the text field.
* <span class="label label-info">Modified</span> The edit operation of a mono-line text field can now be triggered by pressing enter.
+* <span class="label label-info">Modified</span> A selection variable is available in the hyperlink widget, it is equals to the value of the hyperlink instead of self.
h4. Developer-Visible Changes
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFHyperlinkLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFHyperlinkLifecycleManager.java
index d5278e7c0..3d0880ebc 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFHyperlinkLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFHyperlinkLifecycleManager.java
@@ -22,7 +22,6 @@ import org.eclipse.eef.EEFWidgetDescription;
import org.eclipse.eef.EEFWidgetStyle;
import org.eclipse.eef.common.ui.api.EEFWidgetFactory;
import org.eclipse.eef.common.ui.api.IEEFFormContainer;
-import org.eclipse.eef.core.api.EEFExpressionUtils;
import org.eclipse.eef.core.api.EditingContextAdapter;
import org.eclipse.eef.core.api.controllers.EEFControllersFactory;
import org.eclipse.eef.core.api.controllers.IConsumer;
@@ -212,7 +211,7 @@ public class EEFHyperlinkLifecycleManager extends AbstractEEFWidgetLifecycleMana
if (!(hyperlink.getText() != null && hyperlink.getText().equals(value))) {
String text = Objects.firstNonNull(value, ""); //$NON-NLS-1$
hyperlink.setText(text);
- hyperlink.setData(variableManager.getVariables().get(EEFExpressionUtils.SELF));
+ hyperlink.setData(value);
}
EEFHyperlinkLifecycleManager.this.setStyle();
if (!hyperlink.isEnabled()) {

Back to the top