Skip to content

Use ILog.of(Class) in four text-related bundles #3908

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.

Sign up for GitHub

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

Merged
vogella merged 1 commit into from
Apr 20, 2026
Merged

Use ILog.of(Class) in four text-related bundles #3908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions .../eclipse/ui/internal/editors/text/codemining/annotation/AnnotationCodeMiningProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@
import org.eclipse.swt.events.MouseEvent;

import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;

import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.util.IPropertyChangeListener;
Expand All @@ -56,10 +55,6 @@
import org.eclipse.jface.text.source.ISourceViewerExtension3;
import org.eclipse.jface.text.source.ISourceViewerExtension5;

import org.eclipse.ui.internal.editors.text.EditorsPlugin;

import org.eclipse.ui.editors.text.EditorsUI;

/**
* Shows <i>info</i>, <i>warning</i>, and <i>error</i> Annotations as line header code minings.
*
Expand Down Expand Up @@ -320,7 +315,7 @@ private List<AbstractCodeMining> createCodeMinings(Stream<Annotation> annotation
final String message= quickAssistAssistant.showPossibleQuickAssists();

if (message != null) {
EditorsPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, EditorsUI.PLUGIN_ID, message));
ILog.of(AnnotationCodeMiningProvider.class).error(message);
}

});
Expand Down
12 changes: 4 additions & 8 deletions ...rs/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyLinesProviderDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;

import org.eclipse.jface.text.source.ISourceViewer;

import org.eclipse.ui.internal.editors.text.EditorsPlugin;

import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.ui.texteditor.stickyscroll.IStickyLinesProvider;

Expand Down Expand Up @@ -122,13 +121,11 @@ public IStickyLinesProvider createStickyLinesProvider() {
} else {
String message= "Invalid extension to stickyLinesProvider. Must extends IStickyLinesProvider: " //$NON-NLS-1$
+ getId();
EditorsPlugin.getDefault().getLog()
.log(new Status(IStatus.ERROR, EditorsUI.PLUGIN_ID, message));
ILog.of(StickyLinesProviderDescriptor.class).error(message);
return null;
}
} catch (CoreException e) {
EditorsPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, EditorsUI.PLUGIN_ID,
"Error while creating stickyLinesProvider: " + getId(), e)); //$NON-NLS-1$
ILog.of(StickyLinesProviderDescriptor.class).error("Error while creating stickyLinesProvider: " + getId(), e); //$NON-NLS-1$
return null;
}
}
Expand All @@ -154,8 +151,7 @@ public boolean matches(ISourceViewer viewer, ITextEditor editor) {
try {
return enabledWhen.evaluate(context) == EvaluationResult.TRUE;
} catch (CoreException e) {
EditorsPlugin.getDefault().getLog().log(
new Status(IStatus.ERROR, EditorsUI.PLUGIN_ID, "Error while 'enabledWhen' evaluation", e)); //$NON-NLS-1$
ILog.of(StickyLinesProviderDescriptor.class).error("Error while 'enabledWhen' evaluation", e); //$NON-NLS-1$
return false;
}
}
Expand Down
5 changes: 2 additions & 3 deletions ...tors/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyLinesProviderRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,13 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;

import org.eclipse.jface.text.source.ISourceViewer;

import org.eclipse.ui.internal.editors.text.EditorsPlugin;

import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.ui.texteditor.stickyscroll.IStickyLinesProvider;

Expand Down Expand Up @@ -109,7 +108,7 @@ public synchronized void reloadExtensions() {
StickyLinesProviderDescriptor descriptor = descriptorFactory.create(element);
descriptors.add(descriptor);
} catch (CoreException e) {
EditorsPlugin.getDefault().getLog()
ILog.of(StickyLinesProviderRegistry.class)
.log(new Status(IStatus.ERROR, element.getNamespaceIdentifier(), e.getMessage()));
}
}
Expand Down
6 changes: 2 additions & 4 deletions ....ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/AutoEditStrategyRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@
import java.util.stream.Collectors;

import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.jface.text.IAutoEditStrategy;
import org.eclipse.jface.text.source.ISourceViewer;
Expand Down Expand Up @@ -83,8 +82,7 @@ private void sync() {
try {
this.extensions.put(extension, new GenericContentTypeRelatedExtension<>(extension));
} catch (Exception ex) {
GenericEditorPlugin.getDefault().getLog()
.log(new Status(IStatus.ERROR, GenericEditorPlugin.BUNDLE_ID, ex.getMessage(), ex));
ILog.of(AutoEditStrategyRegistry.class).error(ex.getMessage(), ex);
}
}
}
Expand Down
6 changes: 2 additions & 4 deletions ...genericeditor/src/org/eclipse/ui/internal/genericeditor/CharacterPairMatcherRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@
import java.util.stream.Collectors;

import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.jface.text.source.ICharacterPairMatcher;
import org.eclipse.jface.text.source.ISourceViewer;
Expand Down Expand Up @@ -79,8 +78,7 @@ private void sync() {
this.extensions.put(extension,
new GenericContentTypeRelatedExtension<>(extension));
} catch (Exception ex) {
GenericEditorPlugin.getDefault().getLog()
.log(new Status(IStatus.ERROR, GenericEditorPlugin.BUNDLE_ID, ex.getMessage(), ex));
ILog.of(CharacterPairMatcherRegistry.class).error(ex.getMessage(), ex);
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions ...nericeditor/src/org/eclipse/ui/internal/genericeditor/ContentAssistProcessorRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@

import org.eclipse.core.filebuffers.FileBuffers;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.core.runtime.content.IContentTypeManager;
import org.eclipse.jface.text.ITextViewer;
Expand Down Expand Up @@ -166,7 +165,7 @@ private void sync() {
try {
this.extensions.put(extension, new GenericContentTypeRelatedExtension<>(extension));
} catch (Exception ex) {
GenericEditorPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, GenericEditorPlugin.BUNDLE_ID, ex.getMessage(), ex));
ILog.of(ContentAssistProcessorRegistry.class).error(ex.getMessage(), ex);
}
}
}
Expand Down
6 changes: 2 additions & 4 deletions ...itor/src/org/eclipse/ui/internal/genericeditor/ExtensionBasedTextViewerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,9 @@
import org.eclipse.core.runtime.Adapters;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.AbstractReusableInformationControlCreator;
Expand Down Expand Up @@ -127,8 +126,7 @@ public Set<IContentType> getContentTypes(IDocument documentParam) {
this.resolvedContentTypes.add(contentType);
}
} catch (CoreException ex) {
GenericEditorPlugin.getDefault().getLog()
.log(new Status(IStatus.ERROR, GenericEditorPlugin.BUNDLE_ID, ex.getMessage(), ex));
ILog.of(ExtensionBasedTextViewerConfiguration.class).error(ex.getMessage(), ex);
}
}
String fileName = getCurrentFileName(documentParam);
Expand Down
7 changes: 3 additions & 4 deletions ...ceditor/src/org/eclipse/ui/internal/genericeditor/GenericContentTypeRelatedExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.eclipse.core.expressions.IEvaluationContext;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
Expand Down Expand Up @@ -63,8 +64,7 @@ public <E> E createDelegateWithoutTypeCheck() {
try {
return (E) extension.createExecutableExtension(CLASS_ATTRIBUTE);
} catch (CoreException e) {
GenericEditorPlugin.getDefault().getLog()
.log(new Status(IStatus.ERROR, GenericEditorPlugin.BUNDLE_ID, e.getMessage(), e));
ILog.of(GenericContentTypeRelatedExtension.class).error(e.getMessage(), e);
}
return null;
}
Expand Down Expand Up @@ -121,8 +121,7 @@ public boolean matches(ISourceViewer viewer, ITextEditor editor) {
try {
return enabledWhen.evaluate(context) == EvaluationResult.TRUE;
} catch (CoreException e) {
GenericEditorPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, GenericEditorPlugin.BUNDLE_ID,
"Error while 'enabledWhen' evaluation", e)); //$NON-NLS-1$
ILog.of(GenericContentTypeRelatedExtension.class).error("Error while 'enabledWhen' evaluation", e); //$NON-NLS-1$
return false;
}
}
Expand Down
6 changes: 2 additions & 4 deletions ...riceditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorWithContentTypeIcon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@
package org.eclipse.ui.internal.genericeditor;

import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.IEditorDescriptor;
import org.eclipse.ui.IEditorMatchingStrategy;
Expand Down Expand Up @@ -49,8 +48,7 @@ public ImageDescriptor getImageDescriptor() {
return image;
}
} catch (Exception e) {
GenericEditorPlugin.getDefault().getLog()
.log(new Status(IStatus.ERROR, GenericEditorPlugin.BUNDLE_ID, e.getMessage(), e));
ILog.of(GenericEditorWithContentTypeIcon.class).error(e.getMessage(), e);
}
return this.editorDescriptor.getImageDescriptor();
}
Expand Down
5 changes: 2 additions & 3 deletions ...org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/IconsRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@
import java.util.Set;

import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ResourceLocator;
Expand Down Expand Up @@ -68,7 +67,7 @@ private void sync() {
ResourceLocator.imageDescriptorFromBundle(extension.getNamespaceIdentifier(), icon).ifPresent(imageDescriptor -> this.extensions.put(contentType, imageDescriptor));
}
} catch (Exception ex) {
GenericEditorPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, GenericEditorPlugin.BUNDLE_ID, ex.getMessage(), ex));
ILog.of(IconsRegistry.class).error(ex.getMessage(), ex);
}
}

Expand Down
5 changes: 2 additions & 3 deletions ...nericeditor/src/org/eclipse/ui/internal/genericeditor/PresentationReconcilerRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@
import java.util.stream.Collectors;

import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.jface.text.presentation.IPresentationReconciler;
import org.eclipse.jface.text.source.ISourceViewer;
Expand Down Expand Up @@ -78,7 +77,7 @@ private void sync() {
try {
this.extensions.put(extension, new GenericContentTypeRelatedExtension<>(extension));
} catch (Exception ex) {
GenericEditorPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, GenericEditorPlugin.BUNDLE_ID, ex.getMessage(), ex));
ILog.of(PresentationReconcilerRegistry.class).error(ex.getMessage(), ex);
}
}
}
Expand Down
6 changes: 2 additions & 4 deletions ...genericeditor/src/org/eclipse/ui/internal/genericeditor/QuickAssistProcessorRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@
import java.util.stream.Collectors;

import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.jface.text.quickassist.IQuickAssistProcessor;
import org.eclipse.jface.text.source.ISourceViewer;
Expand Down Expand Up @@ -71,8 +70,7 @@ private void sync() {
this.extensions.put(extension,
new GenericContentTypeRelatedExtension<>(extension));
} catch (Exception ex) {
GenericEditorPlugin.getDefault().getLog()
.log(new Status(IStatus.ERROR, GenericEditorPlugin.BUNDLE_ID, ex.getMessage(), ex));
ILog.of(QuickAssistProcessorRegistry.class).error(ex.getMessage(), ex);
}
}
}
Expand Down
12 changes: 4 additions & 8 deletions ...clipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ReconcilerRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@
import java.util.stream.Collectors;

import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.jface.text.reconciler.IReconciler;
import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
Expand Down Expand Up @@ -157,8 +156,7 @@ private void sync() {
try {
this.extensions.put(extension, new GenericContentTypeRelatedExtension<>(extension));
} catch (Exception ex) {
GenericEditorPlugin.getDefault().getLog()
.log(new Status(IStatus.ERROR, GenericEditorPlugin.BUNDLE_ID, ex.getMessage(), ex));
ILog.of(ReconcilerRegistry.class).error(ex.getMessage(), ex);
}
}
}
Expand All @@ -177,8 +175,7 @@ private void syncHighlight() {
try {
this.highlightExtensions.put(extension, new GenericContentTypeRelatedExtension<>(extension));
} catch (Exception ex) {
GenericEditorPlugin.getDefault().getLog()
.log(new Status(IStatus.ERROR, GenericEditorPlugin.BUNDLE_ID, ex.getMessage(), ex));
ILog.of(ReconcilerRegistry.class).error(ex.getMessage(), ex);
}
}
}
Expand All @@ -197,8 +194,7 @@ private void syncFolding() {
try {
this.foldingExtensions.put(extension, new GenericContentTypeRelatedExtension<>(extension));
} catch (Exception ex) {
GenericEditorPlugin.getDefault().getLog()
.log(new Status(IStatus.ERROR, GenericEditorPlugin.BUNDLE_ID, ex.getMessage(), ex));
ILog.of(ReconcilerRegistry.class).error(ex.getMessage(), ex);
}
}
}
Expand Down
6 changes: 2 additions & 4 deletions ...ericeditor/src/org/eclipse/ui/internal/genericeditor/TextDoubleClickStrategyRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@
import java.util.Set;

import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.jface.text.ITextDoubleClickStrategy;
import org.eclipse.jface.text.source.ISourceViewer;
Expand Down Expand Up @@ -72,8 +71,7 @@ private void sync() {
this.extensions.put(extension,
new GenericContentTypeRelatedExtension<>(extension));
} catch (Exception ex) {
GenericEditorPlugin.getDefault().getLog()
.log(new Status(IStatus.ERROR, GenericEditorPlugin.BUNDLE_ID, ex.getMessage(), ex));
ILog.of(TextDoubleClickStrategyRegistry.class).error(ex.getMessage(), ex);
}
}
}
Expand Down
6 changes: 2 additions & 4 deletions ....genericeditor/src/org/eclipse/ui/internal/genericeditor/compare/GenericEditorViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@
import org.eclipse.core.resources.IEncodedStorage;
import org.eclipse.core.resources.IStorage;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.PlatformObject;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceResources;
Expand Down Expand Up @@ -96,8 +95,7 @@ public void setInput(Object input) {
try {
documentProvider.connect(editorInput);
} catch (CoreException ex) {
GenericEditorPlugin.getDefault().getLog()
.log(new Status(IStatus.ERROR, GenericEditorPlugin.BUNDLE_ID, ex.getMessage(), ex));
ILog.of(GenericEditorViewer.class).error(ex.getMessage(), ex);
}

sourceViewer.setDocument(documentProvider.getDocument(editorInput));
Expand Down
Loading
Loading