[rhq] 2 commits - modules/enterprise

mike thompson mithomps at fedoraproject.org
Fri Aug 10 17:31:10 UTC 2012


 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java |    6 ++----
 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java                     |    6 +-----
 2 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 579776f3fe66776d0b013bf13eba8114fe7ff89a
Author: Mike Thompson <mithomps at redhat.com>
Date:   Thu Aug 9 13:53:35 2012 -0700

    Remove unused parameter. Ended up not needing the criteria parameter.

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 9f640dc..e269475 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,7 +26,6 @@ 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;
@@ -126,8 +125,7 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
                     processResponse(request.getRequestId(), response);
                 }
                 
-                private PageList<ResourceGroupComposite> filterEmptyMemberGroups(ResourceGroupCriteria groupCriteria,
-                                                                                 PageList<ResourceGroupComposite> result){
+                private PageList<ResourceGroupComposite> filterEmptyMemberGroups(PageList<ResourceGroupComposite> result){
 
                     PageList<ResourceGroupComposite> pageList = new PageList<ResourceGroupComposite>(result.getPageControl());
 
@@ -141,7 +139,7 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
                 }
 
                 public void onSuccess(PageList<ResourceGroupComposite> result) {
-                    PageList<ResourceGroupComposite> filteredResult =    filterEmptyMemberGroups(criteria,result);
+                    PageList<ResourceGroupComposite> filteredResult =    filterEmptyMemberGroups(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 901fc3d0ecb9b5f800c6c5c3dc59dabebb61a87c
Author: Mike Thompson <mithomps at redhat.com>
Date:   Wed Aug 8 17:33:53 2012 -0700

    Take out search optimization of not doing a search if the search term is the same as the last search. This is causing some stickiness and sometimes the search doesnt run if it was already cached and it thinks it has done a search but it hasnt (probably because of timing issues).

diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java
index f56c81e..e0e004d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java
@@ -48,7 +48,6 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message;
  */
 public class BasicSearchStrategy extends AbstractSearchStrategy {
 
-    private String lastExpression;
 
     public BasicSearchStrategy(EnhancedSearchBar searchBar) {
         super(searchBar);
@@ -175,12 +174,9 @@ public class BasicSearchStrategy extends AbstractSearchStrategy {
     private void getTabAwareSearchSuggestions(final SearchSubsystem searchSubsystem, final String expression,
         int caretPosition) {
 
-        if (null != expression && expression.equals(lastExpression)) {
-            // short-circuit if we dont really need to do a search
-            Log.debug("search tab aware Suggestions: ignoring duplicate search for: " + expression);
+        if(null == expression || expression.isEmpty()){
             return;
         }
-        lastExpression = expression;
 
         final long suggestStart = System.currentTimeMillis();
 




More information about the rhq-commits mailing list