Changeset 17473 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.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/JsonTemplateInstantiator.cs (modified) (2 diffs)

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

@@ -105 +105 @@
         instData.Objects.Add(tmp.Path, tmp);
       }
+      //IList<IJsonItem> faultyItems = new List<IJsonItem>();
+      //root.GetValidator().Validate(ref faultyItems);
     }
     
@@ -113 +115 @@
         // override default value
         if (instData.Objects.TryGetValue(path, out IJsonItem param)) {
-          // save range from template
-          IEnumerable<object> tmpRange = param.Range;
+          // remove fixed template parameter => dont allow to copy them from concrete config
+          obj.Property(nameof(IIntervalRestrictedJsonItem<int>.Minimum))?.Remove();
+          obj.Property(nameof(IIntervalRestrictedJsonItem<int>.Maximum))?.Remove();
+          obj.Property(nameof(IConcreteRestrictedJsonItem<string>.ConcreteRestrictedItems))?.Remove();
+          // merge
           param.SetFromJObject(obj);
-          // set range from template
-          param.Range = tmpRange; 
         } else throw new InvalidDataException($"No parameter with path='{path}' defined!");
       }