Changeset 17473 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/JsonItem.cs

Timestamp:

03/10/20 17:17:37 (4 years ago)

Author:

dpiringe

Message:

#3026:

• refactored inheritance structure of json items, now the default JsonItem is an abstract class without properties Value and Range -> splitted up into new interfaces
• updated view models for new json item structure
• updated SingleLineArrayJsonWriter

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/JsonItem.cs (modified) (7 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/JsonItem.cs

@@ -11 +11 @@
   /// Main data class for json interface.
   /// </summary>
-  public class JsonItem : IJsonItem {
+  public abstract class JsonItem : IJsonItem {
 
     public class JsonItemValidator : IJsonItemValidator {
@@ -25 +25 @@
       }
 
+      // TODO: return ValidationResult ?
       private bool ValidateHelper(JsonItem item, ref IList<IJsonItem> faultyItems) {
         int hash = item.GetHashCode();
@@ -30 +31 @@
           return r;
 
-        bool res = true;
-        if (item.Value != null && item.Range != null)
-          res = item.IsInRange();
+        bool res = item.Validate();
         if (!res) faultyItems.Add(item);
         Cache.Add(hash, res);
-        if(item.Children != null)
+        if(item.Children != null) {
           foreach (var child in item.Children)
-            res = res && ValidateHelper(child as JsonItem, ref faultyItems);
+            if (!ValidateHelper(child as JsonItem, ref faultyItems))
+              res = false && res;
+        }
         return res;
       }
@@ -62 +63 @@
     }
 
-    public virtual object Value { get; set; }
+    //public virtual object Value { get; set; }
 
-    public virtual IEnumerable<object> Range { get; set; }
+    //public virtual IEnumerable<object> Range { get; set; }
     
     // TODO jsonIgnore dataType?
@@ -105 +106 @@
 
     public virtual void SetFromJObject(JObject jObject) {
-      Value = jObject[nameof(IJsonItem.Value)]?.ToObject<object>();
-      Range = jObject[nameof(IJsonItem.Range)]?.ToObject<object[]>();
+      //Value = jObject[nameof(IJsonItem.Value)]?.ToObject<object>();
+      //Range = jObject[nameof(IJsonItem.Range)]?.ToObject<object[]>();
     }
     #endregion
@@ -114 +115 @@
      * TODO protected abstract bool Validate();
      */
-     
+    protected abstract bool Validate();
+    /*
     protected virtual bool IsInRange() {
       bool b1 = true, b2 = true;
@@ -156 +158 @@
         (((T)max).CompareTo(value) == 1 || ((T)max).CompareTo(value) == 0);
     }
+    */
     #endregion
   }