modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
| 5 +++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
| 11 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java
| 10 ++++-----
3 files changed, 15 insertions(+), 11 deletions(-)
New commits:
commit 5a945cfca6b3b1b046b439d9dd1f4ea878a288a5
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Feb 23 17:27:26 2011 -0500
a few locator fixes; clear message bar when user goes to a new url
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
index 7d06d1d..6f447ff 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
@@ -367,7 +367,10 @@ public class CoreGUI implements EntryPoint,
ValueChangeHandler<String> {
// default view
History.newItem(DEFAULT_VIEW_PATH);
} else {
- if (pendingMessage != null) {
+ messageBar.clearMessage(true);
+
+ if (
+ pendingMessage != null) {
getMessageCenter().notify(pendingMessage);
pendingMessage = null;
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
index 9300960..a2e1f04 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
+ * Copyright (C) 2005-2011 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -49,6 +49,7 @@ import org.rhq.core.domain.authz.Role;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.Messages;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVStack;
/**
@@ -142,7 +143,7 @@ public class PermissionsEditor extends LocatableVStack {
}
private ListGrid createGlobalPermissionsGrid() {
- ListGrid grid = createPermissionsGrid();
+ ListGrid grid = createPermissionsGrid("GlobalPermissions");
// TODO: Add table title.
@@ -182,7 +183,7 @@ public class PermissionsEditor extends LocatableVStack {
}
private ListGrid createResourcePermissionsGrid() {
- ListGrid grid = createPermissionsGrid();
+ ListGrid grid = createPermissionsGrid("ResourcePermissions");
// TODO: Add table title.
ListGridField iconField = createIconField();
@@ -290,8 +291,8 @@ public class PermissionsEditor extends LocatableVStack {
return iconField;
}
- private ListGrid createPermissionsGrid() {
- ListGrid grid = new ListGrid();
+ private LocatableListGrid createPermissionsGrid(String id) {
+ LocatableListGrid grid = new LocatableListGrid(extendLocatorId(id));
grid.setAutoFitData(Autofit.BOTH);
grid.setWrapCells(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java
index 1731a7a..b28c6ce 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java
@@ -22,12 +22,12 @@ package org.rhq.enterprise.gui.coregui.client.util.message;
import com.google.gwt.user.client.Timer;
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.types.Overflow;
-import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.events.DoubleClickEvent;
import com.smartgwt.client.widgets.events.DoubleClickHandler;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLabel;
/**
* A bar for displaying a message at the top of a page - the equivalent of the JSF
h:messages component.
@@ -39,7 +39,7 @@ public class MessageBar extends LocatableHLayout implements
MessageCenter.Messag
private static final String LOCATOR_ID = "MessageBar";
private static final int AUTO_HIDE_DELAY_MILLIS = 30000;
- private Label label = new Label();
+ private LocatableLabel label = new
LocatableLabel(extendLocatorId("Label"));
private Message stickyMessage;
private static final String NON_BREAKING_SPACE = " ";
@@ -64,7 +64,7 @@ public class MessageBar extends LocatableHLayout implements
MessageCenter.Messag
setLabelEmpty();
addMember(label);
- // sometimes its annoying to have the error message hang around for too long
+ // sometimes it's annoying to have the error message hang around for too
long;
// let the user click the message so it goes away on demand
addDoubleClickHandler(new DoubleClickHandler() {
@Override
@@ -98,7 +98,7 @@ public class MessageBar extends LocatableHLayout implements
MessageCenter.Messag
}
}
- private void clearMessage(boolean clearSticky) {
+ public void clearMessage(boolean clearSticky) {
setLabelEmpty();
markForRedraw();
@@ -121,7 +121,7 @@ public class MessageBar extends LocatableHLayout implements
MessageCenter.Messag
String styleName = (contents != null) ? message.getSeverity().getStyle() : null;
label.setStyleName(styleName);
- // TODO: Create some custom edge images in greed, yellow, red, etc. so we can add
nice rounded corners to the
+ // TODO: Create some custom edge images in green, yellow, red, etc. so we can add
nice rounded corners to the
// label.
//label.setShowEdges(true);
Show replies by date