diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArrayDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArrayDeclarator.java
index 4edeb1b52d9..02e80947727 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArrayDeclarator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArrayDeclarator.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.core.dom.ast.cpp;
 
@@ -19,6 +19,5 @@ import org.eclipse.cdt.core.dom.ast.IASTArrayDeclarator;
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
  */
-public interface ICPPASTArrayDeclarator extends IASTArrayDeclarator, ICPPASTDeclarator{
-
+public interface ICPPASTArrayDeclarator extends IASTArrayDeclarator, ICPPASTDeclarator {
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeclarator.java
index 5ba0b47538f..0f493d8a8ad 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeclarator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeclarator.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.core.dom.ast.cpp;
 
@@ -21,15 +21,14 @@ import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
  */
 public interface ICPPASTDeclarator extends IASTDeclarator {
 	/**
-	 * Returns whether the declarator contains an ellipsis, in which case it declares a
-	 * parameter pack.
+	 * Returns whether the declarator contains an ellipsis, in which case it declares
+	 * a parameter pack.
 	 */
 	public boolean declaresParameterPack();
-	
-	
+
 	/**
 	 * Set whether the declarator contains an ellipsis, denoting a pack expansion. 
-	 * Not allowed on frozen AST.
+	 * Not allowed on a frozen AST.
 	 */
 	public void setDeclaresParameterPack(boolean val);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionTryBlockDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionTryBlockDeclarator.java
index e5d8af0d57b..91133b4c87e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionTryBlockDeclarator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionTryBlockDeclarator.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    IBM - Initial API and implementation
- *    Markus Schorn (Wind River Systems)
+ *     IBM - Initial API and implementation
+ *     Markus Schorn (Wind River Systems)
  *******************************************************************************/
 package org.eclipse.cdt.core.dom.ast.cpp;
 
@@ -18,9 +18,7 @@ import org.eclipse.cdt.core.dom.ast.ASTNodeProperty;
  * @noimplement This interface is not intended to be implemented by clients.
  */
 @Deprecated
-public interface ICPPASTFunctionTryBlockDeclarator extends
-		ICPPASTFunctionDeclarator {
-
+public interface ICPPASTFunctionTryBlockDeclarator extends ICPPASTFunctionDeclarator {
 	/**
 	 * A <code>CATCH_HANDLER</code> is the role of an ICPPASTCatchHandler in
 	 * this interface.
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/TestSourceFile.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/TestSourceFile.java
index a5bad1bfaaf..d1c75ee130c 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/TestSourceFile.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/TestSourceFile.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2010 Institute for Software, HSR Hochschule fuer Technik  
+ * Copyright (c) 2008, 2012 Institute for Software, HSR Hochschule fuer Technik  
  * Rapperswil, University of applied sciences and others
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Eclipse Public License v1.0 
@@ -25,13 +25,13 @@ public class TestSourceFile {
 	private static final String LINE_SEPARATOR = "\n"; //$NON-NLS-1$
 	private static final Pattern SELECTION_START = Pattern.compile("/\\*\\$\\*/"); //$NON-NLS-1$
 	private static final Pattern SELECTION_END = Pattern.compile("/\\*\\$\\$\\*/"); //$NON-NLS-1$
-	
+
 	private final String name;
 	private final StringBuilder source = new StringBuilder();
 	private final StringBuilder expectedSource = new StringBuilder();
 	private int selectionStart = -1;
 	private int selectionEnd = -1;
-	
+
 	public TestSourceFile(String name) {
 		super();
 		this.name = name;
@@ -44,7 +44,7 @@ public class TestSourceFile {
 	public String getSource() {
 		return source.toString();
 	}
-	
+
 	public String getExpectedSource() {
 		if (expectedSource.length() == 0) {
 			return getSource();
@@ -66,12 +66,12 @@ public class TestSourceFile {
 		source.append(code);
 		source.append(LINE_SEPARATOR);
 	}
-	
+
 	public void addLineToExpectedSource(String code) {
 		expectedSource.append(code);
 		expectedSource.append(LINE_SEPARATOR);
 	}
-	
+
 	public TextSelection getSelection() {
 		if (selectionStart < 0 || selectionEnd < selectionStart)
 			return null;