modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java | 4 +++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java | 10 ++++++---- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 5 ----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTopView.java | 6 +----- 4 files changed, 10 insertions(+), 15 deletions(-)
New commits: commit 6415d67bc516e445ef5bbd3d77b6cc07e9e3a706 Author: Greg Hinkle ghinkle@redhat.com Date: Thu Aug 26 13:22:16 2010 -0400
removed erroneous subtab destroy before display... fixed detail view freezes
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java index 0b2037d..6c579ce 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java @@ -145,11 +145,13 @@ public class SubTabLayout extends LocatableVLayout { }
public void updateSubTab(SubTab subTab) { + // Destroy old views so they don't leak - Canvas oldCanvas = subTab.getCanvas(); - if (oldCanvas != null) { - oldCanvas.destroy(); - } + // TODO: You've already leaked because the subtab has already had its canvas replaced. +// Canvas oldCanvas = subTab.getCanvas(); +// if (oldCanvas != null) { +// oldCanvas.destroy(); +// }
String locatorId = subTab.getLocatorId(); subtabs.put(locatorId, subTab); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java index f6554ff..75c8f9a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java @@ -113,11 +113,6 @@ public class ResourceDetailView extends LocatableVLayout implements Bookmarkable
public ResourceDetailView(String locatorId) { super(locatorId); - } - - @Override - protected void onDraw() { - super.onDraw();
setWidth100(); setHeight100(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTopView.java index 7882473..0476dd1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTopView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTopView.java @@ -41,15 +41,11 @@ public class ResourceTopView extends LocatableHLayout implements BookmarkableVie
public ResourceTopView(String locatorId) { super(locatorId); - } - - @Override - protected void onInit() { - super.onInit();
setWidth100(); setHeight100();
+ treeView = new ResourceTreeView(getLocatorId()); addMember(treeView);
commit 400668a5071d680d37d6161fead802a139bc2147 Author: Greg Hinkle ghinkle@redhat.com Date: Wed Aug 25 10:57:55 2010 -0400
Fixed NPE in selector destory
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java index 0a46217..1617a2d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java @@ -271,7 +271,9 @@ public abstract class AbstractSelector<T> extends LocatableVLayout { removeButton.destroy(); addAllButton.destroy(); removeAllButton.destroy(); - availableFilterForm.destroy(); + if (availableFilterForm != null) { + availableFilterForm.destroy(); + } }
protected void updateButtons() {
rhq-commits@lists.fedorahosted.org