modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java | 45 ++++++---- 1 file changed, 30 insertions(+), 15 deletions(-)
New commits: commit c88234e57e3d97601bcc4750f6800a644a734d40 Author: Jay Shaughnessy jshaughn@redhat.com Date: Mon Jan 16 10:55:05 2012 -0500
Fix clipped title for category in group list views. This icon field does not need a column title.
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 a6740c0..d3d7ed2 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 @@ -18,11 +18,29 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.groups;
+import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.AVAIL_CHILDREN; +import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.AVAIL_DESCENDANTS; +import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.CATEGORY; +import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.DESCRIPTION; +import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.NAME; +import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.PLUGIN; +import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.TYPE; + import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.Criteria; import com.smartgwt.client.types.Alignment; -import com.smartgwt.client.widgets.events.*; -import com.smartgwt.client.widgets.grid.*; +import com.smartgwt.client.widgets.events.ClickEvent; +import com.smartgwt.client.widgets.events.ClickHandler; +import com.smartgwt.client.widgets.events.CloseClickEvent; +import com.smartgwt.client.widgets.events.CloseClickHandler; +import com.smartgwt.client.widgets.events.DoubleClickEvent; +import com.smartgwt.client.widgets.events.DoubleClickHandler; +import com.smartgwt.client.widgets.grid.CellFormatter; +import com.smartgwt.client.widgets.grid.HoverCustomizer; +import com.smartgwt.client.widgets.grid.ListGrid; +import com.smartgwt.client.widgets.grid.ListGridField; +import com.smartgwt.client.widgets.grid.ListGridRecord; + import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.resource.group.GroupCategory; import org.rhq.core.domain.search.SearchSubsystem; @@ -32,6 +50,7 @@ import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.PopupWindow; import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction; import org.rhq.enterprise.gui.coregui.client.components.table.AuthorizedTableAction; +import org.rhq.enterprise.gui.coregui.client.components.table.IconField; import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; @@ -42,8 +61,6 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
-import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.*; - /** * @author Greg Hinkle * @author Joseph Marques @@ -90,9 +107,7 @@ public class ResourceGroupListView extends Table<ResourceGroupCompositeDataSourc ListGridField idField = new ListGridField("id", MSG.common_title_id()); idField.setWidth(50);
- ListGridField categoryField = new ListGridField(CATEGORY.propertyName(), CATEGORY.title()); - categoryField.setWidth(25); - categoryField.setAlign(Alignment.CENTER); + IconField categoryField = new IconField(CATEGORY.propertyName()); categoryField.setCellFormatter(new CellFormatter() { public String format(Object value, ListGridRecord record, int rowNum, int colNum) { String categoryName = (String) value; @@ -108,14 +123,14 @@ public class ResourceGroupListView extends Table<ResourceGroupCompositeDataSourc GroupCategory category = GroupCategory.valueOf(categoryName); String displayName; switch (category) { - case COMPATIBLE: - displayName = MSG.view_group_summary_compatible(); - break; - case MIXED: - displayName = MSG.view_group_summary_mixed(); - break; - default: - throw new IllegalStateException("Unknown group category: " + category); + case COMPATIBLE: + displayName = MSG.view_group_summary_compatible(); + break; + case MIXED: + displayName = MSG.view_group_summary_mixed(); + break; + default: + throw new IllegalStateException("Unknown group category: " + category); } return displayName; }
rhq-commits@lists.fedorahosted.org