diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ExcludeFromBuildHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ExcludeFromBuildHandler.java
index b1e07d2dd15..fe53bae4b8c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ExcludeFromBuildHandler.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ExcludeFromBuildHandler.java
@@ -243,7 +243,7 @@ public class ExcludeFromBuildHandler extends AbstractHandler {
 				try {
 					CoreModel.getDefault().setProjectDescription(p, prjd);
 				} catch (CoreException e) {
-					CUIPlugin.getDefault().logErrorMessage(Messages.AbstractPage_11 + e.getLocalizedMessage()); 
+					CUIPlugin.logError(Messages.AbstractPage_11 + e.getLocalizedMessage()); 
 				}
 				AbstractPage.updateViews(res);
 			}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java
index 37dd8c72b79..1dc9170abc7 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java
@@ -64,7 +64,6 @@ import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener;
 public abstract class OptionsConfigurationBlock {
 	
 	public static final class Key {
-		
 		private String fQualifier;
 		private String fKey;
 		
@@ -118,9 +117,7 @@ public abstract class OptionsConfigurationBlock {
 		public String getQualifier() {
 			return fQualifier;
 		}
-
 	}
-	
 
 	protected static class ControlData {
 		private Key fKey;
@@ -208,7 +205,7 @@ public abstract class OptionsConfigurationBlock {
 			};
 		}
 		
-		testIfOptionsComplete(allKeys);
+		checkIfOptionsComplete(allKeys);
 		if (fProject == null || hasProjectSpecificOptions(fProject)) {
 			fDisabledProjectSettings= null;
 		} else {
@@ -245,12 +242,11 @@ public abstract class OptionsConfigurationBlock {
 	protected final static Key getCDTUIKey(String key) {
 		return getKey(CUIPlugin.PLUGIN_ID, key);
 	}
-	
 		
-	private void testIfOptionsComplete(Key[] allKeys) {
+	private void checkIfOptionsComplete(Key[] allKeys) {
 		for (int i= 0; i < allKeys.length; i++) {
 			if (allKeys[i].getStoredValue(fLookupOrder, false, fManager) == null) {
-				CUIPlugin.getDefault().logErrorMessage("preference option missing: " + allKeys[i] + " (" + this.getClass().getName() +')');  //$NON-NLS-1$//$NON-NLS-2$
+				CUIPlugin.logError("Preference option missing: " + allKeys[i] + " (" + this.getClass().getName() +')');  //$NON-NLS-1$//$NON-NLS-2$
 			}
 		}
 	}
@@ -264,11 +260,9 @@ public abstract class OptionsConfigurationBlock {
 		fManager.getWorkingCopy(DefaultScope.INSTANCE.getNode(CUIPlugin.PLUGIN_ID)).putInt(REBUILD_COUNT_KEY, fRebuildCount);
 	}
 	
-	
 	protected void settingsUpdated() {
 	}
 	
-	
 	public void selectOption(String key, String qualifier) {
 		for (int i= 0; i < fAllKeys.length; i++) {
 			Key curr= fAllKeys[i];
@@ -295,7 +289,6 @@ public abstract class OptionsConfigurationBlock {
 		}
 	}
 	
-	
 	public boolean hasProjectSpecificOptions(IProject project) {
 		if (project != null) {
 			IScopeContext projectContext= new ProjectScope(project);
@@ -696,7 +689,6 @@ public abstract class OptionsConfigurationBlock {
 		return fDisabledProjectSettings == null || fProject == null;
 	}
 	
-	
 	public boolean performOk() {
 		return processChanges(fContainer);
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileStore.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileStore.java
index fc28b7ec7bf..b3754b177c9 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileStore.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileStore.java
@@ -59,9 +59,7 @@ import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.CustomPr
 import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.Profile;
 
 
-
 public class ProfileStore {
-
 	/** The default encoding to use */
 	public static final String ENCODING= "UTF-8"; //$NON-NLS-1$
 	
@@ -71,7 +69,6 @@ public class ProfileStore {
 	 * A SAX event handler to parse the xml format for profiles. 
 	 */
 	private final static class ProfileDefaultHandler extends DefaultHandler {
-		
 		private List<Profile> fProfiles;
 		private int fVersion;
 		
@@ -123,7 +120,6 @@ public class ProfileStore {
 		public List<Profile> getProfiles() {
 			return fProfiles;
 		}
-		
 	}
 
 	/**
@@ -229,7 +225,6 @@ public class ProfileStore {
 	 * @throws CoreException
 	 */
 	protected static List<Profile> readProfilesFromStream(InputSource inputSource) throws CoreException {
-		
 		final ProfileDefaultHandler handler= new ProfileDefaultHandler();
 		try {
 		    final SAXParserFactory factory= SAXParserFactory.newInstance();
@@ -274,8 +269,6 @@ public class ProfileStore {
 	 * @throws CoreException
 	 */
 	private static void writeProfilesToStream(Collection<Profile> profiles, OutputStream stream, String encoding, IProfileVersioner profileVersioner) throws CoreException {
-
-
 		try {
 			final DocumentBuilderFactory factory= DocumentBuilderFactory.newInstance();
 			final DocumentBuilder builder= factory.newDocumentBuilder();		
@@ -305,7 +298,6 @@ public class ProfileStore {
 			throw createException(e, FormatterMessages.CodingStyleConfigurationBlock_error_serializing_xml_message);  
 		}
 	}
-
 	
 	/*
 	 * Create a new profile element in the specified document. The profile is not added
@@ -328,7 +320,7 @@ public class ProfileStore {
 				setting.setAttribute(XML_ATTRIBUTE_VALUE, value);
 				element.appendChild(setting);
 			} else {
-				CUIPlugin.getDefault().logErrorMessage("ProfileStore: Profile does not contain value for key " + key); //$NON-NLS-1$
+				CUIPlugin.logError("ProfileStore: Profile does not contain value for key " + key); //$NON-NLS-1$
 			}
 		}
 		return element;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandInstaller.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandInstaller.java
index 2908d178b2e..b454b430c19 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandInstaller.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandInstaller.java
@@ -53,7 +53,7 @@ public class CorrectionCommandInstaller {
 		}
 		
 		if (fCorrectionHandlerActivations != null) {
-			CUIPlugin.getDefault().logErrorMessage("correction handler activations not released"); //$NON-NLS-1$
+			CUIPlugin.logError("Correction handler activations not released"); //$NON-NLS-1$
 		}
 		fCorrectionHandlerActivations= new ArrayList<IHandlerActivation>();
 		
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/OpenNewWizardAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/OpenNewWizardAction.java
index 0a892b1ee0c..82a13a88014 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/OpenNewWizardAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/OpenNewWizardAction.java
@@ -58,7 +58,7 @@ public class OpenNewWizardAction extends AbstractOpenWizardAction {
 			}
 			return null;
 		} catch (MalformedURLException exception) {
-			CUIPlugin.getDefault().logErrorMessage("Unable to load wizard icon"); //$NON-NLS-1$
+			CUIPlugin.logError("Unable to load wizard icon"); //$NON-NLS-1$
 		}
 		return ImageDescriptor.getMissingImageDescriptor();
 		
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ExcludeFromBuildAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ExcludeFromBuildAction.java
index 2b4bc038094..d9aeb99aaf5 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ExcludeFromBuildAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ExcludeFromBuildAction.java
@@ -203,7 +203,7 @@ implements IWorkbenchWindowPulldownDelegate2, IObjectActionDelegate {
 				try {
 					CoreModel.getDefault().setProjectDescription(p, prjd);
 				} catch (CoreException e) {
-					CUIPlugin.getDefault().logErrorMessage(Messages.AbstractPage_11 + e.getLocalizedMessage()); 
+					CUIPlugin.logError(Messages.AbstractPage_11 + e.getLocalizedMessage()); 
 				}
 				AbstractPage.updateViews(res);
 			}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
index 7009381db58..24d1a6a956e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
@@ -656,7 +656,7 @@ implements
 					else
 						CDTPropertyManager.performOk(AbstractPage.this);
 				} catch (CoreException e) {
-					CUIPlugin.getDefault().logErrorMessage(Messages.AbstractPage_11 + e.getLocalizedMessage()); 
+					CUIPlugin.logError(Messages.AbstractPage_11 + e.getLocalizedMessage()); 
 				}
 				updateViews(internalElement);
 			}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPropertyManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPropertyManager.java
index b983fc558bc..2a3deb30261 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPropertyManager.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPropertyManager.java
@@ -142,7 +142,7 @@ public class CDTPropertyManager {
 		try {
 			CoreModel.getDefault().setProjectDescription(project, prjd);
 		} catch (CoreException e) {
-			CUIPlugin.getDefault().logErrorMessage(Messages.AbstractPage_11 + e.getLocalizedMessage()); 
+			CUIPlugin.logError(Messages.AbstractPage_11 + e.getLocalizedMessage()); 
 		}
 		
 		if (pages.size() == 0) {