From 322d6b02eb9455a7dc489bc7bb234e59b3174ad6 Mon Sep 17 00:00:00 2001
From: Simon Pamies <simon.marcel.pamies@sap.com>
Date: Sun, 12 Jun 2011 19:14:35 +0200
Subject: [PATCH] Fixed problem with CourseImpl where legs were initalized with
 wrong leg start position

---
 .../sap/sailing/domain/test/AbstractTracTracLiveTest.java   | 6 ++++++
 .../src/com/sap/sailing/domain/test/CourseUpdateTest.java   | 4 ++++
 .../src/com/sap/sailing/domain/base/impl/CourseImpl.java    | 5 ++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
index b6d7686ff60..57ab3fc42fc 100755
--- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
+++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
@@ -45,8 +45,14 @@ public abstract class AbstractTracTracLiveTest implements Listener {
         //   storedUri = new URI("tcp://sapsimulation.tracdev.dk:4421"); // or with tunneling: tcp://localhost:4421
         // for stored race, non-real-time simulation:
         paramUrl  = new URL("http://germanmaster.traclive.dk/events/event_20110505_SailingTea/clientparams.php?event=event_20110505_SailingTea&race=bd8c778e-7c65-11e0-8236-406186cbf87c");
+        
+        // tunneled:
         liveUri   = new URI("tcp://localhost:4412");
         storedUri = new URI("tcp://localhost:4413");
+        
+        //no tunnel:
+        //liveUri   = new URI("tcp://germanmaster.traclive.dk:4400");
+        //storedUri = new URI("tcp://germanmaster.traclive.dk:4401");
         receivers = new HashSet<Receiver>();
     }
 
diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
index 07537c82609..14bf9b1a12c 100755
--- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
+++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
@@ -77,6 +77,10 @@ public class CourseUpdateTest extends AbstractTracTracLiveTest {
         course = race.getCourse();
         assertNotNull(course);
         assertEquals(3, Util.size(course.getWaypoints()));
+        
+        // make sure leg is initialized correctly in CourseImpl
+        assertEquals("start/finish", course.getLegs().get(0).getFrom().getName());
+        assertEquals("start/finish", course.getLegs().get(1).getFrom().getName());
     }
 
     @Test
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CourseImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CourseImpl.java
index e1b53abf183..ff8795b45fd 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CourseImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CourseImpl.java
@@ -36,12 +36,15 @@ public class CourseImpl extends NamedImpl implements Course {
         if (waypointIter.hasNext()) {
             Waypoint previous = waypointIter.next();
             this.waypoints.add(previous);
+
+            int indexOfStartWaypoint = i;
+            
             waypointIndexes.put(previous, i++);
             while (waypointIter.hasNext()) {
                 Waypoint current = waypointIter.next();
                 this.waypoints.add(current);
                 waypointIndexes.put(current, i++);
-                Leg leg = new LegImpl(this, i);
+                Leg leg = new LegImpl(this, indexOfStartWaypoint);
                 legs.add(leg);
                 previous = current;
             }