Merge pull request #782 from ikesyo/rename-notificationqueue-coalescing

swift-ci · web-flow · commit 4d4bf20e2632 · 2017-01-11T09:35:38.000-08:00
diff --git a/Foundation/NSNotificationQueue.swift b/Foundation/NSNotificationQueue.swift
@@ -18,12 +18,12 @@ extension NotificationQueue {
         case postNow
     }
 
-    public struct Coalescing : OptionSet {
+    public struct NotificationCoalescing : OptionSet {
         public let rawValue : UInt
         public init(rawValue: UInt) { self.rawValue = rawValue }
         
-        public static let onName = Coalescing(rawValue: 1 << 0)
-        public static let onSender = Coalescing(rawValue: 1 << 1)
+        public static let onName = NotificationCoalescing(rawValue: 1 << 0)
+        public static let onSender = NotificationCoalescing(rawValue: 1 << 1)
     }
 }
 
@@ -80,7 +80,7 @@ open class NotificationQueue: NSObject {
         enqueueNotification(notification, postingStyle: postingStyle, coalesceMask: [.onName, .onSender], forModes: nil)
     }
 
-    open func enqueueNotification(_ notification: Notification, postingStyle: PostingStyle, coalesceMask: Coalescing, forModes modes: [RunLoopMode]?) {
+    open func enqueueNotification(_ notification: Notification, postingStyle: PostingStyle, coalesceMask: NotificationCoalescing, forModes modes: [RunLoopMode]?) {
         var runloopModes: [RunLoopMode] = [.defaultRunLoopMode]
         if let modes = modes  {
             runloopModes = modes
@@ -105,7 +105,7 @@ open class NotificationQueue: NSObject {
         }
     }
     
-    open func dequeueNotificationsMatching(_ notification: Notification, coalesceMask: Coalescing) {
+    open func dequeueNotificationsMatching(_ notification: Notification, coalesceMask: NotificationCoalescing) {
         var predicate: (NSNotificationListEntry) -> Bool
         switch coalesceMask {
         case [.onName, .onSender]:

Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,12 @@ extension NotificationQueue {`
`18`	`18`	`case postNow`
`19`	`19`	`}`
`20`	`20`
`21`		`- public struct Coalescing : OptionSet {`
	`21`	`+ public struct NotificationCoalescing : OptionSet {`
`22`	`22`	`public let rawValue : UInt`
`23`	`23`	`public init(rawValue: UInt) { self.rawValue = rawValue }`
`24`	`24`
`25`		`- public static let onName = Coalescing(rawValue: 1 << 0)`
`26`		`- public static let onSender = Coalescing(rawValue: 1 << 1)`
	`25`	`+ public static let onName = NotificationCoalescing(rawValue: 1 << 0)`
	`26`	`+ public static let onSender = NotificationCoalescing(rawValue: 1 << 1)`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`@@ -80,7 +80,7 @@ open class NotificationQueue: NSObject {`
`80`	`80`	`enqueueNotification(notification, postingStyle: postingStyle, coalesceMask: [.onName, .onSender], forModes: nil)`
`81`	`81`	`}`
`82`	`82`
`83`		`- open func enqueueNotification(_ notification: Notification, postingStyle: PostingStyle, coalesceMask: Coalescing, forModes modes: [RunLoopMode]?) {`
	`83`	`+ open func enqueueNotification(_ notification: Notification, postingStyle: PostingStyle, coalesceMask: NotificationCoalescing, forModes modes: [RunLoopMode]?) {`
`84`	`84`	`var runloopModes: [RunLoopMode] = [.defaultRunLoopMode]`
`85`	`85`	`if let modes = modes {`
`86`	`86`	`runloopModes = modes`
`@@ -105,7 +105,7 @@ open class NotificationQueue: NSObject {`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
`108`		`- open func dequeueNotificationsMatching(_ notification: Notification, coalesceMask: Coalescing) {`
	`108`	`+ open func dequeueNotificationsMatching(_ notification: Notification, coalesceMask: NotificationCoalescing) {`
`109`	`109`	`var predicate: (NSNotificationListEntry) -> Bool`
`110`	`110`	`switch coalesceMask {`
`111`	`111`	`case [.onName, .onSender]:`