Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2019-05-21 08:50:54 -0400
committerlgoubet2019-05-23 08:32:23 -0400
commit80b7768dfda6de49e919ce8d864caf4ac36d44f7 (patch)
tree31a41e1a041a1450aac7370cf035e730c8eefd48
parent4239507e30d5c4ebccb889c3f798ca4217f32b6f (diff)
downloadorg.eclipse.emf.compare-80b7768dfda6de49e919ce8d864caf4ac36d44f7.tar.gz
org.eclipse.emf.compare-80b7768dfda6de49e919ce8d864caf4ac36d44f7.tar.xz
org.eclipse.emf.compare-80b7768dfda6de49e919ce8d864caf4ac36d44f7.zip
Typos
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/FeatureFilter.java2
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/FeatureFilter.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/FeatureFilter.java
index b8eca78ee..6c45429e9 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/FeatureFilter.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/FeatureFilter.java
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.EcorePackage;
/**
- * {@link FeatureFilter}s will be used by the default implemention of a diff engine in order to determine
+ * {@link FeatureFilter}s will be used by the default implementation of a diff engine in order to determine
* which features it is to check for differences. Any feature that is not returned by this filter will be
* ignored by the diff engine.
*
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java
index 6166e1397..1202796f4 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java
@@ -1198,8 +1198,8 @@ public abstract class AbstractMerger implements IMerger2, IMergeOptionAware, IMe
/**
* Adds the given {@code value} into the given {@code list} at the given {@code index}. An {@code index}
- * under than zero or above the list's size will mean that the value should be appended at the end of the
- * list.
+ * lower than zero or greater than the list's size will mean that the value should be appended at the end
+ * of the list.
*
* @param list
* The list into which {@code value} should be added.

Back to the top