Changeset 17406 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonItem.cs

Timestamp:

01/27/20 10:33:01 (4 years ago)

Author:

dpiringe

Message:

#3026

• added interfaces IJsonItem and IJsonItemValidator
• replaced every reference JsonItem with IJsonItem

File:

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

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

@@ -14 +14 @@
   /// Main data class for json interface.
   /// </summary>
-  public class JsonItem {
-    public class JsonItemValidator {
+  public class JsonItem : IJsonItem {
+
+    public class JsonItemValidator : IJsonItemValidator {
       private IDictionary<int, bool> Cache = new Dictionary<int, bool>();
       private JsonItem Root { get; set; }
@@ -22 +23 @@
       }
 
-      public bool Validate(ref IList<JsonItem> faultyItems) {
-        faultyItems = new List<JsonItem>();
+      public bool Validate(ref IList<IJsonItem> faultyItems) {
+        faultyItems = new List<IJsonItem>();
         return ValidateHelper(Root, ref faultyItems);
       }
 
-      private bool ValidateHelper(JsonItem item, ref IList<JsonItem> faultyItems) {
+      private bool ValidateHelper(JsonItem item, ref IList<IJsonItem> faultyItems) {
         int hash = item.GetHashCode();
         if (Cache.TryGetValue(hash, out bool r))
@@ -38 +39 @@
         Cache.Add(hash, res);
         foreach (var child in item.Children)
-          res = res && ValidateHelper(child, ref faultyItems);
+          res = res && ValidateHelper(child as JsonItem, ref faultyItems);
         return res;
       }
@@ -47 +48 @@
     public virtual string Path {
       get {
-        JsonItem tmp = Parent;
+        IJsonItem tmp = Parent;
         StringBuilder builder = new StringBuilder(this.Name);
         while(tmp != null) {
@@ -58 +59 @@
 
     [JsonIgnore]
-    public virtual IList<JsonItem> Children { get; protected set; }
+    public virtual IList<IJsonItem> Children { get; protected set; }
 
     [JsonIgnore]
-    public virtual JsonItem Parent { get; set; }
+    public virtual IJsonItem Parent { get; set; }
 
     public virtual object Value { get; set; }
@@ -72 +73 @@
     public JsonItem() { }
 
-    public JsonItem(IEnumerable<JsonItem> childs) {
+    public JsonItem(IEnumerable<IJsonItem> childs) {
       AddChilds(childs);
     }
     #endregion
-
 
     #region Public Static Methods
@@ -86 +86 @@
       if(target.Children != null) {
         if (from.Children != null)
-          ((List<JsonItem>)from.Children).AddRange(target.Children); 
+          ((List<IJsonItem>)from.Children).AddRange(target.Children); 
       } else {
         target.Children = from.Children;
@@ -94 +94 @@
 
     #region Public Methods
-    public void AddChilds(params JsonItem[] childs) => 
-      AddChilds(childs as IEnumerable<JsonItem>);
+    public void AddChilds(params IJsonItem[] childs) => 
+      AddChilds(childs as IEnumerable<IJsonItem>);
 
-    public void AddChilds(IEnumerable<JsonItem> childs) {
+    public void AddChilds(IEnumerable<IJsonItem> childs) {
       if (Children == null)
-        Children = new List<JsonItem>();
+        Children = new List<IJsonItem>();
       foreach (var child in childs) {
         Children.Add(child);
@@ -106 +106 @@
     }
 
-    public virtual JsonItemValidator GetValidator() => new JsonItemValidator(this);
+    public virtual IJsonItemValidator GetValidator() => new JsonItemValidator(this);
     #endregion
 
@@ -154 +154 @@
 
     #region BuildJsonItemMethods
-    public static JsonItem BuildJsonItem(JObject obj) {
+    public static IJsonItem BuildJsonItem(JObject obj) {
       object val = obj[nameof(Value)]?.ToObject<object>();
       if (val is JContainer jContainer) // for resolving array values