diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/ProjectEncodingMarkerResolutionGenerator.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/ProjectEncodingMarkerResolutionGenerator.java
index 7be3ec9124a..c5b9834f7fa 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/ProjectEncodingMarkerResolutionGenerator.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/ProjectEncodingMarkerResolutionGenerator.java
@@ -25,6 +25,7 @@
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.resources.WorkspaceJob;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -35,7 +36,6 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IMarkerResolution;
 import org.eclipse.ui.IMarkerResolutionGenerator2;
-import org.eclipse.ui.internal.UIPlugin;
 import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
 import org.eclipse.ui.views.markers.WorkbenchMarkerResolution;
 
@@ -43,7 +43,6 @@
  * Provides a resolution for warning markers on projects without an explicit
  * encoding setting.
  */
-@SuppressWarnings("restriction")
 public class ProjectEncodingMarkerResolutionGenerator implements IMarkerResolutionGenerator2 {
 
 	@Override
@@ -54,7 +53,7 @@ public IMarkerResolution[] getResolutions(IMarker marker) {
 			IMarkerResolution[] resolutions = { new ExplicitEncodingResolution(defaultCharset) };
 			return resolutions;
 		} catch (CoreException e) {
-			UIPlugin.getDefault().getLog().log(e.getStatus());
+			ILog.of(ProjectEncodingMarkerResolutionGenerator.class).log(e.getStatus());
 			return new IMarkerResolution[0];
 		}
 	}
@@ -117,7 +116,7 @@ public void run(IMarker marker) {
 					try {
 						charsetManager.setCharsetFor(project.getFullPath(), charset);
 					} catch (CoreException e) {
-						UIPlugin.getDefault().getLog().log(e.getStatus());
+						ILog.of(ProjectEncodingMarkerResolutionGenerator.class).log(e.getStatus());
 					}
 				}
 			}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPlugin.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPlugin.java
index 7e066c9bf2f..62e85d58ac8 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPlugin.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPlugin.java
@@ -181,7 +181,6 @@ public static void log(int severity, int aCode, String aMessage,
 	 * Record a status against this plugin's log.
 	 */
 	public static void log(IStatus aStatus) {
-		//getDefault().getLog().log(aStatus);
 		logJob.log(aStatus);
 		logJob.schedule(LOG_DELAY);
 	}
diff --git a/bundles/org.eclipse.ui/src/org/eclipse/ui/internal/UIPreferenceInitializer.java b/bundles/org.eclipse.ui/src/org/eclipse/ui/internal/UIPreferenceInitializer.java
index 303c54d87db..864731c2f6f 100644
--- a/bundles/org.eclipse.ui/src/org/eclipse/ui/internal/UIPreferenceInitializer.java
+++ b/bundles/org.eclipse.ui/src/org/eclipse/ui/internal/UIPreferenceInitializer.java
@@ -18,6 +18,7 @@
  *******************************************************************************/
 package org.eclipse.ui.internal;
 
+import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.core.runtime.preferences.DefaultScope;
@@ -156,7 +157,7 @@ public void initializeDefaultPreferences() {
 								.getSingleton());
 			}
 		} catch (BackingStoreException e) {
-			UIPlugin.getDefault().getLog().error(e.getLocalizedMessage(), e);
+			ILog.of(UIPreferenceInitializer.class).error(e.getLocalizedMessage(), e);
 		}
 
 		rootNode
diff --git a/examples/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditorUI.java b/examples/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditorUI.java
index e33b5de12ef..b00d0d1ab0e 100644
--- a/examples/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditorUI.java	
+++ b/examples/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditorUI.java	
@@ -19,8 +19,7 @@
 
 import org.osgi.service.prefs.BackingStoreException;
 
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -77,7 +76,7 @@ public TemplateStore getTemplateStore() {
 			try {
 				fStore.load();
 			} catch (IOException e) {
-				JavaEditorExamplePlugin.getDefault().getLog().log(new Status(IStatus.ERROR, "org.eclipse.ui.examples.javaeditor", IStatus.OK, "", e)); //$NON-NLS-1$ //$NON-NLS-2$
+				ILog.of(TemplateEditorUI.class).error("", e); //$NON-NLS-1$
 			}
 		}
 		return fStore;
diff --git a/tests/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/ResourceHelper.java b/tests/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/ResourceHelper.java
index 384ff6cb716..709a751f80c 100644
--- a/tests/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/ResourceHelper.java
+++ b/tests/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/ResourceHelper.java
@@ -18,6 +18,7 @@
 import java.io.InputStream;
 
 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.NullProgressMonitor;
@@ -74,7 +75,7 @@ public static void delete(final IProject project, boolean deleteContent) {
 				i= MAX_RETRY;
 			} catch (CoreException x) {
 				if (i == MAX_RETRY - 1) {
-					FileBuffersTestPlugin.getDefault().getLog().log(x.getStatus());
+					ILog.of(ResourceHelper.class).log(x.getStatus());
 //					throw x;
 				}
 				try {
diff --git a/tests/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/RefactoringUITestPlugin.java b/tests/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/RefactoringUITestPlugin.java
index e2a9e299d40..653711adef7 100644
--- a/tests/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/RefactoringUITestPlugin.java
+++ b/tests/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/RefactoringUITestPlugin.java
@@ -13,6 +13,7 @@
  *******************************************************************************/
 package org.eclipse.ltk.ui.refactoring.tests;
 
+import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
@@ -35,7 +36,7 @@ public static String getPluginId() {
 	}
 
 	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
+		ILog.get().log(status);
 	}
 
 	public static void log(Throwable e) {