From: luukkainen <luukkainen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Wed, 16 Oct 2013 10:49:45 +0000 (+0000)
Subject: Introduced SearchQuery object, which holds search related parameters
X-Git-Tag: 1.8.1~237
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=89a536af0ed37193b5e5defb4c4388f6b804a322;p=simantics%2Fsysdyn.git

Introduced SearchQuery object, which holds search related parameters
Fixed empty results handling

refs #4452

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@27982 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/function/ModulesSearchFunction.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/function/ModulesSearchFunction.java
index c228b394..c1cf02a4 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/function/ModulesSearchFunction.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/function/ModulesSearchFunction.java
@@ -41,6 +41,7 @@ import org.simantics.sysdyn.SysdynResource;
 import org.simantics.sysdyn.ui.handlers.FindSearchTrim;
 import org.simantics.sysdyn.ui.handlers.FindSearchTrim.Scope;
 import org.simantics.workbench.search.NamedResource;
+import org.simantics.workbench.search.SearchQuery;
 import org.simantics.workbench.search.SearchResult;
 import org.simantics.workbench.search.Searching;
 
@@ -51,15 +52,15 @@ import org.simantics.workbench.search.Searching;
  * @author Tuukka Lehtonen
  * @author Tuomas Miettinen
  */
-public class ModulesSearchFunction extends FunctionImpl5<IProgressMonitor, ReadGraph, Resource, String, Integer, Collection<SearchResult>> {
+public class ModulesSearchFunction extends FunctionImpl5<IProgressMonitor, ReadGraph, Resource, SearchQuery, Integer, Collection<SearchResult>> {
 
 	private final int MAX_RESULTS = 50000;
 	
     @Override
-    public Collection<SearchResult> apply(IProgressMonitor monitor, ReadGraph graph, Resource model, String query, Integer maxResults) {
+    public Collection<SearchResult> apply(IProgressMonitor monitor, ReadGraph graph, Resource model, SearchQuery query, Integer maxResults) {
         try {
         	// Check whether only currently open diagram is searched
-        	String filteredQuery = query.replace(FindSearchTrim.CURRENT_DIAGRAM_OPTION, "");
+        	String filteredQuery = query.getQuery().replace(FindSearchTrim.CURRENT_DIAGRAM_OPTION, "");
         	Collection<Map<String, Object>> results = Searching.performSearch(graph,
                     Layer0X.getInstance(graph).Dependencies, model, filteredQuery, MAX_RESULTS);