Make PriorityValue internal.

Want to add computed/readonly values in the near future which will not
use PriorityValue.

Perspex.Base/Diagnostics/IPerspexPropertyBinding.cs

@@ -1,17 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="IPerspexPropertyBinding.cs" company="Steven Kirk">
-// Copyright 2015 MIT Licence. See licence.md for more information.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Perspex.Diagnostics
-{
-    public interface IPerspexPropertyBinding
-    {
-        string Description { get; }
-
-        int Priority { get; }
-
-        object Value { get; }
-    }
-}

Perspex.Base/Diagnostics/PerspexPropertyBinding.cs

@@ -1,17 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="PerspexPropertyBinding.cs" company="Steven Kirk">
-// Copyright 2015 MIT Licence. See licence.md for more information.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Perspex.Diagnostics
-{
-    internal class PerspexPropertyBinding : IPerspexPropertyBinding
-    {
-        public string Description { get; set; }
-
-        public int Priority { get; set; }
-
-        public object Value { get; set; }
-    }
-}

Perspex.Base/Diagnostics/PerspexPropertyValue.cs

@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 // <copyright file="PerspexPropertyValue.cs" company="Steven Kirk">
 // Copyright 2014 MIT Licence. See licence.md for more information.
 // </copyright>
@@ -8,23 +8,20 @@ namespace Perspex.Diagnostics
 {
     public class PerspexPropertyValue
     {
-        public PerspexPropertyValue(PerspexProperty property, object value)
+        public PerspexPropertyValue(
+            PerspexProperty property, 
+            object value,
+            BindingPriority priority)
         {
             this.Property = property;
-            this.CurrentValue = value;
+            this.Value = value;
-        }
+            this.Priority = priority;
-
-        public PerspexPropertyValue(PerspexProperty property, PriorityValue priorityValue)
-        {
-            this.Property = property;
-            this.CurrentValue = priorityValue.Value;
-            this.PriorityValue = priorityValue;
         }
 
         public PerspexProperty Property { get; private set; }
 
-        public object CurrentValue { get; private set; }
+        public object Value { get; private set; }
 
-        public PriorityValue PriorityValue { get; private set; }
+        public BindingPriority Priority { get; private set; }
     }
 }

Perspex.Base/Perspex.Base.csproj

@@ -37,8 +37,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Binding.cs" />
-    <Compile Include="Diagnostics\PerspexPropertyBinding.cs" />
-    <Compile Include="Diagnostics\IPerspexPropertyBinding.cs" />
     <Compile Include="PriorityBindingEntry.cs" />
     <Compile Include="Collections\IPerspexList.cs" />
     <Compile Include="Collections\PerspexReadOnlyListView.cs" />

Perspex.Base/PerspexObject.cs

@@ -94,20 +94,16 @@ namespace Perspex
         /// </summary>
         public PerspexObject()
         {
-            foreach (var p in this.GetAllValues())
+            foreach (var property in this.GetRegisteredProperties())
             {
-                var priority = p.PriorityValue != null ? 
-                    (BindingPriority)p.PriorityValue.ValuePriority : 
-                    BindingPriority.LocalValue;
-
                 var e = new PerspexPropertyChangedEventArgs(
-                    this, 
+                    this,
-                    p.Property, 
+                    property,
-                    PerspexProperty.UnsetValue, 
+                    PerspexProperty.UnsetValue,
-                    p.CurrentValue,
+                    property.GetDefaultValue(this.GetType()),
-                    priority);
+                    BindingPriority.Unset);
 
-                p.Property.NotifyInitialized(e);
+                property.NotifyInitialized(e);
             }
         }
 
@@ -427,11 +423,17 @@ namespace Perspex
 
                 if (this.values.TryGetValue(property, out value))
                 {
-                    yield return new PerspexPropertyValue(property, value);
+                    yield return new PerspexPropertyValue(
+                        property, 
+                        value.Value, 
+                        (BindingPriority)value.ValuePriority);
                 }
                 else
                 {
-                    yield return new PerspexPropertyValue(property, this.GetValue(property));
+                    yield return new PerspexPropertyValue(
+                        property, 
+                        this.GetValue(property),
+                        BindingPriority.Unset);
                 }
             }
         }
