🚧 Adopt StdEmitterType

livereload · Nov 6, 2015 · 1dfbc03 · 1dfbc03
1 parent d799142
commit 1dfbc03
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 11 deletions.
diff --git a/ExpressiveFoundation b/ExpressiveFoundation
diff --git a/LRActionKit/Source/Build/LRBuild.swift b/LRActionKit/Source/Build/LRBuild.swift
@@ -4,8 +4,7 @@ import ExpressiveFoundation
 import ExpressiveCasting
 import ATPathSpec
 
-public class LRBuild : NSObject, EmitterType {
-    public var _listeners = EventListenerStorage()
+public class LRBuild : NSObject, StdEmitterType {
 
     public struct DidProduceResult: EventType {
         public let result: LROperationResult
@@ -215,4 +214,6 @@ public class LRBuild : NSObject, EmitterType {
         emit(DidProduceResult(result: result, target: target, key: key))
     }
 
+    public var _listeners = EventListenerStorage()
+
 }
diff --git a/LRActionKit/Source/EnvironmentErrors/EnvLog.swift b/LRActionKit/Source/EnvironmentErrors/EnvLog.swift
@@ -1,8 +1,7 @@
 import Foundation
 import ExpressiveFoundation
 
-public class EnvLog: EmitterType, CustomStringConvertible {
-    public var _listeners = EventListenerStorage()
+public class EnvLog: StdEmitterType, CustomStringConvertible {
 
     public struct DidChange: EventType {
     }
@@ -106,6 +105,8 @@ public class EnvLog: EmitterType, CustomStringConvertible {
         }
     }
 
+    public var _listeners = EventListenerStorage()
+
 }
 
 public class EnvLogBuilder {

diff --git a/LRProjectKit/Source/Activities/Group.swift b/LRProjectKit/Source/Activities/Group.swift
@@ -2,7 +2,7 @@ import Foundation
 import ExpressiveFoundation
 import PromiseKit
 
-public class ProcessingGroup: Processable {
+public class ProcessingGroup: Processable, StdEmitterType {
 
     private var emitsEventsOnHost: Bool = false
 

diff --git a/LRProjectKit/Source/Activities/Processor.swift b/LRProjectKit/Source/Activities/Processor.swift
@@ -38,7 +38,7 @@ public enum ProcessorError: ErrorType {
 ///
 /// (2) while waiting for an execution strategy to be set during the initialization phase.
 ///
-public class Processor<Request: RequestType>: Processable {
+public class Processor<Request: RequestType>: Processable, StdEmitterType {
 
     public var _listeners = EventListenerStorage()
 

diff --git a/LRProjectKit/Source/Plugin.swift b/LRProjectKit/Source/Plugin.swift
@@ -13,7 +13,7 @@ public enum PluginEnvError: ErrorType {
 }
 
 
-public class Plugin: ActionContainer, EmitterType {
+public class Plugin: ActionContainer, StdEmitterType {
 
     public let context: PluginContext
 

diff --git a/LRProjectKit/Source/PluginManager.swift b/LRProjectKit/Source/PluginManager.swift
@@ -5,7 +5,7 @@ import ATPathSpec
 import ExpressiveCollections
 import PromiseKit
 
-public class PluginManager: EmitterType {
+public class PluginManager: StdEmitterType {
 
     public struct DidDetectInvalidPlugins: EventType {
         public let invalidPlugins: [Plugin]

diff --git a/LRProjectKit/Source/Project.swift b/LRProjectKit/Source/Project.swift
@@ -4,7 +4,7 @@ import ATPathSpec
 import PackageManagerKit
 import LRActionKit
 
-public class Project: EmitterType, ProjectContext {
+public class Project: StdEmitterType, ProjectContext {
 
     public let rootURL: NSURL
 

diff --git a/LRProjectKit/Tests/ActivityTests.swift b/LRProjectKit/Tests/ActivityTests.swift
@@ -27,7 +27,7 @@ func ==(lhs: TestRequest, rhs: TestRequest) -> Bool {
     return (lhs.value == rhs.value) && (lhs.user == rhs.user)
 }
 
-public class Something: EmitterType {
+public class Something: StdEmitterType {
 
     public var log: [String] = []