misc(java): fix spelling

jbampton · jbampton · commit 9c7264aa0736 · 2025-05-27T02:12:53.000+10:00
diff --git a/debug/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfiguration.java b/debug/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfiguration.java
@@ -565,7 +565,7 @@ public IResource[] getMappedResources() throws CoreException {
 	public String getMemento() throws CoreException {
 		IPath relativePath = null;
 		IFile file = getFile();
-		String lineDelimeter = getLineSeparator();
+		String lineDelimiter = getLineSeparator();
 		boolean local = true;
 		if (file == null) {
 			relativePath = IPath.fromOSString(getName());
@@ -580,7 +580,7 @@ public String getMemento() throws CoreException {
 			doc.appendChild(node);
 			node.setAttribute(IConfigurationElementConstants.LOCAL, Boolean.toString(local));
 			node.setAttribute(IConfigurationElementConstants.PATH, relativePath.toString());
-			return LaunchManager.serializeDocument(doc, lineDelimeter);
+			return LaunchManager.serializeDocument(doc, lineDelimiter);
 		} catch (IOException ioe) {
 			e= ioe;
 		} catch (ParserConfigurationException pce) {
diff --git a/debug/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationInfo.java b/debug/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationInfo.java
@@ -440,7 +440,7 @@ protected void setAttribute(String key, Object value) {
 	 *             if an exception occurs creating the XML
 	 */
 	@SuppressWarnings("unchecked")
-	protected String getAsXML(String lineDelimeter) throws CoreException, IOException, ParserConfigurationException, TransformerException {
+	protected String getAsXML(String lineDelimiter) throws CoreException, IOException, ParserConfigurationException, TransformerException {
 		Document doc = LaunchManager.getDocument();
 		Element configRootElement = doc.createElement(LAUNCH_CONFIGURATION);
 		doc.appendChild(configRootElement);
@@ -488,7 +488,7 @@ protected String getAsXML(String lineDelimeter) throws CoreException, IOExceptio
 			configRootElement.appendChild(element);
 		}
 
-		return LaunchManager.serializeDocument(doc, lineDelimeter);
+		return LaunchManager.serializeDocument(doc, lineDelimiter);
 	}
 
 	/**
diff --git a/debug/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java b/debug/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java
@@ -278,10 +278,10 @@ private void doSave0(IProgressMonitor monitor) throws CoreException {
 	 * @exception CoreException if writing the file fails
 	 */
 	protected void writeNewFile(IProgressMonitor monitor) throws CoreException {
-		String lineDelimeter = getLineSeparator();
+		String lineDelimiter = getLineSeparator();
 		String xml = null;
 		try {
-			xml = getInfo().getAsXML(lineDelimeter);
+			xml = getInfo().getAsXML(lineDelimiter);
 		} catch (Exception e) {
 			throw new DebugException(
 					new Status(
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java
@@ -698,7 +698,7 @@ public void testCreateSharedConfiguration() throws CoreException {
 	}
 
 	@Test
-	public void testSharedConfigurationLineDelimeters() throws CoreException {
+	public void testSharedConfigurationLineDelimiters() throws CoreException {
 		// we must test non-system-default separator
 		final String systemSeparator = System.lineSeparator();
 		final String nonSystemSeparator = "\n".equals(systemSeparator) ? "\r\n" : "\n";
diff --git a/team/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/FileDiffResult.java b/team/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/FileDiffResult.java
@@ -285,13 +285,13 @@ public HunkResult[] getHunkResults() {
 
 	@Override
 	public InputStream getOriginalContents() {
-		String contents = LineReader.createString(isPreserveLineDelimeters(), getBeforeLines());
+		String contents = LineReader.createString(isPreserveLineDelimiters(), getBeforeLines());
 		return asInputStream(contents, getCharset());
 	}
 
 	@Override
 	public InputStream getPatchedContents() {
-		String contents = LineReader.createString(isPreserveLineDelimeters(), getLines());
+		String contents = LineReader.createString(isPreserveLineDelimiters(), getLines());
 		return asInputStream(contents, getCharset());
 	}
 
@@ -300,7 +300,7 @@ public String getCharset() {
 		return this.charset;
 	}
 
-	public boolean isPreserveLineDelimeters() {
+	public boolean isPreserveLineDelimiters() {
 		return false;
 	}
 
diff --git a/team/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/Hunk.java b/team/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/Hunk.java
@@ -202,7 +202,7 @@ public boolean tryPatch(PatchConfiguration configuration, List<String> lines, in
 					continue;
 				}
 				return false;
-			} else if (isDeletedDelimeter(controlChar, reverse)) {
+			} else if (isDeletedDelimiter(controlChar, reverse)) {
 				// deleted lines
 
 				if (precedingLinesChecked && !contextLinesMatched && contextLines.size() > 0)
@@ -235,7 +235,7 @@ public boolean tryPatch(PatchConfiguration configuration, List<String> lines, in
 				// fails. In other words, all lines considered for deletion
 				// must be found one by one.
 				return false;
-			} else if (isAddedDelimeter(controlChar, reverse)) {
+			} else if (isAddedDelimiter(controlChar, reverse)) {
 
 				if (precedingLinesChecked && !contextLinesMatched && contextLines.size() > 0)
 					return false;
@@ -349,7 +349,7 @@ int doPatch(PatchConfiguration configuration, List<String> lines, int shift, int
 				}
 				Assert.isTrue(false, "doPatch: context doesn't match"); //$NON-NLS-1$
 //					pos++;
-			} else if (isDeletedDelimeter(controlChar, reverse)) {
+			} else if (isDeletedDelimiter(controlChar, reverse)) {
 				// deleted lines
 				if (precedingLinesChecked && !contextLinesMatched && contextLines.size() > 0)
 					// context lines inside hunk don't match
@@ -371,7 +371,7 @@ int doPatch(PatchConfiguration configuration, List<String> lines, int shift, int
 				contextLinesMatched = true;
 
 				lines.remove(pos);
-			} else if (isAddedDelimeter(controlChar, reverse)) {
+			} else if (isAddedDelimiter(controlChar, reverse)) {
 				// added lines
 				if (precedingLinesChecked && !contextLinesMatched && contextLines.size() > 0)
 					Assert.isTrue(false, "doPatch: context lines inside hunk don't match"); //$NON-NLS-1$
@@ -402,11 +402,11 @@ int doPatch(PatchConfiguration configuration, List<String> lines, int shift, int
 		return getShift(reverse);
 	}
 
-	private boolean isDeletedDelimeter(char controlChar, boolean reverse) {
+	private boolean isDeletedDelimiter(char controlChar, boolean reverse) {
 		return (!reverse && controlChar == '-') || (reverse && controlChar == '+');
 	}
 
-	private boolean isAddedDelimeter(char controlChar, boolean reverse) {
+	private boolean isAddedDelimiter(char controlChar, boolean reverse) {
 		return (reverse && controlChar == '-') || (!reverse && controlChar == '+');
 	}
 
@@ -465,9 +465,9 @@ public String getContents(boolean isAfterState, boolean reverse) {
 			char c = line.charAt(0);
 			if (c == ' ') {
 				result.append(rest);
-			} else if (isDeletedDelimeter(c, reverse) && !isAfterState) {
+			} else if (isDeletedDelimiter(c, reverse) && !isAfterState) {
 				result.append(rest);
-			} else if (isAddedDelimeter(c, reverse) && isAfterState) {
+			} else if (isAddedDelimiter(c, reverse) && isAfterState) {
 				result.append(rest);
 			}
 		}
diff --git a/team/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/HunkResult.java b/team/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/HunkResult.java
@@ -247,7 +247,7 @@ public String getContents(boolean afterState, boolean fullContext) {
 			}
 			// Only return the full context if we could apply the hunk
 			if (!problemFound)
-				return LineReader.createString(this.fDiffResult.isPreserveLineDelimeters(), lines);
+				return LineReader.createString(this.fDiffResult.isPreserveLineDelimiters(), lines);
 		}
 		return getHunk().getContents(afterState, getConfiguration().isReversed());
 	}
diff --git a/team/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/LineReader.java b/team/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/LineReader.java
@@ -59,10 +59,10 @@ public static List<String> readLines(BufferedReader reader) {
 	/*
 	 * Concatenates all strings found in the given List.
 	 */
-	public static String createString(boolean preserveLineDelimeters, List<String> lines) {
+	public static String createString(boolean preserveLineDelimiters, List<String> lines) {
 		StringBuilder sb= new StringBuilder();
 		Iterator<String> iter= lines.iterator();
-		if (preserveLineDelimeters) {
+		if (preserveLineDelimiters) {
 			while (iter.hasNext())
 				sb.append(iter.next());
 		} else {
diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/LineReader.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/LineReader.java
@@ -83,10 +83,10 @@ public static List<String> readLines(BufferedReader reader) {
 	/*
 	 * Concatenates all strings found in the given List.
 	 */
-	public static String createString(boolean preserveLineDelimeters, List<String> lines) {
+	public static String createString(boolean preserveLineDelimiters, List<String> lines) {
 		StringBuilder sb = new StringBuilder();
 		Iterator<String> iter = lines.iterator();
-		if (preserveLineDelimeters) {
+		if (preserveLineDelimiters) {
 			while (iter.hasNext())
 				sb.append(iter.next());
 		} else {
diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchFileTypedElement.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchFileTypedElement.java
@@ -103,7 +103,7 @@ public InputStream getContents() throws CoreException {
 			lines = result.getBeforeLines();
 		}
 		String contents = LineReader.createString(getPatcher()
-				.isPreserveLineDelimeters(), lines);
+				.isPreserveLineDelimiters(), lines);
 		String charSet = getCharset();
 		byte[] bytes = null;
 		if (charSet != null) {
diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
@@ -290,7 +290,7 @@ else if (fTarget instanceof IFile) {
 					// patch it and collect rejected hunks
 					List<String> result= apply(diff, file, true, failed);
 					if (result != null)
-						store(LineReader.createString(isPreserveLineDelimeters(), result), file, SubMonitor.convert(pm, workTicks));
+						store(LineReader.createString(isPreserveLineDelimiters(), result), file, SubMonitor.convert(pm, workTicks));
 					workTicks-= WORK_UNIT;
 					break;
 				case FilePatch2.DELETION:
@@ -301,7 +301,7 @@ else if (fTarget instanceof IFile) {
 					// patch it and collect rejected hunks
 					result= apply(diff, file, false, failed);
 					if (result != null)
-						store(LineReader.createString(isPreserveLineDelimeters(), result), file, SubMonitor.convert(pm, workTicks));
+						store(LineReader.createString(isPreserveLineDelimiters(), result), file, SubMonitor.convert(pm, workTicks));
 					workTicks-= WORK_UNIT;
 					break;
 				default:
@@ -412,7 +412,7 @@ protected void store(byte[] bytes, IFile file, IProgressMonitor pm) throws CoreE
 		}
 	}
 
-	public boolean isPreserveLineDelimeters() {
+	public boolean isPreserveLineDelimiters() {
 		return true;
 	}
 
diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/UnmatchedHunkTypedElement.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/UnmatchedHunkTypedElement.java
@@ -87,7 +87,7 @@ public InputStream getContents() throws CoreException {
 			return new ByteArrayInputStream(getPatcher().getCachedContents(getDiff()));
 		// Otherwise return the after state of the diff result
 		List<String> lines = getHunkResult().getDiffResult().getAfterLines();
-		String content = LineReader.createString(getHunkResult().getDiffResult().isPreserveLineDelimeters(), lines);
+		String content = LineReader.createString(getHunkResult().getDiffResult().isPreserveLineDelimiters(), lines);
 		byte[] bytes = null;
 		if (getCharset() != null)
 			try {
diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspacePatcher.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspacePatcher.java
@@ -126,7 +126,7 @@ public void applyAll(IProgressMonitor pm, IFileValidator validator) throws CoreE
 							// patch it and collect rejected hunks
 							List<String> result= apply(diff, file, true, failed);
 							if (result != null)
-								store(LineReader.createString(isPreserveLineDelimeters(), result), file, SubMonitor.convert(pm, workTicks));
+								store(LineReader.createString(isPreserveLineDelimiters(), result), file, SubMonitor.convert(pm, workTicks));
 							workTicks -= WORK_UNIT;
 							break;
 						case FilePatch2.DELETION :
@@ -137,7 +137,7 @@ public void applyAll(IProgressMonitor pm, IFileValidator validator) throws CoreE
 							// patch it and collect rejected hunks
 							result= apply(diff, file, false, failed);
 							if (result != null)
-								store(LineReader.createString(isPreserveLineDelimeters(), result), file, SubMonitor.convert(pm, workTicks));
+								store(LineReader.createString(isPreserveLineDelimiters(), result), file, SubMonitor.convert(pm, workTicks));
 							workTicks -= WORK_UNIT;
 							break;
 						default:
diff --git a/team/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncByteConverter.java b/team/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncByteConverter.java
@@ -69,16 +69,16 @@ private static int startOfSlot(byte[] syncBytes, int slot) {
 	}
 
 	/**
-	 * Return the offset the the Nth delimeter from the given start index.
+	 * Return the offset the the Nth delimiter from the given start index.
 	 * @return int
 	 */
-	private static int getOffsetOfDelimeter(byte[] bytes, byte delimiter, int start, int n) {
+	private static int getOffsetOfDelimiter(byte[] bytes, byte delimiter, int start, int n) {
 		int count = 0;
 		for (int i = start; i < bytes.length; i++) {
 			if (bytes[i] == delimiter) count++;
 			if (count == n) return i;
 		}
-		// the Nth delimeter was not found
+		// the Nth delimiter was not found
 		return -1;
 	}
 
@@ -97,11 +97,11 @@ public static byte[] getSlot(byte[] bytes, int index, boolean includeRest) {
 			// make start -1 so that end determination will start at offset 0.
 			start = -1;
 		} else {
-			start = getOffsetOfDelimeter(bytes, delimiter, 0, index);
+			start = getOffsetOfDelimiter(bytes, delimiter, 0, index);
 			if (start == -1) return null;
 		}
 		// Find the ending index
-		int end = getOffsetOfDelimeter(bytes, delimiter, start + 1, 1);
+		int end = getOffsetOfDelimiter(bytes, delimiter, start + 1, 1);
 		// Calculate the length
 		int length;
 		if (end == -1 || includeRest) {
diff --git a/team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/LineReaderTest.java b/team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/LineReaderTest.java
@@ -43,13 +43,13 @@ public void testReadNormal() throws IOException {
 			LineReader lr = new LineReader(reader);
 		List<String> inLines= lr.readLines();
 		assertThat(inLines).hasSize(3).satisfiesExactlyInAnyOrder(
-				first -> assertThat(convertLineDelimeters(first)).isEqualTo("[1]\n"),
-				second -> assertThat(convertLineDelimeters(second)).isEqualTo("[2]\n"),
-				third -> assertThat(convertLineDelimeters(third)).isEqualTo("[3]\n"));
+				first -> assertThat(convertLineDelimiters(first)).isEqualTo("[1]\n"),
+				second -> assertThat(convertLineDelimiters(second)).isEqualTo("[2]\n"),
+				third -> assertThat(convertLineDelimiters(third)).isEqualTo("[3]\n"));
 		}
 	}
 
-	private String convertLineDelimeters(Object object) {
+	private String convertLineDelimiters(Object object) {
 		String line = (String)object;
 		if (line.endsWith("\r\n"))
 			return line.substring(0, line.length() - 2) + "\n";
@@ -62,8 +62,8 @@ public void testReadUnterminatedLastLine() throws IOException {
 			LineReader lr = new LineReader(reader);
 		List<String> inLines= lr.readLines();
 		assertThat(inLines).hasSize(3).satisfiesExactlyInAnyOrder(
-				first -> assertThat(convertLineDelimeters(first)).isEqualTo("[1]\n"),
-				second -> assertThat(convertLineDelimeters(second)).isEqualTo("[2]\n"),
+				first -> assertThat(convertLineDelimiters(first)).isEqualTo("[1]\n"),
+				second -> assertThat(convertLineDelimiters(second)).isEqualTo("[2]\n"),
 				third -> assertThat(third).isEqualTo("[3]"));
 		}
 	}
diff --git a/team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchTest.java b/team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchTest.java
@@ -529,7 +529,7 @@ private void patchWorkspace(String msg, String[] originalFiles, String patch, St
 
 			Object[] expected = expectedLines.toArray();
 
-			String resultString = LineReader.createString(patcher.isPreserveLineDelimeters(), inLines);
+			String resultString = LineReader.createString(patcher.isPreserveLineDelimiters(), inLines);
 			LineReader resultReader = new LineReader(new BufferedReader(new StringReader(resultString)));
 			Object[] result = resultReader.readLines().toArray();
 
diff --git a/ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/PreferenceFileHandler.java b/ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/PreferenceFileHandler.java
@@ -278,7 +278,7 @@ public String[] isEnabled() {
 		return isICEnabled;
 	}
 
-	public String getDelimeter() {
+	public String getDelimiter() {
 		return PREFERENCE_ENTRY_DELIMITER;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -698,7 +698,7 @@ public void testCreateSharedConfiguration() throws CoreException {`
`698`	`698`	`}`
`699`	`699`
`700`	`700`	`@Test`
`701`		`- public void testSharedConfigurationLineDelimeters() throws CoreException {`
	`701`	`+ public void testSharedConfigurationLineDelimiters() throws CoreException {`
`702`	`702`	`// we must test non-system-default separator`
`703`	`703`	`final String systemSeparator = System.lineSeparator();`
`704`	`704`	`final String nonSystemSeparator = "\n".equals(systemSeparator) ? "\r\n" : "\n";`
Original file line number	Diff line number	Diff line change
`@@ -285,13 +285,13 @@ public HunkResult[] getHunkResults() {`
`285`	`285`
`286`	`286`	`@Override`
`287`	`287`	`public InputStream getOriginalContents() {`
`288`		`- String contents = LineReader.createString(isPreserveLineDelimeters(), getBeforeLines());`
	`288`	`+ String contents = LineReader.createString(isPreserveLineDelimiters(), getBeforeLines());`
`289`	`289`	`return asInputStream(contents, getCharset());`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`@Override`
`293`	`293`	`public InputStream getPatchedContents() {`
`294`		`- String contents = LineReader.createString(isPreserveLineDelimeters(), getLines());`
	`294`	`+ String contents = LineReader.createString(isPreserveLineDelimiters(), getLines());`
`295`	`295`	`return asInputStream(contents, getCharset());`
`296`	`296`	`}`
`297`	`297`
`@@ -300,7 +300,7 @@ public String getCharset() {`
`300`	`300`	`return this.charset;`
`301`	`301`	`}`
`302`	`302`
`303`		`- public boolean isPreserveLineDelimeters() {`
	`303`	`+ public boolean isPreserveLineDelimiters() {`
`304`	`304`	`return false;`
`305`	`305`	`}`
`306`	`306`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ public String getContents(boolean afterState, boolean fullContext) {`
`247`	`247`	`}`
`248`	`248`	`// Only return the full context if we could apply the hunk`
`249`	`249`	`if (!problemFound)`
`250`		`- return LineReader.createString(this.fDiffResult.isPreserveLineDelimeters(), lines);`
	`250`	`+ return LineReader.createString(this.fDiffResult.isPreserveLineDelimiters(), lines);`
`251`	`251`	`}`
`252`	`252`	`return getHunk().getContents(afterState, getConfiguration().isReversed());`
`253`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public InputStream getContents() throws CoreException {`
`103`	`103`	`lines = result.getBeforeLines();`
`104`	`104`	`}`
`105`	`105`	`String contents = LineReader.createString(getPatcher()`
`106`		`- .isPreserveLineDelimeters(), lines);`
	`106`	`+ .isPreserveLineDelimiters(), lines);`
`107`	`107`	`String charSet = getCharset();`
`108`	`108`	`byte[] bytes = null;`
`109`	`109`	`if (charSet != null) {`