diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBase.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBase.java
index 48dbd1445eb..891fb17e875 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBase.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBase.java
@@ -26,7 +26,6 @@ import org.eclipse.core.runtime.CoreException;
  * @author Doug Schaefer
  */
 class PDOMCPPBase implements ICPPBase, ICPPInternalBase {
-
 	private static final int BASECLASS_SPECIFIER = 0;
 	private static final int NEXTBASE = 4;
 	private static final int FLAGS = 8;
@@ -43,7 +42,8 @@ class PDOMCPPBase implements ICPPBase, ICPPInternalBase {
 		this.record = record;
 	}
 	
-	public PDOMCPPBase(PDOMLinkage linkage, PDOMName baseClassSpec, boolean isVirtual, int visibility) throws CoreException {
+	public PDOMCPPBase(PDOMLinkage linkage, PDOMName baseClassSpec, boolean isVirtual, int visibility)
+			throws CoreException {
 		this.linkage = linkage;
 		Database db = getDB();
 		this.record = db.malloc(RECORD_SIZE);
@@ -97,8 +97,8 @@ class PDOMCPPBase implements ICPPBase, ICPPInternalBase {
 			PDOMName name= getBaseClassSpecifierName();
 			if (name != null) {
 				PDOMBinding b = name.getBinding();
-		    	while( b instanceof PDOMCPPTypedef && ((PDOMCPPTypedef)b).getType() instanceof PDOMBinding ){
-					b = (PDOMBinding) ((PDOMCPPTypedef)b).getType();
+		    	while (b instanceof PDOMCPPTypedef && ((PDOMCPPTypedef) b).getType() instanceof PDOMBinding) {
+					b = (PDOMBinding) ((PDOMCPPTypedef) b).getType();
 		    	}
 		    	return fCachedBaseClass= b;
 			}				
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructor.java
index 474861c62aa..5d2712b0bd4 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructor.java
@@ -8,7 +8,6 @@
  * Contributors:
  *    Markus Schorn - initial API and implementation
  *******************************************************************************/ 
-
 package org.eclipse.cdt.internal.core.pdom.dom.cpp;
 
 import org.eclipse.cdt.core.dom.ast.DOMException;
@@ -21,7 +20,8 @@ import org.eclipse.core.runtime.CoreException;
 
 class PDOMCPPConstructor extends PDOMCPPMethod implements ICPPConstructor {
 
-	public PDOMCPPConstructor(PDOMLinkage linkage, PDOMNode parent, ICPPConstructor method) throws CoreException, DOMException {
+	public PDOMCPPConstructor(PDOMLinkage linkage, PDOMNode parent, ICPPConstructor method)
+			throws CoreException, DOMException {
 		super(linkage, parent, method);
 	}
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorInstance.java
index 87a18b70003..7af275ab856 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorInstance.java
@@ -20,19 +20,16 @@ import org.eclipse.core.runtime.CoreException;
 
 /**
  * @author Bryan Wilkinson
- * 
  */
-public class PDOMCPPConstructorInstance extends PDOMCPPMethodInstance implements
-		ICPPConstructor {
-
+public class PDOMCPPConstructorInstance extends PDOMCPPMethodInstance implements ICPPConstructor {
 	/**
 	 * The size in bytes of a PDOMCPPConstructorInstance record in the database.
 	 */
 	@SuppressWarnings("hiding")
 	protected static final int RECORD_SIZE = PDOMCPPMethodInstance.RECORD_SIZE + 0;
 	
-	public PDOMCPPConstructorInstance(PDOMLinkage linkage, PDOMNode parent, ICPPMethod method, PDOMBinding instantiated)
-			throws CoreException {
+	public PDOMCPPConstructorInstance(PDOMLinkage linkage, PDOMNode parent, ICPPMethod method,
+			PDOMBinding instantiated) throws CoreException {
 		super(linkage, parent, method, instantiated);
 	}
 	
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorSpecialization.java
index bfe54411b4d..d3e5e21bafd 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorSpecialization.java
@@ -19,11 +19,8 @@ import org.eclipse.core.runtime.CoreException;
 
 /**
  * @author Bryan Wilkinson
- * 
  */
-class PDOMCPPConstructorSpecialization extends
-		PDOMCPPMethodSpecialization implements ICPPConstructor {
-
+class PDOMCPPConstructorSpecialization extends PDOMCPPMethodSpecialization implements ICPPConstructor {
 	/**
 	 * The size in bytes of a PDOMCPPConstructorSpecialization record in the database.
 	 */
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplate.java
index 27e4d1febad..f4a07040df8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplate.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplate.java
@@ -19,10 +19,8 @@ import org.eclipse.core.runtime.CoreException;
 
 /**
  * @author Bryan Wilkinson
- * 
  */
-class PDOMCPPConstructorTemplate extends PDOMCPPMethodTemplate implements
-		ICPPConstructor {
+class PDOMCPPConstructorTemplate extends PDOMCPPMethodTemplate implements ICPPConstructor {
 
 	public PDOMCPPConstructorTemplate(PDOMCPPLinkage linkage, PDOMNode parent, ICPPConstructor method) 
 			throws CoreException, DOMException {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplateSpecialization.java
index 363ea3a958e..7e1c5d4f9c7 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplateSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplateSpecialization.java
@@ -19,11 +19,9 @@ import org.eclipse.core.runtime.CoreException;
 
 /**
  * @author Bryan Wilkinson
- * 
  */
-class PDOMCPPConstructorTemplateSpecialization extends
-		PDOMCPPMethodTemplateSpecialization implements ICPPConstructor {
-
+class PDOMCPPConstructorTemplateSpecialization extends PDOMCPPMethodTemplateSpecialization
+		implements ICPPConstructor {
 	/**
 	 * The size in bytes of a PDOMCPPConstructorTemplateSpecialization record in the database.
 	 */
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredClassInstance.java
index ab4a13c41d0..7f7ac592382 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredClassInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredClassInstance.java
@@ -46,8 +46,8 @@ import org.eclipse.core.runtime.CoreException;
  * Deferred class instances collect information about an instantiation until it can be
  * carried out.
  */
-class PDOMCPPDeferredClassInstance extends PDOMCPPSpecialization implements ICPPDeferredClassInstance, IPDOMMemberOwner, IIndexType {
-
+class PDOMCPPDeferredClassInstance extends PDOMCPPSpecialization
+		implements ICPPDeferredClassInstance, IPDOMMemberOwner, IIndexType {
 	private static final int MEMBERLIST = PDOMCPPSpecialization.RECORD_SIZE + 0;
 	private static final int ARGUMENTS = PDOMCPPSpecialization.RECORD_SIZE + 4;	
 	/**
@@ -58,8 +58,8 @@ class PDOMCPPDeferredClassInstance extends PDOMCPPSpecialization implements ICPP
 
 	private ICPPScope unknownScope;
 	
-	public PDOMCPPDeferredClassInstance(PDOMLinkage linkage, PDOMNode parent, ICPPDeferredClassInstance classType, PDOMBinding instantiated)
-			throws CoreException {
+	public PDOMCPPDeferredClassInstance(PDOMLinkage linkage, PDOMNode parent,
+			ICPPDeferredClassInstance classType, PDOMBinding instantiated) throws CoreException {
 		super(linkage, parent, classType, instantiated);
 
 		final ICPPTemplateArgument[] args= classType.getTemplateArguments();