diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/DBStatus.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/DBStatus.java
index 1f9d4e131cb..94fd4bf1d76 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/DBStatus.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/DBStatus.java
@@ -6,9 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- * QNX - Initial API and implementation
+ *     QNX - Initial API and implementation
  *******************************************************************************/
-
 package org.eclipse.cdt.internal.core.pdom.db;
 
 import java.io.IOException;
@@ -19,15 +18,12 @@ import org.eclipse.core.runtime.Status;
 
 /**
  * @author Doug Schaefer
- *
  */
 public class DBStatus extends Status {
-
 	/**
 	 * @param exception
 	 */
 	public DBStatus(IOException exception) {
 		super(IStatus.ERROR, CCorePlugin.PLUGIN_ID, 0, "IOException", exception); //$NON-NLS-1$
 	}
-
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/IString.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/IString.java
index c2368730a4d..b93e01e9228 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/IString.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/IString.java
@@ -10,7 +10,6 @@
  *     Andrew Ferguson (Symbian)
  *     Markus Schorn (Wind River Systems)
  *******************************************************************************/
-
 package org.eclipse.cdt.internal.core.pdom.db;
 
 import org.eclipse.core.runtime.CoreException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/LongString.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/LongString.java
index 6b9751836b2..963a1d2977c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/LongString.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/LongString.java
@@ -10,7 +10,6 @@
  *     Andrew Ferguson (Symbian)
  *     Markus Schorn (Wind River Systems)
  *******************************************************************************/
-
 package org.eclipse.cdt.internal.core.pdom.db;
 
 import org.eclipse.cdt.core.CCorePlugin;
@@ -47,8 +46,8 @@ public class LongString implements IString {
 	}
 	
 	public LongString(Database db, final char[] chars, boolean useBytes) throws CoreException {
-		final int numChars1 = useBytes ? NUM_CHARS1*2 : NUM_CHARS1;
-		final int numCharsn = useBytes ? NUM_CHARSN*2 : NUM_CHARSN;
+		final int numChars1 = useBytes ? NUM_CHARS1 * 2 : NUM_CHARS1;
+		final int numCharsn = useBytes ? NUM_CHARSN * 2 : NUM_CHARSN;
 
 		this.db = db;
 		this.record = db.malloc(Database.MAX_MALLOC_SIZE);
@@ -67,7 +66,7 @@ public class LongString implements IString {
 		// write the subsequent records
 		long lastNext = this.record + NEXT1;
 		int start = numChars1;
-		while (length-start > numCharsn) {
+		while (length - start > numCharsn) {
 			long nextRecord = db.malloc(Database.MAX_MALLOC_SIZE);
 			db.putRecPtr(lastNext, nextRecord);
 			chunk= db.getChunk(nextRecord);
@@ -115,9 +114,9 @@ public class LongString implements IString {
 		long p = record;
 		Chunk chunk= db.getChunk(p);
 		if (useBytes) {
-			chunk.getCharsFromBytes(p+CHARS1, chars, 0, numChars1);
+			chunk.getCharsFromBytes(p + CHARS1, chars, 0, numChars1);
 		} else {
-			chunk.getChars(p+CHARS1, chars, 0, numChars1);
+			chunk.getChars(p + CHARS1, chars, 0, numChars1);
 		}
 		
 		int start= numChars1;
@@ -129,12 +128,12 @@ public class LongString implements IString {
 			int partLen= Math.min(length-start, numCharsn);
 			chunk= db.getChunk(p);
 			if (useBytes) {
-				chunk.getCharsFromBytes(p+CHARSN, chars, start, partLen);
+				chunk.getCharsFromBytes(p + CHARSN, chars, start, partLen);
 			} else {
-				chunk.getChars(p+CHARSN, chars, start, partLen);
+				chunk.getChars(p + CHARSN, chars, start, partLen);
 			}
-			start+= partLen;
-			p=p+NEXTN;
+			start += partLen;
+			p=p + NEXTN;
 		}
 		return chars;
 	}
@@ -201,7 +200,7 @@ public class LongString implements IString {
 				chars = getChars();
 				final int len = chars.length;
 				for (int i = 0; i < len; i++) {
-					h = 31*h + chars[i];
+					h = 31 * h + chars[i];
 				}
 			} catch (CoreException e) {
 			}
@@ -235,7 +234,6 @@ public class LongString implements IString {
 		return ShortString.comparePrefix(getChars(), other, caseSensitive);
 	}
 
-	
 	@Override
 	public String getString() throws CoreException {
 		return new String(getChars());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Messages.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Messages.java
index e99562efe86..3f7e8bd1f99 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Messages.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Messages.java
@@ -16,8 +16,7 @@ import java.util.ResourceBundle;
 public class Messages {
 	private static final String BUNDLE_NAME = "org.eclipse.cdt.internal.core.pdom.db.messages"; //$NON-NLS-1$
 
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
 
 	private Messages() {
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java
index 5c9198bba2f..d260b1e4b9c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.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.core.pdom.db;
 
@@ -28,7 +28,7 @@ import org.eclipse.core.runtime.CoreException;
  * For marshalling types to byte arrays.
  */
 public class TypeMarshalBuffer implements ITypeMarshalBuffer {
-	public final static byte [] EMPTY= {0,0,0,0,0,0};
+	public final static byte[] EMPTY= { 0, 0, 0, 0, 0, 0 };
 	public final static byte NULL_TYPE= 0;
 	public final static byte INDIRECT_TYPE= (byte) -1;
 	public final static byte BINDING_TYPE= (byte) -2;