Greg Sheremeta has uploaded a new change for review. Change subject: userportal, webadmin: delete LabelWithCustomToolTip ......................................................................
userportal, webadmin: delete LabelWithCustomToolTip (Patch 4k of 12) Deleted LabelWithCustomToolTip and replaced its single usage with an HTML widget. The tooltip will be re-added in a follow-up patch. Change-Id: I6dd6c760abd70d385e808010882c68e4d1ba638d Signed-off-by: Greg Sheremeta <[email protected]> --- D frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/LabelWithCustomToolTip.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/InterfaceLabel.java 2 files changed, 6 insertions(+), 87 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/16/38616/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/LabelWithCustomToolTip.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/LabelWithCustomToolTip.java deleted file mode 100644 index 7f232e3..0000000 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/LabelWithCustomToolTip.java +++ /dev/null @@ -1,81 +0,0 @@ -package org.ovirt.engine.ui.common.widget.label; - -import org.ovirt.engine.ui.uicompat.external.StringUtils; - -import com.google.gwt.event.dom.client.MouseOutEvent; -import com.google.gwt.event.dom.client.MouseOutHandler; -import com.google.gwt.event.dom.client.MouseOverEvent; -import com.google.gwt.event.dom.client.MouseOverHandler; -import com.google.gwt.safehtml.shared.SafeHtml; -import com.google.gwt.user.client.ui.DecoratedPopupPanel; -import com.google.gwt.user.client.ui.HTML; - -/** - * This class represents a label with a tooltip. - * - * Both the label and the tooltip can be <code>String</code> or <code>SafeHtml</code>. - * - * The default tooltip is the label's text. Overriding the tooltip (<code>setTitle(String title)</code>) should be done - * after setting the text (<code>setText(String text)</code>). - */ -public class LabelWithCustomToolTip extends HTML { - - private final HTML tooltip = new HTML(); - private final DecoratedPopupPanel tooltipPanel = new DecoratedPopupPanel(); - private String title; - - public LabelWithCustomToolTip() { - initTooltipPanel(); - } - - public LabelWithCustomToolTip(String text) { - this(); - setText(text); - } - - public LabelWithCustomToolTip(SafeHtml html) { - this(); - setHTML(html); - } - - @Override - public void setText(final String text) { - super.setText(text); - setTitle(text); - } - - private void initTooltipPanel() { - tooltipPanel.setWidget(tooltip); - tooltipPanel.getElement().getStyle().setZIndex(1); - registerHandlers(); - } - - private void registerHandlers() { - addMouseOverHandler(new MouseOverHandler() { - - @Override - public void onMouseOver(MouseOverEvent event) { - if (!StringUtils.isEmpty(title)) { - tooltip.setHTML(title); - tooltipPanel.showRelativeTo(LabelWithCustomToolTip.this); - } - } - }); - addMouseOutHandler(new MouseOutHandler() { - - @Override - public void onMouseOut(MouseOutEvent event) { - tooltipPanel.hide(true); - } - }); - } - - @Override - public void setTitle(String text) { - this.title = text; - } - - public void setTitle(SafeHtml text) { - setTitle(text == null ? (String) null : text.asString()); - } -} diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/InterfaceLabel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/InterfaceLabel.java index 22e156c..2409ae0 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/InterfaceLabel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/InterfaceLabel.java @@ -5,7 +5,6 @@ import org.ovirt.engine.core.common.businessentities.comparators.LexoNumericComparator; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; -import org.ovirt.engine.ui.common.widget.label.LabelWithCustomToolTip; import org.ovirt.engine.ui.webadmin.ApplicationResources; import org.ovirt.engine.ui.webadmin.ApplicationTemplates; @@ -15,6 +14,7 @@ import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.HTML; public class InterfaceLabel extends Composite { private final static ApplicationResources resources = GWT.create(ApplicationResources.class); @@ -22,21 +22,21 @@ private final static SafeHtml labelImage = SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(resources.tagImage()).getHTML()); - private final LabelWithCustomToolTip label; + private final HTML label; public InterfaceLabel(VdsNetworkInterface iface) { label = createInterfaceLabel(iface); initWidget(label); } - private LabelWithCustomToolTip createInterfaceLabel(VdsNetworkInterface iface) { + private HTML createInterfaceLabel(VdsNetworkInterface iface) { boolean hasLabels = iface.getLabels() != null && !iface.getLabels().isEmpty(); - LabelWithCustomToolTip interfaceNameWithLabel = - new LabelWithCustomToolTip(hasLabels ? templates.textImageLabels(iface.getName(), labelImage) + HTML interfaceNameWithLabel = + new HTML(hasLabels ? templates.textImageLabels(iface.getName(), labelImage) : SafeHtmlUtils.fromString(iface.getName())); - interfaceNameWithLabel.setTitle(createLabelToolTip(iface.getLabels())); + // TODO tt set tooltip of createLabelToolTip(iface.getLabels()) return interfaceNameWithLabel; } -- To view, visit https://gerrit.ovirt.org/38616 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6dd6c760abd70d385e808010882c68e4d1ba638d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Sheremeta <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
