modules/core/domain/src/main/java/org/rhq/core/domain/criteria/TaggedCriteria.java | 9 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/InventoryView.java | 26 +++++----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java | 8 +-- 3 files changed, 25 insertions(+), 18 deletions(-)
New commits: commit a0e563db21d42cc467bd4e8102d1ae9dd2db450f Author: Joseph Marques joseph@redhat.com Date: Thu Sep 23 07:41:39 2010 -0400
make sure to create contentCanvas and sectionStack early
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/InventoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/InventoryView.java index c6d5289..01f23a2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/InventoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/InventoryView.java @@ -95,6 +95,19 @@ public class InventoryView extends LocatableHLayout implements BookmarkableView protected void onInit() { super.onInit();
+ setWidth100(); + setHeight100(); + + contentCanvas = new Canvas(); + contentCanvas.setWidth("*"); + contentCanvas.setHeight100(); + + sectionStack = new LocatableSectionStack(getLocatorId()); + sectionStack.setShowResizeBar(true); + sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE); + sectionStack.setWidth(250); + sectionStack.setHeight100(); + GWTServiceLookup.getAuthorizationService().getExplicitGlobalPermissions(new AsyncCallback<Set<Permission>>() { @Override public void onFailure(Throwable caught) { @@ -111,19 +124,6 @@ public class InventoryView extends LocatableHLayout implements BookmarkableView }
private void finishOnInit(Set<Permission> globalPermissions) { - setWidth100(); - setHeight100(); - - contentCanvas = new Canvas(); - contentCanvas.setWidth("*"); - contentCanvas.setHeight100(); - - sectionStack = new LocatableSectionStack(getLocatorId()); - sectionStack.setShowResizeBar(true); - sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE); - sectionStack.setWidth(250); - sectionStack.setHeight100(); - buildResourcesSection(globalPermissions); buildGroupsSection(globalPermissions);
commit 3321fe23ca85876b6fff148737f6a58112e2c6c1 Author: Joseph Marques joseph@redhat.com Date: Thu Sep 23 06:51:22 2010 -0400
never change the internal state of a Criteria object, if the filter is NULL
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/TaggedCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/TaggedCriteria.java index 6ef2ce6..effbb4e 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/TaggedCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/TaggedCriteria.java @@ -51,6 +51,9 @@ public abstract class TaggedCriteria extends Criteria { }
public void addFilterTagNamespace(String filterTagNamespace) { + if (filterTagNamespace == null) { + return; // do nothing if the filter is empty + } if (this.filterTag == null) { this.filterTag = new Tag(); } @@ -58,6 +61,9 @@ public abstract class TaggedCriteria extends Criteria { }
public void addFilterTagSemantic(String filterTagSemantic) { + if (filterTagSemantic == null) { + return; // do nothing if the filter is empty + } if (this.filterTag == null) { this.filterTag = new Tag(); } @@ -65,6 +71,9 @@ public abstract class TaggedCriteria extends Criteria { }
public void addFilterTagName(String filterTagName) { + if (filterTagName == null) { + return; // do nothing if the filter is empty + } if (this.filterTag == null) { this.filterTag = new Tag(); }
commit 37633f6d8e7f5ceb222a415db1b9521258d46adf Author: Joseph Marques joseph@redhat.com Date: Thu Sep 23 06:45:10 2010 -0400
fix tagged view, so all tables that are tiled under it render correctly
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java index 981852e..66ff323 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java @@ -25,7 +25,6 @@ package org.rhq.enterprise.gui.coregui.client.report.tag; import java.util.ArrayList;
import com.smartgwt.client.data.Criteria; -import com.smartgwt.client.data.SortSpecifier;
import org.rhq.core.domain.tagging.Tag; import org.rhq.enterprise.gui.coregui.client.BookmarkableView; @@ -91,10 +90,6 @@ public class TaggedView extends LocatableVLayout implements BookmarkableView { tileLayout.setTileWidth(getWidth() / 2 - 20); addMember(tileLayout);
- ResourceSearchView resourceView = new ResourceSearchView(getLocatorId(), criteria, "Tagged Resources", - new SortSpecifier[] {}, new String[] { "pluginName", "category", "currentAvailability" }); - tiles.add(resourceView); - BundlesListView bundlesView = new BundlesListView(getLocatorId(), criteria); tiles.add(bundlesView);
@@ -108,6 +103,9 @@ public class TaggedView extends LocatableVLayout implements BookmarkableView { criteria); tiles.add(bundleDestinationListView);
+ ResourceSearchView resourceView = new ResourceSearchView(getLocatorId(), criteria, "Tagged Resources"); + tiles.add(resourceView); + for (Table t : tiles) { t.setShowFooter(false); tileLayout.addTile(t);
rhq-commits@lists.fedorahosted.org