C# - Colors array is now private. Returning ColorPair objects. Added support for subscripting.

Author: macmade

ColorSetKit-Test/Test.cs

@@ -39,7 +39,7 @@ public void TestInitWithPath()
             string path  = System.IO.Path.Combine( System.IO.Path.GetDirectoryName( Assembly.GetExecutingAssembly().Location ), "Colors.colorset" );
             ColorSet set = new ColorSet( path );
 
-            Assert.IsTrue( set.Colors.Count > 0 );
+            Assert.IsTrue( set.Count > 0 );
         }
 
         [TestMethod]
@@ -49,19 +49,19 @@ public void TestInitWithData()
             Data data    = new Data( path );
             ColorSet set = new ColorSet( data );
 
-            Assert.IsTrue( set.Colors.Count > 0 );
+            Assert.IsTrue( set.Count > 0 );
         }
 
         [TestMethod]
         public void TestShared()
         {
-            Assert.AreEqual( ColorSet.Shared.Colors.Count, 2 );
+            Assert.AreEqual( ColorSet.Shared.Count, 2 );
 
-            Assert.IsTrue( ColorSet.Shared.Colors.ContainsKey( "NoVariant" ) );
-            Assert.IsTrue( ColorSet.Shared.Colors.ContainsKey( "Variant" ) );
+            Assert.IsTrue( ColorSet.Shared[ "NoVariant" ] != null );
+            Assert.IsTrue( ColorSet.Shared[ "Variant" ] != null );
 
-            ColorPair p1 = ColorSet.Shared.Colors[ "NoVariant" ];
-            ColorPair p2 = ColorSet.Shared.Colors[ "Variant" ];
+            ColorPair p1 = ColorSet.Shared[ "NoVariant" ];
+            ColorPair p2 = ColorSet.Shared[ "Variant" ];
 
             {
                 if( p1.Color is SolidColorBrush c )
@@ -144,13 +144,13 @@ public void TestCreate()
 
             set = new ColorSet( set.Data );
 
-            Assert.AreEqual( set.Colors.Count, 2 );
+            Assert.AreEqual( set.Count, 2 );
 
-            Assert.IsTrue( set.Colors.ContainsKey( "NoVariant" ) );
-            Assert.IsTrue( set.Colors.ContainsKey( "Variant" ) );
+            Assert.IsTrue( set[ "NoVariant" ] != null );
+            Assert.IsTrue( set[ "Variant" ] != null );
 
-            ColorPair p1 = set.Colors[ "NoVariant" ];
-            ColorPair p2 = set.Colors[ "Variant" ];
+            ColorPair p1 = set[ "NoVariant" ];
+            ColorPair p2 = set[ "Variant" ];
 
             {
                 if( p1.Color is SolidColorBrush c )

ColorSetKit/Color.cs

@@ -41,7 +41,7 @@ public Color( string name )
 
         public override object ProvideValue( IServiceProvider provider )
         {
-            return ColorSet.Shared.ColorNamed( this.Name );
+            return ColorSet.Shared.ColorNamed( this.Name )?.Color;
         }
 
         [ConstructorArgument( "name" )]

ColorSetKit/ColorSet.cs

@@ -55,30 +55,30 @@ public static ColorSet Shared
             }
         }
 
-        public Dictionary< string, ColorPair > Colors
-        {
-            get
-            {
-                lock( this._Lock )
-                {
-                    return new Dictionary< string, ColorPair >( this._Colors );
-                }
-            }
-        }
-        
-        private Dictionary< string, ColorPair > _Colors
+        private Dictionary< string, ColorPair > Colors
         {
             get;
             set;
         }
         = new Dictionary< string, ColorPair >();
 
-        private object _Lock
+        private object Lock
         {
             get;
         }
         = new object();
 
+        public int Count
+        {
+            get
+            {
+                lock( this.Lock )
+                {
+                    return this.Colors.Count;
+                }
+            }
+        }
+
         public ColorSet()
         {}
 
@@ -131,13 +131,21 @@ public ColorSet( Data data )
             }
         }
 
-        public SolidColorBrush ColorNamed( string name )
+        public ColorPair this[ string key ]
+        {
+            get
+            {
+                return this.ColorNamed( key );
+            }
+        }
+
+        public ColorPair ColorNamed( string name )
         {
-            lock( this._Lock )
+            lock( this.Lock )
             {
-                if( this._Colors.ContainsKey( name ) )
+                if( this.Colors.ContainsKey( name ) )
                 {
-                    return this._Colors[ name ].Color;
+                    return this.Colors[ name ];
                 }
 
                 return null;
@@ -156,9 +164,9 @@ public void Set( SolidColorBrush color, string name )
 
         public void Add( SolidColorBrush color, SolidColorBrush variant, string name )
         {
-            lock( this._Lock )
+            lock( this.Lock )
             {
-                if( this._Colors.ContainsKey( name ) == false )
+                if( this.Colors.ContainsKey( name ) == false )
                 {
                     this.Set( color, variant, name );
                 }
@@ -172,9 +180,9 @@ public void Set( SolidColorBrush color, SolidColorBrush variant, string name )
                 return;
             }
 
-            lock( this._Lock )
+            lock( this.Lock )
             {
-                this._Colors[ name ] = new ColorPair( color, variant );
+                this.Colors[ name ] = new ColorPair( color, variant );
             }
         }