modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ResourceGroupComposite.java
| 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
| 145 ++++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java
| 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
| 22 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
| 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
| 22 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
| 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/BooleanCellFormatter.java
| 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java
| 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java
| 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java
| 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
| 110 +++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
| 31 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
| 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java
| 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java
| 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
| 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java
| 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
| 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java
| 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java
| 56 ++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java
| 43 +-
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_16.png
|binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_24.png
|binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_failed_16.png
|binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_inprogress_16.png
|binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_ok_16.png
|binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_warning_16.png
|binary
29 files changed, 340 insertions(+), 222 deletions(-)
New commits:
commit 2997f48c5f49656b03a51d57634e29845a3875d6
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Nov 29 14:15:33 2010 -0500
use the new ImageManager to obtain icon urls.
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 cae33a9..1c0ff4d 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
@@ -30,6 +30,7 @@ import org.rhq.core.domain.resource.composite.ResourceFacets;
import org.rhq.core.domain.resource.composite.ResourcePermission;
import org.rhq.core.domain.resource.group.GroupCategory;
import org.rhq.core.domain.resource.group.ResourceGroup;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
/**
* @author Greg Hinkle
@@ -186,12 +187,13 @@ public class ResourceGroupComposite implements Serializable {
StringBuilder results = new StringBuilder();
results.append("<table width=\"120px\"><tr>");
if (up == 0 && down == 0) {
- results.append(getColumn(false, "<img
src=\"/images/icons/availability_grey_16.png\" /> 0"));
+ results.append(getColumn(false, "<img src=\"" +
ImageManager.getAvailabilityIcon(null) + "\" /> 0"));
results.append(getColumn(true));
results.append(getColumn(false));
} else {
if (up > 0) {
- results.append(getColumn(false, " <img
src=\"/images/icons/availability_green_16.png\" />", up));
+ results.append(getColumn(false, " <img src=\"" +
ImageManager.getAvailabilityIcon(Boolean.TRUE)
+ + "\" />", up));
}
if (up > 0 && down > 0) {
@@ -199,7 +201,8 @@ public class ResourceGroupComposite implements Serializable {
}
if (down > 0) {
- results.append(getColumn(false, " <img
src=\"/images/icons/availability_red_16.png\" />", down));
+ results.append(getColumn(false, " <img src=\"" +
ImageManager.getAvailabilityIcon(Boolean.FALSE)
+ + "\" />", down));
} else {
results.append(getColumn(false,
" <img src=\"/images/blank.png\"
width=\"16px\" height=\"16px\" />"));
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
new file mode 100644
index 0000000..3975f98
--- /dev/null
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
@@ -0,0 +1,145 @@
+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.resource.group.GroupCategory;
+
+/**
+ * Provides an API to obtain links to images and icons, thus avoiding hardcoding image
URLs throughout client code.
+ *
+ * For each icon, there is typically a small and large version (16x16 and 24x24). To
obtain the smaller icon,
+ * you use the "getXXXIcon" methods and to obtain the larger icon you use the
"getXXXLargeIcon" method.
+ *
+ * @author John Mazzitelli
+ *
+ */
+public class ImageManager {
+ /**
+ * Returns the large 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.
+ *
+ * If avails is null, this means there are no resources in the group. In that
+ * case, this method returns the "UP" badged icon.
+ *
+ * @param groupType the type of group
+ * @param avails percentage of resources that are UP
+ * @return the group badge icon
+ */
+ public static String getGroupLargeIcon(GroupCategory groupType, Double avails) {
+ String category = groupType == GroupCategory.COMPATIBLE ? "Cluster" :
"Group";
+
+ if (avails == null) {
+ return "types/" + category + "_up_24.png";
+ }
+
+ double val = avails.doubleValue();
+
+ if (val == 0.0d) {
+ return "types/" + category + "_down_24.png";
+ } else if (val > 0.0d && val < 1.0d) {
+ return "types/" + category + "_warning_24.png";
+ } else {
+ return "types/" + category + "_up_24.png";
+ }
+ }
+
+ public static String getAvailabilityIconFromAvailType(AvailabilityType availType) {
+ return getAvailabilityIcon((availType != null) ? Boolean.valueOf(availType ==
AvailabilityType.UP) : null);
+ }
+
+ public static String getAvailabilityLargeIconFromAvailType(AvailabilityType
availType) {
+ return getAvailabilityLargeIcon((availType != null) ? Boolean.valueOf(availType
== AvailabilityType.UP) : null);
+ }
+
+ /**
+ * Given a Boolean to indicate if something is to be considered available or
unavailable, the appropriate
+ * availability icon is returned. If the given Boolean is null, the availability will
be considered unknown
+ * and thus the unknown/question icon is returned.
+ *
+ * @param avail
+ * @return the avail icon
+ */
+ public static String getAvailabilityIcon(Boolean avail) {
+ return "subsystems/availability/availability_" + ((avail == null) ?
"grey" : (avail ? "green" : "red"))
+ + "_16.png";
+ }
+
+ public static String getAvailabilityLargeIcon(Boolean avail) {
+ return "subsystems/availability/availability_" + ((avail == null) ?
"grey" : (avail ? "green" : "red"))
+ + "_24.png";
+ }
+
+ /**
+ * Returns the large availability icon based on the given percentage.
+ * Avails is the percentage of availabilities that are UP. If avails is 0, it is
+ * red (nothing is available), if it is 1, it is green (everything is available),
+ * if it is between 0 and 1, it is yellow.
+ *
+ * If avails is null, the icon will be the unknown/grey form.
+ *
+ * @param avails percentage of availabilities that are UP
+ * @return the large availability icon
+ */
+ public static String getAvailabilityGroupLargeIcon(Double avails) {
+ if (avails == null) {
+ return "subsystems/availability/availability_grey_24.png";
+ }
+
+ double val = avails.doubleValue();
+
+ if (val == 0.0d) {
+ return "subsystems/availability/availability_red_24.png";
+ } else if (val > 0.0d && val < 1.0d) {
+ return "subsystems/availability/availability_yellow_24.png";
+ } else {
+ return "subsystems/availability/availability_green_24.png";
+ }
+ }
+
+ public static String getAvailabilityYellowIcon() {
+ return "subsystems/availability/availability_yellow_16.png";
+ }
+
+ public static String getAvailabilityYellowLargeIcon() {
+ return "subsystems/availability/availability_yellow_24.png";
+ }
+
+ public static String getAlertIcon(AlertPriority priority) {
+ return "subsystems/alert/Alert_" + priority.name() +
"_16.png";
+ }
+
+ public static String getAlertIcon() {
+ return "subsystems/alert/Alert_16.png";
+ }
+
+ public static String getAlertLargeIcon() {
+ return "subsystems/alert/Flag_blue_24.png";
+ }
+
+ public static String getAlertEditIcon() {
+ return "subsystems/alert/Edit_Alert.png";
+ }
+
+ public static String getPluginConfigurationIcon(ConfigurationUpdateStatus
updateStatus) {
+ if (updateStatus != null) {
+ switch (updateStatus) {
+ case SUCCESS: {
+ return "subsystems/inventory/Connection_ok_16.png";
+ }
+ case FAILURE: {
+ return "subsystems/inventory/Connection_failed_16.png";
+ }
+ case INPROGRESS: {
+ return "subsystems/inventory/Connection_inprogress_16.png";
+ }
+ case NOCHANGE:
+ return "subsystems/inventory/Connection_16.png";
+ }
+ }
+
+ return "subsystems/inventory/Connection_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 ae4b755..9e6e2d9 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
@@ -43,6 +43,7 @@ import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.ResourceType;
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.LinkManager;
import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
@@ -223,7 +224,7 @@ public class ResourceTypeTreeView extends LocatableVLayout implements
Bookmarkab
});
}
- private void editMetricTemplate(int resourceTypeId) {
+ private void editMetricTemplate(int resourceTypeId) {
Layout metricCanvas = getMetricTemplateCanvas();
TemplateSchedulesView templateSchedulesView = new
TemplateSchedulesView(extendLocatorId("MetricTemplate"),
resourceTypeId);
@@ -307,7 +308,7 @@ public class ResourceTypeTreeView extends LocatableVLayout implements
Bookmarkab
alertTemplateImg.setShowDown(false);
alertTemplateImg.setShowRollOver(false);
alertTemplateImg.setLayoutAlign(Alignment.CENTER);
- alertTemplateImg.setSrc("subsystems/alert/Edit_Alert.png");
+ alertTemplateImg.setSrc(ImageManager.getAlertEditIcon());
alertTemplateImg.setPrompt("Edit Alert Template");
alertTemplateImg.setHeight(16);
alertTemplateImg.setWidth(16);
@@ -403,7 +404,7 @@ public class ResourceTypeTreeView extends LocatableVLayout implements
Bookmarkab
alertTemplateImg.setShowDown(false);
alertTemplateImg.setShowRollOver(false);
alertTemplateImg.setLayoutAlign(Alignment.CENTER);
- alertTemplateImg.setSrc("subsystems/alert/Edit_Alert.png");
+ alertTemplateImg.setSrc(ImageManager.getAlertEditIcon());
alertTemplateImg.setPrompt("Edit Alert Template");
alertTemplateImg.setHeight(16);
alertTemplateImg.setWidth(16);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
index b7fdeb5..98951c0 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
@@ -50,6 +50,7 @@ import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.AlertCriteria;
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.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.gwt.AlertGWTServiceAsync;
@@ -67,9 +68,9 @@ public class AlertDataSource extends RPCDataSource<Alert> {
private EntityContext entityContext;
- private static final String PRIORITY_ICON_HIGH =
"/images/icons/Flag_red_16.png";
- private static final String PRIORITY_ICON_MEDIUM =
"/images/icons/Flag_yellow_16.png";
- private static final String PRIORITY_ICON_LOW =
"/images/icons/Flag_blue_16.png";
+ private static final String PRIORITY_ICON_HIGH =
ImageManager.getAlertIcon(AlertPriority.HIGH);
+ private static final String PRIORITY_ICON_MEDIUM =
ImageManager.getAlertIcon(AlertPriority.MEDIUM);
+ private static final String PRIORITY_ICON_LOW =
ImageManager.getAlertIcon(AlertPriority.LOW);
public AlertDataSource() {
this(EntityContext.forSubsystemView());
@@ -227,20 +228,7 @@ public class AlertDataSource extends RPCDataSource<Alert> {
record.setAttribute("resourceId",
from.getAlertDefinition().getResource().getId());
record.setAttribute("resourceName",
from.getAlertDefinition().getResource().getName());
record.setAttribute("name", from.getAlertDefinition().getName());
- switch (from.getAlertDefinition().getPriority()) {
- case HIGH: {
- record.setAttribute("priority", PRIORITY_ICON_HIGH);
- break;
- }
- case MEDIUM: {
- record.setAttribute("priority", PRIORITY_ICON_MEDIUM);
- break;
- }
- case LOW: {
- record.setAttribute("priority", PRIORITY_ICON_LOW);
- break;
- }
- }
+ record.setAttribute("priority",
ImageManager.getAlertIcon(from.getAlertDefinition().getPriority()));
Set<AlertConditionLog> conditionLogs = from.getConditionLogs();
String conditionText;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
index afa4cdc..3384ed7 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
@@ -35,6 +35,7 @@ import org.rhq.core.domain.alert.AlertPriority;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.AlertCriteria;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
@@ -88,9 +89,9 @@ public class AlertHistoryView extends TableSection {
priorities.put(AlertPriority.MEDIUM.name(), MSG.common_alert_medium());
priorities.put(AlertPriority.LOW.name(), MSG.common_alert_low());
LinkedHashMap<String, String> priorityIcons = new LinkedHashMap<String,
String>(3);
- priorityIcons.put(AlertPriority.HIGH.name(),
"/images/icons/Flag_red_16.png");
- priorityIcons.put(AlertPriority.MEDIUM.name(),
"/images/icons/Flag_yellow_16.png");
- priorityIcons.put(AlertPriority.LOW.name(),
"/images/icons/Flag_blue_16.png");
+ priorityIcons.put(AlertPriority.HIGH.name(),
ImageManager.getAlertIcon(AlertPriority.HIGH));
+ priorityIcons.put(AlertPriority.MEDIUM.name(),
ImageManager.getAlertIcon(AlertPriority.MEDIUM));
+ priorityIcons.put(AlertPriority.LOW.name(),
ImageManager.getAlertIcon(AlertPriority.LOW));
priorityFilter.setValueMap(priorities);
priorityFilter.setValueIcons(priorityIcons);
priorityFilter.setValues(AlertPriority.HIGH.name(), AlertPriority.MEDIUM.name(),
AlertPriority.LOW.name());
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
index aa59e54..a07566c 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
@@ -42,6 +42,7 @@ import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.criteria.AlertDefinitionCriteria;
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.util.RPCDataSource;
@@ -146,26 +147,9 @@ public abstract class AbstractAlertDefinitionsDataSource extends
RPCDataSource<A
record.setAttribute(FIELD_DESCRIPTION, from.getDescription());
record.setAttribute(FIELD_CTIME, new Date(from.getCtime()));
record.setAttribute(FIELD_MTIME, new Date(from.getMtime()));
- if (from.getEnabled()) {
- record.setAttribute(FIELD_ENABLED,
"/images/icons/availability_green_16.png");
- } else {
- record.setAttribute(FIELD_ENABLED,
"/images/icons/availability_red_16.png");
- }
+ record.setAttribute(FIELD_ENABLED,
ImageManager.getAvailabilityIcon(from.getEnabled()));
record.setAttribute(FIELD_DELETED, from.getDeleted());
- switch (from.getPriority()) {
- case HIGH: {
- record.setAttribute(FIELD_PRIORITY,
"/images/icons/Flag_red_16.png");
- break;
- }
- case MEDIUM: {
- record.setAttribute(FIELD_PRIORITY,
"/images/icons/Flag_yellow_16.png");
- break;
- }
- case LOW: {
- record.setAttribute(FIELD_PRIORITY,
"/images/icons/Flag_blue_16.png");
- break;
- }
- }
+ record.setAttribute(FIELD_PRIORITY,
ImageManager.getAlertIcon(from.getPriority()));
record.setAttribute(FIELD_OBJECT, from);
return record;
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
index ca4c3ce..90f09f4 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
@@ -33,6 +33,7 @@ import com.smartgwt.client.widgets.form.fields.TextItem;
import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.alert.AlertPriority;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
/**
@@ -220,9 +221,9 @@ public class GeneralPropertiesAlertDefinitionForm extends
LocatableDynamicForm i
priorities.put(AlertPriority.MEDIUM.name(), MSG.common_alert_medium());
priorities.put(AlertPriority.LOW.name(), MSG.common_alert_low());
LinkedHashMap<String, String> priorityIcons = new
LinkedHashMap<String, String>(3);
- priorityIcons.put(AlertPriority.HIGH.name(),
"/images/icons/Flag_red_16.png");
- priorityIcons.put(AlertPriority.MEDIUM.name(),
"/images/icons/Flag_yellow_16.png");
- priorityIcons.put(AlertPriority.LOW.name(),
"/images/icons/Flag_blue_16.png");
+ priorityIcons.put(AlertPriority.HIGH.name(),
ImageManager.getAlertIcon(AlertPriority.HIGH));
+ priorityIcons.put(AlertPriority.MEDIUM.name(),
ImageManager.getAlertIcon(AlertPriority.MEDIUM));
+ priorityIcons.put(AlertPriority.LOW.name(),
ImageManager.getAlertIcon(AlertPriority.LOW));
prioritySelection.setValueMap(priorities);
prioritySelection.setValueIcons(priorityIcons);
prioritySelection.setDefaultValue(AlertPriority.MEDIUM.name());
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/BooleanCellFormatter.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/BooleanCellFormatter.java
index 7f22af9..16d2891 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/BooleanCellFormatter.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/BooleanCellFormatter.java
@@ -3,20 +3,17 @@ package org.rhq.enterprise.gui.coregui.client.components.table;
import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGridRecord;
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.Messages;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
/**
- * Formats a Boolean value as "yes" or "no".
+ * Formats a Boolean value as "yes" or "no" image.
*
* @author Ian Springer
*/
public class BooleanCellFormatter implements CellFormatter {
- private static final Messages MSG = CoreGUI.getMessages();
-
- private static String RED = "/images/icons/availability_red_16.png";
- private static String GREEN = "/images/icons/availability_green_16.png";
- private static String GREY = "/images/icons/availability_grey_16.png";
+ private static String RED = ImageManager.getAvailabilityIcon(Boolean.FALSE);
+ private static String GREEN = ImageManager.getAvailabilityIcon(Boolean.TRUE);
+ private static String GREY = ImageManager.getAvailabilityIcon(null);
public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
String result;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java
index 62aba36..e2ae778 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java
@@ -35,6 +35,7 @@ import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
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.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
@@ -86,17 +87,17 @@ public class FileUploadForm extends DynamicCallbackForm {
iconLoading.setHeight(16);
iconGreen = new FormItemIcon();
- iconGreen.setSrc("/images/icons/availability_green_16.png");
+ iconGreen.setSrc(ImageManager.getAvailabilityIcon(Boolean.TRUE));
iconGreen.setWidth(16);
iconGreen.setHeight(16);
iconRed = new FormItemIcon();
- iconRed.setSrc("/images/icons/availability_red_16.png");
+ iconRed.setSrc(ImageManager.getAvailabilityIcon(Boolean.FALSE));
iconRed.setWidth(16);
iconRed.setHeight(16);
iconGrey = new FormItemIcon();
- iconGrey.setSrc("/images/icons/availability_grey_16.png");
+ iconGrey.setSrc(ImageManager.getAvailabilityIcon(null));
iconGrey.setWidth(16);
iconGrey.setHeight(16);
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java
index e91a4a2..3eae1f8 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java
@@ -30,6 +30,7 @@ import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
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.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
@@ -104,10 +105,10 @@ public class TextFileRetrieverForm extends DynamicCallbackForm {
if (uploadButton != null) {
FormItemIcon loadedIcon = new FormItemIcon();
if (ok) {
- loadedIcon.setSrc("/images/icons/availability_green_16.png");
+ loadedIcon.setSrc(ImageManager.getAvailabilityIcon(Boolean.TRUE));
CoreGUI.getMessageCenter().notify(new Message(MSG.view_upload_success(),
Severity.Info));
} else {
- loadedIcon.setSrc("/images/icons/availability_red_16.png");
+ loadedIcon.setSrc(ImageManager.getAvailabilityIcon(Boolean.FALSE));
CoreGUI.getMessageCenter().notify(new
Message(MSG.view_upload_error_file(), Severity.Error));
}
loadedIcon.setWidth(16);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java
index d7a545b..db6a3ec 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java
@@ -38,11 +38,11 @@ import com.smartgwt.client.types.DSDataFormat;
import com.smartgwt.client.types.DSProtocol;
import com.smartgwt.client.widgets.tree.TreeNode;
-import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.composite.RecentlyAddedResourceComposite;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.Messages;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
@@ -208,10 +208,8 @@ public class RecentlyAddedResourceDS extends DataSource {
setAttribute("parentId", parentId);
setAttribute("name", resource.getName());
setAttribute("timestamp",
"");//String.valueOf(resource.getItime())); // Seems to be null
- setAttribute(
- "currentAvailability",
- resource.getCurrentAvailability().getAvailabilityType() ==
AvailabilityType.UP ? "/images/icons/availability_green_16.png"
- : "/images/icons/availability_red_16.png");
+ setAttribute("currentAvailability",
ImageManager.getAvailabilityIconFromAvailType(resource
+ .getCurrentAvailability().getAvailabilityType()));
}
public Resource getResource() {
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 94865f8..cada640 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
@@ -140,35 +140,35 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
protected List<TwoLevelTab> createTabs() {
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");
- 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.view_tabs_common_timeline()), null);
+ summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"),
new ViewName("Summary", MSG
+ .view_tabs_common_summary()), "/images/icons/Service_up_16.png");
+ 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
+ .view_tabs_common_timeline()), null);
summaryTab.registerSubTabs(summaryOverview, summaryTimeline);
tabs.add(summaryTab);
- monitoringTab = new
TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), new
ViewName("Monitoring",
- MSG.view_tabs_common_monitoring()),
"/images/icons/Monitor_grey_16.png");
- monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), new
ViewName("Graphs",
- MSG.view_tabs_common_graphs()), null);
- monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), new
ViewName("Tables",
- MSG.view_tabs_common_tables()), null);
- monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), new
ViewName("Traits",
- MSG.view_tabs_common_traits()), null);
-
- monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"),
new ViewName("Schedules",
- MSG.view_tabs_common_schedules()), null);
- monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"),
new ViewName("CallTime",
- MSG.view_tabs_common_calltime()), null);
+ monitoringTab = new
TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), new
ViewName("Monitoring", MSG
+ .view_tabs_common_monitoring()),
"/images/icons/Monitor_grey_16.png");
+ monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), new
ViewName("Graphs", MSG
+ .view_tabs_common_graphs()), null);
+ monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), new
ViewName("Tables", MSG
+ .view_tabs_common_tables()), null);
+ monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), new
ViewName("Traits", MSG
+ .view_tabs_common_traits()), null);
+
+ monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"),
new ViewName("Schedules", MSG
+ .view_tabs_common_schedules()), null);
+ monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"),
new ViewName("CallTime", MSG
+ .view_tabs_common_calltime()), null);
monitoringTab.registerSubTabs(monitorGraphs, monitorTables, monitorTraits,
monitorSched, monitorCallTime);
tabs.add(monitoringTab);
- inventoryTab = new
TwoLevelTab(getTabSet().extendLocatorId("Inventory"), new
ViewName("Inventory",
- MSG.view_tabs_common_inventory()),
"/images/icons/Inventory_grey_16.png");
- inventoryMembers = new SubTab(inventoryTab.extendLocatorId("Members"),
new ViewName("Members",
- MSG.view_tabs_common_members()), null);
+ inventoryTab = new
TwoLevelTab(getTabSet().extendLocatorId("Inventory"), new
ViewName("Inventory", MSG
+ .view_tabs_common_inventory()),
"/images/icons/Inventory_grey_16.png");
+ inventoryMembers = new SubTab(inventoryTab.extendLocatorId("Members"),
new ViewName("Members", MSG
+ .view_tabs_common_members()), null);
inventoryConn = new
SubTab(inventoryTab.extendLocatorId("ConnectionSettings"), new ViewName(
"ConnectionSettings", MSG.view_tabs_common_connectionSettings()),
null);
inventoryConnHistory = new
SubTab(inventoryTab.extendLocatorId("ConnectionSettingsHistory"), new ViewName(
@@ -176,37 +176,37 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
inventoryTab.registerSubTabs(this.inventoryMembers, this.inventoryConn,
this.inventoryConnHistory);
tabs.add(inventoryTab);
- operationsTab = new
TwoLevelTab(getTabSet().extendLocatorId("Operations"), new
ViewName("Operations",
- MSG.view_tabs_common_operations()),
"/images/icons/Operation_grey_16.png");
- this.opHistory = new SubTab(operationsTab.extendLocatorId("History"),
new ViewName("History",
- MSG.view_tabs_common_history()), null);
- this.opSched = new SubTab(operationsTab.extendLocatorId("Scheduled"),
new ViewName("Scheduled",
- MSG.view_tabs_common_scheduled()), null);
+ operationsTab = new
TwoLevelTab(getTabSet().extendLocatorId("Operations"), new
ViewName("Operations", MSG
+ .view_tabs_common_operations()),
"/images/icons/Operation_grey_16.png");
+ this.opHistory = new SubTab(operationsTab.extendLocatorId("History"),
new ViewName("History", MSG
+ .view_tabs_common_history()), null);
+ this.opSched = new SubTab(operationsTab.extendLocatorId("Scheduled"),
new ViewName("Scheduled", MSG
+ .view_tabs_common_scheduled()), null);
operationsTab.registerSubTabs(this.opHistory, this.opSched);
tabs.add(operationsTab);
- alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), new
ViewName("Alerts",
- MSG.view_tabs_common_alerts()),
"/images/icons/Alert_grey_16.png");
- this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"),
new ViewName("History",
- MSG.view_tabs_common_history()), null);
- this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"),
new ViewName("Definitions",
- MSG.view_tabs_common_definitions()), null);
+ alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), new
ViewName("Alerts", MSG
+ .view_tabs_common_alerts()), "/images/icons/Alert_grey_16.png");
+ this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"),
new ViewName("History", MSG
+ .view_tabs_common_history()), null);
+ this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"),
new ViewName("Definitions", MSG
+ .view_tabs_common_definitions()), null);
alertsTab.registerSubTabs(alertHistory, alertDef);
tabs.add(alertsTab);
configurationTab = new
TwoLevelTab(getTabSet().extendLocatorId("Configuration"), new
ViewName("Configuration",
MSG.view_tabs_common_configuration()),
"/images/icons/Configure_grey_16.png");
- this.configCurrent = new
SubTab(configurationTab.extendLocatorId("Current"), new
ViewName("Current",
- MSG.view_tabs_common_current()), null);
- this.configHistory = new
SubTab(configurationTab.extendLocatorId("History"), new
ViewName("History",
- MSG.view_tabs_common_history()), null);
+ this.configCurrent = new
SubTab(configurationTab.extendLocatorId("Current"), new
ViewName("Current", MSG
+ .view_tabs_common_current()), null);
+ this.configHistory = new
SubTab(configurationTab.extendLocatorId("History"), new
ViewName("History", MSG
+ .view_tabs_common_history()), null);
configurationTab.registerSubTabs(this.configCurrent, this.configHistory);
tabs.add(configurationTab);
- eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), new
ViewName("Events",
- MSG.view_tabs_common_events()),
"/images/icons/Events_grey_16.png");
- this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"),
new ViewName("History",
- MSG.view_tabs_common_history()), null);
+ eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), new
ViewName("Events", MSG
+ .view_tabs_common_events()), "/images/icons/Events_grey_16.png");
+ this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"),
new ViewName("History", MSG
+ .view_tabs_common_history()), null);
eventsTab.registerSubTabs(eventHistory);
tabs.add(eventsTab);
@@ -221,7 +221,7 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
this.groupComposite = groupComposite;
ResourceGroup group = groupComposite.getResourceGroup();
int groupId = group.getId();
- getTitleBar().setGroup(group);
+ getTitleBar().setGroup(groupComposite);
for (Tab top : this.getTabSet().getTabs()) {
((TwoLevelTab) top).getLayout().destroyViews();
@@ -234,8 +234,8 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
// summaryTab.updateSubTab("Overview", new
DashboardView(resource));
// summaryTab.updateSubTab("Timeline", timelinePane);
// Summary tab is always visible and enabled.
- updateSubTab(this.summaryTab, this.summaryOverview,
- new OverviewView(this.summaryOverview.extendLocatorId("View"),
this.groupComposite), true, true);
+ updateSubTab(this.summaryTab, this.summaryOverview, new
OverviewView(this.summaryOverview
+ .extendLocatorId("View"), this.groupComposite), true, true);
if (updateTab(this.monitoringTab, groupCategory == GroupCategory.COMPATIBLE,
true)) {
visible = hasMetricsOfType(this.groupComposite, DataType.MEASUREMENT);
@@ -274,8 +274,8 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
this.inventoryConnHistory.extendLocatorId("View"),
this.groupComposite), facets
.contains(ResourceTypeFacet.PLUGIN_CONFIGURATION), true);
- if (updateTab(this.operationsTab,
- groupCategory == GroupCategory.COMPATIBLE &&
facets.contains(ResourceTypeFacet.OPERATION), true)) {
+ if (updateTab(this.operationsTab, groupCategory == GroupCategory.COMPATIBLE
+ && facets.contains(ResourceTypeFacet.OPERATION), true)) {
updateSubTab(this.operationsTab, this.opHistory, new
FullHTMLPane(this.opHistory.extendLocatorId("View"),
"/rhq/group/operation/groupOperationHistory-plain.xhtml?groupId=" + groupId),
true, true);
updateSubTab(this.operationsTab, this.opSched, new
FullHTMLPane(this.opSched.extendLocatorId("View"),
@@ -285,8 +285,8 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
// alerts tab is always visible, even for mixed groups
if (updateTab(this.alertsTab, true, true)) {
// alert history is always available
- updateSubTab(this.alertsTab, this.alertHistory,
-
GroupAlertHistoryView.get(this.alertHistory.extendLocatorId("View"),
groupComposite), true, true);
+ updateSubTab(this.alertsTab, this.alertHistory,
GroupAlertHistoryView.get(this.alertHistory
+ .extendLocatorId("View"), groupComposite), true, true);
// but alert definitions can only be created on compatible groups
visible = (groupCategory == GroupCategory.COMPATIBLE);
canvas = (visible) ? new
GroupAlertDefinitionsView(alertDef.extendLocatorId("View"),
this.groupComposite)
@@ -301,16 +301,16 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
// "/rhq/group/configuration/viewCurrent-plain.xhtml?groupId=" +
groupId), true, true);
updateSubTab(this.configurationTab, this.configCurrent, new
GroupResourceConfigurationEditView(
this.configCurrent.extendLocatorId("View"),
this.groupComposite), true, true);
- updateSubTab(this.configurationTab, this.configHistory,
- new FullHTMLPane(this.configHistory.extendLocatorId("View"),
- "/rhq/group/configuration/history-plain.xhtml?groupId=" +
groupId), true, true);
+ updateSubTab(this.configurationTab, this.configHistory, new
FullHTMLPane(this.configHistory
+ .extendLocatorId("View"),
"/rhq/group/configuration/history-plain.xhtml?groupId=" + groupId), true,
+ true);
}
// allow mixed groups to show events from supporting resources
visible = groupCategory == GroupCategory.MIXED
|| (groupCategory == GroupCategory.COMPATIBLE &&
facets.contains(ResourceTypeFacet.EVENT));
if (updateTab(this.eventsTab, visible, true)) {
- updateSubTab(this.eventsTab, this.eventHistory,
-
EventCompositeHistoryView.get(this.eventHistory.extendLocatorId("View"),
groupComposite), true, true);
+ updateSubTab(this.eventsTab, this.eventHistory,
EventCompositeHistoryView.get(this.eventHistory
+ .extendLocatorId("View"), groupComposite), true, true);
}
this.show();
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 a623c4b..a81f98e 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,12 +32,12 @@ 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;
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.components.tagging.TagEditorView;
import org.rhq.enterprise.gui.coregui.client.components.tagging.TagsChangedCallback;
@@ -89,7 +89,7 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
this.title = new HTMLFlow();
this.title.setWidth("*");
- this.availabilityImage = new Img("resources/availability_grey_24.png",
24, 24);
+ this.availabilityImage = new Img(ImageManager.getAvailabilityLargeIcon(null), 24,
24);
this.favoriteButton = new
LocatableImg(this.extendLocatorId("Favorite"), NOT_FAV_ICON, 24, 24);
@@ -119,7 +119,11 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
.valueOf(ResourceGroupTitleBar.this.group.getId())));
return;
}
- generalProperties = new
GeneralProperties(extendLocatorId("genProps"), result.get(0));
+
+ ResourceGroupComposite resultComposite = result.get(0);
+ setGroupIcons(resultComposite);
+
+ generalProperties = new
GeneralProperties(extendLocatorId("genProps"), resultComposite);
generalProperties.setVisible(false);
ResourceGroupTitleBar.this.addMember(generalProperties);
expandCollapseArrow.addClickHandler(new ClickHandler() {
@@ -202,8 +206,8 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
});
}
- public void setGroup(ResourceGroup group) {
- this.group = group;
+ public void setGroup(ResourceGroupComposite groupComposite) {
+ this.group = groupComposite.getResourceGroup();
update();
this.title.setContents("<span class=\"SectionHeader\">"
+ group.getName()
@@ -213,19 +217,16 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
this.favorite = favorites.contains(group.getId());
updateFavoriteButton();
- this.availabilityImage.setSrc("resources/availability_" + (true ?
"green" : "red") + //todo
- "_24.png");
-
- String category = this.group.getGroupCategory() == GroupCategory.COMPATIBLE ?
"Cluster" : "Group";
-
- String avail = "up"; // todo
- // (resource.getCurrentAvailability() != null &&
resource.getCurrentAvailability().getAvailabilityType() != null)
- // ?
(resource.getCurrentAvailability().getAvailabilityType().name().toLowerCase()) :
"down";
- badge.setSrc("types/" + category + "_" + avail +
"_24.png");
-
+ setGroupIcons(groupComposite);
markForRedraw();
}
+ private void setGroupIcons(ResourceGroupComposite groupComposite) {
+ Double avails = groupComposite.getExplicitAvail();
+ this.badge.setSrc(ImageManager.getGroupLargeIcon(this.group.getGroupCategory(),
avails));
+
this.availabilityImage.setSrc(ImageManager.getAvailabilityGroupLargeIcon(avails));
+ }
+
private void updateFavoriteButton() {
this.favoriteButton.setSrc(favorite ? FAV_ICON : NOT_FAV_ICON);
if (favorite) {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
index 32f363f..7567f58 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
@@ -46,6 +46,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.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
@@ -112,10 +113,14 @@ public class HistoryGroupPluginConfigurationMembers extends
LocatableVLayout {
fieldStatus.setType(ListGridFieldType.ICON);
HashMap<String, String> statusIcons = new HashMap<String,
String>(4);
- statusIcons.put(ConfigurationUpdateStatus.SUCCESS.name(),
"/images/icons/Connection_ok_16.png");
- statusIcons.put(ConfigurationUpdateStatus.FAILURE.name(),
"/images/icons/Connection_failed_16.png");
- statusIcons.put(ConfigurationUpdateStatus.INPROGRESS.name(),
"/images/icons/Connection_inprogress_16.png");
- statusIcons.put(ConfigurationUpdateStatus.NOCHANGE.name(),
"/images/icons/Connection_16.png");
+ statusIcons.put(ConfigurationUpdateStatus.SUCCESS.name(), ImageManager
+ .getPluginConfigurationIcon(ConfigurationUpdateStatus.SUCCESS));
+ statusIcons.put(ConfigurationUpdateStatus.FAILURE.name(), ImageManager
+ .getPluginConfigurationIcon(ConfigurationUpdateStatus.FAILURE));
+ statusIcons.put(ConfigurationUpdateStatus.INPROGRESS.name(), ImageManager
+ .getPluginConfigurationIcon(ConfigurationUpdateStatus.INPROGRESS));
+ statusIcons.put(ConfigurationUpdateStatus.NOCHANGE.name(), ImageManager
+ .getPluginConfigurationIcon(ConfigurationUpdateStatus.NOCHANGE));
fieldStatus.setValueIcons(statusIcons);
fieldStatus.addRecordClickHandler(new RecordClickHandler() {
@Override
@@ -169,7 +174,6 @@ public class HistoryGroupPluginConfigurationMembers extends
LocatableVLayout {
listGrid.setLinkTextProperty("resourceName");
-
}
private String getStatusHtmlString(Record record) {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java
index 4639767..11149f9 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java
@@ -48,6 +48,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.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
@@ -92,10 +93,14 @@ public class HistoryGroupPluginConfigurationTable extends Table {
fieldStatus.setType(ListGridFieldType.ICON);
HashMap<String, String> statusIcons = new HashMap<String,
String>(4);
- statusIcons.put(ConfigurationUpdateStatus.SUCCESS.name(),
"/images/icons/Connection_ok_16.png");
- statusIcons.put(ConfigurationUpdateStatus.FAILURE.name(),
"/images/icons/Connection_failed_16.png");
- statusIcons.put(ConfigurationUpdateStatus.INPROGRESS.name(),
"/images/icons/Connection_inprogress_16.png");
- statusIcons.put(ConfigurationUpdateStatus.NOCHANGE.name(),
"/images/icons/Connection_16.png");
+ statusIcons.put(ConfigurationUpdateStatus.SUCCESS.name(), ImageManager
+ .getPluginConfigurationIcon(ConfigurationUpdateStatus.SUCCESS));
+ statusIcons.put(ConfigurationUpdateStatus.FAILURE.name(), ImageManager
+ .getPluginConfigurationIcon(ConfigurationUpdateStatus.FAILURE));
+ statusIcons.put(ConfigurationUpdateStatus.INPROGRESS.name(), ImageManager
+ .getPluginConfigurationIcon(ConfigurationUpdateStatus.INPROGRESS));
+ statusIcons.put(ConfigurationUpdateStatus.NOCHANGE.name(), ImageManager
+ .getPluginConfigurationIcon(ConfigurationUpdateStatus.NOCHANGE));
fieldStatus.setValueIcons(statusIcons);
fieldStatus.addRecordClickHandler(new RecordClickHandler() {
@Override
@@ -201,7 +206,6 @@ public class HistoryGroupPluginConfigurationTable extends Table {
}
});
-
}
private String getStatusHtmlString(Record record) {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java
index 33dd19b..bf6d251 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java
@@ -27,6 +27,7 @@ import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.composite.ResourceComposite;
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.ResourceGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
@@ -160,12 +161,8 @@ public class ResourceCompositeDataSource extends
RPCDataSource<ResourceComposite
record.setAttribute(CATEGORY.propertyName(),
res.getResourceType().getCategory().name());
record.setAttribute("icon",
res.getResourceType().getCategory().getDisplayName() + "_"
+ (res.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP
? "up" : "down") + "_16.png");
-
- record
- .setAttribute(
- AVAILABILITY.propertyName(),
- res.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP
? "/images/icons/availability_green_16.png"
- : "/images/icons/availability_red_16.png");
+ record.setAttribute(AVAILABILITY.propertyName(),
ImageManager.getAvailabilityIconFromAvailType(res
+ .getCurrentAvailability().getAvailabilityType()));
record.setAttribute("resourcePersmission",
from.getResourcePermission());
return record;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
index 515c0b5..d2593a5 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
@@ -44,6 +44,7 @@ import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceCategory;
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.ResourceGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
@@ -168,12 +169,8 @@ public class ResourceDatasource extends RPCDataSource<Resource>
{
record.setAttribute(CATEGORY.propertyName(),
from.getResourceType().getCategory().name());
record.setAttribute("icon",
from.getResourceType().getCategory().getDisplayName() + "_"
+ (from.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP
? "up" : "down") + "_16.png");
-
- record
- .setAttribute(
- AVAILABILITY.propertyName(),
- from.getCurrentAvailability().getAvailabilityType() ==
AvailabilityType.UP ? "/images/icons/availability_green_16.png"
- : "/images/icons/availability_red_16.png");
+ record.setAttribute(AVAILABILITY.propertyName(),
ImageManager.getAvailabilityIconFromAvailType(from
+ .getCurrentAvailability().getAvailabilityType()));
return record;
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java
index db193e1..c54c0ff 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java
@@ -42,13 +42,13 @@ import com.smartgwt.client.types.DSProtocol;
import com.smartgwt.client.widgets.tree.TreeNode;
import org.rhq.core.domain.criteria.ResourceCriteria;
-import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.ResourceSubCategory;
import org.rhq.core.domain.resource.ResourceType;
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.Messages;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
@@ -334,10 +334,8 @@ public class NewResourceTreeDataSource extends DataSource {
setAttribute("name", resource.getName());
// setAttribute("description",
resource.getDescription());
- setAttribute(
- "currentAvailability",
- resource.getCurrentAvailability().getAvailabilityType() ==
AvailabilityType.UP ? "/images/icons/availability_green_16.png"
- : "/images/icons/availability_red_16.png");
+ setAttribute("currentAvailability",
ImageManager.getAvailabilityIconFromAvailType(resource
+ .getCurrentAvailability().getAvailabilityType()));
setIsFolder((resource.getResourceType().getChildResourceTypes() != null
&& !resource.getResourceType()
.getChildResourceTypes().isEmpty()));
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 2054855..a4f9897 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
@@ -41,13 +41,13 @@ 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.measurement.AvailabilityType;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceError;
import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.core.domain.tagging.Tag;
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.components.tagging.TagEditorView;
import org.rhq.enterprise.gui.coregui.client.components.tagging.TagsChangedCallback;
@@ -116,7 +116,7 @@ public class ResourceTitleBar extends LocatableVLayout {
this.title = new HTMLFlow();
this.title.setWidth("*");
- this.availabilityImage = new Img("resources/availability_grey_24.png",
24, 24);
+ this.availabilityImage = new Img(ImageManager.getAvailabilityLargeIcon(null), 24,
24);
this.favoriteButton = new
LocatableImg(this.extendLocatorId("Favorite"), NOT_FAV_ICON, 24, 24);
@@ -312,9 +312,8 @@ public class ResourceTitleBar extends LocatableVLayout {
this.favorite = favorites.contains(resource.getId());
updateFavoriteButton();
- this.availabilityImage.setSrc("resources/availability_"
- + (resource.getCurrentAvailability().getAvailabilityType() ==
AvailabilityType.UP ? "green" : "red")
- + "_24.png");
+
this.availabilityImage.setSrc(ImageManager.getAvailabilityLargeIconFromAvailType(resource
+ .getCurrentAvailability().getAvailabilityType()));
String category =
this.resource.getResourceType().getCategory().getDisplayName();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java
index f398136..d113ae8 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java
@@ -32,6 +32,7 @@ import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import org.rhq.core.domain.resource.Agent;
import org.rhq.core.domain.resource.composite.ResourceComposite;
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.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -104,7 +105,7 @@ public class OverviewView extends LocatableVLayout {
//agent-comm-status
String agentComStatus = "agent-comm-status";
agentStatusIcon = new FormItemIcon();
-
agentStatusIcon.setSrc("resources/availability_grey_24.png");
+ agentStatusIcon.setSrc(ImageManager.getAvailabilityLargeIcon(null));
agentStatus = new StaticTextItem(agentComStatus,
MSG.view_inventory_summary_agent_status_title());
agentStatus.setIcons(agentStatusIcon);
agentStatus.setWrapTitle(false);
@@ -119,7 +120,7 @@ public class OverviewView extends LocatableVLayout {
@Override
public void onSuccess(Boolean result) {
//update icon with correct status
- agentStatusIcon.setSrc("resources/availability_" +
(result ? "green" : "red") + "_24.png");
+
agentStatusIcon.setSrc(ImageManager.getAvailabilityLargeIcon(result));
currentAgentInfo.markForRedraw();
}
});
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java
index 1278490..d843ba3 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java
@@ -76,7 +76,7 @@ public class ResourceSelector extends AbstractSelector<Resource>
{
typeSelectItem.setCanSelectParentItems(true);
typeSelectItem.setLoadDataOnDemand(false);
typeSelectItem.setEmptyMenuMessage(MSG.common_msg_loading());
- typeSelectItem.setShowIcons(true);
+ typeSelectItem.setShowIcons(false);
if (this.forceResourceTypeFilter) {
typeSelectItem.setDisabled(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java
index 1bab7a8..71b7310 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java
@@ -21,7 +21,6 @@ package org.rhq.enterprise.gui.coregui.client.operation;
import java.util.Date;
import java.util.List;
-import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
@@ -35,6 +34,7 @@ import org.rhq.core.domain.operation.OperationRequestStatus;
import org.rhq.core.domain.operation.composite.ResourceOperationLastCompletedComposite;
import org.rhq.core.domain.resource.composite.DisambiguationReport;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import
org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.operations.OperationsPortlet;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
@@ -61,7 +61,7 @@ public class RecentOperationsDataSource extends
//config attributes
private boolean operationsRangeLastEnabled = false;
- private int operationsRangeCompleted = -1;
+ private int operationsRangeCompleted = -1;
/** Build list of fields for the datasource and then adds them to it.
*/
@@ -76,25 +76,25 @@ public class RecentOperationsDataSource extends
protected List<DataSourceField> addDataSourceFields() {
List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField resourceField = new DataSourceTextField(FIELD_RESOURCE,
- MSG.dataSource_recentOperations_field_resource());
+ DataSourceTextField resourceField = new DataSourceTextField(FIELD_RESOURCE, MSG
+ .dataSource_recentOperations_field_resource());
resourceField.setPrimaryKey(true);
fields.add(resourceField);
- DataSourceTextField locationField = new DataSourceTextField(FIELD_LOCATION,
- MSG.dataSource_recentOperations_field_location(), 200);
+ DataSourceTextField locationField = new DataSourceTextField(FIELD_LOCATION, MSG
+ .dataSource_recentOperations_field_location(), 200);
fields.add(locationField);
- DataSourceTextField operationField = new DataSourceTextField(FIELD_OPERATION,
- MSG.dataSource_recentOperations_field_operation());
+ DataSourceTextField operationField = new DataSourceTextField(FIELD_OPERATION,
MSG
+ .dataSource_recentOperations_field_operation());
fields.add(operationField);
- DataSourceDateTimeField timeField = new DataSourceDateTimeField(FIELD_TIME,
- MSG.dataSource_recentOperations_field_time());
+ DataSourceDateTimeField timeField = new DataSourceDateTimeField(FIELD_TIME, MSG
+ .dataSource_recentOperations_field_time());
fields.add(timeField);
- DataSourceTextField statusField = new DataSourceTextField(FIELD_STATUS,
- MSG.dataSource_recentOperations_field_status());
+ DataSourceTextField statusField = new DataSourceTextField(FIELD_STATUS, MSG
+ .dataSource_recentOperations_field_status());
fields.add(statusField);
return fields;
@@ -170,9 +170,9 @@ public class RecentOperationsDataSource extends
for (DisambiguationReport<ResourceOperationLastCompletedComposite>
report : list) {
ListGridRecord record = new ListGridRecord();
//disambiguated Resource name, decorated with html anchors to problem
resources
- record.setAttribute(FIELD_RESOURCE,
ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL,
- report.getResourceType(), report.getOriginal().getResourceName(),
report.getOriginal()
- .getResourceId(), true));
+ record.setAttribute(FIELD_RESOURCE,
ReportDecorator.decorateResourceName(
+ ReportDecorator.GWT_RESOURCE_URL, report.getResourceType(),
report.getOriginal().getResourceName(),
+ report.getOriginal().getResourceId(), true));
//disambiguated resource lineage, decorated with html anchors
record.setAttribute(FIELD_LOCATION,
ReportDecorator.decorateResourceLineage(report.getParents(), true));
//operation name.
@@ -195,20 +195,24 @@ public class RecentOperationsDataSource extends
*/
private String generateResourceOperationStatusLink(
DisambiguationReport<ResourceOperationLastCompletedComposite> report) {
- //TODO: refactor this out for more general case
- String link = "<a href='" +
"/rhq/resource/operation/resourceOperationHistoryDetails-plain.xhtml?id="
- + report.getOriginal().getResourceId() + "&opId=" +
report.getOriginal().getResourceId() + "'>";
- String img = "<img alt='" +
report.getOriginal().getOperationStatus() + "' title='"
- + report.getOriginal().getOperationStatus() + "'
src='/images/icons/";
+
+ String iconLink;
if
(report.getOriginal().getOperationStatus().compareTo(OperationRequestStatus.SUCCESS) == 0)
{
- img += "availability_green_16.png'";
+ iconLink = ImageManager.getAvailabilityIcon(Boolean.TRUE);
} else if
(report.getOriginal().getOperationStatus().compareTo(OperationRequestStatus.FAILURE) == 0)
{
- img += "availability_red_16.png";
+ iconLink = ImageManager.getAvailabilityIcon(Boolean.FALSE);
} else if
(report.getOriginal().getOperationStatus().compareTo(OperationRequestStatus.CANCELED) ==
0) {
- img += "availability_yellow_16.png";
+ iconLink = ImageManager.getAvailabilityYellowIcon();
} else {
- img += "availability_grey_16.png";
+ iconLink = ImageManager.getAvailabilityIcon(null);
}
+
+ //TODO: refactor this out for more general case
+ String link = "<a href='" +
"/rhq/resource/operation/resourceOperationHistoryDetails-plain.xhtml?id="
+ + report.getOriginal().getResourceId() + "&opId=" +
report.getOriginal().getResourceId() + "'>";
+ String img = "<img alt='" +
report.getOriginal().getOperationStatus() + "' title='"
+ + report.getOriginal().getOperationStatus() + "' src='";
+ img += iconLink;
link = link + img + "'></img></a>";
return link;
}
@@ -221,8 +225,8 @@ public class RecentOperationsDataSource extends
@Override
public ListGridRecord
copyValues(DisambiguationReport<ResourceOperationLastCompletedComposite> from) {
ListGridRecord record = new ListGridRecord();
- record.setAttribute(FIELD_RESOURCE,
ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL,
- from.getResourceType(), from.getOriginal().getResourceName(),
from.getOriginal().getResourceId(), true));
+ record.setAttribute(FIELD_RESOURCE,
ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, from
+ .getResourceType(), from.getOriginal().getResourceName(),
from.getOriginal().getResourceId(), true));
record.setAttribute(FIELD_LOCATION,
ReportDecorator.decorateResourceLineage(from.getParents(), true));
record.setAttribute(FIELD_OPERATION, from.getOriginal().getOperationName());
record.setAttribute(FIELD_TIME, from.getOriginal().getOperationStartTime());
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 4763217..b21b0bf 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
@@ -20,7 +20,6 @@ package org.rhq.enterprise.gui.coregui.client.resource;
*/
import java.util.List;
-import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
@@ -30,10 +29,10 @@ import com.smartgwt.client.data.fields.DataSourceImageField;
import com.smartgwt.client.data.fields.DataSourceTextField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
-import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.composite.DisambiguationReport;
import org.rhq.core.domain.resource.composite.ProblemResourceComposite;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import
org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.problems.ProblemResourcesPortlet;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
@@ -74,21 +73,21 @@ public class ProblemResourcesDataSource extends
RPCDataSource<DisambiguationRepo
protected List<DataSourceField> addDataSourceFields() {
List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField resourceField = new DataSourceTextField(FIELD_RESOURCE,
- MSG.dataSource_problemResources_field_resource());
+ DataSourceTextField resourceField = new DataSourceTextField(FIELD_RESOURCE, MSG
+ .dataSource_problemResources_field_resource());
resourceField.setPrimaryKey(true);
fields.add(resourceField);
- DataSourceTextField locationField = new DataSourceTextField(FIELD_LOCATION,
- MSG.dataSource_problemResources_field_location());
+ DataSourceTextField locationField = new DataSourceTextField(FIELD_LOCATION, MSG
+ .dataSource_problemResources_field_location());
fields.add(locationField);
- DataSourceTextField alertsField = new DataSourceTextField(FIELD_ALERTS,
- MSG.dataSource_problemResources_field_alerts());
+ DataSourceTextField alertsField = new DataSourceTextField(FIELD_ALERTS, MSG
+ .dataSource_problemResources_field_alerts());
fields.add(alertsField);
- DataSourceImageField availabilityField = new
DataSourceImageField(FIELD_AVAILABLE,
- MSG.dataSource_problemResources_field_available());
+ DataSourceImageField availabilityField = new
DataSourceImageField(FIELD_AVAILABLE, MSG
+ .dataSource_problemResources_field_available());
fields.add(availabilityField);
return fields;
@@ -159,19 +158,16 @@ public class ProblemResourcesDataSource extends
RPCDataSource<DisambiguationRepo
for (DisambiguationReport<ProblemResourceComposite> report : list) {
ListGridRecord record = new ListGridRecord();
//disambiguated Resource name, decorated with html anchors to problem
resources
- record.setAttribute(FIELD_RESOURCE,
ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL,
- report.getResourceType(), report.getOriginal().getResourceName(),
report.getOriginal()
- .getResourceId(), true));
+ record.setAttribute(FIELD_RESOURCE,
ReportDecorator.decorateResourceName(
+ ReportDecorator.GWT_RESOURCE_URL, report.getResourceType(),
report.getOriginal().getResourceName(),
+ report.getOriginal().getResourceId(), true));
//disambiguated resource lineage, decorated with html anchors
record.setAttribute(FIELD_LOCATION,
ReportDecorator.decorateResourceLineage(report.getParents(), true));
//alert cnt.
record.setAttribute(FIELD_ALERTS, report.getOriginal().getNumAlerts());
//populate availability icon
- if
(report.getOriginal().getAvailabilityType().compareTo(AvailabilityType.DOWN) == 0) {
- record.setAttribute(FIELD_AVAILABLE,
"/images/icons/availability_red_16.png");
- } else {
- record.setAttribute(FIELD_AVAILABLE,
"/images/icons/availability_green_16.png");
- }
+ record.setAttribute(FIELD_AVAILABLE,
ImageManager.getAvailabilityIconFromAvailType(report.getOriginal()
+ .getAvailabilityType()));
dataValues[indx++] = record;
}
@@ -182,15 +178,12 @@ public class ProblemResourcesDataSource extends
RPCDataSource<DisambiguationRepo
@Override
public ListGridRecord copyValues(DisambiguationReport<ProblemResourceComposite>
from) {
ListGridRecord record = new ListGridRecord();
- record.setAttribute(FIELD_RESOURCE,
ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL,
- from.getResourceType(), from.getOriginal().getResourceName(),
from.getOriginal().getResourceId(), true));
+ record.setAttribute(FIELD_RESOURCE,
ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, from
+ .getResourceType(), from.getOriginal().getResourceName(),
from.getOriginal().getResourceId(), true));
record.setAttribute(FIELD_LOCATION,
ReportDecorator.decorateResourceLineage(from.getParents(), true));
record.setAttribute(FIELD_ALERTS, from.getOriginal().getNumAlerts());
- if (from.getOriginal().getAvailabilityType().compareTo(AvailabilityType.DOWN) ==
0) {
- record.setAttribute(FIELD_AVAILABLE,
"/images/icons/availability_red_16.png");
- } else {
- record.setAttribute(FIELD_AVAILABLE,
"/images/icons/availability_green_16.png");
- }
+ record.setAttribute(FIELD_AVAILABLE,
ImageManager.getAvailabilityIconFromAvailType(from.getOriginal()
+ .getAvailabilityType()));
record.setAttribute("entity", from);
return record;
diff --git
a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_16.png
b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_16.png
new file mode 100644
index 0000000..f595d09
Binary files /dev/null and
b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_16.png
differ
diff --git
a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_24.png
b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_24.png
new file mode 100644
index 0000000..d3755f6
Binary files /dev/null and
b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_24.png
differ
diff --git
a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_failed_16.png
b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_failed_16.png
new file mode 100644
index 0000000..e926a22
Binary files /dev/null and
b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_failed_16.png
differ
diff --git
a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_inprogress_16.png
b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_inprogress_16.png
new file mode 100644
index 0000000..3754265
Binary files /dev/null and
b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_inprogress_16.png
differ
diff --git
a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_ok_16.png
b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_ok_16.png
new file mode 100644
index 0000000..32137ac
Binary files /dev/null and
b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_ok_16.png
differ
diff --git
a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_warning_16.png
b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_warning_16.png
new file mode 100644
index 0000000..0b5c56b
Binary files /dev/null and
b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_warning_16.png
differ