modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java
| 2 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedView.java
| 4 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java
| 2 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
| 6 ++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java
| 2 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java
| 14 ++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
| 15 +---------
7 files changed, 16 insertions(+), 29 deletions(-)
New commits:
commit ee8eb63dc16b3e4d9847c0d26705dee5008e2222
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Thu Sep 9 18:30:01 2010 -0400
organize config labels.
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 ad0895b..e66f091 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
@@ -88,7 +88,7 @@ public class AutodiscoveryPortlet extends ResourceAutodiscoveryView
implements C
//horizontal display component
LocatableHLayout row = new
LocatableHLayout("auto-discovery.configuration");
BlurbItem label = new BlurbItem("discovery-platform-count-label");
- label.setValue("Maximum Platforms to show");
+ label.setValue("Number of platforms to display");
//-------------combobox for number of platforms to display on the dashboard
final SelectItem maximumPlatformsComboBox = new
SelectItem(AUTODISCOVERY_PLATFORM_MAX);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedView.java
index 655596b..c856151 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedView.java
@@ -129,7 +129,7 @@ public class RecentlyAddedView extends LocatableVLayout implements
CustomSetting
//-------------combobox for number of recently added resources to display on the
dashboard
final SelectItem maximumRecentlyAddedComboBox = new
SelectItem(RECENTLY_ADDED_SHOW_MAX);
- maximumRecentlyAddedComboBox.setTitle("Show maximum of");
+ maximumRecentlyAddedComboBox.setTitle("Show");
maximumRecentlyAddedComboBox.setHint("<nobr><b> recently
approved resources on dashboard.</b></nobr>");
//spinder 9/3/10: the following is required workaround to disable editability of
combobox.
maximumRecentlyAddedComboBox.setType("selection");
@@ -154,7 +154,7 @@ public class RecentlyAddedView extends LocatableVLayout implements
CustomSetting
//------------- Build second combobox for timeframe for problem resources
search.
final SelectItem maximumTimeRecentlyAddedComboBox = new
SelectItem(RECENTLY_ADDED_SHOW_HRS);
- maximumTimeRecentlyAddedComboBox.setTitle("For the last ");
+ maximumTimeRecentlyAddedComboBox.setTitle("Over ");
maximumTimeRecentlyAddedComboBox.setHint("<nobr><b> hours
</b></nobr>");
//spinder 9/3/10: the following is required workaround to disable editability of
combobox.
maximumTimeRecentlyAddedComboBox.setType("selection");
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 88df56f..815afd7 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
@@ -136,8 +136,8 @@ public class ProblemResourcesPortlet extends Table implements
CustomSettingsPort
//-------------combobox for number of resource to display on the dashboard
final SelectItem maximumProblemResourcesComboBox = new
SelectItem(PROBLEM_RESOURCE_SHOW_MAX);
- maximumProblemResourcesComboBox.setTitle("Show maximum of");
- maximumProblemResourcesComboBox.setHint("<nobr><b> problem
resources for display on dashboard.</b></nobr>");
+ maximumProblemResourcesComboBox.setTitle("Display");
+ maximumProblemResourcesComboBox.setHint("<nobr><b> problem
resources on dashboard.</b></nobr>");
//spinder 9/3/10: the following is required workaround to disable editability of
combobox.
maximumProblemResourcesComboBox.setType("selection");
//define acceptable values for display amount
@@ -161,7 +161,7 @@ public class ProblemResourcesPortlet extends Table implements
CustomSettingsPort
//------------- Build second combobox for timeframe for problem resources
search.
final SelectItem maximumTimeProblemResourcesComboBox = new
SelectItem(PROBLEM_RESOURCE_SHOW_HRS);
- maximumTimeProblemResourcesComboBox.setTitle("For the last ");
+ maximumTimeProblemResourcesComboBox.setTitle("Over ");
maximumTimeProblemResourcesComboBox.setHint("<nobr><b> hours
</b></nobr>");
//spinder 9/3/10: the following is required workaround to disable editability of
combobox.
maximumTimeProblemResourcesComboBox.setType("selection");
commit b07055b4f5bb90aa5d4d3c01541793fc5c23b3ef
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Thu Sep 9 18:16:01 2010 -0400
enable server side problem resource config.
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 81accf8..ce381ce 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
@@ -74,7 +74,7 @@ public class OperationsPortlet extends LocatableVLayout implements
CustomSetting
private DashboardPortlet storedPortlet = null;
public static String unlimited = "unlimited";
public static String defaultValue = unlimited;
- public static boolean defaultEnabled = false;
+ public static boolean defaultEnabled = true;
//default no-args constructor for serialization.
private OperationsPortlet() {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java
index fefa85f..b282e41 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java
@@ -50,7 +50,7 @@ public interface ResourceGWTService extends RemoteService {
List<RecentlyAddedResourceComposite> findRecentlyAddedResources(long ctime, int
maxItems);
- List<DisambiguationReport<ProblemResourceComposite>>
findProblemResources(ResourceCriteria criteria);
+ List<DisambiguationReport<ProblemResourceComposite>>
findProblemResources(long ctime, int maxItems);
Resource getPlatformForResource(int resourceId);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java
index d0835b8..7597d13 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java
@@ -31,7 +31,6 @@ import com.smartgwt.client.types.DSDataFormat;
import com.smartgwt.client.types.DSProtocol;
import com.smartgwt.client.widgets.grid.ListGridRecord;
-import org.rhq.core.domain.criteria.ResourceCriteria;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.composite.DisambiguationReport;
import org.rhq.core.domain.resource.composite.ProblemResourceComposite;
@@ -102,26 +101,25 @@ public class ProblemResourcesDataSource extends
RPCDataSource<DisambiguationRepo
*/
public void executeFetch(final DSRequest request, final DSResponse response) {
- ResourceCriteria criteria = new ResourceCriteria();
+ long ctime = -1;
+ int maxItems = -1;
//retrieve current portlet display settings
if ((this.portlet != null) && (this.portlet instanceof
ProblemResourcesPortlet)) {
ProblemResourcesPortlet problemPortlet = (ProblemResourcesPortlet)
this.portlet;
//populate criteria with portlet preferences defined.
if (problemPortlet != null) {
if (problemPortlet.getMaximumProblemResourcesToDisplay() > 0) {
- criteria.setPaging(0,
problemPortlet.getMaximumProblemResourcesToDisplay());
+ maxItems = problemPortlet.getMaximumProblemResourcesToDisplay();
}
//define the time window
if (problemPortlet.getMaximumProblemResourcesWithinHours() > 0) {
- criteria.addFilterStartItime(System.currentTimeMillis()
- - (problemPortlet.getMaximumProblemResourcesWithinHours() * 60 *
60 * 1000));
- criteria.addFilterEndItime(System.currentTimeMillis());
+ ctime = System.currentTimeMillis()
+ - (problemPortlet.getMaximumProblemResourcesWithinHours() * 60 *
60 * 1000);
}
}
- //problem resources within the time specified
}
- GWTServiceLookup.getResourceService().findProblemResources(criteria,
+ GWTServiceLookup.getResourceService().findProblemResources(ctime, maxItems,
new
AsyncCallback<List<DisambiguationReport<ProblemResourceComposite>>>() {
public void onFailure(Throwable throwable) {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
index aca7778..6bb2d7d 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
@@ -146,16 +146,14 @@ public class ResourceGWTServiceImpl extends AbstractGWTServiceImpl
implements Re
/** Locate ProblemResourcesComposites and generate the disambiguation reports for
them.
* Criteria passed in not currently used.
*/
- public List<DisambiguationReport<ProblemResourceComposite>>
findProblemResources(ResourceCriteria criteria) {
+ public List<DisambiguationReport<ProblemResourceComposite>>
findProblemResources(long ctime, int maxItems) {
List<ProblemResourceComposite> located = new
ArrayList<ProblemResourceComposite>();
MeasurementProblemManagerLocal problemManager =
LookupUtil.getMeasurementProblemManager();
ResourceManagerLocal resourceManager = LookupUtil.getResourceManager();
//retrieve list of discovered problem resources. Grab all, live scrolling data
- //TODO: modify MeasurementProblemManagerLocal to accept ResourceCriteria
- // located = problemManager.findProblemResources(getSessionSubject(), 0,
new PageControl(0, -1));
- located = problemManager.findProblemResources(getSessionSubject(), 0, new
PageControl(0, -1));
+ located = problemManager.findProblemResources(getSessionSubject(), ctime, new
PageControl(0, maxItems));
//translate the returned problem resources to disambiguated links
List<DisambiguationReport<ProblemResourceComposite>> translated =
resourceManager.disambiguate(located,
@@ -197,15 +195,6 @@ public class ResourceGWTServiceImpl extends AbstractGWTServiceImpl
implements Re
return platforms;
}
- // @Override
- // public List<ProblemResourceComposite> findProblemResources(long ctime,
int maxItems) {
- // List<ProblemResourceComposite> problems =
- // resourceManager.findResourceCompositesByCriteria(getSessionSubject(),
criteria)(
- // getSessionSubject(), ctime, maxItems);
- //
- // return problems;
- // }
-
public List<Integer> uninventoryResources(int[] resourceIds) {
return
SerialUtility.prepare(resourceManager.uninventoryResources(getSessionSubject(),
resourceIds),
"ResourceService.uninventoryResources");