From 7e486cea644be00378054ad42d0d3afe60054540 Mon Sep 17 00:00:00 2001
From: Stefan van den Oord <stefan.van.den.oord@philips.com>
Date: Fri, 31 May 2013 18:43:02 +0200
Subject: [PATCH] Added player names to init method

---
 Tennis/objc/.idea/misc.xml            |  18 -----
 Tennis/objc/.idea/vcs.xml             |   1 +
 Tennis/objc/.idea/workspace.xml       | 112 +++++++++++++++++---------
 Tennis/objc/Tennis/TennisGame.h       |   5 ++
 Tennis/objc/Tennis/TennisGame.m       |  18 +++--
 Tennis/objc/Tennis/TennisGame3.m      |   3 +-
 Tennis/objc/TennisTests/TennisTests.m |   6 +-
 7 files changed, 97 insertions(+), 66 deletions(-)

diff --git a/Tennis/objc/.idea/misc.xml b/Tennis/objc/.idea/misc.xml
index f48e1cf7..1162f438 100644
--- a/Tennis/objc/.idea/misc.xml
+++ b/Tennis/objc/.idea/misc.xml
@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ProjectRootManager" version="2" />
-  <component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="false" SSL_PROTOCOLS="sslv3">
-    <option name="USER" value="" />
-    <option name="PASSWORD" value="" />
-    <option name="mySSHConnectionTimeout" value="30000" />
-    <option name="mySSHReadTimeout" value="30000" />
-    <option name="LAST_MERGED_REVISION" />
-    <option name="MERGE_DRY_RUN" value="false" />
-    <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
-    <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
-    <option name="IGNORE_SPACES_IN_MERGE" value="false" />
-    <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
-    <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
-    <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
-    <option name="FORCE_UPDATE" value="false" />
-    <option name="IGNORE_EXTERNALS" value="false" />
-    <configuration useDefault="false">$USER_HOME$/.subversion</configuration>
-    <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
-  </component>
 </project>
 
diff --git a/Tennis/objc/.idea/vcs.xml b/Tennis/objc/.idea/vcs.xml
index def6a6a1..a5dd0864 100644
--- a/Tennis/objc/.idea/vcs.xml
+++ b/Tennis/objc/.idea/vcs.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="" />
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
   </component>
 </project>
 
diff --git a/Tennis/objc/.idea/workspace.xml b/Tennis/objc/.idea/workspace.xml
index 48fd3656..748a7d90 100644
--- a/Tennis/objc/.idea/workspace.xml
+++ b/Tennis/objc/.idea/workspace.xml
@@ -1,16 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="3432493f-5b19-44ab-868c-f539ff9f9548" name="Default" comment="" />
+    <list default="true" id="3432493f-5b19-44ab-868c-f539ff9f9548" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tennis/TennisGame.h" afterPath="$PROJECT_DIR$/Tennis/TennisGame.h" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tennis/TennisGame.m" afterPath="$PROJECT_DIR$/Tennis/TennisGame.m" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tennis/TennisGame3.m" afterPath="$PROJECT_DIR$/Tennis/TennisGame3.m" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TennisTests/TennisTests.m" afterPath="$PROJECT_DIR$/TennisTests/TennisTests.m" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
+    </list>
     <ignored path="Tennis.iws" />
     <ignored path=".idea/workspace.xml" />
     <file path="/fragment.mm" changelist="3432493f-5b19-44ab-868c-f539ff9f9548" time="1370012942444" ignored="false" />
-    <file path="/TennisTests.m" changelist="3432493f-5b19-44ab-868c-f539ff9f9548" time="1370014260625" ignored="false" />
+    <file path="/TennisTests.m" changelist="3432493f-5b19-44ab-868c-f539ff9f9548" time="1370018341630" ignored="false" />
     <file path="/fragment.m" changelist="3432493f-5b19-44ab-868c-f539ff9f9548" time="1370014036256" ignored="false" />
     <file path="/TennisGame1.h" changelist="3432493f-5b19-44ab-868c-f539ff9f9548" time="1370013500893" ignored="false" />
     <file path="/TennisGame2.h" changelist="3432493f-5b19-44ab-868c-f539ff9f9548" time="1370013513152" ignored="false" />
     <file path="/TennisGame3.h" changelist="3432493f-5b19-44ab-868c-f539ff9f9548" time="1370013520283" ignored="false" />
     <file path="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/usr/include/string.h" changelist="3432493f-5b19-44ab-868c-f539ff9f9548" time="1370014093686" ignored="false" />
