Merge pull request ochococo#52 from maintainer/master

ochococo · ochococo · commit 33eebd94bd74 · 2016-04-24T13:17:02.000+02:00
Fix error in mediator pattern.
diff --git a/Design-Patterns.playground.zip b/Design-Patterns.playground.zip
diff --git a/Design-Patterns.playground/Pages/Behavioral.xcplaygroundpage/Contents.swift b/Design-Patterns.playground/Pages/Behavioral.xcplaygroundpage/Contents.swift
@@ -287,9 +287,11 @@ The mediator pattern is used to reduce coupling between classes that communicate
 */
 
 class Colleague {
+    let name: String
     let mediator: Mediator
     
-    init(mediator: Mediator) {
+    init(name: String, mediator: Mediator) {
+        self.name = name
         self.mediator = mediator
     }
     
@@ -316,15 +318,15 @@ class MessageMediator: Mediator {
     func send(message: String, colleague: Colleague) {
         for c in colleagues {
             if c !== colleague { //for simplicity we compare object references
-                colleague.receive(message)
+                c.receive(message)
             }
         }
     }
 }
 
 class ConcreteColleague: Colleague {
     override func receive(message: String) {
-        print("Colleague received: \(message)")
+        print("Colleague \(name) received: \(message)")
     }
 }
 
@@ -333,8 +335,8 @@ class ConcreteColleague: Colleague {
 */
 
 let messagesMediator = MessageMediator()
-let user0 = ConcreteColleague(mediator: messagesMediator)
-let user1 = ConcreteColleague(mediator: messagesMediator)
+let user0 = ConcreteColleague(name: "0", mediator: messagesMediator)
+let user1 = ConcreteColleague(name: "1", mediator: messagesMediator)
 messagesMediator.addColleague(user0)
 messagesMediator.addColleague(user1)
 
diff --git a/README.md b/README.md
@@ -12,6 +12,12 @@ A short cheat-sheet with Xcode 7beta Playground ([Design-Patterns.playground.zip
 * [Structural](#structural)
 
 
+```swift
+ Behavioral |
+ [Creational](Creational) |
+ [Structural](Structural)
+```
+
 Behavioral
 ==========
 
@@ -20,6 +26,7 @@ Behavioral
 >**Source:** [wikipedia.org](http://en.wikipedia.org/wiki/Behavioral_pattern)
 
 ```swift
+
 import Swift
 import Foundation
 ```
@@ -325,9 +332,11 @@ The mediator pattern is used to reduce coupling between classes that communicate
 
 
 class Colleague {
+    let name: String
     let mediator: Mediator
     
-    init(mediator: Mediator) {
+    init(name: String, mediator: Mediator) {
+        self.name = name
         self.mediator = mediator
     }
     
@@ -354,15 +363,15 @@ class MessageMediator: Mediator {
     func send(message: String, colleague: Colleague) {
         for c in colleagues {
             if c !== colleague { //for simplicity we compare object references
-                colleague.receive(message)
+                c.receive(message)
             }
         }
     }
 }
 
 class ConcreteColleague: Colleague {
     override func receive(message: String) {
-        print("Colleague received: \(message)")
+        print("Colleague \(name) received: \(message)")
     }
 }
 
@@ -374,8 +383,8 @@ class ConcreteColleague: Colleague {
 
 
 let messagesMediator = MessageMediator()
-let user0 = ConcreteColleague(mediator: messagesMediator)
-let user1 = ConcreteColleague(mediator: messagesMediator)
+let user0 = ConcreteColleague(name: "0", mediator: messagesMediator)
+let user1 = ConcreteColleague(name: "1", mediator: messagesMediator)
 messagesMediator.addColleague(user0)
 messagesMediator.addColleague(user1)
 
@@ -696,6 +705,11 @@ Creational
 >
 >**Source:** [wikipedia.org](http://en.wikipedia.org/wiki/Creational_pattern)
 
+```swift
+
+import Swift
+import Foundation
+```
 
 🌰 Abstract Factory
 -------------------
@@ -981,6 +995,11 @@ Structural
 >
 >**Source:** [wikipedia.org](http://en.wikipedia.org/wiki/Structural_pattern)
 
+```swift
+
+import Swift
+import Foundation
+```
 
 🔌 Adapter
 ----------
diff --git a/source/behavioral/mediator.swift b/source/behavioral/mediator.swift
@@ -8,9 +8,11 @@ The mediator pattern is used to reduce coupling between classes that communicate
 */
 
 class Colleague {
+    let name: String
     let mediator: Mediator
     
-    init(mediator: Mediator) {
+    init(name: String, mediator: Mediator) {
+        self.name = name
         self.mediator = mediator
     }
     
@@ -37,15 +39,15 @@ class MessageMediator: Mediator {
     func send(message: String, colleague: Colleague) {
         for c in colleagues {
             if c !== colleague { //for simplicity we compare object references
-                colleague.receive(message)
+                c.receive(message)
             }
         }
     }
 }
 
 class ConcreteColleague: Colleague {
     override func receive(message: String) {
-        print("Colleague received: \(message)")
+        print("Colleague \(name) received: \(message)")
     }
 }
 
@@ -54,8 +56,8 @@ class ConcreteColleague: Colleague {
 */
 
 let messagesMediator = MessageMediator()
-let user0 = ConcreteColleague(mediator: messagesMediator)
-let user1 = ConcreteColleague(mediator: messagesMediator)
+let user0 = ConcreteColleague(name: "0", mediator: messagesMediator)
+let user1 = ConcreteColleague(name: "1", mediator: messagesMediator)
 messagesMediator.addColleague(user0)
 messagesMediator.addColleague(user1)
 

Original file line number	Diff line number	Diff line change
`@@ -287,9 +287,11 @@ The mediator pattern is used to reduce coupling between classes that communicate`
`287`	`287`	`*/`
`288`	`288`
`289`	`289`	`class Colleague {`
	`290`	`+ let name: String`
`290`	`291`	`let mediator: Mediator`
`291`	`292`
`292`		`- init(mediator: Mediator) {`
	`293`	`+ init(name: String, mediator: Mediator) {`
	`294`	`+ self.name = name`
`293`	`295`	`self.mediator = mediator`
`294`	`296`	`}`
`295`	`297`
`@@ -316,15 +318,15 @@ class MessageMediator: Mediator {`
`316`	`318`	`func send(message: String, colleague: Colleague) {`
`317`	`319`	`for c in colleagues {`
`318`	`320`	`if c !== colleague { //for simplicity we compare object references`
`319`		`- colleague.receive(message)`
	`321`	`+ c.receive(message)`
`320`	`322`	`}`
`321`	`323`	`}`
`322`	`324`	`}`
`323`	`325`	`}`
`324`	`326`
`325`	`327`	`class ConcreteColleague: Colleague {`
`326`	`328`	`override func receive(message: String) {`
`327`		`- print("Colleague received: \(message)")`
	`329`	`+ print("Colleague \(name) received: \(message)")`
`328`	`330`	`}`
`329`	`331`	`}`
`330`	`332`
`@@ -333,8 +335,8 @@ class ConcreteColleague: Colleague {`
`333`	`335`	`*/`
`334`	`336`
`335`	`337`	`let messagesMediator = MessageMediator()`
`336`		`-let user0 = ConcreteColleague(mediator: messagesMediator)`
`337`		`-let user1 = ConcreteColleague(mediator: messagesMediator)`
	`338`	`+let user0 = ConcreteColleague(name: "0", mediator: messagesMediator)`
	`339`	`+let user1 = ConcreteColleague(name: "1", mediator: messagesMediator)`
`338`	`340`	`messagesMediator.addColleague(user0)`
`339`	`341`	`messagesMediator.addColleague(user1)`
`340`	`342`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,11 @@ The mediator pattern is used to reduce coupling between classes that communicate`
`8`	`8`	`*/`
`9`	`9`
`10`	`10`	`class Colleague {`
	`11`	`+ let name: String`
`11`	`12`	`let mediator: Mediator`
`12`	`13`
`13`		`- init(mediator: Mediator) {`
	`14`	`+ init(name: String, mediator: Mediator) {`
	`15`	`+ self.name = name`
`14`	`16`	`self.mediator = mediator`
`15`	`17`	`}`
`16`	`18`
`@@ -37,15 +39,15 @@ class MessageMediator: Mediator {`
`37`	`39`	`func send(message: String, colleague: Colleague) {`
`38`	`40`	`for c in colleagues {`
`39`	`41`	`if c !== colleague { //for simplicity we compare object references`
`40`		`- colleague.receive(message)`
	`42`	`+ c.receive(message)`
`41`	`43`	`}`
`42`	`44`	`}`
`43`	`45`	`}`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`class ConcreteColleague: Colleague {`
`47`	`49`	`override func receive(message: String) {`
`48`		`- print("Colleague received: \(message)")`
	`50`	`+ print("Colleague \(name) received: \(message)")`
`49`	`51`	`}`
`50`	`52`	`}`
`51`	`53`
`@@ -54,8 +56,8 @@ class ConcreteColleague: Colleague {`
`54`	`56`	`*/`
`55`	`57`
`56`	`58`	`let messagesMediator = MessageMediator()`
`57`		`-let user0 = ConcreteColleague(mediator: messagesMediator)`
`58`		`-let user1 = ConcreteColleague(mediator: messagesMediator)`
	`59`	`+let user0 = ConcreteColleague(name: "0", mediator: messagesMediator)`
	`60`	`+let user1 = ConcreteColleague(name: "1", mediator: messagesMediator)`
`59`	`61`	`messagesMediator.addColleague(user0)`
`60`	`62`	`messagesMediator.addColleague(user1)`
`61`	`63`