From 9b333b09a977c6848b8ac7d95802636f0f53b606 Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@gmail.com>
Date: Wed, 2 Apr 2025 10:51:03 +1000
Subject: [PATCH 1/2] misc: fix spelling

General spelling clean up all similar words
---
 .../org/eclipse/jface/viewers/CellEditor.java |  2 +-
 .../jface/viewers/ComboBoxCellEditor.java     |  4 +--
 .../viewers/ComboBoxViewerCellEditor.java     |  4 +--
 .../eclipse/jface/viewers/TextCellEditor.java | 14 +++++-----
 .../internal/core/text/TextSearchVisitor.java | 26 +++++++++----------
 bundles/org.eclipse.search/plugin.xml         |  2 +-
 .../org.eclipse.text.quicksearch/plugin.xml   |  2 +-
 .../plugin.properties                         |  2 +-
 .../schema/highlightReconcilers.exsd          |  2 +-
 .../css/dark/e4-dark_preferencestyle.css      |  2 +-
 .../internal/texteditor/HistoryTracker.java   |  2 +-
 .../ui/internal/WorkbenchMessages.java        |  2 +-
 .../eclipse/ui/internal/messages.properties   |  2 +-
 .../registry/PropertyPagesRegistryReader.java |  2 +-
 .../statushandlers/InternalDialog.java        |  2 +-
 docs/Menu_Contributions/Search_Menu.md        |  6 ++---
 .../viewers/TextAndDialogCellEditor.java      |  6 ++---
 .../DifferentRealmsBindingTest.java           |  6 ++---
 .../TextMultiCaretSelectionCommandsTest.java  |  8 +++---
 .../performance/OpenClosePerspectiveTest.java |  2 +-
 .../performance/PerspectiveSwitchTest.java    |  2 +-
 .../eclipse/ui/tests/api/IWorkbenchTest.java  |  6 ++---
 .../tests/decorators/DecoratorViewerTest.java |  2 +-
 .../eclipse/ui/tests/menus/MenuBuilder.java   |  2 +-
 24 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CellEditor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CellEditor.java
