X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.modeling%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2FModelingUtils.java;h=4a4d97a18a2b254f0be58c2a928483dcecd234c6;hb=4bc25acb8086df68836950af08faeacd382e5427;hp=de388b2576d5df5d1883faed042d27ca2ecfefde;hpb=417eee8911a617038f5f10dfb1cae37ac4a45bef;p=simantics%2Fplatform.git

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 de388b257..4a4d97a18 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
@@ -67,6 +67,7 @@ import org.simantics.db.RequestProcessor;
 import org.simantics.db.Resource;
 import org.simantics.db.Session;
 import org.simantics.db.Statement;
+import org.simantics.db.VirtualGraph;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.common.Indexing;
 import org.simantics.db.common.NamedResource;
@@ -96,7 +97,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 +131,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 +157,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 +414,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 +1517,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 +1527,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;
             }
         });
@@ -2400,31 +2401,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 +2461,20 @@ public class ModelingUtils {
         return library;
     }
 
+    public static IModelingRules getModelingRules(ReadGraph graph, Resource diagramResource) throws DatabaseException {
+        return DiagramGraphUtil.getModelingRules(graph, diagramResource, null);
+    }
 
+    public static void markChanged(WriteGraph graph, Resource r) throws DatabaseException {
+        VirtualGraphSupport support = Simantics.getSession().getService(VirtualGraphSupport.class);
+        VirtualGraph vg = support.getWorkspacePersistent("changeInformation");
+        graph.syncRequest(new WriteRequest(vg) {
+            @Override
+            public void perform(WriteGraph graph) throws DatabaseException {
+                ModelingResources MOD = ModelingResources.getInstance(graph);
+                graph.claim(r, MOD.changed, MOD.changed, r);
+            }
+        });
+    }
+    
 }