diff options
Diffstat (limited to 'core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java')
| -rw-r--r-- | core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java index bc866c132b9..cc92fdd0203 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java @@ -425,7 +425,7 @@ public class BaseCElementContentProvider implements ITreeContentProvider { if (!cproject.getProject().isOpen()) return NO_CHILDREN; - List<ICElement> list = new ArrayList<ICElement>(); + List<ICElement> list = new ArrayList<>(); ICElement[] children = cproject.getChildren(); for (ICElement child : children) { if (child instanceof ISourceRoot && child.getResource().getType() == IResource.PROJECT) { @@ -454,7 +454,7 @@ public class BaseCElementContentProvider implements ITreeContentProvider { Object[] children = unit.getChildren(); if (fIncludesGrouping) { boolean hasInclude = false; - ArrayList<Object> list = new ArrayList<Object>(children.length); + ArrayList<Object> list = new ArrayList<>(children.length); for (int i = 0; i < children.length; i++) { if (!(children[i] instanceof IInclude)) { list.add(children[i]); @@ -467,10 +467,10 @@ public class BaseCElementContentProvider implements ITreeContentProvider { } children = list.toArray(); } - Map<String, NamespacesGrouping> nsmap = new HashMap<String, NamespacesGrouping>(); + Map<String, NamespacesGrouping> nsmap = new HashMap<>(); if (fNamespacesGrouping) { // check if there is another namespace with the same name for the same parent - List<Object> list = new ArrayList<Object>(children.length); + List<Object> list = new ArrayList<>(children.length); for (int i = 0; i < children.length; ++i) { if (children[i] instanceof INamespace) { INamespace n1 = (INamespace) children[i]; @@ -492,8 +492,8 @@ public class BaseCElementContentProvider implements ITreeContentProvider { } if (fMemberGrouping) { // check if there is another member with the same namespace for the same parent - List<Object> list = new ArrayList<Object>(children.length); - Map<String, MembersGrouping> map = new HashMap<String, MembersGrouping>(); + List<Object> list = new ArrayList<>(children.length); + Map<String, MembersGrouping> map = new HashMap<>(); for (int i = 0; i < children.length; ++i) { if (children[i] instanceof IMember) { final ICElement member = (ICElement) children[i]; @@ -515,7 +515,7 @@ public class BaseCElementContentProvider implements ITreeContentProvider { children = list.toArray(); } if (fMacroGrouping) { - ArrayList<Object> list = new ArrayList<Object>(children.length); + ArrayList<Object> list = new ArrayList<>(children.length); boolean hasMacros = false; for (int i = 0; i < children.length; i++) { if (!(children[i] instanceof IMacro)) @@ -542,8 +542,8 @@ public class BaseCElementContentProvider implements ITreeContentProvider { Object[] children = element.getChildren(); if (fMemberGrouping) { // check if there is another member with the same namespace for the same parent - List<Object> list = new ArrayList<Object>(children.length); - Map<String, MembersGrouping> map = new HashMap<String, MembersGrouping>(); + List<Object> list = new ArrayList<>(children.length); + Map<String, MembersGrouping> map = new HashMap<>(); for (int i = 0; i < children.length; ++i) { if (children[i] instanceof IMember) { final ICElement member = (ICElement) children[i]; @@ -602,9 +602,9 @@ public class BaseCElementContentProvider implements ITreeContentProvider { private List<ICElement> getMissingElements(ICContainer container, ICElement[] elements) { // nested source roots may be filtered out below the project root, // we need to find them to add them back in - List<ICElement> missingElements = new ArrayList<ICElement>(); + List<ICElement> missingElements = new ArrayList<>(); try { - List<IResource> missingContainers = new ArrayList<IResource>(); + List<IResource> missingContainers = new ArrayList<>(); IResource[] allChildren = container.getResource().members(); for (IResource child : allChildren) { if (!(child instanceof IContainer)) @@ -666,7 +666,7 @@ public class BaseCElementContentProvider implements ITreeContentProvider { } catch (CModelException e) { roots = new ISourceRoot[0]; } - List<Object> nonCResources = new ArrayList<Object>(objects.length); + List<Object> nonCResources = new ArrayList<>(objects.length); for (Object object : objects) { Object o = object; // A folder can also be a source root in the following case @@ -745,7 +745,7 @@ public class BaseCElementContentProvider implements ITreeContentProvider { protected IBinary[] getBinaries(IBinaryContainer container) throws CModelException { ICElement[] celements = container.getChildren(); - ArrayList<IBinary> list = new ArrayList<IBinary>(celements.length); + ArrayList<IBinary> list = new ArrayList<>(celements.length); for (ICElement celement : celements) { if (celement instanceof IBinary) { IBinary bin = (IBinary) celement; @@ -764,7 +764,7 @@ public class BaseCElementContentProvider implements ITreeContentProvider { protected IArchive[] getArchives(IArchiveContainer container) throws CModelException { ICElement[] celements = container.getChildren(); - ArrayList<IArchive> list = new ArrayList<IArchive>(celements.length); + ArrayList<IArchive> list = new ArrayList<>(celements.length); for (ICElement celement : celements) { if (celement instanceof IArchive) { IArchive ar = (IArchive) celement; |