Author: vrubezhny Date: 2008-04-15 11:20:35 -0400 (Tue, 15 Apr 2008) New Revision: 7536 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java Log: http://jira.jboss.com/jira/browse/JBIDE-2057 Search history is spurious in Previous Searches wizard. Issue is fixed Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java 2008-04-15 14:23:25 UTC (rev 7535) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java 2008-04-15 15:20:35 UTC (rev 7536) @@ -304,13 +304,6 @@ return new SeamSearchQuery(tokens, sourceFile, scope); } - private SeamSearchQuery createQuery(Var var, IFile sourceFile) throws JavaModelException, InterruptedException { - - SeamSearchScope scope = new SeamSearchScope(new IFile[] {sourceFile}, getLimitTo()); - - return new SeamSearchQuery(var, sourceFile, scope); - } - /** * Returns the limitTo flag. The possible values are: * - SeamSearchScope.SEARCH_FOR_DECLARATIONS Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java 2008-04-15 14:23:25 UTC (rev 7535) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java 2008-04-15 15:20:35 UTC (rev 7536) @@ -120,8 +120,6 @@ private List<ELOperandToken> fTokens; private IJavaElement[] fJavaElements; private final SeamSearchScope fScope; - private final String[] fVariables; - private final Var fVar; private SeamSearchResult fResult; private IFile fSourceFile; private ISearchRequestor fParentRequestor; @@ -137,8 +135,6 @@ fTokens = tokens; fJavaElements = null; fSourceFile = sourceFile; - fVariables = null; - fVar = null; fScope= scope; } @@ -153,26 +149,9 @@ fTokens = null; fJavaElements = javaElements; fSourceFile = sourceFile; - fVariables = null; - fVar = null; fScope= scope; } - /** - * Constructs Seam search query for a given {@link Var} objects array - * - * @param var - * @param sourceFile - * @param scope - */ - public SeamSearchQuery(Var var, IFile sourceFile, SeamSearchScope scope) { - fTokens = null; - fJavaElements = null; - fSourceFile = sourceFile; - fVariables = null; - fVar = var; - fScope= scope; - } /** * Sets up a parent ISearchRequestor @@ -252,7 +231,6 @@ if (seamProject == null) return Status.OK_STATUS; -// List<IJavaElement> elements = engine.getJavaElementsForELOperandTokens(seamProject, fSourceFile, fTokens) SeamSearchResultCollector collector= new SeamSearchResultCollector(textResult, getParentRequestor()); return SeamSearchEngine.getInstance().search(fScope, collector, fSourceFile, fJavaElements, monitor); } @@ -284,17 +262,21 @@ */ public String getSearchString() { String searchString = ""; - if (fVariables != null) { + if (fJavaElements != null) { StringBuffer buf= new StringBuffer(); - for (int i= 0; i < fVariables.length; i++) { + for (int i= 0; i < fJavaElements.length; i++) { if (i > 0) { buf.append(", "); //$NON-NLS-1$ } - buf.append(fVariables[i]); + buf.append(fJavaElements[i]); } searchString = buf.toString(); - } else if (fVar != null) { - searchString = fVar.getName(); + } else if (fTokens != null) { + StringBuffer buf= new StringBuffer(); + for (int i= 0; i < fTokens.size(); i++) { + buf.append(fTokens.get(i).getText()); + } + searchString = buf.toString(); } return searchString; }