Context Navigation

Models

Timestamp:

02/01/21 14:37:18 (4 years ago)

Author:

dpiringe

Message:

#3026

removed the option to set the value for JsonItems via exporter
- reworked some base controls
- added new controls for JsonItem specific properties (e.g. ArrayResizable)
- deleted a lot of obsolet controls
removed the Enable checkbox in the detail view of JsonItems
exporter now clones the IOptimizer object
added a check + message for unsupported exports
list of JsonItems now includes unsupported JsonItems (disabled and marked with 'unsupported')
refactored the converter type check
- now every converter has to specify its supported type(s)

Location:

Files:

-                      r17519
+                      r17828
+using System.Collections.Generic;
+using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 namespace HeuristicLab.JsonInterface {
   public abstract class ConcreteRestrictedValueJsonItem<T> : ValueJsonItem<T>, IConcreteRestrictedJsonItem<T> {
     public IEnumerable<T> ConcreteRestrictedItems { get; set; }

r17519	r17828
20	20	if (minProp != null) Minimum = minProp.ToObject<T>();
21	21
22
23	22	var maxProp = jObject[nameof(IIntervalRestrictedJsonItem<T>.Maximum)];
24	23	if (maxProp != null) Maximum = maxProp.ToObject<T>();

-                      r17519
+                      r17828
+using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 …
     public bool Success { get; }
     public IEnumerable<string> Errors { get; }
+    public Exception GenerateException() =>
+      new AggregateException(Errors.Select(x => new ArgumentException(x)));
+  }
 …
+    }
-    // TODO jsonIgnore dataType?
     [JsonIgnore]
     public virtual IEnumerable<IJsonItem> Children { get; protected set; }

r17519	r17828
2	2	public class ResultJsonItem : JsonItem, IResultJsonItem {
3	3	protected override ValidationResult Validate() => ValidationResult.Successful();
	4
	5	public string Converter { get; set; }
4	6	}
5	7	}

-                      r17519
+                      r17828
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Newtonsoft.Json;
 namespace HeuristicLab.JsonInterface {
   public class UnsupportedJsonItem : JsonItem {
+    /*
     public override string Name {
       get => throw new NotSupportedException();
 …
+    }
     public override string Description {
+    public override string Description { // TODO
       get => throw new NotSupportedException();
       set => throw new NotSupportedException();
 …
       get => throw new NotSupportedException();
+    }
+    */
     [JsonIgnore]
     public override IEnumerable<IJsonItem> Children {
       get => throw new NotSupportedException();
+      get => Enumerable.Empty<IJsonItem>();
       protected set => throw new NotSupportedException();
+    }
+    /*
     [JsonIgnore]
     public override IJsonItem Parent {
 …
       set => throw new NotSupportedException();
+    }
+    */
     protected override ValidationResult Validate() => ValidationResult.Successful();
+  }

Note: See TracChangeset for help on using the changeset viewer.