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 03:21:07 +00:00
parent 37c2c68fbd
commit f28b2834b8
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/CSettingEntryFactory.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2007 Intel Corporation and others. * Copyright (c) 2007, 2010 Intel Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -20,7 +20,7 @@ import org.eclipse.cdt.core.settings.model.ICSettingEntry;
import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IPath;
public class CSettingEntryFactory { public class CSettingEntryFactory {
private static final HashSet EMPTY_SET = new HashSet(0); private static final HashSet<IPath> EMPTY_SET = new HashSet<IPath>(0);
private KindBasedStore fStore = new KindBasedStore(false); private KindBasedStore fStore = new KindBasedStore(false);
@ -41,7 +41,7 @@ public class CSettingEntryFactory {
return null; return null;
} }
private HashMap getFlagMap(int kind, String name, String value, IPath[] exclusionPatters, boolean create){ private HashMap<Integer, ICSettingEntry> getFlagMap(int kind, String name, String value, IPath[] exclusionPatters, boolean create){
switch(kind){ switch(kind){
case ICSettingEntry.MACRO: case ICSettingEntry.MACRO:
HashMap valueMap = getValueMap(name, create); HashMap valueMap = getValueMap(name, create);
@ -53,7 +53,7 @@ public class CSettingEntryFactory {
case ICSettingEntry.OUTPUT_PATH: case ICSettingEntry.OUTPUT_PATH:
HashMap excPatternMap = getExclusionPatternsMap(kind, name, create); HashMap excPatternMap = getExclusionPatternsMap(kind, name, create);
if(excPatternMap != null){ if(excPatternMap != null){
HashSet setKey = exclusionPatters == null || exclusionPatters.length == 0 ? EMPTY_SET : new HashSet(Arrays.asList(exclusionPatters)); HashSet<IPath> setKey = exclusionPatters == null || exclusionPatters.length == 0 ? EMPTY_SET : new HashSet<IPath>(Arrays.asList(exclusionPatters));
return getMap(excPatternMap, setKey, create); return getMap(excPatternMap, setKey, create);
} }
return null; return null;
@ -102,10 +102,10 @@ public class CSettingEntryFactory {
} }
private ICSettingEntry getEntry(int kind, String name, String value, IPath[] exclusionPatterns, int flags, ICSettingEntry baseEntry, boolean create){ private ICSettingEntry getEntry(int kind, String name, String value, IPath[] exclusionPatterns, int flags, ICSettingEntry baseEntry, boolean create){
HashMap flagMap = getFlagMap(kind, name, value, exclusionPatterns, create); HashMap<Integer, ICSettingEntry> flagMap = getFlagMap(kind, name, value, exclusionPatterns, create);
if(flagMap != null){ if(flagMap != null){
Integer iFlags = new Integer(flags); Integer iFlags = new Integer(flags);
ICSettingEntry entry = (ICSettingEntry)flagMap.get(iFlags); ICSettingEntry entry = flagMap.get(iFlags);
if(entry == null && create){ if(entry == null && create){
entry = baseEntry != null ? baseEntry : CDataUtil.createEntry(kind, name, value, exclusionPatterns, flags); entry = baseEntry != null ? baseEntry : CDataUtil.createEntry(kind, name, value, exclusionPatterns, flags);
flagMap.put(iFlags, entry); flagMap.put(iFlags, entry);