Greg Sheremeta has uploaded a new change for review. Change subject: webadmin: refactor - replace EnabledDisabledRadioCell ......................................................................
webadmin: refactor - replace EnabledDisabledRadioCell (Patch 4ab of 12) Removed barely used EnabledDisabledRadioCell and merged functionality into RadioboxCell. Removed deprecated, unused constructor from RadioboxCell. No functional changes -- just a refactor. Change-Id: I413952160da6a98080ebd43e075f8d7fbcdb6165 Signed-off-by: Greg Sheremeta <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/RadioboxCell.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractCheckboxColumn.java D frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/EnabledDisabledRadioCell.java 3 files changed, 13 insertions(+), 42 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/38721/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/RadioboxCell.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/RadioboxCell.java index 5f5d4e1..fa6880c 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/RadioboxCell.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/RadioboxCell.java @@ -1,5 +1,7 @@ package org.ovirt.engine.ui.common.widget.table.cell; +import org.ovirt.engine.ui.uicommonweb.models.EntityModel; + import com.google.gwt.cell.client.ValueUpdater; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.BrowserEvents; @@ -10,12 +12,13 @@ import com.google.gwt.safehtml.client.SafeHtmlTemplates; import com.google.gwt.safehtml.shared.SafeHtml; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; +import com.google.gwt.view.client.CellPreviewEvent; /** * A cell used to render a radio button. The value of the radio may be toggled using the ENTER key as well as via mouse * click. */ -public class RadioboxCell extends AbstractEditableCell<Boolean, Boolean> { +public class RadioboxCell extends AbstractEditableCell<Boolean, Boolean> implements EventHandlingCell { interface RadioboxCellTemplates extends SafeHtmlTemplates { @Template("<input id=\"{0}\" type=\"radio\" tabindex=\"-1\" checked/>") @@ -33,19 +36,7 @@ * Construct a new {@link RadioboxCell}. */ public RadioboxCell() { - this(false); - } - - /** - * Construct a new {@link RadioboxCell} that optionally controls selection. - * - * @param isSelectBox - * true if the cell controls the selection state - * @deprecated use {@link #RadioboxCell(boolean, boolean)} instead - */ - @Deprecated - public RadioboxCell(boolean isSelectBox) { - this(isSelectBox, isSelectBox); + this(false, false); } /** @@ -134,4 +125,9 @@ } } + @Override + public boolean handlesEvent(CellPreviewEvent<EntityModel> event) { + return EventHandlingCellMixin.inputHandlesClick(event); + } + } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractCheckboxColumn.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractCheckboxColumn.java index bf27213..e9fd3b6 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractCheckboxColumn.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractCheckboxColumn.java @@ -2,6 +2,8 @@ import java.util.Comparator; +import org.ovirt.engine.ui.common.widget.table.cell.RadioboxCell; + import com.google.gwt.cell.client.Cell.Context; import com.google.gwt.cell.client.FieldUpdater; import com.google.gwt.safehtml.shared.SafeHtml; @@ -37,7 +39,7 @@ } public AbstractCheckboxColumn(boolean multipleSelectionAllowed, FieldUpdater<T, Boolean> fieldUpdater) { - super(multipleSelectionAllowed ? new EnabledDisabledCheckboxCell() : new EnabledDisabledRadioCell()); + super(multipleSelectionAllowed ? new EnabledDisabledCheckboxCell() : new RadioboxCell(true, false)); this.multipleSelectionAllowed = multipleSelectionAllowed; setFieldUpdater(fieldUpdater); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/EnabledDisabledRadioCell.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/EnabledDisabledRadioCell.java deleted file mode 100644 index eabb049..0000000 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/EnabledDisabledRadioCell.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.ovirt.engine.ui.common.widget.table.column; - -import org.ovirt.engine.ui.common.idhandler.CellWithElementId; -import org.ovirt.engine.ui.common.widget.table.cell.EventHandlingCell; -import org.ovirt.engine.ui.common.widget.table.cell.EventHandlingCellMixin; -import org.ovirt.engine.ui.common.widget.table.cell.RadioboxCell; -import org.ovirt.engine.ui.uicommonweb.models.EntityModel; - -import com.google.gwt.view.client.CellPreviewEvent; - -/** - * EnabledDisabledRadioCell. - * Supports rendering Element ids via the oVirt Element-ID framework. - */ -public class EnabledDisabledRadioCell extends RadioboxCell implements EventHandlingCell, CellWithElementId<Boolean> { - - public EnabledDisabledRadioCell() { - super(true, false); - } - - @Override - public boolean handlesEvent(CellPreviewEvent<EntityModel> event) { - return EventHandlingCellMixin.inputHandlesClick(event); - } - -} - -- To view, visit https://gerrit.ovirt.org/38721 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I413952160da6a98080ebd43e075f8d7fbcdb6165 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
