modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 16 ++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 35 ++++++---- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ObjectFilter.java | 3 3 files changed, 34 insertions(+), 20 deletions(-)
New commits: commit 2dfc4a34aa925d2683bb6dff736e5154fbe6c443 Author: Ian Springer ian.springer@redhat.com Date: Wed Mar 23 13:21:21 2011 -0400
some changes to locators in Table sub-widgets to make sure locators are hierarchal
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java index 9d1c1ba..c68da84 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java @@ -458,11 +458,12 @@ public class ConfigurationEditor extends LocatableVLayout { Menu menu = new LocatableMenu(toolStrip.extendLocatorId("JumpMenu")); for (SectionStackSection section : sectionStack.getSections()) { MenuItem item = new MenuItem(section.getTitle()); + item.setAttribute("name", section.getName()); item.addClickHandler(new ClickHandler() { public void onClick(MenuItemClickEvent event) { - int x = event.getMenu().getItemNum(event.getItem()); - sectionStack.expandSection(x); - sectionStack.showSection(x); + int index = event.getMenu().getItemNum(event.getItem()); + sectionStack.expandSection(index); + sectionStack.showSection(index); } }); menu.addItem(item); @@ -491,13 +492,14 @@ public class ConfigurationEditor extends LocatableVLayout { section = new SectionStackSection(MSG.common_title_generalProp()); section.setExpanded(true); } else { - section = new SectionStackSection( - "<div style="float:left; font-weight: bold;">" + String title = "<div style="float:left; font-weight: bold;">" + group.getDisplayName() + "</div>" + (group.getDescription() != null ? ("<div style='padding-left: 10px; font-weight: normal; font-size: smaller; float: left;'>" - + " - " + group.getDescription() + "</div>") - : "")); + + " - " + group.getDescription() + "</div>") + : ""); + section = new SectionStackSection(title); + section.setName(group.getName()); section.setExpanded(!group.isDefaultHidden()); }
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 4864145..b22a79a 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 @@ -52,7 +52,6 @@ import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; import com.smartgwt.client.widgets.events.DoubleClickEvent; import com.smartgwt.client.widgets.events.DoubleClickHandler; -import com.smartgwt.client.widgets.form.DynamicForm; import com.smartgwt.client.widgets.form.fields.FormItem; import com.smartgwt.client.widgets.form.fields.HiddenItem; import com.smartgwt.client.widgets.form.fields.SelectItem; @@ -72,7 +71,6 @@ import com.smartgwt.client.widgets.layout.LayoutSpacer; import com.smartgwt.client.widgets.menu.IMenuButton; import com.smartgwt.client.widgets.menu.MenuItem; import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent; -import com.smartgwt.client.widgets.toolbar.ToolStrip;
import org.rhq.core.domain.search.SearchSubsystem; import org.rhq.enterprise.gui.coregui.client.CoreGUI; @@ -80,11 +78,13 @@ import org.rhq.enterprise.gui.coregui.client.RefreshableView; import org.rhq.enterprise.gui.coregui.client.components.form.SearchBarItem; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; 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.LocatableIButton; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIMenuButton; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableMenu; +import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
@@ -133,8 +133,8 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements private boolean tableActionDisableOverride = false; protected List<Canvas> extraWidgetsAboveFooter = new ArrayList<Canvas>(); protected List<Canvas> extraWidgetsInMainFooter = new ArrayList<Canvas>(); - private ToolStrip footer; - private ToolStrip footerExtraWidgets; + private LocatableToolStrip footer; + private LocatableToolStrip footerExtraWidgets;
public Table(String locatorId) { this(locatorId, null, null, null, null, true); @@ -210,7 +210,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements protected void onInit() { super.onInit();
- contents = new LocatableVLayout(extendLocatorId("tableContents")); + contents = new LocatableVLayout(extendLocatorId("Contents")); contents.setWidth100(); contents.setHeight100(); //contents.setOverflow(Overflow.AUTO); @@ -287,7 +287,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements setTableTitle(this.tableTitle);
if (showHeader) { - titleLayout = new HLayout(); + titleLayout = new LocatableHLayout(contents.extendLocatorId("Title")); titleLayout.setAutoHeight(); titleLayout.setAlign(VerticalAlignment.BOTTOM); contents.addMember(titleLayout, 0); @@ -301,16 +301,16 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
// Footer
- // A second toolstrip that optionaly appears before the main footer - it will contain extra widgets. + // A second toolstrip that optionally appears before the main footer - it will contain extra widgets. // This is hidden from view unless extra widgets are actually added to the table above the main footer. - this.footerExtraWidgets = new ToolStrip(); + this.footerExtraWidgets = new LocatableToolStrip(contents.extendLocatorId("FooterExtraWidgets")); footerExtraWidgets.setPadding(5); footerExtraWidgets.setWidth100(); footerExtraWidgets.setMembersMargin(15); footerExtraWidgets.hide(); contents.addMember(footerExtraWidgets);
- this.footer = new ToolStrip(); + this.footer = new LocatableToolStrip(contents.extendLocatorId("Footer")); footer.setPadding(5); footer.setWidth100(); footer.setMembersMargin(15); @@ -747,7 +747,17 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
public void addTableAction(String locatorId, String title, String confirmation, LinkedHashMap<String, ? extends Object> valueMap, TableAction tableAction) { - TableActionInfo info = new TableActionInfo(locatorId, title, confirmation, valueMap, tableAction); + // If the specified locator ID is qualified, strip off the ancestry prefix, so we can make sure its locator ID + // extends the footer's locator ID as it should. + int underscoreIndex = locatorId.lastIndexOf('_'); + String unqualifiedLocatorId; + if (underscoreIndex >= 0 && underscoreIndex != (locatorId.length() - 1)) { + unqualifiedLocatorId = locatorId.substring(underscoreIndex + 1); + } else { + unqualifiedLocatorId = locatorId; + } + TableActionInfo info = new TableActionInfo(this.footer.extendLocatorId(unqualifiedLocatorId), title, + confirmation, valueMap, tableAction); tableActions.add(info); }
@@ -894,7 +904,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements * * @author Joseph Marques */ - private static class TableFilter extends DynamicForm implements KeyPressHandler, ChangedHandler, + private static class TableFilter extends LocatableDynamicForm implements KeyPressHandler, ChangedHandler, com.google.gwt.event.dom.client.KeyPressHandler {
private Table<?> table; @@ -902,7 +912,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements private HiddenItem hiddenItem;
public TableFilter(Table<?> table) { - super(); + super(table.extendLocatorId("TableFilter")); setWidth100(); setPadding(5); this.table = table; @@ -1050,4 +1060,5 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements protected SearchSubsystem getSearchSubsystem() { return null; } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ObjectFilter.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ObjectFilter.java index e090640..01921e6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ObjectFilter.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ObjectFilter.java @@ -39,7 +39,7 @@ public class ObjectFilter { for (Object object : collection) { filterFields(object, goodFields); } - com.allen_sauer.gwt.log.client.Log.info("Object filtered from size [" + sizeOfBefore + "] to [" + sizeOf(collection) + "]"); + Log.debug("Object filtered from size [" + sizeOfBefore + "] to [" + sizeOf(collection) + "]");
return collection; } @@ -80,4 +80,5 @@ public class ObjectFilter { } return -1; } + }