From a60558722164f18242dbe67f5b116946baa8cd2f Mon Sep 17 00:00:00 2001
From: miettinen <miettinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 27 Mar 2014 08:30:25 +0000
Subject: [PATCH] Escaped the search query (refs #4786). Changed the version in
 the about text to 1.8 (refs #4695).

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@29205 ac1ea38d-2e2b-0410-8846-a27921b304fc
---
 org.simantics.sysdyn.ui/plugin.properties             |  4 ++--
 .../sysdyn/ui/function/ModulesSearchFunction.java     | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/org.simantics.sysdyn.ui/plugin.properties b/org.simantics.sysdyn.ui/plugin.properties
index dd1e0656..a6b3f78a 100644
--- a/org.simantics.sysdyn.ui/plugin.properties
+++ b/org.simantics.sysdyn.ui/plugin.properties
@@ -1,8 +1,8 @@
 about.text = Simantics System Dynamics\n\
 \n\
-Version 1.7.0\n\
+Version 1.8.0\n\
 \n\
-Copyright (c) 2013 Association for Decentralized Information Management in Industry THTH ry.\n\
+Copyright (c) 2014 Association for Decentralized Information Management in Industry THTH ry.\n\
 \n\
 Contributors:\n\
 VTT Technical Research Centre of Finland\n\
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 edf5afea..bfed4278 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
@@ -59,19 +59,20 @@ public class ModulesSearchFunction extends FunctionImpl5<IProgressMonitor, ReadG
     public SearchResult apply(IProgressMonitor monitor, ReadGraph graph, Resource model, SearchQuery query, Integer maxResults) {
         try {
         	String origQuery = query.getOriginalQuery();
+        	SearchQuery wildcardedQuery;
         	if (!origQuery.isEmpty()) // Add asterisks for performSearch 
-        		query.setOriginalQuery("*" + origQuery + "*");
+        		wildcardedQuery = query.withOriginalQuery("*" + origQuery + "*");
+        	else
+        		wildcardedQuery = query.withOriginalQuery("*");
         	
-        	// Check whether only currently open diagram is searched
-        	String filteredQuery = query.getQuery("Name","Types");
+        	String filteredQuery = wildcardedQuery.escaped(false).getQuery("Name","Types");
         	Collection<Map<String, Object>> results = Searching.performSearch(graph, 
         			Layer0X.getInstance(graph).Dependencies, 
         			model, 
         			filteredQuery, 
         			MAX_RESULTS);
 
-        	query.setOriginalQuery(origQuery); // Restore the original query without *'s
-        	
+        	// Check whether only currently open diagram is searched
         	if (!query.getSearchParams().contains(FindSearchTrim.CURRENT_DIAGRAM_OPTION))
             	return generateSearchResults(graph, results, Scope.ALL_MODELS);
         	else
-- 
2.47.1