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

cleanup: warnings about arrays of generics fixed

Browse source
This commit is contained in:
Andrew Gvozdev 2010-02-18 03:59:39 +00:00
parent 2b86b4d136
commit c2a1e845ab
1 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationSpecSettings.java
View file

@ -87,6 +87,15 @@ public class CConfigurationSpecSettings implements ICSettingsStorage{
// private CConfigBasedDescriptor fDescriptor; // private CConfigBasedDescriptor fDescriptor;
// private Map fExternalSettingsProviderMap; // private Map fExternalSettingsProviderMap;
private class DeltaSet {
public Set<ICConfigExtensionReference> extSet;
public Set<String> idSet;
public DeltaSet(Set<ICConfigExtensionReference> extSet, Set<String> idSet) {
this.extSet = extSet;
this.idSet = idSet;
}
}
public CConfigurationSpecSettings(ICConfigurationDescription des, ICStorageElement storage) throws CoreException{ public CConfigurationSpecSettings(ICConfigurationDescription des, ICStorageElement storage) throws CoreException{
fCfg = des; fCfg = des;
fRootStorageElement = storage; fRootStorageElement = storage;
@ -572,11 +581,10 @@ public class CConfigurationSpecSettings implements ICSettingsStorage{
private void checkReconsile(String extensionPointID, boolean toExt){ private void checkReconsile(String extensionPointID, boolean toExt){
if(toExt){ if(toExt){
Set[] delta = getReferenceDelta(extensionPointID); DeltaSet delta = getReferenceDelta(extensionPointID);
if(delta != null){ if(delta != null){
if(delta[0] != null){ if(delta.extSet != null){
Set<ICConfigExtensionReference> extSet = delta[0]; for (ICConfigExtensionReference ref : delta.extSet) {
for (ICConfigExtensionReference ref : extSet) {
try { try {
doRemove(ref); doRemove(ref);
} catch (CoreException e) { } catch (CoreException e) {
@ -584,9 +592,8 @@ public class CConfigurationSpecSettings implements ICSettingsStorage{
} }
} }
} }
if(delta[1] != null){ if(delta.idSet != null){
Set<String> idSet =delta[1]; for (String id : delta.idSet) {
for (String id : idSet) {
try { try {
doCreate(extensionPointID, id); doCreate(extensionPointID, id);
} catch (CoreException e) { } catch (CoreException e) {
@ -875,7 +882,7 @@ public class CConfigurationSpecSettings implements ICSettingsStorage{
} }
return false; return false;
} }
private Set[] getReferenceDelta(String extPointId){ private DeltaSet getReferenceDelta(String extPointId){
if(!usesCache(fCfg)){ if(!usesCache(fCfg)){
if(CCorePlugin.BINARY_PARSER_UNIQ_ID.equals(extPointId)){ if(CCorePlugin.BINARY_PARSER_UNIQ_ID.equals(extPointId)){
ICTargetPlatformSetting tp = fCfg.getTargetPlatformSetting(); ICTargetPlatformSetting tp = fCfg.getTargetPlatformSetting();
@ -895,28 +902,28 @@ public class CConfigurationSpecSettings implements ICSettingsStorage{
} }
return null; return null;
} }
private DeltaSet getReferenceDelta(ICConfigExtensionReference refs[], String[] extIds){
private Set[] getReferenceDelta(ICConfigExtensionReference refs[], String[] extIds){
if(refs == null || refs.length == 0){ if(refs == null || refs.length == 0){
if(extIds == null || extIds.length == 0) if(extIds == null || extIds.length == 0)
return null; return null;
return new Set[]{null, new HashSet<String>(Arrays.asList(extIds))}; return new DeltaSet(null, new HashSet<String>(Arrays.asList(extIds)));
} else if(extIds == null || extIds.length == 0){ } else if(extIds == null || extIds.length == 0){
Map<String, ICConfigExtensionReference> map = createRefMap(refs); Map<String, ICConfigExtensionReference> map = createRefMap(refs);
return new Set[]{new HashSet<ICConfigExtensionReference>(map.values()), null}; return new DeltaSet(new HashSet<ICConfigExtensionReference>(map.values()), null);
} }
Set<String> idSet = new HashSet<String>(Arrays.asList(extIds)); Set<String> idSet = new HashSet<String>(Arrays.asList(extIds));
Set<String> idSetCopy = new HashSet<String>(idSet); Set<String> idSetCopy = new HashSet<String>(idSet);
Map<String, ICConfigExtensionReference> refsMap = createRefMap(refs); Map<String, ICConfigExtensionReference> refsMap = createRefMap(refs);
idSet.removeAll(refsMap.keySet()); idSet.removeAll(refsMap.keySet());
refsMap.keySet().removeAll(idSetCopy); refsMap.keySet().removeAll(idSetCopy);
Set<ICConfigExtensionReference> extSet = new HashSet<ICConfigExtensionReference>(refsMap.values()); Set<ICConfigExtensionReference> extSet = new HashSet<ICConfigExtensionReference>(refsMap.values());
return new Set[]{extSet, idSet}; return new DeltaSet(extSet, idSet);
} }
private Map<String, ICConfigExtensionReference> createRefMap(ICConfigExtensionReference refs[]){ private Map<String, ICConfigExtensionReference> createRefMap(ICConfigExtensionReference refs[]){