modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java | 2 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/BooleanCellFormatter.java | 18 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-)
New commits: commit 779b977100d43007e89d03694e1f004e127a3a9a Author: Ian Springer ian.springer@redhat.com Date: Wed Jan 5 17:49:12 2011 -0500
use more appropriate icons for formatted values of cells in ListGrid columns with Boolean values (https://bugzilla.redhat.com/show_bug.cgi?id=667467)
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 437cb54..c9afaec 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 @@ -87,7 +87,7 @@ public class ImageManager { * {@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} + * method to obtain the full path. The caller can optionally prepend {@link #IMAGES_DIR} * to any path returned by ImageManager, which is all this method really does. * * @param image a relative image path 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 226fd33..1b709f3 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 @@ -6,24 +6,28 @@ import com.smartgwt.client.widgets.grid.ListGridRecord; import org.rhq.enterprise.gui.coregui.client.ImageManager;
/** - * Formats a Boolean value as "yes" or "no" image. + * Formats a Boolean value as an icon. * * @author Ian Springer */ public class BooleanCellFormatter implements CellFormatter { - private static String RED = ImageManager.getFullImagePath(ImageManager.getAvailabilityIcon(Boolean.FALSE)); - private static String GREEN = ImageManager.getFullImagePath(ImageManager.getAvailabilityIcon(Boolean.TRUE)); - private static String GREY = ImageManager.getFullImagePath(ImageManager.getAvailabilityIcon(null)); + + private static String ICON_URL_NULL = ImageManager.getFullImagePath("subsystems/availability/availability_grey_16.png"); + private static String ICON_URL_TRUE = ImageManager.getFullImagePath("global/permission_enabled_11.png"); + private static String ICON_URL_FALSE = ImageManager.getFullImagePath("global/permission_disabled_11.png");
public String format(Object value, ListGridRecord record, int rowNum, int colNum) { - String result; + String imageUrl; if (value == null) { - result = "<img src="" + GREY + ""/>"; + imageUrl = ICON_URL_NULL; } else if (value instanceof Boolean) { - result = ((Boolean) value) ? "<img src="" + GREEN + ""/>" : "<img src="" + RED + ""/>"; + imageUrl = ((Boolean) value) ? ICON_URL_FALSE : ICON_URL_TRUE; } else { throw new IllegalArgumentException("value parameter is not a Boolean."); } + @SuppressWarnings({"UnnecessaryLocalVariable"}) + String result = "<img src="" + imageUrl + "" width="11" height="11"/>"; return result; } + }
rhq-commits@lists.fedorahosted.org