mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

cosmetics: generics

Browse source
This commit is contained in:
Andrew Gvozdev 2010-01-25 21:37:38 +00:00
parent 6945d7ce32
commit 44392d77e4
2 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryLanguageData.java
View file

@ -18,7 +18,7 @@ import org.eclipse.cdt.core.settings.model.extension.CLanguageData;
public abstract class UserAndDiscoveredEntryLanguageData extends public abstract class UserAndDiscoveredEntryLanguageData extends
EntryStorageBasedLanguageData { EntryStorageBasedLanguageData {
private KindBasedStore fDisabledNameSetStore; private KindBasedStore<Set<String>> fDisabledNameSetStore;
public UserAndDiscoveredEntryLanguageData() { public UserAndDiscoveredEntryLanguageData() {
super(); super();
@ -35,15 +35,17 @@ public abstract class UserAndDiscoveredEntryLanguageData extends
if(data instanceof UserAndDiscoveredEntryLanguageData){ if(data instanceof UserAndDiscoveredEntryLanguageData){
UserAndDiscoveredEntryLanguageData lData = (UserAndDiscoveredEntryLanguageData)data; UserAndDiscoveredEntryLanguageData lData = (UserAndDiscoveredEntryLanguageData)data;
if(lData.fDisabledNameSetStore != null){ if(lData.fDisabledNameSetStore != null){
fDisabledNameSetStore = (KindBasedStore)lData.fDisabledNameSetStore.clone(); @SuppressWarnings("unchecked")
KindBasedStore<Set<String>> clone = (KindBasedStore<Set<String>>) lData.fDisabledNameSetStore.clone();
fDisabledNameSetStore = clone;
int kinds[] = KindBasedStore.getLanguageEntryKinds(); int kinds[] = KindBasedStore.getLanguageEntryKinds();
int kind; int kind;
Set set; Set<String> set;
for(int i = 0; i < kinds.length; i++){ for(int i = 0; i < kinds.length; i++){
kind = kinds[i]; kind = kinds[i];
set = (Set)fDisabledNameSetStore.get(kind); set = fDisabledNameSetStore.get(kind);
if(set != null){ if(set != null){
set = new HashSet(set); set = new HashSet<String>(set);
fDisabledNameSetStore.put(kind, set); fDisabledNameSetStore.put(kind, set);
} }
} }
@ -65,7 +67,7 @@ public abstract class UserAndDiscoveredEntryLanguageData extends
@Override @Override
protected ICLanguageSettingEntry[] getDiscoveredEntries( protected ICLanguageSettingEntry[] getDiscoveredEntries(
Set disabledNameSet) { Set<String> disabledNameSet) {
return fLangData.getDiscoveredEntries(getKind(), disabledNameSet); return fLangData.getDiscoveredEntries(getKind(), disabledNameSet);
} }
@ -75,7 +77,7 @@ public abstract class UserAndDiscoveredEntryLanguageData extends
} }
@Override @Override
protected void setDisabledDiscoveredNames(Set disabledNameSet) { protected void setDisabledDiscoveredNames(Set<String> disabledNameSet) {
fLangData.setDisabledDiscoveredNames(getKind(), disabledNameSet); fLangData.setDisabledDiscoveredNames(getKind(), disabledNameSet);
} }
@ -96,17 +98,17 @@ public abstract class UserAndDiscoveredEntryLanguageData extends
} }
protected ICLanguageSettingEntry[] getDiscoveredEntries(int kind, protected ICLanguageSettingEntry[] getDiscoveredEntries(int kind,
Set disabledNameSet){ Set<String> disabledNameSet){
ICLanguageSettingEntry[] entries = getAllDiscoveredEntries(kind); ICLanguageSettingEntry[] entries = getAllDiscoveredEntries(kind);
Set set = getDisabledSet(kind); Set<String> set = getDisabledSet(kind);
if(set != null && set.size() != 0){ if(set != null && set.size() != 0){
disabledNameSet.addAll(set); disabledNameSet.addAll(set);
} }
return entries; return entries;
} }
protected void removeInexistent(ICLanguageSettingEntry[] entries, Set set){ protected void removeInexistent(ICLanguageSettingEntry[] entries, Set<String> set){
Set copy = new HashSet(set); Set<String> copy = new HashSet<String>(set);
for(int i = 0; i < entries.length; i++){ for(int i = 0; i < entries.length; i++){
copy.remove(entries[i].getName()); copy.remove(entries[i].getName());
} }
@ -120,25 +122,25 @@ public abstract class UserAndDiscoveredEntryLanguageData extends
return getEntriesFromStore(kind); return getEntriesFromStore(kind);
} }
protected void setDisabledDiscoveredNames(int kind, Set disabledNameSet){ protected void setDisabledDiscoveredNames(int kind, Set<String> disabledNameSet){
setDisabledSet(kind, disabledNameSet != null ? new HashSet(disabledNameSet) : null); setDisabledSet(kind, disabledNameSet != null ? new HashSet<String>(disabledNameSet) : null);
} }
protected Set getDisabledSet(int kind){ protected Set<String> getDisabledSet(int kind){
if(fDisabledNameSetStore != null){ if(fDisabledNameSetStore != null){
return (Set)fDisabledNameSetStore.get(kind); return fDisabledNameSetStore.get(kind);
} }
return null; return null;
} }
protected void setDisabledSet(int kind, Set set){ protected void setDisabledSet(int kind, Set<String> set){
if(set == null || set.size() == 0){ if(set == null || set.size() == 0){
if(fDisabledNameSetStore != null){ if(fDisabledNameSetStore != null){
fDisabledNameSetStore.put(kind, null); fDisabledNameSetStore.put(kind, null);
} }
} else { } else {
if(fDisabledNameSetStore == null) if(fDisabledNameSetStore == null)
fDisabledNameSetStore = new KindBasedStore(); fDisabledNameSetStore = new KindBasedStore<Set<String>>();
fDisabledNameSetStore.put(kind, set); fDisabledNameSetStore.put(kind, set);
} }
} }

8
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryStorage.java
View file

@ -53,7 +53,7 @@ public abstract class UserAndDiscoveredEntryStorage extends AbstractEntryStorage
break; break;
case DISCOVERY_ENTRIES_LEVEL: case DISCOVERY_ENTRIES_LEVEL:
if(level != null){ if(level != null){
Set set = level.getOverrideSet(); Set<String> set = level.getOverrideSet();
setDisabledDiscoveredNames(set); setDisabledDiscoveredNames(set);
} else { } else {
setDisabledDiscoveredNames(null); setDisabledDiscoveredNames(null);
@ -68,7 +68,7 @@ public abstract class UserAndDiscoveredEntryStorage extends AbstractEntryStorage
level.addEntries(getUserEntries()); level.addEntries(getUserEntries());
break; break;
case DISCOVERY_ENTRIES_LEVEL: case DISCOVERY_ENTRIES_LEVEL:
HashSet set = new HashSet(); HashSet<String> set = new HashSet<String>();
ICLanguageSettingEntry[] entries = getDiscoveredEntries(set); ICLanguageSettingEntry[] entries = getDiscoveredEntries(set);
level.addEntries(entries); level.addEntries(entries);
if(set.size() != 0) if(set.size() != 0)
@ -85,7 +85,7 @@ public abstract class UserAndDiscoveredEntryStorage extends AbstractEntryStorage
protected abstract ICLanguageSettingEntry[] getUserEntries(); protected abstract ICLanguageSettingEntry[] getUserEntries();
protected abstract void setDisabledDiscoveredNames(Set disabledNameSet); protected abstract void setDisabledDiscoveredNames(Set<String> disabledNameSet);
protected abstract ICLanguageSettingEntry[] getDiscoveredEntries(Set disabledNameSet); protected abstract ICLanguageSettingEntry[] getDiscoveredEntries(Set<String> disabledNameSet);
} }