From e3e3e5ef70c537d7ba7c5193796280c239649593 Mon Sep 17 00:00:00 2001
From: Andrew Gvozdev <angvoz.dev@gmail.com>
Date: Mon, 25 Jan 2010 14:57:54 +0000
Subject: [PATCH] cosmetics: generics

---
 .../model/util/CSettingEntryFactory.java      | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/CSettingEntryFactory.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/CSettingEntryFactory.java
index d1243eb4298..b82fe3530f1 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/CSettingEntryFactory.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/CSettingEntryFactory.java
@@ -22,19 +22,20 @@ import org.eclipse.core.runtime.IPath;
 public class CSettingEntryFactory {
 	private static final HashSet<IPath> EMPTY_SET = new HashSet<IPath>(0);
 	
-	private KindBasedStore fStore = new KindBasedStore(false);
+	private KindBasedStore<HashMap<String, ?>> fStore = new KindBasedStore<HashMap<String, ?>>(false);
 	
-	private HashMap getNameMap(int kind, boolean create){
-		HashMap map = (HashMap)fStore.get(kind);
+	private <K, V> HashMap<String, HashMap<K, V>> getNameMap(int kind, boolean create, HashMap<K, V> type){
+		@SuppressWarnings("unchecked")
+		HashMap<String, HashMap<K, V>> map = (HashMap<String, HashMap<K, V>>) fStore.get(kind);
 		if(map == null && create){
-			map = new HashMap();
+			map = new HashMap<String, HashMap<K, V>>();
 			fStore.put(kind, map);
 		}
 		return map;
 	}
 
-	private HashMap getValueMap(String name, boolean create){
-		HashMap nameMap = getNameMap(ICSettingEntry.MACRO, create);
+	private <K, V> HashMap<K, V> getValueMap(String name, boolean create, HashMap<K, V> type){
+		HashMap<String, HashMap<K, V>> nameMap = getNameMap(ICSettingEntry.MACRO, create, (HashMap<K, V>)null);
 		if(nameMap != null){
 			return getMap(nameMap, name, create);
 		}
@@ -44,21 +45,21 @@ public class CSettingEntryFactory {
 	private HashMap<Integer, ICSettingEntry> getFlagMap(int kind, String name, String value, IPath[] exclusionPatters, boolean create){
 		switch(kind){
 		case ICSettingEntry.MACRO:
-			HashMap valueMap = getValueMap(name, create);
+			HashMap<String, HashMap<Integer, ICSettingEntry>> valueMap = getValueMap(name, create, (HashMap<String, HashMap<Integer, ICSettingEntry>>)null);
 			if(valueMap != null){
 				return getMap(valueMap, name, create);
 			}
 			return null;
 		case ICSettingEntry.SOURCE_PATH:
 		case ICSettingEntry.OUTPUT_PATH:
-			HashMap excPatternMap = getExclusionPatternsMap(kind, name, create);
+			HashMap<HashSet<IPath>, HashMap<Integer, ICSettingEntry>> excPatternMap = getExclusionPatternsMap(kind, name, create);
 			if(excPatternMap != null){
 				HashSet<IPath> setKey = exclusionPatters == null || exclusionPatters.length == 0 ? EMPTY_SET : new HashSet<IPath>(Arrays.asList(exclusionPatters)); 
 				return getMap(excPatternMap, setKey, create);
 			}
 			return null;
 		default:
-			HashMap nameMap = getNameMap(kind, create);
+			HashMap<String, HashMap<Integer, ICSettingEntry>> nameMap = getNameMap(kind, create, (HashMap<Integer, ICSettingEntry>)null);
 			if(nameMap != null){
 				return getMap(nameMap, name, create);
 			}
@@ -66,18 +67,18 @@ public class CSettingEntryFactory {
 		}
 	}
 	
-	private HashMap getExclusionPatternsMap(int kind, String name, boolean create){
-		HashMap nameMap = getNameMap(kind, create);
+	private HashMap<HashSet<IPath>, HashMap<Integer, ICSettingEntry>> getExclusionPatternsMap(int kind, String name, boolean create){
+		HashMap<String, HashMap<HashSet<IPath>, HashMap<Integer, ICSettingEntry>>> nameMap = getNameMap(kind, create, (HashMap<HashSet<IPath>, HashMap<Integer, ICSettingEntry>>)null);
 		if(nameMap != null){
 			return getMap(nameMap, name, create);
 		}
 		return null;
 	}
 	
-	private static HashMap getMap(HashMap container, Object key, boolean create){
-		HashMap map = (HashMap)container.get(key);
+	private static <Key, K, V> HashMap<K, V> getMap(HashMap<Key, HashMap<K, V>> container, Key key, boolean create){
+		HashMap<K, V> map = container.get(key);
 		if(map == null && create){
-			map = new HashMap();
+			map = new HashMap<K, V>();
 			container.put(key, map);
 		}
 		return map;