X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.modeling%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2FModelingUtils.java;h=ea960c1d0de2fe97dfae468331b0521f69219ccd;hp=1f530f59f60306d13e3f86e9426ae5ce6e5565dd;hb=42542a731384c850346a58e580770011ee3d4ba2;hpb=a57dcc8e1a200d33fec06da5edffb064f286a82f

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
index 1f530f59f..ea960c1d0 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
@@ -96,7 +96,6 @@ import org.simantics.db.layer0.adapter.CopyHandler;
 import org.simantics.db.layer0.adapter.GenericRelationIndex;
 import org.simantics.db.layer0.adapter.Instances;
 import org.simantics.db.layer0.adapter.impl.DefaultPasteImportAdvisor;
-import org.simantics.db.layer0.adapter.impl.EntityInstances.QueryIndex;
 import org.simantics.db.layer0.adapter.impl.ImportAdvisorFactory;
 import org.simantics.db.layer0.genericrelation.DependenciesRelation.DependencyChangesRequest;
 import org.simantics.db.layer0.genericrelation.DependencyChanges;
@@ -131,6 +130,7 @@ import org.simantics.db.service.VirtualGraphSupport;
 import org.simantics.diagram.stubs.DiagramResource;
 import org.simantics.diagram.stubs.G2DResource;
 import org.simantics.diagram.synchronization.graph.AddElement;
+import org.simantics.diagram.synchronization.graph.DiagramGraphUtil;
 import org.simantics.graph.db.IImportAdvisor2;
 import org.simantics.graph.db.ImportAdvisors;
 import org.simantics.graph.db.MissingDependencyException;
@@ -156,9 +156,9 @@ import org.simantics.scl.runtime.function.Function1;
 import org.simantics.scl.runtime.tuple.Tuple;
 import org.simantics.simulation.ontology.SimulationResource;
 import org.simantics.structural.stubs.StructuralResource2;
+import org.simantics.structural2.modelingRules.IModelingRules;
 import org.simantics.structural2.scl.StructuralComponent;
 import org.simantics.structural2.utils.StructuralUtils;
-import org.simantics.ui.SimanticsUI;
 import org.simantics.utils.ObjectUtils;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.datastructures.Triple;
@@ -413,7 +413,7 @@ public class ModelingUtils {
 
 	public static void importModel(String fileName) {
 
-		Resource project = SimanticsUI.getProject().get();
+		Resource project = Simantics.getProject().get();
 
 		try (StreamingTransferableGraphFileReader importer = new StreamingTransferableGraphFileReader(new File(fileName))) {
 			TransferableGraphSource tg = importer.readTG();
@@ -1516,7 +1516,7 @@ public class ModelingUtils {
     public static TransferableGraph1 exportSharedOntology(IProgressMonitor monitor, RequestProcessor processor, File location, String format, int version, final LibraryInfo info) throws DatabaseException, IOException {
     	
     	if(monitor == null) monitor = new NullProgressMonitor();
-    	
+    	final IProgressMonitor finalMonitor = monitor;
         // TODO: figure out a way to make the TG go directly into a file
         // instead of having it all in memory at once.
 
@@ -1526,7 +1526,7 @@ public class ModelingUtils {
             public SimanticsClipboard perform(ReadGraph graph) throws DatabaseException {
                 CopyHandler ch = graph.adapt(info.library.getResource(), CopyHandler.class);
                 SimanticsClipboardImpl clipboard = new SimanticsClipboardImpl();
-                ch.copyToClipboard(graph, clipboard);
+                ch.copyToClipboard(graph, clipboard, finalMonitor);
                 return clipboard;
             }
         });
@@ -2371,7 +2371,7 @@ public class ModelingUtils {
 			
 	        monitor.setTaskName("Creating missing GUID identifiers " + NameUtils.getSafeName(graph, root));
 			Resource indexRoot = graph.syncRequest(new PossibleIndexRoot(root));
-			for(Resource r : searchByType(graph, indexRoot, L0.Entity)) {
+			for(Resource r : searchByTypeShallow(graph, indexRoot, L0.Entity)) {
 
 				memory.maintain();
 
@@ -2400,31 +2400,45 @@ public class ModelingUtils {
 	}
 	
 	public static File fileDialog(String title, List<Tuple> namesAndExtensions) {
-		
-		Display display = Display.getCurrent();
-		Shell shell = display.getActiveShell();
-		
-        FileDialog dialog = new FileDialog(shell, SWT.OPEN);
-        dialog.setText(title);
-        
-        String[] extensions = new String[namesAndExtensions.size()];
-        String[] filterNames = new String[namesAndExtensions.size()];
-        int index = 0;
-        for(Tuple t : namesAndExtensions) {
-        	String filterName = (String)t.get(0);
-        	String extension = (String)t.get(1);
-        	filterNames[index] = filterName;
-        	extensions[index] = extension;
-        	index++;
-        }
-        
-        dialog.setFilterExtensions(extensions);
-        dialog.setFilterNames(filterNames);
-        final String fileName = dialog.open();
-        if (fileName == null) return null;
-        
-        return new File(fileName);
+		return new Runnable() {
+			private File result;
+			
+			File getFile() {
+				Display.getDefault().syncExec(this);
+				return result;
+			}
+			
+			@Override
+			public void run() {
+				result = showDialog();
+			}
 
+			private File showDialog() {
+				Display display = Display.getCurrent();
+				Shell shell = display.getActiveShell();
+				
+		        FileDialog dialog = new FileDialog(shell, SWT.OPEN);
+		        dialog.setText(title);
+		        
+		        String[] extensions = new String[namesAndExtensions.size()];
+		        String[] filterNames = new String[namesAndExtensions.size()];
+		        int index = 0;
+		        for(Tuple t : namesAndExtensions) {
+		        	String filterName = (String)t.get(0);
+		        	String extension = (String)t.get(1);
+		        	filterNames[index] = filterName;
+		        	extensions[index] = extension;
+		        	index++;
+		        }
+		        
+		        dialog.setFilterExtensions(extensions);
+		        dialog.setFilterNames(filterNames);
+		        final String fileName = dialog.open();
+		        if (fileName == null) return null;
+		        
+		        return new File(fileName);
+			}
+		}.getFile();
 	}
 	
 	public static Resource createLibrary(WriteGraph graph, Resource parent) throws DatabaseException {
@@ -2446,5 +2460,8 @@ public class ModelingUtils {
         return library;
     }
 
+    public static IModelingRules getModelingRules(ReadGraph graph, Resource diagramResource) throws DatabaseException {
+        return DiagramGraphUtil.getModelingRules(graph, diagramResource, null);
+    }
 
 }