diff options
author | Laurent Goubet | 2014-01-28 08:52:54 +0000 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org | 2014-01-28 08:52:54 +0000 |
commit | 7e6d4c6286d845a98ad6b70c56b26e4618ee598e (patch) | |
tree | 8d0d6e48e56c477671443418673817f09c12d6b9 | |
parent | f855216b759bb7e6c7ca0a779dafbbe71683b19e (diff) | |
parent | 7ad6cd0464cdcd85a2d15cdeb606d898897f0180 (diff) | |
download | org.eclipse.emf.compare-7e6d4c6286d845a98ad6b70c56b26e4618ee598e.tar.gz org.eclipse.emf.compare-7e6d4c6286d845a98ad6b70c56b26e4618ee598e.tar.xz org.eclipse.emf.compare-7e6d4c6286d845a98ad6b70c56b26e4618ee598e.zip |
Merge "[421609] ProximityEObjectMatcher detects match even when Distance function sais no"
-rw-r--r-- | plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ProximityEObjectMatcher.java | 4 |
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);
|