modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java
| 9 +++++----
modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_autogroup_closed.png
|binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_autogroup_opened.png
|binary
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit a11451c05fdf837b4f67a49d72c61b0c9e71f641
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Oct 1 15:32:47 2013 -0400
Bug 1006594 - use new tree icons for auto-groups and subcategories
work in the new UX provided icons for a clearer tree.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java
index d751587..bfad2a4 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java
@@ -24,8 +24,8 @@ import com.smartgwt.client.widgets.tree.TreeNode;
import org.rhq.core.domain.resource.Resource;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeDatasource.AutoGroupTreeNode;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeDatasource.ResourceTreeNode;
-import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeDatasource.SubCategoryTreeNode;
/**
* @author Greg Hinkle
@@ -52,10 +52,11 @@ public class CustomResourceTreeGrid extends TreeGrid {
return
ImageManager.getResourceIcon(resource.getResourceType().getCategory(), resource
.getCurrentAvailability().getAvailabilityType());
}
- } else if (record instanceof SubCategoryTreeNode) {
- return "resources/folder_mixed_" + (open ? "opened" :
"closed") + ".png";
+ } else if (record instanceof AutoGroupTreeNode) {
+ return "resources/folder_autogroup_" + (open ?
"opened" : "closed") + ".png";
} else {
- return "resources/folder_group_" + (open ? "opened" :
"closed") + ".png";
+ // note - subcategory nodes use default folder icons
+ return super.getIcon(record, defaultState);
}
}
return null;
diff --git
a/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_autogroup_closed.png
b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_autogroup_closed.png
new file mode 100644
index 0000000..d85404d
Binary files /dev/null and
b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_autogroup_closed.png
differ
diff --git
a/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_autogroup_opened.png
b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_autogroup_opened.png
new file mode 100644
index 0000000..33856c8
Binary files /dev/null and
b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_autogroup_opened.png
differ
Show replies by date