Cosmetics.

2 files changed, 16 insertions, 15 deletions

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java
index 1c7cfcf2092..dd50f94fd06 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java
@@ -15,6 +15,10 @@
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.pdom.dom.cpp;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.dom.IPDOMVisitor;
 import org.eclipse.cdt.core.dom.ast.ASTTypeUtil;
@@ -41,10 +45,6 @@ import org.eclipse.cdt.internal.core.pdom.dom.PDOMName;
 import org.eclipse.cdt.internal.core.pdom.dom.PDOMNode;
 import org.eclipse.core.runtime.CoreException;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 /**
  * @author Doug Schaefer
  */
@@ -66,7 +66,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO
 		setKind(classType);
 		setAnonymous(classType);
 		setFinal(classType);
-		// linked list is initialized by storage being zero'd by malloc
+		// Linked list is initialized by storage being zero'd by malloc
 	}
 
 	public PDOMCPPClassType(PDOMLinkage linkage, long bindingRecord) {
@@ -308,7 +308,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO
 			return bases;
 
 		try {
-			List<PDOMCPPBase> list = new ArrayList<PDOMCPPBase>();
+			List<PDOMCPPBase> list = new ArrayList<>();
 			for (PDOMCPPBase base = getFirstBase(); base != null; base = base.getNextBase()) {
 				list.add(base);
 			}
@@ -318,7 +318,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO
 			return bases;
 		} catch (CoreException e) {
 			CCorePlugin.log(e);
-			return new ICPPBase[0];
+			return ICPPBase.EMPTY_BASE_ARRAY;
 		}
 	}
 
@@ -373,7 +373,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO
 	@Override
 	public IBinding[] getFriends() {
 		try {
-			final List<IBinding> list = new ArrayList<IBinding>();
+			final List<IBinding> list = new ArrayList<>();
 			for (PDOMCPPFriend friend = getFirstFriend();
 					friend != null; friend = friend.getNextFriend()) {
 				list.add(0, friend.getFriendSpecifier());
@@ -381,7 +381,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO
 			return list.toArray(new IBinding[list.size()]);
 		} catch (CoreException e) {
 			CCorePlugin.log(e);
-			return new IBinding[0];
+			return IBinding.EMPTY_BINDING_ARRAY;
 		}
 	}
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespace.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespace.java
index 2e94b55a729..8038384b8da 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespace.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespace.java
@@ -193,7 +193,8 @@ class PDOMCPPNamespace extends PDOMCPPBinding
 		return null;
 	}
 	
-	@Deprecated	@Override
+	@Deprecated
+	@Override
 	public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup, IIndexFileSet fileSet) {
 		return getBindings(new ScopeLookupData(name, resolve, prefixLookup));
 	}
@@ -243,7 +244,7 @@ class PDOMCPPNamespace extends PDOMCPPBinding
 	@Override
 	public IBinding[] getMemberBindings() {
 		IBinding[] result = null;
-		final List<PDOMNode> preresult = new ArrayList<PDOMNode>();
+		final List<PDOMNode> preresult = new ArrayList<>();
 		try {
 			getIndex().accept(new IBTreeVisitor() {
 				@Override
@@ -257,8 +258,8 @@ class PDOMCPPNamespace extends PDOMCPPBinding
 				}
 			});
 			result = preresult.toArray(new IBinding[preresult.size()]);
-		} catch (CoreException ce) {
-			CCorePlugin.log(ce);
+		} catch (CoreException e) {
+			CCorePlugin.log(e);
 		}
 		return result;
 	}
@@ -288,7 +289,7 @@ class PDOMCPPNamespace extends PDOMCPPBinding
 			List<PDOMCPPNamespace> nslist = collectInlineNamespaces(getDB(), getLinkage(),
 					record + FIRST_NAMESPACE_CHILD_OFFSET);
 			if (nslist == null) {
-				fInlineNamespaces= new PDOMCPPNamespace[0];
+				fInlineNamespaces= ICPPNamespaceScope.EMPTY_NAMESPACE_SCOPE_ARRAY;
 			} else {
 				fInlineNamespaces= nslist.toArray(new PDOMCPPNamespace[nslist.size()]);
 			}
@@ -305,7 +306,7 @@ class PDOMCPPNamespace extends PDOMCPPBinding
 				PDOMCPPNamespace ns= new PDOMCPPNamespace(linkage, rec);
 				if (ns.isInline()) {
 					if (nslist == null) {
-						nslist= new ArrayList<PDOMCPPNamespace>();
+						nslist= new ArrayList<>();
 					}
 					nslist.add(ns);
 				}