Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2019-06-18 09:13:45 +0000
committerLars Vogel2019-06-18 09:13:45 +0000
commite82ea939cc04c50f9291734add69d038c867f64a (patch)
treec866f89b9c7cfeb6c6d7a17b4cfe15d049a92d68 /org.eclipse.debug.core
parentc642e98e154c4b8b34d3cab4023cee1ad2f3cb35 (diff)
downloadeclipse.platform.debug-e82ea939cc04c50f9291734add69d038c867f64a.tar.gz
eclipse.platform.debug-e82ea939cc04c50f9291734add69d038c867f64a.tar.xz
eclipse.platform.debug-e82ea939cc04c50f9291734add69d038c867f64a.zip
Use addAll, deleteAll instead of looping through a collectionI20190620-0130I20190619-1820I20190619-1800I20190618-1805
Change-Id: I9c95900ed1b6e8823bb30c4ded37f214a92deffc Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Diffstat (limited to 'org.eclipse.debug.core')
-rw-r--r--org.eclipse.debug.core/core/org/eclipse/debug/core/commands/AbstractDebugCommand.java5
-rw-r--r--org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java5
-rw-r--r--org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupParticipant.java5
-rw-r--r--org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/CompositeSourceContainer.java5
-rw-r--r--org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ContainerSourceContainer.java9
-rw-r--r--org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/DirectorySourceContainer.java5
-rw-r--r--org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ProjectSourceContainer.java5
-rw-r--r--org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java8
-rw-r--r--org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureManager.java5
-rw-r--r--org.eclipse.debug.core/core/org/eclipse/debug/internal/core/StepFilterManager.java5
10 files changed, 21 insertions, 36 deletions
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/commands/AbstractDebugCommand.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/commands/AbstractDebugCommand.java
index 15b204aad..89f371ded 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/commands/AbstractDebugCommand.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/commands/AbstractDebugCommand.java
@@ -13,6 +13,7 @@
*******************************************************************************/
package org.eclipse.debug.core.commands;
+import java.util.Collections;
import java.util.LinkedHashSet;
import org.eclipse.core.runtime.CoreException;
@@ -393,9 +394,7 @@ public abstract class AbstractDebugCommand implements IDebugCommandHandler {
return objects;
} else {
LinkedHashSet<Object> set = new LinkedHashSet<>(objects.length);
- for (int i = 0; i < objects.length; i++) {
- set.add(objects[i]);
- }
+ Collections.addAll(set, objects);
return set.toArray();
}
}
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java
index 18b6b4131..c5585dd4d 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java
@@ -15,6 +15,7 @@
package org.eclipse.debug.core.model;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -337,9 +338,7 @@ public abstract class LaunchConfigurationDelegate implements ILaunchConfiguratio
List<IProject> orderedProjects = new ArrayList<>(projects.length);
//Projects may not be in the build order but should be built if selected
List<IProject> unorderedProjects = new ArrayList<>(projects.length);
- for(int i = 0; i < projects.length; ++i) {
- unorderedProjects.add(projects[i]);
- }
+ Collections.addAll(unorderedProjects, projects);
for (int i = 0; i < orderedNames.length; i++) {
String projectName = orderedNames[i];
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupParticipant.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupParticipant.java
index fa55c48b7..50728d593 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupParticipant.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupParticipant.java
@@ -14,6 +14,7 @@
package org.eclipse.debug.core.sourcelookup;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.eclipse.core.runtime.CoreException;
@@ -66,9 +67,7 @@ public abstract class AbstractSourceLookupParticipant implements ISourceLookupPa
//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/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);
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java
index d505c00e9..ddce2a193 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java
@@ -1242,9 +1242,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe
IDebugTarget[] targets = null;
for (ILaunch launch : fLaunches) {
targets = launch.getDebugTargets();
- for (int i = 0; i < targets.length; i++) {
- allTargets.add(targets[i]);
- }
+ Collections.addAll(allTargets, targets);
}
return allTargets.toArray(new IDebugTarget[allTargets.size()]);
}
@@ -1840,9 +1838,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe
IProcess[] processes = null;
for (ILaunch launch : fLaunches) {
processes = launch.getProcesses();
- for (int i= 0; i < processes.length; i++) {
- allProcesses.add(processes[i]);
- }
+ Collections.addAll(allProcesses, processes);
}
return allProcesses.toArray(new IProcess[allProcesses.size()]);
}
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureManager.java
index 396160866..fd03c0510 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureManager.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureManager.java
@@ -14,6 +14,7 @@
package org.eclipse.debug.internal.core;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -95,9 +96,7 @@ public class LogicalStructureManager {
// asks the logical structure providers
for (LogicalStructureProvider provider : fTypeProviders) {
ILogicalStructureType[] types = provider.getLogicalStructures(value);
- for (int i = 0; i < types.length; i++) {
- select.add(types[i]);
- }
+ Collections.addAll(select, types);
}
return select.toArray(new ILogicalStructureType[select.size()]);
}
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/StepFilterManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/StepFilterManager.java
index 6092704ec..a2ecfb295 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/StepFilterManager.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/StepFilterManager.java
@@ -15,6 +15,7 @@
package org.eclipse.debug.internal.core;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.eclipse.core.runtime.CoreException;
@@ -106,9 +107,7 @@ public class StepFilterManager implements ILaunchListener {
initialize();
List<IStepFilter> select = new ArrayList<>();
for (StepFilter extension : stepFilters) {
- for (IStepFilter stepFilter : extension.getStepFilters(modelIdentifier)) {
- select.add(stepFilter);
- }
+ Collections.addAll(select, extension.getStepFilters(modelIdentifier));
}
return select.toArray(new IStepFilter[select.size()]);
}

Back to the top