modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceCategory.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ResourceGroupComposite.java | 56 ----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java | 128 +++++++++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/footer/FavoritesButton.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java | 111 ++++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java | 61 ++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/PluginTypeTreeView.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeView.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java | 14 -
21 files changed, 288 insertions(+), 181 deletions(-)
New commits:
commit ec6cb956604f58995cd83b614322f55e9f439b8d
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Nov 29 16:38:11 2010 -0500
more imagemanager additions. remove html rendering methods from domain objects
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceCategory.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceCategory.java
index 853fc81..7e677e5 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceCategory.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceCategory.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
/**
- * A JON resource category.
+ * An individual resource category.
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ResourceGroupComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ResourceGroupComposite.java
index 2a19c82..6e743c4 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ResourceGroupComposite.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ResourceGroupComposite.java
@@ -147,14 +147,6 @@ public class ResourceGroupComposite implements Serializable {
return this.explicitDown;
}
- public String getExplicitFormatted() {
- return getAlignedAvailabilityResults(getExplicitUp(), getExplicitDown());
- }
-
- public String getImplicitFormatted() {
- return getAlignedAvailabilityResults(getImplicitUp(), getImplicitDown());
- }
-
@XmlTransient
public void setResourceFacets(ResourceFacets facets) {
this.resourceFacets = facets;
@@ -182,54 +174,6 @@ public class ResourceGroupComposite implements Serializable {
return "groupId=" + getResourceGroup().getId();
}
- private String getAlignedAvailabilityResults(long up, long down) {
- StringBuilder results = new StringBuilder();
- results.append("<table width=\"120px\"><tr>");
- if (up == 0 && down == 0) {
- results.append(getColumn(false, "<img src=\"" + "subsystems/availability/availability_grey_16.png"
- + "\" /> 0"));
- results.append(getColumn(true));
- results.append(getColumn(false));
- } else {
- if (up > 0) {
- results.append(getColumn(false, " <img src=\"" + "subsystems/availability/availability_green_16.png"
- + "\" />", up));
- }
-
- if (up > 0 && down > 0) {
- results.append(getColumn(true)); // , " / ")); // use a vertical separator image if we want a separator
- }
-
- if (down > 0) {
- results.append(getColumn(false, " <img src=\"" + "subsystems/availability/availability_red_16.png"
- + "\" />", down));
- } else {
- results.append(getColumn(false,
- " <img src=\"/images/blank.png\" width=\"16px\" height=\"16px\" />"));
- }
- }
- results.append("</tr></table>");
- return results.toString();
- }
-
- private String getColumn(boolean isSpacerColumn, Object... data) {
- StringBuilder results = new StringBuilder();
- if (isSpacerColumn) {
- results.append("<td nowrap=\"nowrap\" style=\"white-space:nowrap;\" width=\"10px\" align=\"left\" >");
- } else {
- results.append("<td nowrap=\"nowrap\" style=\"white-space:nowrap;\" width=\"55px\" align=\"left\" >");
- }
- if (data == null) {
- results.append(" ");
- } else {
- for (Object datum : data) {
- results.append(datum == null ? " " : datum);
- }
- }
- results.append("</td>");
- return results.toString();
- }
-
@Override
public String toString() {
return "ResourceGroupComposite[name="
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
index 3975f98..d091558 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
@@ -3,6 +3,10 @@ package org.rhq.enterprise.gui.coregui.client;
import org.rhq.core.domain.alert.AlertPriority;
import org.rhq.core.domain.configuration.ConfigurationUpdateStatus;
import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.measurement.ResourceAvailability;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.ResourceCategory;
+import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.group.GroupCategory;
/**
@@ -15,8 +19,110 @@ import org.rhq.core.domain.resource.group.GroupCategory;
*
*/
public class ImageManager {
+
+ public static final String IMAGES_DIR = "images/";
+
/**
- * Returns the large group icon badged with availability icon. Avails is the
+ * All methods in this ImageManager class return image paths relative to the top
+ * {@link #IMAGES_DIR images directory}. If you need a full path to the image, including
+ * this top images directory name (for example, if you need to populate an explicit HTML
+ * img tag's src attribute) pass in an image path to this {@link #getFullImagePath(String)}
+ * method to obtain the full path. The caller can optionall prepend {@link #IMAGES_DIR}
+ * to any path returned by ImageManager, which is all this method really does.
+ *
+ * @param image a relative image path
+ * @return a full image path
+ */
+ public static String getFullImagePath(String image) {
+ return IMAGES_DIR + image;
+ }
+
+ public static String getResourceIcon(Resource resource) {
+ return getResourceIcon(resource, "16");
+ }
+
+ public static String getResourceLargeIcon(Resource resource) {
+ return getResourceIcon(resource, "24");
+ }
+
+ private static String getResourceIcon(Resource resource, String size) {
+ ResourceType type = resource.getResourceType();
+ ResourceCategory category;
+ if (type != null) {
+ category = type.getCategory();
+ } else {
+ category = ResourceCategory.SERVICE;
+ }
+
+ ResourceAvailability resourceAvail = resource.getCurrentAvailability();
+ Boolean avail;
+ if (resourceAvail != null) {
+ AvailabilityType availType = resourceAvail.getAvailabilityType();
+ if (availType != null) {
+ avail = Boolean.valueOf(availType == AvailabilityType.UP);
+ } else {
+ avail = null;
+ }
+ } else {
+ avail = null;
+ }
+ return getResourceIcon(category, avail, size);
+ }
+
+ public static String getResourceIcon(ResourceCategory category) {
+ return getResourceIcon(category, Boolean.TRUE);
+ }
+
+ public static String getResourceLargeIcon(ResourceCategory category) {
+ return getResourceLargeIcon(category, Boolean.TRUE);
+ }
+
+ public static String getResourceIcon(ResourceCategory category, Boolean avail) {
+ return getResourceIcon(category, avail, "16");
+ }
+
+ public static String getResourceLargeIcon(ResourceCategory category, Boolean avail) {
+ return getResourceIcon(category, avail, "24");
+ }
+
+ private static String getResourceIcon(ResourceCategory category, Boolean avail, String size) {
+ String categoryName = null;
+ String availName = null;
+
+ switch (category) {
+ case PLATFORM: {
+ categoryName = "Platform";
+ availName = (avail != null && avail.booleanValue()) ? "up" : "down";
+ break;
+ }
+ case SERVER: {
+ categoryName = "Server";
+ // only server icons have an explicit "unknown" icon, the others will be assumed down when null
+ availName = (avail != null) ? (avail.booleanValue() ? "up" : "down") : "unknown";
+ break;
+ }
+ case SERVICE: {
+ categoryName = "Service";
+ availName = (avail != null && avail.booleanValue()) ? "up" : "down";
+ break;
+ }
+ }
+
+ return "types/" + categoryName + "_" + availName + "_" + size + ".png";
+ }
+
+ public static String getGroupIcon(GroupCategory groupType) {
+ String category = groupType == GroupCategory.COMPATIBLE ? "Cluster" : "Group";
+ return "types/" + category + "_up_16.png";
+ }
+
+ public static String getGroupLargeIcon(GroupCategory groupType) {
+ String category = groupType == GroupCategory.COMPATIBLE ? "Cluster" : "Group";
+ return "types/" + category + "_up_24.png";
+ }
+
+ /**
+ * Returns the group icon badged with availability icon. Avails is the
* percentage of resources in the group that are UP. If avails is 0, it is
* red (no resources are available), if it is 1, it is green (all resources
* are available), if it is between 0 and 1, it is yellow.
@@ -28,21 +134,29 @@ public class ImageManager {
* @param avails percentage of resources that are UP
* @return the group badge icon
*/
+ public static String getGroupIcon(GroupCategory groupType, Double avails) {
+ return getGroupIcon(groupType, avails, "16");
+ }
+
public static String getGroupLargeIcon(GroupCategory groupType, Double avails) {
+ return getGroupIcon(groupType, avails, "24");
+ }
+
+ private static String getGroupIcon(GroupCategory groupType, Double avails, String size) {
String category = groupType == GroupCategory.COMPATIBLE ? "Cluster" : "Group";
if (avails == null) {
- return "types/" + category + "_up_24.png";
+ return "types/" + category + "_up_" + size + ".png";
}
double val = avails.doubleValue();
if (val == 0.0d) {
- return "types/" + category + "_down_24.png";
+ return "types/" + category + "_down_" + size + ".png";
} else if (val > 0.0d && val < 1.0d) {
- return "types/" + category + "_warning_24.png";
+ return "types/" + category + "_warning_" + size + ".png";
} else {
- return "types/" + category + "_up_24.png";
+ return "types/" + category + "_up_" + size + ".png";
}
}
@@ -142,4 +256,8 @@ public class ImageManager {
return "subsystems/inventory/Connection_16.png";
}
+
+ public static String getLockedIcon() {
+ return "global/Locked_16.png";
+ }
}
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 9e6e2d9..2132e36 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
@@ -431,14 +431,7 @@ public class ResourceTypeTreeView extends LocatableVLayout implements Bookmarkab
if (record instanceof TreeNode) {
if (record instanceof ResourceTypeTreeNodeBuilder.ResourceTypeTreeNode) {
String categoryName = record.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_CATEGORY);
- switch (ResourceCategory.valueOf(categoryName)) {
- case PLATFORM:
- return "types/Platform_up_16.png";
- case SERVER:
- return "types/Server_up_16.png";
- case SERVICE:
- return "types/Service_up_16.png";
- }
+ return ImageManager.getResourceIcon(ResourceCategory.valueOf(categoryName));
}
}
return null;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
index 6d4df01..9b91e25 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
@@ -49,11 +49,13 @@ import org.rhq.core.domain.bundle.BundleVersion;
import org.rhq.core.domain.criteria.BundleCriteria;
import org.rhq.core.domain.criteria.BundleDeploymentCriteria;
import org.rhq.core.domain.criteria.BundleResourceDeploymentCriteria;
+import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.tagging.Tag;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
import org.rhq.enterprise.gui.coregui.client.Breadcrumb;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
@@ -164,8 +166,8 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
ListGridField resourceIcon = new ListGridField("resourceAvailability", "");
HashMap<String, String> icons = new HashMap<String, String>();
- icons.put("UP", "types/Platform_up_16.png");
- icons.put("DOWN", "types/Platform_down_16.png");
+ icons.put("UP", ImageManager.getResourceIcon(ResourceCategory.PLATFORM, Boolean.TRUE));
+ icons.put("DOWN", ImageManager.getResourceIcon(ResourceCategory.PLATFORM, Boolean.FALSE));
resourceIcon.setValueIcons(icons);
resourceIcon.setValueIconSize(16);
resourceIcon.setCellFormatter(new CellFormatter() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/footer/FavoritesButton.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/footer/FavoritesButton.java
index 39e3094..7a10c11 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/footer/FavoritesButton.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/footer/FavoritesButton.java
@@ -33,6 +33,7 @@ import org.rhq.core.domain.criteria.ResourceCriteria;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIMenuButton;
@@ -92,13 +93,7 @@ public class FavoritesButton extends LocatableIMenuButton {
// TODO: Ideally, we should use ResourceManagerLocal.disambiguate() here to obtain
// disambiguated Resource names.
item.setTitle(resource.getName());
-
- String category = resource.getResourceType().getCategory().getDisplayName();
-
- String avail = (resource.getCurrentAvailability() != null && resource
- .getCurrentAvailability().getAvailabilityType() != null) ? (resource
- .getCurrentAvailability().getAvailabilityType().name().toLowerCase()) : "down";
- item.setIcon("types/" + category + "_" + avail + "_16.png");
+ item.setIcon(ImageManager.getResourceIcon(resource));
}
favoritesMenu.setItems(items);
favoritesMenu.showContextMenu();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
index a77c032..2340ec4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
@@ -34,6 +34,7 @@ import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.group.GroupCategory;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.components.TitleBar;
import org.rhq.enterprise.gui.coregui.client.components.view.AbstractSectionedLeftNavigationView;
import org.rhq.enterprise.gui.coregui.client.components.view.NavigationItem;
@@ -147,47 +148,50 @@ public class InventoryView extends AbstractSectionedLeftNavigationView {
NavigationItem allResourcesItem = new NavigationItem(PAGE_ALL_RESOURCES, null, new ViewFactory() {
public Canvas createView() {
return new ResourceSearchView(extendLocatorId(PAGE_ALL_RESOURCES.getName()), null, PAGE_ALL_RESOURCES
- .getTitle(), "types/Platform_up_24.png", "types/Server_up_24.png", "types/Service_up_24.png");
+ .getTitle(), ImageManager.getResourceLargeIcon(ResourceCategory.PLATFORM, Boolean.TRUE),
+ ImageManager.getResourceLargeIcon(ResourceCategory.SERVER, Boolean.TRUE), ImageManager
+ .getResourceLargeIcon(ResourceCategory.SERVICE, Boolean.TRUE));
}
});
- NavigationItem platformsItem = new NavigationItem(PAGE_PLATFORMS, "types/Platform_up_16.png",
- new ViewFactory() {
- public Canvas createView() {
- return new ResourceSearchView(extendLocatorId(PAGE_PLATFORMS.getName()), new Criteria(
- ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.PLATFORM.name()),
- PAGE_PLATFORMS.getTitle(), "types/Platform_up_24.png");
- }
- });
+ NavigationItem platformsItem = new NavigationItem(PAGE_PLATFORMS, ImageManager.getResourceIcon(
+ ResourceCategory.PLATFORM, Boolean.TRUE), new ViewFactory() {
+ public Canvas createView() {
+ return new ResourceSearchView(extendLocatorId(PAGE_PLATFORMS.getName()), new Criteria(
+ ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.PLATFORM.name()), PAGE_PLATFORMS
+ .getTitle(), ImageManager.getResourceLargeIcon(ResourceCategory.PLATFORM, Boolean.TRUE));
+ }
+ });
- NavigationItem serversItem = new NavigationItem(PAGE_SERVERS, "types/Server_up_16.png", new ViewFactory() {
+ NavigationItem serversItem = new NavigationItem(PAGE_SERVERS, ImageManager.getResourceIcon(
+ ResourceCategory.SERVER, Boolean.TRUE), new ViewFactory() {
public Canvas createView() {
return new ResourceSearchView(extendLocatorId(PAGE_SERVERS.getName()), new Criteria(
ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.SERVER.name()), PAGE_SERVERS
- .getTitle(), "types/Server_up_24.png");
+ .getTitle(), ImageManager.getResourceLargeIcon(ResourceCategory.SERVER, Boolean.TRUE));
}
});
- NavigationItem servicesItem = new NavigationItem(PAGE_SERVICES, "types/Service_up_16.png", new ViewFactory() {
+ NavigationItem servicesItem = new NavigationItem(PAGE_SERVICES, ImageManager.getResourceIcon(
+ ResourceCategory.SERVICE, Boolean.TRUE), new ViewFactory() {
public Canvas createView() {
return new ResourceSearchView(extendLocatorId(PAGE_SERVICES.getName()), new Criteria(
ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.SERVICE.name()), PAGE_SERVICES
- .getTitle(), "types/Service_up_24.png");
+ .getTitle(), ImageManager.getResourceLargeIcon(ResourceCategory.SERVICE, Boolean.TRUE));
}
});
- NavigationItem downServersItem = new NavigationItem(PAGE_DOWN_SERVERS, "types/Server_down_16.png",
- new ViewFactory() {
- public Canvas createView() {
- Criteria criteria = new Criteria(ResourceDataSourceField.AVAILABILITY.propertyName(),
- AvailabilityType.DOWN.name());
- criteria.addCriteria(ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.SERVER
- .name());
- // TODO (ips, 10/28/10): Should we include down platforms too?
- return new ResourceSearchView(extendLocatorId(PAGE_DOWN_SERVERS.getName()), criteria, MSG
- .view_inventory_downServers());
- }
- });
+ NavigationItem downServersItem = new NavigationItem(PAGE_DOWN_SERVERS, ImageManager.getResourceIcon(
+ ResourceCategory.SERVER, Boolean.FALSE), new ViewFactory() {
+ public Canvas createView() {
+ Criteria criteria = new Criteria(ResourceDataSourceField.AVAILABILITY.propertyName(),
+ AvailabilityType.DOWN.name());
+ criteria.addCriteria(ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.SERVER.name());
+ // TODO (ips, 10/28/10): Should we include down platforms too?
+ return new ResourceSearchView(extendLocatorId(PAGE_DOWN_SERVERS.getName()), criteria, MSG
+ .view_inventory_downServers());
+ }
+ });
return new NavigationSection(RESOURCES_SECTION_VIEW_ID, autodiscoveryQueueItem, allResourcesItem,
platformsItem, serversItem, servicesItem, downServersItem);
@@ -203,40 +207,43 @@ public class InventoryView extends AbstractSectionedLeftNavigationView {
}
}, this.globalPermissions.contains(Permission.MANAGE_INVENTORY));
- NavigationItem allGroupsItem = new NavigationItem(PAGE_ALL_GROUPS, "types/Group_up_16.png", new ViewFactory() {
+ NavigationItem allGroupsItem = new NavigationItem(PAGE_ALL_GROUPS, ImageManager
+ .getGroupIcon(GroupCategory.MIXED), new ViewFactory() {
public Canvas createView() {
return new ResourceGroupListView(extendLocatorId(PAGE_ALL_GROUPS.getName()), null, PAGE_ALL_GROUPS
- .getTitle(), "types/Cluster_up_24.png", "types/Group_up_24.png");
+ .getTitle(), ImageManager.getGroupLargeIcon(GroupCategory.COMPATIBLE), ImageManager
+ .getGroupLargeIcon(GroupCategory.MIXED));
}
});
- NavigationItem compatibleGroupsItem = new NavigationItem(PAGE_COMPATIBLE_GROUPS, "types/Cluster_up_16.png",
- new ViewFactory() {
- public Canvas createView() {
- return new ResourceGroupListView(extendLocatorId(PAGE_COMPATIBLE_GROUPS.getName()), new Criteria(
- ResourceGroupDataSourceField.CATEGORY.propertyName(), GroupCategory.COMPATIBLE.name()),
- PAGE_COMPATIBLE_GROUPS.getTitle(), "types/Cluster_up_24.png");
- }
- });
+ NavigationItem compatibleGroupsItem = new NavigationItem(PAGE_COMPATIBLE_GROUPS, ImageManager
+ .getGroupIcon(GroupCategory.COMPATIBLE), new ViewFactory() {
+ public Canvas createView() {
+ return new ResourceGroupListView(extendLocatorId(PAGE_COMPATIBLE_GROUPS.getName()), new Criteria(
+ ResourceGroupDataSourceField.CATEGORY.propertyName(), GroupCategory.COMPATIBLE.name()),
+ PAGE_COMPATIBLE_GROUPS.getTitle(), ImageManager.getGroupLargeIcon(GroupCategory.COMPATIBLE));
+ }
+ });
- NavigationItem mixedGroupsItem = new NavigationItem(PAGE_MIXED_GROUPS, "types/Group_up_16.png",
- new ViewFactory() {
- public Canvas createView() {
- return new ResourceGroupListView(extendLocatorId(PAGE_MIXED_GROUPS.getName()), new Criteria(
- ResourceGroupDataSourceField.CATEGORY.propertyName(), GroupCategory.MIXED.name()),
- PAGE_MIXED_GROUPS.getTitle(), "types/Group_up_24.png");
- }
- });
+ NavigationItem mixedGroupsItem = new NavigationItem(PAGE_MIXED_GROUPS, ImageManager
+ .getGroupIcon(GroupCategory.MIXED), new ViewFactory() {
+ public Canvas createView() {
+ return new ResourceGroupListView(extendLocatorId(PAGE_MIXED_GROUPS.getName()), new Criteria(
+ ResourceGroupDataSourceField.CATEGORY.propertyName(), GroupCategory.MIXED.name()),
+ PAGE_MIXED_GROUPS.getTitle(), ImageManager.getGroupLargeIcon(GroupCategory.MIXED));
+ }
+ });
- NavigationItem problemGroupsItem = new NavigationItem(PAGE_PROBLEM_GROUPS, "types/Cluster_down_16.png",
- new ViewFactory() {
- public Canvas createView() {
- // TODO: There is no underlying support for this criteria. Also, there should not be an active New
- // button on this page.
- return new ResourceGroupListView(extendLocatorId(PAGE_PROBLEM_GROUPS.getName()), new Criteria(
- "availability", "down"), PAGE_PROBLEM_GROUPS.getTitle(), "types/Cluster_down_16.png");
- }
- });
+ NavigationItem problemGroupsItem = new NavigationItem(PAGE_PROBLEM_GROUPS, ImageManager.getGroupIcon(
+ GroupCategory.COMPATIBLE, 0.0d), new ViewFactory() {
+ public Canvas createView() {
+ // TODO: There is no underlying support for this criteria. Also, there should not be an active New
+ // button on this page.
+ return new ResourceGroupListView(extendLocatorId(PAGE_PROBLEM_GROUPS.getName()), new Criteria(
+ "availability", "down"), PAGE_PROBLEM_GROUPS.getTitle(), ImageManager.getGroupLargeIcon(
+ GroupCategory.COMPATIBLE, 0.0d));
+ }
+ });
return new NavigationSection(GROUPS_SECTION_VIEW_ID, dynagroupDefinitionsItem, allGroupsItem,
compatibleGroupsItem, mixedGroupsItem, problemGroupsItem);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
index 127cd83..72a73fe 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
@@ -43,6 +43,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
@@ -175,8 +176,8 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
record.setAttribute("implicitUp", String.valueOf(from.getImplicitUp()));
record.setAttribute("implicitDown", String.valueOf(from.getImplicitDown()));
- record.setAttribute("availabilityChildren", from.getExplicitFormatted());
- record.setAttribute("availabilityDescendents", from.getImplicitFormatted());
+ record.setAttribute("availabilityChildren", getExplicitFormatted(from));
+ record.setAttribute("availabilityDescendents", getImplicitFormatted(from));
if (from.getResourceGroup().getResourceType() != null) {
record.setAttribute("resourceType", from.getResourceGroup().getResourceType());
@@ -186,4 +187,60 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
return record;
}
+
+ private String getExplicitFormatted(ResourceGroupComposite from) {
+ return getAlignedAvailabilityResults(from.getExplicitUp(), from.getExplicitDown());
+ }
+
+ private String getImplicitFormatted(ResourceGroupComposite from) {
+ return getAlignedAvailabilityResults(from.getImplicitUp(), from.getImplicitDown());
+ }
+
+ private String getAlignedAvailabilityResults(long up, long down) {
+ StringBuilder results = new StringBuilder();
+ results.append("<table width=\"120px\"><tr>");
+ if (up == 0 && down == 0) {
+ results.append(getColumn(false, "<img src=\""
+ + ImageManager.getFullImagePath(ImageManager.getAvailabilityIcon(null)) + "\" /> 0"));
+ results.append(getColumn(true));
+ results.append(getColumn(false));
+ } else {
+ if (up > 0) {
+ results.append(getColumn(false, " <img src=\""
+ + ImageManager.getFullImagePath(ImageManager.getAvailabilityIcon(Boolean.TRUE)) + "\" />", up));
+ }
+
+ if (up > 0 && down > 0) {
+ results.append(getColumn(true)); // , " / ")); // use a vertical separator image if we want a separator
+ }
+
+ if (down > 0) {
+ results.append(getColumn(false, " <img src=\""
+ + ImageManager.getFullImagePath(ImageManager.getAvailabilityIcon(Boolean.FALSE)) + "\" />", down));
+ } else {
+ results.append(getColumn(false,
+ " <img src=\"/images/blank.png\" width=\"16px\" height=\"16px\" />"));
+ }
+ }
+ results.append("</tr></table>");
+ return results.toString();
+ }
+
+ private String getColumn(boolean isSpacerColumn, Object... data) {
+ StringBuilder results = new StringBuilder();
+ if (isSpacerColumn) {
+ results.append("<td nowrap=\"nowrap\" style=\"white-space:nowrap;\" width=\"10px\" align=\"left\" >");
+ } else {
+ results.append("<td nowrap=\"nowrap\" style=\"white-space:nowrap;\" width=\"55px\" align=\"left\" >");
+ }
+ if (data == null) {
+ results.append(" ");
+ } else {
+ for (Object datum : data) {
+ results.append(datum == null ? " " : datum);
+ }
+ }
+ results.append("</td>");
+ return results.toString();
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
index 88e78f4..5de3232 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
@@ -89,12 +89,12 @@ public class ResourceGroupListView extends Table {
ListGridField categoryField = new ListGridField(CATEGORY.propertyName(), CATEGORY.title(), 60);
ListGridField availabilityChildrenField = new ListGridField("availabilityChildren", MSG
- .view_inventory_groups_children(), 70);
+ .view_inventory_groups_children(), 120); // 120 due to the html in ResourceGroupCompositeDataSource.getAlignedAvailabilityResults
availabilityChildrenField.setWrap(false);
availabilityChildrenField.setAlign(Alignment.CENTER);
ListGridField availabilityDescendantsField = new ListGridField("availabilityDescendents", MSG
- .view_inventory_groups_descendants(), 70);
+ .view_inventory_groups_descendants(), 120); // 120 due to the html in ResourceGroupCompositeDataSource.getAlignedAvailabilityResults
availabilityDescendantsField.setWrap(false);
availabilityDescendantsField.setAlign(Alignment.CENTER);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
index 569882d..4c1561c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
@@ -31,6 +31,7 @@ import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.criteria.ResourceGroupCriteria;
import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.MeasurementDefinition;
+import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.ResourceTypeFacet;
import org.rhq.core.domain.resource.group.GroupCategory;
@@ -38,6 +39,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.alert.GroupAlertHistoryView;
import org.rhq.enterprise.gui.coregui.client.alert.definitions.GroupAlertDefinitionsView;
@@ -141,7 +143,7 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
List<TwoLevelTab> tabs = new ArrayList<TwoLevelTab>();
summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"), new ViewName("Summary", MSG
- .view_tabs_common_summary()), "/images/icons/Service_up_16.png");
+ .view_tabs_common_summary()), ImageManager.getResourceIcon(ResourceCategory.SERVICE, Boolean.TRUE));
summaryOverview = new SubTab(summaryTab.extendLocatorId("Overview"), new ViewName("Overview", MSG
.view_tabs_common_overview()), null);
summaryTimeline = new SubTab(summaryTab.extendLocatorId("Timeline"), new ViewName("Timeline", MSG
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
index a81f98e..656ebe9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
@@ -32,6 +32,7 @@ import com.smartgwt.client.widgets.events.ClickHandler;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.criteria.ResourceGroupCriteria;
+import org.rhq.core.domain.resource.group.GroupCategory;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
import org.rhq.core.domain.tagging.Tag;
@@ -152,7 +153,7 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
}
});
- badge = new Img("types/Service_up_24.png", 24, 24);
+ badge = new Img(ImageManager.getGroupLargeIcon(GroupCategory.MIXED), 24, 24);
TagEditorView tagEditorView = new TagEditorView(extendLocatorId("Editor"), group.getTags(), false,
new TagsChangedCallback() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
index 364c1a5..e31eb35 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
@@ -53,6 +53,7 @@ import org.rhq.core.domain.resource.group.composite.ClusterKeyFlyweight;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode;
@@ -171,7 +172,7 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
ResourceGroupTreeView.this.rootGroupId = rootResourceGroup.getId();
TreeNode fakeRoot = new TreeNode("fakeRootNode");
TreeNode rootNode = new TreeNode(rootResourceGroup.getName());
- String icon = "types/Group_up_16.png";
+ String icon = ImageManager.getGroupIcon(GroupCategory.MIXED);
rootNode.setIcon(icon);
rootNode.setID(String.valueOf(rootResourceGroup.getId())); //getClusterKey().toString());
fakeRoot.setChildren(new TreeNode[] { rootNode });
@@ -265,7 +266,7 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
ResourceType rootResourceType = typeMap.get(rootResourceGroup.getResourceType().getId());
rootNode.setAttribute("resourceType", rootResourceType);
- String icon = "types/" + rootResourceType.getCategory().getDisplayName() + "_up_16.png";
+ String icon = ImageManager.getResourceIcon(rootResourceType.getCategory());
rootNode.setIcon(icon);
fakeRoot.setChildren(new TreeNode[] { rootNode });
@@ -385,7 +386,7 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
node.setAttribute("resourceType", type);
node.setIsFolder(!child.getChildren().isEmpty());
- String icon = "types/" + type.getCategory().getDisplayName() + "_up_16.png";
+ String icon = ImageManager.getResourceIcon(type.getCategory());
node.setIcon(icon);
return node;
}
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 f1dad07..76ac9f1 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
@@ -23,6 +23,7 @@ import com.smartgwt.client.widgets.tree.TreeNode;
import org.rhq.core.domain.measurement.AvailabilityType;
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.ResourceTreeNode;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTreeGrid;
@@ -45,14 +46,11 @@ public class CustomResourceTreeGrid extends LocatableTreeGrid {
ResourceTreeNode node = (ResourceTreeNode) record;
if (node.isLocked()) {
- return "global/Locked_16.png";
-
+ return ImageManager.getLockedIcon();
} else {
Resource resource = ((ResourceTreeDatasource.ResourceTreeNode) record).getResource();
- String category = resource.getResourceType().getCategory().getDisplayName();
boolean up = resource.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP;
-
- return "types/" + category + "_" + (up ? "up" : "down") + "_16.png";
+ return ImageManager.getResourceIcon(resource.getResourceType().getCategory(), up);
}
} else {
return "resources/folder_group_" + (open ? "opened" : "closed") + ".png";
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java
index 9ce25ab..4f899b9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java
@@ -57,6 +57,7 @@ import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.Breadcrumb;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
@@ -485,7 +486,7 @@ public class NewResourceTreeView extends LocatableVLayout {
Resource nr = ((ResourceTreeDatasource.ResourceTreeNode) node).getResource();
String display = node.getName() + " <span class=\"subtitle\">" + nr.getResourceType().getName() + "</span>";
- String icon = "types/" + nr.getResourceType().getCategory().getDisplayName() + "_up_16.png";
+ String icon = ImageManager.getResourceIcon(nr.getResourceType().getCategory());
viewId.getBreadcrumbs().add(new Breadcrumb(node.getAttribute("id"), display, icon, true));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
index 9ee899c..9f41ace 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
@@ -32,12 +32,14 @@ import org.rhq.core.domain.criteria.ResourceCriteria;
import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.ResourceTypeFacet;
import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.core.domain.resource.composite.ResourcePermission;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.alert.ResourceAlertHistoryView;
import org.rhq.enterprise.gui.coregui.client.alert.definitions.ResourceAlertDefinitionsView;
@@ -121,7 +123,7 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
List<TwoLevelTab> tabs = new ArrayList<TwoLevelTab>();
summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"), new ViewName("Summary", MSG
- .view_tabs_common_summary()), "/images/icons/Service_up_16.png");
+ .view_tabs_common_summary()), ImageManager.getResourceIcon(ResourceCategory.SERVICE, Boolean.TRUE));
summaryOverview = new SubTab(summaryTab.extendLocatorId("Overview"), new ViewName("Overview", MSG
.view_tabs_common_overview()), null);
summaryDashboard = new SubTab(summaryTab.extendLocatorId("Dashboard"), new ViewName("Dashboard", MSG
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
index a4f9897..2be0412 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
@@ -42,6 +42,7 @@ import com.smartgwt.client.widgets.form.fields.events.ChangeHandler;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.criteria.ResourceCriteria;
import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.ResourceError;
import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.core.domain.tagging.Tag;
@@ -127,7 +128,7 @@ public class ResourceTitleBar extends LocatableVLayout {
}
});
- badge = new Img("types/Service_up_24.png", 24, 24);
+ badge = new Img(ImageManager.getResourceLargeIcon(ResourceCategory.SERVICE), 24, 24);
TagEditorView tagEditorView = new TagEditorView(extendLocatorId("TagEdit"), resource.getTags(), false,
new TagsChangedCallback() {
@@ -315,12 +316,7 @@ public class ResourceTitleBar extends LocatableVLayout {
this.availabilityImage.setSrc(ImageManager.getAvailabilityLargeIconFromAvailType(resource
.getCurrentAvailability().getAvailabilityType()));
- String category = this.resource.getResourceType().getCategory().getDisplayName();
-
- String avail = (resource.getCurrentAvailability() != null && resource.getCurrentAvailability()
- .getAvailabilityType() != null) ? (resource.getCurrentAvailability().getAvailabilityType().name()
- .toLowerCase()) : "down";
- badge.setSrc("types/" + category + "_" + avail + "_24.png");
+ badge.setSrc(ImageManager.getResourceLargeIcon(this.resource));
markForRedraw();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
index bd8b9b0..1b45837 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
@@ -69,6 +69,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.Breadcrumb;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
@@ -326,14 +327,14 @@ public class ResourceTreeView extends LocatableVLayout {
if (node instanceof ResourceTreeNode) {
Resource nr = ((ResourceTreeNode) node).getResource();
String display = node.getName() + " <span class=\"subtitle\">" + nr.getResourceType().getName() + "</span>";
- String icon = "types/" + nr.getResourceType().getCategory().getDisplayName() + "_up_16.png";
+ String icon = ImageManager.getResourceIcon(nr.getResourceType().getCategory());
viewId.getBreadcrumbs().add(new Breadcrumb(node.getAttribute("id"), display, icon, true));
} else if (node instanceof AutoGroupTreeNode) {
String name = ((AutoGroupTreeNode) node).getBackingGroupName();
String display = node.getName() + " <span class=\"subtitle\">" + name + "</span>";
- String icon = "types/" + ((AutoGroupTreeNode) node).getResourceType().getCategory() + "_up_16.png";
+ String icon = ImageManager.getResourceIcon(((AutoGroupTreeNode) node).getResourceType().getCategory());
viewId.getBreadcrumbs().add(new Breadcrumb(node.getAttribute("id"), display, icon, true));
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java
index a7eebd0..8e39647 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java
@@ -61,7 +61,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
*/
public class ResourceAutodiscoveryView extends LocatableVLayout {
private static final String TITLE = MSG.view_autoDiscoveryQ_title();
- private static final String HEADER_ICON = "global/Recent_16.png";
+ private static final String HEADER_ICON = "global/Recent_24.png";
private boolean simple;
private TreeGrid treeGrid;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/PluginTypeTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/PluginTypeTreeView.java
index cfa47e2..4cb5747 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/PluginTypeTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/PluginTypeTreeView.java
@@ -29,6 +29,7 @@ import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -89,20 +90,13 @@ public class PluginTypeTreeView extends LocatableVLayout {
protected String getIcon(Record record, boolean defaultState) {
if (record instanceof TreeNode) {
- boolean open = getTree().isOpen((TreeNode) record);
+ //boolean open = getTree().isOpen((TreeNode) record);
if (record instanceof ResourceTypePluginTreeDataSource.ResourceTypeTreeNode) {
ResourceType resourceType = ((ResourceTypePluginTreeDataSource.ResourceTypeTreeNode) record)
.getResourceType();
- switch (resourceType.getCategory()) {
- case PLATFORM:
- return "types/Platform_up_16.png";
- case SERVER:
- return "types/Server_up_16.png";
- case SERVICE:
- return "types/Service_up_16.png";
- }
+ return ImageManager.getResourceIcon(resourceType.getCategory());
} else if (record instanceof ResourceTypePluginTreeDataSource.PluginTreeNode) {
return "types/plugin_16.png";
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeView.java
index 99aa414..32664db 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeView.java
@@ -29,6 +29,7 @@ import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTreeGrid;
@@ -101,15 +102,7 @@ public class ResourceTypeTreeView extends LocatableVLayout {
if (record instanceof ResourceTypeTreeDataSource.ResourceTypeTreeNode) {
ResourceType resourceType = ((ResourceTypeTreeDataSource.ResourceTypeTreeNode) record)
.getResourceType();
-
- switch (resourceType.getCategory()) {
- case PLATFORM:
- return "types/Platform_up_16.png";
- case SERVER:
- return "types/Server_up_16.png";
- case SERVICE:
- return "types/Service_up_16.png";
- }
+ return ImageManager.getResourceIcon(resourceType.getCategory());
} else if (record instanceof ResourceTypeTreeDataSource.PluginTreeNode) {
return "types/plugin_16.png";
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
index eab6d06..f6518f5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
@@ -29,6 +29,8 @@ import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.layout.VLayout;
+import org.rhq.core.domain.resource.ResourceCategory;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView;
import org.rhq.enterprise.gui.coregui.client.admin.templates.ResourceTypeTreeView;
import org.rhq.enterprise.gui.coregui.client.alert.AlertHistoryView;
@@ -150,12 +152,12 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView {
}
});
- NavigationItem platformSystemInfoItem = new NavigationItem(PlatformPortletView.VIEW_ID,
- "types/Platform_up_16.png", new ViewFactory() {
- public Canvas createView() {
- return new PlatformPortletView(extendLocatorId(PlatformPortletView.VIEW_ID.getName()));
- }
- });
+ NavigationItem platformSystemInfoItem = new NavigationItem(PlatformPortletView.VIEW_ID, ImageManager
+ .getResourceIcon(ResourceCategory.PLATFORM), new ViewFactory() {
+ public Canvas createView() {
+ return new PlatformPortletView(extendLocatorId(PlatformPortletView.VIEW_ID.getName()));
+ }
+ });
return new NavigationSection(SECTION_INVENTORY_VIEW_ID, inventorySummaryItem, platformSystemInfoItem);
}
