Skip to content

misc: fix spelling #2885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
* <li><code>CheckboxCellEditor</code> - boolean valued checkbox</li>
* <li><code>DialogCellEditor</code> - value from arbitrary dialog</li>
* </ul>
*/

Check warning on line 45 in bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CellEditor.java

View check run for this annotation

Jenkins - Eclipse Platform / Compiler

Other

ERROR: The method org.eclipse.jface.viewers.CellEditor.keyReleaseOccured(KeyEvent) has been removed

Check warning on line 45 in bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CellEditor.java

View check run for this annotation

Jenkins - Eclipse Platform / API Tools

REMOVED

ERROR: The method org.eclipse.jface.viewers.CellEditor.keyReleaseOccured(KeyEvent) has been removed
public abstract class CellEditor {

/**
Expand Down Expand Up @@ -691,8 +691,8 @@
*
* @param keyEvent
* the key event
*/

Check warning on line 694 in bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CellEditor.java

View check run for this annotation

Jenkins - Eclipse Platform / Compiler

Other

ERROR: Missing @SInCE tag on keyReleaseOccurred(KeyEvent)

Check warning on line 694 in bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CellEditor.java

View check run for this annotation

Jenkins - Eclipse Platform / API Tools

MISSING_SINCE_TAGS

ERROR: Missing @SInCE tag on keyReleaseOccurred(KeyEvent)
protected void keyReleaseOccured(KeyEvent keyEvent) {
protected void keyReleaseOccurred(KeyEvent keyEvent) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately this is API so it can not be changed as every downstream project will break . Please revert this part.

if (keyEvent.character == '\u001b') { // Escape character
fireCancelEditor();
} else if (keyEvent.character == '\r') { // Return key
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
});

Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
* {@link ComboBoxCellEditor} it wraps the underlying {@link CCombo} using a
* {@link ComboViewer}
* @since 3.4
*/

Check warning on line 40 in bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxViewerCellEditor.java

View check run for this annotation

Jenkins - Eclipse Platform / Compiler

Other

ERROR: The method org.eclipse.jface.viewers.ComboBoxViewerCellEditor.keyReleaseOccured(KeyEvent) has been removed

Check warning on line 40 in bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxViewerCellEditor.java

View check run for this annotation

Jenkins - Eclipse Platform / API Tools

REMOVED

ERROR: The method org.eclipse.jface.viewers.ComboBoxViewerCellEditor.keyReleaseOccured(KeyEvent) has been removed
public class ComboBoxViewerCellEditor extends AbstractComboBoxCellEditor {

/**
Expand Down Expand Up @@ -86,7 +86,7 @@
// hook key pressed - see PR 14201
@Override
public void keyPressed(KeyEvent e) {
keyReleaseOccured(e);
keyReleaseOccurred(e);
}
});

Expand Down Expand Up @@ -260,7 +260,7 @@
}

@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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* <p>
* This class may be instantiated or subclassed.
* </p>
*/

Check warning on line 43 in bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TextCellEditor.java

View check run for this annotation

Jenkins - Eclipse Platform / Compiler

Other

ERROR: The method org.eclipse.jface.viewers.TextCellEditor.editOccured(ModifyEvent) has been removed

Check warning on line 43 in bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TextCellEditor.java

View check run for this annotation

Jenkins - Eclipse Platform / Compiler

Other

ERROR: The method org.eclipse.jface.viewers.TextCellEditor.keyReleaseOccured(KeyEvent) has been removed

Check warning on line 43 in bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TextCellEditor.java

View check run for this annotation

Jenkins - Eclipse Platform / API Tools

REMOVED

ERROR: The method org.eclipse.jface.viewers.TextCellEditor.editOccured(ModifyEvent) has been removed

Check warning on line 43 in bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TextCellEditor.java

View check run for this annotation

Jenkins - Eclipse Platform / API Tools

REMOVED

ERROR: The method org.eclipse.jface.viewers.TextCellEditor.keyReleaseOccured(KeyEvent) has been removed
public class TextCellEditor extends CellEditor {

/**
Expand Down Expand Up @@ -148,7 +148,7 @@
// 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
Expand Down Expand Up @@ -236,8 +236,8 @@
* may extend or reimplement.
*
* @param e the SWT modify event
*/

Check warning on line 239 in bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TextCellEditor.java

View check run for this annotation

Jenkins - Eclipse Platform / Compiler

Other

ERROR: Missing @SInCE tag on editOccurred(ModifyEvent)

Check warning on line 239 in bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TextCellEditor.java

View check run for this annotation

Jenkins - Eclipse Platform / API Tools

MISSING_SINCE_TAGS

ERROR: Missing @SInCE tag on editOccurred(ModifyEvent)
protected void editOccured(ModifyEvent e) {
protected void editOccurred(ModifyEvent e) {
String value = text.getText();
if (value == null) {
value = "";//$NON-NLS-1$
Expand Down Expand Up @@ -268,7 +268,7 @@
*/
private ModifyListener getModifyListener() {
if (modifyListener == null) {
modifyListener = this::editOccured;
modifyListener = this::editOccurred;
}
return modifyListener;
}
Expand All @@ -282,7 +282,7 @@
* @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();
}
Expand Down Expand Up @@ -385,7 +385,7 @@
* @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
Expand All @@ -398,12 +398,12 @@
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);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.search.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand All @@ -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) {
Expand Down Expand Up @@ -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;
}


Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.search/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.text.quicksearch/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.ui.genericeditor/plugin.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.ui.themes/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
6 changes: 3 additions & 3 deletions docs/Menu_Contributions/Search_Menu.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,20 +66,20 @@ public void focusLost(FocusEvent event) {
textField.addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent event) {
keyReleaseOccured(event);
keyReleaseOccurred(event);
}
});

return textField;
}

@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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading