modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java | 15 +++++++++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java | 6 +++- modules/enterprise/gui/coregui/src/main/webapp/images/global/DiscoveryQueue_Platform_16_closed.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/global/DiscoveryQueue_Platform_16_open.png |binary 4 files changed, 19 insertions(+), 2 deletions(-)
New commits: commit 8b0f4b53d64097e217b0f5dc51dc0d4767858e5b Author: John Mazzitelli mazz@redhat.com Date: Wed Mar 13 12:57:51 2013 -0400
minor issue - fixing the icons in the discovery queue so they make a bit more sense
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 a15857e..76ee6ae 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 @@ -8,7 +8,11 @@ import org.rhq.core.domain.event.EventSeverity; import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.measurement.ResourceAvailability; import org.rhq.core.domain.operation.OperationRequestStatus; -import org.rhq.core.domain.resource.*; +import org.rhq.core.domain.resource.CreateResourceStatus; +import org.rhq.core.domain.resource.DeleteResourceStatus; +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; import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite.GroupAvailabilityType;
@@ -26,6 +30,15 @@ public class ImageManager { public static final String IMAGES_DIR = "images/";
/** + * Returns the base icon name for the discovery queue's platform folder nodes. + * There are actually two icons, open and closed - the returned string is just + * the base icon name. + */ + public static String getDiscoveryQueuePlatformIconBase() { + return "global/DiscoveryQueue_Platform_16.png"; + } + + /** * Returns a generic "help" icon. This will also have a peer "disabled" help icon. */ public static String getHelpIcon() { 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 0233e3e..2223ed7 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 @@ -48,8 +48,10 @@ import com.smartgwt.client.widgets.tree.TreeGridField; import com.smartgwt.client.widgets.tree.TreeNode;
import org.rhq.core.domain.resource.InventoryStatus; +import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.IconEnum; +import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.RefreshableView; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; import org.rhq.enterprise.gui.coregui.client.components.view.HasViewName; @@ -57,9 +59,9 @@ import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; 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.TableUtility; -import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedIButton; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; +import org.rhq.enterprise.gui.coregui.client.util.message.Message;
/** * @author Greg Hinkle @@ -111,6 +113,8 @@ public class ResourceAutodiscoveryView extends EnhancedVLayout implements Refres treeGrid.setAutoFitData(Autofit.HORIZONTAL); treeGrid.setWrapCells(true); treeGrid.setFixedRecordHeights(false); + treeGrid.setFolderIcon(ImageManager.getDiscoveryQueuePlatformIconBase()); + treeGrid.setNodeIcon(ImageManager.getResourceIcon(ResourceCategory.SERVER));
final TreeGridField name, key, type, description, status, ctime; name = new TreeGridField("name"); diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/global/DiscoveryQueue_Platform_16_closed.png b/modules/enterprise/gui/coregui/src/main/webapp/images/global/DiscoveryQueue_Platform_16_closed.png new file mode 100644 index 0000000..65e8952 Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/global/DiscoveryQueue_Platform_16_closed.png differ diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/global/DiscoveryQueue_Platform_16_open.png b/modules/enterprise/gui/coregui/src/main/webapp/images/global/DiscoveryQueue_Platform_16_open.png new file mode 100644 index 0000000..b9b3d14 Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/global/DiscoveryQueue_Platform_16_open.png differ