From ff4341922c85b0d1cacfdc8000b9656e7753e6bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= Date: Mon, 26 Jun 2023 18:23:04 +0200 Subject: [PATCH] Use new ILog.of(...) method instead of Platform.getLog(...) --- org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF | 2 +- .../core/filebuffers/tests/FileBufferFunctions.java | 2 +- org.eclipse.core.filebuffers/META-INF/MANIFEST.MF | 2 +- .../core/internal/filebuffers/ExtensionsRegistry.java | 3 ++- .../core/internal/filebuffers/ResourceFileBuffer.java | 6 +++--- .../filebuffers/ResourceTextFileBufferManager.java | 7 ++++--- .../core/internal/filebuffers/TextFileBufferManager.java | 7 ++++--- org.eclipse.jface.text.tests/META-INF/MANIFEST.MF | 4 ++-- .../tests/codemining/CodeMiningProjectionViewerTest.java | 2 +- org.eclipse.jface.text/META-INF/MANIFEST.MF | 2 +- .../jface/internal/text/codemining/CodeMiningManager.java | 2 +- .../org/eclipse/jface/text/TextViewerHoverManager.java | 2 +- .../jface/text/contentassist/CompletionProposalPopup.java | 2 +- .../jface/text/contentassist/ContentAssistant.java | 3 ++- org.eclipse.text/META-INF/MANIFEST.MF | 4 ++-- .../org/eclipse/text/templates/TemplateReaderWriter.java | 2 +- org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF | 2 +- .../ui/editors/tests/FileDocumentProviderTest.java | 2 +- .../ui/editors/tests/MarkerAnnotationOrderTest.java | 4 ++-- .../org/eclipse/ui/editors/tests/StatusEditorTest.java | 2 +- org.eclipse.ui.editors/META-INF/MANIFEST.MF | 4 ++-- .../eclipse/ui/editors/text/StorageDocumentProvider.java | 2 +- .../eclipse/ui/editors/text/TextFileDocumentProvider.java | 2 +- .../ui/texteditor/AbstractMarkerAnnotationModel.java | 2 +- .../src/org/eclipse/ui/texteditor/AddMarkerAction.java | 2 +- .../eclipse/ui/texteditor/DocumentProviderRegistry.java | 2 +- .../src/org/eclipse/ui/texteditor/MarkerRulerAction.java | 4 ++-- .../src/org/eclipse/ui/texteditor/MarkerUtilities.java | 2 +- .../eclipse/ui/texteditor/SelectMarkerRulerAction.java | 4 ++-- org.eclipse.ui.genericeditor.tests/META-INF/MANIFEST.MF | 4 ++-- .../eclipse/ui/genericeditor/tests/CompletionTest.java | 2 +- org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF | 2 +- .../src/org/eclipse/ui/texteditor/AbstractTextEditor.java | 8 ++++---- 33 files changed, 53 insertions(+), 49 deletions(-) diff --git a/org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF b/org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF index 56d7ae071..49e6edf8d 100644 --- a/org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-Vendor: %Plugin.providerName Bundle-Localization: plugin Export-Package: org.eclipse.core.filebuffers.tests;x-internal:=true Require-Bundle: - org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.28.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)", org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";resolution:=optional, org.eclipse.core.filebuffers;bundle-version="[3.5.0,4.0.0)", diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java index 729d9b4b1..2cd1a8c0f 100644 --- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java +++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java @@ -109,7 +109,7 @@ public static class TestFailReporter extends TestWatcher { private static final String BUNDLE_ID= "org.eclipse.core.filebuffers.tests"; - ILog log= Platform.getLog(Platform.getBundle(BUNDLE_ID)); + ILog log= ILog.of(Platform.getBundle(BUNDLE_ID)); @Override protected void failed(Throwable e, Description description) { diff --git a/org.eclipse.core.filebuffers/META-INF/MANIFEST.MF b/org.eclipse.core.filebuffers/META-INF/MANIFEST.MF index 444c4db1b..c140e20f2 100644 --- a/org.eclipse.core.filebuffers/META-INF/MANIFEST.MF +++ b/org.eclipse.core.filebuffers/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Export-Package: org.eclipse.core.filebuffers.manipulation, org.eclipse.core.internal.filebuffers;x-internal:=true Require-Bundle: - org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.28.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";resolution:=optional, org.eclipse.text;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)" diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ExtensionsRegistry.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ExtensionsRegistry.java index 6a9c46085..22fdbfb8a 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ExtensionsRegistry.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ExtensionsRegistry.java @@ -26,6 +26,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionPoint; +import org.eclipse.core.runtime.ILog; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; @@ -175,7 +176,7 @@ private void readContentType(String attributeName, IConfigurationElement element * @param status the status to log */ private void log(IStatus status) { - Platform.getLog(ExtensionsRegistry.class).log(status); + ILog.of(ExtensionsRegistry.class).log(status); } /** diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java index ca6eaa482..641f0f774 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java @@ -19,12 +19,12 @@ import org.eclipse.core.filesystem.IFileInfo; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.ILog; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.jobs.ISchedulingRule; @@ -85,7 +85,7 @@ public void run() { try { execute(); } catch (Exception x) { - Platform.getLog(ResourceFileBuffer.class).error("Exception when synchronizing", x); //$NON-NLS-1$ + ILog.of(ResourceFileBuffer.class).error("Exception when synchronizing", x); //$NON-NLS-1$ fManager.fireStateChangeFailed(ResourceFileBuffer.this); } } @@ -451,7 +451,7 @@ protected void refreshFile(IProgressMonitor monitor) { * @param exception the exception to be logged */ protected void handleCoreException(CoreException exception) { - Platform.getLog(ResourceFileBuffer.class).log(exception.getStatus()); + ILog.of(ResourceFileBuffer.class).log(exception.getStatus()); } @Override diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBufferManager.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBufferManager.java index c4822424f..20cd32d82 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBufferManager.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBufferManager.java @@ -18,6 +18,7 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.ILog; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.ISafeRunnable; @@ -152,13 +153,13 @@ public void run() throws Exception { if (document.getDocumentPartitioner() != null) { String message= NLSUtility.format(FileBuffersMessages.TextFileBufferManager_warning_documentSetupInstallsDefaultPartitioner, participant.getClass()); IStatus status= new Status(IStatus.WARNING, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, message, null); - Platform.getLog(ResourceTextFileBufferManager.class).log(status); + ILog.of(ResourceTextFileBufferManager.class).log(status); } } @Override public void handleException(Throwable t) { IStatus status= new Status(IStatus.ERROR, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, FileBuffersMessages.TextFileBufferManager_error_documentSetupFailed, t); - Platform.getLog(ResourceTextFileBufferManager.class).log(status); + ILog.of(ResourceTextFileBufferManager.class).log(status); } }; SafeRunner.run(runnable); @@ -189,7 +190,7 @@ public void run() throws Exception { @Override public void handleException(Throwable t) { IStatus status= new Status(IStatus.ERROR, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, FileBuffersMessages.TextFileBufferManager_error_documentFactoryFailed, t); - Platform.getLog(ResourceTextFileBufferManager.class).log(status); + ILog.of(ResourceTextFileBufferManager.class).log(status); } }; SafeRunner.run(runnable); diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java index 25b2af215..d1bf608f1 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java @@ -30,6 +30,7 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.ILog; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.ISafeRunnable; @@ -463,13 +464,13 @@ public void run() throws Exception { if (document.getDocumentPartitioner() != null) { String message= NLSUtility.format(FileBuffersMessages.TextFileBufferManager_warning_documentSetupInstallsDefaultPartitioner, participant.getClass()); IStatus status= new Status(IStatus.WARNING, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, message, null); - Platform.getLog(ResourceTextFileBufferManager.class).log(status); + ILog.of(ResourceTextFileBufferManager.class).log(status); } } @Override public void handleException(Throwable t) { IStatus status= new Status(IStatus.ERROR, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, FileBuffersMessages.TextFileBufferManager_error_documentSetupFailed, t); - Platform.getLog(ResourceTextFileBufferManager.class).log(status); + ILog.of(ResourceTextFileBufferManager.class).log(status); } }; SafeRunner.run(runnable); @@ -502,7 +503,7 @@ public void run() throws Exception { @Override public void handleException(Throwable t) { IStatus status= new Status(IStatus.ERROR, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, FileBuffersMessages.TextFileBufferManager_error_documentFactoryFailed, t); - Platform.getLog(ResourceTextFileBufferManager.class).log(status); + ILog.of(ResourceTextFileBufferManager.class).log(status); } }; SafeRunner.run(runnable); diff --git a/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF b/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF index 1dbde5216..00fc63af1 100644 --- a/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.jface.text.tests -Bundle-Version: 3.13.100.qualifier +Bundle-Version: 3.13.200.qualifier Bundle-Vendor: %Plugin.providerName Bundle-Localization: plugin Export-Package: @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.jface;bundle-version="[3.5.0,4.0.0)", org.junit;bundle-version="4.12.0", org.eclipse.text.tests;bundle-version="[3.5.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.28.0,4.0.0)", org.eclipse.ui.workbench.texteditor, org.eclipse.test.performance;bundle-version="3.13.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningProjectionViewerTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningProjectionViewerTest.java index fe347c47d..09708f16b 100644 --- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningProjectionViewerTest.java +++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningProjectionViewerTest.java @@ -167,7 +167,7 @@ public void testCollapse() throws Exception { logError.set(status); }; if (bundle != null && bundle.getState() == Bundle.ACTIVE) { - log = Platform.getLog(bundle); + log = ILog.of(bundle); log.addLogListener(logListener); } try { diff --git a/org.eclipse.jface.text/META-INF/MANIFEST.MF b/org.eclipse.jface.text/META-INF/MANIFEST.MF index e128d960e..c245f5836 100644 --- a/org.eclipse.jface.text/META-INF/MANIFEST.MF +++ b/org.eclipse.jface.text/META-INF/MANIFEST.MF @@ -33,7 +33,7 @@ Export-Package: org.eclipse.jface.text.templates, org.eclipse.jface.text.templates.persistence Require-Bundle: - org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.28.0,4.0.0)", org.eclipse.text;bundle-version="[3.8.0,4.0.0)";visibility:=reexport, org.eclipse.swt;bundle-version="[3.117.0,4.0.0)", org.eclipse.jface;bundle-version="[3.19.0,4.0.0)" diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java index 4b950c468..eed8d98fb 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java @@ -165,7 +165,7 @@ private static void logCodeMiningProviderException(Throwable e) { Bundle plugin= Platform.getBundle(PLUGIN_ID); if (plugin != null) { // In OSGi context, uses Platform Text log - ILog log= Platform.getLog(plugin); + ILog log= ILog.of(plugin); log.log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, e.getMessage(), e)); } else { // In java main context, print stack trace diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerHoverManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerHoverManager.java index 314357815..dcb484805 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerHoverManager.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerHoverManager.java @@ -180,7 +180,7 @@ public void run() { // Just swallow the exception if the operation was canceled } catch (RuntimeException ex) { String PLUGIN_ID= "org.eclipse.jface.text"; //$NON-NLS-1$ - ILog log= Platform.getLog(Platform.getBundle(PLUGIN_ID)); + ILog log= ILog.of(Platform.getBundle(PLUGIN_ID)); log.log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, "Unexpected runtime error while computing a text hover", ex)); //$NON-NLS-1$ } finally { synchronized (fMutex) { diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java index 13b12ec48..ec8dfe74f 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java @@ -892,7 +892,7 @@ private void handleSetData(Event event) { displayString= JFaceTextMessages.getString("CompletionProposalPopup.error_retrieving_proposal"); //$NON-NLS-1$ String PLUGIN_ID= "org.eclipse.jface.text"; //$NON-NLS-1$ - ILog log= Platform.getLog(Platform.getBundle(PLUGIN_ID)); + ILog log= ILog.of(Platform.getBundle(PLUGIN_ID)); log.log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, JFaceTextMessages.getString("CompletionProposalPopup.unexpected_error"), e)); //$NON-NLS-1$ } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java index 151b7f96e..4651e5c91 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java @@ -61,6 +61,7 @@ import org.eclipse.core.commands.IHandler; import org.eclipse.core.runtime.Assert; +import org.eclipse.core.runtime.ILog; import org.eclipse.core.runtime.ISafeRunnable; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.ListenerList; @@ -874,7 +875,7 @@ public void handleException(Throwable exception) { String message= JFaceTextMessages.getString(fMessageKey); IStatus status= new Status(IStatus.ERROR, PLUGIN_ID, message, exception); - Platform.getLog(Platform.getBundle(PLUGIN_ID)).log(status); + ILog.of(Platform.getBundle(PLUGIN_ID)).log(status); fLastErrorMessage= message; } diff --git a/org.eclipse.text/META-INF/MANIFEST.MF b/org.eclipse.text/META-INF/MANIFEST.MF index 529f61d4c..52511e065 100644 --- a/org.eclipse.text/META-INF/MANIFEST.MF +++ b/org.eclipse.text/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.text -Bundle-Version: 3.13.0.qualifier +Bundle-Version: 3.13.100.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: @@ -18,6 +18,6 @@ Require-Bundle: org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)", org.eclipse.equinox.common;bundle-version="[3.5.0,4.0.0)", org.eclipse.equinox.preferences;bundle-version="[3.7.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)" + org.eclipse.core.runtime;bundle-version="[3.28.0,4.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.text diff --git a/org.eclipse.text/src/org/eclipse/text/templates/TemplateReaderWriter.java b/org.eclipse.text/src/org/eclipse/text/templates/TemplateReaderWriter.java index a0768f829..353e13f60 100644 --- a/org.eclipse.text/src/org/eclipse/text/templates/TemplateReaderWriter.java +++ b/org.eclipse.text/src/org/eclipse/text/templates/TemplateReaderWriter.java @@ -175,7 +175,7 @@ private TemplatePersistenceData[] read(InputSource source, ResourceBundle bundle String id= getStringValue(attributes, ID_ATTRIBUTE, null); if (id != null && ids.contains(id)) { String PLUGIN_ID= "org.eclipse.jface.text"; //$NON-NLS-1$ - ILog log= Platform.getLog(Platform.getBundle(PLUGIN_ID)); + ILog log= ILog.of(Platform.getBundle(PLUGIN_ID)); String message= NLS.bind(TextTemplateMessages.getString("TemplateReaderWriter.duplicate.id"), id); //$NON-NLS-1$ log.log(new Status(IStatus.WARNING, PLUGIN_ID, IStatus.OK, message, null)); } else { diff --git a/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF b/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF index 131ff6ac2..a50f94c07 100644 --- a/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: %Plugin.providerName Bundle-Localization: plugin Export-Package: org.eclipse.ui.editors.tests Require-Bundle: - org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.28.0,4.0.0)", org.junit;bundle-version="4.12.0", org.eclipse.jface;bundle-version="[3.5.0,4.0.0)", org.eclipse.text;bundle-version="[3.5.0,4.0.0)", diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/FileDocumentProviderTest.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/FileDocumentProviderTest.java index ae984d270..dca7a090c 100644 --- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/FileDocumentProviderTest.java +++ b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/FileDocumentProviderTest.java @@ -249,7 +249,7 @@ private void makeSureResourceIsOutOfDate() throws Exception { static void logError(String message, Exception ex) { String PLUGIN_ID = "org.eclipse.jface.text"; //$NON-NLS-1$ - ILog log = Platform.getLog(Platform.getBundle(PLUGIN_ID)); + ILog log = ILog.of(Platform.getBundle(PLUGIN_ID)); log.log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, message, ex)); } diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/MarkerAnnotationOrderTest.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/MarkerAnnotationOrderTest.java index 8a7c77978..ff29e629a 100644 --- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/MarkerAnnotationOrderTest.java +++ b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/MarkerAnnotationOrderTest.java @@ -88,7 +88,7 @@ public void tearDown() throws Exception { public void testDirectDependency() { final ArrayList list= new ArrayList<>(2); Bundle bundle= Platform.getBundle(EditorsUI.PLUGIN_ID); - ILog log= Platform.getLog(bundle); + ILog log= ILog.of(bundle); log.addLogListener((status, plugin) -> list.add(status)); TestMarkerAnnotationModel t1= new TestMarkerAnnotationModel(); @@ -137,7 +137,7 @@ protected boolean isAcceptable(IMarker marker) { private static void log(Exception ex) { String PLUGIN_ID= "org.eclipse.jface.text"; //$NON-NLS-1$ - ILog log= Platform.getLog(Platform.getBundle(PLUGIN_ID)); + ILog log= ILog.of(Platform.getBundle(PLUGIN_ID)); log.log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, ex.getMessage(), ex)); } diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/StatusEditorTest.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/StatusEditorTest.java index 465375143..074951af3 100644 --- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/StatusEditorTest.java +++ b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/StatusEditorTest.java @@ -80,7 +80,7 @@ public void after() { public void doNotThrowOnActivationInStale() throws Exception { IEditorPart editor1 = openNonExistentFile(page, new URI("file:/1.txt")); openNonExistentFile(page, new URI("file:/2.txt")); - ILog log = Platform.getLog(Platform.getBundle("org.eclipse.e4.ui.workbench")); + ILog log = ILog.of(Platform.getBundle("org.eclipse.e4.ui.workbench")); List logEvents = new ArrayList<>(); ILogListener listener = (status, plugin) -> logEvents.add(status.toString()); log.addLogListener(listener); diff --git a/org.eclipse.ui.editors/META-INF/MANIFEST.MF b/org.eclipse.ui.editors/META-INF/MANIFEST.MF index df7e9d794..bd04c95d9 100644 --- a/org.eclipse.ui.editors/META-INF/MANIFEST.MF +++ b/org.eclipse.ui.editors/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Export-Package: org.eclipse.ui.internal.texteditor;x-internal:=true, org.eclipse.ui.texteditor Require-Bundle: - org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.28.0,4.0.0)", org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)", org.eclipse.swt;bundle-version="[3.101.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)", @@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.jface.text;bundle-version="[3.8.0,4.0.0)", org.eclipse.ui.workbench;bundle-version="[3.117.0,4.0.0)", org.eclipse.ui.workbench.texteditor;bundle-version="[3.14.0,4.0.0)", - org.eclipse.core.filebuffers;visibility:=reexport;bundle-version="[3.5.0,4.0.0)", + org.eclipse.core.filebuffers;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)", org.eclipse.jdt.annotation;bundle-version="2.2";resolution:=optional diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/StorageDocumentProvider.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/StorageDocumentProvider.java index 37122156c..136242d64 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/StorageDocumentProvider.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/StorageDocumentProvider.java @@ -267,7 +267,7 @@ protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocumen protected void handleCoreException(CoreException exception, String message) { Bundle bundle = Platform.getBundle(PlatformUI.PLUGIN_ID); - ILog log= Platform.getLog(bundle); + ILog log= ILog.of(bundle); if (message != null) log.log(new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, IStatus.OK, message, exception)); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextFileDocumentProvider.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextFileDocumentProvider.java index 18b73351d..c6b53cc04 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextFileDocumentProvider.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextFileDocumentProvider.java @@ -1197,7 +1197,7 @@ public IContentType getContentType(Object element) throws CoreException { */ protected void handleCoreException(CoreException exception, String message) { Bundle bundle = Platform.getBundle(PlatformUI.PLUGIN_ID); - ILog log= Platform.getLog(bundle); + ILog log= ILog.of(bundle); IStatus status= message != null ? new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, IStatus.OK, message, exception) : exception.getStatus(); log.log(status); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractMarkerAnnotationModel.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractMarkerAnnotationModel.java index c700ef616..0aba2b25b 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractMarkerAnnotationModel.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractMarkerAnnotationModel.java @@ -174,7 +174,7 @@ protected MarkerAnnotation createMarkerAnnotation(IMarker marker) { protected void handleCoreException(CoreException exception, String message) { Bundle bundle = Platform.getBundle(PlatformUI.PLUGIN_ID); - ILog log= Platform.getLog(bundle); + ILog log= ILog.of(bundle); if (message != null) log.log(new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, IStatus.OK, message, exception)); else diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AddMarkerAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AddMarkerAction.java index e416555c3..8b4994acf 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AddMarkerAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AddMarkerAction.java @@ -153,7 +153,7 @@ public T getAdapter(Class adapter) { operationHistory.execute(operation, null, context); } catch (ExecutionException x) { Bundle bundle= Platform.getBundle(PlatformUI.PLUGIN_ID); - ILog log= Platform.getLog(bundle); + ILog log= ILog.of(bundle); String msg= getString(fBundle, fPrefix + "error.dialog.message", fPrefix + "error.dialog.message"); //$NON-NLS-2$ //$NON-NLS-1$ log.log(new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, IStatus.OK, msg, x)); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DocumentProviderRegistry.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DocumentProviderRegistry.java index 8954d3f75..c40ef642e 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DocumentProviderRegistry.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DocumentProviderRegistry.java @@ -129,7 +129,7 @@ private void initialize() { if (extensionPoint == null) { String msg= NLSUtility.format(TextEditorMessages.DocumentProviderRegistry_error_extension_point_not_found, PlatformUI.PLUGIN_ID); Bundle bundle = Platform.getBundle(PlatformUI.PLUGIN_ID); - ILog log= Platform.getLog(bundle); + ILog log= ILog.of(bundle); log.log(new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, IStatus.OK, msg, null)); return; } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java index d39b40e56..d28882f6f 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java @@ -318,7 +318,7 @@ protected boolean includesRulerLine(Position position, IDocument document) { */ protected void handleCoreException(CoreException exception, String message) { Bundle bundle= Platform.getBundle(PlatformUI.PLUGIN_ID); - ILog log= Platform.getLog(bundle); + ILog log= ILog.of(bundle); if (message != null) log.log(new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, IStatus.OK, message, exception)); @@ -535,7 +535,7 @@ public T getAdapter(Class adapter) { operationHistory.execute(operation, null, context); } catch (ExecutionException e) { Bundle bundle= Platform.getBundle(PlatformUI.PLUGIN_ID); - ILog log= Platform.getLog(bundle); + ILog log= ILog.of(bundle); String msg= getString(fBundle, fPrefix + "error.dialog.message", fPrefix + "error.dialog.message"); //$NON-NLS-2$ //$NON-NLS-1$ log.log(new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, IStatus.OK, msg, e)); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerUtilities.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerUtilities.java index e23343c57..aae3f49f3 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerUtilities.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerUtilities.java @@ -218,7 +218,7 @@ public static int getSeverity(IMarker marker) { */ private static void handleCoreException(CoreException e) { Bundle bundle = Platform.getBundle(PlatformUI.PLUGIN_ID); - ILog log= Platform.getLog(bundle); + ILog log= ILog.of(bundle); log.log(e.getStatus()); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SelectMarkerRulerAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SelectMarkerRulerAction.java index 35c0013bf..f6c4687a4 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SelectMarkerRulerAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/SelectMarkerRulerAction.java @@ -351,7 +351,7 @@ protected final void handleCoreException(CoreException exception, String message */ private void logException(IStatus status) { Bundle bundle = Platform.getBundle(PlatformUI.PLUGIN_ID); - ILog log= Platform.getLog(bundle); + ILog log= ILog.of(bundle); log.log(status); } @@ -394,7 +394,7 @@ protected final List getMarkers() { it= model.getAnnotationIterator(line.getOffset(), line.getLength() + 1, true, true); } catch (BadLocationException e) { Bundle bundle= Platform.getBundle(PlatformUI.PLUGIN_ID); - Platform.getLog(bundle).log(new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, IStatus.OK, e.getLocalizedMessage(), e)); + ILog.of(bundle).log(new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, IStatus.OK, e.getLocalizedMessage(), e)); it= model.getAnnotationIterator(); } diff --git a/org.eclipse.ui.genericeditor.tests/META-INF/MANIFEST.MF b/org.eclipse.ui.genericeditor.tests/META-INF/MANIFEST.MF index 53495a66e..bcb4e7755 100644 --- a/org.eclipse.ui.genericeditor.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.ui.genericeditor.tests/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.ui.genericeditor.tests;singleton:=true -Bundle-Version: 1.3.100.qualifier +Bundle-Version: 1.3.200.qualifier Bundle-Vendor: %Plugin.providerName Bundle-Localization: plugin Export-Package: org.eclipse.ui.genericeditor.tests, org.eclipse.ui.genericeditor.tests.contributions -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.28.0,4.0.0)", org.junit;bundle-version="4.12.0", org.eclipse.jface;bundle-version="[3.5.0,4.0.0)", org.eclipse.text;bundle-version="[3.5.0,4.0.0)", diff --git a/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/CompletionTest.java b/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/CompletionTest.java index e397484e6..a50e52578 100644 --- a/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/CompletionTest.java +++ b/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/CompletionTest.java @@ -85,7 +85,7 @@ public void testCompletion() throws Exception { @Test public void testDefaultContentAssistBug570488() throws Exception { - ILog log= Platform.getLog(Platform.getBundle("org.eclipse.jface.text")); + ILog log= ILog.of(Platform.getBundle("org.eclipse.jface.text")); TestLogListener listener= new TestLogListener(); log.addLogListener(listener); createAndOpenFile("Bug570488.txt", "bar 'bar'"); diff --git a/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF b/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF index 791aa8c36..332ec61ed 100644 --- a/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF +++ b/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF @@ -24,7 +24,7 @@ Export-Package: org.eclipse.ui.texteditor.spelling, org.eclipse.ui.texteditor.templates Require-Bundle: - org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.28.0,4.0.0)", org.eclipse.compare.core;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.expressions;bundle-version="[3.4.100,4.0.0)", org.eclipse.jface.text;bundle-version="[3.19.0,4.0.0)", diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java index a9fd4232a..6f447efec 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java @@ -4911,7 +4911,7 @@ protected void validateState(IEditorInput input) { } if (status == null || status.getSeverity() != IStatus.CANCEL) { Bundle bundle= Platform.getBundle(PlatformUI.PLUGIN_ID); - ILog log= Platform.getLog(bundle); + ILog log= ILog.of(bundle); log.log(x.getStatus()); Shell shell= getSite().getShell(); @@ -4984,7 +4984,7 @@ protected void updateState(IEditorInput input) { } catch (CoreException x) { Bundle bundle= Platform.getBundle(PlatformUI.PLUGIN_ID); - ILog log= Platform.getLog(bundle); + ILog log= ILog.of(bundle); log.log(x.getStatus()); } } @@ -7174,7 +7174,7 @@ public void doSave(IProgressMonitor monitor) throws CoreException { // https://bugs.eclipse.org/bugs/show_bug.cgi?id=569286 if (disconnectStack != null && !disconnectStackShown) { Bundle bundle = Platform.getBundle(PlatformUI.PLUGIN_ID); - ILog log = Platform.getLog(bundle); + ILog log = ILog.of(bundle); disconnectStack.addSuppressed(new IllegalStateException("doSave after disconnect")); //$NON-NLS-1$ Status status = new Status(IStatus.ERROR, TextEditorPlugin.PLUGIN_ID, null, disconnectStack); log.log(status); @@ -7193,7 +7193,7 @@ public boolean isDirty() { // https://bugs.eclipse.org/bugs/show_bug.cgi?id=569286 if (disconnectStack != null && !disconnectStackShown) { Bundle bundle = Platform.getBundle(PlatformUI.PLUGIN_ID); - ILog log = Platform.getLog(bundle); + ILog log = ILog.of(bundle); disconnectStack.addSuppressed(new IllegalStateException("isDirty check after disconnect")); //$NON-NLS-1$ Status status = new Status(IStatus.ERROR, TextEditorPlugin.PLUGIN_ID, disconnectStack.getMessage(), disconnectStack);