From aad801dad01e0512fe71ac085f433583e0edb100 Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Mon, 11 Apr 2016 10:37:11 -0700
Subject: [PATCH] Code cleanup.

Change-Id: Id6ea0aa5450d623b0be1bb3acde8d0a0c4628d6d
---
 .../eclipse/cdt/core/parser/util/CharArraySet.java  | 13 +------------
 .../org/eclipse/cdt/core/parser/util/CharTable.java |  4 ++--
 .../eclipse/cdt/core/parser/util/ObjectTable.java   |  5 ++---
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArraySet.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArraySet.java
index 36272113058..d5d3482ba1a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArraySet.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArraySet.java
@@ -55,7 +55,7 @@ public class CharArraySet extends CharTable {
 	    }
 	}
 	
-	final public boolean remove(char[] key) {
+	public final boolean remove(char[] key) {
 		int i = lookup(key);
 		if (i < 0)
 			return false;
@@ -63,15 +63,4 @@ public class CharArraySet extends CharTable {
 		removeEntry(i);
 		return true;
 	}
-
-	@Override
-	final public void clear() {
-	    for (int i = 0; i < keyTable.length; i++) {
-	        keyTable[i] = null;
-	        hashTable[2 * i] = 0;
-	        hashTable[2 * i + 1] = 0;
-	        nextTable[i] = 0;
-	    }
-	    currEntry = -1;
-	}
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharTable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharTable.java
index 8e39ccebba8..6280a0b18ae 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharTable.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharTable.java
@@ -13,6 +13,7 @@
 package org.eclipse.cdt.core.parser.util;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -37,8 +38,7 @@ public class CharTable extends HashTable {
 	@Override
 	public void clear() {
 		super.clear();
-		for (int i = 0; i < capacity(); i++)
-			keyTable[i] = null;
+		Arrays.fill(keyTable, null);
 	}
 
 	@Override
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectTable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectTable.java
index c55ffdae2fa..a21464ed4a0 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectTable.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectTable.java
@@ -58,8 +58,7 @@ public abstract class ObjectTable<T> extends HashTable implements Iterable<T> {
 	@Override
 	public void clear() {
 		super.clear();
-	    for (int i = 0; i < keyTable.length; i++)
-	        keyTable[i] = null;
+		Arrays.fill(keyTable, null);
 	}
 
 	@Override
@@ -117,7 +116,7 @@ public abstract class ObjectTable<T> extends HashTable implements Iterable<T> {
 			if (buffer.equals(keyTable[i]))
 				return i;
 
-			// Follow the next chain
+			// Follow the next chain.
 			for (i = nextTable[i] - 1; i >= 0 && i != nextTable[i] - 1; i = nextTable[i] - 1) {
 				if (buffer.equals(keyTable[i]))
 					return i;