Bug 548923 - Use jdk 5 for-each loop
Replace simple uses of Iterator with a corresponding for-loop. Also add
missing braces on loops as necessary.
Change-Id: I6785ac36c08aaa540f8a3eadae25b85710358080
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/InstanceFilterEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/InstanceFilterEditor.java
index 60d8b90..8d504be 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/InstanceFilterEditor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/InstanceFilterEditor.java
@@ -93,9 +93,8 @@
*/
protected void setInitialCheckedState() {
try {
- IJavaObject[] objects = fBreakpoint.getInstanceFilters();
- for (int i= 0; i < objects.length; i++) {
- fCheckHandler.checkObject(objects[i], true);
+ for (IJavaObject object : fBreakpoint.getInstanceFilters()) {
+ fCheckHandler.checkObject(object, true);
}
} catch (CoreException e) {
JDIDebugUIPlugin.log(e);
@@ -104,10 +103,9 @@
protected void doStore() {
try {
- IJavaObject[] objects = fBreakpoint.getInstanceFilters();
- for (int i= 0; i < objects.length; i++) {
- if (!fInstanceViewer.getChecked(objects[i])) {
- fBreakpoint.removeInstanceFilter(objects[i]);
+ for (IJavaObject object : fBreakpoint.getInstanceFilters()) {
+ if (!fInstanceViewer.getChecked(object)) {
+ fBreakpoint.removeInstanceFilter(object);
}
}
} catch (CoreException e) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ThreadFilterEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ThreadFilterEditor.java
index a983da5..395406c 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ThreadFilterEditor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ThreadFilterEditor.java
@@ -79,18 +79,15 @@
}
protected void doStore() {
- IDebugTarget[] targets= getDebugTargets();
IJavaDebugTarget target;
- IThread[] threads;
IJavaThread thread;
- for (int i= 0, numTargets= targets.length; i < numTargets; i++) {
- target = targets[i].getAdapter(IJavaDebugTarget.class);
+ for (IDebugTarget debugTarget : getDebugTargets()) {
+ target = debugTarget.getAdapter(IJavaDebugTarget.class);
if (target != null) {
try {
if (fThreadViewer.getChecked(target)) {
- threads= target.getThreads();
- for (int j=0, numThreads= threads.length; j < numThreads; j++) {
- thread= (IJavaThread)threads[j];
+ for (IThread targetThread : target.getThreads()) {
+ thread= (IJavaThread)targetThread;
if (fThreadViewer.getChecked(thread)) {
// thread selected for filtering
fPage.getBreakpoint().setThreadFilter(thread);
@@ -116,9 +113,8 @@
*/
protected void setInitialCheckedState() {
try {
- IDebugTarget[] targets= getDebugTargets();
- for (int i= 0, numTargets= targets.length; i < numTargets; i++) {
- IJavaDebugTarget target = targets[i].getAdapter(IJavaDebugTarget.class);
+ for (IDebugTarget debugTarget : getDebugTargets()) {
+ IJavaDebugTarget target = debugTarget.getAdapter(IJavaDebugTarget.class);
if (target != null) {
IJavaThread filteredThread= fPage.getBreakpoint().getThreadFilter(target);
if (filteredThread != null) {
@@ -176,8 +172,8 @@
IThread thread;
boolean checkedThread= false;
// Try to check the "main" thread by default
- for (int i= 0, numThreads= threads.length; i < numThreads; i++) {
- thread= threads[i];
+ for (IThread targetThread : threads) {
+ thread= targetThread;
String name= null;
try {
name= thread.getName();
@@ -191,8 +187,8 @@
// If the main thread couldn't be checked, check the first
// available thread
if (!checkedThread) {
- for (int i= 0, numThreads= threads.length; i < numThreads; i++) {
- if (fThreadViewer.setChecked(threads[i], true)) {
+ for (IThread targetThread : threads) {
+ if (fThreadViewer.setChecked(targetThread, true)) {
break;
}
}
@@ -205,8 +201,8 @@
JDIDebugUIPlugin.log(exception);
return;
}
- for (int i= 0, numThreads= threads.length; i < numThreads; i++) {
- fThreadViewer.setChecked(threads[i], false);
+ for (IThread thread : threads) {
+ fThreadViewer.setChecked(thread, false);
}
}
}
@@ -235,10 +231,10 @@
JDIDebugUIPlugin.log(exception);
return;
}
- for (int i= 0, numThreads= threads.length; i < numThreads; i++) {
- if (threads[i] != thread) {
+ for (IThread targetThread : threads) {
+ if (targetThread != thread) {
// Uncheck all threads other than the selected thread
- fThreadViewer.setChecked(threads[i], false);
+ fThreadViewer.setChecked(targetThread, false);
}
}
} else {
@@ -257,8 +253,8 @@
IDebugTarget target;
IThread[] threads;
boolean checkedThread;
- for (int i= 0, numTargets= targets.length; i < numTargets; i++) {
- target= targets[i];
+ for (IDebugTarget debugTarget : targets) {
+ target= debugTarget;
if (!fThreadViewer.getChecked(target)) {
continue;
}
@@ -269,8 +265,8 @@
continue;
}
checkedThread= false;
- for (int j= 0, numThreads= threads.length; j < numThreads; j++) {
- if (fThreadViewer.getChecked(threads[j])) {
+ for (IThread thread : threads) {
+ if (fThreadViewer.getChecked(thread)) {
checkedThread= true;
break;
}
@@ -306,10 +302,10 @@
ILaunch[] launches= ((ILaunchManager) parent).getLaunches();
IDebugTarget[] targets;
IJavaDebugTarget target;
- for (int i= 0, numLaunches= launches.length; i < numLaunches; i++) {
- targets= launches[i].getDebugTargets();
- for (int j= 0, numTargets= targets.length; j < numTargets; j++) {
- target= targets[j].getAdapter(IJavaDebugTarget.class);
+ for (ILaunch launch : launches) {
+ targets= launch.getDebugTargets();
+ for (IDebugTarget debugTarget : targets) {
+ target= debugTarget.getAdapter(IJavaDebugTarget.class);
if (target != null && !target.isDisconnected() && !target.isTerminated()) {
children.add(target);
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/search/LaunchConfigurationQueryParticipant.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/search/LaunchConfigurationQueryParticipant.java
index 19f9134..c6fe60f 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/search/LaunchConfigurationQueryParticipant.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/search/LaunchConfigurationQueryParticipant.java
@@ -243,8 +243,8 @@
}
IResource[] resources = config.getMappedResources();
if (resources != null) {
- for (int i = 0; i < resources.length; i++) {
- if (scope.encloses(resources[i].getFullPath().toString())) {
+ for (IResource resource : resources) {
+ if (scope.encloses(resource.getFullPath().toString())) {
return true;
}
}
@@ -264,13 +264,13 @@
ILaunchConfiguration[] configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations();
monitor.beginTask("Searching for launch configurations", configs.length); //$NON-NLS-1$
try {
- for (int i = 0; i < configs.length; ++i) {
+ for (ILaunchConfiguration config : configs) {
if (monitor.isCanceled()) {
return;
}
monitor.worked(1);
- if (matches(scope, configs[i], pattern)) {
- requestor.reportMatch(new Match(configs[i], 0, 0));
+ if (matches(scope, config, pattern)) {
+ requestor.reportMatch(new Match(config, 0, 0));
}
}
} finally {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetEditor.java
index 507281d..9ed9c13 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetEditor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetEditor.java
@@ -506,11 +506,9 @@
if (fVM != null) {
DebugPlugin.getDefault().addDebugEventFilter(this);
try {
- IThread[] threads= fVM.getThreads();
- for (int i = 0; i < threads.length; i++) {
- IThread iThread = threads[i];
- if (iThread.isSuspended()) {
- iThread.resume();
+ for (IThread thread : fVM.getThreads()) {
+ if (thread.isSuspended()) {
+ thread.resume();
}
}
} catch (DebugException de) {
@@ -630,10 +628,8 @@
public void run() {
Shell shell= getShell();
if (fSnippetStateListeners != null && shell != null && !shell.isDisposed()) {
- List<ISnippetStateChangedListener> v = new ArrayList<>(fSnippetStateListeners);
- for (int i= 0; i < v.size(); i++) {
- ISnippetStateChangedListener l= v.get(i);
- l.snippetStateChanged(JavaSnippetEditor.this);
+ for (ISnippetStateChangedListener listener : new ArrayList<>(fSnippetStateListeners)) {
+ listener.snippetStateChanged(JavaSnippetEditor.this);
}
}
}
@@ -844,8 +840,8 @@
String delimiter = document.getLegalLineDelimiters()[0];
final StringBuilder errorString = new StringBuilder();
- for (int i = 0; i < errors.length; i++) {
- errorString.append(errors[i] + delimiter);
+ for (String error : errors) {
+ errorString.append(error + delimiter);
}
Runnable r = new Runnable() {
@@ -1083,8 +1079,7 @@
*/
@Override
public DebugEvent[] filterDebugEvents(DebugEvent[] events) {
- for (int i = 0; i < events.length; i++) {
- DebugEvent e = events[i];
+ for (DebugEvent e : events) {
Object source = e.getSource();
if (source instanceof IDebugElement) {
IDebugElement de = (IDebugElement)source;
@@ -1117,19 +1112,18 @@
if (e.getDetail() == DebugEvent.STEP_END && (lineNumber == 28)
&& f.getDeclaringTypeName().equals("org.eclipse.jdt.internal.debug.ui.snippeteditor.ScrapbookMain1") //$NON-NLS-1$
&& jt.getDebugTarget() == fVM) {
- // restore step filters
- target.setStepFiltersEnabled(fStepFiltersSetting);
+ // restore step filters
+ target.setStepFiltersEnabled(fStepFiltersSetting);
setThread(jt);
return null;
} else if (e.getDetail() == DebugEvent.BREAKPOINT && bps.length > 0 && bps[0].equals(ScrapbookLauncher.getDefault().getMagicBreakpoint(jt.getDebugTarget()))) {
// locate the 'eval' method and step over
- IStackFrame[] frames = jt.getStackFrames();
- for (int j = 0; j < frames.length; j++) {
- IJavaStackFrame frame = (IJavaStackFrame)frames[j];
+ for (IStackFrame stackframe : jt.getStackFrames()) {
+ IJavaStackFrame frame = (IJavaStackFrame) stackframe;
if (frame.getReceivingTypeName().equals("org.eclipse.jdt.internal.debug.ui.snippeteditor.ScrapbookMain1") && frame.getName().equals("eval")) { //$NON-NLS-1$ //$NON-NLS-2$
- // ignore step filters for this step
- fStepFiltersSetting = target.isStepFiltersEnabled();
- target.setStepFiltersEnabled(false);
+ // ignore step filters for this step
+ fStepFiltersSetting = target.isStepFiltersEnabled();
+ target.setStepFiltersEnabled(false);
frame.stepOver();
return null;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java
index 0eea33f..3ebf6e3 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java
@@ -146,10 +146,9 @@
cp.add(supportEntry);
// get bootpath entries
try {
- IRuntimeClasspathEntry[] entries = JavaRuntime.computeUnresolvedRuntimeClasspath(javaProject);
- for (int i = 0; i < entries.length; i++) {
- if (entries[i].getClasspathProperty() != IRuntimeClasspathEntry.USER_CLASSES) {
- cp.add(entries[i]);
+ for (IRuntimeClasspathEntry entry : JavaRuntime.computeUnresolvedRuntimeClasspath(javaProject)) {
+ if (entry.getClasspathProperty() != IRuntimeClasspathEntry.USER_CLASSES) {
+ cp.add(entry);
}
}
IRuntimeClasspathEntry[] classPath = cp.toArray(new IRuntimeClasspathEntry[cp.size()]);
@@ -216,8 +215,8 @@
// convert to mementos
List<String> classpathList= new ArrayList<>(classPath.length);
- for (int i = 0; i < classPath.length; i++) {
- classpathList.add(classPath[i].getMemento());
+ for (IRuntimeClasspathEntry cp : classPath) {
+ classpathList.add(cp.getMemento());
}
if(wc == null) {
wc = config.getWorkingCopy();
@@ -230,9 +229,9 @@
}
StringBuilder urlsString = new StringBuilder();
- for (int i = 0; i < urls.length; i++) {
+ for (String url : urls) {
urlsString.append(' ');
- urlsString.append(urls[i]);
+ urlsString.append(url);
}
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, urlsString.toString());
wc.setAttribute(SCRAPBOOK_LAUNCH, SCRAPBOOK_LAUNCH);
@@ -293,8 +292,7 @@
*/
@Override
public void handleDebugEvents(DebugEvent[] events) {
- for (int i = 0; i < events.length; i++) {
- DebugEvent event = events[i];
+ for (DebugEvent event : events) {
if (event.getSource() instanceof IDebugTarget && event.getKind() == DebugEvent.TERMINATE) {
cleanup((IDebugTarget)event.getSource());
}
@@ -506,16 +504,15 @@
public void cleanupLaunchConfigurations() {
try {
ILaunchConfigurationType lcType = getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
- ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations(lcType);
IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- for (int i = 0; i < configs.length; i++) {
- String path = configs[i].getAttribute(SCRAPBOOK_FILE_PATH, (String)null);
+ for (ILaunchConfiguration config : getLaunchManager().getLaunchConfigurations(lcType)) {
+ String path = config.getAttribute(SCRAPBOOK_FILE_PATH, (String)null);
if (path != null) {
IPath pagePath = new Path(path);
IResource res = root.findMember(pagePath);
if (res == null) {
// config without a page - delete it
- configs[i].delete();
+ config.delete();
}
}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java
index 798725e..869ffb6 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java
@@ -84,8 +84,7 @@
protected void populateImports() {
fImportNames= new ArrayList<>(1);
if (fImports != null) {
- for (int i = 0; i < fImports.length; i++) {
- String name = fImports[i];
+ for (String name : fImports) {
addImport(name);
}
}
@@ -101,8 +100,8 @@
protected void removeImports(Object[] imports) {
- for (int i = 0; i < imports.length; i++) {
- Filter imprt = (Filter)imports[i];
+ for (Object i : imports) {
+ Filter imprt = (Filter) i;
fImportNames.remove(imprt);
}
fViewer.remove(imports);
@@ -201,9 +200,7 @@
IJavaProject project= fEditor.getJavaProject();
List<IJavaElement> projects= new ArrayList<>();
projects.add(project);
- IPackageFragmentRoot[] roots= project.getAllPackageFragmentRoots();
- for (int i = 0; i < roots.length; i++) {
- IPackageFragmentRoot root = roots[i];
+ for (IPackageFragmentRoot root : project.getAllPackageFragmentRoots()) {
projects.add(root.getParent());
}
dialog = JDIDebugUIPlugin.createAllPackagesDialog(shell, projects.toArray(new IJavaProject[projects.size()]), false);
@@ -224,8 +221,8 @@
}
Object[] packages= dialog.getResult();
if (packages != null) {
- for (int i = 0; i < packages.length; i++) {
- IJavaElement pkg = (IJavaElement)packages[i];
+ for (Object p : packages) {
+ IJavaElement pkg = (IJavaElement) p;
String filter = pkg.getElementName();
filter += ".*"; //$NON-NLS-1$
fImportContentProvider.addImport(filter);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/JavaProjectSourceContainerBrowser.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/JavaProjectSourceContainerBrowser.java
index 6c9cb8d..3c82081 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/JavaProjectSourceContainerBrowser.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/sourcelookup/JavaProjectSourceContainerBrowser.java
@@ -97,8 +97,8 @@
Object[] selections = dialog.getResult();
List<IJavaProject> additions = new ArrayList<>(selections.length);
try {
- for (int i = 0; i < selections.length; i++) {
- IJavaProject jp = (IJavaProject)selections[i];
+ for (Object selection : selections) {
+ IJavaProject jp = (IJavaProject) selection;
if (dialog.isAddRequiredProjects()) {
collectRequiredProjects(jp, additions);
} else {
@@ -145,13 +145,11 @@
projects= new IJavaProject[0];
}
List<IJavaProject> remaining = new ArrayList<>();
- for (int i = 0; i < projects.length; i++) {
- remaining.add(projects[i]);
+ for (IJavaProject project : projects) {
+ remaining.add(project);
}
List<IJavaProject> alreadySelected = new ArrayList<>();
- ISourceContainer[] containers = director.getSourceContainers();
- for (int i = 0; i < containers.length; i++) {
- ISourceContainer container = containers[i];
+ for (ISourceContainer container : director.getSourceContainers()) {
if (container.getType().getId().equals(JavaProjectSourceContainer.TYPE_ID)) {
alreadySelected.add(((JavaProjectSourceContainer)container).getJavaProject());
}
@@ -175,9 +173,7 @@
IJavaModel model= proj.getJavaModel();
- IClasspathEntry[] entries= proj.getRawClasspath();
- for (int i= 0; i < entries.length; i++) {
- IClasspathEntry curr= entries[i];
+ for (IClasspathEntry curr : proj.getRawClasspath()) {
if (curr.getEntryKind() == IClasspathEntry.CPE_PROJECT) {
IJavaProject ref= model.getJavaProject(curr.getPath().segment(0));
if (ref.exists()) {
@@ -197,9 +193,7 @@
* @throws CoreException if an exception occurs
*/
protected void collectExportedEntries(IJavaProject proj, List<ISourceContainer> list) throws CoreException {
- IClasspathEntry[] entries = proj.getRawClasspath();
- for (int i = 0; i < entries.length; i++) {
- IClasspathEntry entry = entries[i];
+ for (IClasspathEntry entry : proj.getRawClasspath()) {
ISourceContainer sourceContainer = null;
if (entry.isExported()) {
switch (entry.getEntryKind()) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaModelProxyFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaModelProxyFactory.java
index 8526f23..09c6eb0 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaModelProxyFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaModelProxyFactory.java
@@ -35,9 +35,8 @@
if (IDebugUIConstants.ID_DEBUG_VIEW.equals(context.getId())) {
if (element instanceof IJavaDebugTarget) {
ILaunch launch = ((IDebugTarget) element).getLaunch();
- Object[] children = launch.getChildren();
- for (int i = 0; i < children.length; i++) {
- if (children[i] == element) {
+ for (Object child : launch.getChildren()) {
+ if (child == element) {
// ensure the target is a visible child of the launch
return new JavaDebugTargetProxy((IDebugTarget) element);
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaThreadGroupContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaThreadGroupContentProvider.java
index f7c6ad3..66b02a2 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaThreadGroupContentProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaThreadGroupContentProvider.java
@@ -59,12 +59,12 @@
IJavaThread[] threads = group.getThreads();
Object[] kids = new Object[threadGroups.length + threads.length];
int index = 0;
- for (int i = 0; i < threads.length; i++) {
- kids[index]= threads[i];
+ for (IJavaThread thread : threads) {
+ kids[index]= thread;
index++;
}
- for (int i = 0; i < threadGroups.length; i++) {
- kids[index] = threadGroups[i];
+ for (IJavaThreadGroup threadGroup : threadGroups) {
+ kids[index] = threadGroup;
index++;
}
return kids;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaContentProviderFilter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaContentProviderFilter.java
index 8217702..376cc9f 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaContentProviderFilter.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaContentProviderFilter.java
@@ -49,10 +49,10 @@
if (filterStatics || filterConstants) {
List<Object> keep = new ArrayList<>(variables.length);
- for (int i = 0; i < variables.length; i++) {
+ for (Object variable : variables) {
boolean filter = false;
- if (variables[i] instanceof IJavaVariable){
- IJavaVariable var = (IJavaVariable)variables[i];
+ if (variable instanceof IJavaVariable) {
+ IJavaVariable var = (IJavaVariable) variable;
if (var.isStatic()){
if (var.isFinal()){
filter = filterConstants;
@@ -61,8 +61,8 @@
}
}
}
- if (!filter){
- keep.add(variables[i]);
+ if (!filter) {
+ keep.add(variable);
}
}
return keep.toArray(new Object[keep.size()]);
