diff options
author | Axel Richard | 2015-05-29 08:08:12 +0000 |
---|---|---|
committer | Laurent Goubet | 2015-06-01 11:15:05 +0000 |
commit | ab1049cc1a2a4435e69ab4fdd3f2a1e5252daf3d (patch) | |
tree | 7909df44bf34ec48a46e6ed2880785517d845d87 | |
parent | 2fab99b657368c3c290a01bb1a2190e8fd787fa0 (diff) | |
download | org.eclipse.emf.compare-ab1049cc1a2a4435e69ab4fdd3f2a1e5252daf3d.tar.gz org.eclipse.emf.compare-ab1049cc1a2a4435e69ab4fdd3f2a1e5252daf3d.tar.xz org.eclipse.emf.compare-ab1049cc1a2a4435e69ab4fdd3f2a1e5252daf3d.zip |
Happy Checkstyle3.1.0RC3
Change-Id: I9afedcb525911f9c9a110079de5aceac4d1a29c0
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
-rw-r--r-- | plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/MatchUtil.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/MatchUtil.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/MatchUtil.java index 77854875b..ef416058b 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/MatchUtil.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/MatchUtil.java @@ -197,22 +197,27 @@ public final class MatchUtil { proxyUri = EcoreUtil.getURI(eObjectValue); } + boolean contains = false; + for (Object element : getAsList(eObject, feature)) { if (element == value) { - return true; + contains = true; + break; } if (element != null && element.equals(value)) { - return true; + contains = true; + break; } if (proxyUri != null && element instanceof EObject) { EObject eObjectElement = (EObject)element; if (eObjectElement.eIsProxy() && EcoreUtil.getURI(eObjectElement).equals(proxyUri)) { - return true; + contains = true; + break; } } } - return false; + return contains; } /** |