Tomas Jelinek has uploaded a new change for review. Change subject: userportal,webadmin: added possibility to have single selection attach disk popup ......................................................................
userportal,webadmin: added possibility to have single selection attach disk popup Change-Id: I535480b9d5671eab8e8a569d1d27755c304cea1e Bug-Url: https://bugzilla.redhat.com/1117489 Signed-off-by: Tomas Jelinek <[email protected]> --- M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/PresenterModule.java A frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/popup/vm/SingleSelectionVmDiskAttachPopupPresenterWidget.java A frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/BaseVmDiskAttachPopupView.java A frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/SingleSelectionVmDiskAttachPopupView.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmDiskAttachPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java A frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/vm/SingleSelectionVmDiskAttachPopupPresenterWidget.java A frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/BaseVmDiskAttachPopupView.java A frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/SingleSelectionVmDiskAttachPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmDiskAttachPopupView.java 10 files changed, 130 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/62/36062/1 diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/PresenterModule.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/PresenterModule.java index 8831489..25e4c73 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/PresenterModule.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/PresenterModule.java @@ -13,6 +13,7 @@ import org.ovirt.engine.ui.userportal.section.main.presenter.popup.template.TemplateInterfacePopupPresenterWidget; import org.ovirt.engine.ui.userportal.section.main.presenter.popup.template.TemplateNewPopupPresenterWidget; import org.ovirt.engine.ui.userportal.section.main.presenter.popup.vm.CloneVmPopupPresenterWidget; +import org.ovirt.engine.ui.userportal.section.main.presenter.popup.vm.SingleSelectionVmDiskAttachPopupPresenterWidget; import org.ovirt.engine.ui.userportal.section.main.presenter.popup.vm.VmChangeCDPopupPresenterWidget; import org.ovirt.engine.ui.userportal.section.main.presenter.popup.vm.VmClonePopupPresenterWidget; import org.ovirt.engine.ui.userportal.section.main.presenter.popup.vm.VmDiskAttachPopupPresenterWidget; @@ -62,6 +63,7 @@ import org.ovirt.engine.ui.userportal.section.main.view.popup.template.TemplateInterfacePopupView; import org.ovirt.engine.ui.userportal.section.main.view.popup.template.TemplateNewPopupView; import org.ovirt.engine.ui.userportal.section.main.view.popup.vm.CloneVmPopupView; +import org.ovirt.engine.ui.userportal.section.main.view.popup.vm.SingleSelectionVmDiskAttachPopupView; import org.ovirt.engine.ui.userportal.section.main.view.popup.vm.VmChangeCDPopupView; import org.ovirt.engine.ui.userportal.section.main.view.popup.vm.VmClonePopupView; import org.ovirt.engine.ui.userportal.section.main.view.popup.vm.VmDiskAttachPopupView; @@ -285,6 +287,9 @@ bindPresenterWidget(VmDiskAttachPopupPresenterWidget.class, VmDiskAttachPopupPresenterWidget.ViewDef.class, VmDiskAttachPopupView.class); + bindPresenterWidget(SingleSelectionVmDiskAttachPopupPresenterWidget.class, + SingleSelectionVmDiskAttachPopupPresenterWidget.ViewDef.class, + SingleSelectionVmDiskAttachPopupView.class); bindPresenterWidget(VmDiskRemovePopupPresenterWidget.class, VmDiskRemovePopupPresenterWidget.ViewDef.class, VmDiskRemovePopupView.class); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/popup/vm/SingleSelectionVmDiskAttachPopupPresenterWidget.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/popup/vm/SingleSelectionVmDiskAttachPopupPresenterWidget.java new file mode 100644 index 0000000..f2ec5dc --- /dev/null +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/popup/vm/SingleSelectionVmDiskAttachPopupPresenterWidget.java @@ -0,0 +1,17 @@ +package org.ovirt.engine.ui.userportal.section.main.presenter.popup.vm; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import org.ovirt.engine.ui.common.presenter.AbstractModelBoundPopupPresenterWidget; +import org.ovirt.engine.ui.uicommonweb.models.vms.AttachDiskModel; + +public class SingleSelectionVmDiskAttachPopupPresenterWidget extends AbstractModelBoundPopupPresenterWidget<AttachDiskModel, SingleSelectionVmDiskAttachPopupPresenterWidget.ViewDef> { + + public interface ViewDef extends AbstractModelBoundPopupPresenterWidget.ViewDef<AttachDiskModel> { + } + + @Inject + public SingleSelectionVmDiskAttachPopupPresenterWidget(EventBus eventBus, ViewDef view) { + super(eventBus, view); + } +} diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/BaseVmDiskAttachPopupView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/BaseVmDiskAttachPopupView.java new file mode 100644 index 0000000..31818a0 --- /dev/null +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/BaseVmDiskAttachPopupView.java @@ -0,0 +1,17 @@ +package org.ovirt.engine.ui.userportal.section.main.view.popup.vm; + +import com.google.gwt.event.shared.EventBus; +import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundWidgetPopupView; +import org.ovirt.engine.ui.common.widget.uicommon.popup.vm.VmDiskAttachPopupWidget; +import org.ovirt.engine.ui.uicommonweb.models.vms.AttachDiskModel; +import org.ovirt.engine.ui.userportal.ApplicationConstants; +import org.ovirt.engine.ui.userportal.ApplicationResources; +import org.ovirt.engine.ui.userportal.ApplicationTemplates; + +public class BaseVmDiskAttachPopupView extends AbstractModelBoundWidgetPopupView<AttachDiskModel> { + + public BaseVmDiskAttachPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, ApplicationTemplates templates, boolean allowMultipleSelection) { + super(eventBus, resources, new VmDiskAttachPopupWidget(constants, resources, templates, false, allowMultipleSelection), "815px", "615px"); //$NON-NLS-1$ //$NON-NLS-2$ + asWidget().enableResizeSupport(true); + } +} diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/SingleSelectionVmDiskAttachPopupView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/SingleSelectionVmDiskAttachPopupView.java new file mode 100644 index 0000000..61033de --- /dev/null +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/SingleSelectionVmDiskAttachPopupView.java @@ -0,0 +1,24 @@ +package org.ovirt.engine.ui.userportal.section.main.view.popup.vm; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.userportal.ApplicationConstants; +import org.ovirt.engine.ui.userportal.ApplicationResources; +import org.ovirt.engine.ui.userportal.ApplicationTemplates; +import org.ovirt.engine.ui.userportal.section.main.presenter.popup.vm.SingleSelectionVmDiskAttachPopupPresenterWidget; + +public class SingleSelectionVmDiskAttachPopupView extends BaseVmDiskAttachPopupView implements SingleSelectionVmDiskAttachPopupPresenterWidget.ViewDef { + + interface ViewIdHandler extends ElementIdHandler<SingleSelectionVmDiskAttachPopupView> { + ViewIdHandler idHandler = GWT.create(ViewIdHandler.class); + } + + @Inject + public SingleSelectionVmDiskAttachPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, ApplicationTemplates templates) { + super(eventBus, resources, constants, templates, false); + ViewIdHandler.idHandler.generateAndSetIds(this); + } + +} diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmDiskAttachPopupView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmDiskAttachPopupView.java index 05502f4..91f7529 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmDiskAttachPopupView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmDiskAttachPopupView.java @@ -1,9 +1,6 @@ package org.ovirt.engine.ui.userportal.section.main.view.popup.vm; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; -import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundWidgetPopupView; -import org.ovirt.engine.ui.common.widget.uicommon.popup.vm.VmDiskAttachPopupWidget; -import org.ovirt.engine.ui.uicommonweb.models.vms.AttachDiskModel; import org.ovirt.engine.ui.userportal.ApplicationConstants; import org.ovirt.engine.ui.userportal.ApplicationResources; import org.ovirt.engine.ui.userportal.ApplicationTemplates; @@ -13,7 +10,7 @@ import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; -public class VmDiskAttachPopupView extends AbstractModelBoundWidgetPopupView<AttachDiskModel> implements VmDiskAttachPopupPresenterWidget.ViewDef { +public class VmDiskAttachPopupView extends BaseVmDiskAttachPopupView implements VmDiskAttachPopupPresenterWidget.ViewDef { interface ViewIdHandler extends ElementIdHandler<VmDiskAttachPopupView> { ViewIdHandler idHandler = GWT.create(ViewIdHandler.class); @@ -21,8 +18,8 @@ @Inject public VmDiskAttachPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, ApplicationTemplates templates) { - super(eventBus, resources, new VmDiskAttachPopupWidget(constants, resources, templates, false), "815px", "615px"); //$NON-NLS-1$ //$NON-NLS-2$ + super(eventBus, resources, constants, templates, true); ViewIdHandler.idHandler.generateAndSetIds(this); - asWidget().enableResizeSupport(true); } + } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java index 7e32232..deeb492 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java @@ -100,6 +100,7 @@ import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.template.TemplateNewPresenterWidget; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.user.ManageEventsPopupPresenterWidget; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.vm.CloneVmPopupPresenterWidget; +import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.vm.SingleSelectionVmDiskAttachPopupPresenterWidget; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.vm.VmChangeCDPopupPresenterWidget; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.vm.VmClonePopupPresenterWidget; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.vm.VmDiskAttachPopupPresenterWidget; @@ -340,6 +341,7 @@ import org.ovirt.engine.ui.webadmin.section.main.view.popup.template.TemplateNewPopupView; import org.ovirt.engine.ui.webadmin.section.main.view.popup.user.ManageEventsPopupView; import org.ovirt.engine.ui.webadmin.section.main.view.popup.vm.CloneVmPopupView; +import org.ovirt.engine.ui.webadmin.section.main.view.popup.vm.SingleSelectionVmDiskAttachPopupView; import org.ovirt.engine.ui.webadmin.section.main.view.popup.vm.VmChangeCDPopupView; import org.ovirt.engine.ui.webadmin.section.main.view.popup.vm.VmClonePopupView; import org.ovirt.engine.ui.webadmin.section.main.view.popup.vm.VmDiskAttachPopupView; @@ -1350,6 +1352,9 @@ bindPresenterWidget(VmDiskAttachPopupPresenterWidget.class, VmDiskAttachPopupPresenterWidget.ViewDef.class, VmDiskAttachPopupView.class); + bindPresenterWidget(SingleSelectionVmDiskAttachPopupPresenterWidget.class, + SingleSelectionVmDiskAttachPopupPresenterWidget.ViewDef.class, + SingleSelectionVmDiskAttachPopupView.class); // VM Detach/Remove Disk bindPresenterWidget(VmDiskRemovePopupPresenterWidget.class, diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/vm/SingleSelectionVmDiskAttachPopupPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/vm/SingleSelectionVmDiskAttachPopupPresenterWidget.java new file mode 100644 index 0000000..054c509 --- /dev/null +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/vm/SingleSelectionVmDiskAttachPopupPresenterWidget.java @@ -0,0 +1,17 @@ +package org.ovirt.engine.ui.webadmin.section.main.presenter.popup.vm; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import org.ovirt.engine.ui.common.presenter.AbstractModelBoundPopupPresenterWidget; +import org.ovirt.engine.ui.uicommonweb.models.vms.AttachDiskModel; + +public class SingleSelectionVmDiskAttachPopupPresenterWidget extends AbstractModelBoundPopupPresenterWidget<AttachDiskModel, SingleSelectionVmDiskAttachPopupPresenterWidget.ViewDef> { + + public interface ViewDef extends AbstractModelBoundPopupPresenterWidget.ViewDef<AttachDiskModel> { + } + + @Inject + public SingleSelectionVmDiskAttachPopupPresenterWidget(EventBus eventBus, ViewDef view) { + super(eventBus, view); + } +} diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/BaseVmDiskAttachPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/BaseVmDiskAttachPopupView.java new file mode 100644 index 0000000..4c85df7 --- /dev/null +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/BaseVmDiskAttachPopupView.java @@ -0,0 +1,17 @@ +package org.ovirt.engine.ui.webadmin.section.main.view.popup.vm; + +import com.google.gwt.event.shared.EventBus; +import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundWidgetPopupView; +import org.ovirt.engine.ui.common.widget.uicommon.popup.vm.VmDiskAttachPopupWidget; +import org.ovirt.engine.ui.uicommonweb.models.vms.AttachDiskModel; +import org.ovirt.engine.ui.webadmin.ApplicationConstants; +import org.ovirt.engine.ui.webadmin.ApplicationResources; +import org.ovirt.engine.ui.webadmin.ApplicationTemplates; + +public class BaseVmDiskAttachPopupView extends AbstractModelBoundWidgetPopupView<AttachDiskModel> { + + public BaseVmDiskAttachPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, ApplicationTemplates templates, boolean allowMultipleSelection) { + super(eventBus, resources, new VmDiskAttachPopupWidget(constants, resources, templates, true, allowMultipleSelection), "815px", "615px"); //$NON-NLS-1$ //$NON-NLS-2$ + asWidget().enableResizeSupport(true); + } +} diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/SingleSelectionVmDiskAttachPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/SingleSelectionVmDiskAttachPopupView.java new file mode 100644 index 0000000..0cb2ef0 --- /dev/null +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/SingleSelectionVmDiskAttachPopupView.java @@ -0,0 +1,23 @@ +package org.ovirt.engine.ui.webadmin.section.main.view.popup.vm; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.webadmin.ApplicationConstants; +import org.ovirt.engine.ui.webadmin.ApplicationResources; +import org.ovirt.engine.ui.webadmin.ApplicationTemplates; +import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.vm.SingleSelectionVmDiskAttachPopupPresenterWidget; + +public class SingleSelectionVmDiskAttachPopupView extends BaseVmDiskAttachPopupView implements SingleSelectionVmDiskAttachPopupPresenterWidget.ViewDef { + + interface ViewIdHandler extends ElementIdHandler<SingleSelectionVmDiskAttachPopupView> { + ViewIdHandler idHandler = GWT.create(ViewIdHandler.class); + } + + @Inject + public SingleSelectionVmDiskAttachPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, ApplicationTemplates templates) { + super(eventBus, resources, constants, templates, false); + ViewIdHandler.idHandler.generateAndSetIds(this); + } +} diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmDiskAttachPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmDiskAttachPopupView.java index 08b8e1c..0a40fed 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmDiskAttachPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmDiskAttachPopupView.java @@ -1,9 +1,6 @@ package org.ovirt.engine.ui.webadmin.section.main.view.popup.vm; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; -import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundWidgetPopupView; -import org.ovirt.engine.ui.common.widget.uicommon.popup.vm.VmDiskAttachPopupWidget; -import org.ovirt.engine.ui.uicommonweb.models.vms.AttachDiskModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; import org.ovirt.engine.ui.webadmin.ApplicationResources; import org.ovirt.engine.ui.webadmin.ApplicationTemplates; @@ -13,7 +10,7 @@ import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; -public class VmDiskAttachPopupView extends AbstractModelBoundWidgetPopupView<AttachDiskModel> implements VmDiskAttachPopupPresenterWidget.ViewDef { +public class VmDiskAttachPopupView extends BaseVmDiskAttachPopupView implements VmDiskAttachPopupPresenterWidget.ViewDef { interface ViewIdHandler extends ElementIdHandler<VmDiskAttachPopupView> { ViewIdHandler idHandler = GWT.create(ViewIdHandler.class); @@ -21,8 +18,7 @@ @Inject public VmDiskAttachPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, ApplicationTemplates templates) { - super(eventBus, resources, new VmDiskAttachPopupWidget(constants, resources, templates, true), "815px", "615px"); //$NON-NLS-1$ //$NON-NLS-2$ + super(eventBus, resources, constants, templates, true); ViewIdHandler.idHandler.generateAndSetIds(this); - asWidget().enableResizeSupport(true); } } -- To view, visit http://gerrit.ovirt.org/36062 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I535480b9d5671eab8e8a569d1d27755c304cea1e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
