modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
| 9 ++++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
| 3 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
| 4 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
| 3 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHLayout.java
| 3 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableLayout.java
| 3 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableToolStrip.java
| 15 ++++++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVLayout.java
| 3 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVStack.java
| 3 --
9 files changed, 25 insertions(+), 21 deletions(-)
New commits:
commit c37617a8384f6770ba578a3f604348687ad9cfc6
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Feb 1 18:25:02 2011 -0500
Fix a selenium locator issue with the top level view titles.
- use locatable layouts as opposed to standard for default views
- removethe special onDestroy() logic for LocatableToolStrip (not sure why
this was not right, not sure ToolStrip is behaving as expected).
- change other Layout onDestroy() impls to remove members prior to calling
super.onDestroy().
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 fd59cf6..beea6da 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
@@ -259,10 +259,13 @@ public class CoreGUI implements EntryPoint,
ValueChangeHandler<String> {
}
public static void setContent(Canvas newContent) {
- Canvas contentCanvas = Canvas.getById(CONTENT_CANVAS_ID);
- for (Canvas child : contentCanvas.getChildren()) {
- child.destroy();
+ if (content != null) {
+ content.removeFromParent();
+ content.destroy();
+ content = null;
}
+
+ Canvas contentCanvas = Canvas.getById(CONTENT_CANVAS_ID);
if (newContent != null) {
content = newContent;
contentCanvas.addChild(newContent);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
index 723d87d..b0078d6 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
@@ -37,6 +37,7 @@ import
org.rhq.enterprise.gui.coregui.client.components.view.NavigationItem;
import org.rhq.enterprise.gui.coregui.client.components.view.NavigationSection;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewFactory;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
* The Administration top-level view.
@@ -90,7 +91,7 @@ public class AdministrationView extends
AbstractSectionedLeftNavigationView {
}
protected VLayout defaultView() {
- VLayout vLayout = new VLayout();
+ LocatableVLayout vLayout = new
LocatableVLayout(this.extendLocatorId("Default"));
vLayout.setWidth100();
// TODO: Admin icon.
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 2e3d919..b32775f 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
@@ -26,7 +26,6 @@ import java.util.Set;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.Label;
-import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.measurement.AvailabilityType;
@@ -47,6 +46,7 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.groups.definitions.GroupD
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.discovery.ResourceAutodiscoveryView;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
* The Inventory top-level view.
@@ -101,7 +101,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView
{
}
protected Canvas defaultView() {
- VLayout vLayout = new VLayout();
+ LocatableVLayout vLayout = new
LocatableVLayout(this.extendLocatorId("Default"));
vLayout.setWidth100();
// TODO: Admin icon.
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 5b0cd5c..4349039 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
@@ -48,6 +48,7 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configura
import org.rhq.enterprise.gui.coregui.client.report.measurement.MeasurementOOBView;
import
org.rhq.enterprise.gui.coregui.client.report.operation.SubsystemOperationHistoryListView;
import org.rhq.enterprise.gui.coregui.client.report.tag.TaggedView;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
* The Reports top-level view.
@@ -82,7 +83,7 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView
{
@Override
protected VLayout defaultView() {
- VLayout vLayout = new VLayout();
+ LocatableVLayout vLayout = new
LocatableVLayout(this.extendLocatorId("Default"));
vLayout.setWidth100();
// TODO: Admin icon.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHLayout.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHLayout.java
index 8a72774..6729210 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHLayout.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHLayout.java
@@ -53,9 +53,8 @@ public class LocatableHLayout extends HLayout implements Locatable {
@Override
protected void onDestroy() {
- super.onDestroy();
-
destroyMembers();
+ super.onDestroy();
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableLayout.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableLayout.java
index 8f8311c..efe2894 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableLayout.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableLayout.java
@@ -37,9 +37,8 @@ public class LocatableLayout extends Layout implements Locatable {
@Override
protected void onDestroy() {
- super.onDestroy();
-
destroyMembers();
+ super.onDestroy();
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableToolStrip.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableToolStrip.java
index 13db7f8..6e7a2ac 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableToolStrip.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableToolStrip.java
@@ -35,11 +35,14 @@ public class LocatableToolStrip extends ToolStrip implements Locatable
{
SeleniumUtility.destroyMembers(this);
}
- @Override
- protected void onDestroy() {
- super.onDestroy();
-
- destroyMembers();
- }
+ // It was my understanding that Layouts needed explicit removal of members but it
seems
+ // that ToolStrip may treat its members differently. The logic below actually caused
issues because
+ // the member was being destroyed automatically.
+ //
+ //@Override
+ //protected void onDestroy() {
+ // destroyMembers();
+ // super.onDestroy();
+ //}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVLayout.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVLayout.java
index d91f9cd..54f081c 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVLayout.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVLayout.java
@@ -53,9 +53,8 @@ public class LocatableVLayout extends VLayout implements Locatable {
@Override
protected void onDestroy() {
- super.onDestroy();
-
destroyMembers();
+ super.onDestroy();
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVStack.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVStack.java
index c6dfafd..4a86ee4 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVStack.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVStack.java
@@ -53,9 +53,8 @@ public class LocatableVStack extends VStack implements Locatable {
@Override
protected void onDestroy() {
- super.onDestroy();
-
destroyMembers();
+ super.onDestroy();
}
}
Show replies by date