From 3e4337c00ad28af2d4755bc452f4e48a0b3334f6 Mon Sep 17 00:00:00 2001
From: miettinen <miettinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Fri, 13 Sep 2013 12:56:08 +0000
Subject: [PATCH] Ctrl+F search to Sysdyn (refs #2873). Changed some visibility
 definitions of Simantics ssarch to allow inheriting SearchTrim.

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@27833 ac1ea38d-2e2b-0410-8846-a27921b304fc
---
 org.simantics.sysdyn.ui/META-INF/MANIFEST.MF  |   3 +-
 org.simantics.sysdyn.ui/plugin.xml            |  14 +++
 .../ui/function/ModulesSearchFunction.java    |  66 +++++++++--
 .../sysdyn/ui/handlers/FindReplaceDialog.java | 107 ++++++++++++++++++
 .../ui/handlers/FindReplaceHandler.java       |  61 ++++++++++
 .../sysdyn/ui/handlers/FindSearchTrim.java    |  38 +++++++
 6 files changed, 280 insertions(+), 9 deletions(-)
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/FindReplaceDialog.java
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/FindReplaceHandler.java
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/FindSearchTrim.java

diff --git a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
index 25222644..119c139f 100644
--- a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
+++ b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
@@ -56,7 +56,8 @@ Require-Bundle: org.simantics.layer0.utils;bundle-version="0.6.2",
  org.eclipse.nebula.widgets.tablecombo;bundle-version="1.0.0",
  org.simantics.fmu;bundle-version="1.0.0",
  org.simantics.jfreechart;bundle-version="1.0.0",
- org.simantics.db.indexing;bundle-version="1.1.0"
+ org.simantics.db.indexing;bundle-version="1.1.0",
+ org.simantics.workbench
 Bundle-Activator: org.simantics.sysdyn.ui.Activator
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.sysdyn.ui.browser.nodes
diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index 5e5a19a9..69dc4a06 100644
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -1004,6 +1004,11 @@
                </visibleWhen>
             </command>
          </menu>
+         <command
+               commandId="org.eclipse.ui.edit.findReplace"
+               label="Find"
+               style="push">
+         </command>
       </menuContribution>
       <menuContribution
             locationURI="popup:#SysdynDiagramPopup?after=wbStart">
@@ -1087,6 +1092,11 @@
                label="Paste"
                style="push">
          </command>
+         <command
+               commandId="org.eclipse.ui.edit.findReplace"
+               label="Find"
+               style="push">
+         </command>
          <command
                commandId="org.simantics.sysdyn.ui.pasteSpecial"
                icon="platform:/plugin/com.famfamfam.silk/icons/paste_plain.png"
@@ -1840,6 +1850,10 @@
             class="org.simantics.sysdyn.ui.handlers.newComponents.NewSensitivityAnalysisExperimentNodeHandler"
             commandId="org.simantics.sysdyn.ui.newSensitivityAnalysisExperiment">
       </handler>
+      <handler
+            class="org.simantics.sysdyn.ui.handlers.FindReplaceHandler"
+            commandId="org.eclipse.ui.edit.findReplace">
+      </handler>
    </extension>
    <extension
          point="org.simantics.browsing.ui.common.viewpointContributionBinding">
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 e1c422e5..c228b394 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
@@ -18,18 +18,28 @@ import java.util.Map;
 import java.util.Set;
 
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
 import org.simantics.databoard.Bindings;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.common.utils.Logger;
 import org.simantics.db.common.utils.NameUtils;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.exception.ManyObjectsForFunctionalRelationException;
+import org.simantics.db.exception.ServiceException;
 import org.simantics.db.layer0.genericrelation.Dependencies;
 import org.simantics.diagram.stubs.DiagramResource;
 import org.simantics.layer0.Layer0;
+import org.simantics.modeling.ModelingResources;
+import org.simantics.modeling.ui.diagramEditor.DiagramEditor;
 import org.simantics.operation.Layer0X;
 import org.simantics.scl.runtime.function.FunctionImpl5;
 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.SearchResult;
 import org.simantics.workbench.search.Searching;
@@ -39,6 +49,7 @@ import org.simantics.workbench.search.Searching;
  *      (IProgressMonitor, ReadGraph, model : Resource, query : String, maxResults : Integer) -> QueryResult
  * 
  * @author Tuukka Lehtonen
+ * @author Tuomas Miettinen
  */
 public class ModulesSearchFunction extends FunctionImpl5<IProgressMonitor, ReadGraph, Resource, String, Integer, Collection<SearchResult>> {
 
@@ -47,18 +58,53 @@ public class ModulesSearchFunction extends FunctionImpl5<IProgressMonitor, ReadG
     @Override
     public Collection<SearchResult> apply(IProgressMonitor monitor, ReadGraph graph, Resource model, String query, Integer maxResults) {
         try {
-            Collection<Map<String, Object>> results = Searching.performSearch(graph,
-                    Layer0X.getInstance(graph).Dependencies, model, query, MAX_RESULTS);
-
-            return generateSearchResults(graph, results);
+        	// Check whether only currently open diagram is searched
+        	String filteredQuery = query.replace(FindSearchTrim.CURRENT_DIAGRAM_OPTION, "");
+        	Collection<Map<String, Object>> results = Searching.performSearch(graph,
+                    Layer0X.getInstance(graph).Dependencies, model, filteredQuery, MAX_RESULTS);
+
+        	if (filteredQuery.equals(query))
+            	return generateSearchResults(graph, results, Scope.ALL_MODELS);
+        	else
+        		return generateSearchResults(graph, results, Scope.CURRENT_DIAGRAM);
         } catch (DatabaseException e) {
             Logger.defaultLogError(e);
         }
         return null;
     }
+    
+    private static boolean resourceFoundInCurrentDiagram(ReadGraph graph, Resource diagram) throws ManyObjectsForFunctionalRelationException, ServiceException {
+
+        DiagramEditor editor = null;
+    	IWorkbench workbench = PlatformUI.getWorkbench();
+    	IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
+    	// To ask for the active window doesn't work, so browse through all
+    	// windows and when an active editor is found, use that
+    	for (IWorkbenchWindow window : windows) {
+    		IWorkbenchPage page = window.getActivePage();
+    		if (page != null) {
+    			try {
+    	            editor = (DiagramEditor)page.getActiveEditor();
+    	            if (editor != null)
+        				// Found one
+        				break;
+    			} catch (ClassCastException e) {
+    				continue;
+                }
+    		}
+    	}
+        if (editor != null) {
+        	Resource inputResource = editor.getInputResource();
+        	ModelingResources MOD = ModelingResources.getInstance(graph);
+        	Resource editorResource = graph.getPossibleObject(inputResource, MOD.DiagramToComposite);
+    		if (diagram.equalsResource(editorResource)) 
+    			return true;
+        }
+        return false;
+    }
 
-    public static final Collection<SearchResult> generateSearchResults(ReadGraph graph,
-            Collection<Map<String, Object>> results) throws DatabaseException {
+    private static final Collection<SearchResult> generateSearchResults(ReadGraph graph,
+            Collection<Map<String, Object>> results, Scope scope) throws DatabaseException {
         Layer0 L0 = Layer0.getInstance(graph);
         DiagramResource DIA = DiagramResource.getInstance(graph);
         SysdynResource SYSDYN = SysdynResource.getInstance(graph);
@@ -84,9 +130,13 @@ public class ModulesSearchFunction extends FunctionImpl5<IProgressMonitor, ReadG
             if (typeResources.contains(DIA.Element))
                 continue;
 
+            // Check if the result is found in the open diagram.  
             Resource parent = (Resource) r.get(Dependencies.FIELD_PARENT);
+            if (scope == Scope.CURRENT_DIAGRAM &&
+            		!resourceFoundInCurrentDiagram(graph, parent))
+            	continue;
+            
             String name = (String) r.get(Dependencies.FIELD_NAME);
-
             SearchResult rst = new SearchResult();
             rst.resource = NamedResource.of(graph, resource, name);
             rst.parent = NamedResource.of(graph, parent);
@@ -105,7 +155,7 @@ public class ModulesSearchFunction extends FunctionImpl5<IProgressMonitor, ReadG
                         rst.principalTypes.add(nr);
                 }
             }
-
+  
             result.add(rst);
         }
         return result;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/FindReplaceDialog.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/FindReplaceDialog.java
new file mode 100644
index 00000000..f467523d
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/FindReplaceDialog.java
@@ -0,0 +1,107 @@
+package org.simantics.sysdyn.ui.handlers;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.simantics.sysdyn.ui.handlers.FindSearchTrim.Scope;
+
+/**
+ * Find dialog for finding variables in diagrams.
+ * @author Tuomas Miettinen
+ *
+ */
+public class FindReplaceDialog extends Dialog {
+    
+    private FindSearchTrim search;
+    
+    private Button scopeButtonAllModels; 
+    private Button scopeButtonCurrentDiagram; 
+    private Scope scope;
+    private boolean diagramOpen;
+    
+    protected FindReplaceDialog(Shell parentShell, Scope scope, boolean diagramOpen) {
+        super(parentShell);
+		setBlockOnOpen(false);
+		this.scope = scope; 
+		this.diagramOpen = diagramOpen;
+    }
+
+    @Override
+	protected boolean isResizable() {
+		return true;
+	}
+    
+    @Override
+    protected Control createDialogArea(Composite parent) {
+        Composite composite = ( Composite )super.createDialogArea(parent);
+        composite.getShell().setText("Find");
+        GridLayoutFactory.fillDefaults().margins(5, 5).numColumns(2).applyTo(composite);
+        
+        Label label = new Label(composite, SWT.NONE);
+        label.setText("Find: ");
+        GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).hint(40, SWT.DEFAULT).applyTo(label);
+
+        search = new FindSearchTrim(composite);
+        GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(search);
+        
+        Group scopeGroup = new Group(composite, SWT.SHADOW_NONE);
+        scopeGroup.setText("Scope");
+        GridDataFactory.fillDefaults().span(2, 1).grab(true, false).applyTo(scopeGroup);
+        GridLayoutFactory.fillDefaults().margins(5, 5).applyTo(scopeGroup);
+        
+        Composite scopeComposite = new Composite(scopeGroup, SWT.NONE);
+        GridDataFactory.fillDefaults().grab(true, false).applyTo(scopeComposite);
+        GridLayoutFactory.fillDefaults().applyTo(scopeComposite);
+        
+        scopeButtonCurrentDiagram = new Button(scopeComposite, SWT.RADIO);
+        scopeButtonCurrentDiagram.setText("Current Diagram");
+        scopeButtonCurrentDiagram.setSelection(scope == Scope.CURRENT_DIAGRAM);
+        scopeButtonCurrentDiagram.setEnabled(diagramOpen);
+        GridDataFactory.fillDefaults().applyTo(scopeButtonCurrentDiagram);
+        
+        scopeButtonAllModels = new Button(scopeComposite, SWT.RADIO);
+        scopeButtonAllModels.setText("All Models");
+        scopeButtonAllModels.setSelection(scope == Scope.ALL_MODELS);
+        GridDataFactory.fillDefaults().applyTo(scopeButtonAllModels);
+
+        return composite;
+    }
+    
+    @Override
+    protected void createButtonsForButtonBar(Composite parent) {
+        // Replace "OK" with "Find".
+		createButton(parent, IDialogConstants.OK_ID, "Find",
+				true);
+		createButton(parent, IDialogConstants.CANCEL_ID,
+				"Close", false);
+    }
+
+    @Override
+    protected void cancelPressed() {
+        setReturnCode(CANCEL);
+        close();
+    }
+
+    @Override
+    protected void okPressed() {
+        if (scopeButtonAllModels.getSelection())
+        	scope = Scope.ALL_MODELS;
+        else if (scopeButtonCurrentDiagram.getSelection())
+        	scope = Scope.CURRENT_DIAGRAM;
+        else
+        	scope = Scope.ALL_MODELS;
+        search.findNameAndTypeQuery(scope);
+        setReturnCode(OK);
+        close();
+    }
+
+    
+}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/FindReplaceHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/FindReplaceHandler.java
new file mode 100644
index 00000000..35c9dcc6
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/FindReplaceHandler.java
@@ -0,0 +1,61 @@
+package org.simantics.sysdyn.ui.handlers;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.simantics.g2d.diagram.IDiagram;
+import org.simantics.modeling.ui.diagramEditor.DiagramEditor;
+import org.simantics.sysdyn.ui.browser.SysdynBrowser;
+import org.simantics.sysdyn.ui.editor.DiagramViewer;
+import org.simantics.sysdyn.ui.handlers.FindSearchTrim.Scope;
+
+/**
+ * Handler for Ctrl+F
+ * @author Tuomas Miettinen
+ *
+ */
+public class FindReplaceHandler extends AbstractHandler {
+
+    @Override
+    public Object execute(ExecutionEvent event) throws ExecutionException {
+        
+        IEditorPart editor = (IEditorPart)HandlerUtil.getActiveEditor(event);
+        IWorkbenchPart workbenchPart = (IWorkbenchPart)HandlerUtil.getActivePart(event); 
+        
+        Shell shell = HandlerUtil.getActiveShell(event);
+        if(shell == null)
+            return null;
+        
+        // If there is something else in the diagram view, do not allow search in current diagram
+        if (!(editor instanceof DiagramEditor)) {
+            if (workbenchPart != null && workbenchPart instanceof SysdynBrowser) {
+            	// If focus is on model browser, allow search in all models.
+                FindReplaceDialog dialog = new FindReplaceDialog(shell, Scope.ALL_MODELS, false);
+                dialog.open();
+            }
+            return null;
+        }
+        
+        final DiagramViewer viewer = (DiagramViewer) ((DiagramEditor) editor).getViewer();
+        if (viewer == null)
+            return null;
+        
+        Object d = viewer.getAdapter(IDiagram.class);
+        if (workbenchPart != null && workbenchPart instanceof SysdynBrowser) {
+        	// If focus is on model browser, default search in all models, allow also current diagram.
+            FindReplaceDialog dialog = new FindReplaceDialog(shell, Scope.ALL_MODELS, true);
+            dialog.open();
+        } else if (d != null && d instanceof IDiagram) {
+        	// If focus is on diagram editor, default search in current diagram, allow also all models.
+            FindReplaceDialog dialog = new FindReplaceDialog(shell, Scope.CURRENT_DIAGRAM, true);
+            dialog.open();
+        }
+
+        return null;
+    }
+
+}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/FindSearchTrim.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/FindSearchTrim.java
new file mode 100644
index 00000000..7063b0aa
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/FindSearchTrim.java
@@ -0,0 +1,38 @@
+package org.simantics.sysdyn.ui.handlers;
+
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.simantics.workbench.internal.contributions.search.SearchTrim;
+
+public class FindSearchTrim extends SearchTrim {
+	
+	public static enum Scope {
+		CURRENT_DIAGRAM,
+		ALL_MODELS
+	}
+	
+	public static final String CURRENT_DIAGRAM_OPTION = "@Current_diagram";
+	
+	public FindSearchTrim(Composite parent) {
+		super(parent);
+        GridDataFactory.fillDefaults().hint(160, SWT.DEFAULT).grab(true, true).applyTo(searchText);
+	}
+
+	public void findNameAndTypeQuery(Scope scope) {
+        String query = searchText.getText();
+
+        // Don't allow empty queries
+        if (query.trim().isEmpty())
+            return;
+
+        query = filter(query);
+        query = "Name:" + query + " OR Types:" + query;
+        
+        // Add option for showing only findings in currently open diagram
+        if (scope == Scope.CURRENT_DIAGRAM)
+        	query += " " + CURRENT_DIAGRAM_OPTION;
+        performQuery(query, ResultBrowser.VIEW);
+	}	
+
+}
-- 
2.47.1