Alexander Wels has uploaded a new change for review. Change subject: userportal,webadmin: label value title ......................................................................
userportal,webadmin: label value title - Moved the title code from TextBoxLabel to TextBoxLabelBase so that all subclasses also set the title properly when setting the value. Change-Id: I3cb524ba13ec9a9f37d5ddcb6b4554293d6ec23d Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1061379 Signed-off-by: Alexander Wels <aw...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/TextBoxLabel.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/TextBoxLabelBase.java 2 files changed, 20 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/24138/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/TextBoxLabel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/TextBoxLabel.java index 84ea6f2..26d9f8d 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/TextBoxLabel.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/TextBoxLabel.java @@ -13,7 +13,6 @@ public class TextBoxLabel extends TextBoxLabelBase<String> { private boolean hasFocus = false; - private String tooltipCaption; public TextBoxLabel() { super(new EmptyValueRenderer<String>() { @@ -68,12 +67,6 @@ final int cursorPosition = getCursorPos(); final int selectionLength = getSelectionLength(); - String renderedText = text; - if (getTooltipCaption() != null) { - renderedText = getTooltipCaption() + ": " + renderedText; //$NON-NLS-1$ - } - setTitle(renderedText); - if (hasFocus) { // Needs to be deferred, because the setSelection works // only after the element has been attached to the document @@ -86,14 +79,6 @@ } }); } - } - - public String getTooltipCaption() { - return tooltipCaption; - } - - public void setTooltipCaption(String tooltipCaption) { - this.tooltipCaption = tooltipCaption; } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/TextBoxLabelBase.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/TextBoxLabelBase.java index b0ec402..06bc208 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/TextBoxLabelBase.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/TextBoxLabelBase.java @@ -27,6 +27,7 @@ public abstract class TextBoxLabelBase<T> extends ValueBoxBase<T> { private T value; + private String tooltipCaption; private TextBoxLabelBase(Renderer<T> renderer, Parser<T> parser) { super(Document.get().createTextInputElement(), renderer, parser); @@ -53,6 +54,16 @@ } @Override + public void setText(String text) { + super.setText(text); + String renderedText = text; + if (getTooltipCaption() != null) { + renderedText = getTooltipCaption() + ": " + renderedText; //$NON-NLS-1$ + } + setTitle(renderedText); + } + + @Override public T getValueOrThrow() throws ParseException { // Suppress rendered text parsing logic, // return the value that was set previously @@ -76,4 +87,13 @@ }, MouseDownEvent.getType()); } + public String getTooltipCaption() { + return tooltipCaption; + } + + public void setTooltipCaption(String tooltipCaption) { + this.tooltipCaption = tooltipCaption; + } + + } -- To view, visit http://gerrit.ovirt.org/24138 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3cb524ba13ec9a9f37d5ddcb6b4554293d6ec23d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <aw...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
