Simupedia tuning step 2

[simantics/platform.git] / bundles / org.simantics.db.layer0 / src / org / simantics / db / layer0 / request / PropertyInfo.java

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/request/PropertyInfo.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/request/PropertyInfo.java
index 150c760aa0cd2d26069b03c84d75b7d8f03a9218..a7ef69c8bb38f193b142c39d3e47a40998f1010c 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/request/PropertyInfo.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/request/PropertyInfo.java
@@ -30,6 +30,7 @@ import org.simantics.utils.datastructures.Pair;
 public class PropertyInfo {
        public final Resource predicate;
        public final String name;
+       public final boolean isImmutable;
        public final boolean isHasProperty;
        public final boolean isFunctional;
        public final Set<String> classifications;
@@ -42,9 +43,10 @@ public class PropertyInfo {
        public final Map<String,Pair<Resource, ChildReference>> subliteralPredicates;
        public final ValueAccessor valueAccessor;
        public final boolean hasEnumerationRange;
-       public PropertyInfo(Resource predicate, String name, boolean isFunctional, boolean isHasProperty, Set<String> classifications, VariableBuilder builder, Resource literalRange, Datatype requiredDatatype, String definedUnit, String requiredValueType, Binding defaultBinding, Map<String,Pair<Resource, ChildReference>> subliteralPredicates, ValueAccessor valueAccessor, boolean hasEnumerationRange) {
+       public PropertyInfo(Resource predicate, String name, boolean isImmutable, boolean isFunctional, boolean isHasProperty, Set<String> classifications, VariableBuilder builder, Resource literalRange, Datatype requiredDatatype, String definedUnit, String requiredValueType, Binding defaultBinding, Map<String,Pair<Resource, ChildReference>> subliteralPredicates, ValueAccessor valueAccessor, boolean hasEnumerationRange) {
                this.predicate = predicate;
                this.name = name;
+               this.isImmutable = isImmutable;
                this.isFunctional = isFunctional;
                this.isHasProperty = isHasProperty;
                this.classifications = classifications;
@@ -71,7 +73,7 @@ public class PropertyInfo {
                
                Binding defaultBinding = requiredDatatype != null ? Bindings.getBinding(requiredDatatype) : null;
                
-               return new PropertyInfo(predicate, name, isFunctional, isHasProperty, classifications, builder, literalRange, requiredDatatype, definedUnit, requiredValueType, defaultBinding, subliteralPredicates, valueAccessor, hasEnumerationRange);
+               return new PropertyInfo(predicate, name, graph.isImmutable(predicate), isFunctional, isHasProperty, classifications, builder, literalRange, requiredDatatype, definedUnit, requiredValueType, defaultBinding, subliteralPredicates, valueAccessor, hasEnumerationRange);
 
        }
        public boolean hasClassification(String classification) {
@@ -107,20 +109,22 @@ public class PropertyInfo {
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + ((builder == null) ? 0 : builder.hashCode());
-        result = prime * result + ((classifications == null) ? 0 : classifications.hashCode());
-        result = prime * result + ((defaultBinding == null) ? 0 : defaultBinding.hashCode());
-        result = prime * result + ((definedUnit == null) ? 0 : definedUnit.hashCode());
-        result = prime * result + (hasEnumerationRange ? 1231 : 1237);
-        result = prime * result + (isFunctional ? 1231 : 1237);
-        result = prime * result + (isHasProperty ? 1231 : 1237);
-        result = prime * result + ((literalRange == null) ? 0 : literalRange.hashCode());
-        result = prime * result + ((name == null) ? 0 : name.hashCode());
         result = prime * result + ((predicate == null) ? 0 : predicate.hashCode());
-        result = prime * result + ((requiredDatatype == null) ? 0 : requiredDatatype.hashCode());
-        result = prime * result + ((requiredValueType == null) ? 0 : requiredValueType.hashCode());
-        result = prime * result + ((subliteralPredicates == null) ? 0 : subliteralPredicates.hashCode());
-        result = prime * result + ((valueAccessor == null) ? 0 : valueAccessor.hashCode());
+        if(!isImmutable) { 
+            result = prime * result + ((builder == null) ? 0 : builder.hashCode());
+            result = prime * result + ((classifications == null) ? 0 : classifications.hashCode());
+            result = prime * result + ((defaultBinding == null) ? 0 : defaultBinding.hashCode());
+            result = prime * result + ((definedUnit == null) ? 0 : definedUnit.hashCode());
+            result = prime * result + (hasEnumerationRange ? 1231 : 1237);
+            result = prime * result + (isFunctional ? 1231 : 1237);
+            result = prime * result + (isHasProperty ? 1231 : 1237);
+            result = prime * result + ((literalRange == null) ? 0 : literalRange.hashCode());
+            result = prime * result + ((name == null) ? 0 : name.hashCode());
+            result = prime * result + ((requiredDatatype == null) ? 0 : requiredDatatype.hashCode());
+            result = prime * result + ((requiredValueType == null) ? 0 : requiredValueType.hashCode());
+            result = prime * result + ((subliteralPredicates == null) ? 0 : subliteralPredicates.hashCode());
+            result = prime * result + ((valueAccessor == null) ? 0 : valueAccessor.hashCode());
+        }
         return result;
     }
     @Override
@@ -132,6 +136,13 @@ public class PropertyInfo {
         if (getClass() != obj.getClass())
             return false;
         PropertyInfo other = (PropertyInfo) obj;
+        if (predicate == null) {
+            if (other.predicate != null)
+                return false;
+        } else if (!predicate.equals(other.predicate))
+            return false;
+        if(isImmutable)
+            return true;
         if (builder == null) {
             if (other.builder != null)
                 return false;
@@ -168,11 +179,6 @@ public class PropertyInfo {
                 return false;
         } else if (!name.equals(other.name))
             return false;
-        if (predicate == null) {
-            if (other.predicate != null)
-                return false;
-        } else if (!predicate.equals(other.predicate))
-            return false;
         if (requiredDatatype == null) {
             if (other.requiredDatatype != null)
                 return false;