[rhq] 2 commits - modules/enterprise

mike thompson mithomps at fedoraproject.org
Wed Aug 8 18:51:40 UTC 2012


 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java |   28 ++++++++--
 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties                               |    1 
 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties                            |    1 
 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties                            |    1 
 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties                            |    1 
 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties                            |    1 
 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties                            |    1 
 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties                            |    1 
 8 files changed, 31 insertions(+), 4 deletions(-)

New commits:
commit 15552573391da403073ea1c27a8a9a5ffc969e65
Author: mtho11 <mikecthompson at gmail.com>
Date:   Wed Aug 8 11:45:51 2012 -0700

    [BZ 845389 - Group without members with unknown status appears in every availability search result] Get rid of superfluous empty groups that show up as unknown availability.

diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
index 72f25a4..9f640dc 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
@@ -26,6 +26,7 @@ import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGro
 import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.PLUGIN;
 import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.TYPE;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -50,6 +51,7 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager;
 import org.rhq.enterprise.gui.coregui.client.Messages;
 import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
 import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
 import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
 import org.rhq.enterprise.gui.coregui.client.util.message.Message;
 
@@ -110,7 +112,7 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
     }
 
     @Override
-    public void executeFetch(final DSRequest request, final DSResponse response, ResourceGroupCriteria criteria) {
+    public void executeFetch(final DSRequest request, final DSResponse response, final ResourceGroupCriteria criteria ) {
         groupService.findResourceGroupCompositesByCriteria(criteria,
             new AsyncCallback<PageList<ResourceGroupComposite>>() {
                 public void onFailure(Throwable caught) {
@@ -123,10 +125,25 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
                     response.setStatus(RPCResponse.STATUS_FAILURE);
                     processResponse(request.getRequestId(), response);
                 }
+                
+                private PageList<ResourceGroupComposite> filterEmptyMemberGroups(ResourceGroupCriteria groupCriteria,
+                                                                                 PageList<ResourceGroupComposite> result){
+
+                    PageList<ResourceGroupComposite> pageList = new PageList<ResourceGroupComposite>(result.getPageControl());
+
+                    for (ResourceGroupComposite rgc : result) {
+                        if (rgc.getExplicitCount() > 0 ){
+                            pageList.add(rgc);
+                        }
+                    }
+
+                    return pageList;
+                }
 
                 public void onSuccess(PageList<ResourceGroupComposite> result) {
-                    response.setData(buildRecords(result));
-                    response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set
+                    PageList<ResourceGroupComposite> filteredResult =    filterEmptyMemberGroups(criteria,result);
+                    response.setData(buildRecords(filteredResult));
+                    response.setTotalRows(filteredResult.getTotalSize()); // for paging to work we have to specify size of full result set
                     processResponse(request.getRequestId(), response);
                 }
             });


commit 8ead20e62a892e10b12ed70c20a8b1c4e55ff024
Author: mtho11 <mikecthompson at gmail.com>
Date:   Tue Aug 7 14:27:26 2012 -0700

    Add i18n messages for ResourceGroupCompositeDataSource

diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
index 2abefa1..72f25a4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
@@ -47,6 +47,7 @@ import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
 import org.rhq.core.domain.util.PageList;
 import org.rhq.enterprise.gui.coregui.client.CoreGUI;
 import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.Messages;
 import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
 import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync;
 import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
@@ -57,6 +58,8 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message;
  */
 public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGroupComposite, ResourceGroupCriteria> {
 
+    private static final Messages MSG = CoreGUI.getMessages();
+
     public static final String FILTER_GROUP_IDS = "resourceGroupIds";
 
     ResourceGroupGWTServiceAsync groupService = GWTServiceLookup.getResourceGroupService();
@@ -112,7 +115,7 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
             new AsyncCallback<PageList<ResourceGroupComposite>>() {
                 public void onFailure(Throwable caught) {
                     if (caught.getMessage().contains("SearchExpressionException")) {
-                        Message message = new Message("Invalid search expression.", Message.Severity.Error);
+                        Message message = new Message(MSG.search_invalid_search_expression(), Message.Severity.Error);
                         CoreGUI.getMessageCenter().notify(message);
                     } else {
                         CoreGUI.getErrorHandler().handleError(MSG.view_inventory_groups_loadFailed(), caught);
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index a558db1..f9b75f3 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -413,6 +413,7 @@ filter_from_date = From
 filter_to_date = To
 group_tree_groupOfResourceType = Group of [{0}]
 group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource
+search_invalid_search_expression = Invalid search expression.
 search_failed_to_save_search = Failed to Save Search: {0}
 search_failed_to_retrieve_saved_search = Failed to retrieve saved search
 search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
index b146b3d..11c4488 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
@@ -432,6 +432,7 @@ filter_from_date = Od
 filter_to_date = Do
 group_tree_groupOfResourceType = Skupina: [{0}]
 group_tree_partialClusterTooltip = {0} z {1} členů skupiny má "{2}" zdroj
+##search_invalid_search_expression = Invalid search expression.
 ##search_failed_to_save_search = Failed to Save Search: {0}
 ##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
 ##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index 7b9effe..71d8367 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -397,6 +397,7 @@ filter_from_date = Von
 filter_to_date = Bis
 ##group_tree_groupOfResourceType = Group of [{0}]
 group_tree_partialClusterTooltip = {0} der {1} Gruppenmitglieder haben eine ''{2}'' Ressource
+##search_invalid_search_expression = Invalid search expression.
 ##search_failed_to_save_search = Failed to Save Search: {0}
 ##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
 ##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
index b7c191e..33e39c8 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
@@ -410,6 +410,7 @@ filter_from_date = 開始
 filter_to_date = 終了
 ##group_tree_groupOfResourceType = Group of [{0}]
 group_tree_partialClusterTooltip = {1} の中の {0} グループメンバーが ''{2}'' リソースを持っています
+##search_invalid_search_expression = Invalid search expression.
 ##search_failed_to_save_search = Failed to Save Search: {0}
 ##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
 ##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
index 72b2f34..2c1af7e 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
@@ -416,6 +416,7 @@ favorites_resources = Recursos Favoritos
 ##filter_to_date = To
 ##group_tree_groupOfResourceType = Group of [{0}]
 group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource
+##search_invalid_search_expression = Invalid search expression.
 ##search_failed_to_save_search = Failed to Save Search: {0}
 ##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
 ##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
index 5a44858..29a3fa6 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
@@ -403,6 +403,7 @@
 #filter_from_date = From
 #filter_to_date = To
 #group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource
+##search_invalid_search_expression = Invalid search expression.
 ##search_failed_to_save_search = Failed to Save Search: {0}
 ##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
 ##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
index 6ae9e47..cd7f97f 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
@@ -405,6 +405,7 @@ favorites_resources = \u8d44\u6e90\u6536\u85cf\u5939
 ##filter_to_date = To
 ##group_tree_groupOfResourceType = Group of [{0}]
 group_tree_partialClusterTooltip = \u9664\u53bb {1},{0}\u7684\u7ec4\u6210\u5458\u62e5\u6709 \u4e00\u4e2a''{2}''\u8d44\u6e90
+##search_invalid_search_expression = Invalid search expression.
 ##search_failed_to_save_search = Failed to Save Search: {0}
 ##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
 ##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion




More information about the rhq-commits mailing list