diff options
Diffstat (limited to 'org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers')
4 files changed, 9 insertions, 15 deletions
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/CompositeSourceContainer.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/CompositeSourceContainer.java index 420477cae..7799c478c 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/CompositeSourceContainer.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/CompositeSourceContainer.java @@ -14,6 +14,7 @@ package org.eclipse.debug.core.sourcelookup.containers; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.eclipse.core.runtime.CoreException; @@ -80,9 +81,7 @@ public abstract class CompositeSourceContainer extends AbstractSourceContainer { //it will only not be null when we care about duplicates //saves the computation in isFindDuplicates() if (results != null) { - for (int j = 0; j < objects.length; j++) { - results.add(objects[j]); - } + Collections.addAll(results, objects); } else { if (objects.length == 1) { return objects; diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ContainerSourceContainer.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ContainerSourceContainer.java index 0b21c4dc0..a7347bff9 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ContainerSourceContainer.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ContainerSourceContainer.java @@ -16,6 +16,7 @@ package org.eclipse.debug.core.sourcelookup.containers; import java.net.URI; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.eclipse.core.filesystem.EFS; @@ -110,9 +111,7 @@ public abstract class ContainerSourceContainer extends CompositeSourceContainer // of canonical paths (fix to bug 95679 was removed). IFile[] files = fRoot.findFilesForLocationURI(target.toURI()); if (isFindDuplicates() && files.length > 1) { - for (int i = 0; i < files.length; i++) { - sources.add(files[i]); - } + Collections.addAll(sources, files); } else if (files.length > 0) { sources.add(files[0]); } @@ -130,9 +129,7 @@ public abstract class ContainerSourceContainer extends CompositeSourceContainer continue; } if (isFindDuplicates()) { - for(int j=0; j < objects.length; j++) { - sources.add(objects[j]); - } + Collections.addAll(sources, objects); } else { sources.add(objects[0]); break; diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/DirectorySourceContainer.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/DirectorySourceContainer.java index 55860c7d7..12bab3aa2 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/DirectorySourceContainer.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/DirectorySourceContainer.java @@ -15,6 +15,7 @@ package org.eclipse.debug.core.sourcelookup.containers; import java.io.File; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.eclipse.core.runtime.CoreException; @@ -110,9 +111,7 @@ public class DirectorySourceContainer extends CompositeSourceContainer { continue; } if (isFindDuplicates()) { - for(int j=0; j < objects.length; j++) { - sources.add(objects[j]); - } + Collections.addAll(sources, objects); } else { sources.add(objects[0]); break; diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ProjectSourceContainer.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ProjectSourceContainer.java index 0c5f32a61..7259a4504 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ProjectSourceContainer.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ProjectSourceContainer.java @@ -15,6 +15,7 @@ package org.eclipse.debug.core.sourcelookup.containers; import java.util.ArrayList; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -91,9 +92,7 @@ public class ProjectSourceContainer extends ContainerSourceContainer { IProject[] projects = getAllReferencedProjects(project); ISourceContainer[] folders = super.createSourceContainers(); List<ISourceContainer> all = new ArrayList<>(folders.length + projects.length); - for (int i = 0; i < folders.length; i++) { - all.add(folders[i]); - } + Collections.addAll(all, folders); for (int i = 0; i < projects.length; i++) { if (project.exists() && project.isOpen()) { ProjectSourceContainer container = new ProjectSourceContainer(projects[i], false); |