From 8997a49ef1a91af088dd2fff0ba58ea83b549fff Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Tue, 4 Nov 2014 12:02:51 -0800
Subject: [PATCH] Cosmetics.

---
 .../ui/refactoring/utils/NamespaceHelper.java  | 18 +++++++++---------
 .../cdt/internal/ui/viewsupport/IndexUI.java   |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NamespaceHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NamespaceHelper.java
index 802a1e8d873..2c313a14d35 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NamespaceHelper.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NamespaceHelper.java
@@ -40,7 +40,8 @@ import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContext;
  */
 public class NamespaceHelper {
 	/**
-	 * Returns the qualified name of all namespaces that are defined at the specified translation unit and offset.
+	 * Returns the qualified name of all namespaces that are defined at the specified translation
+	 * unit and offset.
 	 * 
 	 * @param translationUnit
 	 * @param offset
@@ -55,11 +56,12 @@ public class NamespaceHelper {
 		astCache.getAST(translationUnit, null).accept(new CPPASTAllVisitor() {
 			@Override
 			public int visit(IASTDeclSpecifier declSpec) {
-				if (declSpec instanceof ICPPASTCompositeTypeSpecifier && checkFileNameAndLocation(translationUnit.getLocation(), offset, declSpec)) {
-						qualifiedName.addName(createNameWithTemplates(declSpec));
-					}
-					return super.visit(declSpec);
+				if (declSpec instanceof ICPPASTCompositeTypeSpecifier &&
+						checkFileNameAndLocation(translationUnit.getLocation(), offset, declSpec)) {
+					qualifiedName.addName(createNameWithTemplates(declSpec));
 				}
+				return super.visit(declSpec);
+			}
 		
 			@Override
 			public int visit(ICPPASTNamespaceDefinition namespace) {
@@ -92,16 +94,14 @@ public class NamespaceHelper {
 	}
 	
 	private static IASTName createNameWithTemplates(IASTNode declarationParent) {
-		IASTName parentName;
-		parentName = ((ICPPASTCompositeTypeSpecifier) declarationParent).getName().copy(
+		IASTName parentName = ((ICPPASTCompositeTypeSpecifier) declarationParent).getName().copy(
 				CopyStyle.withLocations);
 		
 		if (classHasTemplates(declarationParent)) {
 			CPPASTTemplateId templateId = new CPPASTTemplateId();
 			templateId.setTemplateName(parentName);
 				
-			for (ICPPASTTemplateParameter templateParameter : ((ICPPASTTemplateDeclaration) declarationParent.getParent().getParent() ).getTemplateParameters()) {
-					
+			for (ICPPASTTemplateParameter templateParameter : ((ICPPASTTemplateDeclaration) declarationParent.getParent().getParent()).getTemplateParameters()) {
 				if (templateParameter instanceof CPPASTSimpleTypeTemplateParameter) {
 					CPPASTSimpleTypeTemplateParameter simpleTypeTemplateParameter = (CPPASTSimpleTypeTemplateParameter) templateParameter;
 					
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java
index 771a67253c7..daa17b3465f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java
@@ -289,7 +289,7 @@ public class IndexUI {
 		if (binding != null) {
 			IIndexName[] defs= index.findNames(binding, IIndex.FIND_DEFINITIONS | IIndex.SEARCH_ACROSS_LANGUAGE_BOUNDARIES);
 
-			ArrayList<ICElementHandle> result= new ArrayList<ICElementHandle>();
+			ArrayList<ICElementHandle> result= new ArrayList<>();
 			for (IIndexName in : defs) {
 				ICElementHandle definition= getCElementForName((ICProject) null, index, in);
 				if (definition != null) {
@@ -506,7 +506,7 @@ public class IndexUI {
 			for (ICPPTemplateInstance inst : instances) {
 				if (!ASTInternal.hasDeclaration(inst)) {
 					if (result == null)
-						result= new ArrayList<IBinding>(instances.length);
+						result= new ArrayList<>(instances.length);
 					result.add(inst);
 				}
 			}
@@ -524,7 +524,7 @@ public class IndexUI {
 					specializedMember= index.adaptBinding(specializedMember);
 					if (specializedMember != null) {
 						if (result == null)
-							result= new ArrayList<IBinding>(specializations.size());
+							result= new ArrayList<>(specializations.size());
 						result.add(specializedMember);
 						// Also add instances of the specialized member.
 						if (specializedMember instanceof ICPPInstanceCache) {