+    <file path="/Dummy.txt" changelist="3432493f-5b19-44ab-868c-f539ff9f9548" time="1370018279112" ignored="false" />
+    <file path="/TennisGame3.m" changelist="3432493f-5b19-44ab-868c-f539ff9f9548" time="1370018390956" ignored="false" />
+    <file path="/TennisGame.m" changelist="3432493f-5b19-44ab-868c-f539ff9f9548" time="1370018510872" ignored="false" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -33,7 +43,7 @@
       <file leaf-file-name="TennisGame3.m" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Tennis/TennisGame3.m">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+            <state line="13" column="0" selection-start="233" selection-end="233" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -51,7 +61,7 @@
       <file leaf-file-name="TennisTests.m" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/TennisTests/TennisTests.m">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="105" column="52" selection-start="2809" selection-end="2809" vertical-scroll-proportion="0.7359736">
+            <state line="110" column="91" selection-start="3060" selection-end="3060" vertical-scroll-proportion="0.8125">
               <folding>
                 <element signature="e#144#167#0" expanded="true" />
               </folding>
@@ -107,7 +117,7 @@
       <file leaf-file-name="TennisGame.m" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Tennis/TennisGame.m">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="21" column="4" selection-start="321" selection-end="321" vertical-scroll-proportion="0.0">
+            <state line="19" column="8" selection-start="409" selection-end="409" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -116,7 +126,7 @@
       <file leaf-file-name="TennisGame.h" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Tennis/TennisGame.h">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+            <state line="13" column="0" selection-start="293" selection-end="293" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -129,15 +139,25 @@
       <setting name="OPEN_NEW_TAB" value="false" />
     </FindUsagesManager>
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../.." />
+  </component>
+  <component name="GitLogSettings">
+    <option name="myDateState">
+      <MyDateState />
+    </option>
+  </component>
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
         <option value="$PROJECT_DIR$/Tennis/TennisGame1.h" />
-        <option value="$PROJECT_DIR$/Tennis/TennisGame.h" />
         <option value="$PROJECT_DIR$/Tennis/TennisGame2.h" />
         <option value="$PROJECT_DIR$/Tennis/TennisGame3.h" />
         <option value="$PROJECT_DIR$/Tennis/TennisGame.mm" />
         <option value="$PROJECT_DIR$/TennisTests/TennisTests.m" />
+        <option value="$PROJECT_DIR$/Tennis/TennisGame3.m" />
+        <option value="$PROJECT_DIR$/Tennis/TennisGame.m" />
+        <option value="$PROJECT_DIR$/Tennis/TennisGame.h" />
       </list>
     </option>
   </component>
@@ -147,7 +167,7 @@
     <option name="width" value="1620" />
     <option name="height" value="1028" />
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <OptionsSetting value="true" id="Add" />
     <OptionsSetting value="true" id="Remove" />
     <OptionsSetting value="true" id="Checkout" />
@@ -220,14 +240,14 @@
   </component>
   <component name="PropertiesComponent">
     <property name="options.splitter.main.proportions" value="0.3" />
+    <property name="options.lastSelected" value="project.propVCSSupport.Mappings" />
     <property name="recentsLimit" value="5" />
-    <property name="options.lastSelected" value="preferences.keymap" />
-    <property name="restartRequiresConfirmation" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/Tennis" />
+    <property name="restartRequiresConfirmation" value="true" />
     <property name="FullScreen" value="false" />
     <property name="OBJC.PRESERVED_TARGET_SELECTION" value="Tennis,,,TennisTests" />
-    <property name="options.splitter.details.proportions" value="0.2" />
     <property name="options.searchVisible" value="true" />
+    <property name="options.splitter.details.proportions" value="0.2" />
   </component>
   <component name="RunManager" selected="OCUnit.TennisTests">
     <configuration default="false" name="Tennis" type="AppleRunConfiguration" factoryName="Application" temporary="true" SCHEME_NAME="Tennis" PROJECT_NAME="Tennis" TARGET_NAME="Tennis" CONFIG_NAME="Debug" WORKING_DIR="" PASS_PARENT_ENVS="FALSE" RUN_TARGET_PROJECT_NAME="Tennis" RUN_TARGET_NAME="Tennis" MAKE_ACTIVE="TRUE" WAIT_FOR="FALSE">
@@ -259,6 +279,24 @@
     </recent_temporary>
   </component>
   <component name="ShelveChangesManager" show_recycled="false" />
+  <component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="false" SSL_PROTOCOLS="sslv3">
+    <option name="USER" value="" />
+    <option name="PASSWORD" value="" />
+    <option name="mySSHConnectionTimeout" value="30000" />
+    <option name="mySSHReadTimeout" value="30000" />
+    <option name="LAST_MERGED_REVISION" />
+    <option name="MERGE_DRY_RUN" value="false" />
+    <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
+    <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
+    <option name="IGNORE_SPACES_IN_MERGE" value="false" />
+    <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
+    <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
+    <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
+    <option name="FORCE_UPDATE" value="false" />
+    <option name="IGNORE_EXTERNALS" value="false" />
+    <configuration useDefault="false">$USER_HOME$/.subversion</configuration>
+    <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
+  </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="3432493f-5b19-44ab-868c-f539ff9f9548" name="Default" comment="" />
@@ -269,7 +307,7 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="60" y="22" width="1620" height="1028" extended-state="6" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -351,9 +389,9 @@
     <breakpoint-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/Tennis/TennisGame.h">
