X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.workbench.search%2Fsrc%2Forg%2Fsimantics%2Fworkbench%2Fsearch%2FSearchData.java;h=f3783f0a01c9079bf8a400f3a6917a8e91ba920b;hb=4e7fd7de62f57825448d4dcc2636d0b59646a7ef;hp=ee0e13fedacc774647def77e1867a7f8b8fbcb87;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.workbench.search/src/org/simantics/workbench/search/SearchData.java b/bundles/org.simantics.workbench.search/src/org/simantics/workbench/search/SearchData.java
index ee0e13fed..f3783f0a0 100644
--- a/bundles/org.simantics.workbench.search/src/org/simantics/workbench/search/SearchData.java
+++ b/bundles/org.simantics.workbench.search/src/org/simantics/workbench/search/SearchData.java
@@ -1,94 +1,97 @@
-package org.simantics.workbench.search;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-
-/**
- * @author Tuukka Lehtonen
- */
-public class SearchData {
-
-    int resultNumber;
-
-    String dataUrl;
-    File dataDirectory;
-    SearchQuery query;
-    NamedResource model;
-    SearchEngine searchEngine;
-    SearchResult results;
-    Collection<SearchEngine> searchEngines;
-    
-    int resultCount;
-    int maxResults;
-
-    public int getResultNumber() {
-        return resultNumber;
-    }
-
-    public String getDataUrl() {
-        return dataUrl;
-    }
-
-    public File getDataDirectory() {
-        return dataDirectory;
-    }
-
-    public SearchQuery getQuery() {
-        return query;
-    }
-    
-    public Collection<SearchEngine> getSearchEngines() {
-		return searchEngines;
-	}
-    
-    public Set<String> getAllSearchParams() {
-    	Set<String> params = new HashSet<String>();
-    	for (SearchEngine engine : searchEngines)
-    		params.addAll(engine.getSupportedParams());
-    	return params;
-    }
-
-    public NamedResource getModel() {
-        return model;
-    }
-
-    public SearchResult getResults() {
-        return results;
-    }
-
-    public int getResultCount() {
-        return results.rows.size();
-    }
-    
-    public int getResultTotalCount() {
-        return resultCount;
-    }
-
-    public int getMaxResults() {
-        return maxResults;
-    }
-    
-    public SearchEngine getSearchEngine() {
-		return searchEngine;
-	}
-
-    public SearchData clone() {
-        SearchData data = new SearchData();
-        data.resultNumber = resultNumber;
-        data.dataUrl = dataUrl;
-        data.dataDirectory = dataDirectory;
-        data.query = query;
-        data.model = model;
-        data.results = results;
-        data.maxResults = maxResults;
-        data.resultCount = resultCount;
-        data.searchEngine = searchEngine;
-        data.searchEngines = searchEngines;
-        return data;
-    }
-    
-    
-}
+package org.simantics.workbench.search;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.Map;
+import java.util.TreeMap;
+
+
+/**
+ * @author Tuukka Lehtonen
+ */
+public class SearchData {
+
+    int resultNumber;
+
+    String dataUrl;
+    File dataDirectory;
+    SearchQuery query;
+    NamedResource model;
+    SearchEngine searchEngine;
+    SearchResult results;
+    Collection<SearchEngine> searchEngines;
+    
+    int resultCount;
+    int maxResults;
+
+    public int getResultNumber() {
+        return resultNumber;
+    }
+
+    public String getDataUrl() {
+        return dataUrl;
+    }
+
+    public File getDataDirectory() {
+        return dataDirectory;
+    }
+
+    public SearchQuery getQuery() {
+        return query;
+    }
+    
+    public Collection<SearchEngine> getSearchEngines() {
+		return searchEngines;
+	}
+    
+    public Collection<SearchParam> getAllSearchParams() {
+        Map<String, SearchParam> params = new TreeMap<>();
+        for (SearchEngine engine : searchEngines) {
+            for (SearchParam param : engine.getSupportedParams()) {
+                params.put(param.getName(), param);
+            }
+        }
+        return params.values();
+    }
+
+    public NamedResource getModel() {
+        return model;
+    }
+
+    public SearchResult getResults() {
+        return results;
+    }
+
+    public int getResultCount() {
+        return results.rows.size();
+    }
+    
+    public int getResultTotalCount() {
+        return resultCount;
+    }
+
+    public int getMaxResults() {
+        return maxResults;
+    }
+    
+    public SearchEngine getSearchEngine() {
+		return searchEngine;
+	}
+
+    public SearchData clone() {
+        SearchData data = new SearchData();
+        data.resultNumber = resultNumber;
+        data.dataUrl = dataUrl;
+        data.dataDirectory = dataDirectory;
+        data.query = query;
+        data.model = model;
+        data.results = results;
+        data.maxResults = maxResults;
+        data.resultCount = resultCount;
+        data.searchEngine = searchEngine;
+        data.searchEngines = searchEngines;
+        return data;
+    }
+    
+    
+}