Merge "[421609] ProximityEObjectMatcher detects match even when Distance function sais no"

1 files changed, 2 insertions, 2 deletions

diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ProximityEObjectMatcher.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ProximityEObjectMatcher.java
index 6708ba079..1eb2268e3 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ProximityEObjectMatcher.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ProximityEObjectMatcher.java
@@ -369,7 +369,7 @@ public class ProximityEObjectMatcher implements IEObjectMatcher, ScopeQuery {
 	public interface DistanceFunction {

 		/**

 		 * Return the distance between two EObjects. When the two objects should considered as completely

-		 * different the implementation is expected to return Integer.MAX_VALUE.

+		 * different the implementation is expected to return Double.MAX_VALUE.

 		 * 

 		 * @param inProgress

 		 *            the comparison being processed right now. This might be used for the distance to

@@ -378,7 +378,7 @@ public class ProximityEObjectMatcher implements IEObjectMatcher, ScopeQuery {
 		 *            first object.

 		 * @param b

 		 *            second object.

-		 * @return the distance between the two EObjects or Integer.MAX_VALUE when the objects are considered

+		 * @return the distance between the two EObjects or Double.MAX_VALUE when the objects are considered

 		 *         too different to be the same.

 		 */

 		double distance(Comparison inProgress, EObject a, EObject b);