Ravi Nori has uploaded a new change for review. Change subject: webadmin: ENTER does not execute default command ......................................................................
webadmin: ENTER does not execute default command Pressing the enter key does not execute the default command for all models that extend SearchableListModel Change-Id: I4ebfa08d2d3bcd0d2089febbe19e54c76cef25ec Bug-Url: https://bugzilla.redhat.com/1126324 Signed-off-by: Ravi Nori <rn...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/DeferredModelCommandInvoker.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractActionStackPanelItem.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java 5 files changed, 16 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/31167/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/DeferredModelCommandInvoker.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/DeferredModelCommandInvoker.java index 1de08ca..61f1e60 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/DeferredModelCommandInvoker.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/DeferredModelCommandInvoker.java @@ -26,6 +26,10 @@ this.model = model; } + public void invokeCommand(UICommand command) { + scheduleCommandExecution(command); + } + public void invokeDefaultCommand() { scheduleCommandExecution(model.getDefaultCommand()); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractActionStackPanelItem.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractActionStackPanelItem.java index ac59a94..497d84e 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractActionStackPanelItem.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractActionStackPanelItem.java @@ -4,13 +4,13 @@ import org.ovirt.engine.ui.common.uicommon.model.DeferredModelCommandInvoker; import org.ovirt.engine.ui.common.uicommon.model.SearchableTableModelProvider; import org.ovirt.engine.ui.uicommonweb.UICommand; -import org.ovirt.engine.ui.uicommonweb.models.Model; import com.google.gwt.event.dom.client.DoubleClickEvent; import com.google.gwt.event.dom.client.DoubleClickHandler; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; +import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel; public abstract class AbstractActionStackPanelItem<M, T, W extends Widget> extends Composite { @@ -49,11 +49,11 @@ widget.addDomHandler(new DoubleClickHandler() { @Override public void onDoubleClick(DoubleClickEvent event) { - Model model = ((SearchableTableModelProvider<?, ?>) modelProvider).getModel(); - UICommand defaultCommand = model.getDefaultCommand(); - if (defaultCommand != null && defaultCommand.getIsExecutionAllowed()) { + SearchableListModel model = ((SearchableTableModelProvider<?, ?>) modelProvider).getModel(); + UICommand command = model.getDoubleClickCommand(); + if (command != null && command.getIsExecutionAllowed()) { DeferredModelCommandInvoker invoker = new DeferredModelCommandInvoker(model); - invoker.invokeDefaultCommand(); + invoker.invokeCommand(command); } } }, DoubleClickEvent.getType()); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java index bd38890..d692031 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java @@ -15,7 +15,6 @@ import org.ovirt.engine.ui.common.widget.label.NoItemsLabel; import org.ovirt.engine.ui.common.widget.table.column.SortableColumn; import org.ovirt.engine.ui.uicommonweb.UICommand; -import org.ovirt.engine.ui.uicommonweb.models.Model; import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel; import org.ovirt.engine.ui.uicompat.EventArgs; import org.ovirt.engine.ui.uicompat.IEventListener; @@ -188,11 +187,11 @@ this.table.addDomHandler(new DoubleClickHandler() { @Override public void onDoubleClick(DoubleClickEvent event) { - Model model = dataProvider.getModel(); - UICommand defaultCommand = model.getDefaultCommand(); - if (defaultCommand != null && defaultCommand.getIsExecutionAllowed()) { + SearchableListModel model = dataProvider.getModel(); + UICommand command = model.getDoubleClickCommand(); + if (command != null && command.getIsExecutionAllowed()) { DeferredModelCommandInvoker invoker = new DeferredModelCommandInvoker(model); - invoker.invokeDefaultCommand(); + invoker.invokeCommand(command); } } }, DoubleClickEvent.getType()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java index 270a163..4bdcfe7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java @@ -1040,7 +1040,7 @@ } /** - * Get the default command, in most cases this will be 'edit'. If sub + * Get the double click command, in most cases this will be 'edit'. If sub * classes want a different default command they can override this method * and return the command they want. * @@ -1048,8 +1048,7 @@ * invoked. * @return The default {@code UICommand} */ - @Override - public UICommand getDefaultCommand() { + public UICommand getDoubleClickCommand() { return getEditCommand(); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java index cf1af53..cbd6f55 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java @@ -218,7 +218,7 @@ } @Override - public UICommand getDefaultCommand() { + public UICommand getDoubleClickCommand() { return getDetailsCommand(); } -- To view, visit http://gerrit.ovirt.org/31167 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ebfa08d2d3bcd0d2089febbe19e54c76cef25ec Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <rn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
