Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcbrun2013-12-19 15:51:53 -0500
committerLaurent Goubet2014-02-03 09:35:24 -0500
commit48ec9e419da1960b75b32e5a30751d0351bdc238 (patch)
tree5ea3e2851c524882834183b213c5bf7004b735b7
parent6b8a61f0ae4a47651aeadb5c0106e08ae6324cd8 (diff)
downloadorg.eclipse.emf.compare-2.1.tar.gz
org.eclipse.emf.compare-2.1.tar.xz
org.eclipse.emf.compare-2.1.zip
[421609] ProximityEObjectMatcher detects match even when Distance function sais no2.1.3RC22.1.32.1
Fix the javadoc so that adopters don't get misleaded. Java, doing autoboxing, will allow Integer.MAX_VALUE but we do expect Double.MAX_VALUE Change-Id: I36f19fc78798d5f312cad3e4e0f67ffdcf858dc8
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ProximityEObjectMatcher.java4
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 d5cc7616f..4e8adac2d 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);

Back to the top