Refactoring cause of merge nearly finished

This commit is contained in:
Lennart Hensler committed 2012-01-16 11:50:53 +01:00
1 parent 4a71aa0c74
commit d8ed753379
13 files changed
+24 -21

No files matched your search

@@ -1,6 +1,7 @@
package com.sap.sailing.domain.base;
import com.sap.sailing.domain.common.Util.Pair;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.impl.Util.Pair;
import com.sap.sailing.domain.confidence.HasConfidence;
@@ -1,6 +1,7 @@
package com.sap.sailing.domain.base;
import com.sap.sailing.domain.common.Util.Triple;
import com.sap.sailing.domain.common.Speed;
import com.sap.sailing.domain.common.impl.Util.Triple;
import com.sap.sailing.domain.confidence.HasConfidence;
public interface SpeedWithBearingWithConfidence extends
@@ -1,5 +1,6 @@
package com.sap.sailing.domain.base;
import com.sap.sailing.domain.common.Speed;
import com.sap.sailing.domain.confidence.HasConfidence;
public interface SpeedWithConfidence extends HasConfidence<SpeedWithConfidence, SpeedWithConfidence> {
@@ -1,8 +1,9 @@
package com.sap.sailing.domain.base.impl;
import com.sap.sailing.domain.base.Bearing;
import com.sap.sailing.domain.base.BearingWithConfidence;
import com.sap.sailing.domain.common.Util.Pair;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.impl.RadianBearingImpl;
import com.sap.sailing.domain.common.impl.Util.Pair;
import com.sap.sailing.domain.confidence.ScalableValue;
public class BearingWithConfidenceImpl implements BearingWithConfidence {
@@ -1,10 +1,11 @@
package com.sap.sailing.domain.base.impl;
import com.sap.sailing.domain.base.Bearing;
import com.sap.sailing.domain.base.Speed;
import com.sap.sailing.domain.base.SpeedWithBearing;
import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence;
import com.sap.sailing.domain.common.Util.Triple;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.Speed;
import com.sap.sailing.domain.common.impl.RadianBearingImpl;
import com.sap.sailing.domain.common.impl.Util.Triple;
import com.sap.sailing.domain.confidence.ScalableValue;
public class SpeedWithBearingWithConfidenceImpl extends
@@ -1,6 +1,6 @@
package com.sap.sailing.domain.confidence;
import com.sap.sailing.domain.base.Distance;
import com.sap.sailing.domain.common.Distance;
/**
* Some values, particularly those obtained from real-world measurements, are not always accurate. Some values are
@@ -2,7 +2,7 @@ package com.sap.sailing.domain.confidence.impl;
import java.util.Iterator;
import com.sap.sailing.domain.common.Util;
import com.sap.sailing.domain.common.impl.Util;
import com.sap.sailing.domain.confidence.ConfidenceBasedAverager;
import com.sap.sailing.domain.confidence.HasConfidence;
import com.sap.sailing.domain.confidence.ScalableValue;
@@ -1,8 +1,6 @@
package com.sap.sailing.domain.tracking.impl;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.impl.RadianBearingImpl;
import com.sap.sailing.domain.common.impl.Util.Pair;
/**
* Contains a number of {@link Bearing} objects and maintains the average bearing. For a given {@link Bearing} it
@@ -1,8 +1,8 @@
package com.sap.sailing.domain.tracking.impl;
import com.sap.sailing.domain.base.Bearing;
import com.sap.sailing.domain.base.BearingWithConfidence;
import com.sap.sailing.domain.common.Util.Pair;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.impl.Util.Pair;
import com.sap.sailing.domain.confidence.ConfidenceBasedAverager;
import com.sap.sailing.domain.confidence.ConfidenceBasedAveragerFactory;
@@ -4,9 +4,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import com.sap.sailing.domain.base.Bearing;
import com.sap.sailing.domain.base.impl.RadianBearingImpl;
import com.sap.sailing.domain.common.Util.Pair;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.impl.RadianBearingImpl;
import com.sap.sailing.domain.common.impl.Util.Pair;
/**
* Contains a number of {@link Bearing} objects (or a subtype thereof) and maintains the average bearing. For a given