diff --git a/UIX.RenderApi/Microsoft/Iris/Render/Graphics/Image.cs b/UIX.RenderApi/Microsoft/Iris/Render/Graphics/Image.cs index 315f303..7f0c48c 100644 --- a/UIX.RenderApi/Microsoft/Iris/Render/Graphics/Image.cs +++ b/UIX.RenderApi/Microsoft/Iris/Render/Graphics/Image.cs @@ -270,5 +270,7 @@ namespace Microsoft.Iris.Render.Graphics } internal delegate void ContentReloadedHandler(Image image); + + public override string ToString() => $"{{Image {Identifier} {Format} {Size}}}"; } } diff --git a/UIX.RenderApi/Microsoft/Iris/Render/Size.cs b/UIX.RenderApi/Microsoft/Iris/Render/Size.cs index 9b9d184..955ea17 100644 --- a/UIX.RenderApi/Microsoft/Iris/Render/Size.cs +++ b/UIX.RenderApi/Microsoft/Iris/Render/Size.cs @@ -73,7 +73,7 @@ namespace Microsoft.Iris.Render public override int GetHashCode() => this.Width ^ this.Height; - public override string ToString() => base.ToString(); + public override string ToString() => $"({Width} x {Height})"; public Point ToPoint() => new Point(this.Width, this.Height); diff --git a/UIX/Microsoft/Iris/Audio/Sound.cs b/UIX/Microsoft/Iris/Audio/Sound.cs index 55399ed..b275db4 100644 --- a/UIX/Microsoft/Iris/Audio/Sound.cs +++ b/UIX/Microsoft/Iris/Audio/Sound.cs @@ -59,5 +59,7 @@ namespace Microsoft.Iris.Audio sound.Play(); sound.UnregisterUsage(this); } + + public override string ToString() => $"{{Sound {SystemSoundEvent} '{Source}'}}"; } } diff --git a/UIX/Microsoft/Iris/Drawing/Font.cs b/UIX/Microsoft/Iris/Drawing/Font.cs index 85da0b0..7c5cf0b 100644 --- a/UIX/Microsoft/Iris/Drawing/Font.cs +++ b/UIX/Microsoft/Iris/Drawing/Font.cs @@ -4,8 +4,6 @@ // MVID: A56C6C9D-B7F6-46A9-8BDE-B3D9B8D60B11 // Assembly location: C:\Program Files\Zune\UIX.dll -using System.Text; - namespace Microsoft.Iris.Drawing { internal sealed class Font @@ -76,17 +74,6 @@ namespace Microsoft.Iris.Drawing public override int GetHashCode() => _fontName.GetHashCode() ^ _fontHeight.GetHashCode() ^ _altFontHeight.GetHashCode() ^ _fontStyle.GetHashCode(); - public override string ToString() - { - StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.Append("{Font \""); - stringBuilder.Append(_fontName); - stringBuilder.Append("\" "); - stringBuilder.Append(_fontHeight); - stringBuilder.Append("pt "); - stringBuilder.Append(_fontStyle); - stringBuilder.Append("}"); - return stringBuilder.ToString(); - } + public override string ToString() => $"{{Font \"{_fontName}\" {_fontHeight}pt {_fontStyle}}}"; } } diff --git a/UIX/Microsoft/Iris/Drawing/UIImage.cs b/UIX/Microsoft/Iris/Drawing/UIImage.cs index 6a4f4b7..8337f96 100644 --- a/UIX/Microsoft/Iris/Drawing/UIImage.cs +++ b/UIX/Microsoft/Iris/Drawing/UIImage.cs @@ -190,5 +190,7 @@ namespace Microsoft.Iris.Drawing } public event ContentLoadCompleteHandler LoadComplete; + + public override string ToString() => $"{{UIImage {RenderImage?.ToString() ?? "null"}}}"; } } diff --git a/UIX/Microsoft/Iris/Drawing/UriImage.cs b/UIX/Microsoft/Iris/Drawing/UriImage.cs index 2ff930a..9f25041 100644 --- a/UIX/Microsoft/Iris/Drawing/UriImage.cs +++ b/UIX/Microsoft/Iris/Drawing/UriImage.cs @@ -119,5 +119,7 @@ namespace Microsoft.Iris.Drawing { ScavengeImageCache.Instance.RemoveData(new ImageCacheKey(source, maximumSize, flippable, antialiasEdges)); } + + public override string ToString() => $"{{UriImage '{Source}' {RenderImage?.ToString() ?? "null"}}}"; } } diff --git a/UIX/Microsoft/Iris/Markup/EventSchema.cs b/UIX/Microsoft/Iris/Markup/EventSchema.cs index 878172b..d7caa17 100644 --- a/UIX/Microsoft/Iris/Markup/EventSchema.cs +++ b/UIX/Microsoft/Iris/Markup/EventSchema.cs @@ -10,8 +10,8 @@ namespace Microsoft.Iris.Markup { public abstract class EventSchema : DisposableObject { - private TypeSchema _owner; - public static EventSchema[] EmptyList = new EventSchema[0]; + private readonly TypeSchema _owner; + public readonly static EventSchema[] EmptyList = System.Array.Empty(); public EventSchema(TypeSchema owner) { @@ -22,5 +22,7 @@ namespace Microsoft.Iris.Markup public TypeSchema Owner => _owner; public abstract string Name { get; } + + public override string ToString() => $"{_owner.Name}.{Name}"; } } diff --git a/UIX/Microsoft/Iris/Markup/PropertySchema.cs b/UIX/Microsoft/Iris/Markup/PropertySchema.cs index 154c173..b1edc8b 100644 --- a/UIX/Microsoft/Iris/Markup/PropertySchema.cs +++ b/UIX/Microsoft/Iris/Markup/PropertySchema.cs @@ -10,8 +10,8 @@ namespace Microsoft.Iris.Markup { public abstract class PropertySchema : DisposableObject { - public static PropertySchema[] EmptyList = new PropertySchema[0]; - private TypeSchema _owner; + public readonly static PropertySchema[] EmptyList = System.Array.Empty(); + private readonly TypeSchema _owner; public PropertySchema(TypeSchema owner) { @@ -44,5 +44,7 @@ namespace Microsoft.Iris.Markup public abstract object GetValue(object instance); public abstract void SetValue(ref object instance, object value); + + public override string ToString() => $"{Owner.Name}.{Name}"; } } diff --git a/UIX/Microsoft/Iris/Markup/SymbolRecord.cs b/UIX/Microsoft/Iris/Markup/SymbolRecord.cs index 0e3f442..0d5ca82 100644 --- a/UIX/Microsoft/Iris/Markup/SymbolRecord.cs +++ b/UIX/Microsoft/Iris/Markup/SymbolRecord.cs @@ -11,6 +11,8 @@ namespace Microsoft.Iris.Markup public string Name; public TypeSchema Type; public SymbolOrigin SymbolOrigin; - public static SymbolRecord[] EmptyList = new SymbolRecord[0]; + public readonly static SymbolRecord[] EmptyList = System.Array.Empty(); + + public override string ToString() => $"{Type} {Name}"; } } diff --git a/UIX/Microsoft/Iris/Markup/SymbolReference.cs b/UIX/Microsoft/Iris/Markup/SymbolReference.cs index be89973..e759691 100644 --- a/UIX/Microsoft/Iris/Markup/SymbolReference.cs +++ b/UIX/Microsoft/Iris/Markup/SymbolReference.cs @@ -20,5 +20,7 @@ namespace Microsoft.Iris.Markup public string Symbol => _symbol; public SymbolOrigin Origin => _origin; + + public override string ToString() => Symbol; } } diff --git a/UIX/Microsoft/Iris/Markup/TypeSchema.cs b/UIX/Microsoft/Iris/Markup/TypeSchema.cs index 44c744a..3a9885d 100644 --- a/UIX/Microsoft/Iris/Markup/TypeSchema.cs +++ b/UIX/Microsoft/Iris/Markup/TypeSchema.cs @@ -12,12 +12,12 @@ namespace Microsoft.Iris.Markup { public abstract class TypeSchema : DisposableObject { - private LoadResult _owner; - private ulong _id; + private readonly LoadResult _owner; + private readonly ulong _id; private Vector _equivalents; private static ulong s_uniqueId; - private static Map s_idToTypeSchema = new Map(); - public static TypeSchema[] EmptyList = new TypeSchema[0]; + private readonly static Map s_idToTypeSchema = new(); + public readonly static TypeSchema[] EmptyList = Array.Empty(); public TypeSchema(LoadResult owner) { @@ -232,7 +232,7 @@ namespace Microsoft.Iris.Markup public void ShareEquivalents(Vector equivalents) => _equivalents = equivalents; - public virtual string ErrorContextDescription => string.Format("{0} (Owner='{1}')", Name, Owner.Uri ?? "Unavailable"); + public virtual string ErrorContextDescription => $"{Name} (Owner='{Owner.Uri ?? "Unavailable"}')"; public static string NameFromInstance(object instance) => !(instance is ISchemaInfo schemaInfo) ? instance.GetType().Name : schemaInfo.TypeSchema.Name; @@ -244,5 +244,7 @@ namespace Microsoft.Iris.Markup s_idToTypeSchema.TryGetValue(id, out typeSchema); return typeSchema; } + + public override string ToString() => $"typeof({Name})"; } } diff --git a/UIX/Microsoft/Iris/Markup/UIXTypeSchema.cs b/UIX/Microsoft/Iris/Markup/UIXTypeSchema.cs index efcff3a..f730874 100644 --- a/UIX/Microsoft/Iris/Markup/UIXTypeSchema.cs +++ b/UIX/Microsoft/Iris/Markup/UIXTypeSchema.cs @@ -11,10 +11,10 @@ namespace Microsoft.Iris.Markup { internal class UIXTypeSchema : TypeSchema { - private short _typeID; - private short _baseTypeID; - private string _name; - private string _alternateName; + private readonly short _typeID; + private readonly short _baseTypeID; + private readonly string _name; + private readonly string _alternateName; private TypeSchema _baseType; private DefaultConstructHandler _defaultConstructor; private ConstructorSchema[] _constructors; @@ -28,9 +28,9 @@ namespace Microsoft.Iris.Markup private PerformOperationHandler _performOperation; private SupportsOperationHandler _supportsOperation; private FindCanonicalInstanceHandler _findCanonicalInstance; - private Type _instanceType; - private UIXTypeFlags _flags; - private static object[] EmptyParameterList = new object[0]; + private readonly Type _instanceType; + private readonly UIXTypeFlags _flags; + private static readonly object[] EmptyParameterList = Array.Empty(); public UIXTypeSchema( short typeID, diff --git a/UIX/Microsoft/Iris/ModelItems/NotifyList.cs b/UIX/Microsoft/Iris/ModelItems/NotifyList.cs index 6f50779..d968354 100644 --- a/UIX/Microsoft/Iris/ModelItems/NotifyList.cs +++ b/UIX/Microsoft/Iris/ModelItems/NotifyList.cs @@ -107,5 +107,7 @@ namespace Microsoft.Iris.ModelItems return; ContentsChanged(this, new UIListContentsChangedArgs(type, oldIndex, newIndex)); } + + public override string ToString() => $"{{NotifyList Source=[{string.Join(", ", _source)}]}}"; } } diff --git a/UIX/Microsoft/Iris/ModelItems/Range.cs b/UIX/Microsoft/Iris/ModelItems/Range.cs index 96a7fca..2959862 100644 --- a/UIX/Microsoft/Iris/ModelItems/Range.cs +++ b/UIX/Microsoft/Iris/ModelItems/Range.cs @@ -74,6 +74,6 @@ namespace Microsoft.Iris.ModelItems return intList; } - public override string ToString() => string.Format("{{{0} to {1}}}", _begin, _end); + public override string ToString() => $"{{{_begin} to {_end}}}"; } } diff --git a/UIX/Microsoft/Iris/UI/UIClass.cs b/UIX/Microsoft/Iris/UI/UIClass.cs index 1b92b76..7362729 100644 --- a/UIX/Microsoft/Iris/UI/UIClass.cs +++ b/UIX/Microsoft/Iris/UI/UIClass.cs @@ -1378,7 +1378,7 @@ namespace Microsoft.Iris.UI internal void SetEventContext(EventContext eventContext) => _eventContext = eventContext; - public override string ToString() => _typeSchema.ToString(); + public override string ToString() => $"UI[{_typeSchema.Name}]"; private class SavedFocusState {