Changeset 17394 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ParameterizedItemConverter.cs

Timestamp:

01/07/20 16:25:39 (4 years ago)

Author:

dpiringe

Message:

#3026:

• deleted: ConvertableAttribute, DummyConverter, ObjectExtensions
• renamed: CustomJsonWriter -> SingleLineArrayJsonWriter, JCInstantiator -> JsonTemplateInstantiator
• added: JsonItemConverterFactory, UnsupportedJsonItem
• IJsonItemConverter:
  • added two new properties: Priority and ConvertableType -> because converters are automatically collected by plugin infrastructure now
  • Extract, Inject references a root converter now -> typically an instance of JsonItemConverter -> to prevent cycles
• JsonItemConverter:
  • now implements the interface IJsonItemConverter
  • is now a dynamic class
  • is only instantiable with an factory (JsonItemConverterFactory)
  • still has the old (but now public) static methods Extract and Inject (without ref param IJsonItemConverter root) -> creates instance with factory and calls methods of instance
  • removed register and unregister methods, because the factory collects all converters automatically now (on first call of Create)
  • has cycle detection for Extract and Inject
  • renamed method Get to GetConverter

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ParameterizedItemConverter.cs (modified) (1 diff)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ParameterizedItemConverter.cs

@@ -8 +8 @@
 namespace HeuristicLab.JsonInterface {
   public class ParameterizedItemConverter : BaseConverter {
-    public override void InjectData(IItem item, JsonItem data) {
-      IParameterizedItem pItem = item.Cast<IParameterizedItem>();
+    public override int Priority => 2;
+    public override Type ConvertableType => typeof(IParameterizedItem);
+
+    public override void InjectData(IItem item, JsonItem data, IJsonItemConverter root) {
+      IParameterizedItem pItem = item as IParameterizedItem;
 
       if(data.Children != null) {
         foreach (var sp in data.Children)
           if (pItem.Parameters.TryGetValue(sp.Name, out IParameter param))
-            JsonItemConverter.Inject(param, sp);
+            root.Inject(param, sp, root);
       }
     }
 
-    public override JsonItem ExtractData(IItem value) {
-      JsonItem item = new JsonItem();
+    public override void Populate(IItem value, JsonItem item, IJsonItemConverter root) {
       var parameterizedItem = value as IParameterizedItem;
 
       foreach (var param in parameterizedItem.Parameters) {
-        if(!param.Hidden) {
-          JsonItem data = JsonItemConverter.Extract(param);
-          //data.Name = param.Name;
-
-          if (item.Children == null)
-            item.Children = new List<JsonItem>();
-          item.Children.Add(data);
-        }
+        if(!param.Hidden)
+          item.AddChilds(root.Extract(param, root));
       }
-      return item;
     }
   }