diff options
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension')
2 files changed, 12 insertions, 12 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/MatchObjectElement.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/MatchObjectElement.java index c6cf1ea528e..28f39826761 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/MatchObjectElement.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/MatchObjectElement.java @@ -40,8 +40,8 @@ public class MatchObjectElement { public static class TypeToStringAssociation { private int fType; private String fString; - private static ObjectTypeBasedStorage<TypeToStringAssociation> fTypeAssociationStorage = new ObjectTypeBasedStorage<TypeToStringAssociation>(); - private static Map<String, TypeToStringAssociation> fStringAssociationStorage = new HashMap<String, TypeToStringAssociation>(); + private static ObjectTypeBasedStorage<TypeToStringAssociation> fTypeAssociationStorage = new ObjectTypeBasedStorage<>(); + private static Map<String, TypeToStringAssociation> fStringAssociationStorage = new HashMap<>(); public static TypeToStringAssociation TOOL = new TypeToStringAssociation( IRealBuildObjectAssociation.OBJECT_TOOL, "tool"); //$NON-NLS-1$ @@ -125,7 +125,7 @@ public class MatchObjectElement { PatternElement(IConfigurationElement el, int defaultSearchType, int defaultIdType) { String tmp = el.getAttribute(ATTR_OBJECT_IDS); - fIds = new HashSet<String>(Arrays.asList(CDataUtil.stringToArray(tmp, DELIMITER))); + fIds = new HashSet<>(Arrays.asList(CDataUtil.stringToArray(tmp, DELIMITER))); int type = 0; tmp = el.getAttribute(ATTR_PATTERN_TYPE_SEARCH_SCOPE); @@ -193,7 +193,7 @@ public class MatchObjectElement { if (el.fType != fType) throw new IllegalArgumentException(); - HashSet<String> set = new HashSet<String>(); + HashSet<String> set = new HashSet<>(); set.addAll(fIds); set.addAll(el.fIds); return new PatternElement(set, fType); @@ -219,7 +219,7 @@ public class MatchObjectElement { fObjectType = assoc.getType(); - Map<PatternTypeKey, PatternElement> patternMap = new HashMap<PatternTypeKey, PatternElement>(); + Map<PatternTypeKey, PatternElement> patternMap = new HashMap<>(); int defaultSearchType = PatternElement.DEFAULT_PATTERN_SEARCH_TYPE; int defaultIdType = PatternElement.DEFAULT_PATTERN_ID_TYPE; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/RulesManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/RulesManager.java index 2bf1b5c92d8..e2f0ac6cfd7 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/RulesManager.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/RulesManager.java @@ -46,7 +46,7 @@ public class RulesManager { private ConflictDefinition[] fConflictDefinitions; - private Map<MatchObjectElement, IObjectSet> fMatchObjectMap = new HashMap<MatchObjectElement, IObjectSet>(); + private Map<MatchObjectElement, IObjectSet> fMatchObjectMap = new HashMap<>(); private PerTypeMapStorage<IRealBuildObjectAssociation, Set<IRealBuildObjectAssociation>> fObjToChildSuperClassMap; private StarterJob fStarter; private boolean fIsStartInited; @@ -106,7 +106,7 @@ public class RulesManager { fConflictDefinitions = new ConflictDefinition[0]; } else { IExtension[] extensions = extensionPoint.getExtensions(); - List<ConflictDefinition> conflictDefs = new ArrayList<ConflictDefinition>(); + List<ConflictDefinition> conflictDefs = new ArrayList<>(); for (int i = 0; i < extensions.length; ++i) { IExtension extension = extensions[i]; IConfigurationElement[] elements = extension.getConfigurationElements(); @@ -153,7 +153,7 @@ public class RulesManager { if (oSet == null) { int type = el.getObjectType(); PatternElement[] patterns = el.getPatterns(); - HashSet<IRealBuildObjectAssociation> objectsSet = new HashSet<IRealBuildObjectAssociation>(); + HashSet<IRealBuildObjectAssociation> objectsSet = new HashSet<>(); for (int i = 0; i < patterns.length; i++) { PatternElement pattern = patterns[i]; processPattern(type, pattern, objectsSet); @@ -174,7 +174,7 @@ public class RulesManager { IRealBuildObjectAssociation[] allObjs = TcModificationUtil.getExtensionObjects(objType); Pattern pattern = Pattern.compile(id); - List<IRealBuildObjectAssociation> list = new ArrayList<IRealBuildObjectAssociation>(); + List<IRealBuildObjectAssociation> list = new ArrayList<>(); for (int i = 0; i < allObjs.length; i++) { if (pattern.matcher(allObjs[i].getId()).matches()) @@ -187,7 +187,7 @@ public class RulesManager { private Set<IRealBuildObjectAssociation> processPattern(int objType, PatternElement el, Set<IRealBuildObjectAssociation> set) { if (set == null) - set = new HashSet<IRealBuildObjectAssociation>(); + set = new HashSet<>(); String ids[] = el.getIds(); if (el.getSearchType() == PatternElement.TYPE_SEARCH_EXTENSION_OBJECT) { @@ -237,7 +237,7 @@ public class RulesManager { private Set<IRealBuildObjectAssociation> getChildSuperClassRealSet(IRealBuildObjectAssociation obj, IRealBuildObjectAssociation[] all) { if (fObjToChildSuperClassMap == null) - fObjToChildSuperClassMap = new PerTypeMapStorage<IRealBuildObjectAssociation, Set<IRealBuildObjectAssociation>>(); + fObjToChildSuperClassMap = new PerTypeMapStorage<>(); if (all == null) all = TcModificationUtil.getExtensionObjects(obj.getType()); @@ -256,7 +256,7 @@ public class RulesManager { private static Set<IRealBuildObjectAssociation> createChildSuperClassRealSet(IRealBuildObjectAssociation obj, IRealBuildObjectAssociation[] all, Set<IRealBuildObjectAssociation> set) { if (set == null) - set = new HashSet<IRealBuildObjectAssociation>(); + set = new HashSet<>(); if (all == null) all = TcModificationUtil.getExtensionObjects(obj.getType()); |