[rhq] 10 commits - modules/enterprise
by Simeon Pinder
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java | 27 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java | 106 ++++------
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 2
6 files changed, 66 insertions(+), 81 deletions(-)
New commits:
commit 46800f7f592553f87fc735129700b421bf63a5f4
Merge: a45bdba... fe1b328...
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Tue Nov 30 13:08:07 2010 -0500
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into track-master
Conflicts:
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
commit a45bdba55d9aba8d28a44cadd524535a505b6ee2
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Tue Nov 30 12:58:13 2010 -0500
fix inventory title refresh issue.
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 68314ec..890b7c0 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
@@ -288,7 +288,7 @@ public class ResourceTitleBar extends LocatableVLayout {
}
public void setResource(ResourceComposite resourceComposite) {
- if (this.resource == null || this.resource.getId() != resource.getId()) {
+ if (this.resourceComposite == null || resourceComposite.getResource().getId() != this.resource.getId()) {
this.resource = resourceComposite.getResource();
this.resourceComposite = resourceComposite;
update();
commit 102617182fb01beecb023b212c847ae91490ea16
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Tue Nov 30 11:23:33 2010 -0500
move tags lower in ResourceGroupTitle
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..b086971 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
@@ -180,9 +180,9 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
hlayout.addMember(expandCollapseArrow);
hlayout.addMember(badge);
hlayout.addMember(title);
- hlayout.addMember(tagEditorView);
hlayout.addMember(availabilityImage);
hlayout.addMember(favoriteButton);
+ addMember(tagEditorView);
}
private void loadTags(final TagEditorView tagEditorView) {
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 0f45a31..68314ec 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
@@ -101,9 +101,8 @@ public class ResourceTitleBar extends LocatableVLayout {
//modify VLayout settings
setWidth100();
setHeight(30);
- setPadding(0);
setMembersMargin(0);
- setLayoutMargin(0);
+ setPadding(5);
}
public void update() {
commit b19bc953c65ba8bb2f0b0eddb794686933b95e39
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Tue Nov 30 11:07:41 2010 -0500
refactor to use ImageManager
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..ccb2e4c 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,7 @@ 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.ResourceType;
import org.rhq.core.domain.resource.group.GroupCategory;
/**
@@ -142,4 +143,21 @@ public class ImageManager {
return "subsystems/inventory/Connection_16.png";
}
+
+ /**
+ * Given a Boolean to indicate if something is to be considered up or down, and a category[Cluster,Group,Platform,Server,Service]
+ * the appropriate availability icon is returned. If the given Boolean is null, the availability will be considered down.
+ *
+ * @param Type
+ * @return the [Type] icon
+ */
+ public static String getResourceTypeIcon(ResourceType resourceType, Boolean avail) {
+ return "types/" + ((resourceType == null) ? null : resourceType.getCategory().getDisplayName()) + "_"
+ + ((avail == null) ? "down" : (avail ? "up" : "down")) + "_16.png";
+ }
+
+ public static String getResourceTypeLargeIcon(ResourceType resourceType, Boolean avail) {
+ return "types/" + ((resourceType == null) ? null : resourceType.getCategory().getDisplayName()) + "_"
+ + ((avail == null) ? "down" : (avail ? "up" : "down")) + "_24.png";
+ }
}
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 6f8b508..0f45a31 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
@@ -91,8 +91,8 @@ public class ResourceTitleBar extends LocatableVLayout {
super(locatorId);
//define two rows of content
top = new LocatableHLayout(locatorId + "_Top");
- top.setPadding(5);
- top.setMembersMargin(5);
+ top.setPadding(0);
+ top.setMembersMargin(0);
top.setHeight(30);
details = new LocatableHLayout(locatorId + "_Details");
@@ -126,7 +126,7 @@ public class ResourceTitleBar extends LocatableVLayout {
}
});
- badge = new Img("types/Service_up_24.png", 24, 24);
+ badge = new Img(ImageManager.getResourceTypeLargeIcon(this.resource.getResourceType(), true), 24, 24);
TagEditorView tagEditorView = new TagEditorView(extendLocatorId("TagEdit"), resource.getTags(), false,
new TagsChangedCallback() {
@@ -309,7 +309,8 @@ public class ResourceTitleBar extends LocatableVLayout {
String avail = (resource.getCurrentAvailability() != null && resource.getCurrentAvailability()
.getAvailabilityType() != null) ? (resource.getCurrentAvailability().getAvailabilityType().name()
.toLowerCase()) : "down";
- badge.setSrc("types/" + category + "_" + avail + "_24.png");
+ Boolean isAvailable = (avail.equals("down") ? Boolean.FALSE : Boolean.TRUE);
+ badge.setSrc(ImageManager.getResourceTypeLargeIcon(this.resource.getResourceType(), isAvailable));
markForRedraw();
}
commit 3c883290aa10d259de676a97258f4051cde5fb8d
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Tue Nov 30 09:48:36 2010 -0500
i)moved Resource Inventory Tags ui lower in ResourceTitle
ii)changed checkbox to expand/collapse icon
ii)plugin errors icon change and conditional display only when errors exist.
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..6f8b508 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
@@ -33,11 +33,7 @@ import com.smartgwt.client.widgets.Window;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
import com.smartgwt.client.widgets.form.DynamicForm;
-import com.smartgwt.client.widgets.form.fields.CheckboxItem;
-import com.smartgwt.client.widgets.form.fields.LinkItem;
import com.smartgwt.client.widgets.form.fields.SpacerItem;
-import com.smartgwt.client.widgets.form.fields.events.ChangeEvent;
-import com.smartgwt.client.widgets.form.fields.events.ChangeHandler;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.criteria.ResourceCriteria;
@@ -56,7 +52,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.summary.O
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.summary.ResourceErrorsDataSource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.summary.ResourceErrorsView;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableImg;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -71,9 +66,14 @@ public class ResourceTitleBar extends LocatableVLayout {
private LocatableHLayout top;
//represents normally closed region of Resource details[to verbosely describe resource across all tabs]
private LocatableHLayout details;
- private static String COMPONENT_ERROR_COUNT_MSG = MSG.common_title_component_errors();
private static final String FAV_ICON = "Favorite_24_Selected.png";
private static final String NOT_FAV_ICON = "Favorite_24.png";
+ private static final String EXPANDED_ICON = "[SKIN]/ListGrid/row_expanded.png";
+ private static final String COLLAPSED_ICON = "[SKIN]/ListGrid/row_collapsed.png";
+ private static final String COLLAPSED_TOOLTIP = MSG.view_portlet_inventory_tooltip_expand();
+ private static final String EXPANDED_TOOLTIP = MSG.view_portlet_inventory_tooltip_collapse();
+ private static final String PLUGIN_ERRORS_ICON = "[SKIN]/Dialog/warn.png";
+ private Img expandCollapseArrow;
private Resource resource;
private ResourceComposite resourceComposite;
@@ -85,7 +85,7 @@ public class ResourceTitleBar extends LocatableVLayout {
private boolean favorite;
private LocatableHLayout detailsForm;
private OverviewForm detailsFormSummary;
- private LinkItem pluginErrors;
+ private Img pluginErrors;
public ResourceTitleBar(String locatorId) {
super(locatorId);
@@ -97,7 +97,6 @@ public class ResourceTitleBar extends LocatableVLayout {
details = new LocatableHLayout(locatorId + "_Details");
details.setWidth100();
- details.setHeight(10);//initialize to small amount of pixels
//modify VLayout settings
setWidth100();
@@ -152,10 +151,31 @@ public class ResourceTitleBar extends LocatableVLayout {
loadTags(tagEditorView);
- //creating link to put in resource title bar
- pluginErrors = new LinkItem("plugin-errors");
- pluginErrors.setTitle("");
- pluginErrors.setLinkTitle(COMPONENT_ERROR_COUNT_MSG + " (0)");
+ //add expand/collapse icon
+ expandCollapseArrow = new Img(COLLAPSED_ICON, 16, 16);
+ expandCollapseArrow.setTooltip(COLLAPSED_TOOLTIP);
+ expandCollapseArrow.setLayoutAlign(VerticalAlignment.BOTTOM);
+ expandCollapseArrow.addClickHandler(new ClickHandler() {
+ private boolean collapsed = true;
+
+ @Override
+ public void onClick(ClickEvent event) {
+ collapsed = !collapsed;
+ if (collapsed) {
+ expandCollapseArrow.setSrc(COLLAPSED_ICON);
+ expandCollapseArrow.setTooltip(COLLAPSED_TOOLTIP);
+ details.hide();
+ } else {
+ expandCollapseArrow.setSrc(EXPANDED_ICON);
+ expandCollapseArrow.setTooltip(EXPANDED_TOOLTIP);
+ details.show();
+ }
+ ResourceTitleBar.this.markForRedraw();
+ }
+ });
+
+ pluginErrors = new Img(PLUGIN_ERRORS_ICON, 24, 24);
+ pluginErrors.hide();
GWTServiceLookup.getResourceService().findResourceErrors(resourceComposite.getResource().getId(),
new AsyncCallback<List<ResourceError>>() {
public void onFailure(Throwable caught) {
@@ -165,11 +185,8 @@ public class ResourceTitleBar extends LocatableVLayout {
}
public void onSuccess(List<ResourceError> result) {
- if (result.isEmpty()) {
- pluginErrors.setLinkTitle(COMPONENT_ERROR_COUNT_MSG + " (" + result.size() + ")");
- } else {
- pluginErrors.setLinkTitle("<font color='red'>" + COMPONENT_ERROR_COUNT_MSG + " ("
- + result.size() + ")</font>");
+ if (!result.isEmpty()) {
+ pluginErrors.show();
}
markForRedraw();
}
@@ -177,11 +194,9 @@ public class ResourceTitleBar extends LocatableVLayout {
//define tool tip
pluginErrors.setPrompt(MSG.view_resource_title_component_errors_tooltip());
-
- //define click action to pop open detailed view of Component plugin errors
- pluginErrors.addClickHandler(new com.smartgwt.client.widgets.form.fields.events.ClickHandler() {
+ pluginErrors.addClickHandler(new ClickHandler() {
@Override
- public void onClick(com.smartgwt.client.widgets.form.fields.events.ClickEvent event) {
+ public void onClick(ClickEvent event) {
final Window winModal = new Window();
winModal.setShowMinimizeButton(false);
winModal.setShowModalMask(true);
@@ -216,54 +231,27 @@ public class ResourceTitleBar extends LocatableVLayout {
});
//top information
+ top.addMember(expandCollapseArrow);
top.addMember(badge);
top.addMember(title);
- top.addMember(tagEditorView);
- DynamicForm wrappedPluginErrors = new DynamicForm();
- wrappedPluginErrors.setFields(pluginErrors);
- top.addMember(wrappedPluginErrors);
+ top.addMember(pluginErrors);
top.addMember(availabilityImage);
top.addMember(favoriteButton);
- //detail information
- //checkbox
- final CheckboxItem displayMore = new CheckboxItem();
- final String moreDetails = MSG.common_title_show_more();
- displayMore.setName("resourceDetails");
- displayMore.setTitle(moreDetails);
- displayMore.setWidth(120);
- //conditionally expand more details section.
- displayMore.addChangeHandler(new ChangeHandler() {
- public void onChange(ChangeEvent event) {
- Boolean displayMoreDetails = (Boolean) event.getValue();
- if (displayMoreDetails) {
- detailsFormSummary.show();
- } else {
- detailsFormSummary.hide();
- }
- markForRedraw();
- }
- });
-
- //wrap checkbox for inclusion in details form.
- LocatableDynamicForm wrappedCheckbox = new LocatableDynamicForm(extendLocatorId("Title_Bar_Checkbox"));
- wrappedCheckbox.setFields(displayMore);
detailsForm = new LocatableHLayout(extendLocatorId("_Resource_Details"));
detailsForm.setWidth100();
detailsForm.setHeight(10);
detailsForm.setAlign(Alignment.LEFT);
- detailsForm.addMember(wrappedCheckbox);
detailsFormSummary = new OverviewForm(extendLocatorId("Title_Optional_Summary"), resourceComposite);
detailsFormSummary.setWidth100();
- detailsFormSummary.setPadding(0);
- detailsFormSummary.setMargin(0);
+ detailsFormSummary.setPadding(3);
+ detailsFormSummary.setMargin(3);
detailsFormSummary.setLayoutAlign(Alignment.LEFT);
//condense details for display
detailsFormSummary.setHeaderEnabled(false);
detailsFormSummary.setDisplayCondensed(true);
- detailsFormSummary.hide();
detailsForm.addMember(detailsFormSummary);
SpacerItem widthSpace = new SpacerItem();
@@ -272,12 +260,13 @@ public class ResourceTitleBar extends LocatableVLayout {
wrappedSpacer.setFields(widthSpace);
detailsForm.addMember(wrappedSpacer);
details.addChild(detailsForm);
+ details.hide();
//order the components
addMember(top);
+ addMember(tagEditorView);
addMember(details);
- top.markForRedraw();
- details.markForRedraw();
+ ResourceTitleBar.this.markForRedraw();
}
private void loadTags(final TagEditorView tagEditorView) {
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index 347ea5a..d181cef 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -1055,6 +1055,8 @@ view_portlet_graph_help_title = Graph Portlet~
view_portlet_graph_help_unconfigured=This graph is unconfigured, click the settings button to configure.~
view_portlet_graph_title = Resource Graph~
view_portlet_inventory_error1=Failed to retrieve inventory summary~
+view_portlet_inventory_tooltip_expand=Click to show more details for this resource.~
+view_portlet_inventory_tooltip_collapse=Click to hide details for this resource.~
view_portlet_mashup_config_title=MashupPorlet Configuration~
view_portlet_mashup_config_title_desc=The configuration settings for the mashup portlet.~
view_portlet_mashup_help=This portlet can include a web page via an HTTP request into an iframe on the dashboard.~
commit eb80441a2941c118d65bb2dba58244600748c62c
Merge: f671d9f... a94e265...
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Mon Nov 29 15:43:32 2010 -0500
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into track-master
commit f671d9fd167e40f65e6724b267e496b0312e29a6
Merge: bad2920... 59c7975...
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Mon Nov 29 15:16:56 2010 -0500
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into track-master
Conflicts:
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
diff --cc modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
index 556437a,3384ed7..6499162
--- 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
@@@ -20,13 -20,14 +20,11 @@@
package org.rhq.enterprise.gui.coregui.client.alert;
import java.util.Arrays;
- import java.util.Date;
-import java.util.LinkedHashMap;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.SortSpecifier;
-import com.smartgwt.client.types.MultipleAppearance;
import com.smartgwt.client.types.SortDirection;
import com.smartgwt.client.widgets.Canvas;
- import com.smartgwt.client.widgets.grid.CellFormatter;
-import com.smartgwt.client.widgets.form.fields.SelectItem;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@@ -34,8 -35,7 +32,7 @@@ import org.rhq.core.domain.alert.AlertP
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.LinkManager;
-import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.components.form.EnumSelectItem;
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;
commit bad2920fd46c0a1dbc009a116d0b32215b1c5ef4
Merge: 8d72ac8... 8a2e19e...
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed Nov 24 13:22:17 2010 -0500
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into track-master
commit 8d72ac83f36b125ad8fd1edc660f542b09caed60
Merge: 0f79fdf... 64aa25b...
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed Nov 24 12:43:31 2010 -0500
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into track-master
commit 0f79fdf9772a831b4193f1075e7cbf98980be1a8
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed Nov 24 12:42:51 2010 -0500
removed redundant filter form from RecentAlertsPortlet.
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 9fd74a1..baf256d 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
@@ -82,8 +82,9 @@ public class AlertHistoryView extends TableSection {
protected void configureTableFilters() {
final EnumSelectItem priorityFilter = new EnumSelectItem("severities", MSG.view_alerts_table_filter_priority(),
AlertPriority.class);
-
- setFilterFormItems(priorityFilter);
+ if (isShowFilterForm()) {
+ setFilterFormItems(priorityFilter);
+ }
}
@Override
@@ -127,7 +128,6 @@ public class AlertHistoryView extends TableSection {
setupTableInteractions();
-
}
private void setupTableInteractions() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
index d82bfd4..c25029b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
@@ -108,6 +108,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
private boolean showHeader = true;
private boolean showFooter = true;
private boolean showFooterRefresh = true;
+ private boolean showFilterForm = true;
private String tableTitle;
private Criteria criteria;
@@ -829,4 +830,12 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
public void setTableInfo(Label tableInfo) {
this.tableInfo = tableInfo;
}
+
+ public boolean isShowFilterForm() {
+ return showFilterForm;
+ }
+
+ public void setShowFilterForm(boolean showFilterForm) {
+ this.showFilterForm = showFilterForm;
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
index a81c97f..6b12bb1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
@@ -111,6 +111,7 @@ public class RecentAlertsPortlet extends AlertHistoryView implements CustomSetti
setShowHeader(false);
setShowFooter(true);
setShowFooterRefresh(false); //disable footer refresh
+ setShowFilterForm(false); //disable filter form for portlet
}
public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
13 years, 5 months
[rhq] modules/enterprise
by lkrejci
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java | 12 +++++-----
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 5 +++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java | 7 ++++-
3 files changed, 16 insertions(+), 8 deletions(-)
New commits:
commit fe1b328c664ec536a9868837ece1a918bd39e414
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Nov 29 18:35:13 2010 +0100
BZ 657232
* Don't throw NPE while destroying an agent on the server-side
if there is no command spool file name defined.
* Improve the error messages during intermittent confusion of the server
and agent after platform removal.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
index a299dfc..29116d8 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
@@ -438,11 +438,13 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
try {
ClientCommandSenderConfiguration sender_config = getSenderConfiguration(agent);
- spool_file = new File(sender_config.dataDirectory, sender_config.commandSpoolFileName);
- if (spool_file.exists()) {
- // first truncate it, in case Windows is locking it; then try to delete
- new FileOutputStream(spool_file, false).close();
- spool_file.delete();
+ if (sender_config.commandSpoolFileName != null) {
+ spool_file = new File(sender_config.dataDirectory, sender_config.commandSpoolFileName);
+ if (spool_file.exists()) {
+ // first truncate it, in case Windows is locking it; then try to delete
+ new FileOutputStream(spool_file, false).close();
+ spool_file.delete();
+ }
}
} catch (Exception e) {
LOG.warn("Failed to truncate/delete spool for deleted agent [" + agent + "]"
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
index c593d62..89e445a 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
@@ -122,7 +122,10 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
Agent knownAgent = agentManager.getAgentByName(agent.getName());
if (knownAgent == null) {
throw new InvalidInventoryReportException("Unknown Agent named [" + agent.getName()
- + "] sent an inventory report - that report will be ignored");
+ + "] sent an inventory report - that report will be ignored. "
+ + "This error is harmless and should stop appearing after a short while if the platform of the agent ["
+ + agent.getName()
+ + "] was recently removed from the inventory. In any other case this is a bug.");
}
if (log.isDebugEnabled()) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
index 6517e70..80c1ff0 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
@@ -506,9 +506,12 @@ public class AvailabilityManagerBean implements AvailabilityManagerLocal, Availa
return false;
}
} else {
- log.error("Could not figure out which agent sent availability report. This is a bug, please report it. "
+ log.error("Could not figure out which agent sent availability report. "
+ + "This error is harmless and should stop appearing after a short while if the platform of the agent ["
+ + agentName
+ + "] was recently removed. In any other case this is a bug."
+ report);
- }
+ }
return true; // everything is OK and things look to be in sync
}
13 years, 5 months
[rhq] Branch 'release-3.0.0' - modules/enterprise
by lkrejci
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java | 12 +++++-----
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 5 +++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java | 7 ++++-
3 files changed, 16 insertions(+), 8 deletions(-)
New commits:
commit a6d145b4c1f2f200a9bbcfc13933a01e9815f01b
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Nov 29 18:35:13 2010 +0100
BZ 657232
* Don't throw NPE while destroying an agent on the server-side
if there is no command spool file name defined.
* Improve the error messages during intermittent confusion of the server
and agent after platform removal.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
index a299dfc..29116d8 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
@@ -438,11 +438,13 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
try {
ClientCommandSenderConfiguration sender_config = getSenderConfiguration(agent);
- spool_file = new File(sender_config.dataDirectory, sender_config.commandSpoolFileName);
- if (spool_file.exists()) {
- // first truncate it, in case Windows is locking it; then try to delete
- new FileOutputStream(spool_file, false).close();
- spool_file.delete();
+ if (sender_config.commandSpoolFileName != null) {
+ spool_file = new File(sender_config.dataDirectory, sender_config.commandSpoolFileName);
+ if (spool_file.exists()) {
+ // first truncate it, in case Windows is locking it; then try to delete
+ new FileOutputStream(spool_file, false).close();
+ spool_file.delete();
+ }
}
} catch (Exception e) {
LOG.warn("Failed to truncate/delete spool for deleted agent [" + agent + "]"
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
index 2773b4c..c96c6f5 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
@@ -115,7 +115,10 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
Agent knownAgent = agentManager.getAgentByName(agent.getName());
if (knownAgent == null) {
throw new InvalidInventoryReportException("Unknown Agent named [" + agent.getName()
- + "] sent an inventory report - that report will be ignored");
+ + "] sent an inventory report - that report will be ignored. "
+ + "This error is harmless and should stop appearing after a short while if the platform of the agent ["
+ + agent.getName()
+ + "] was recently removed from the inventory. In any other case this is a bug.");
}
if (log.isDebugEnabled()) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
index 0a4c3ec..cd950e6 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
@@ -506,9 +506,12 @@ public class AvailabilityManagerBean implements AvailabilityManagerLocal, Availa
return false;
}
} else {
- log.error("Could not figure out which agent sent availability report. This is a bug, please report it. "
+ log.error("Could not figure out which agent sent availability report. "
+ + "This error is harmless and should stop appearing after a short while if the platform of the agent ["
+ + agentName
+ + "] was recently removed. In any other case this is a bug."
+ report);
- }
+ }
return true; // everything is OK and things look to be in sync
}
13 years, 5 months
[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java | 36 ++++++++--
1 file changed, 31 insertions(+), 5 deletions(-)
New commits:
commit 6768323d174b88a5ef9f60ec5a5b54da527750af
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Nov 29 18:11:40 2010 -0500
ensure that the Type column for the Resource tables show the resource type NAME and not the type ID
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 d2593a5..9abe462 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
@@ -25,7 +25,9 @@ import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceD
import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.PLUGIN;
import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.TYPE;
+import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
@@ -42,11 +44,14 @@ 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.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.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
/**
@@ -125,11 +130,32 @@ public class ResourceDatasource extends RPCDataSource<Resource> {
});
}
- protected void dataRetrieved(PageList<Resource> result, DSResponse response, DSRequest request) {
- Record[] records = buildRecords(result);
- response.setData(records);
- response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set
- processResponse(request.getRequestId(), response);
+ protected void dataRetrieved(final PageList<Resource> result, final DSResponse response, final DSRequest request) {
+ HashSet<Integer> typesSet = new HashSet<Integer>();
+ for (Resource resource : result) {
+ ResourceType type = resource.getResourceType();
+ if (type != null) {
+ typesSet.add(type.getId());
+ }
+ }
+
+ ResourceTypeRepository typeRepo = ResourceTypeRepository.Cache.getInstance();
+ typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), new TypesLoadedCallback() {
+ @Override
+ public void onTypesLoaded(Map<Integer, ResourceType> types) {
+ Record[] records = buildRecords(result);
+ for (Record record : records) {
+ Integer typeId = record.getAttributeAsInt(TYPE.propertyName());
+ ResourceType type = types.get(typeId);
+ if (type != null) {
+ record.setAttribute(TYPE.propertyName(), type.getName());
+ }
+ }
+ response.setData(records);
+ response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set
+ processResponse(request.getRequestId(), response);
+ }
+ });
}
protected ResourceCriteria getFetchCriteria(final DSRequest request) {
13 years, 5 months
[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 719ae082bb23252b356a9473c73d0d083bfb97ff
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Nov 29 17:18:45 2010 -0500
vertically align the links in the top menu. this makes it look cleaner, plus we remove a few wasted pixels in height
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
index 8a090dd..77d24fd 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
@@ -135,8 +135,8 @@ public class MenuBarView extends LocatableVLayout {
}
// Set explicit identifiers because the generated scLocator is not getting picked up by Selenium.
- headerString.append("<td id=\"").append(section).append("\" class=\"").append(styleClass).append(
- "\" onclick=\"document.location='#").append(section).append("'\" >");
+ headerString.append("<td style=\"vertical-align:middle\" id=\"").append(section).append("\" class=\"")
+ .append(styleClass).append("\" onclick=\"document.location='#").append(section).append("'\" >");
headerString.append(section.getTitle());
headerString.append("</td>\n");
13 years, 5 months
[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java | 6 +++---
modules/enterprise/gui/coregui/src/main/webapp/images/types/GroupDefinition_24.png |binary
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3a6da41cd4549d5ab71d9770ecd84642266f9dd0
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Nov 29 17:06:28 2010 -0500
show the downed server icon to be consistent with other views
add new 24px group def icon and show it
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 2340ec4..2120978 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
@@ -189,7 +189,8 @@ public class InventoryView extends AbstractSectionedLeftNavigationView {
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());
+ .view_inventory_downServers(), ImageManager.getResourceLargeIcon(ResourceCategory.SERVER,
+ Boolean.FALSE));
}
});
@@ -201,9 +202,8 @@ public class InventoryView extends AbstractSectionedLeftNavigationView {
NavigationItem dynagroupDefinitionsItem = new NavigationItem(PAGE_DYNAGROUP_DEFINITIONS,
"types/GroupDefinition_16.png", new ViewFactory() {
public Canvas createView() {
- // TODO: Do we have a 24x24 groupdef icon?
return new GroupDefinitionListView(extendLocatorId(PAGE_DYNAGROUP_DEFINITIONS.getName()),
- "types/GroupDefinition_16.png");
+ "types/GroupDefinition_24.png");
}
}, this.globalPermissions.contains(Permission.MANAGE_INVENTORY));
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/types/GroupDefinition_24.png b/modules/enterprise/gui/coregui/src/main/webapp/images/types/GroupDefinition_24.png
new file mode 100644
index 0000000..3289d81
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/types/GroupDefinition_24.png differ
13 years, 5 months
[rhq] modules/enterprise
by mazz
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(a)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
13 years, 5 months
[rhq] modules/core modules/enterprise
by mazz
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);
}
13 years, 5 months
[rhq] modules/core
by mazz
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ResourceGroupComposite.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit a94e2652d4c7c413c58e384fdff1000ab0124306
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Nov 29 15:34:36 2010 -0500
this is a domain object, can't use coregui stuff
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 1c0ff4d..2a19c82 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,7 +30,6 @@ 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
@@ -187,12 +186,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=\"" + ImageManager.getAvailabilityIcon(null) + "\" /> 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=\"" + ImageManager.getAvailabilityIcon(Boolean.TRUE)
+ results.append(getColumn(false, " <img src=\"" + "subsystems/availability/availability_green_16.png"
+ "\" />", up));
}
@@ -201,7 +201,7 @@ public class ResourceGroupComposite implements Serializable {
}
if (down > 0) {
- results.append(getColumn(false, " <img src=\"" + ImageManager.getAvailabilityIcon(Boolean.FALSE)
+ results.append(getColumn(false, " <img src=\"" + "subsystems/availability/availability_red_16.png"
+ "\" />", down));
} else {
results.append(getColumn(false,
13 years, 5 months
[rhq] Changes to 'unitils'
by John Sanda
New branch 'unitils' available with the following commits:
commit 0e666c041b3047c5a8919325615569c0d95a06d7
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Oct 26 09:01:32 2010 -0400
Refactoring tests to use unitils instead of the embedded ejb container
13 years, 5 months