Spell-check

README-java-imports.md

@@ -16,7 +16,7 @@ If the only conflicts are in import statements, or there are no conflicts, then:
 * Remove all unneeded imports.  A needed import is one that is used somewhere
    in the Java file.
 
-(If there are conflicts beyound import statements, such as in code or in
+(If there are conflicts beyond import statements, such as in code or in
 comments, then you should first resolve those other conflicts, then run the Java
 imports merger as a merge tool.)
 

src/main/java/name/fraser/neil/plaintext/diff_match_patch.java

@@ -2478,7 +2478,7 @@ public String toString() {
   }
 
   /**
-   * Unescape selected chars for compatability with JavaScript's encodeURI.
+   * Unescape selected chars for compatibility with JavaScript's encodeURI.
    * In speed critical applications this could be dropped since the
    * receiving application will certainly decode these fine.
    * Note that this function is case-sensitive.  Thus "%3f" would not be

src/main/java/org/plumelib/merging/AdjacentLinesMerger.java

@@ -31,7 +31,7 @@ public AdjacentLinesMerger(boolean verbose) {
 
     List<ConflictElement> hunks = cf.hunks();
     if (hunks == null) {
-      Main.exitErroneously("Unparseable file " + cf.path);
+      Main.exitErroneously("Unparsable file " + cf.path);
       throw new Error("unreachable");
     }
 

src/main/java/org/plumelib/merging/Main.java

@@ -43,7 +43,7 @@ public Main() {}
   @Parameters(index = "3", description = "The right, or other, file")
   Path rightPath;
 
-  /** Fro a merge tool, the merged file; is overwritten. For a merge driver, null. */
+  /** For a merge tool, the merged file; is overwritten. For a merge driver, null. */
   @Parameters(
       arity = "0..1",
       index = "4",

src/main/java/org/plumelib/merging/fileformat/ConflictedFile.java

@@ -22,7 +22,7 @@
 /**
  * Represents a file that may contain conflict markers.
  *
- * <p>It is either erroneous (unparseable), or it is a sequence of ConflictElement objects.
+ * <p>It is either erroneous (unparsable), or it is a sequence of ConflictElement objects.
  *
  * <p>There are two general forms of conflicted sections of a file:
  *

src/test/resources/ImportsTest11A.java

@@ -51,7 +51,7 @@ public void thenHasOneDigipeater() {
 			}
 
 			@Test
-			@DisplayName("Then it should have a correct lattitude and longitude")
+			@DisplayName("Then it should have a correct latitude and longitude")
 			public void thenHasPosition() {
 				Collection<APRSData> dataFields = packet2.getAprsInformation().getAprsData().values();
 				for ( APRSData dataField : dataFields ) {

src/test/resources/ImportsTest11Goal.java

@@ -50,7 +50,7 @@ public void thenHasOneDigipeater() {
 			}
 
 			@Test
-			@DisplayName("Then it should have a correct lattitude and longitude")
+			@DisplayName("Then it should have a correct latitude and longitude")
 			public void thenHasPosition() {
 				Collection<APRSData> dataFields = packet2.getAprsInformation().getAprsData().values();
 				for ( APRSData dataField : dataFields ) {