index ca0b70f67db..516800261b3 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CellEditor.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CellEditor.java
@@ -692,7 +692,7 @@ public boolean isValueValid() {
 	 * @param keyEvent
 	 *            the key event
 	 */
-	protected void keyReleaseOccured(KeyEvent keyEvent) {
+	protected void keyReleaseOccurred(KeyEvent keyEvent) {
 		if (keyEvent.character == '\u001b') { // Escape character
 			fireCancelEditor();
 		} else if (keyEvent.character == '\r') { // Return key
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxCellEditor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxCellEditor.java
index 9bd26174313..083d59d97dd 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxCellEditor.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxCellEditor.java
@@ -143,7 +143,7 @@ protected Control createControl(Composite parent) {
 			// hook key pressed - see PR 14201
 			@Override
 			public void keyPressed(KeyEvent e) {
-				keyReleaseOccured(e);
+				keyReleaseOccurred(e);
 			}
 		});
 
@@ -283,7 +283,7 @@ protected void focusLost() {
 	}
 
 	@Override
-	protected void keyReleaseOccured(KeyEvent keyEvent) {
+	protected void keyReleaseOccurred(KeyEvent keyEvent) {
 		if (keyEvent.character == '\u001b') { // Escape character
 			fireCancelEditor();
 		} else if (keyEvent.character == '\t') { // tab key
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxViewerCellEditor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxViewerCellEditor.java
index 8d9c527a53b..c3e466735ec 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxViewerCellEditor.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxViewerCellEditor.java
@@ -86,7 +86,7 @@ protected Control createControl(Composite parent) {
 			// hook key pressed - see PR 14201
 			@Override
 			public void keyPressed(KeyEvent e) {
-				keyReleaseOccured(e);
+				keyReleaseOccurred(e);
 			}
 		});
 
@@ -260,7 +260,7 @@ protected void focusLost() {
 	}
 
 	@Override
-	protected void keyReleaseOccured(KeyEvent keyEvent) {
+	protected void keyReleaseOccurred(KeyEvent keyEvent) {
 		if (keyEvent.character == '\u001b') { // Escape character
 			fireCancelEditor();
 		} else if (keyEvent.character == '\t') { // tab key
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TextCellEditor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TextCellEditor.java
index b9b50ab5657..38cd9dda813 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TextCellEditor.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TextCellEditor.java
@@ -148,7 +148,7 @@ protected Control createControl(Composite parent) {
 			// hook key pressed - see PR 14201
 			@Override
 			public void keyPressed(KeyEvent e) {
-				keyReleaseOccured(e);
+				keyReleaseOccurred(e);
 
 				// as a result of processing the above call, clients may have
 				// disposed this cell editor
@@ -237,7 +237,7 @@ protected void doSetValue(Object value) {
 	 *
 	 * @param e the SWT modify event
 	 */
-	protected void editOccured(ModifyEvent e) {
+	protected void editOccurred(ModifyEvent e) {
 		String value = text.getText();
 		if (value == null) {
 			value = "";//$NON-NLS-1$
@@ -268,7 +268,7 @@ public LayoutData getLayoutData() {
 	 */
 	private ModifyListener getModifyListener() {
 		if (modifyListener == null) {
-			modifyListener = this::editOccured;
+			modifyListener = this::editOccurred;
 		}
 		return modifyListener;
 	}
@@ -282,7 +282,7 @@ private ModifyListener getModifyListener() {
 	 * @since 3.0
 	 */
 	protected void handleDefaultSelection(SelectionEvent event) {
-		// same with enter-key handling code in keyReleaseOccured(e);
+		// same with enter-key handling code in keyReleaseOccurred(e);
 		fireApplyEditorValue();
 		deactivate();
 	}
@@ -385,7 +385,7 @@ public boolean isSelectAllEnabled() {
 	 * @param keyEvent the key event
 	 */
 	@Override
-	protected void keyReleaseOccured(KeyEvent keyEvent) {
+	protected void keyReleaseOccurred(KeyEvent keyEvent) {
 		if (keyEvent.character == '\r') { // Return key
 			// Enter is handled in handleDefaultSelection.
 			// Do not apply the editor value in response to an Enter key event
@@ -398,12 +398,12 @@ protected void keyReleaseOccured(KeyEvent keyEvent) {
 			if (text != null && !text.isDisposed()
 					&& (text.getStyle() & SWT.MULTI) != 0) {
 				if ((keyEvent.stateMask & SWT.CTRL) != 0) {
-					super.keyReleaseOccured(keyEvent);
+					super.keyReleaseOccurred(keyEvent);
 				}
 			}
 			return;
 		}
-		super.keyReleaseOccured(keyEvent);
+		super.keyReleaseOccurred(keyEvent);
 	}
 
 	/**
diff --git a/bundles/org.eclipse.search.core/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java b/bundles/org.eclipse.search.core/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java
index 8a0354bf93f..d0c239f0c0f 100644
--- a/bundles/org.eclipse.search.core/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java
+++ b/bundles/org.eclipse.search.core/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java
@@ -194,14 +194,14 @@ public IStatus processFile(List<IFile> sameFiles, IProgressMonitor monitor) {
 					return Status.OK_STATUS;
 				}
 
-				List<TextSearchMatchAccess> occurences;
+				List<TextSearchMatchAccess> occurrences;
 				CharSequence charsequence;
 
 				IDocument document= getOpenDocument(file, getDocumentsInEditors());
 				if (document != null) {
 					charsequence = new DocumentCharSequence(document);
 					// assume all documents are non-binary
-					occurences = locateMatches(file, charsequence, matcher, monitor);
+					occurrences = locateMatches(file, charsequence, matcher, monitor);
 				} else {
 					try {
 						boolean reportTextOnly = !fCollector.reportBinaryFile(file);
@@ -213,7 +213,7 @@ public IStatus processFile(List<IFile> sameFiles, IProgressMonitor monitor) {
 						if (reportTextOnly && hasBinaryContent(charsequence)) {
 							return Status.OK_STATUS;
 						}
-						occurences = locateMatches(file, charsequence, matcher, monitor);
+						occurrences = locateMatches(file, charsequence, matcher, monitor);
 					} catch (FileCharSequenceProvider.FileCharSequenceException e) {
 						if (e.getCause() instanceof RuntimeException runtimeEx) {
 							throw runtimeEx;
@@ -226,8 +226,8 @@ public IStatus processFile(List<IFile> sameFiles, IProgressMonitor monitor) {
 				for (IFile duplicateFiles : sameFiles) {
 					// reuse previous result
 					ReusableMatchAccess matchAccess= new ReusableMatchAccess();
-					for (TextSearchMatchAccess occurence : occurences) {
-						matchAccess.initialize(duplicateFiles, occurence.getMatchOffset(), occurence.getMatchLength(),
+					for (TextSearchMatchAccess occurrence : occurrences) {
+						matchAccess.initialize(duplicateFiles, occurrence.getMatchOffset(), occurrence.getMatchLength(),
 								charsequence);
 						boolean goOn= fCollector.acceptPatternMatch(matchAccess);
 						if (!goOn) {
@@ -478,30 +478,30 @@ private boolean hasBinaryContent(CharSequence seq) {
 	}
 
 	private List<TextSearchMatchAccess> locateMatches(IFile file, CharSequence searchInput, Matcher matcher, IProgressMonitor monitor) throws CoreException {
-		List<TextSearchMatchAccess> occurences= null;
+		List<TextSearchMatchAccess> occurrences= null;
 		matcher.reset(searchInput);
 		// Check for cancellation before calling matcher.find() since that call
 		// can be very expensive
 		while (!monitor.isCanceled() && matcher.find()) {
-			if (occurences == null) {
-				occurences= new ArrayList<>();
+			if (occurrences == null) {
+				occurrences= new ArrayList<>();
 			}
 			int start= matcher.start();
 			int end= matcher.end();
 			if (end != start) { // don't report 0-length matches
 				ReusableMatchAccess access= new ReusableMatchAccess();
 				access.initialize(file, start, end - start, searchInput);
-				occurences.add(access);
+				occurrences.add(access);
 				boolean res= fCollector.acceptPatternMatch(access);
 				if (!res) {
-					return occurences; // no further reporting requested
+					return occurrences; // no further reporting requested
 				}
 			}
 		}
-		if (occurences == null) {
-			occurences= Collections.emptyList();
+		if (occurrences == null) {
+			occurrences= Collections.emptyList();
 		}
-		return occurences;
+		return occurrences;
 	}
 
 
diff --git a/bundles/org.eclipse.search/plugin.xml b/bundles/org.eclipse.search/plugin.xml
index 3f8dda7b1c9..2a74fdcf56d 100644
--- a/bundles/org.eclipse.search/plugin.xml
+++ b/bundles/org.eclipse.search/plugin.xml
@@ -184,7 +184,7 @@
 				<groupMarker name="dialogGroup"/>           <!-- to be used by clients      -->
 				<separator name="fileSearchContextMenuActionsGroup"/> <!-- to be used by clients      -->
 	         	<separator name="contextMenuActionsGroup"/> <!-- to be used by clients -->
-	         	<separator name="occurencesActionsGroup"/> <!-- to be used by clients -->
+	         	<separator name="occurrencesActionsGroup"/> <!-- to be used by clients -->
 	         	<separator name="extraSearchGroup"/> <!-- to be used by clients -->
 	      	</menu>
 	      	
diff --git a/bundles/org.eclipse.text.quicksearch/plugin.xml b/bundles/org.eclipse.text.quicksearch/plugin.xml
index 40f76acfad9..762bb4701f1 100644
--- a/bundles/org.eclipse.text.quicksearch/plugin.xml
+++ b/bundles/org.eclipse.text.quicksearch/plugin.xml
@@ -55,7 +55,7 @@
 			<groupMarker name="dialogGroup"/>           <!-- to be used by clients      -->
 			<separator name="fileSearchContextMenuActionsGroup"/> <!-- to be used by clients      -->
 	     	<separator name="contextMenuActionsGroup"/> <!-- to be used by clients -->
-	     	<separator name="occurencesActionsGroup"/> <!-- to be used by clients -->
+	     	<separator name="occurrencesActionsGroup"/> <!-- to be used by clients -->
 	     	<separator name="extraSearchGroup"/> <!-- to be used by clients -->
 	  	</menu>
             
diff --git a/bundles/org.eclipse.ui.genericeditor/plugin.properties b/bundles/org.eclipse.ui.genericeditor/plugin.properties
index 9bbbe849ff2..211a55b6b26 100644
--- a/bundles/org.eclipse.ui.genericeditor/plugin.properties
+++ b/bundles/org.eclipse.ui.genericeditor/plugin.properties
@@ -32,7 +32,7 @@ findReferencesCommand_name=Find References
 findReferencesCommand_description=Find other code items referencing the current selected item.
 Bundle-Vendor=Eclipse.org
 Bundle-Name=Generic and Extensible Code Editor
-command.toggle.highlight.label = Toggle Mark Occurences
+command.toggle.highlight.label = Toggle Mark Occurrences
 command.toggle.highlight.name = Toggle Highlight
 menu.source.label = Source
 gotoMatchingBracketCommand_name =  Go to Matching Bracket
diff --git a/bundles/org.eclipse.ui.genericeditor/schema/highlightReconcilers.exsd b/bundles/org.eclipse.ui.genericeditor/schema/highlightReconcilers.exsd
index a0c95bc2845..a9401e75c0f 100644
--- a/bundles/org.eclipse.ui.genericeditor/schema/highlightReconcilers.exsd
+++ b/bundles/org.eclipse.ui.genericeditor/schema/highlightReconcilers.exsd
@@ -6,7 +6,7 @@
          <meta.schema plugin="org.eclipse.ui.genericeditor" id="highlightReconcilers" name="Highlight reconcilers"/>
       </appinfo>
       <documentation>
-         This extension point is used to contribute highlight reconcilers for controlling the highlighting on a file with a given content type. Reconcilers attached to this extension point that listen to the preference &quot;org.eclipse.ui.genericeditor.togglehighlight&quot; will be toggled with the &quot;Toggle Mark Occurences&quot; button.
+         This extension point is used to contribute highlight reconcilers for controlling the highlighting on a file with a given content type. Reconcilers attached to this extension point that listen to the preference &quot;org.eclipse.ui.genericeditor.togglehighlight&quot; will be toggled with the &quot;Toggle Mark Occurrences&quot; button.
       </documentation>
    </annotation>
 
diff --git a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_preferencestyle.css b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_preferencestyle.css
index 6e74b61901a..07be5f975bc 100644
--- a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_preferencestyle.css
+++ b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_preferencestyle.css
@@ -28,7 +28,7 @@ IEclipsePreferences#org-eclipse-ui-editors:org-eclipse-ui-themes { /* pseudo att
 		'AbstractTextEditor.Color.SelectionForeground=147,161,161'
 		'AbstractTextEditor.Color.Foreground=204,204,204'
 		'AbstractTextEditor.Color.FindScope=30,120,155'
-		'asOccurencesIndicationColor=72,72,72'
+		'asOccurrencesIndicationColor=72,72,72'
 		'breakpointIndicationColor=51,119,193'
 		'currentIPColor=90,90,90'
 		'currentLineColor=55,55,55'
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/HistoryTracker.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/HistoryTracker.java
index 8488a31f6ee..c0956d70719 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/HistoryTracker.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/HistoryTracker.java
@@ -162,7 +162,7 @@ public T addOrReplace(T newItem) {
 				 * history contains [10,20,30] and vicinity threshold defined as distance 2,
 				 * then you insert the following series: 11, 12, 13, 14, 15, 16, 17, 18, 19, 20
 				 * even if each insert overwrote the prior, you still could end up with dataset
-				 * [20, 20, 30]. By not breaking here we prevent that state from occuring, but
+				 * [20, 20, 30]. By not breaking here we prevent that state from occurring, but
 				 * at some computation cost. Therefore if cost (performance) ever a problem, we
 				 * could just accept that occasional suboptimal history state for better
 				 * performance
diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkbenchMessages.java b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkbenchMessages.java
index 7f1f1435b4f..2ead20eb073 100644
--- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkbenchMessages.java
+++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkbenchMessages.java
@@ -1005,7 +1005,7 @@ public class WorkbenchMessages extends NLS {
 	public static String WorkbenchStatusDialog_SupportHyperlink;
 	public static String WorkbenchStatusDialog_StatusWithChildren;
 	public static String WorkbenchStatusDialog_SeeDetails;
-	public static String WorkbenchStatusDialog_MultipleProblemsHaveOccured;
+	public static String WorkbenchStatusDialog_MultipleProblemsHaveOccurred;
 	public static String WorkbenchStatusDialog_ProblemOccurred;
 	public static String WorkbenchStatusDialog_ProblemOccurredInJob;
 
diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/messages.properties b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/messages.properties
index b614be6310e..308a5358d64 100644
--- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/messages.properties
+++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/messages.properties
@@ -1022,7 +1022,7 @@ WorkbenchStatusDialog_SupportTooltip=Get Support
 WorkbenchStatusDialog_SupportHyperlink=<a>Get Support</a>
 WorkbenchStatusDialog_StatusWithChildren=This status has children statuses. See 'Details' for more information.
 WorkbenchStatusDialog_SeeDetails=See 'Details' for more information.
-WorkbenchStatusDialog_MultipleProblemsHaveOccured=Multiple problems have occurred
+WorkbenchStatusDialog_MultipleProblemsHaveOccurred=Multiple problems have occurred
 WorkbenchStatusDialog_ProblemOccurred=A problem has occurred.
 WorkbenchStatusDialog_ProblemOccurredInJob=''{0}'' has encountered a problem.
 StackTraceSupportArea_CausedBy=Caused by:
diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/registry/PropertyPagesRegistryReader.java b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/registry/PropertyPagesRegistryReader.java
index 61614848b47..107be950c1b 100644
--- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/registry/PropertyPagesRegistryReader.java
+++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/registry/PropertyPagesRegistryReader.java
@@ -193,7 +193,7 @@ public boolean readElement(IConfigurationElement element) {
 	}
 
 	/**
-	 * Reads all occurances of propertyPages extension in the registry.
+	 * Reads all occurrences of propertyPages extension in the registry.
 	 *
 	 * @param registry the registry
 	 */
diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/statushandlers/InternalDialog.java b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/statushandlers/InternalDialog.java
index fbd51b76f40..c185ee92885 100644
--- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/statushandlers/InternalDialog.java
+++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/statushandlers/InternalDialog.java
@@ -754,7 +754,7 @@ private void refreshStatusListArea() {
 		if (statusListViewer != null && !statusListViewer.getControl().isDisposed()) {
 			statusListViewer.refresh();
 			if (statusListViewer.getTable().getItemCount() > 1) {
-				getShell().setText(WorkbenchMessages.WorkbenchStatusDialog_MultipleProblemsHaveOccured);
+				getShell().setText(WorkbenchMessages.WorkbenchStatusDialog_MultipleProblemsHaveOccurred);
 			} else {
 				getShell().setText(getString(IStatusDialogConstants.TITLE));
 			}
diff --git a/docs/Menu_Contributions/Search_Menu.md b/docs/Menu_Contributions/Search_Menu.md
index 7575a62f3f9..8b6a69b9a41 100644
--- a/docs/Menu_Contributions/Search_Menu.md
+++ b/docs/Menu_Contributions/Search_Menu.md
@@ -106,7 +106,7 @@ We'll assume that the Search menu is globally defined elsewhere by the org.eclip
                <separator name="fileSearchContextMenuActionsGroup"
                           visible="true" />
                <separator name="contextMenuActionsGroup" visible="true" />
-               <separator name="occurencesActionsGroup" visible="true" />
+               <separator name="occurrencesActionsGroup" visible="true" />
                <separator name="extraSearchGroup" visible="true" />
             </menu>
          </menuContribution>
@@ -198,7 +198,7 @@ Then the JDT plugin would contribute the menu items to search, where the menuCon
                </visibleWhen>
             </menu>
          </menuContribution>
-         <menuContribution locationURI="menu:org.eclipse.search.menu?after=occurencesActionsGroup">
+         <menuContribution locationURI="menu:org.eclipse.search.menu?after=occurrencesActionsGroup">
             <command commandId="org.eclipse.jdt.ui.edit.text.java.search.occurrences.in.file.quickMenu"
                      label="%occurrencesSubMenu.label">
                <visibleWhen>
@@ -255,7 +255,7 @@ The API can be used to contribute to the main menu bar:
                    search.add(new GroupMarker("dialogGroup"));
                    search.add(new Separator("fileSearchContextMenuActionsGroup"));
                    search.add(new Separator("contextMenuActionsGroup"));
-                   search.add(new Separator("occurencesActionsGroup"));
+                   search.add(new Separator("occurrencesActionsGroup"));
                    search.add(new Separator("extraSearchGroup"));
     
                    additions.add(search);
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/TextAndDialogCellEditor.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/TextAndDialogCellEditor.java
index b81b9e62608..89a42103030 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/TextAndDialogCellEditor.java	
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/TextAndDialogCellEditor.java	
@@ -66,7 +66,7 @@ public void focusLost(FocusEvent event) {
 		textField.addKeyListener(new KeyAdapter() {
 			@Override
 			public void keyPressed(KeyEvent event) {
-				keyReleaseOccured(event);
+				keyReleaseOccurred(event);
 			}
 		});
 
@@ -74,12 +74,12 @@ public void keyPressed(KeyEvent event) {
 	}
 
 	@Override
-	protected void keyReleaseOccured(KeyEvent keyEvent) {
+	protected void keyReleaseOccurred(KeyEvent keyEvent) {
 		if (keyEvent.keyCode == SWT.CR || keyEvent.keyCode == SWT.KEYPAD_CR) {
 			// Enter key
 			setValueToModel();
 		}
-		super.keyReleaseOccured(keyEvent);
+		super.keyReleaseOccurred(keyEvent);
 	}
 
 	protected void setValueToModel() {
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/DifferentRealmsBindingTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/DifferentRealmsBindingTest.java
index 966080467f4..e57ff1036cd 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/DifferentRealmsBindingTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/DifferentRealmsBindingTest.java
@@ -121,21 +121,21 @@ public void testBindingCanBeCreatedOutsideOfValidationRealm() throws Exception {
 
 		targetRealm.unblock();
 
-		AtomicReference<Exception> exceptionOccured = new AtomicReference<>();
+		AtomicReference<Exception> exceptionOccurred = new AtomicReference<>();
 		Thread t = new Thread() {
 			@Override
 			public void run() {
 				try {
 					dbc.bindSet(target, model);
 				} catch (Exception e) {
-					exceptionOccured.set(e);
+					exceptionOccurred.set(e);
 				}
 			}
 		};
 		t.start();
 		t.join(1000);
 
-		assertNull(exceptionOccured.get());
+		assertNull(exceptionOccurred.get());
 	}
 
 	@Test
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextMultiCaretSelectionCommandsTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextMultiCaretSelectionCommandsTest.java
index 85b43634ae8..900c2de401d 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextMultiCaretSelectionCommandsTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextMultiCaretSelectionCommandsTest.java
@@ -112,7 +112,7 @@ public void testMultiSelectionDown_withFirstIdentifierSelected_addsIdenticalIden
 	}
 
 	@Test
-	public void testMultiSelectionDown_withSecondIdentifierSelectedIdentifier_addsNextOccurenceToSelection()
+	public void testMultiSelectionDown_withSecondIdentifierSelectedIdentifier_addsNextOccurrenceToSelection()
 			throws Exception {
 		setSelection(new IRegion[] { new Region(8, 6) });
 		assertEquals(14, widget.getCaretOffset());
@@ -236,7 +236,7 @@ public void testMultiSelectionDown_withCaretAtEndOfDocument_selectsFullIdentifie
 	}
 
 	@Test
-	public void testAddAllMatches_withSingleSelection_selectsAllOccurences() throws Exception {
+	public void testAddAllMatches_withSingleSelection_selectsAllOccurrences() throws Exception {
 		setSelection(new IRegion[] { new Region(0, 7) });
 		assertEquals(7, widget.getCaretOffset());
 
@@ -248,7 +248,7 @@ public void testAddAllMatches_withSingleSelection_selectsAllOccurences() throws
 	}
 
 	@Test
-	public void testAddAllMatches_withDoubleSelectionOfSameText_selectsAllOccurences() throws Exception {
+	public void testAddAllMatches_withDoubleSelectionOfSameText_selectsAllOccurrences() throws Exception {
 		setSelection(new IRegion[] { new Region(0, 7), new Region(L1_LEN, 7) });
 		assertEquals(7, widget.getCaretOffset());
 
@@ -271,7 +271,7 @@ public void testAddAllMatches_withDoubleSelectionOfDifferentTexts_doesNotChangeS
 	}
 
 	@Test
-	public void testAddAllMatches_withCaretInIdentifier_selectsAllOccurencesOfIdentifier() throws Exception {
+	public void testAddAllMatches_withCaretInIdentifier_selectsAllOccurrencesOfIdentifier() throws Exception {
 		setSelection(new IRegion[] { new Region(2, 0) });
 		assertEquals(2, widget.getCaretOffset());
 
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/OpenClosePerspectiveTest.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/OpenClosePerspectiveTest.java
index 358c0d0fa75..180ea150cfb 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/OpenClosePerspectiveTest.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/OpenClosePerspectiveTest.java
@@ -70,7 +70,7 @@ public void test() throws Throwable {
 				.findPerspectiveWithId(id);
 
 		// Don't fail if we reference an unknown perspective ID. This can be
-		// a normal occurrance since the test suites reference JDT perspectives, which
+		// a normal occurrence since the test suites reference JDT perspectives, which
 		// might not exist.
 		if (perspective1 == null) {
 			System.out.println("Unknown perspective id: " + id);
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/PerspectiveSwitchTest.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/PerspectiveSwitchTest.java
index f7045d5372c..13dd32e2580 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/PerspectiveSwitchTest.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/PerspectiveSwitchTest.java
@@ -76,7 +76,7 @@ public void test() throws CoreException, WorkbenchException {
 		final IPerspectiveDescriptor perspective2 = registry.findPerspectiveWithId(id2);
 
 		// Don't fail if we reference an unknown perspective ID. This can be
-		// a normal occurrance since the test suites reference JDT perspectives, which
+		// a normal occurrence since the test suites reference JDT perspectives, which
 		// might not exist. Just skip the test.
 		if (perspective1 == null) {
 			System.out.println("Unknown perspective ID: " + id1);
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchTest.java
index 020ec193879..e032555c496 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchTest.java	
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchTest.java	
@@ -162,14 +162,14 @@ public void XXXtestOpenWorkbenchWindow() throws Throwable {
 		}
 
 		// open a window with invalid perspective. WorkbenchException is expected.
-		boolean exceptionOccured = false;
+		boolean exceptionOccurred = false;
 		try {
 			win = fWorkbench.openWorkbenchWindow("afdasfdasf", getPageInput());
 		} catch (WorkbenchException ex) {
-			exceptionOccured = true;
+			exceptionOccurred = true;
 		}
 
-		assertEquals(exceptionOccured, true);
+		assertEquals(exceptionOccurred, true);
 	}
 
 	/**
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorViewerTest.java
index bbf46661ab1..d7dd5bf011a 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorViewerTest.java	
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorViewerTest.java	
@@ -113,7 +113,7 @@ public void testForeground() throws PartInitException, CoreException,
 	}
 
 	/**
-	 * Read and dispatch while updates are occuring
+	 * Read and dispatch while updates are occurring
 	 */
 	private void dispatchDuringUpdates(DecoratorTestPart view) {
 		view.readAndDispatchForUpdates();
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/MenuBuilder.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/MenuBuilder.java
index 19a896b7626..e985fe60190 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/MenuBuilder.java	
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/MenuBuilder.java	
@@ -153,7 +153,7 @@ public void createContributionItems(IServiceLocator menuService,
 				search.add(new GroupMarker("dialogGroup"));
 				search.add(new Separator("fileSearchContextMenuActionsGroup"));
 				search.add(new Separator("contextMenuActionsGroup"));
-				search.add(new Separator("occurencesActionsGroup"));
+				search.add(new Separator("occurrencesActionsGroup"));
 				search.add(new Separator("extraSearchGroup"));
 
 				additions.addContributionItem(search, null);

From 50aa85b34c5b5460c0576356e50226dd706e81e9 Mon Sep 17 00:00:00 2001
From: Eclipse Platform Bot <platform-bot@eclipse.org>
Date: Wed, 2 Apr 2025 01:03:08 +0000
Subject: [PATCH 2/2] Version bump(s) for 4.36 stream

---
 bundles/org.eclipse.search.core/META-INF/MANIFEST.MF        | 2 +-
 bundles/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF   | 2 +-
 bundles/org.eclipse.ui.themes/META-INF/MANIFEST.MF          | 2 +-
 tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.search.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.search.core/META-INF/MANIFEST.MF
index b7ae62f251e..7e060fe5eae 100644
--- a/bundles/org.eclipse.search.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.search.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.search.core;singleton:=true
-Bundle-Version: 3.16.400.qualifier
+Bundle-Version: 3.16.500.qualifier
 Bundle-Activator: org.eclipse.search.internal.core.SearchCorePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
diff --git a/bundles/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF
index 31a9a9c320a..6f5dd6b08a1 100644
--- a/bundles/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.ui.genericeditor;singleton:=true
-Bundle-Version: 1.3.500.qualifier
+Bundle-Version: 1.3.600.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui.workbench.texteditor;bundle-version="3.10.0",
diff --git a/bundles/org.eclipse.ui.themes/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.themes/META-INF/MANIFEST.MF
index 59abbfd238a..11d118fd4c9 100644
--- a/bundles/org.eclipse.ui.themes/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.ui.themes/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.ui.themes;singleton:=true
-Bundle-Version: 1.2.2700.qualifier
+Bundle-Version: 1.2.2800.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.e4.ui.css.swt.theme
diff --git a/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF
index c42e6518802..9d958c34c28 100644
--- a/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Performance Plug-in
 Bundle-SymbolicName: org.eclipse.ui.tests.performance;singleton:=true
-Bundle-Version: 1.6.400.qualifier
+Bundle-Version: 1.6.500.qualifier
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.tests.harness,