modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/AbstractSearchStrategy.java | 7 ++----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java | 7 +++++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java | 4 +++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java | 5 +++++ 4 files changed, 15 insertions(+), 8 deletions(-)
New commits: commit c38db268a77276c2ad26c0bc33ed652506f6a54c Author: Mike Thompson mithomps@redhat.com Date: Wed Jun 20 15:39:40 2012 -0700
Make initial population bugfix.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/AbstractSearchStrategy.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/AbstractSearchStrategy.java index 35f45df..4718fd1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/AbstractSearchStrategy.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/AbstractSearchStrategy.java @@ -18,19 +18,16 @@ */ package org.rhq.enterprise.gui.coregui.client.searchbar;
-import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.widgets.form.fields.events.KeyUpEvent; import com.smartgwt.client.widgets.grid.CellFormatter; import com.smartgwt.client.widgets.grid.events.RecordClickHandler; import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.criteria.SavedSearchCriteria; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.SearchGWTServiceAsync;
-import java.util.List;
/** * AbstractSearchStrategy defines common search strategy behaviors the subclasses must implement. @@ -60,6 +57,8 @@ public abstract class AbstractSearchStrategy implements RecordClickHandler, Cel }
+ public abstract void initialize(); + /** * Handle the key press event in the search bar. Must be overridden in subclass. * @param keyUpEvent 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 4625ef5..9300f3f 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 @@ -201,7 +201,7 @@ public class BasicSearchStrategy extends AbstractSearchStrategy { }); }
- private void getSearchSuggestions(SearchSubsystem searchSubsystem, String expression, int caretPosition) { + public void getSearchSuggestions(SearchSubsystem searchSubsystem, String expression, int caretPosition) {
final long suggestStart = System.currentTimeMillis();
@@ -242,5 +242,8 @@ public class BasicSearchStrategy extends AbstractSearchStrategy { }); }
- + @Override + public void initialize() { + getSearchSuggestions(SearchSubsystem.RESOURCE, "", 0); + } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java index 7379e52..7f33531 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java @@ -104,7 +104,7 @@ public class EnhancedSearchBar extends ToolStrip { searchComboboxItem.setBrowserSpellCheck(false); searchComboboxItem.setAutoFetchData(true); searchComboboxItem.setFetchDelay(300); - //searchComboboxItem.setCompleteOnTab(true); + searchComboboxItem.setCompleteOnTab(true);
pickListGrid = new ListGrid(); configureCommonHandlers(); @@ -158,6 +158,8 @@ public class EnhancedSearchBar extends ToolStrip { // set the default search provider switchToBasicSearchMode();
+ // do any initialization + getSearchStrategy().initialize();
this.draw(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java index 8fe5bf4..2386785 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java @@ -146,4 +146,9 @@ public class FavoritesSearchStrategy extends AbstractSearchStrategy { // do nothing Log.debug("return key in SavedSearchProvider"); } + + @Override + public void initialize() { + + } }
commit 59291f1cf9be64e565acde9bb2acc1cbb06339b1 Author: Mike Thompson mithomps@redhat.com Date: Wed Jun 20 09:53:18 2012 -0700
Remove more unused code.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/AbstractSearchStrategy.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/AbstractSearchStrategy.java index b1946d5..35f45df 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/AbstractSearchStrategy.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/AbstractSearchStrategy.java @@ -24,13 +24,11 @@ import com.smartgwt.client.widgets.grid.CellFormatter; import com.smartgwt.client.widgets.grid.events.RecordClickHandler; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.criteria.SavedSearchCriteria; -import org.rhq.core.domain.search.SavedSearch; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.SearchGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import java.util.List;