modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
| 28 +----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java
| 52 +++++-----
2 files changed, 39 insertions(+), 41 deletions(-)
New commits:
commit 16ff182bc813383485b77bc96312505c74ea37ec
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Oct 20 17:43:44 2010 -0400
no need to store the full resource type in the record
don't allow selections in the grids
refactor out common methods that trigger when edit buttons are pushed
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
index ec26699..c038076 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
@@ -141,50 +141,46 @@ public class ResourceTypeTreeNodeBuilder {
public static class ResourceTypeListGridRecord extends ListGridRecord {
- private ResourceType resourceType;
+ private int id;
private ResourceTypeListGridRecord(ResourceTypeTemplateCountComposite composite)
{
- this.resourceType = composite.getType();
+ ResourceType resourceType = composite.getType();
+ this.id = resourceType.getId();
- setAttribute(ATTRIB_ID, String.valueOf(resourceType.getId()));
+ setAttribute(ATTRIB_ID, String.valueOf(id));
setAttribute(ATTRIB_NAME, resourceType.getName());
setAttribute(ATTRIB_PLUGIN, resourceType.getPlugin());
- setAttribute(ATTRIB_CATEGORY, resourceType.getCategory().getDisplayName());
+ setAttribute(ATTRIB_CATEGORY, resourceType.getCategory().name());
setAttribute(ATTRIB_ENABLED_ALERT_TEMPLATES,
composite.getEnabledAlertCount());
setAttribute(ATTRIB_DISABLED_ALERT_TEMPLATES,
composite.getDisabledAlertCount());
setAttribute(ATTRIB_ENABLED_METRIC_TEMPLATES,
composite.getEnabledMetricCount());
setAttribute(ATTRIB_DISABLED_METRIC_TEMPLATES,
composite.getDisabledMetricCount());
}
- public ResourceType getResourceType() {
- return resourceType;
- }
-
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
- if (!(o instanceof ResourceTypeTreeNode)) {
+ if (!(o instanceof ResourceTypeListGridRecord)) {
return false;
}
- return (this.resourceType.getId() == ((ResourceTypeTreeNode)
o).resourceType.getId());
+ return (this.id == ((ResourceTypeListGridRecord) o).id);
}
@Override
public int hashCode() {
- return 31 * resourceType.getId();
+ return 31 * id;
}
}
public static class ResourceTypeTreeNode extends TreeNode {
- private ResourceType resourceType;
private String id;
private String parentId;
private ResourceTypeTreeNode(ResourceTypeTemplateCountComposite composite, String
parentId) {
- this.resourceType = composite.getType();
+ ResourceType resourceType = composite.getType();
String id = String.valueOf(resourceType.getId());
setID(id);
@@ -197,7 +193,7 @@ public class ResourceTypeTreeNodeBuilder {
setAttribute(ATTRIB_PARENT_ID, parentId);
setAttribute(ATTRIB_NAME, resourceType.getName());
setAttribute(ATTRIB_PLUGIN, resourceType.getPlugin());
- setAttribute(ATTRIB_CATEGORY, resourceType.getCategory().getDisplayName());
+ setAttribute(ATTRIB_CATEGORY, resourceType.getCategory().name());
setAttribute(ATTRIB_ENABLED_ALERT_TEMPLATES,
composite.getEnabledAlertCount());
setAttribute(ATTRIB_DISABLED_ALERT_TEMPLATES,
composite.getDisabledAlertCount());
setAttribute(ATTRIB_DISABLED_METRIC_TEMPLATES,
composite.getEnabledMetricCount());
@@ -206,10 +202,6 @@ public class ResourceTypeTreeNodeBuilder {
setIsFolder(true);
}
- public ResourceType getResourceType() {
- return resourceType;
- }
-
@Override
public boolean equals(Object o) {
if (this == o) {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java
index 6e2047d..ff50be7 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java
@@ -20,6 +20,7 @@ package org.rhq.enterprise.gui.coregui.client.admin.templates;
import com.smartgwt.client.data.Record;
import com.smartgwt.client.types.Alignment;
+import com.smartgwt.client.types.SelectionStyle;
import com.smartgwt.client.types.VisibilityMode;
import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.Canvas;
@@ -36,7 +37,7 @@ import com.smartgwt.client.widgets.tree.TreeGrid;
import com.smartgwt.client.widgets.tree.TreeGridField;
import com.smartgwt.client.widgets.tree.TreeNode;
-import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTreeGrid;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -80,6 +81,25 @@ public class ResourceTypeTreeView extends LocatableVLayout {
new ResourceTypeTreeNodeBuilder(platformsList, platformServicesList,
serversTreeGrid);
}
+ private static void editAlertTemplate(Record record) {
+ SC.say("Alert Template : " //
+ + record.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_NAME)
+ + "==>"
+ + record.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_PLUGIN)
+ + "==>"
+ + record.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_ID));
+ }
+
+ private static void editMetricTemplate(Record record) {
+ //
http://localhost:7080/admin/platform/monitor/Config.do?nomenu=true&mo...
+ SC.say("Metric Template: " //
+ + record.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_NAME)
+ + "==>"
+ + record.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_PLUGIN)
+ + "==>"
+ + record.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_ID));
+ }
+
public static class CustomResourceTypeListGrid extends LocatableListGrid {
private HLayout rollOverCanvas;
private ListGridRecord rollOverRecord;
@@ -91,6 +111,7 @@ public class ResourceTypeTreeView extends LocatableVLayout {
setFixedRecordHeights(false);
setShowRollOverCanvas(true);
setEmptyMessage("Loading...");
+ setSelectionType(SelectionStyle.NONE);
final ListGridField name = new
ListGridField(ResourceTypeTreeNodeBuilder.ATTRIB_NAME, "Name");
final ListGridField plugin = new
ListGridField(ResourceTypeTreeNodeBuilder.ATTRIB_PLUGIN, "Plugin");
@@ -147,11 +168,7 @@ public class ResourceTypeTreeView extends LocatableVLayout {
metricTemplateImg.setWidth(16);
metricTemplateImg.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
- //
http://localhost:7080/admin/platform/monitor/Config.do?nomenu=true&mo...
- SC.say("Metric Template: "
- +
rollOverRecord.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_NAME) + "==>"
- +
rollOverRecord.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_PLUGIN) +
"==>"
- +
rollOverRecord.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_ID));
+ editMetricTemplate(rollOverRecord);
}
});
@@ -166,10 +183,7 @@ public class ResourceTypeTreeView extends LocatableVLayout {
alertTemplateImg.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
- SC.say("Alert Template : "
- +
rollOverRecord.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_NAME) + "==>"
- +
rollOverRecord.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_PLUGIN) +
"==>"
- +
rollOverRecord.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_ID));
+ editAlertTemplate(rollOverRecord);
}
});
@@ -191,6 +205,7 @@ public class ResourceTypeTreeView extends LocatableVLayout {
setFixedRecordHeights(false);
setShowRollOverCanvas(true);
setEmptyMessage("Loading...");
+ setSelectionType(SelectionStyle.NONE);
setAnimateFolders(false);
final TreeGridField name = new
TreeGridField(ResourceTypeTreeNodeBuilder.ATTRIB_NAME, "Name");
@@ -245,11 +260,7 @@ public class ResourceTypeTreeView extends LocatableVLayout {
metricTemplateImg.setWidth(16);
metricTemplateImg.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
- //
http://localhost:7080/admin/platform/monitor/Config.do?nomenu=true&mo...
- SC.say("Metric Template: "
- +
rollOverRecord.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_NAME) + "==>"
- +
rollOverRecord.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_PLUGIN) +
"==>"
- +
rollOverRecord.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_ID));
+ editMetricTemplate(rollOverRecord);
}
});
@@ -264,10 +275,7 @@ public class ResourceTypeTreeView extends LocatableVLayout {
alertTemplateImg.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
- SC.say("Alert Template : "
- +
rollOverRecord.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_NAME) + "==>"
- +
rollOverRecord.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_PLUGIN) +
"==>"
- +
rollOverRecord.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_ID));
+ editAlertTemplate(rollOverRecord);
}
});
@@ -282,10 +290,8 @@ public class ResourceTypeTreeView extends LocatableVLayout {
if (record instanceof TreeNode) {
if (record instanceof ResourceTypeTreeNodeBuilder.ResourceTypeTreeNode)
{
- ResourceType resourceType =
((ResourceTypeTreeNodeBuilder.ResourceTypeTreeNode) record)
- .getResourceType();
-
- switch (resourceType.getCategory()) {
+ String c =
record.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_CATEGORY);
+ switch (ResourceCategory.valueOf(c)) {
case PLATFORM:
return "types/Platform_up_16.png";
case SERVER: