diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/ICodanDisposable.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/ICodanDisposable.java
index a175c058090..8a4683270c2 100644
--- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/ICodanDisposable.java
+++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/ICodanDisposable.java
@@ -25,8 +25,8 @@ package org.eclipse.cdt.codan.core.model;
  */
 public interface ICodanDisposable {
 	/**
-	 * Disposes of the cache. This method has to be called exactly once during
-	 * the life cycle of the cache.
+	 * Disposes of the object. This method has to be called exactly once during
+	 * the life cycle of the object.
 	 */
 	public void dispose();
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
index 7d92162159d..a1cf6a2d9f5 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
@@ -3224,7 +3224,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
 	 *
 	 * @since 4.0
 	 */
-	private boolean isSemanticHighlightingEnabled() {
+	protected boolean isSemanticHighlightingEnabled() {
 		return SemanticHighlightings.isEnabled(getPreferenceStore()) && !(isEnableScalablilityMode() && getPreferenceStore().getBoolean(PreferenceConstants.SCALABILITY_SEMANTIC_HIGHLIGHT));
 	}
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoringContribution.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoringContribution.java
index ea8c33cab3a..eca83abe692 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoringContribution.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoringContribution.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html  
  * 
  * Contributors: 
- * Institute for Software (IFS)- initial API and implementation 
+ *     Institute for Software (IFS)- initial API and implementation 
  ******************************************************************************/
 package org.eclipse.cdt.internal.ui.refactoring;
 
@@ -18,7 +18,6 @@ import org.eclipse.ltk.core.refactoring.RefactoringDescriptor;
 
 /**
  * @author Emanuel Graf IFS
- *
  */
 public abstract class CRefactoringContribution extends RefactoringContribution {
 
@@ -32,9 +31,8 @@ public abstract class CRefactoringContribution extends RefactoringContribution {
 		if (descriptor instanceof CRefactoringDescription) {
 			CRefactoringDescription refDesc = (CRefactoringDescription) descriptor;
 			return refDesc.getParameterMap();
-		}else {
+		} else {
 			return super.retrieveArgumentMap(descriptor);
 		}
 	}
-
 }
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringContribution.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringContribution.java
index a0e1be67eec..1d5a89a8bc9 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringContribution.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringContribution.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html  
  * 
  * Contributors: 
- * Institute for Software (IFS)- initial API and implementation 
+ *     Institute for Software (IFS)- initial API and implementation 
  ******************************************************************************/
 package org.eclipse.cdt.internal.ui.refactoring.extractconstant;
 
@@ -19,21 +19,18 @@ import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContribution;
 
 /**
  * @author Emanuel Graf IFS
- *
  */
-public class ExtractConstantRefactoringContribution extends
-		CRefactoringContribution {
+public class ExtractConstantRefactoringContribution extends CRefactoringContribution {
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public RefactoringDescriptor createDescriptor(String id, String project,
 			String description, String comment, Map arguments, int flags)
 			throws IllegalArgumentException {
-		if(id.equals(ExtractConstantRefactoring.ID)) {
+		if (id.equals(ExtractConstantRefactoring.ID)) {
 			return new ExtractConstantRefactoringDescription(project, description, comment, arguments);
-		}else {
+		} else {
 			return null;
 		}
 	}
-
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringContribution.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringContribution.java
index 344b3279fe0..602d5df5a8f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringContribution.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringContribution.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html  
  * 
  * Contributors: 
- * Institute for Software (IFS)- initial API and implementation 
+ * 	   Institute for Software (IFS)- initial API and implementation 
  ******************************************************************************/
 package org.eclipse.cdt.internal.ui.refactoring.extractfunction;
 
@@ -19,7 +19,6 @@ import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContribution;
 
 /**
  * @author Emanuel Graf IFS
- *
  */
 public class ExtractFunctionRefactoringContribution extends CRefactoringContribution {
 
@@ -27,11 +26,10 @@ public class ExtractFunctionRefactoringContribution extends CRefactoringContribu
 	@Override
 	public RefactoringDescriptor createDescriptor(String id, String project, String description,
 			String comment, Map arguments, int flags) throws IllegalArgumentException {
-		if(id.equals(ExtractFunctionRefactoring.ID)) {
+		if (id.equals(ExtractFunctionRefactoring.ID)) {
 			return new ExtractFunctionRefactoringDescription(project, description, comment, arguments);
-		}else {
+		} else {
 			return null;
 		}
 	}
-
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringContribution.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringContribution.java
index 51c455923a3..4e5c892d650 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringContribution.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringContribution.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html  
  * 
  * Contributors: 
- * Institute for Software (IFS)- initial API and implementation 
+ *     Institute for Software (IFS)- initial API and implementation 
  ******************************************************************************/
 package org.eclipse.cdt.internal.ui.refactoring.extractlocalvariable;
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringContribution.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringContribution.java
index 0bc51da622a..39dbc7c6d9e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringContribution.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringContribution.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html  
  * 
  * Contributors: 
- * Institute for Software (IFS)- initial API and implementation 
+ *     Institute for Software (IFS)- initial API and implementation 
  ******************************************************************************/
 package org.eclipse.cdt.internal.ui.refactoring.hidemethod;
 
@@ -19,7 +19,6 @@ import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContribution;
 
 /**
  * @author Emanuel Graf IFS
- *
  */
 public class HideMethodRefactoringContribution extends CRefactoringContribution {
 
@@ -27,11 +26,10 @@ public class HideMethodRefactoringContribution extends CRefactoringContribution
 	@Override
 	public RefactoringDescriptor createDescriptor(String id, String project, String description,
 			String comment, Map arguments, int flags) throws IllegalArgumentException {
-		if(id.equals(HideMethodRefactoring.ID)) {
+		if (id.equals(HideMethodRefactoring.ID)) {
 			return new HideMethodRefactoringDescription(project, description, comment, arguments);
-		}else {
+		} else {
 			return null;
 		}
 	}
-
 }