Skip to content

Commit afd9772

Browse files
committed
Fixed code formatting in Memento Pattern
1 parent 1cd561c commit afd9772

File tree

4 files changed

+36
-34
lines changed

4 files changed

+36
-34
lines changed

Design-Patterns.playground.zip

8 Bytes
Binary file not shown.
Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
typealias Memento = Dictionary<NSObject,AnyObject>
1+
typealias Memento = Dictionary<NSObject, AnyObject>
22

33
/**
44
* Originator
55
*/
66
class GameState {
7+
var gameLevel: Int = 1
8+
var playerScore: Int = 0
79

8-
var gameLevel:Int = 1
9-
var playerScore:Int = 0
10-
11-
func saveToMemeto() -> Memento { return ["gameLevel":gameLevel,"playerScore":playerScore] }
10+
func saveToMemeto() -> Memento {
11+
return ["gameLevel": gameLevel, "playerScore": playerScore]
12+
}
1213

13-
func restoreFromMemeto(memento:Memento) {
14+
func restoreFromMemeto(memento: Memento) {
1415
gameLevel = memento["gameLevel"]! as Int
1516
playerScore = memento["playerScore"]! as Int
1617
}
@@ -20,15 +21,15 @@ class GameState {
2021
* Caretaker
2122
*/
2223
class CheckPoint {
23-
24-
class func saveState(memento:Memento,keyName:String = "gameState"){
24+
class func saveState(memento: Memento, keyName: String = "gameState") {
2525
let defaults:NSUserDefaults = NSUserDefaults.standardUserDefaults()
26-
defaults.setObject(memento , forKey:keyName)
26+
defaults.setObject(memento, forKey: keyName)
2727
defaults.synchronize()
2828
}
2929

30-
class func restorePreviousState(keyName:String = "gameState") -> Memento{
30+
class func restorePreviousState(keyName: String = "gameState") -> Memento {
3131
let defaults:NSUserDefaults = NSUserDefaults.standardUserDefaults()
32+
3233
return defaults.objectForKey(keyName) as Memento
3334
}
3435
}

Design-Patterns.playground/section-62.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@ var gameState = GameState()
22
gameState.gameLevel = 2
33
gameState.playerScore = 200
44

5-
//saves state:{gameLevel 2 playerScore 200}
5+
// Saves state: {gameLevel 2 playerScore 200}
66
CheckPoint.saveState(gameState.saveToMemeto())
77

88
gameState.gameLevel = 3
99
gameState.gameLevel = 250
1010

11-
//restores state:{gameLevel 2 playerScore 200}
11+
// Restores state: {gameLevel 2 playerScore 200}
1212
gameState.restoreFromMemeto(CheckPoint.restorePreviousState())
1313

1414
gameState.gameLevel = 4
1515

16-
//saves state - gameState2:{gameLevel 4 playerScore 200}
17-
CheckPoint.saveState(gameState.saveToMemeto(),keyName: "gameState2")
16+
// Saves state - gameState2: {gameLevel 4 playerScore 200}
17+
CheckPoint.saveState(gameState.saveToMemeto(), keyName: "gameState2")
1818

1919
gameState.gameLevel = 5
2020
gameState.playerScore = 300
2121

22-
//saves state - gameState3:{gameLevel 5 playerScore 300}
23-
CheckPoint.saveState(gameState.saveToMemeto(),keyName: "gameState3")
22+
// Saves state - gameState3: {gameLevel 5 playerScore 300}
23+
CheckPoint.saveState(gameState.saveToMemeto(), keyName: "gameState3")
2424

25-
//restores state - gameState2:{gameLevel 4 playerScore 200}
25+
// Restores state - gameState2: {gameLevel 4 playerScore 200}
2626
gameState.restoreFromMemeto(CheckPoint.restorePreviousState(keyName: "gameState2"))

README.markdown

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -713,19 +713,20 @@ fileManager.move()
713713
##💾 Memento
714714

715715
```swift
716-
typealias Memento = Dictionary<NSObject,AnyObject>
716+
typealias Memento = Dictionary<NSObject, AnyObject>
717717

718718
/**
719719
* Originator
720720
*/
721721
class GameState {
722+
var gameLevel: Int = 1
723+
var playerScore: Int = 0
722724

723-
var gameLevel:Int = 1
724-
var playerScore:Int = 0
725-
726-
func saveToMemeto() -> Memento { return ["gameLevel":gameLevel,"playerScore":playerScore] }
725+
func saveToMemeto() -> Memento {
726+
return ["gameLevel": gameLevel, "playerScore": playerScore]
727+
}
727728

728-
func restoreFromMemeto(memento:Memento) {
729+
func restoreFromMemeto(memento: Memento) {
729730
gameLevel = memento["gameLevel"]! as Int
730731
playerScore = memento["playerScore"]! as Int
731732
}
@@ -735,15 +736,15 @@ class GameState {
735736
* Caretaker
736737
*/
737738
class CheckPoint {
738-
739-
class func saveState(memento:Memento,keyName:String = "gameState"){
739+
class func saveState(memento: Memento, keyName: String = "gameState") {
740740
let defaults:NSUserDefaults = NSUserDefaults.standardUserDefaults()
741-
defaults.setObject(memento , forKey:keyName)
741+
defaults.setObject(memento, forKey: keyName)
742742
defaults.synchronize()
743743
}
744744

745-
class func restorePreviousState(keyName:String = "gameState") -> Memento{
745+
class func restorePreviousState(keyName: String = "gameState") -> Memento {
746746
let defaults:NSUserDefaults = NSUserDefaults.standardUserDefaults()
747+
747748
return defaults.objectForKey(keyName) as Memento
748749
}
749750
}
@@ -754,27 +755,27 @@ var gameState = GameState()
754755
gameState.gameLevel = 2
755756
gameState.playerScore = 200
756757

757-
//saves state:{gameLevel 2 playerScore 200}
758+
// Saves state: {gameLevel 2 playerScore 200}
758759
CheckPoint.saveState(gameState.saveToMemeto())
759760

760761
gameState.gameLevel = 3
761762
gameState.gameLevel = 250
762763

763-
//restores state:{gameLevel 2 playerScore 200}
764+
// Restores state: {gameLevel 2 playerScore 200}
764765
gameState.restoreFromMemeto(CheckPoint.restorePreviousState())
765766

766767
gameState.gameLevel = 4
767768

768-
//saves state - gameState2:{gameLevel 4 playerScore 200}
769-
CheckPoint.saveState(gameState.saveToMemeto(),keyName: "gameState2")
769+
// Saves state - gameState2: {gameLevel 4 playerScore 200}
770+
CheckPoint.saveState(gameState.saveToMemeto(), keyName: "gameState2")
770771

771772
gameState.gameLevel = 5
772773
gameState.playerScore = 300
773774

774-
//saves state - gameState3:{gameLevel 5 playerScore 300}
775-
CheckPoint.saveState(gameState.saveToMemeto(),keyName: "gameState3")
775+
// Saves state - gameState3: {gameLevel 5 playerScore 300}
776+
CheckPoint.saveState(gameState.saveToMemeto(), keyName: "gameState3")
776777

777-
//restores state - gameState2:{gameLevel 4 playerScore 200}
778+
// Restores state - gameState2: {gameLevel 4 playerScore 200}
778779
gameState.restoreFromMemeto(CheckPoint.restorePreviousState(keyName: "gameState2"))
779780
```
780781

0 commit comments

Comments
 (0)