From 44392d77e452c4475da7697f2ff2b3500b146f89 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Mon, 25 Jan 2010 21:37:38 +0000 Subject: [PATCH] cosmetics: generics --- .../UserAndDiscoveredEntryLanguageData.java | 36 ++++++++++--------- .../util/UserAndDiscoveredEntryStorage.java | 8 ++--- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryLanguageData.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryLanguageData.java index 1a2bd406f86..1f333ffaff0 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryLanguageData.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryLanguageData.java @@ -18,7 +18,7 @@ import org.eclipse.cdt.core.settings.model.extension.CLanguageData; public abstract class UserAndDiscoveredEntryLanguageData extends EntryStorageBasedLanguageData { - private KindBasedStore fDisabledNameSetStore; + private KindBasedStore> fDisabledNameSetStore; public UserAndDiscoveredEntryLanguageData() { super(); @@ -35,15 +35,17 @@ public abstract class UserAndDiscoveredEntryLanguageData extends if(data instanceof UserAndDiscoveredEntryLanguageData){ UserAndDiscoveredEntryLanguageData lData = (UserAndDiscoveredEntryLanguageData)data; if(lData.fDisabledNameSetStore != null){ - fDisabledNameSetStore = (KindBasedStore)lData.fDisabledNameSetStore.clone(); + @SuppressWarnings("unchecked") + KindBasedStore> clone = (KindBasedStore>) lData.fDisabledNameSetStore.clone(); + fDisabledNameSetStore = clone; int kinds[] = KindBasedStore.getLanguageEntryKinds(); int kind; - Set set; + Set set; for(int i = 0; i < kinds.length; i++){ kind = kinds[i]; - set = (Set)fDisabledNameSetStore.get(kind); + set = fDisabledNameSetStore.get(kind); if(set != null){ - set = new HashSet(set); + set = new HashSet(set); fDisabledNameSetStore.put(kind, set); } } @@ -65,7 +67,7 @@ public abstract class UserAndDiscoveredEntryLanguageData extends @Override protected ICLanguageSettingEntry[] getDiscoveredEntries( - Set disabledNameSet) { + Set disabledNameSet) { return fLangData.getDiscoveredEntries(getKind(), disabledNameSet); } @@ -75,7 +77,7 @@ public abstract class UserAndDiscoveredEntryLanguageData extends } @Override - protected void setDisabledDiscoveredNames(Set disabledNameSet) { + protected void setDisabledDiscoveredNames(Set disabledNameSet) { fLangData.setDisabledDiscoveredNames(getKind(), disabledNameSet); } @@ -96,17 +98,17 @@ public abstract class UserAndDiscoveredEntryLanguageData extends } protected ICLanguageSettingEntry[] getDiscoveredEntries(int kind, - Set disabledNameSet){ + Set disabledNameSet){ ICLanguageSettingEntry[] entries = getAllDiscoveredEntries(kind); - Set set = getDisabledSet(kind); + Set set = getDisabledSet(kind); if(set != null && set.size() != 0){ disabledNameSet.addAll(set); } return entries; } - protected void removeInexistent(ICLanguageSettingEntry[] entries, Set set){ - Set copy = new HashSet(set); + protected void removeInexistent(ICLanguageSettingEntry[] entries, Set set){ + Set copy = new HashSet(set); for(int i = 0; i < entries.length; i++){ copy.remove(entries[i].getName()); } @@ -120,25 +122,25 @@ public abstract class UserAndDiscoveredEntryLanguageData extends return getEntriesFromStore(kind); } - protected void setDisabledDiscoveredNames(int kind, Set disabledNameSet){ - setDisabledSet(kind, disabledNameSet != null ? new HashSet(disabledNameSet) : null); + protected void setDisabledDiscoveredNames(int kind, Set disabledNameSet){ + setDisabledSet(kind, disabledNameSet != null ? new HashSet(disabledNameSet) : null); } - protected Set getDisabledSet(int kind){ + protected Set getDisabledSet(int kind){ if(fDisabledNameSetStore != null){ - return (Set)fDisabledNameSetStore.get(kind); + return fDisabledNameSetStore.get(kind); } return null; } - protected void setDisabledSet(int kind, Set set){ + protected void setDisabledSet(int kind, Set set){ if(set == null || set.size() == 0){ if(fDisabledNameSetStore != null){ fDisabledNameSetStore.put(kind, null); } } else { if(fDisabledNameSetStore == null) - fDisabledNameSetStore = new KindBasedStore(); + fDisabledNameSetStore = new KindBasedStore>(); fDisabledNameSetStore.put(kind, set); } } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryStorage.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryStorage.java index 0335390e535..0b53399be47 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryStorage.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryStorage.java @@ -53,7 +53,7 @@ public abstract class UserAndDiscoveredEntryStorage extends AbstractEntryStorage break; case DISCOVERY_ENTRIES_LEVEL: if(level != null){ - Set set = level.getOverrideSet(); + Set set = level.getOverrideSet(); setDisabledDiscoveredNames(set); } else { setDisabledDiscoveredNames(null); @@ -68,7 +68,7 @@ public abstract class UserAndDiscoveredEntryStorage extends AbstractEntryStorage level.addEntries(getUserEntries()); break; case DISCOVERY_ENTRIES_LEVEL: - HashSet set = new HashSet(); + HashSet set = new HashSet(); ICLanguageSettingEntry[] entries = getDiscoveredEntries(set); level.addEntries(entries); if(set.size() != 0) @@ -85,7 +85,7 @@ public abstract class UserAndDiscoveredEntryStorage extends AbstractEntryStorage protected abstract ICLanguageSettingEntry[] getUserEntries(); - protected abstract void setDisabledDiscoveredNames(Set disabledNameSet); + protected abstract void setDisabledDiscoveredNames(Set disabledNameSet); - protected abstract ICLanguageSettingEntry[] getDiscoveredEntries(Set disabledNameSet); + protected abstract ICLanguageSettingEntry[] getDiscoveredEntries(Set disabledNameSet); }