modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/tab/SubTabLayout.java
| 11 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/searchbar/EnhancedSearchBar.java
| 1
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit b43b869329cf61b7fe48766f71b2226b24043254
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Nov 1 13:25:15 2013 -0400
[Bug 1011592] Search bar placed over the main menu on navigating to Connection
Settings tab of a compatible group
Fix an issue with the destroy() impl of EnhancedSearchBar. But the main fix
is to SubTabLayout.destroyViews(). When destroying the subtab views for
a tab, make sure to set the currently displayed subtab to null. Previously is
looked like we were still diasplaying a canvas, and subsequent calls, such as
to hide(), would force the canvas to be created, only to be able to hide it.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/tab/SubTabLayout.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/tab/SubTabLayout.java
index 2228ae8..5398916 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/tab/SubTabLayout.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/tab/SubTabLayout.java
@@ -95,8 +95,8 @@ public class SubTabLayout extends EnhancedVLayout {
}
/**
- * Make subTab visible.
- *
+ * Make subTab visible.
+ *
* @param subTab not null
*/
public void showSubTab(SubTab subTab) {
@@ -137,7 +137,7 @@ public class SubTabLayout extends EnhancedVLayout {
/**
* Make subTab not visible. Keeps any associated Canvas.
- *
+ *
* @param subTab not null
*/
public void hideSubTab(SubTab subTab) {
@@ -207,7 +207,7 @@ public class SubTabLayout extends EnhancedVLayout {
}
}
- /**
+ /**
* @return true if not visible or disabled
*/
public boolean isSubTabDisabled(SubTab subTab) {
@@ -289,7 +289,7 @@ public class SubTabLayout extends EnhancedVLayout {
}
public SubTab getDefaultSubTab() {
- // the default subTab is the first one in the set that is visible and not
disabled
+ // the default subTab is the first one in the set that is visible and not
disabled
for (SubTab subTab : this.subTabs.values()) {
if (!isSubTabDisabled(subTab)) {
return subTab;
@@ -418,6 +418,7 @@ public class SubTabLayout extends EnhancedVLayout {
for (SubTab subTab : subTabs.values()) {
subTab.destroyCanvas();
}
+ this.currentlyDisplayed = null;
}
private void setCurrentlySelected(boolean showCanvas) {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/searchbar/EnhancedSearchBar.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/searchbar/EnhancedSearchBar.java
index 0b87cff..1074999 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/searchbar/EnhancedSearchBar.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/searchbar/EnhancedSearchBar.java
@@ -448,5 +448,6 @@ public class EnhancedSearchBar extends EnhancedToolStrip {
if (null != pickListGrid) {
pickListGrid.destroy();
}
+ super.destroy();
}
}
Show replies by date