modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 4 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/SeleniumUtility.java | 15 ---------- 2 files changed, 3 insertions(+), 16 deletions(-)
New commits: commit 4b9236698335f78b081e313040c725d459a9d06d Author: Jay Shaughnessy jshaughn@redhat.com Date: Wed Jan 26 16:18:30 2011 -0500
Fix LogOut menu option to have non-localized html id. Remove related selenium utility that assigned potentially localized ids for Hyperlink widgets.
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 1b3bc8c..2c9e761 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 @@ -52,6 +52,7 @@ public class MenuBarView extends LocatableVLayout {
public static final ViewName[] SECTIONS = { DashboardsView.VIEW_ID, InventoryView.VIEW_ID, ReportTopView.VIEW_ID, BundleTopView.VIEW_ID, AdministrationView.VIEW_ID, HelpView.VIEW_ID }; + public static final ViewName LOGOUT_VIEW_ID = new ViewName("LogOut", MSG.view_menuBar_logout());
private String currentlySelectedSection = DashboardsView.VIEW_ID.getName(); private LocatableLabel userLabel; @@ -160,7 +161,8 @@ public class MenuBarView extends LocatableVLayout { lineLabel.setWidth("10px"); lineLabel.setAlign(Alignment.CENTER);
- Hyperlink logoutLink = SeleniumUtility.setHtmlId(new Hyperlink(MSG.view_menuBar_logout(), "LogOut")); + Hyperlink logoutLink = SeleniumUtility.setHtmlId(new Hyperlink(LOGOUT_VIEW_ID.getTitle(), LOGOUT_VIEW_ID + .getName()), LOGOUT_VIEW_ID.getName()); logoutLink.setWidth("50px");
layout.addMember(userLabel); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/SeleniumUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/SeleniumUtility.java index 43893a6..60291bc 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/SeleniumUtility.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/SeleniumUtility.java @@ -1,6 +1,5 @@ package org.rhq.enterprise.gui.coregui.client.util.selenium;
-import com.google.gwt.user.client.ui.Hyperlink; import com.google.gwt.user.client.ui.UIObject; import com.smartgwt.client.widgets.BaseWidget; import com.smartgwt.client.widgets.Canvas; @@ -99,20 +98,6 @@ public class SeleniumUtility { }
/** - * A utility for assigning an ID to a gwt Hyperlink. For a smartgwt widget - * use {@link setId(BaseWidget)}. Any current ID will be overwritten. The algorithm is: - * <pre> - * Equivalent to setHtmlId(hyperlink, hyperlink.getText()); - * </pre> - * - * @param hyperlink - * @return the updated hyperlink - */ - static public <T extends Hyperlink> T setHtmlId(final T hyperlink) { - return setHtmlId(hyperlink, hyperlink.getText()); - } - - /** * Use only if you are sure the unsafeId is not null or empty, or if DEFAULT_ID is acceptable. * <pre> * Equivalent to: