From: Jani Mäkinen <jani.makinen@semantum.fi>
Date: Mon, 24 Aug 2020 14:03:57 +0000 (+0300)
Subject: Update module graph structure, deny deleting modules in use under model
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=7461e507cc76fa26456ba6f8177f11e7ea0c7941;p=simantics%2Fsysdyn.git

Update module graph structure, deny deleting modules in use under model

gitlab #52

Change-Id: I16df1a66dddb0a7fc039d739b73a3c5616066e48
---

diff --git a/bundles/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph b/bundles/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
index 8037fece..8ed1e078 100644
--- a/bundles/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
+++ b/bundles/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
@@ -215,7 +215,9 @@ SYSDYN.Module <T SYSDYN.Component
     >-- SYSDYN.Module.redeclaration --> SYSDYN.Redeclaration  <R L0.IsComposedOf
     >-- SYSDYN.Module.parameterOverride --> SYSDYN.Module.ParameterOverride <R L0.IsComposedOf
 
-SYSDYN.ModuleSymbol <T DIA.FontProvider <T DIA.ColorProvider
+SYSDYN.ModuleSymbolType <T L0.Entity
+
+SYSDYN.ModuleSymbol <T DIA.FontProvider <T DIA.ColorProvider : SYSDYN.ModuleSymbolType
     @MOD.defSymbol "ModuleSymbol" SYSDYN.Module
     STR.IsDefinedBy _ : DIA.Composite
         @L0.orderedSet  
diff --git a/bundles/org.simantics.sysdyn.ui/adapters.xml b/bundles/org.simantics.sysdyn.ui/adapters.xml
index 32864ef3..5d274576 100644
--- a/bundles/org.simantics.sysdyn.ui/adapters.xml
+++ b/bundles/org.simantics.sysdyn.ui/adapters.xml
@@ -267,7 +267,7 @@
     </target>     
   
     <target interface="org.simantics.db.layer0.adapter.Remover">
-        <type uri="http://www.simantics.org/Sysdyn-0.0/ModuleSymbol"
+        <type uri="http://www.simantics.org/Sysdyn-0.0/ModuleSymbolType"
             class="org.simantics.sysdyn.ui.browser.actions.remove.ModuleSymbolRemover">
             <this />
         </type>
diff --git a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/newActions/NewModuleTypeAction.java b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/newActions/NewModuleTypeAction.java
index ac524380..20cae87d 100644
--- a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/newActions/NewModuleTypeAction.java
+++ b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/newActions/NewModuleTypeAction.java
@@ -94,7 +94,6 @@ public class NewModuleTypeAction implements ActionFactory{
                         g.claimLiteral(moduleSymbol, l0.HasName, name + " Symbol");
                         g.claimLiteral(moduleSymbol, l0.HasLabel, name + " Symbol");
                         g.claim(moduleSymbol, l0.Inherits, sr.ModuleSymbol);
-                        g.claim(moduleSymbol, l0.InstanceOf, sr.ModuleSymbol);
                         g.claim(moduleSymbol, mr.SymbolToComponentType, moduleType);
                         g.claim(moduleSymbol, l0.PartOf, moduleType);
 
diff --git a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/remove/ModuleSymbolRemover.java b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/remove/ModuleSymbolRemover.java
index 1b5becef..4f718fe5 100644
--- a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/remove/ModuleSymbolRemover.java
+++ b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/remove/ModuleSymbolRemover.java
@@ -11,44 +11,59 @@
  *******************************************************************************/
 package org.simantics.sysdyn.ui.browser.actions.remove;
 
+import java.util.Collection;
+import java.util.Map;
+
+import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
+import org.simantics.db.common.request.PossibleIndexRoot;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.indexing.IndexUtils;
 import org.simantics.db.layer0.adapter.impl.AbstractRemover;
 import org.simantics.db.layer0.adapter.impl.EntityRemover;
 import org.simantics.layer0.Layer0;
 import org.simantics.sysdyn.SysdynResource;
 
 /**
- * 
+ *
  * @author Miro Eklund
  *
  */
 public class ModuleSymbolRemover extends AbstractRemover {
 
     public ModuleSymbolRemover(Resource resource) {
-    	super(resource);
+        super(resource);
+    }
+
+    @Override
+    public String canRemove(ReadGraph graph, Map<Object, Object> aux) throws DatabaseException {
+        Resource model = graph.syncRequest(new PossibleIndexRoot(resource));
+        if(model == null) return null;
+        Collection<Resource> symbolsInUse = IndexUtils.findByType(graph, model, resource);
+        if(symbolsInUse.isEmpty()) return null;
+        return "Module you are attemping to delete is use in the model.";
     }
-    
+
     @Override
     public void remove(WriteGraph g) throws DatabaseException {
-    	g.markUndoPoint();
-
-	    Layer0 L0 = Layer0.getInstance(g);
-	    SysdynResource sr = SysdynResource.getInstance(g);
-	        
-	    //We need to remove the Module object, not just the symbol.
-	    //Thus, if the resource is the symbol, find the parent Module first
-	    if(g.isInstanceOf(resource, sr.ModuleSymbol)) {
-	    	Resource module = g.getPossibleObject(resource, L0.PartOf);
-	        if(module != null) {
-	            EntityRemover.remove(g, module, false); //Remove Module instead - was of type ModuleSymbol
-	        } else {
-	        	EntityRemover.remove(g, resource, false);
-	        }
-	    } else {
-	        EntityRemover.remove(g, resource, false); //Remove resource - not of type ModuleSymbol
-	    }
+        g.markUndoPoint();
+
+        Layer0 L0 = Layer0.getInstance(g);
+        SysdynResource sr = SysdynResource.getInstance(g);
+
+        //We need to remove the Module object, not just the symbol.
+        //Thus, if the resource is the symbol, find the parent Module first
+        if(g.isInstanceOf(resource, sr.ModuleSymbolType)) {
+            Resource module = g.getPossibleObject(resource, L0.PartOf);
+            if(module != null) {
+                EntityRemover.remove(g, module, false); //Remove Module instead - was of type ModuleSymbol
+            } else {
+                EntityRemover.remove(g, resource, false);
+            }
+        } else {
+            EntityRemover.remove(g, resource, false); //Remove resource - not of type ModuleSymbol
+        }
     }
 
     @Override