Vojtech Szocs has uploaded a new change for review. Change subject: userportal: Set default refresh rate to 30s ......................................................................
userportal: Set default refresh rate to 30s Work in progress, needs verification, use at own risk :-) Change-Id: Ibcaf85e0f6f38b522ccc282a0a76ef3016a220ea Signed-off-by: Vojtech Szocs <vsz...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/refresh/AbstractRefreshManager.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/SimpleActionTable.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/AbstractSideTabWithDetailsView.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/MainTabBasicView.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedResourceView.java A frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/refresh/UserPortalRefreshManager.java 6 files changed, 60 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/12340/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/refresh/AbstractRefreshManager.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/refresh/AbstractRefreshManager.java index f24d71b..ad5aa1a 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/refresh/AbstractRefreshManager.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/refresh/AbstractRefreshManager.java @@ -163,8 +163,12 @@ try { return new Integer(refreshRate).intValue(); } catch (NumberFormatException e) { - return DEFAULT_REFRESH_RATE; + return getDefaultRefreshRate(); } } + protected int getDefaultRefreshRate() { + return DEFAULT_REFRESH_RATE; + } + } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/SimpleActionTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/SimpleActionTable.java index f61408b..3d2af57 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/SimpleActionTable.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/SimpleActionTable.java @@ -41,11 +41,14 @@ @WithElementId("itemsCount") public Label itemsCountLabel; - private final SimpleRefreshManager refreshManager; - public SimpleActionTable(SearchableTableModelProvider<T, ?> dataProvider, EventBus eventBus, ClientStorage clientStorage) { this(dataProvider, null, null, eventBus, clientStorage); + } + + public SimpleActionTable(SearchableTableModelProvider<T, ?> dataProvider, + EventBus eventBus, SimpleRefreshManager refreshManager) { + this(dataProvider, null, null, eventBus, refreshManager); } public SimpleActionTable(SearchableTableModelProvider<T, ?> dataProvider, @@ -56,8 +59,14 @@ public SimpleActionTable(SearchableTableModelProvider<T, ?> dataProvider, Resources resources, Resources headerResources, EventBus eventBus, ClientStorage clientStorage) { + this(dataProvider, resources, headerResources, eventBus, + new SimpleRefreshManager(dataProvider, eventBus, clientStorage)); + } + + public SimpleActionTable(SearchableTableModelProvider<T, ?> dataProvider, + Resources resources, Resources headerResources, + EventBus eventBus, SimpleRefreshManager refreshManager) { super(dataProvider, resources, headerResources, eventBus); - this.refreshManager = new SimpleRefreshManager(dataProvider, eventBus, clientStorage); this.refreshPanel = refreshManager.getRefreshPanel(); initWidget(WidgetUiBinder.uiBinder.createAndBindUi(this)); initStyles(); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/AbstractSideTabWithDetailsView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/AbstractSideTabWithDetailsView.java index 5efb248..264e6c9 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/AbstractSideTabWithDetailsView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/AbstractSideTabWithDetailsView.java @@ -9,6 +9,7 @@ import org.ovirt.engine.ui.userportal.gin.ClientGinjectorProvider; import org.ovirt.engine.ui.userportal.section.main.presenter.AbstractSideTabWithDetailsPresenter; import org.ovirt.engine.ui.userportal.widget.extended.ExtendedViewSplitLayoutPanel; +import org.ovirt.engine.ui.userportal.widget.refresh.UserPortalRefreshManager; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; @@ -45,7 +46,9 @@ protected SimpleActionTable<T> createActionTable() { return new SimpleActionTable<T>(modelProvider, ClientGinjectorProvider.instance().getEventBus(), - ClientGinjectorProvider.instance().getClientStorage()); + new UserPortalRefreshManager(modelProvider, + ClientGinjectorProvider.instance().getEventBus(), + ClientGinjectorProvider.instance().getClientStorage())); } void initSplitPanel() { diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/MainTabBasicView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/MainTabBasicView.java index 50a405b..48bab33 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/MainTabBasicView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/MainTabBasicView.java @@ -8,6 +8,7 @@ import org.ovirt.engine.ui.userportal.section.main.presenter.tab.MainTabBasicPresenter; import org.ovirt.engine.ui.userportal.uicommon.model.basic.UserPortalBasicListProvider; import org.ovirt.engine.ui.userportal.widget.basic.BasicViewSplitLayoutPanel; +import org.ovirt.engine.ui.userportal.widget.refresh.UserPortalRefreshManager; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.HasClickHandlers; @@ -45,7 +46,7 @@ ClientStorage clientStorage, ApplicationResources applicationResources) { - this.refreshManager = new SimpleRefreshManager(modelProvider, eventBus, clientStorage); + this.refreshManager = new UserPortalRefreshManager(modelProvider, eventBus, clientStorage); this.refreshPanel = refreshManager.getRefreshPanel(); splitLayoutPanel = new BasicViewSplitLayoutPanel( diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedResourceView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedResourceView.java index 5f255c9..0fba353 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedResourceView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedResourceView.java @@ -1,14 +1,7 @@ package org.ovirt.engine.ui.userportal.section.main.view.tab.extended; -import com.google.gwt.event.logical.shared.ResizeEvent; -import com.google.gwt.event.logical.shared.ResizeHandler; -import com.google.gwt.resources.client.CssResource; -import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.ui.Widget; -import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.ScrollPanel; -import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.Label; +import java.util.List; + import org.ovirt.engine.core.common.businessentities.QuotaUsagePerUser; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.ui.common.SubTableResources; @@ -29,16 +22,24 @@ import org.ovirt.engine.ui.userportal.uicommon.model.resources.ResourcesModelProvider; import org.ovirt.engine.ui.userportal.widget.QuotaProgressBar; import org.ovirt.engine.ui.userportal.widget.ToStringEntityModelLabel; +import org.ovirt.engine.ui.userportal.widget.refresh.UserPortalRefreshManager; import org.ovirt.engine.ui.userportal.widget.resources.VmTable; import com.google.gwt.core.client.GWT; import com.google.gwt.editor.client.SimpleBeanEditorDriver; +import com.google.gwt.event.logical.shared.ResizeEvent; +import com.google.gwt.event.logical.shared.ResizeHandler; import com.google.gwt.event.shared.EventBus; +import com.google.gwt.resources.client.CssResource; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.ScrollPanel; +import com.google.gwt.user.client.ui.VerticalPanel; +import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; - -import java.util.List; public class SideTabExtendedResourceView extends AbstractView implements SideTabExtendedResourcePresenter.ViewDef { @@ -156,7 +157,7 @@ vmTable = new VmTable(modelProvider, headerResources, resources, constants); - SimpleRefreshManager refreshManager = new SimpleRefreshManager(modelProvider, eventBus, clientStorage); + SimpleRefreshManager refreshManager = new UserPortalRefreshManager(modelProvider, eventBus, clientStorage); refreshPanel = refreshManager.getRefreshPanel(); cpusProgressBar = new QuotaProgressBar(QuotaProgressBar.QuotaType.CPU); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/refresh/UserPortalRefreshManager.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/refresh/UserPortalRefreshManager.java new file mode 100644 index 0000000..d43cdab --- /dev/null +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/refresh/UserPortalRefreshManager.java @@ -0,0 +1,24 @@ +package org.ovirt.engine.ui.userportal.widget.refresh; + +import org.ovirt.engine.ui.common.system.ClientStorage; +import org.ovirt.engine.ui.common.uicommon.model.ModelProvider; +import org.ovirt.engine.ui.common.widget.refresh.SimpleRefreshManager; +import org.ovirt.engine.ui.uicommonweb.models.GridController; + +import com.google.gwt.event.shared.EventBus; + +public class UserPortalRefreshManager extends SimpleRefreshManager { + + private static final Integer SLOWER_REFRESH_RATE = Integer.valueOf(30000); + + public UserPortalRefreshManager(ModelProvider<? extends GridController> modelProvider, + EventBus eventBus, ClientStorage clientStorage) { + super(modelProvider, eventBus, clientStorage); + } + + @Override + protected int getDefaultRefreshRate() { + return SLOWER_REFRESH_RATE; + } + +} -- To view, visit http://gerrit.ovirt.org/12340 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibcaf85e0f6f38b522ccc282a0a76ef3016a220ea Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vojtech Szocs <vsz...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches