claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unnecessary serialization

Browse Source
This commit is contained in:
Matt Nadareski
2020-09-07 22:33:48 -07:00
parent d2ab6fdc05
commit f679aa46b9
3 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SabreTools.Library/DatItems/DipSwitch.cs
View File

@@ -80,16 +80,16 @@ namespace SabreTools.Library.DatItems
/// </summary> /// </summary>
[JsonProperty("part", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("part", DefaultValueHandling = DefaultValueHandling.Ignore)]
[XmlElement("part")] [XmlElement("part")]
public Part Part { get; set; } public Part Part { get; set; } = null;
[JsonIgnore] [JsonIgnore]
public bool PartSpecified public bool PartSpecified
{ {
get get
{ {
return Part != null && Part != default return Part != null
&& ((Part.Name != null && Part.Name != default) && (!string.IsNullOrEmpty(Part.Name)
|| (Part.Interface != null && Part.Interface != default)); || !string.IsNullOrEmpty(Part.Interface));
} }
} }

18
SabreTools.Library/DatItems/Disk.cs
View File

@@ -84,7 +84,7 @@ namespace SabreTools.Library.DatItems
/// </summary> /// </summary>
[JsonProperty("writable", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("writable", DefaultValueHandling = DefaultValueHandling.Ignore)]
[XmlElement("writable")] [XmlElement("writable")]
public bool? Writable { get; set; } public bool? Writable { get; set; } = null;
[JsonIgnore] [JsonIgnore]
public bool WritableSpecified { get { return Writable != null; } } public bool WritableSpecified { get { return Writable != null; } }
@@ -105,7 +105,7 @@ namespace SabreTools.Library.DatItems
/// </summary> /// </summary>
[JsonProperty("optional", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("optional", DefaultValueHandling = DefaultValueHandling.Ignore)]
[XmlElement("optional")] [XmlElement("optional")]
public bool? Optional { get; set; } public bool? Optional { get; set; } = null;
[JsonIgnore] [JsonIgnore]
public bool OptionalSpecified { get { return Optional != null; } } public bool OptionalSpecified { get { return Optional != null; } }
@@ -119,15 +119,15 @@ namespace SabreTools.Library.DatItems
/// </summary> /// </summary>
[JsonProperty("diskarea", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("diskarea", DefaultValueHandling = DefaultValueHandling.Ignore)]
[XmlElement("diskarea")] [XmlElement("diskarea")]
public DiskArea DiskArea { get; set; } public DiskArea DiskArea { get; set; } = null;
[JsonIgnore] [JsonIgnore]
public bool DiskAreaSpecified public bool DiskAreaSpecified
{ {
get get
{ {
return DiskArea != null && DiskArea != default return DiskArea != null
&& DiskArea.Name != null && DiskArea.Name != default; && !string.IsNullOrEmpty(DiskArea.Name);
} }
} }
@@ -136,16 +136,16 @@ namespace SabreTools.Library.DatItems
/// </summary> /// </summary>
[JsonProperty("part", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("part", DefaultValueHandling = DefaultValueHandling.Ignore)]
[XmlElement("part")] [XmlElement("part")]
public Part Part { get; set; } public Part Part { get; set; } = null;
[JsonIgnore] [JsonIgnore]
public bool PartSpecified public bool PartSpecified
{ {
get get
{ {
return Part != null && Part != default return Part != null
&& ((Part.Name != null && Part.Name != default) && (!string.IsNullOrEmpty(Part.Name)
|| (Part.Interface != null && Part.Interface != default)); || !string.IsNullOrEmpty(Part.Interface));
} }
} }

26
SabreTools.Library/DatItems/Rom.cs
View File

@@ -59,7 +59,7 @@ namespace SabreTools.Library.DatItems
/// </summary> /// </summary>
[JsonProperty("size", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("size", DefaultValueHandling = DefaultValueHandling.Ignore)]
[XmlElement("size")] [XmlElement("size")]
public long? Size { get; set; } public long? Size { get; set; } = null;
[JsonIgnore] [JsonIgnore]
public bool SizeSpecified { get { return Size != null; } } public bool SizeSpecified { get { return Size != null; } }
@@ -198,7 +198,7 @@ namespace SabreTools.Library.DatItems
/// </summary> /// </summary>
[JsonProperty("optional", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("optional", DefaultValueHandling = DefaultValueHandling.Ignore)]
[XmlElement("optional")] [XmlElement("optional")]
public bool? Optional { get; set; } public bool? Optional { get; set; } = null;
[JsonIgnore] [JsonIgnore]
public bool OptionalSpecified { get { return Optional != null; } } public bool OptionalSpecified { get { return Optional != null; } }
@@ -208,7 +208,7 @@ namespace SabreTools.Library.DatItems
/// </summary> /// </summary>
[JsonProperty("inverted", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("inverted", DefaultValueHandling = DefaultValueHandling.Ignore)]
[XmlElement("inverted")] [XmlElement("inverted")]
public bool? Inverted { get; set; } public bool? Inverted { get; set; } = null;
[JsonIgnore] [JsonIgnore]
public bool InvertedSpecified { get { return Inverted != null; } } public bool InvertedSpecified { get { return Inverted != null; } }
@@ -240,7 +240,7 @@ namespace SabreTools.Library.DatItems
/// </summary> /// </summary>
[JsonProperty("original", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("original", DefaultValueHandling = DefaultValueHandling.Ignore)]
[XmlElement("original")] [XmlElement("original")]
public Original Original { get; set; } public Original Original { get; set; } = null;
[JsonIgnore] [JsonIgnore]
public bool OriginalSpecified { get { return Original != null && Original != default; } } public bool OriginalSpecified { get { return Original != null && Original != default; } }
@@ -287,17 +287,17 @@ namespace SabreTools.Library.DatItems
/// </summary> /// </summary>
[JsonProperty("dataarea", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("dataarea", DefaultValueHandling = DefaultValueHandling.Ignore)]
[XmlElement("dataarea")] [XmlElement("dataarea")]
public DataArea DataArea { get; set; } public DataArea DataArea { get; set; } = null;
[JsonIgnore] [JsonIgnore]
public bool DataAreaSpecified public bool DataAreaSpecified
{ {
get get
{ {
return DataArea != null && DataArea != default return DataArea != null
&& ((DataArea.Name != null && DataArea.Name != default) && (!string.IsNullOrEmpty(DataArea.Name)
|| (DataArea.Size != null && DataArea.Size != default) || (DataArea.Size != null)
|| (DataArea.Width != null && DataArea.Width != default) || (DataArea.Width != null)
|| (DataArea.Endianness != Endianness.NULL)); || (DataArea.Endianness != Endianness.NULL));
} }
} }
@@ -318,16 +318,16 @@ namespace SabreTools.Library.DatItems
/// </summary> /// </summary>
[JsonProperty("part", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("part", DefaultValueHandling = DefaultValueHandling.Ignore)]
[XmlElement("part")] [XmlElement("part")]
public Part Part { get; set; } public Part Part { get; set; } = null;
[JsonIgnore] [JsonIgnore]
public bool PartSpecified public bool PartSpecified
{ {
get get
{ {
return Part != null && Part != default return Part != null
&& ((Part.Name != null && Part.Name != default) && (!string.IsNullOrEmpty(Part.Name)
|| (Part.Interface != null && Part.Interface != default)); || !string.IsNullOrEmpty(Part.Interface));
} }
} }