Solved some errors after merge

This commit is contained in:
Armin Zamani committed 2013-03-01 15:47:43 +01:00
1 parent b254437be3
commit 67375f2a5b
6 files changed
+739 -738

No files matched your search

@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.UUID;
import com.sap.sailing.domain.common.MarkType;
import com.sap.sailing.domain.common.NauticalSide;
public interface SharedDomainFactory {
@@ -53,7 +54,7 @@ public interface SharedDomainFactory {
* The waypoint created is weakly cached so that when requested again by
* {@link #getExistingWaypointById(Waypoint)} it is found.
*/
Waypoint createWaypoint(ControlPoint controlPoint);
Waypoint createWaypoint(ControlPoint controlPoint, NauticalSide passingSide);
Waypoint getExistingWaypointById(Waypoint waypointPrototype);