X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2FModelingUIUtils.java;h=fa153e193500d4fa29804c5d723e627dc0047896;hp=db434bac487681acfdf8310b8ba19c9230f956b4;hb=fa806341cc06b72051d5e8d709674eb9d5c2bf00;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/ModelingUIUtils.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/ModelingUIUtils.java
index db434bac4..fa153e193 100644
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/ModelingUIUtils.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/ModelingUIUtils.java
@@ -1,177 +1,177 @@
-package org.simantics.modeling.ui;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Consumer;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.simantics.Simantics;
-import org.simantics.databoard.Bindings;
-import org.simantics.databoard.util.URIStringUtils;
-import org.simantics.db.ReadGraph;
-import org.simantics.db.Resource;
-import org.simantics.db.WriteGraph;
-import org.simantics.db.common.request.ReadRequest;
-import org.simantics.db.common.request.WriteRequest;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.layer0.adapter.Instances;
-import org.simantics.g2d.canvas.ICanvasContext;
-import org.simantics.layer0.Layer0;
-import org.simantics.modeling.ModelingResources;
-import org.simantics.modeling.ui.diagramEditor.DiagramEditor;
-import org.simantics.modeling.ui.diagramEditor.DiagramViewer;
-import org.simantics.ui.workbench.dialogs.ResourceSelectionDialog3;
-import org.simantics.utils.datastructures.Pair;
-
-public class ModelingUIUtils {
-
-    public static DiagramViewer tryGetDiagramViewer(ExecutionEvent event) {
-
-    	IEditorPart editorPart = HandlerUtil.getActiveEditor(event);
-    	if(editorPart == null) return null;
-    	if(editorPart instanceof DiagramEditor) {
-    		return (DiagramViewer)editorPart.getAdapter(DiagramViewer.class);
-    	}
-    	
-    	return null;
-    	
-    }
-    
-    public static ICanvasContext tryGetCanvasContext(ExecutionEvent event) {
-    	
-    	DiagramViewer viewer = tryGetDiagramViewer(event);
-    	if(viewer != null) return (ICanvasContext)viewer.getAdapter(ICanvasContext.class);
-    	else return null;
-    	
-    }
-	
-	protected static void findSCLQueryTypes(ReadGraph graph, Resource indexRoot, Map<Resource, Pair<String, ImageDescriptor>> map) throws DatabaseException {
-
-		Layer0 L0 = Layer0.getInstance(graph);
-		ModelingResources MOD = ModelingResources.getInstance(graph);
-
-		Instances query = graph.adapt(MOD.SCLQueryType, Instances.class);
-
-		String modelURI = graph.getURI(indexRoot);
-		
-		for(Resource _res : query.find(graph, indexRoot)) {
-			
-			// Don't allow instantiation of abstract query types.
-			if (graph.hasStatement(_res, L0.Abstract))
-				continue;
-
-			Resource res = graph.getPossibleObject(_res, L0.HasRange_Inverse);
-			if(res == null) {
-				
-				// Entry type
-
-				String name = graph.getPossibleRelatedValue(_res, L0.HasName, Bindings.STRING);
-				if (name == null)
-					continue;
-				String label = graph.getPossibleRelatedValue2(_res, L0.HasLabel, Bindings.STRING);
-
-				if (label != null && !name.equals(label)) {
-					name = label + " (" + name + ")";
-				}
-
-				Resource parent = graph.getPossibleObject(_res, L0.PartOf);
-				if(parent == null) continue;
-
-				String parentURI = graph.getURI(parent);
-				if(parentURI.startsWith(modelURI)) {
-					parentURI = parentURI.substring(modelURI.length());
-					if(parentURI.startsWith("/")) parentURI = parentURI.substring(1);
-				}
-
-				name = name + " - " + URIStringUtils.unescape(parentURI);
-
-				map.put(_res, new Pair<String, ImageDescriptor>(name, null));
-				
-			} else {
-				
-				// Property type
-			
-				String name = graph.getPossibleRelatedValue(res, L0.HasName, Bindings.STRING);
-				if (name == null)
-					continue;
-				String label = graph.getPossibleRelatedValue2(res, L0.HasLabel, Bindings.STRING);
-
-				if (label != null && !name.equals(label)) {
-					name = label + " (" + name + ")";
-				}
-
-				Resource parent = graph.getPossibleObject(_res, L0.PartOf);
-				if(parent == null) continue;
-
-				String parentURI = graph.getURI(parent);
-				if(parentURI.startsWith(modelURI)) {
-					parentURI = parentURI.substring(modelURI.length());
-					if(parentURI.startsWith("/")) parentURI = parentURI.substring(1);
-				}
-
-				name = name + " - " + URIStringUtils.unescape(parentURI);
-
-				map.put(_res, new Pair<String, ImageDescriptor>(name, null));
-			
-			}
-			
-		}
-
-	}
-	
-	public static void queryUserSelectedQueryType(
-			final Map<Resource, Pair<String, ImageDescriptor>> map,
-			final Consumer<Resource> selectionCallback)
-	{
-		Display.getDefault().asyncExec(new Runnable() {
-			@Override
-			public void run() {
-				Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-				ResourceSelectionDialog3<Resource> dialog = new ResourceSelectionDialog3<Resource>(shell, map, "Select query type from list") {
-					@Override
-					protected IDialogSettings getBaseDialogSettings() {
-						return Activator.getDefault().getDialogSettings();
-					}
-				};
-				if (dialog.open() == Window.OK) {
-					Object[] result = dialog.getResult();
-					if (result != null && result.length == 1) {
-						final Resource res = (Resource)result[0];
-						selectionCallback.accept(res);
-					}
-				}
-			}
-		});
-	}
-	
-	public static void newSCLQuery(final Resource parent, final Resource indexRoot) throws DatabaseException {
-        if (indexRoot == null)
-            return;
-        Simantics.getSession().syncRequest(new ReadRequest() {
-            @Override
-            public void run(ReadGraph graph) throws DatabaseException {
-                
-                final Map<Resource, Pair<String, ImageDescriptor>> map = new HashMap<Resource, Pair<String,ImageDescriptor>>();
-                findSCLQueryTypes(graph, indexRoot, map);
-                queryUserSelectedQueryType(map, selected -> {
-                    Simantics.getSession().async(new WriteRequest() {
-                        @Override
-                        public void perform(WriteGraph g) throws DatabaseException {
-                            g.markUndoPoint();
-                            Simantics.applySCL("Simantics/Query", "createSCLQueryDefault", g, parent, selected);
-                        }
-                    });
-                });
-            }
-        });
-    }
-    
-}
+package org.simantics.modeling.ui;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Consumer;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.simantics.Simantics;
+import org.simantics.databoard.Bindings;
+import org.simantics.databoard.util.URIStringUtils;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.common.request.ReadRequest;
+import org.simantics.db.common.request.WriteRequest;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.adapter.Instances;
+import org.simantics.g2d.canvas.ICanvasContext;
+import org.simantics.layer0.Layer0;
+import org.simantics.modeling.ModelingResources;
+import org.simantics.modeling.ui.diagramEditor.DiagramEditor;
+import org.simantics.modeling.ui.diagramEditor.DiagramViewer;
+import org.simantics.ui.workbench.dialogs.ResourceSelectionDialog3;
+import org.simantics.utils.datastructures.Pair;
+
+public class ModelingUIUtils {
+
+    public static DiagramViewer tryGetDiagramViewer(ExecutionEvent event) {
+
+    	IEditorPart editorPart = HandlerUtil.getActiveEditor(event);
+    	if(editorPart == null) return null;
+    	if(editorPart instanceof DiagramEditor) {
+    		return (DiagramViewer)editorPart.getAdapter(DiagramViewer.class);
+    	}
+    	
+    	return null;
+    	
+    }
+    
+    public static ICanvasContext tryGetCanvasContext(ExecutionEvent event) {
+    	
+    	DiagramViewer viewer = tryGetDiagramViewer(event);
+    	if(viewer != null) return (ICanvasContext)viewer.getAdapter(ICanvasContext.class);
+    	else return null;
+    	
+    }
+	
+	protected static void findSCLQueryTypes(ReadGraph graph, Resource indexRoot, Map<Resource, Pair<String, ImageDescriptor>> map) throws DatabaseException {
+
+		Layer0 L0 = Layer0.getInstance(graph);
+		ModelingResources MOD = ModelingResources.getInstance(graph);
+
+		Instances query = graph.adapt(MOD.SCLQueryType, Instances.class);
+
+		String modelURI = graph.getURI(indexRoot);
+		
+		for(Resource _res : query.find(graph, indexRoot)) {
+			
+			// Don't allow instantiation of abstract query types.
+			if (graph.hasStatement(_res, L0.Abstract))
+				continue;
+
+			Resource res = graph.getPossibleObject(_res, L0.HasRange_Inverse);
+			if(res == null) {
+				
+				// Entry type
+
+				String name = graph.getPossibleRelatedValue(_res, L0.HasName, Bindings.STRING);
+				if (name == null)
+					continue;
+				String label = graph.getPossibleRelatedValue2(_res, L0.HasLabel, Bindings.STRING);
+
+				if (label != null && !name.equals(label)) {
+					name = label + " (" + name + ")";
+				}
+
+				Resource parent = graph.getPossibleObject(_res, L0.PartOf);
+				if(parent == null) continue;
+
+				String parentURI = graph.getURI(parent);
+				if(parentURI.startsWith(modelURI)) {
+					parentURI = parentURI.substring(modelURI.length());
+					if(parentURI.startsWith("/")) parentURI = parentURI.substring(1);
+				}
+
+				name = name + " - " + URIStringUtils.unescape(parentURI);
+
+				map.put(_res, new Pair<String, ImageDescriptor>(name, null));
+				
+			} else {
+				
+				// Property type
+			
+				String name = graph.getPossibleRelatedValue(res, L0.HasName, Bindings.STRING);
+				if (name == null)
+					continue;
+				String label = graph.getPossibleRelatedValue2(res, L0.HasLabel, Bindings.STRING);
+
+				if (label != null && !name.equals(label)) {
+					name = label + " (" + name + ")";
+				}
+
+				Resource parent = graph.getPossibleObject(_res, L0.PartOf);
+				if(parent == null) continue;
+
+				String parentURI = graph.getURI(parent);
+				if(parentURI.startsWith(modelURI)) {
+					parentURI = parentURI.substring(modelURI.length());
+					if(parentURI.startsWith("/")) parentURI = parentURI.substring(1);
+				}
+
+				name = name + " - " + URIStringUtils.unescape(parentURI);
+
+				map.put(_res, new Pair<String, ImageDescriptor>(name, null));
+			
+			}
+			
+		}
+
+	}
+	
+	public static void queryUserSelectedQueryType(
+			final Map<Resource, Pair<String, ImageDescriptor>> map,
+			final Consumer<Resource> selectionCallback)
+	{
+		Display.getDefault().asyncExec(new Runnable() {
+			@Override
+			public void run() {
+				Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+				ResourceSelectionDialog3<Resource> dialog = new ResourceSelectionDialog3<Resource>(shell, map, "Select query type from list") {
+					@Override
+					protected IDialogSettings getBaseDialogSettings() {
+						return Activator.getDefault().getDialogSettings();
+					}
+				};
+				if (dialog.open() == Window.OK) {
+					Object[] result = dialog.getResult();
+					if (result != null && result.length == 1) {
+						final Resource res = (Resource)result[0];
+						selectionCallback.accept(res);
+					}
+				}
+			}
+		});
+	}
+	
+	public static void newSCLQuery(final Resource parent, final Resource indexRoot) throws DatabaseException {
+        if (indexRoot == null)
+            return;
+        Simantics.getSession().syncRequest(new ReadRequest() {
+            @Override
+            public void run(ReadGraph graph) throws DatabaseException {
+                
+                final Map<Resource, Pair<String, ImageDescriptor>> map = new HashMap<Resource, Pair<String,ImageDescriptor>>();
+                findSCLQueryTypes(graph, indexRoot, map);
+                queryUserSelectedQueryType(map, selected -> {
+                    Simantics.getSession().async(new WriteRequest() {
+                        @Override
+                        public void perform(WriteGraph g) throws DatabaseException {
+                            g.markUndoPoint();
+                            Simantics.applySCL("Simantics/Query", "createSCLQueryDefault", g, parent, selected);
+                        }
+                    });
+                });
+            }
+        });
+    }
+    
+}