Cosmetics.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTInitializerList.java

@@ -20,7 +20,6 @@ import org.eclipse.cdt.core.dom.ast.IASTInitializerList;
  * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ICPPASTInitializerList extends IASTInitializerList, ICPPASTInitializerClause, ICPPASTPackExpandable {
-
 	@Override
 	ICPPASTInitializerList copy();
 

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CArrayType.java

@@ -157,7 +157,6 @@ public class CArrayType implements ICArrayType, ITypeContainer, ISerializableTyp
 		return ASTTypeUtil.getType(this);
 	}
 
-	
 	@Override
 	public void marshal(ITypeMarshalBuffer buffer) throws CoreException {
 		int firstByte= ITypeMarshalBuffer.ARRAY_TYPE;
@@ -174,7 +173,6 @@ public class CArrayType implements ICArrayType, ITypeContainer, ISerializableTyp
 			firstByte |= ITypeMarshalBuffer.FLAG1;
 		}
 
-
 		val= getSize();
 		if (val != null) {
 			firstByte |= ITypeMarshalBuffer.FLAG2;

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateNonTypeParameter.java

@@ -32,10 +32,9 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor;
 /**
  * Binding for a non-type template parameter.
  */
-public class CPPTemplateNonTypeParameter extends CPPTemplateParameter implements
-		ICPPTemplateNonTypeParameter {
-
-	private IType type = null;
+public class CPPTemplateNonTypeParameter extends CPPTemplateParameter
+		implements ICPPTemplateNonTypeParameter {
+	private IType type;
 	
 	public CPPTemplateNonTypeParameter(IASTName name) {
 		super(name);
@@ -123,26 +122,32 @@ public class CPPTemplateNonTypeParameter extends CPPTemplateParameter implements
 	public boolean isStatic() {
 		return false;
 	}
+
 	@Override
 	public boolean isExtern() {
 		return false;
 	}
+
 	@Override
 	public boolean isAuto() {
 		return false;
 	}
+
 	@Override
 	public boolean isRegister() {
 		return false;
 	}
+
 	@Override
 	public IValue getInitialValue() {
 		return null;
 	}
+
 	@Override
 	public boolean isExternC() {
 		return false;
 	}
+
 	@Override
 	public boolean isMutable() {
 		return false;

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/TemplateInstanceUtil.java

@@ -26,15 +26,16 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameter;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameterMap;
 import org.eclipse.cdt.core.index.IIndexBinding;
 import org.eclipse.cdt.core.parser.util.ObjectMap;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateArgument;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateParameterMap;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateTypeArgument;
 import org.eclipse.cdt.internal.core.index.IIndexFragmentBinding;
 import org.eclipse.cdt.internal.core.index.composite.ICompositesFactory;
 
 /**
- * For implementation re-use in the absence of multiple inheritance
+ * For implementation re-use in the absence of multiple inheritance.
  */
 public class TemplateInstanceUtil {
+
 	public static ICPPTemplateParameterMap getTemplateParameterMap(ICompositesFactory cf, ICPPTemplateInstance rbinding) {
 		ICPPTemplateParameterMap preresult= rbinding.getTemplateParameterMap();
 		Integer[] keys= preresult.getAllParameterPositions();
@@ -50,8 +51,8 @@ public class TemplateInstanceUtil {
 					result.put(key, convert(cf, pack));
 				}
 			}
-		} catch(DOMException de) {
-			CCorePlugin.log(de);
+		} catch (DOMException e) {
+			CCorePlugin.log(e);
 		}
 		return result;
 	}
@@ -105,7 +106,7 @@ public class TemplateInstanceUtil {
 		final IType typeValue = arg.getTypeValue();
 		IType t= cf.getCompositeType(typeValue);
 		if (t != typeValue) {
-			return new CPPTemplateArgument(t);
+			return new CPPTemplateTypeArgument(t);
 		}
 		return arg;
 	}
@@ -128,8 +129,7 @@ public class TemplateInstanceUtil {
 		for (int i= 0; i < keys.length && i < keysToAdapt.length; i++) {
 			IType type= (IType) preresult.get(keys[i]);
 			result.put(
-					cf.getCompositeBinding((IIndexFragmentBinding)keysToAdapt[i]),
-					cf.getCompositeType(type));
+					cf.getCompositeBinding((IIndexFragmentBinding) keysToAdapt[i]), cf.getCompositeType(type));
 		}
 		
 		return result;
@@ -144,8 +144,8 @@ public class TemplateInstanceUtil {
 	public static IType[] getArguments(ICompositesFactory cf, ICPPClassTemplatePartialSpecialization rbinding) {
 		try {
 			return getArguments(cf, rbinding.getArguments());
-		} catch(DOMException de) {
-			CCorePlugin.log(de);
+		} catch (DOMException e) {
+			CCorePlugin.log(e);
 			return IType.EMPTY_TYPE_ARRAY;
 		}
 	}

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPArgumentList.java

@@ -15,7 +15,6 @@ import org.eclipse.cdt.core.dom.ast.IType;
 import org.eclipse.cdt.core.dom.ast.IValue;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateArgument;
 import org.eclipse.cdt.internal.core.dom.parser.ProblemType;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateArgument;
 import org.eclipse.cdt.internal.core.pdom.db.Database;
 import org.eclipse.cdt.internal.core.pdom.dom.PDOMLinkage;
 import org.eclipse.cdt.internal.core.pdom.dom.PDOMNode;
@@ -40,7 +39,8 @@ public class PDOMCPPArgumentList {
 		final long block= db.malloc(2 + NODE_SIZE * len);
 		long p= block;
 
-		db.putShort(p, len); p+=2;
+		db.putShort(p, len);
+		p += 2;
 		for (int i= 0; i < len; i++, p += NODE_SIZE) {
 			final ICPPTemplateArgument arg = templateArguments[i];
 			final boolean isNonType= arg.isNonTypeValue();
@@ -54,7 +54,6 @@ public class PDOMCPPArgumentList {
 		return block;
 	}
 
-
 	/**
 	 * Restores an array of template arguments from the database.
 	 */

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateNonTypeParameter.java

@@ -24,7 +24,6 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateArgument;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateNonTypeParameter;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameter;
 import org.eclipse.cdt.internal.core.Util;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateArgument;
 import org.eclipse.cdt.internal.core.index.IIndexCPPBindingConstants;
 import org.eclipse.cdt.internal.core.pdom.db.Database;
 import org.eclipse.cdt.internal.core.pdom.dom.IPDOMMemberOwner;
@@ -35,9 +34,8 @@ import org.eclipse.core.runtime.CoreException;
 /**
  * Binding for template non-type parameter in the index.
  */
-class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMemberOwner,
-		ICPPTemplateNonTypeParameter, IPDOMCPPTemplateParameter {
-
+class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding
+		implements IPDOMMemberOwner, ICPPTemplateNonTypeParameter, IPDOMCPPTemplateParameter {
 	private static final int TYPE_OFFSET= PDOMCPPBinding.RECORD_SIZE;
 	private static final int PARAMETERID= TYPE_OFFSET + Database.TYPE_SIZE;
 	private static final int DEFAULTVAL= PARAMETERID + Database.VALUE_SIZE;
@@ -184,18 +182,22 @@ class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMem
 	public IValue getInitialValue() {
 		return null;
 	}
+
 	@Override
 	public boolean isAuto() {
 		return false;
 	}
+
 	@Override
 	public boolean isExtern() {
 		return false;
 	}
+
 	@Override
 	public boolean isRegister() {
 		return false;
 	}
+
 	@Override
 	public boolean isStatic() {
 		return false;
@@ -204,6 +206,7 @@ class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMem
 	public boolean isExternC() {
 		return false;
 	}
+
 	@Override
 	public boolean isMutable() {
 		return false;
@@ -213,6 +216,7 @@ class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMem
 	public Object clone() {
 		throw new UnsupportedOperationException(); 
 	}
+
 	/**
 	 * @deprecated
 	 */
@@ -221,5 +225,4 @@ class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMem
 	public IASTExpression getDefault() {
 		return null;
 	}
-
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateParameterMap.java

@@ -16,7 +16,6 @@ import org.eclipse.cdt.core.dom.ast.IValue;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateArgument;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameterMap;
 import org.eclipse.cdt.internal.core.dom.parser.ProblemType;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateArgument;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateParameterMap;
 import org.eclipse.cdt.internal.core.pdom.db.Database;
 import org.eclipse.cdt.internal.core.pdom.dom.PDOMLinkage;
@@ -140,7 +139,6 @@ public class PDOMCPPTemplateParameterMap {
 		return result;
 	}
 
-
 	private static ICPPTemplateArgument readArgument(long rec, final PDOMLinkage linkage, final Database db)
 			throws CoreException {
 		IType type= linkage.loadType(rec + TYPE_OFFSET);