File tree Expand file tree Collapse file tree 3 files changed +29
-8
lines changed
Expand file tree Collapse file tree 3 files changed +29
-8
lines changed Original file line number Diff line number Diff line change @@ -80,14 +80,14 @@ class Test: XCTestCase
8080
8181 func testShared( )
8282 {
83- XCTAssertEqual ( ColorSet . shared. colors . count, 2 )
83+ XCTAssertEqual ( ColorSet . shared. count, 2 )
8484
85- guard let p1 = ColorSet . shared. colors [ " NoVariant " ] else
85+ guard let p1 = ColorSet . shared [ " NoVariant " ] else
8686 {
8787 XCTFail ( " Cannot retrieve color from shared color set file " ) ; return
8888 }
8989
90- guard let p2 = ColorSet . shared. colors [ " Variant " ] else
90+ guard let p2 = ColorSet . shared [ " Variant " ] else
9191 {
9292 XCTFail ( " Cannot retrieve color from shared color set file " ) ; return
9393 }
@@ -158,14 +158,14 @@ class Test: XCTestCase
158158
159159 set = ColorSet ( data: set. data ) ?? ColorSet ( )
160160
161- XCTAssertEqual ( set. colors . count, 2 )
161+ XCTAssertEqual ( set. count, 2 )
162162
163- guard let p1 = set. colors [ " NoVariant " ] else
163+ guard let p1 = set [ " NoVariant " ] else
164164 {
165165 XCTFail ( " Cannot retrieve color from shared color set file " ) ; return
166166 }
167167
168- guard let p2 = set. colors [ " Variant " ] else
168+ guard let p2 = set [ " Variant " ] else
169169 {
170170 XCTFail ( " Cannot retrieve color from shared color set file " ) ; return
171171 }
Original file line number Diff line number Diff line change @@ -55,7 +55,15 @@ import Cocoa
5555 return set ?? ColorSet ( )
5656 } ( )
5757
58- @objc public private( set ) dynamic var colors = [ String : ColorPair ] ( )
58+ private var colors = [ String : ColorPair ] ( )
59+
60+ @objc public var count : Int
61+ {
62+ return self . synchronized
63+ {
64+ return self . colors. count
65+ }
66+ }
5967
6068 @objc public override init ( )
6169 { }
@@ -122,6 +130,19 @@ import Cocoa
122130 }
123131 }
124132
133+ @objc public subscript( key: String ) -> ColorPair ?
134+ {
135+ return self . colorWith ( name: key )
136+ }
137+
138+ @objc public func colorWith( name: String ) -> ColorPair ?
139+ {
140+ return self . synchronized
141+ {
142+ return self . colors [ name ]
143+ }
144+ }
145+
125146 @objc ( addColor: forName: )
126147 public func add( color: NSColor , forName name: String )
127148 {
Original file line number Diff line number Diff line change @@ -46,7 +46,7 @@ import Cocoa
4646
4747 }
4848
49- let pair = ColorSet . shared. colors [ name ]
49+ let pair = ColorSet . shared [ name ]
5050
5151 if #available( macOS 10 . 14 , * )
5252 {
You can’t perform that action at this time.
0 commit comments