Gilad Chaplik has uploaded a new change for review. Change subject: webadmin: qos parent sub tab ......................................................................
webadmin: qos parent sub tab Adding a view-only sub tab to hold all other qos subtabs (storage and network) **draft version** Change-Id: I6d5e2de2d979bdaab498922acd6a580bc89dc19a Signed-off-by: Gilad Chaplik <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/place/ApplicationPlaces.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AbstractSubTabPanelPresenter.java A frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/datacenter/DataCenterQosSubTabPanelPresenter.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/datacenter/SubTabDataCenterNetworkQoSPresenter.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/datacenter/SubTabDataCenterStorageQosPresenter.java A frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/datacenter/DataCenterQosSubTabPanelView.java 8 files changed, 115 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/55/30655/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index ae93e2f..730be72 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -178,12 +178,15 @@ @DefaultStringValue("Quota") String dataCenterQuotaSubTabLabel(); - @DefaultStringValue("Network QoS") + @DefaultStringValue("Network") String dataCenterNetworkQoSSubTabLabel(); - @DefaultStringValue("Storage QoS") + @DefaultStringValue("Storage") String dataCenterStorageQosSubTabLabel(); + @DefaultStringValue("QoS") + String dataCenterQosSubTabLabel(); + @DefaultStringValue("Permissions") String dataCenterPermissionSubTabLabel(); 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 38cf23d..109cdeb 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 @@ -137,6 +137,7 @@ import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.cluster.SubTabClusterPermissionPresenter; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.cluster.SubTabClusterServicePresenter; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.cluster.SubTabClusterVmPresenter; +import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.datacenter.DataCenterQosSubTabPanelPresenter; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.datacenter.DataCenterSubTabPanelPresenter; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.datacenter.SubTabDataCenterClusterPresenter; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.datacenter.SubTabDataCenterEventPresenter; @@ -371,6 +372,7 @@ import org.ovirt.engine.ui.webadmin.section.main.view.tab.cluster.SubTabClusterPermissionView; import org.ovirt.engine.ui.webadmin.section.main.view.tab.cluster.SubTabClusterServiceView; import org.ovirt.engine.ui.webadmin.section.main.view.tab.cluster.SubTabClusterVmView; +import org.ovirt.engine.ui.webadmin.section.main.view.tab.datacenter.DataCenterQosSubTabPanelView; import org.ovirt.engine.ui.webadmin.section.main.view.tab.datacenter.DataCenterSubTabPanelView; import org.ovirt.engine.ui.webadmin.section.main.view.tab.datacenter.SubTabDataCenterClusterView; import org.ovirt.engine.ui.webadmin.section.main.view.tab.datacenter.SubTabDataCenterEventView; @@ -602,6 +604,10 @@ DataCenterSubTabPanelPresenter.ViewDef.class, DataCenterSubTabPanelView.class, DataCenterSubTabPanelPresenter.ProxyDef.class); + bindPresenter(DataCenterQosSubTabPanelPresenter.class, + DataCenterQosSubTabPanelPresenter.ViewDef.class, + DataCenterQosSubTabPanelView.class, + DataCenterQosSubTabPanelPresenter.ProxyDef.class); bindPresenter(SubTabDataCenterStoragePresenter.class, SubTabDataCenterStoragePresenter.ViewDef.class, SubTabDataCenterStorageView.class, diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/place/ApplicationPlaces.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/place/ApplicationPlaces.java index 17af961..60ecb07 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/place/ApplicationPlaces.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/place/ApplicationPlaces.java @@ -78,6 +78,9 @@ public static final String dataCenterEventSubTabPlace = dataCenterMainTabPlace + SUB_TAB_PREFIX + "events"; //$NON-NLS-1$ + public static final String dataCenterQosSubTabPlace = dataCenterMainTabPlace + SUB_TAB_PREFIX + + "qos"; //$NON-NLS-1$ + // Storage public static final String storageGeneralSubTabPlace = storageMainTabPlace + SUB_TAB_PREFIX diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AbstractSubTabPanelPresenter.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AbstractSubTabPanelPresenter.java index 4ed80be..7aea268 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AbstractSubTabPanelPresenter.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AbstractSubTabPanelPresenter.java @@ -40,8 +40,18 @@ Type<RequestTabsHandler> requestTabsEventType, Type<ChangeTabHandler> changeTabEventType, ScrollableTabBarPresenterWidget tabBar) { + this(eventBus, view, proxy, tabContentSlot, requestTabsEventType, changeTabEventType, + tabBar, MainContentPresenter.TYPE_SetSubTabPanelContent); + } + + public AbstractSubTabPanelPresenter(EventBus eventBus, V view, P proxy, + Object tabContentSlot, + Type<RequestTabsHandler> requestTabsEventType, + Type<ChangeTabHandler> changeTabEventType, + ScrollableTabBarPresenterWidget tabBar, + Type<RevealContentHandler<?>> slot) { super(eventBus, view, proxy, tabContentSlot, requestTabsEventType, changeTabEventType, - MainContentPresenter.TYPE_SetSubTabPanelContent); + slot); getView().setUiHandlers(tabBar); this.tabBar = tabBar; this.tabBar.setWantsOffset(false); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/datacenter/DataCenterQosSubTabPanelPresenter.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/datacenter/DataCenterQosSubTabPanelPresenter.java new file mode 100644 index 0000000..feb5faa --- /dev/null +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/datacenter/DataCenterQosSubTabPanelPresenter.java @@ -0,0 +1,59 @@ +package org.ovirt.engine.ui.webadmin.section.main.presenter.tab.datacenter; + +import org.ovirt.engine.ui.common.presenter.ScrollableTabBarPresenterWidget; +import org.ovirt.engine.ui.common.presenter.DynamicTabContainerPresenter.DynamicTabPanel; +import org.ovirt.engine.ui.common.uicommon.model.ModelProvider; +import org.ovirt.engine.ui.common.widget.tab.ModelBoundTabData; +import org.ovirt.engine.ui.uicommonweb.models.datacenters.DataCenterListModel; +import org.ovirt.engine.ui.webadmin.ApplicationConstants; +import org.ovirt.engine.ui.webadmin.place.ApplicationPlaces; +import org.ovirt.engine.ui.webadmin.section.main.presenter.AbstractSubTabPanelPresenter; + +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.event.shared.GwtEvent.Type; +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.ChangeTabHandler; +import com.gwtplatform.mvp.client.RequestTabsHandler; +import com.gwtplatform.mvp.client.TabData; +import com.gwtplatform.mvp.client.annotations.ChangeTab; +import com.gwtplatform.mvp.client.annotations.ContentSlot; +import com.gwtplatform.mvp.client.annotations.NameToken; +import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; +import com.gwtplatform.mvp.client.annotations.RequestTabs; +import com.gwtplatform.mvp.client.annotations.TabInfo; +import com.gwtplatform.mvp.client.proxy.RevealContentHandler; +import com.gwtplatform.mvp.client.proxy.TabContentProxyPlace; + +public class DataCenterQosSubTabPanelPresenter extends + AbstractSubTabPanelPresenter<DataCenterQosSubTabPanelPresenter.ViewDef, DataCenterQosSubTabPanelPresenter.ProxyDef> { + + @ProxyCodeSplit + @NameToken(ApplicationPlaces.dataCenterQosSubTabPlace) + public interface ProxyDef extends TabContentProxyPlace<DataCenterQosSubTabPanelPresenter> { + } + + public interface ViewDef extends AbstractSubTabPanelPresenter.ViewDef, DynamicTabPanel { + } + + @RequestTabs + public static final Type<RequestTabsHandler> TYPE_RequestTabs = new Type<RequestTabsHandler>(); + + @ChangeTab + public static final Type<ChangeTabHandler> TYPE_ChangeTab = new Type<ChangeTabHandler>(); + + @ContentSlot + public static final Type<RevealContentHandler<?>> TYPE_SetTabContent = new Type<RevealContentHandler<?>>(); + + @Inject + public DataCenterQosSubTabPanelPresenter(EventBus eventBus, ViewDef view, ProxyDef proxy, + ScrollableTabBarPresenterWidget tabBar) { + super(eventBus, view, proxy, TYPE_SetTabContent, TYPE_RequestTabs, TYPE_ChangeTab, tabBar, DataCenterSubTabPanelPresenter.TYPE_SetTabContent); + } + + @TabInfo(container = DataCenterSubTabPanelPresenter.class) + static TabData getTabData(ApplicationConstants applicationConstants, + ModelProvider<DataCenterListModel> modelProvider) { + return new ModelBoundTabData(applicationConstants.dataCenterQosSubTabLabel(), 2, modelProvider); + } + +} diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/datacenter/SubTabDataCenterNetworkQoSPresenter.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/datacenter/SubTabDataCenterNetworkQoSPresenter.java index 28578d2..9e72c36 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/datacenter/SubTabDataCenterNetworkQoSPresenter.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/datacenter/SubTabDataCenterNetworkQoSPresenter.java @@ -35,10 +35,10 @@ public interface ViewDef extends AbstractSubTabPresenter.ViewDef<StoragePool> { } - @TabInfo(container = DataCenterSubTabPanelPresenter.class) + @TabInfo(container = DataCenterQosSubTabPanelPresenter.class) static TabData getTabData(ApplicationConstants applicationConstants, SearchableDetailModelProvider<NetworkQoS, DataCenterListModel, DataCenterNetworkQoSListModel> modelProvider) { - return new ModelBoundTabData(applicationConstants.dataCenterNetworkQoSSubTabLabel(), 2, modelProvider); + return new ModelBoundTabData(applicationConstants.dataCenterNetworkQoSSubTabLabel(), 1, modelProvider); } @Inject @@ -46,7 +46,7 @@ PlaceManager placeManager, SearchableDetailModelProvider<NetworkQoS, DataCenterListModel, DataCenterNetworkQoSListModel> modelProvider) { super(eventBus, view, proxy, placeManager, modelProvider, - DataCenterSubTabPanelPresenter.TYPE_SetTabContent); + DataCenterQosSubTabPanelPresenter.TYPE_SetTabContent); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/datacenter/SubTabDataCenterStorageQosPresenter.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/datacenter/SubTabDataCenterStorageQosPresenter.java index 563fb7a..7cdffa6 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/datacenter/SubTabDataCenterStorageQosPresenter.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/datacenter/SubTabDataCenterStorageQosPresenter.java @@ -35,10 +35,10 @@ public interface ViewDef extends AbstractSubTabPresenter.ViewDef<StoragePool> { } - @TabInfo(container = DataCenterSubTabPanelPresenter.class) + @TabInfo(container = DataCenterQosSubTabPanelPresenter.class) static TabData getTabData(ApplicationConstants applicationConstants, SearchableDetailModelProvider<StorageQos, DataCenterListModel, DataCenterStorageQosListModel> modelProvider) { - return new ModelBoundTabData(applicationConstants.dataCenterStorageQosSubTabLabel(), 10, modelProvider); + return new ModelBoundTabData(applicationConstants.dataCenterStorageQosSubTabLabel(), 0, modelProvider); } @Inject @@ -46,7 +46,7 @@ PlaceManager placeManager, SearchableDetailModelProvider<StorageQos, DataCenterListModel, DataCenterStorageQosListModel> modelProvider) { super(eventBus, view, proxy, placeManager, modelProvider, - DataCenterSubTabPanelPresenter.TYPE_SetTabContent); + DataCenterQosSubTabPanelPresenter.TYPE_SetTabContent); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/datacenter/DataCenterQosSubTabPanelView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/datacenter/DataCenterQosSubTabPanelView.java new file mode 100644 index 0000000..c6292ec --- /dev/null +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/datacenter/DataCenterQosSubTabPanelView.java @@ -0,0 +1,25 @@ +package org.ovirt.engine.ui.webadmin.section.main.view.tab.datacenter; + +import org.ovirt.engine.ui.common.widget.tab.AbstractTabPanel; +import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.datacenter.DataCenterQosSubTabPanelPresenter; +import org.ovirt.engine.ui.webadmin.section.main.view.AbstractSubTabPanelView; +import org.ovirt.engine.ui.webadmin.widget.tab.SimpleTabPanel; + +public class DataCenterQosSubTabPanelView extends AbstractSubTabPanelView implements DataCenterQosSubTabPanelPresenter.ViewDef { + + private final SimpleTabPanel tabPanel = new SimpleTabPanel(); + + public DataCenterQosSubTabPanelView() { + initWidget(getTabPanel()); + } + + @Override + protected Object getContentSlot() { + return DataCenterQosSubTabPanelPresenter.TYPE_SetTabContent; + } + + @Override + protected AbstractTabPanel getTabPanel() { + return tabPanel; + } +} -- To view, visit http://gerrit.ovirt.org/30655 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d5e2de2d979bdaab498922acd6a580bc89dc19a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
