Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Langer2016-08-22 03:44:52 -0400
committerLaurent Delaigue2016-09-13 03:45:56 -0400
commitd27ccfd2eeab02689be473aa36bd507238f5e6cd (patch)
tree774db52471adbd6d82deaf9c44b587b469308e98
parent776044b8a9d95e30770233fdfd1bce28228dc9a2 (diff)
downloadorg.eclipse.emf.compare-d27ccfd2eeab02689be473aa36bd507238f5e6cd.tar.gz
org.eclipse.emf.compare-d27ccfd2eeab02689be473aa36bd507238f5e6cd.tar.xz
org.eclipse.emf.compare-d27ccfd2eeab02689be473aa36bd507238f5e6cd.zip
Fix Javadoc of ComparisonUtil.getAssociatedDiffs
The Javadoc did not mention that getAssociatedDiffs would include diff.getRefines() even though the JavaDoc explicitly lists all diffs that would be included. Since it is quite an important aspect whether or not diff.getRefines() is included, we now mention it explicitly. Change-Id: If94780d3a1ac410bb36b601115e31fae4de3f504 Signed-off-by: Philip Langer <planger@eclipsesource.com>
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/utils/ComparisonUtil.java26
1 files changed, 10 insertions, 16 deletions
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/utils/ComparisonUtil.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/utils/ComparisonUtil.java
index 43b964388..5e6a8539f 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/utils/ComparisonUtil.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/utils/ComparisonUtil.java
@@ -393,23 +393,17 @@ public final class ComparisonUtil {
* diffs (see {@link DiffUtil#getSubDiffs(boolean)}) of these associated diffs.
* <p>
* The associated diffs of a diff are :
- * <p>
- * - {@link Diff#getRequiredBy()} if the source of the diff is the left side and the direction of the
- * merge is right to left.
- * </p>
- * <p>
- * - {@link Diff#getRequiredBy()} if the source of the diff is the right side and the direction of the
- * merge is left to right.
- * </p>
- * <p>
- * - {@link Diff#getRequires()} if the source of the diff is the left side and the direction of the merge
- * is left to right.
- * </p>
- * <p>
- * - {@link Diff#getRequires()} if the source of the diff is the right side and the direction of the merge
- * is right to left.
- * </p>
* </p>
+ * <li>{@link Diff#getRequiredBy()} if the source of the diff is the left side and the direction of the
+ * merge is right to left.</li>
+ * <li>{@link Diff#getRequiredBy()} if the source of the diff is the right side and the direction of the
+ * merge is left to right.</li>
+ * <li>{@link Diff#getRequires()} if the source of the diff is the left side and the direction of the
+ * merge is left to right.</li>
+ * <li>{@link Diff#getRequires()} if the source of the diff is the right side and the direction of the
+ * merge is right to left.</li>
+ * <li>{@link Diff#getRefines()} in any case.</li>
+ * </ul>
*
* @param diffRoot
* the given diff.

Back to the top