Vojtech Szocs has uploaded a new change for review. Change subject: userportal: Put model bindings into UiCommonModule ......................................................................
userportal: Put model bindings into UiCommonModule This patch puts UiCommon model bindings right next to corresponding model provider bindings. If we'd like to split these bindings, the split should be done per-function similar to WebAdmin, i.e. "template" module, "resource" module etc. Change-Id: Ib6ae77c8083f44ee4fba19d7f3cb3c0af043d452 Signed-off-by: Vojtech Szocs <[email protected]> --- M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UiCommonModule.java D frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UserPortalModule.java 2 files changed, 46 insertions(+), 71 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/35752/1 diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UiCommonModule.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UiCommonModule.java index 957438f..42511a8 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UiCommonModule.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UiCommonModule.java @@ -4,21 +4,32 @@ import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.VM; +import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.ui.common.gin.BaseUiCommonModule; +import org.ovirt.engine.ui.uicommonweb.models.configure.UserPortalPermissionListModel; import org.ovirt.engine.ui.uicommonweb.models.pools.PoolDiskListModel; import org.ovirt.engine.ui.uicommonweb.models.pools.PoolGeneralModel; import org.ovirt.engine.ui.uicommonweb.models.pools.PoolInterfaceListModel; import org.ovirt.engine.ui.uicommonweb.models.resources.ResourcesModel; import org.ovirt.engine.ui.uicommonweb.models.templates.TemplateGeneralModel; +import org.ovirt.engine.ui.uicommonweb.models.templates.TemplateInterfaceListModel; import org.ovirt.engine.ui.uicommonweb.models.templates.UserPortalTemplateDiskListModel; import org.ovirt.engine.ui.uicommonweb.models.templates.UserPortalTemplateEventListModel; +import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalBasicListModel; import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalListModel; import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalLoginModel; import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalTemplateListModel; +import org.ovirt.engine.ui.uicommonweb.models.userportal.VmBasicDiskListModel; +import org.ovirt.engine.ui.uicommonweb.models.users.AdElementListModel; +import org.ovirt.engine.ui.uicommonweb.models.users.UserPortalAdElementListModel; import org.ovirt.engine.ui.uicommonweb.models.vms.UserPortalVmEventListModel; +import org.ovirt.engine.ui.uicommonweb.models.vms.UserPortalVmSnapshotListModel; import org.ovirt.engine.ui.uicommonweb.models.vms.VmAppListModel; +import org.ovirt.engine.ui.uicommonweb.models.vms.VmDiskListModel; import org.ovirt.engine.ui.uicommonweb.models.vms.VmGeneralModel; +import org.ovirt.engine.ui.uicommonweb.models.vms.VmInterfaceListModel; +import org.ovirt.engine.ui.uicommonweb.models.vms.VmMonitorModel; import org.ovirt.engine.ui.uicommonweb.models.vms.VmSessionsModel; import org.ovirt.engine.ui.userportal.uicommon.UserPortalConfigurator; import org.ovirt.engine.ui.userportal.uicommon.model.UserPortalDataBoundModelProvider; @@ -46,11 +57,45 @@ @Override protected void configure() { bindModels(); + bindModelProviders(); bindIntegration(); - install(new UserPortalModule()); } void bindModels() { + bind(AdElementListModel.class).to(UserPortalAdElementListModel.class); + + // Basic tab + bind(UserPortalBasicListModel.class).in(Singleton.class); + bind(VmBasicDiskListModel.class).in(Singleton.class); + + // Extended tab: Virtual Machine + bind(UserPortalListModel.class).in(Singleton.class); + bind(VmGeneralModel.class).in(Singleton.class); + bind(PoolGeneralModel.class).in(Singleton.class); + bind(VmInterfaceListModel.class).in(Singleton.class); + bind(VmDiskListModel.class).in(Singleton.class); + bind(PoolDiskListModel.class).in(Singleton.class); + bind(UserPortalVmSnapshotListModel.class).in(Singleton.class); + bind(new TypeLiteral<UserPortalPermissionListModel<UserPortalListModel>>(){}).in(Singleton.class); + bind(UserPortalVmEventListModel.class).in(Singleton.class); + bind(VmAppListModel.class).in(Singleton.class); + bind(VmMonitorModel.class).in(Singleton.class); + bind(PoolInterfaceListModel.class).in(Singleton.class); + bind(VmSessionsModel.class).in(Singleton.class); + + // Extended tab: Template + bind(UserPortalTemplateListModel.class).in(Singleton.class); + bind(TemplateGeneralModel.class).in(Singleton.class); + bind(TemplateInterfaceListModel.class).in(Singleton.class); + bind(new TypeLiteral<UserPortalPermissionListModel<VmTemplate>>(){}).in(Singleton.class); + bind(UserPortalTemplateDiskListModel.class).in(Singleton.class); + bind(UserPortalTemplateEventListModel.class).in(Singleton.class); + + // Extended tab: Resources + bind(ResourcesModel.class).in(Singleton.class); + } + + void bindModelProviders() { // Basic tab bind(UserPortalBasicListProvider.class).in(Singleton.class); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UserPortalModule.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UserPortalModule.java deleted file mode 100644 index a72b620..0000000 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UserPortalModule.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.ovirt.engine.ui.userportal.gin; - -import org.ovirt.engine.core.common.businessentities.VmTemplate; -import org.ovirt.engine.ui.uicommonweb.models.configure.UserPortalPermissionListModel; -import org.ovirt.engine.ui.uicommonweb.models.pools.PoolDiskListModel; -import org.ovirt.engine.ui.uicommonweb.models.pools.PoolGeneralModel; -import org.ovirt.engine.ui.uicommonweb.models.pools.PoolInterfaceListModel; -import org.ovirt.engine.ui.uicommonweb.models.resources.ResourcesModel; -import org.ovirt.engine.ui.uicommonweb.models.templates.TemplateGeneralModel; -import org.ovirt.engine.ui.uicommonweb.models.templates.TemplateInterfaceListModel; -import org.ovirt.engine.ui.uicommonweb.models.templates.UserPortalTemplateDiskListModel; -import org.ovirt.engine.ui.uicommonweb.models.templates.UserPortalTemplateEventListModel; -import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalBasicListModel; -import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalListModel; -import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalTemplateListModel; -import org.ovirt.engine.ui.uicommonweb.models.userportal.VmBasicDiskListModel; -import org.ovirt.engine.ui.uicommonweb.models.users.AdElementListModel; -import org.ovirt.engine.ui.uicommonweb.models.users.UserPortalAdElementListModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.UserPortalVmEventListModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.UserPortalVmSnapshotListModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.VmAppListModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.VmDiskListModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.VmGeneralModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.VmInterfaceListModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.VmMonitorModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.VmSessionsModel; - -import com.google.gwt.inject.client.AbstractGinModule; -import com.google.inject.Singleton; -import com.google.inject.TypeLiteral; - -public class UserPortalModule extends AbstractGinModule { - - @Override - protected void configure() { - bind(AdElementListModel.class).to(UserPortalAdElementListModel.class); - - // Basic tab - bind(UserPortalBasicListModel.class).in(Singleton.class); - bind(VmBasicDiskListModel.class).in(Singleton.class); - - // Extended tab: Virtual Machine - bind(UserPortalListModel.class).in(Singleton.class); - bind(VmGeneralModel.class).in(Singleton.class); - bind(PoolGeneralModel.class).in(Singleton.class); - bind(VmInterfaceListModel.class).in(Singleton.class); - bind(VmDiskListModel.class).in(Singleton.class); - bind(PoolDiskListModel.class).in(Singleton.class); - bind(UserPortalVmSnapshotListModel.class).in(Singleton.class); - bind(new TypeLiteral<UserPortalPermissionListModel<UserPortalListModel>>(){}).in(Singleton.class); - bind(UserPortalVmEventListModel.class).in(Singleton.class); - bind(VmAppListModel.class).in(Singleton.class); - bind(VmMonitorModel.class).in(Singleton.class); - bind(PoolInterfaceListModel.class).in(Singleton.class); - bind(VmSessionsModel.class).in(Singleton.class); - - // Extended tab: Template - bind(UserPortalTemplateListModel.class).in(Singleton.class); - bind(TemplateGeneralModel.class).in(Singleton.class); - bind(TemplateInterfaceListModel.class).in(Singleton.class); - bind(new TypeLiteral<UserPortalPermissionListModel<VmTemplate>>(){}).in(Singleton.class); - bind(UserPortalTemplateDiskListModel.class).in(Singleton.class); - bind(UserPortalTemplateEventListModel.class).in(Singleton.class); - - // Extended tab: Resources - bind(ResourcesModel.class).in(Singleton.class); - - } - -} -- To view, visit http://gerrit.ovirt.org/35752 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6ae77c8083f44ee4fba19d7f3cb3c0af043d452 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vojtech Szocs <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
