From: miettinen <miettinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Wed, 3 Jul 2013 05:40:13 +0000 (+0000)
Subject: Renaming variables, enumerations, and modules in model browser (refs #4152).
X-Git-Tag: 1.8.1~276
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=be2593115db3ced8f5d55502414eb5c7399e1ee3;p=simantics%2Fsysdyn.git

Renaming variables, enumerations, and modules in model browser (refs #4152).

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@27675 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index 32671a80..b375b9eb 100644
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -1581,6 +1581,18 @@
                         args="org.simantics.sysdyn.ui.browser.nodes.BarChartNode"
                         property="org.simantics.sysdyn.ui.nodeClass">
                   </test>
+                  <test
+                        args="org.simantics.sysdyn.ui.browser.nodes.VariableNode"
+                        property="org.simantics.sysdyn.ui.nodeClass">
+                  </test>
+                  <test
+                        args="org.simantics.sysdyn.ui.browser.nodes.EnumerationNode"
+                        property="org.simantics.sysdyn.ui.nodeClass">
+                  </test>
+                  <test
+                        args="org.simantics.sysdyn.ui.browser.nodes.ModuleNode"
+                        property="org.simantics.sysdyn.ui.nodeClass">
+                  </test>
                   <!--
                   <test
                         args="org.simantics.document.workbench.browser_old.DocumentationNode"
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/EnumerationNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/EnumerationNode.java
index cc3283ef..7d7ee9dc 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/EnumerationNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/EnumerationNode.java
@@ -2,7 +2,11 @@ package org.simantics.sysdyn.ui.browser.nodes;
 
 import org.simantics.browsing.ui.common.node.DeleteException;
 import org.simantics.browsing.ui.common.node.IDeletableNode;
+import org.simantics.browsing.ui.common.node.IModifiableNode;
+import org.simantics.browsing.ui.content.Labeler.Modifier;
+import org.simantics.browsing.ui.graph.impl.LabelModifier;
 import org.simantics.db.Resource;
+import org.simantics.db.Session;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.common.request.ObjectsWithType;
 import org.simantics.db.common.request.WriteRequest;
@@ -13,10 +17,11 @@ import org.simantics.db.layer0.util.RemoverUtil;
 import org.simantics.db.layer0.variable.Variable;
 import org.simantics.layer0.Layer0;
 import org.simantics.sysdyn.SysdynResource;
+import org.simantics.sysdyn.ui.utils.VariableNameValidator;
 import org.simantics.ui.SimanticsUI;
 import org.simantics.utils.ui.ExceptionUtils;
 
-public class EnumerationNode extends VariableNode<Resource> implements /*IModifiableNode,*/ IDeletableNode {
+public class EnumerationNode extends VariableNode<Resource> implements IModifiableNode, IDeletableNode {
 
 	public EnumerationNode(Resource resource) {
 		super(resource);
@@ -25,11 +30,11 @@ public class EnumerationNode extends VariableNode<Resource> implements /*IModifi
 	public EnumerationNode(Variable variable, Resource represents) {
         super(variable, represents);
 	}
-    /*
+    
     @Override
     public Modifier getModifier(String columnId) {
         
-        Session session = SimanticsUI.getSession();
+        final Session session = SimanticsUI.getSession();
         LabelModifier modifier = new LabelModifier(session, data, session.getService(Layer0.class).HasName) {
             @Override
             public String isValid(String label) {
@@ -38,9 +43,32 @@ public class EnumerationNode extends VariableNode<Resource> implements /*IModifi
                 else
                     return null;
             }
+            
+            @Override
+            public void modify(final String label) {
+                try {
+					session.syncRequest(new WriteRequest() {
+						@Override
+						public void perform(WriteGraph graph)
+								throws DatabaseException {
+
+			        		String originalName = graph.getRelatedValue(data, Layer0.getInstance(graph).HasName);
+			        		if(!originalName.equals(label)) {
+			        		    Resource configuration = graph.getPossibleObject(data, Layer0.getInstance(graph).PartOf);
+			        		    new VariableNameValidator().renameInAllEquations(graph, configuration, originalName, label);
+			        			graph.claimLiteral(data, Layer0.getInstance(graph).HasName, label);
+			        		}
+						}
+					});
+				} catch (DatabaseException e) {
+					e.printStackTrace();
+				}
+
+            	super.modify(label);
+            }
         };
         return modifier;
-    }*/
+    }
 
 	@Override
 	public void delete() throws DeleteException {
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModuleNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModuleNode.java
index 2c947be3..297124a0 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModuleNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModuleNode.java
@@ -11,18 +11,25 @@
  *******************************************************************************/
 package org.simantics.sysdyn.ui.browser.nodes;
 
+import org.simantics.browsing.ui.common.node.IModifiableNode;
+import org.simantics.browsing.ui.content.Labeler.Modifier;
+import org.simantics.browsing.ui.graph.impl.LabelModifier;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
+import org.simantics.db.Session;
+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.PasteHandler;
 import org.simantics.db.layer0.adapter.impl.DefaultPasteHandler;
 import org.simantics.db.layer0.variable.Variable;
 import org.simantics.layer0.Layer0;
 import org.simantics.structural.stubs.StructuralResource2;
+import org.simantics.sysdyn.ui.utils.VariableNameValidator;
 import org.simantics.ui.SimanticsUI;
 
-public class ModuleNode extends ConfigurationNode<Resource>/* implements IModifiableNode*/ {
+public class ModuleNode extends ConfigurationNode<Resource> implements IModifiableNode {
 
 	Resource configuration;
 	
@@ -61,11 +68,12 @@ public class ModuleNode extends ConfigurationNode<Resource>/* implements IModifi
         return super.getAdapter(adapter);
     }
 
-    /*@Override
+    @Override
     public Modifier getModifier(String columnId) {
         try {
-            Resource hasName = Layer0.getInstance(SimanticsUI.getSession()).HasName;
-            LabelModifier modifier = new LabelModifier(SimanticsUI.getSession(), data, hasName) {
+            final Session session = SimanticsUI.getSession();
+            Resource hasName = Layer0.getInstance(session).HasName;
+            LabelModifier modifier = new LabelModifier(session, data, hasName) {
                 @Override
                 public String isValid(String label) {
                     if (!new VariableNameValidator().isValid(data, label))
@@ -73,11 +81,34 @@ public class ModuleNode extends ConfigurationNode<Resource>/* implements IModifi
                     else
                         return null;
                 }
+                
+                @Override
+                public void modify(final String label) {
+                    try {
+    					session.syncRequest(new WriteRequest() {
+    						@Override
+    						public void perform(WriteGraph graph)
+    								throws DatabaseException {
+
+    			        		String originalName = graph.getRelatedValue(data, Layer0.getInstance(graph).HasName);
+    			        		if(!originalName.equals(label)) {
+    			        		    Resource configuration = graph.getPossibleObject(data, Layer0.getInstance(graph).PartOf);
+    			        		    new VariableNameValidator().renameInAllEquations(graph, configuration, originalName, label);
+    			        			graph.claimLiteral(data, Layer0.getInstance(graph).HasName, label);
+    			        		}
+    						}
+    					});
+    				} catch (DatabaseException e) {
+    					e.printStackTrace();
+    				}
+
+                	super.modify(label);
+                }
             };
             return modifier;
         } catch (DatabaseException e) {
             e.printStackTrace();
         }
         return null;
-    }*/
+    }
 }
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/VariableNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/VariableNode.java
index 71973d34..fdfcb134 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/VariableNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/VariableNode.java
@@ -12,10 +12,20 @@
 package org.simantics.sysdyn.ui.browser.nodes;
 
 import org.simantics.browsing.ui.common.node.AbstractNode;
+import org.simantics.browsing.ui.common.node.IModifiableNode;
+import org.simantics.browsing.ui.content.Labeler.Modifier;
+import org.simantics.browsing.ui.graph.impl.LabelModifier;
 import org.simantics.db.Resource;
+import org.simantics.db.Session;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.common.request.WriteRequest;
+import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.variable.Variable;
+import org.simantics.layer0.Layer0;
+import org.simantics.sysdyn.ui.utils.VariableNameValidator;
+import org.simantics.ui.SimanticsUI;
 
-public class VariableNode<T> extends AbstractNode<Resource>/* implements IModifiableNode*/ {
+public class VariableNode<T> extends AbstractNode<Resource> implements IModifiableNode {
 
 	Variable variable;
 
@@ -32,11 +42,12 @@ public class VariableNode<T> extends AbstractNode<Resource>/* implements IModifi
 		return variable;
 	}
 
-    /*@Override
+    @Override
     public Modifier getModifier(String columnId) {
         try {
-            Resource hasName = Layer0.getInstance(SimanticsUI.getSession()).HasName;
-            LabelModifier modifier = new LabelModifier(SimanticsUI.getSession(), data, hasName) {
+            final Session session = SimanticsUI.getSession();
+            Resource hasName = Layer0.getInstance(session).HasName;
+            LabelModifier modifier = new LabelModifier(session, data, hasName) {
                 @Override
                 public String isValid(String label) {
                     if (!new VariableNameValidator().isValid(data, label))
@@ -44,11 +55,34 @@ public class VariableNode<T> extends AbstractNode<Resource>/* implements IModifi
                     else
                         return null;
                 }
+                
+                @Override
+                public void modify(final String label) {
+                    try {
+    					session.syncRequest(new WriteRequest() {
+    						@Override
+    						public void perform(WriteGraph graph)
+    								throws DatabaseException {
+
+    			        		String originalName = graph.getRelatedValue(data, Layer0.getInstance(graph).HasName);
+    			        		if(!originalName.equals(label)) {
+    			        		    Resource configuration = graph.getPossibleObject(data, Layer0.getInstance(graph).PartOf);
+    			        		    new VariableNameValidator().renameInAllEquations(graph, configuration, originalName, label);
+    			        			graph.claimLiteral(data, Layer0.getInstance(graph).HasName, label);
+    			        		}
+    						}
+    					});
+    				} catch (DatabaseException e) {
+    					e.printStackTrace();
+    				}
+
+                	super.modify(label);
+                }
             };
             return modifier;
         } catch (DatabaseException e) {
             e.printStackTrace();
         }
         return null;
-    }*/
+    }
 }
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EnumerationTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EnumerationTab.java
index 265325a2..b9f246ce 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EnumerationTab.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EnumerationTab.java
@@ -300,7 +300,7 @@ public class EnumerationTab extends LabelPropertyTabContributor implements Widge
 
 							@Override
 							public void run() {
-							    if(result != null)
+							    if(result != null && !showAll.getWidget().isDisposed())
 							        showAll.getWidget().setSelection(result.booleanValue());
 							}
 						});