modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java
| 19 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
| 19 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
| 18 +++++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java
| 19 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java
| 19 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
| 18 +++++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java
| 19 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java
| 10 ++++-
8 files changed, 83 insertions(+), 58 deletions(-)
New commits:
commit 682db9a8bd03ebedab669fc02147c2bc46e7ff23
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed Dec 22 17:06:00 2010 -0500
fix refresh issue.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java
index 74ce25c..14e4d4f 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java
@@ -40,6 +40,7 @@ import
org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.discovery.AutodiscoveryQueueDataSource;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.discovery.ResourceAutodiscoveryView;
+import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
@@ -197,13 +198,15 @@ public class AutodiscoveryPortlet extends ResourceAutodiscoveryView
implements C
if (defaultReloader != null) {
defaultReloader.cancel();
}
- defaultReloader = new Timer() {
- public void run() {
- redraw();
- //launch again until portlet reference and child references GC.
- defaultReloader.schedule(retrievedRefreshInterval);
- }
- };
- defaultReloader.schedule(retrievedRefreshInterval);
+ if (retrievedRefreshInterval >= MeasurementUtility.MINUTES) {
+ defaultReloader = new Timer() {
+ public void run() {
+ redraw();
+ //launch again until portlet reference and child references GC.
+ defaultReloader.schedule(retrievedRefreshInterval);
+ }
+ };
+ defaultReloader.schedule(retrievedRefreshInterval);
+ }
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
index f7cbcdc..40311ff 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
@@ -40,6 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
+import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
/**
* @author Greg Hinkle
@@ -121,13 +122,15 @@ public class FavoriteResourcesPortlet extends ResourceSearchView
implements Auto
if (defaultReloader != null) {
defaultReloader.cancel();
}
- defaultReloader = new Timer() {
- public void run() {
- redraw();
- //launch again until portlet reference and child references GC.
- defaultReloader.schedule(retrievedRefreshInterval);
- }
- };
- defaultReloader.schedule(retrievedRefreshInterval);
+ if (retrievedRefreshInterval >= MeasurementUtility.MINUTES) {
+ defaultReloader = new Timer() {
+ public void run() {
+ redraw();
+ //launch again until portlet reference and child references GC.
+ defaultReloader.schedule(retrievedRefreshInterval);
+ }
+ };
+ defaultReloader.schedule(retrievedRefreshInterval);
+ }
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
index 024adb3..1ebf65e 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
@@ -545,14 +545,16 @@ public class RecentAlertsPortlet extends AlertHistoryView implements
CustomSetti
if (defaultReloader != null) {
defaultReloader.cancel();
}
- defaultReloader = new Timer() {
- public void run() {
- refresh();
- //launch again until portlet reference and child references GC.
- defaultReloader.schedule(retrievedRefreshInterval);
- }
- };
- defaultReloader.schedule(retrievedRefreshInterval);
+ if (retrievedRefreshInterval >= MeasurementUtility.MINUTES) {
+ defaultReloader = new Timer() {
+ public void run() {
+ refresh();
+ //launch again until portlet reference and child references GC.
+ defaultReloader.schedule(retrievedRefreshInterval);
+ }
+ };
+ defaultReloader.schedule(retrievedRefreshInterval);
+ }
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java
index 30c9b4e..46d376a 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java
@@ -44,6 +44,7 @@ import
org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
+import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
public class RecentlyAddedResourcesPortlet extends LocatableVLayout implements
CustomSettingsPortlet,
@@ -236,13 +237,15 @@ public class RecentlyAddedResourcesPortlet extends LocatableVLayout
implements C
if (defaultReloader != null) {
defaultReloader.cancel();
}
- defaultReloader = new Timer() {
- public void run() {
- redraw();
- //launch again until portlet reference and child references GC.
- defaultReloader.schedule(retrievedRefreshInterval);
- }
- };
- defaultReloader.schedule(retrievedRefreshInterval);
+ if (retrievedRefreshInterval >= MeasurementUtility.MINUTES) {
+ defaultReloader = new Timer() {
+ public void run() {
+ redraw();
+ //launch again until portlet reference and child references GC.
+ defaultReloader.schedule(retrievedRefreshInterval);
+ }
+ };
+ defaultReloader.schedule(retrievedRefreshInterval);
+ }
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java
index 507c8ed..4c46860 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java
@@ -45,6 +45,7 @@ import
org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
import org.rhq.enterprise.gui.coregui.client.operation.RecentOperationsDataSource;
import org.rhq.enterprise.gui.coregui.client.operation.ScheduledOperationsDataSource;
+import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLabel;
@@ -424,13 +425,15 @@ public class OperationsPortlet extends LocatableVLayout implements
CustomSetting
if (defaultReloader != null) {
defaultReloader.cancel();
}
- defaultReloader = new Timer() {
- public void run() {
- redraw();
- //launch again until portlet reference and child references GC.
- defaultReloader.schedule(retrievedRefreshInterval);
- }
- };
- defaultReloader.schedule(retrievedRefreshInterval);
+ if (retrievedRefreshInterval >= MeasurementUtility.MINUTES) {
+ defaultReloader = new Timer() {
+ public void run() {
+ redraw();
+ //launch again until portlet reference and child references GC.
+ defaultReloader.schedule(retrievedRefreshInterval);
+ }
+ };
+ defaultReloader.schedule(retrievedRefreshInterval);
+ }
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
index fddbfa1..658257f 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
@@ -298,14 +298,16 @@ public class ProblemResourcesPortlet extends Table implements
CustomSettingsPort
if (defaultReloader != null) {
defaultReloader.cancel();
}
- defaultReloader = new Timer() {
- public void run() {
- refresh();
- //launch again until portlet reference and child references GC.
- defaultReloader.schedule(retrievedRefreshInterval);
- }
- };
- defaultReloader.schedule(retrievedRefreshInterval);
+ if (retrievedRefreshInterval >= MeasurementUtility.MINUTES) {
+ defaultReloader = new Timer() {
+ public void run() {
+ refresh();
+ //launch again until portlet reference and child references GC.
+ defaultReloader.schedule(retrievedRefreshInterval);
+ }
+ };
+ defaultReloader.schedule(retrievedRefreshInterval);
+ }
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java
index 6b70298..62bcf15 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java
@@ -45,6 +45,7 @@ import
org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceBossGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -177,13 +178,15 @@ public class InventorySummaryPortlet extends LocatableVLayout
implements AutoRef
if (defaultReloader != null) {
defaultReloader.cancel();
}
- defaultReloader = new Timer() {
- public void run() {
- redraw();
- //launch again until portlet reference and child references GC.
- defaultReloader.schedule(retrievedRefreshInterval);
- }
- };
- defaultReloader.schedule(retrievedRefreshInterval);
+ if (retrievedRefreshInterval >= MeasurementUtility.MINUTES) {
+ defaultReloader = new Timer() {
+ public void run() {
+ redraw();
+ //launch again until portlet reference and child references GC.
+ defaultReloader.schedule(retrievedRefreshInterval);
+ }
+ };
+ defaultReloader.schedule(retrievedRefreshInterval);
+ }
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java
index 1c311b0..7fde8e7 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java
@@ -74,14 +74,20 @@ public class UserPreferences {
}
public int getPageRefreshInterval() {
- if (getPreference(UserPreferenceNames.PAGE_REFRESH_PERIOD) == null) {//default to
60 seconds
+ if ((getPreference(UserPreferenceNames.PAGE_REFRESH_PERIOD) == null)
+ || (Long.valueOf(getPreference(UserPreferenceNames.PAGE_REFRESH_PERIOD)) <
MeasurementUtility.MINUTES)) {
+ //default to 60 seconds
setPreference(UserPreferenceNames.PAGE_REFRESH_PERIOD,
String.valueOf(MeasurementUtility.MINUTES));
}
return getPreferenceAsInteger(UserPreferenceNames.PAGE_REFRESH_PERIOD);
}
public void setPageRefreshInterval(int refreshInterval, AsyncCallback<Subject>
callback) {
- setPreference(UserPreferenceNames.PAGE_REFRESH_PERIOD,
String.valueOf(refreshInterval));
+ if (refreshInterval >= MeasurementUtility.MINUTES) {
+ setPreference(UserPreferenceNames.PAGE_REFRESH_PERIOD,
String.valueOf(refreshInterval));
+ } else {
+ setPreference(UserPreferenceNames.PAGE_REFRESH_PERIOD,
String.valueOf(MeasurementUtility.MINUTES));
+ }
store(callback);
}
Show replies by date