@@ -469,7 +471,10 @@ namespace Perspex
         {
             foreach (var value in this.values)
             {
-                yield return new PerspexPropertyValue(value.Key, value.Value);
+                yield return new PerspexPropertyValue(
+                    value.Key, 
+                    value.Value.Value,
+                    (BindingPriority)value.Value.ValuePriority);
             }
         }
 

Perspex.Base/PriorityValue.cs

@@ -25,7 +25,7 @@ namespace Perspex
     /// has a higher priority. Each time the value changes, the <see cref="Changed"/> observable is 
     /// fired with the old and new values.
     /// </remarks>
-    public class PriorityValue
+    internal class PriorityValue
     {
         /// <summary>
         /// The name of the property.
@@ -160,18 +160,13 @@ namespace Perspex
         /// Gets the currently active bindings on this object.
         /// </summary>
         /// <returns>An enumerable collection of bindings.</returns>
-        public IEnumerable<IPerspexPropertyBinding> GetBindings()
+        public IEnumerable<PriorityBindingEntry> GetBindings()
         {
             foreach (var level in this.levels)
             {
                 foreach (var binding in level.Value.Bindings)
                 {
-                    yield return new PerspexPropertyBinding
+                    yield return binding;
-                    {
-                        Description = binding.Description,
-                        Priority = level.Key,
-                        Value = binding.Value,
-                    };
                 }
             }
         }

Perspex.Base/Properties/AssemblyInfo.cs

@@ -6,6 +6,7 @@
 
 using System.Reflection;
 using System.Resources;
+using System.Runtime.CompilerServices;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -32,3 +33,5 @@ using System.Resources;
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly:InternalsVisibleTo("Perspex.Base.UnitTests")]

Perspex.Diagnostics/Debug.cs

@@ -46,9 +46,9 @@ namespace Perspex.Diagnostics
                     builder.Append(" |  ");
                     builder.Append(value.Property.Name);
                     builder.Append(" = ");
-                    builder.Append(value.CurrentValue ?? "(null)");
+                    builder.Append(value.Value ?? "(null)");
                     builder.Append(" [");
-                    builder.Append(value.PriorityValue.ValuePriority);
+                    builder.Append(value.Priority);
                     builder.AppendLine("]");
                 }
             }

Perspex.Diagnostics/ViewModels/PropertyDetails.cs

@@ -20,15 +20,15 @@ namespace Perspex.Diagnostics.ViewModels
                 value.Property.Name;
             this.IsAttached = value.Property.IsAttached;
 
-            this.value = value.CurrentValue ?? "(null)";
+            this.value = value.Value ?? "(null)";
-            this.Priority = (value.PriorityValue != null) ?
+            this.Priority = (value.Priority != BindingPriority.Unset) ?
-                Enum.GetName(typeof(BindingPriority), value.PriorityValue.ValuePriority) :
+                value.Priority.ToString() :
                 value.Property.Inherits ? "Inherited" : "Unset";
 
-            if (value.PriorityValue != null)
+            //if (value.PriorityValue != null)
-            {
+            //{
-                value.PriorityValue.Changed.Subscribe(x => this.Value = x.Item2);
+            //    value.PriorityValue.Changed.Subscribe(x => this.Value = x.Item2);
-            }
+            //}
         }
 
         public string Name

Tests/Perspex.Base.UnitTests/PerspexPropertyTests.cs

@@ -89,12 +89,19 @@ namespace Perspex.Base.UnitTests
         [Fact]
         public void Initialized_Observable_Fired()
         {
-            string value = null;
+            bool invoked = false;
+
+            Class1.FooProperty.Initialized.Subscribe(x =>
+            {
+                Assert.Equal(PerspexProperty.UnsetValue, x.OldValue);
+                Assert.Equal("default", x.NewValue);
+                Assert.Equal(BindingPriority.Unset, x.Priority);
+                invoked = true;
+            });
 
-            Class1.FooProperty.Initialized.Subscribe(x => value = (string)x.NewValue);
             var target = new Class1();
 
-            Assert.Equal("default", value);
+            Assert.True(invoked);
         }
 
         [Fact]