diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AbstractContentAssistTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AbstractContentAssistTest.java
index 26db8a43f23..df559f84097 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AbstractContentAssistTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AbstractContentAssistTest.java
@@ -45,7 +45,6 @@ import org.eclipse.cdt.internal.ui.text.contentassist.CContentAssistProcessor;
 import org.eclipse.cdt.internal.ui.text.contentassist.RelevanceConstants;
 
 public abstract class AbstractContentAssistTest extends BaseUITestCase {
-
 	public static final int COMPARE_ID_STRINGS = 0;
 	public static final int COMPARE_DISP_STRINGS = 1;
 	public static final int COMPARE_REP_STRINGS = 2;
@@ -65,8 +64,7 @@ public abstract class AbstractContentAssistTest extends BaseUITestCase {
 		super.setUp();
 		if (fIsCpp) {
 			fCProject= CProjectHelper.createCCProject(getName(), "unused", IPDOMManager.ID_FAST_INDEXER);
-		}
-		else {
+		} else {
 			fCProject= CProjectHelper.createCProject(getName(), "unused", IPDOMManager.ID_FAST_INDEXER);
 		}
 		fCFile= setUpProjectContent(fCProject.getProject());
@@ -134,7 +132,7 @@ public abstract class AbstractContentAssistTest extends BaseUITestCase {
 			}
 		}
 
-		boolean allFound = true ;  // for the time being, let's be optimistic
+		boolean allFound = true;  // for the time being, let's be optimistic
 
 		for (String element : expected) {
 			boolean found = false;
@@ -148,7 +146,7 @@ public abstract class AbstractContentAssistTest extends BaseUITestCase {
 				}
 			}
 			if (!found)  {
-				allFound = false ;
+				allFound = false;
 				if (CTestPlugin.getDefault().isDebugging())  {
 					System.out.println( "Lookup failed for " + element); //$NON-NLS-1$
 				}
@@ -160,7 +158,6 @@ public abstract class AbstractContentAssistTest extends BaseUITestCase {
 		} else if (doCheckExtraResults())  {
 			assertEquals("Extra results!", toString(expected), toString(resultStrings));
 		}
-
 	}
 	
 	protected void assertContentAssistResults(int offset, int length, String[] expected, boolean isCompletion, boolean isTemplate, int compareType) throws Exception {
@@ -258,7 +255,7 @@ public abstract class AbstractContentAssistTest extends BaseUITestCase {
 	 * Override to relax checking of extra results
 	 */
 	protected boolean doCheckExtraResults() {
-		return true ;
+		return true;
 	}
 
 	/**
@@ -274,5 +271,4 @@ public abstract class AbstractContentAssistTest extends BaseUITestCase {
 	protected IDocument getDocument() {
 		return EditorTestHelper.getDocument(fEditor);
 	}
-
 }
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ParameterHintTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ParameterHintTests.java
index f49669149a3..817b98296da 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ParameterHintTests.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ParameterHintTests.java
@@ -20,7 +20,6 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.cdt.core.testplugin.util.BaseTestCase;
 
 public class ParameterHintTests extends AbstractContentAssistTest {
-
 	private static final String HEADER_FILE_NAME = "PHTest.h";
 	private static final String SOURCE_FILE_NAME = "PHTest.cpp";
 	
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java
index 0503d97b018..fa4c981c26e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java
@@ -43,7 +43,6 @@ import org.eclipse.cdt.internal.ui.actions.StructureSelectPreviousAction;
 import org.eclipse.cdt.internal.ui.actions.StructureSelectionAction;
 
 public class CEditorActionContributor extends TextEditorActionContributor {
-	
 	private RetargetTextEditorAction fContentAssist;
 	private RetargetTextEditorAction fContextInformation;
 	private TogglePresentationAction fTogglePresentation;
@@ -120,7 +119,6 @@ public class CEditorActionContributor extends TextEditorActionContributor {
 	 */
 	@Override
 	public void contributeToMenu(IMenuManager menu) {
-		
 		super.contributeToMenu(menu);
 		
 		IMenuManager editMenu= menu.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
@@ -187,7 +185,6 @@ public class CEditorActionContributor extends TextEditorActionContributor {
 	 */
 	@Override
 	public void setActiveEditor(IEditorPart part) {
-		
 		super.setActiveEditor(part);
 		
 		ITextEditor textEditor= null;
@@ -246,12 +243,8 @@ public class CEditorActionContributor extends TextEditorActionContributor {
 			CEditor cEditor= (CEditor) part;
 			cEditor.fillActionBars(bars);
 		}
-
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorActionBarContributor#dispose()
-	 */
 	@Override
 	public void dispose() {
 		setActiveEditor(null);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/Messages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/Messages.java
index 13eecf1e087..f79ac985df3 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/Messages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/Messages.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Markus Schorn - initial API and implementation
+ *     Markus Schorn - initial API and implementation
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui.viewsupport;
 
@@ -14,12 +14,14 @@ import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.cdt.internal.ui.viewsupport.messages"; //$NON-NLS-1$
+
 	public static String EditorOpener_fileDoesNotExist;
 	public static String IndexedFilesCache_jobName;
 	public static String IndexUI_infoNotInIndex;
 	public static String IndexUI_infoNotInSource;
 	public static String IndexUI_infoSelectIndexAllFiles;
 	public static String SelectionListenerWithASTManager_jobName;
+
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/messages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/messages.properties
index 74bd740d5e9..6b285e5c21b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/messages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/messages.properties
@@ -1,11 +1,11 @@
 ################################################################################
-#  Copyright (c) 2007, 2008 Wind River Systems, Inc. and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+# Copyright (c) 2007, 2008 Wind River Systems, Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
 # 
-#  Contributors:
+# Contributors:
 #     Markus Schorn - initial API and implementation
 ################################################################################
 EditorOpener_fileDoesNotExist=File ''{0}'' no longer exists