Vojtech Szocs has uploaded a new change for review. Change subject: webadmin,userportal: Small code improvements ......................................................................
webadmin,userportal: Small code improvements 1. Hard-coded strings for DOM events such as "click" replaced with constants such as BrowserEvents.CLICK 2. Removed unused CSS file: IVdcQueryableCellTable.css 3. Small code improvements in ResizeableCheckboxHeader (making field private and final) 4. Added Javadoc to ColumnResizeCellTable.wrapHeader 5. When comparing constant (non-null) vs. dynamic (nullable) value, it's always better to do: if (constant.equals(dynamic)) ... instead of: if (dynamic.equals(constant)) ... to avoid potential NPE if dynamic == null Change-Id: Id8bfb32a64c6e6edfe62e92796b1a0ffad2e1141 Signed-off-by: Vojtech Szocs <vsz...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractCellWithTooltip.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/CheckboxColumn.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskContainersCell.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/EditTextCellWithTooltip.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/LinkCellWithTooltip.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/ListModelListBoxCell.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/RadioboxCell.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SafeHtmlCellWithTooltip.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SafeHtmlWithSafeHtmlTooltipColumn.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StorageDomainsCell.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StyledImageResourceCell.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/TextCellWithEditableTooltip.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/TextCellWithTooltip.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/header/ResizeableCheckboxHeader.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ColumnResizeCellTable.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ColumnResizeHandler.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ResizableHeader.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/extended/vm/AbstractConsoleButtonCell.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/extended/vm/ImageButtonCell.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CustomSelectionCell.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/MenuCell.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tags/TagItemCell.java D frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/css/IVdcQueryableCellTable.css 24 files changed, 89 insertions(+), 124 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/26923/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java index 9d987f7..f11fb36 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java @@ -17,6 +17,7 @@ import com.google.gwt.cell.client.Cell; import com.google.gwt.cell.client.CheckboxCell; import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.safehtml.shared.SafeHtml; import com.google.gwt.safehtml.shared.SafeHtmlUtils; @@ -287,7 +288,7 @@ return; } - if ("click".equals(event.getNativeEvent().getType()) //$NON-NLS-1$ + if (BrowserEvents.CLICK.equals(event.getNativeEvent().getType()) && !(getSelectionModel() instanceof NoSelectionModel)) { // Let the selection column deal with this if (event.getColumn() == 0) { diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractCellWithTooltip.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractCellWithTooltip.java index 5918c75..e850fd1 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractCellWithTooltip.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractCellWithTooltip.java @@ -2,6 +2,7 @@ import com.google.gwt.cell.client.AbstractCell; import com.google.gwt.cell.client.ValueUpdater; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NativeEvent; @@ -25,7 +26,7 @@ super.onBrowserEvent(context, parent, value, event, valueUpdater); // Skip events other than 'mouseover' - if (!"mouseover".equals(event.getType())) { //$NON-NLS-1$ + if (!BrowserEvents.MOUSEOVER.equals(event.getType())) { return; } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/CheckboxColumn.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/CheckboxColumn.java index 6753bc6..ebd9ff1 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/CheckboxColumn.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/CheckboxColumn.java @@ -5,6 +5,7 @@ import com.google.gwt.cell.client.Cell.Context; import com.google.gwt.cell.client.CheckboxCell; import com.google.gwt.cell.client.FieldUpdater; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.safehtml.shared.SafeHtml; @@ -46,7 +47,7 @@ private static boolean handlesEvent(CellPreviewEvent<EntityModel> event) { NativeEvent nativeEvent = event.getNativeEvent(); - if (!"click".equals(nativeEvent.getType().toLowerCase())) { //$NON-NLS-1$ + if (!BrowserEvents.CLICK.equals(nativeEvent.getType())) { return false; } Element target = nativeEvent.getEventTarget().cast(); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskContainersCell.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskContainersCell.java index f6d4936..070617f 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskContainersCell.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskContainersCell.java @@ -2,6 +2,7 @@ import com.google.gwt.cell.client.Cell; import com.google.gwt.cell.client.ValueUpdater; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NativeEvent; @@ -19,14 +20,16 @@ super.onBrowserEvent(context, parent, value, event, valueUpdater); // Ignore events other than 'mouseover' - if (!"mouseover".equals(event.getType())) { //$NON-NLS-1$ + if (!BrowserEvents.MOUSEOVER.equals(event.getType())) { return; } parent.setTitle(title); } + @Override public void setTitle(String title) { this.title = title != null ? title : ""; //$NON-NLS-1$ } + } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/EditTextCellWithTooltip.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/EditTextCellWithTooltip.java index 38dab20..0cfc5f5 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/EditTextCellWithTooltip.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/EditTextCellWithTooltip.java @@ -4,6 +4,7 @@ import com.google.gwt.cell.client.EditTextCell; import com.google.gwt.cell.client.ValueUpdater; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; @@ -17,7 +18,8 @@ private EditTextCell delegate; public EditTextCellWithTooltip(int maxTextLength) { - super(maxTextLength, "mouseover", "click", "keyup", "keydown", "blur"); //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$ $NON-NLS-4$ $NON-NLS-5$ + super(maxTextLength, BrowserEvents.MOUSEOVER, BrowserEvents.CLICK, + BrowserEvents.KEYUP, BrowserEvents.KEYDOWN, BrowserEvents.BLUR); delegate = new EditTextCell(); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/LinkCellWithTooltip.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/LinkCellWithTooltip.java index 60852b8..722d781 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/LinkCellWithTooltip.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/LinkCellWithTooltip.java @@ -3,6 +3,7 @@ import org.ovirt.engine.core.compat.StringHelper; import com.google.gwt.cell.client.ValueUpdater; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; @@ -16,7 +17,7 @@ public class LinkCellWithTooltip extends TextCellWithTooltip { public LinkCellWithTooltip(int maxTextLength) { - super(maxTextLength, "mouseover", "click"); //$NON-NLS-1$ $NON-NLS-2$ + super(maxTextLength, BrowserEvents.MOUSEOVER, BrowserEvents.CLICK); } @Override @@ -36,7 +37,7 @@ ValueUpdater<String> valueUpdater) { super.onBrowserEvent(context, parent, value, event, valueUpdater); - if (!"click".equals(event.getType())) { //$NON-NLS-1$ + if (!BrowserEvents.CLICK.equals(event.getType())) { return; } if (valueUpdater != null && !StringHelper.isNullOrEmpty(value)) { diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/ListModelListBoxCell.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/ListModelListBoxCell.java index 46503dd..bb8156f 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/ListModelListBoxCell.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/ListModelListBoxCell.java @@ -7,9 +7,11 @@ import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; + import com.google.gwt.cell.client.AbstractInputCell; import com.google.gwt.cell.client.SelectionCell; import com.google.gwt.cell.client.ValueUpdater; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; @@ -35,7 +37,7 @@ private final Renderer<T> renderer; public ListModelListBoxCell(final Renderer<T> renderer) { - super("change"); //$NON-NLS-1$ + super(BrowserEvents.CHANGE); this.renderer = renderer; delegate = new SelectionCell(new ArrayList<String>()); // just to avoid null pointer in setSelection() } @@ -96,7 +98,7 @@ @Override public boolean handlesEvent(CellPreviewEvent<EntityModel> event) { NativeEvent nativeEvent = event.getNativeEvent(); - if (!"click".equals(nativeEvent.getType().toLowerCase())) { //$NON-NLS-1$ + if (!BrowserEvents.CLICK.equals(nativeEvent.getType())) { return false; } Element target = nativeEvent.getEventTarget().cast(); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/RadioboxCell.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/RadioboxCell.java index d3891a2..5347c61 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/RadioboxCell.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/RadioboxCell.java @@ -2,6 +2,7 @@ import com.google.gwt.cell.client.AbstractEditableCell; import com.google.gwt.cell.client.ValueUpdater; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.InputElement; import com.google.gwt.dom.client.NativeEvent; @@ -59,7 +60,7 @@ * true if the cell modifies the selection state */ public RadioboxCell(boolean dependsOnSelection, boolean handlesSelection) { - super("change", "keydown"); //$NON-NLS-1$ //$NON-NLS-2$ + super(BrowserEvents.CHANGE, BrowserEvents.KEYDOWN); this.dependsOnSelection = dependsOnSelection; this.handlesSelection = handlesSelection; } @@ -86,9 +87,9 @@ NativeEvent event, ValueUpdater<Boolean> valueUpdater) { String type = event.getType(); - boolean enterPressed = "keydown".equals(type) //$NON-NLS-1$ + boolean enterPressed = BrowserEvents.KEYDOWN.equals(type) && event.getKeyCode() == KeyCodes.KEY_ENTER; - if ("change".equals(type) || enterPressed) { //$NON-NLS-1$ + if (BrowserEvents.CHANGE.equals(type) || enterPressed) { InputElement input = parent.getFirstChild().cast(); Boolean isChecked = input.isChecked(); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SafeHtmlCellWithTooltip.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SafeHtmlCellWithTooltip.java index 345900c..3dcee3d 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SafeHtmlCellWithTooltip.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SafeHtmlCellWithTooltip.java @@ -1,5 +1,6 @@ package org.ovirt.engine.ui.common.widget.table.column; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.safehtml.shared.SafeHtml; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; import com.google.gwt.user.client.ui.HTML; @@ -13,7 +14,7 @@ public class SafeHtmlCellWithTooltip extends AbstractCellWithTooltip<SafeHtml> { public SafeHtmlCellWithTooltip() { - super("mouseover"); //$NON-NLS-1$ + super(BrowserEvents.MOUSEOVER); } public SafeHtmlCellWithTooltip(String... consumedEvents) { diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SafeHtmlWithSafeHtmlTooltipColumn.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SafeHtmlWithSafeHtmlTooltipColumn.java index 0fd6f0e..67b4fa0 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SafeHtmlWithSafeHtmlTooltipColumn.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SafeHtmlWithSafeHtmlTooltipColumn.java @@ -3,6 +3,7 @@ import com.google.gwt.cell.client.AbstractCell; import com.google.gwt.cell.client.Cell.Context; import com.google.gwt.cell.client.ValueUpdater; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.safehtml.shared.SafeHtml; @@ -15,7 +16,7 @@ public abstract class SafeHtmlWithSafeHtmlTooltipColumn<T> extends Column<T, SafeHtml>{ public SafeHtmlWithSafeHtmlTooltipColumn() { - super(new AbstractCell<SafeHtml>("mouseover", "mouseout"){ //$NON-NLS-1$ //$NON-NLS-2$ + super(new AbstractCell<SafeHtml>(BrowserEvents.MOUSEOVER, BrowserEvents.MOUSEOUT) { @Override public void onBrowserEvent(com.google.gwt.cell.client.Cell.Context context, @@ -53,7 +54,7 @@ public void onBrowserEvent(Context context, final Element elem, T object, NativeEvent event) { super.onBrowserEvent(context, elem, object, event); - if (event.getType().equals("mouseover")) { //$NON-NLS-1$ + if (BrowserEvents.MOUSEOVER.equals(event.getType())) { Widget widget = new Widget(){ @Override public com.google.gwt.user.client.Element getElement() { @@ -67,7 +68,7 @@ tooltipPanel.showRelativeTo(widget); } } - else if (event.getType().equals("mouseout")) { //$NON-NLS-1$ + else if (BrowserEvents.MOUSEOUT.equals(event.getType())) { tooltipPanel.hide(true); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StorageDomainsCell.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StorageDomainsCell.java index 226f423..5ad2e21 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StorageDomainsCell.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StorageDomainsCell.java @@ -2,6 +2,7 @@ import com.google.gwt.cell.client.Cell; import com.google.gwt.cell.client.ValueUpdater; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NativeEvent; @@ -19,14 +20,16 @@ super.onBrowserEvent(context, parent, value, event, valueUpdater); // Ignore events other than 'mouseover' - if (!"mouseover".equals(event.getType())) { //$NON-NLS-1$ + if (!BrowserEvents.MOUSEOVER.equals(event.getType())) { return; } parent.setTitle(title); } + @Override public void setTitle(String title) { this.title = title != null ? title : ""; //$NON-NLS-1$ } + } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StyledImageResourceCell.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StyledImageResourceCell.java index 1e16c55..3d28bcc 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StyledImageResourceCell.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StyledImageResourceCell.java @@ -22,7 +22,6 @@ /** * ImageResourceCell that supports setting a style and displaying a tooltip in a * DecoratedPopupPanel. - * */ public class StyledImageResourceCell extends ImageResourceCell { @@ -49,8 +48,8 @@ } consumedEvents = new HashSet<String>(); - consumedEvents.add("mouseover"); //$NON-NLS-1$ - consumedEvents.add("mouseout"); //$NON-NLS-1$ + consumedEvents.add(BrowserEvents.MOUSEOVER); + consumedEvents.add(BrowserEvents.MOUSEOUT); } @Override diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/TextCellWithEditableTooltip.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/TextCellWithEditableTooltip.java index 17a7b12..d7757bf 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/TextCellWithEditableTooltip.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/TextCellWithEditableTooltip.java @@ -2,6 +2,7 @@ import com.google.gwt.cell.client.Cell; import com.google.gwt.cell.client.ValueUpdater; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NativeEvent; @@ -10,6 +11,7 @@ * It overrides the usual {@link TextCellWithTooltip} tooltip behavior */ public class TextCellWithEditableTooltip extends TextCellWithTooltip { + private String title = ""; //$NON-NLS-1$ public TextCellWithEditableTooltip() { @@ -22,14 +24,16 @@ super.onBrowserEvent(context, parent, value, event, valueUpdater); // Ignore events other than 'mouseover' or when title was left empty string - if (!"mouseover".equals(event.getType()) || "".equals(title)) { //$NON-NLS-1$ //$NON-NLS-2$ + if (!BrowserEvents.MOUSEOVER.equals(event.getType()) || "".equals(title)) { //$NON-NLS-1$ return; } parent.setTitle(title); } + @Override public void setTitle(String title) { this.title = title != null ? title : ""; //$NON-NLS-1$ } + } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/TextCellWithTooltip.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/TextCellWithTooltip.java index 8ef9efe..1199531 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/TextCellWithTooltip.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/TextCellWithTooltip.java @@ -1,9 +1,11 @@ package org.ovirt.engine.ui.common.widget.table.column; import com.google.gwt.user.client.ui.HTML; + import org.ovirt.engine.ui.common.utils.ElementIdUtils; import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Element; import com.google.gwt.safehtml.client.SafeHtmlTemplates; import com.google.gwt.safehtml.shared.SafeHtml; @@ -39,7 +41,7 @@ private static CellTemplate template; public TextCellWithTooltip(int maxTextLength) { - this(maxTextLength, "mouseover"); //$NON-NLS-1$ + this(maxTextLength, BrowserEvents.MOUSEOVER); } public TextCellWithTooltip(int maxTextLength, String... consumedEvents) { diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/header/ResizeableCheckboxHeader.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/header/ResizeableCheckboxHeader.java index 9f25204..167abbb 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/header/ResizeableCheckboxHeader.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/header/ResizeableCheckboxHeader.java @@ -13,20 +13,18 @@ public class ResizeableCheckboxHeader<T> extends ResizableHeader<T> { - CheckboxHeader checkboxHeaderDelegate; + private final CheckboxHeader checkboxHeaderDelegate; public ResizeableCheckboxHeader(CheckboxHeader checkboxHeader, - Column<T, ?> column, - HasResizableColumns<T> table) { - - super(checkboxHeader.getTitle(), column, table, new SafeHtmlCellWithTooltip(BrowserEvents.CLICK, + Column<T, ?> column, HasResizableColumns<T> table) { + super(checkboxHeader.getTitle(), column, table, new SafeHtmlCellWithTooltip( + BrowserEvents.CLICK, BrowserEvents.MOUSEDOWN, BrowserEvents.MOUSEMOVE, BrowserEvents.MOUSEOVER, BrowserEvents.CHANGE, BrowserEvents.KEYDOWN)); - - checkboxHeaderDelegate = checkboxHeader; + this.checkboxHeaderDelegate = checkboxHeader; } @Override diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ColumnResizeCellTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ColumnResizeCellTable.java index 82beb51..8cd8b1f 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ColumnResizeCellTable.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ColumnResizeCellTable.java @@ -165,7 +165,6 @@ /** * Removes a column. - * */ @Override public void removeColumn(int index) { @@ -194,6 +193,11 @@ }; } + /** + * Wraps the given {@code header} passed from user code, if necessary. + * <p> + * This method is called whenever a column is added to the table. + */ Header<?> wrapHeader(Header<?> header, Column<T, ?> column) { return (columnResizingEnabled && header instanceof CheckboxHeader) ? new ResizeableCheckboxHeader<T>((CheckboxHeader) header, column, this) : header; diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ColumnResizeHandler.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ColumnResizeHandler.java index 75449a7..1851c38 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ColumnResizeHandler.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ColumnResizeHandler.java @@ -1,5 +1,6 @@ package org.ovirt.engine.ui.common.widget.table.resize; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.event.shared.HandlerRegistration; @@ -39,7 +40,7 @@ nativeEvent.preventDefault(); nativeEvent.stopPropagation(); - if ("mousemove".equals(nativeEvent.getType())) { //$NON-NLS-1$ + if (BrowserEvents.MOUSEMOVE.equals(nativeEvent.getType())) { // Calculate display-relative column width int absoluteLeft = headerElement.getAbsoluteLeft(); int clientX = nativeEvent.getClientX(); @@ -53,7 +54,7 @@ table.resizeColumn(column, displayColumnWidth); } - else if ("mouseup".equals(nativeEvent.getType())) { //$NON-NLS-1$ + else if (BrowserEvents.MOUSEUP.equals(nativeEvent.getType())) { // Release native event handler eventHandler.removeHandler(); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ResizableHeader.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ResizableHeader.java index 9cda350..bbf1156 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ResizableHeader.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ResizableHeader.java @@ -4,6 +4,7 @@ import com.google.gwt.cell.client.Cell; import com.google.gwt.cell.client.Cell.Context; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.dom.client.Style.Cursor; @@ -31,9 +32,11 @@ public ResizableHeader(SafeHtml text, Column<T, ?> column, HasResizableColumns<T> table) { - this(text, column, table, - new SafeHtmlCellWithTooltip("click", "mousedown", //$NON-NLS-1$ //$NON-NLS-2$ - "mousemove", "mouseover")); //$NON-NLS-1$ //$NON-NLS-2$ + this(text, column, table, new SafeHtmlCellWithTooltip( + BrowserEvents.CLICK, + BrowserEvents.MOUSEDOWN, + BrowserEvents.MOUSEMOVE, + BrowserEvents.MOUSEOVER)); } public ResizableHeader(SafeHtml text, Column<T, ?> column, HasResizableColumns<T> table, @@ -56,9 +59,11 @@ if (previousColumn == null) { previousColumn = table.getPreviousColumn(column); } + int clientX = event.getClientX(); int absoluteLeft = target.getAbsoluteLeft(); int offsetWidth = target.getOffsetWidth(); + boolean mouseOverRightResizeBarArea = clientX > absoluteLeft + offsetWidth - RESIZE_BAR_WIDTH; boolean mouseOverLeftResizeBarArea = (clientX >= absoluteLeft && clientX < absoluteLeft + RESIZE_BAR_WIDTH) && previousColumn != null; @@ -73,7 +78,7 @@ // On mouse down event, which initiates the column resize operation, // register a column resize handler that listens to mouse move events - if ("mousedown".equals(event.getType())) { //$NON-NLS-1$ + if (BrowserEvents.MOUSEDOWN.equals(event.getType())) { if (mouseOverRightResizeBarArea) { new ColumnResizeHandler<T>(target, column, table); } else if (mouseOverLeftResizeBarArea) { diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/extended/vm/AbstractConsoleButtonCell.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/extended/vm/AbstractConsoleButtonCell.java index a97a364..ce4f625 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/extended/vm/AbstractConsoleButtonCell.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/extended/vm/AbstractConsoleButtonCell.java @@ -6,6 +6,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.DivElement; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.EventTarget; @@ -15,6 +16,7 @@ import com.google.gwt.safehtml.shared.SafeHtmlBuilder; import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.gwt.user.client.DOM; + import org.ovirt.engine.ui.common.utils.ElementIdUtils; import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalItemModel; @@ -50,7 +52,7 @@ public AbstractConsoleButtonCell(String enabledCss, String disabledCss, String title, ConsoleButtonCommand command) { - super("click"); //$NON-NLS-1$ + super(BrowserEvents.CLICK); this.enabledCss = SafeHtmlUtils.htmlEscape(enabledCss); this.disabledCss = SafeHtmlUtils.htmlEscape(disabledCss); this.title = SafeHtmlUtils.htmlEscape(title); @@ -79,7 +81,7 @@ EventTarget eventTarget = event.getEventTarget(); // Skip events other than 'click' - if (!"click".equals(event.getType())) { //$NON-NLS-1$ + if (!BrowserEvents.CLICK.equals(event.getType())) { return; } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/extended/vm/ImageButtonCell.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/extended/vm/ImageButtonCell.java index 7f433f0..4a40d89 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/extended/vm/ImageButtonCell.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/extended/vm/ImageButtonCell.java @@ -5,6 +5,7 @@ import com.google.gwt.cell.client.AbstractCell; import com.google.gwt.cell.client.ValueUpdater; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.EventTarget; import com.google.gwt.dom.client.NativeEvent; @@ -35,7 +36,7 @@ public ImageButtonCell(ImageResource enabledImage, String enabledCss, ImageResource disabledImage, String disabledCss) { - super("click"); //$NON-NLS-1$ + super(BrowserEvents.CLICK); this.enabledHtml = SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(enabledImage).getHTML()); this.enabledCss = enabledCss; this.disabledHtml = SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(disabledImage).getHTML()); @@ -59,7 +60,7 @@ return; } - if ("click".equals(event.getType()) && isEnabled(value)) { //$NON-NLS-1$ + if (BrowserEvents.CLICK.equals(event.getType()) && isEnabled(value)) { onClick(value); } // TODO change the image while the mouse is down (simulate click) diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CustomSelectionCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CustomSelectionCell.java index 990f63c..d1c0cc3 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CustomSelectionCell.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CustomSelectionCell.java @@ -7,6 +7,7 @@ import com.google.gwt.cell.client.AbstractInputCell; import com.google.gwt.cell.client.ValueUpdater; import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.dom.client.SelectElement; @@ -46,7 +47,7 @@ * the options in the cell */ public CustomSelectionCell(List<String> options) { - super("change"); //$NON-NLS-1$ + super(BrowserEvents.CHANGE); if (template == null) { template = GWT.create(CellTemplate.class); } @@ -62,7 +63,7 @@ NativeEvent event, ValueUpdater<String> valueUpdater) { super.onBrowserEvent(context, parent, value, event, valueUpdater); String type = event.getType(); - if ("change".equals(type)) { //$NON-NLS-1$ + if (BrowserEvents.CHANGE.equals(type)) { Object key = context.getKey(); SelectElement select = parent.getFirstChild().cast(); String newValue = options.get(select.getSelectedIndex()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/MenuCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/MenuCell.java index f9e1cf6..f9edb58 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/MenuCell.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/MenuCell.java @@ -8,6 +8,7 @@ import com.google.gwt.cell.client.AbstractCell; import com.google.gwt.cell.client.ValueUpdater; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.EventTarget; import com.google.gwt.dom.client.NativeEvent; @@ -30,7 +31,7 @@ private MenuPanelPopup menuPanelPopup; public MenuCell() { - super("click" , "mouseover" , "mouseout"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ + super(BrowserEvents.CLICK, BrowserEvents.MOUSEOVER, BrowserEvents.MOUSEOUT); this.menuPanelPopup = new MenuPanelPopup(true); } @@ -49,6 +50,7 @@ return true; } + @Override public void onBrowserEvent(Context context, Element parent, T value, @@ -59,14 +61,14 @@ int eventY = event.getClientY(); // Handle the click event. - if ("click".equals(event.getType())) { //$NON-NLS-1$ + if (BrowserEvents.CLICK.equals(event.getType())) { // Ignore clicks that occur outside of the outermost element. EventTarget eventTarget = event.getEventTarget(); if (parent.getFirstChildElement().isOrHasChild(Element.as(eventTarget))) { menuPanelPopup.asPopupPanel().showAndFitToScreen(eventX, eventY); } } - else if("mouseover".equals(event.getType())) {//$NON-NLS-1$ + else if(BrowserEvents.MOUSEOVER.equals(event.getType())) { if (isVisible(value)) { parent.getFirstChildElement().getStyle().setBorderColor("#96B7D6"); //$NON-NLS-1$ } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tags/TagItemCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tags/TagItemCell.java index f09df6f..54c6ef6 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tags/TagItemCell.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tags/TagItemCell.java @@ -12,6 +12,7 @@ import com.google.gwt.cell.client.CompositeCell; import com.google.gwt.cell.client.HasCell; import com.google.gwt.cell.client.ValueUpdater; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.dom.client.Style.Visibility; @@ -24,17 +25,13 @@ public class TagItemCell extends CompositeCell<TagModel> { - private static final String CLICK = "click"; //$NON-NLS-1$ - private static final String MOUSEOVER = "mouseover"; //$NON-NLS-1$ - private static final String MOUSEOUT = "mouseout"; //$NON-NLS-1$ - private static class TagItemTextCell extends Column<TagModel, SafeHtml> { private final ApplicationResources resources; private final ApplicationTemplates templates; private TagItemTextCell(ApplicationResources resources, ApplicationTemplates templates) { - super(new AbstractCell<SafeHtml>(CLICK, MOUSEOVER, MOUSEOUT) { + super(new AbstractCell<SafeHtml>(BrowserEvents.CLICK, BrowserEvents.MOUSEOVER, BrowserEvents.MOUSEOUT) { @Override public void render(Context context, SafeHtml value, SafeHtmlBuilder sb) { TagModel tagModel = (TagModel) context.getKey(); @@ -59,10 +56,10 @@ Element tagButtonElement = parent.getNextSiblingElement().getFirstChildElement(); // Update tag item and button on mouse over and mouse out - if (event.getType().equals(MOUSEOVER) && tagModel.getType() != TagModelType.Root) { + if (BrowserEvents.MOUSEOVER.equals(event.getType()) && tagModel.getType() != TagModelType.Root) { updateTagElement(true, tagItemElement, tagButtonElement); } - else if (event.getType().equals(MOUSEOUT) && !tagModel.getSelection()) { + else if (BrowserEvents.MOUSEOUT.equals(event.getType()) && !tagModel.getSelection()) { updateTagElement(false, tagItemElement, tagButtonElement); } } @@ -93,7 +90,7 @@ private static class TagItemButtonCell extends Column<TagModel, Boolean> { private TagItemButtonCell(final ApplicationResources resources, final ApplicationTemplates templates) { - super(new AbstractCell<Boolean>(CLICK, MOUSEOVER, MOUSEOUT) { + super(new AbstractCell<Boolean>(BrowserEvents.CLICK, BrowserEvents.MOUSEOVER, BrowserEvents.MOUSEOUT) { @Override public void render(Context context, Boolean value, SafeHtmlBuilder sb) { String tagPin = AbstractImagePrototype.create(resources.tagPinImage()).getHTML(); @@ -128,7 +125,7 @@ boolean isSelected = !value; // Update tag item and button on click, mouse over and mouse out - if (event.getType().equals(CLICK)) { + if (BrowserEvents.CLICK.equals(event.getType())) { if (tagModel.getType() != TagModelType.Root) { // Update model selection tagModel.setSelection(isSelected); @@ -141,10 +138,10 @@ isSelected ? TAG_BG_COLOR_SELECTED : TAG_BG_COLOR_UNSELECTED); } } - else if (event.getType().equals(MOUSEOVER) && tagModel.getType() != TagModelType.Root) { + else if (BrowserEvents.MOUSEOVER.equals(event.getType()) && tagModel.getType() != TagModelType.Root) { updateTagElement(true, tagItem, tagButton); } - else if (event.getType().equals(MOUSEOUT) && !tagModel.getSelection()) { + else if (BrowserEvents.MOUSEOUT.equals(event.getType()) && !tagModel.getSelection()) { updateTagElement(false, tagItem, tagButton); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/css/IVdcQueryableCellTable.css b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/css/IVdcQueryableCellTable.css deleted file mode 100644 index e7de46b..0000000 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/css/IVdcQueryableCellTable.css +++ /dev/null @@ -1,68 +0,0 @@ -.cellTableWidget { - width: 100%; - position: relative; -} - -.cellTableFirstColumn { - padding: 2px 15px; -} - -.cellTableLastColumn { - -} - -.cellTableFooter { - -} - -.cellTableHeader { - border-top: 1px solid #E3EDF6; - border-bottom: 1px solid #E3EDF6; - border-left: 1px solid #D7D7E1; - padding-top: 0px; - padding-bottom: 0px; - padding-left: 5px; - padding-right: 5px; - text-align: left; - color: #111111; - font-family: Arial, sans-serif; - font-size: 11px; - background-color: #F0F2FF; - height: 28px; - white-space: nowrap; -} - -.cellTableCell { - padding: 0px 3px; - height: 26px !important; - border-top: 0px; - border-bottom: 1px solid #EDEEF0; - border-right: 0px; - border-left: 0px; - white-space: nowrap; - cursor: pointer; -} - -.cellTableEvenRow { - background-color: #ffffff; -} - -.cellTableOddRow { - background-color: #f3f7fb; -} - -.cellTableHoveredRow { - background-color: #eee; -} - -.cellTableSelectedRow { - background-color: #C3D0E0; - color: white; - overflow: auto; -} - -@ -sprite .cellTableLoading { - gwt-image: 'cellTableLoading'; - margin: 3px; -} \ No newline at end of file -- To view, visit http://gerrit.ovirt.org/26923 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8bfb32a64c6e6edfe62e92796b1a0ffad2e1141 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vojtech Szocs <vsz...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches