Made Noted more swift3y

ml-archive · Sep 13, 2016 · d02bc48 · d02bc48
1 parent 13fbee6
commit d02bc48
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/Noted/Classes/Noted.swift b/Noted/Classes/Noted.swift
@@ -42,7 +42,6 @@ public class Noted {
 
     public static let defaultInstance = Noted()
 
-
     private let notedQueue = DispatchQueue(label: "com.nodes.noted", attributes: .concurrent)
 
     private var _observers = NSHashTable<NoteObserverInfo>(options: .weakMemory)
@@ -51,24 +50,23 @@ public class Noted {
         return _observers.allObjects.map {$0.receiver}
     }
 
-
     private init() {}
 
-    public func addObserver(_ observer: NoteObserver, filter: NoteFilter = PassthroughNoteFilter()) {
+    public func add(observer: NoteObserver, filter: NoteFilter = PassthroughNoteFilter()) {
         notedQueue.async(group: nil, qos: .default, flags: .barrier) {
             self._observers.add(NoteObserverInfo(receiver: observer, filter: filter))
         }
     }
 
-    public func removeObserver(_ observer: NoteObserver) {
+    public func remove(observer: NoteObserver) {
         notedQueue.async(group: nil, qos: .default, flags: .barrier) {
             if let foundEntry = (self._observers.allObjects).first(where: {$0.receiver === observer}) {
                 self._observers.remove(foundEntry)
             }
         }
     }
 
-    public func postNote(_ note: NoteType) {
+    public func post(note: NoteType) {
         notedQueue.async {
             for receiver in self._observers.allObjects {
                 if !receiver.filter.shouldFilter(note:note) {

diff --git a/NotedTests/ThreadSafeTests.swift b/NotedTests/ThreadSafeTests.swift
@@ -48,8 +48,8 @@ class ThreadSafeTests: XCTestCase {
             receiverStore.append(controller)
             let queue = DispatchQueue(label:"com.noted.queue.\(index)")
             queue.async {
-                Noted.defaultInstance.addObserver(controller)
-                Noted.defaultInstance.postNote(TestNotification.TestUpdated)
+                Noted.defaultInstance.add(observer: controller)
+                Noted.defaultInstance.post(note: TestNotification.TestUpdated)
 
             }