Merge branch 'master' into ubilabs--tracking_app--develop

This commit is contained in:
Bennet Brunsen committed 2015-04-16 11:02:40 +02:00
commit e28dec03fc
722 files changed
+14069 -7269

No files matched your search

@@ -3,7 +3,7 @@ package com.sap.sailing.racecommittee.app.domain.coursedesign;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.Distance;
import com.sap.sailing.domain.common.Position;
import com.sap.sailing.domain.tracking.Positioned;
import com.sap.sailing.domain.common.Positioned;
public interface Located extends Positioned {
Bearing getBearingFrom(Position other);
@@ -1,7 +1,7 @@
package com.sap.sailing.racecommittee.app.domain.coursedesign;
import com.sap.sailing.domain.base.Mark;
import com.sap.sailing.domain.tracking.Positioned;
import com.sap.sailing.domain.common.Positioned;
public interface PositionedMark extends Mark, Positioned, Located {
@@ -26,11 +26,11 @@ import android.widget.Toast;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.Position;
import com.sap.sailing.domain.common.SpeedWithBearing;
import com.sap.sailing.domain.common.Wind;
import com.sap.sailing.domain.common.impl.DegreeBearingImpl;
import com.sap.sailing.domain.common.impl.DegreePosition;
import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl;
import com.sap.sailing.domain.tracking.Wind;
import com.sap.sailing.domain.tracking.impl.WindImpl;
import com.sap.sailing.domain.common.impl.WindImpl;
import com.sap.sailing.racecommittee.app.AppConstants;
import com.sap.sailing.racecommittee.app.AppPreferences;
import com.sap.sailing.racecommittee.app.R;
@@ -19,7 +19,7 @@ import com.sap.sailing.domain.abstractlog.race.state.RaceStateChangedListener;
import com.sap.sailing.domain.abstractlog.race.state.ReadonlyRaceState;
import com.sap.sailing.domain.abstractlog.race.state.impl.BaseRaceStateChangedListener;
import com.sap.sailing.domain.base.CourseBase;
import com.sap.sailing.domain.tracking.Wind;
import com.sap.sailing.domain.common.Wind;
import com.sap.sailing.racecommittee.app.AppConstants;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.domain.ManagedRace;
@@ -33,7 +33,7 @@ import com.sap.sailing.domain.base.CourseBase;
import com.sap.sailing.domain.base.impl.CourseDataImpl;
import com.sap.sailing.domain.common.MarkType;
import com.sap.sailing.domain.common.Position;
import com.sap.sailing.domain.tracking.Wind;
import com.sap.sailing.domain.common.Wind;
import com.sap.sailing.racecommittee.app.AppConstants;
import com.sap.sailing.racecommittee.app.AppPreferences;
import com.sap.sailing.racecommittee.app.R;