From 16fe8ee5b4bc2b67c25db4217ae959d21ac7da77 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Sat, 2 May 2026 21:19:57 -0700 Subject: [PATCH] Spell-check --- README-java-imports.md | 2 +- src/main/java/name/fraser/neil/plaintext/diff_match_patch.java | 2 +- src/main/java/org/plumelib/merging/AdjacentLinesMerger.java | 2 +- src/main/java/org/plumelib/merging/Main.java | 2 +- .../java/org/plumelib/merging/fileformat/ConflictedFile.java | 2 +- src/test/resources/ImportsTest11A.java | 2 +- src/test/resources/ImportsTest11Goal.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README-java-imports.md b/README-java-imports.md index 4e63575..8e27c6e 100644 --- a/README-java-imports.md +++ b/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.) diff --git a/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java b/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java index 52d02fb..f2f7174 100644 --- a/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java +++ b/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 diff --git a/src/main/java/org/plumelib/merging/AdjacentLinesMerger.java b/src/main/java/org/plumelib/merging/AdjacentLinesMerger.java index 9b5f5fa..27ce4c9 100644 --- a/src/main/java/org/plumelib/merging/AdjacentLinesMerger.java +++ b/src/main/java/org/plumelib/merging/AdjacentLinesMerger.java @@ -31,7 +31,7 @@ public AdjacentLinesMerger(boolean verbose) { List hunks = cf.hunks(); if (hunks == null) { - Main.exitErroneously("Unparseable file " + cf.path); + Main.exitErroneously("Unparsable file " + cf.path); throw new Error("unreachable"); } diff --git a/src/main/java/org/plumelib/merging/Main.java b/src/main/java/org/plumelib/merging/Main.java index 5fe1321..535e309 100644 --- a/src/main/java/org/plumelib/merging/Main.java +++ b/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", diff --git a/src/main/java/org/plumelib/merging/fileformat/ConflictedFile.java b/src/main/java/org/plumelib/merging/fileformat/ConflictedFile.java index 0fd5c64..200d083 100644 --- a/src/main/java/org/plumelib/merging/fileformat/ConflictedFile.java +++ b/src/main/java/org/plumelib/merging/fileformat/ConflictedFile.java @@ -22,7 +22,7 @@ /** * Represents a file that may contain conflict markers. * - *

It is either erroneous (unparseable), or it is a sequence of ConflictElement objects. + *

It is either erroneous (unparsable), or it is a sequence of ConflictElement objects. * *

There are two general forms of conflicted sections of a file: * diff --git a/src/test/resources/ImportsTest11A.java b/src/test/resources/ImportsTest11A.java index 71df847..a6b85fd 100644 --- a/src/test/resources/ImportsTest11A.java +++ b/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 dataFields = packet2.getAprsInformation().getAprsData().values(); for ( APRSData dataField : dataFields ) { diff --git a/src/test/resources/ImportsTest11Goal.java b/src/test/resources/ImportsTest11Goal.java index cd1fc37..bdabb03 100644 --- a/src/test/resources/ImportsTest11Goal.java +++ b/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 dataFields = packet2.getAprsInformation().getAprsData().values(); for ( APRSData dataField : dataFields ) {