From f86ee9bbf7166711a10bc90d85487c1b0a6cfb82 Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Wed, 17 Dec 2014 17:02:06 -0800
Subject: [PATCH] Cosmetics.

---
 .../ui/refactoring/StubTypeContext.java        |  2 +-
 .../ui/refactoring/rename/ASTManager.java      | 18 +++++++++---------
 .../rename/CRefactoringArgument.java           |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/StubTypeContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/StubTypeContext.java
index 4223a0eee31..dc88f87b693 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/StubTypeContext.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/StubTypeContext.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *     Sergey Prigogin (Googel)
+ *     Sergey Prigogin (Google)
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui.refactoring;
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java
index a269d6d69e4..dc470cbca9d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java
@@ -133,8 +133,8 @@ public class ASTManager implements IDisposable {
     public final static int UNKNOWN= -1;
     
 	private IASTTranslationUnit fSharedAST;
-    private Map<IFile, IASTTranslationUnit> fTranslationUnits= new HashMap<IFile, IASTTranslationUnit>();
-    private HashSet<String> fProblemUnits= new HashSet<String>();
+    private Map<IFile, IASTTranslationUnit> fTranslationUnits= new HashMap<>();
+    private HashSet<String> fProblemUnits= new HashSet<>();
     private CRefactoringArgument fArgument;
     private IBinding[] fValidBindings;
     private String fRenameTo;
@@ -1008,9 +1008,9 @@ public class ASTManager implements IDisposable {
 
     private void analyzeTextMatchesOfTranslationUnit(IASTTranslationUnit tu, 
             final CRefactoringMatchStore store, final RefactoringStatus status) {
-        fKnownBindings= new HashMap<IBinding, Integer>();
-        fConflictingBinding= new HashSet<IBinding>();
-        final Set<IPath> paths= new HashSet<IPath>();
+        fKnownBindings= new HashMap<>();
+        fConflictingBinding= new HashSet<>();
+        final Set<IPath> paths= new HashSet<>();
         boolean renamesMacro= fArgument.getArgumentKind() == CRefactory.ARGUMENT_MACRO;
         
         analyzeMacroMatches(tu, store, paths, status);
@@ -1186,7 +1186,7 @@ public class ASTManager implements IDisposable {
             cmp= UNKNOWN;
             handleProblemBinding(name.getTranslationUnit(), (IProblemBinding) binding, status);
         } else {
-        	// check whether a qualifier has a problem binding
+        	// Check whether a qualifier has a problem binding.
         	boolean problemInQualifier= false;
         	IASTNode parent= name.getParent();
         	if (parent instanceof ICPPASTQualifiedName) {
@@ -1231,7 +1231,7 @@ public class ASTManager implements IDisposable {
         			}
         		}
         	}
-            fKnownBindings.put(binding, new Integer(cmp));
+            fKnownBindings.put(binding, Integer.valueOf(cmp));
         }
         switch (cmp) {
         case TRUE:
@@ -1496,12 +1496,12 @@ public class ASTManager implements IDisposable {
                 }
             }            
 
-            if (newBindingsAboverOrEqual != null && newBindingsAboverOrEqual.length>0) {
+            if (newBindingsAboverOrEqual != null && newBindingsAboverOrEqual.length > 0) {
                 break;
             }
         }
         if (newBindingsAboverOrEqual == null) {
-            newBindingsAboverOrEqual= new IBinding[0];
+            newBindingsAboverOrEqual= IBinding.EMPTY_BINDING_ARRAY;
         }
         
         // check conflicting bindings for being from above or equal level.
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringArgument.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringArgument.java
index ff9eee6f3db..12d4c99d411 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringArgument.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringArgument.java
@@ -35,7 +35,7 @@ import org.eclipse.cdt.core.model.ISourceReference;
 import org.eclipse.cdt.ui.CUIPlugin;
 
 /**
- * Represents the input to a refactoring. Important is file and offset the rest
+ * Represents the input to a refactoring. Important are file and offset, the rest
  * can be calculated from the AST.
  */
 public class CRefactoringArgument {