Skip to content

Commit 3edc75b

Browse files
committed
Modernize remaining getDefault().getLog() log sites
Replace Plugin.getDefault().getLog() with ILog.of(Class) / ILog.get() to drop the Activator round-trip and collapse Status construction where applicable. In ProjectEncodingMarkerResolutionGenerator, the class lives in org.eclipse.ui.ide but previously logged via UIPlugin (org.eclipse.ui); ILog.of(...) now routes the log to the containing bundle, which matches the class location. The workbench bundle (org.eclipse.ui.workbench) is intentionally deferred until the org.eclipse.ui vs org.eclipse.ui.workbench plug-in id question is resolved.
1 parent 1cbae34 commit 3edc75b

5 files changed

Lines changed: 11 additions & 10 deletions

File tree

bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/ProjectEncodingMarkerResolutionGenerator.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.eclipse.core.resources.ResourcesPlugin;
2626
import org.eclipse.core.resources.WorkspaceJob;
2727
import org.eclipse.core.runtime.CoreException;
28+
import org.eclipse.core.runtime.ILog;
2829
import org.eclipse.core.runtime.IProgressMonitor;
2930
import org.eclipse.core.runtime.IStatus;
3031
import org.eclipse.core.runtime.Status;
@@ -35,15 +36,13 @@
3536
import org.eclipse.swt.widgets.Display;
3637
import org.eclipse.ui.IMarkerResolution;
3738
import org.eclipse.ui.IMarkerResolutionGenerator2;
38-
import org.eclipse.ui.internal.UIPlugin;
3939
import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
4040
import org.eclipse.ui.views.markers.WorkbenchMarkerResolution;
4141

4242
/**
4343
* Provides a resolution for warning markers on projects without an explicit
4444
* encoding setting.
4545
*/
46-
@SuppressWarnings("restriction")
4746
public class ProjectEncodingMarkerResolutionGenerator implements IMarkerResolutionGenerator2 {
4847

4948
@Override
@@ -54,7 +53,7 @@ public IMarkerResolution[] getResolutions(IMarker marker) {
5453
IMarkerResolution[] resolutions = { new ExplicitEncodingResolution(defaultCharset) };
5554
return resolutions;
5655
} catch (CoreException e) {
57-
UIPlugin.getDefault().getLog().log(e.getStatus());
56+
ILog.of(ProjectEncodingMarkerResolutionGenerator.class).log(e.getStatus());
5857
return new IMarkerResolution[0];
5958
}
6059
}
@@ -117,7 +116,7 @@ public void run(IMarker marker) {
117116
try {
118117
charsetManager.setCharsetFor(project.getFullPath(), charset);
119118
} catch (CoreException e) {
120-
UIPlugin.getDefault().getLog().log(e.getStatus());
119+
ILog.of(ProjectEncodingMarkerResolutionGenerator.class).log(e.getStatus());
121120
}
122121
}
123122
}

bundles/org.eclipse.ui/src/org/eclipse/ui/internal/UIPreferenceInitializer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*******************************************************************************/
1919
package org.eclipse.ui.internal;
2020

21+
import org.eclipse.core.runtime.ILog;
2122
import org.eclipse.core.runtime.Platform;
2223
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
2324
import org.eclipse.core.runtime.preferences.DefaultScope;
@@ -156,7 +157,7 @@ public void initializeDefaultPreferences() {
156157
.getSingleton());
157158
}
158159
} catch (BackingStoreException e) {
159-
UIPlugin.getDefault().getLog().error(e.getLocalizedMessage(), e);
160+
ILog.of(UIPreferenceInitializer.class).error(e.getLocalizedMessage(), e);
160161
}
161162

162163
rootNode

examples/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditorUI.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919

2020
import org.osgi.service.prefs.BackingStoreException;
2121

22-
import org.eclipse.core.runtime.IStatus;
23-
import org.eclipse.core.runtime.Status;
22+
import org.eclipse.core.runtime.ILog;
2423
import org.eclipse.core.runtime.preferences.InstanceScope;
2524

2625
import org.eclipse.jface.preference.IPreferenceStore;
@@ -77,7 +76,7 @@ public TemplateStore getTemplateStore() {
7776
try {
7877
fStore.load();
7978
} catch (IOException e) {
80-
JavaEditorExamplePlugin.getDefault().getLog().log(new Status(IStatus.ERROR, "org.eclipse.ui.examples.javaeditor", IStatus.OK, "", e)); //$NON-NLS-1$ //$NON-NLS-2$
79+
ILog.of(TemplateEditorUI.class).error("", e); //$NON-NLS-1$
8180
}
8281
}
8382
return fStore;

tests/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/ResourceHelper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.io.InputStream;
1919

2020
import org.eclipse.core.runtime.CoreException;
21+
import org.eclipse.core.runtime.ILog;
2122
import org.eclipse.core.runtime.IPath;
2223
import org.eclipse.core.runtime.IProgressMonitor;
2324
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -74,7 +75,7 @@ public static void delete(final IProject project, boolean deleteContent) {
7475
i= MAX_RETRY;
7576
} catch (CoreException x) {
7677
if (i == MAX_RETRY - 1) {
77-
FileBuffersTestPlugin.getDefault().getLog().log(x.getStatus());
78+
ILog.of(ResourceHelper.class).log(x.getStatus());
7879
// throw x;
7980
}
8081
try {

tests/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/RefactoringUITestPlugin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*******************************************************************************/
1414
package org.eclipse.ltk.ui.refactoring.tests;
1515

16+
import org.eclipse.core.runtime.ILog;
1617
import org.eclipse.core.runtime.IStatus;
1718
import org.eclipse.core.runtime.Status;
1819

@@ -35,7 +36,7 @@ public static String getPluginId() {
3536
}
3637

3738
public static void log(IStatus status) {
38-
getDefault().getLog().log(status);
39+
ILog.get().log(status);
3940
}
4041

4142
public static void log(Throwable e) {

0 commit comments

Comments
 (0)