ColorSet - Added a shared instance.

Author: macmade

ColorSetKit/ColorSet.swift

@@ -28,6 +28,33 @@ import Cocoa
 {
     private static let magic: UInt64 = 0x434F4C4F52534554
 
+    public static var shared: ColorSet =
+    {
+        var set: ColorSet?
+        
+        if let path = Bundle.main.path( forResource: "Colors", ofType: "colorset" )
+        {
+            if FileManager.default.fileExists( atPath: path )
+            {
+                set = ColorSet( path: path )
+            }
+        }
+        
+        #if DEBUG
+        
+        if set == nil, let path = Bundle( identifier: "com.xs-labs.ColorSetKit-Test" )?.path( forResource: "Colors", ofType: "colorset" )
+        {
+            if FileManager.default.fileExists( atPath: path )
+            {
+                set = ColorSet( path: path )
+            }
+        }
+        
+        #endif
+        
+        return set ?? ColorSet()
+    }()
+    
     @objc public private( set ) dynamic var colors = [ String : ColorPair ]()
 
     @objc public override init()

ColorSetKit/NSColor+ColorSetKit.swift

@@ -26,26 +26,8 @@ import Cocoa
 
 @objc public extension NSColor
 {
-    private static var mainColorSet: ColorSet?
-    private static var lock        = NSLock()
-    
     @objc class func colorFrom( colorSet name: String ) -> NSColor?
     {
-        lock.lock()
-        
-        if mainColorSet == nil
-        {
-            if let path = Bundle.main.path( forResource: "Colors", ofType: "colorset" )
-            {
-                if FileManager.default.fileExists( atPath: path )
-                {
-                    mainColorSet = ColorSet( path:  path )
-                }
-            }
-        }
-        
-        lock.unlock()
-        
         if name.hasPrefix( "NS" )
         {
             var selectorName = String( name[ name.index( name.startIndex, offsetBy: 2 )... ] )
@@ -64,7 +46,7 @@ import Cocoa
 
         }
 
-        let pair = mainColorSet?.colors[ name ]
+        let pair = ColorSet.shared.colors[ name ]
 
         if #available( macOS 10.14, * )
         {