Improve PropertyChange.equals for asserted properties.

[simantics/interop.git] / org.simantics.interop.update / src / org / simantics / interop / update / model / PropertyChange.java

diff --git a/org.simantics.interop.update/src/org/simantics/interop/update/model/PropertyChange.java b/org.simantics.interop.update/src/org/simantics/interop/update/model/PropertyChange.java
index 491bf5753c8932f8e031fcbe30a523ac70a33fa5..de28055996ef41f8c1ed7368fd5d6fffb6ccc651 100644 (file)
--- a/org.simantics.interop.update/src/org/simantics/interop/update/model/PropertyChange.java
+++ b/org.simantics.interop.update/src/org/simantics/interop/update/model/PropertyChange.java
@@ -5,6 +5,7 @@ import org.simantics.db.Statement;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.interop.test.GraphChanges;
+import org.simantics.layer0.Layer0;
 import org.simantics.utils.datastructures.Pair;
 
 public class PropertyChange {
@@ -15,6 +16,8 @@ public class PropertyChange {
        protected boolean applied = false;
        protected boolean selected = false;
        protected boolean visible = true;
+       protected boolean enabled = true;
+       protected Object customValue = null;
        
        
        public PropertyChange(GraphChanges changes, Resource left, Statement first, Resource right, Statement second) {
@@ -78,7 +81,15 @@ public class PropertyChange {
                if (obj.getClass() != this.getClass())
                        return false;
                PropertyChange c = (PropertyChange)obj;
-               return pair.equals(c.pair);
+               if (!leftSubject.equals(c.leftSubject))
+                       return false;
+               if (!rightSubject.equals(c.rightSubject))
+                       return false;
+               if (pair.first != null && pair.first.equals(c.pair.first))
+                       return true;
+               if (pair.second != null && pair.second.equals(c.pair.second))
+                       return true;
+               return false;
        }
        
        public void apply(WriteGraph graph) throws DatabaseException {
@@ -88,36 +99,70 @@ public class PropertyChange {
                        graph.deny(leftSubject, pair.first.getPredicate(),pair.first.getObject());
                        return;
                } 
+               Layer0 L0 = Layer0.getInstance(graph);
                Resource s = leftSubject;
-               //Resource s = changes.getComparable().getLeft(rightSubject);
-               //Resource s = pair.first.getSubject();
-               Resource pred = pair.second.getPredicate();
-               if (graph.hasValue(pair.second.getObject())) {
-                       Object value = graph.getValue(pair.second.getObject());
-                       graph.claimLiteral(s, pred, value);
-               } else {
-                       graph.deny(s,pred);
+               if (graph.isInstanceOf(pair.second.getObject(), L0.Literal)) {
+                       Object value = null;
+                       if (customValue != null)
+                               value = customValue;
+                       else if (graph.hasValue(pair.second.getObject())) {
+                               value = graph.getValue(pair.second.getObject());
+                       }
+                       Resource pred = pair.second.getPredicate();
+                       if (getChanges().getComparable().containsRight(pred))
+                               pred = getChanges().getComparable().getLeft(pred);
+                       
+                       if (value != null) {
+                               graph.deny(s, pred);
+                               graph.claimLiteral(s, pred, value);
+                       } else {
+                               graph.deny(s,pred);
+                       }
+               } else if (graph.isInstanceOf(pair.second.getObject(), L0.SCLValue)) {
+                       Resource pred = pair.second.getPredicate();
+                       graph.deny(s, pred);
+                       Resource valueResource = graph.newResource();
+                       graph.claim(valueResource, L0.InstanceOf, graph.getSingleObject(pair.second.getObject(), L0.InstanceOf));
+                       AddDeleteUpdateOp.copyProperties(graph, pair.second.getObject(), valueResource);
+                       graph.claim(s, pred, valueResource);
                }
                applied = true;
-               
        }
        
+       /**
+        * Sets selected state. 
+        * @param select
+        * @return true if selection state was changed
+        */
        public boolean select(boolean select) {
+           if (!enabled)
+               return false;
                if (applied)
                        return false;
                this.selected = select;
                return true;
        }
        
-       
+       /**
+        * Is change selected.
+        * @return
+        */
        public boolean selected() {
                return selected;
        }
        
+       /**
+        * Has change been applied
+        * @return
+        */
        public boolean applied() {
                return applied;
        }
        
+       /**
+        * Is change visible
+        * @return
+        */
        public boolean isVisible() {
                return visible;
        }
@@ -126,14 +171,42 @@ public class PropertyChange {
                this.visible = visible;
        }
        
+       /**
+        * Is change enabled. Disabled changes do not allow changing selected state.
+        * @return
+        */
+       public boolean enabled() {
+        return enabled;
+    }
+       
+       public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+       
        @Override
        public String toString() {
                String s = "PropertyChange";
                if (pair.first != null)
-                       s += " (" + (leftSubject) + " , " + pair.first.getPredicate() + " , " + pair.first.getObject() + ")";
+                       s += " L(" + (leftSubject) + " , " + pair.first.getPredicate() + " , " + pair.first.getObject() + ")";
                if (pair.second != null)
-                       s += " (" + (rightSubject) + " , " + pair.second.getPredicate() + " , " + pair.second.getObject() + ")";
+                       s += " R(" + (rightSubject) + " , " + pair.second.getPredicate() + " , " + pair.second.getObject() + ")";
+               if (selected)
+                   s += " selected";
+               if (enabled)
+                   s += " enabled";
+               if (visible)
+            s += " visible";
+               if (applied)
+                   s += " applied";
                return s;
        }
        
+       public Object getCustomValue() {
+               return customValue;
+       }
+       
+       public void setCustomValue(Object customValue) {
+               this.customValue = customValue;
+       }
+       
 }