+    <entry file="file://$PROJECT_DIR$/Tennis/TennisGame3.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+        <state line="13" column="4" selection-start="277" selection-end="277" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
@@ -372,27 +410,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Tennis/TennisGame2.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="12" column="35" selection-start="272" selection-end="272" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Tennis/TennisGame3.m">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Tennis/TennisGame3.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="13" column="4" selection-start="277" selection-end="277" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Tennis/TennisGame2.m">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
@@ -400,6 +417,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Tennis/TennisGame2.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="12" column="35" selection-start="272" selection-end="272" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/Tennis/TennisGame1.m">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
@@ -407,16 +431,30 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Tennis/TennisGame3.m">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="13" column="0" selection-start="233" selection-end="233" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/Tennis/TennisGame.m">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="4" selection-start="321" selection-end="321" vertical-scroll-proportion="0.0">
+        <state line="19" column="8" selection-start="409" selection-end="409" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Tennis/TennisGame.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="13" column="0" selection-start="293" selection-end="293" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/TennisTests/TennisTests.m">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="105" column="52" selection-start="2809" selection-end="2809" vertical-scroll-proportion="0.7359736">
+        <state line="110" column="91" selection-start="3060" selection-end="3060" vertical-scroll-proportion="0.8125">
           <folding>
             <element signature="e#144#167#0" expanded="true" />
           </folding>
diff --git a/Tennis/objc/Tennis/TennisGame.h b/Tennis/objc/Tennis/TennisGame.h
index 02b3c9c4..4634840d 100644
--- a/Tennis/objc/Tennis/TennisGame.h
+++ b/Tennis/objc/Tennis/TennisGame.h
@@ -10,6 +10,11 @@
 
 
 @interface TennisGame : NSObject
+@property(nonatomic, copy) NSString *player1;
+@property(nonatomic, copy) NSString *player2;
+
+- (id)initWithPlayer1:(NSString *)player1 player2:(NSString *)player2;
+
 - (void)wonPoint:(NSString *)player;
 
 - (NSString *)score;
diff --git a/Tennis/objc/Tennis/TennisGame.m b/Tennis/objc/Tennis/TennisGame.m
index a3a6ccf6..e4fc9664 100644
--- a/Tennis/objc/Tennis/TennisGame.m
+++ b/Tennis/objc/Tennis/TennisGame.m
@@ -6,17 +6,23 @@
 //
 
 
+#import "TennisGame3.h"
 #import "TennisGame.h"
 
 
-@implementation TennisGame {
+@implementation TennisGame
 
-}
-- (void)wonPoint:(NSString *)player {
 
+- (id)initWithPlayer1:(NSString *)player1 player2:(NSString *)player2 {
+    self = [super init];
+    if (self) {
+        self.player1 = player1;
+        self.player2 = player2;
+    }
+
+    return self;
 }
 
-- (NSString *)score {
-    return nil;
-}
+- (void)wonPoint:(NSString *)player {}
+- (NSString *)score { return nil; }
 @end
\ No newline at end of file
diff --git a/Tennis/objc/Tennis/TennisGame3.m b/Tennis/objc/Tennis/TennisGame3.m
index bc2d3456..b2a8a869 100644
--- a/Tennis/objc/Tennis/TennisGame3.m
+++ b/Tennis/objc/Tennis/TennisGame3.m
@@ -9,7 +9,6 @@
 #import "TennisGame3.h"
 
 
-@implementation TennisGame3 {
+@implementation TennisGame3
 
-}
 @end
\ No newline at end of file
diff --git a/Tennis/objc/TennisTests/TennisTests.m b/Tennis/objc/TennisTests/TennisTests.m
index a6e0a62a..8a21ca6e 100644
--- a/Tennis/objc/TennisTests/TennisTests.m
+++ b/Tennis/objc/TennisTests/TennisTests.m
@@ -98,17 +98,17 @@
 }
 
 - (void)testAllScoresTennisGame1 {
-    TennisGame1 * game = [[TennisGame1 alloc] init];
+    TennisGame1 * game = [[TennisGame1 alloc] initWithPlayer1:@"player1" player2:@"player2"];
     [self checkAllScoresForGame:game];
 }
 
 - (void)testAllScoresTennisGame2 {
-    TennisGame2 * game = [[TennisGame2 alloc] init];
+    TennisGame2 * game = [[TennisGame2 alloc] initWithPlayer1:@"player1" player2:@"player2"];
     [self checkAllScoresForGame:game];
 }
 
 - (void)testAllScoresTennisGame3 {
-    TennisGame3 * game = [[TennisGame3 alloc] init];
+    TennisGame3 * game = [[TennisGame3 alloc] initWithPlayer1:@"player1" player2:@"player2"];
     [self checkAllScoresForGame:game];
 }