diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java
index 5dd7d221db5..2848f3fc7c8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java
@@ -117,6 +117,7 @@ public class PDOMManager implements IWritableIndexManager, IListener {
 
 	private final class PCL implements IPreferenceChangeListener {
 		private ICProject fProject;
+
 		public PCL(ICProject prj) {
 			fProject= prj;
 		}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMFile.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMFile.java
index a8692a2927c..f2a399c0ada 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMFile.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMFile.java
@@ -770,7 +770,7 @@ public class PDOMFile implements IIndexFragmentFile {
 			}
 			return result;
 		}
-		return new IIndexFragmentFile[0];
+		return IIndexFragmentFile.EMPTY_ARRAY;
 	}
 
 	public static PDOMFile recreateFile(PDOM pdom, final long record) throws CoreException {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFastIndexer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFastIndexer.java
index 66da09ce548..7ae979e6577 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFastIndexer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFastIndexer.java
@@ -6,13 +6,11 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    QNX - Initial API and implementation
- *    Markus Schorn (Wind River Systems)
+ *     QNX - Initial API and implementation
+ *     Markus Schorn (Wind River Systems)
  *******************************************************************************/
-
 package org.eclipse.cdt.internal.core.pdom.indexer;
 
-
 import org.eclipse.cdt.core.dom.IPDOMIndexerTask;
 import org.eclipse.cdt.core.dom.IPDOMManager;
 import org.eclipse.cdt.core.model.ITranslationUnit;
@@ -23,7 +21,7 @@ import org.eclipse.cdt.core.model.ITranslationUnit;
 public class PDOMFastIndexer extends AbstractPDOMIndexer {
 	// Must match extension id
 	public static final String ID = IPDOMManager.ID_FAST_INDEXER;
-		
+
 	@Override
 	public String getID() {
 		return ID;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FreshenIndexAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FreshenIndexAction.java
index ffed3d4d1c1..d901e3f404f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FreshenIndexAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FreshenIndexAction.java
@@ -6,14 +6,13 @@
  * 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.actions;
 
 import org.eclipse.cdt.core.index.IIndexManager;
 
 public class FreshenIndexAction extends AbstractUpdateIndexAction {
-
 	@Override
 	protected int getUpdateOptions() {
 		return IIndexManager.UPDATE_ALL | IIndexManager.UPDATE_EXTERNAL_FILES_FOR_PROJECT;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/UpdateIndexWithModifiedFilesAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/UpdateIndexWithModifiedFilesAction.java
index d8fbca40dfc..569f0717606 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/UpdateIndexWithModifiedFilesAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/UpdateIndexWithModifiedFilesAction.java
@@ -6,17 +6,18 @@
  * 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.actions;
 
 import org.eclipse.cdt.core.index.IIndexManager;
 
 public class UpdateIndexWithModifiedFilesAction extends AbstractUpdateIndexAction {
-
 	@Override
 	protected int getUpdateOptions() {
-		return IIndexManager.UPDATE_CHECK_TIMESTAMPS | IIndexManager.UPDATE_CHECK_CONFIGURATION |
-		IIndexManager.UPDATE_EXTERNAL_FILES_FOR_PROJECT | IIndexManager.UPDATE_CHECK_CONTENTS_HASH;
+		return IIndexManager.UPDATE_CHECK_TIMESTAMPS |
+				IIndexManager.UPDATE_CHECK_CONFIGURATION |
+				IIndexManager.UPDATE_EXTERNAL_FILES_FOR_PROJECT |
+				IIndexManager.UPDATE_CHECK_CONTENTS_HASH;
 	}
 }