modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java | 20 ++++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java | 18 +-------- modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/configure/Configure_inprogress_16.png |binary 3 files changed, 22 insertions(+), 16 deletions(-)
New commits: commit 03ef28b44969c47ae7bae4c7db0f4481a9fd0c74 Author: John Mazzitelli mazz@redhat.com Date: Mon Nov 29 16:53:44 2010 -0500
new inprogress config update icon - use image manager now
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 d091558..fcae004 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 @@ -257,6 +257,26 @@ public class ImageManager { return "subsystems/inventory/Connection_16.png"; }
+ public static String getResourceConfigurationIcon(ConfigurationUpdateStatus updateStatus) { + if (updateStatus != null) { + switch (updateStatus) { + case SUCCESS: { + return "subsystems/configure/Configure_ok_16.png"; + } + case FAILURE: { + return "subsystems/configure/Configure_failed_16.png"; + } + case INPROGRESS: { + return "subsystems/inventory/Configure_inprogress_16.png"; + } + case NOCHANGE: + return "subsystems/inventory/Configure_16.png"; + } + } + + return "subsystems/inventory/Configure_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/inventory/resource/detail/configuration/ConfigurationHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java index 6d3d59f..9a88d81 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java @@ -31,6 +31,7 @@ import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.ResourceConfigurationUpdate; import org.rhq.core.domain.resource.Resource; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationComparisonView; import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction; import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement; @@ -98,21 +99,7 @@ public class ConfigurationHistoryView extends TableSection { statusField.setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { ConfigurationUpdateStatus status = ConfigurationUpdateStatus.valueOf((String) o); - String icon = ""; - switch (status) { - case INPROGRESS: - break; - case SUCCESS: - icon = "_ok"; - break; - case FAILURE: - icon = "_failed"; - break; - case NOCHANGE: - break; - } - - return Canvas.imgHTML("subsystems/configure/Configure" + icon + "_16.png", 16, 16) + o; + return Canvas.imgHTML(ImageManager.getResourceConfigurationIcon(status), 16, 16); } }); fields.add(statusField); @@ -152,7 +139,6 @@ public class ConfigurationHistoryView extends TableSection { } });
- }
@Override diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/configure/Configure_inprogress_16.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/configure/Configure_inprogress_16.png new file mode 100644 index 0000000..93aab78 Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/configure/Configure_inprogress_16.png differ
rhq-commits@lists.fedorahosted.org