Bug 511712 - Run cleanup action on eclipse.platform.ui/bundles to use
enhanced for loop - Part3
Change-Id: I0604be64a9287a0b16ea5764d81c8410dd07dc37
Signed-off-by: David Weiser <david.weiser@vogella.com>
diff --git a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserEditor.java b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserEditor.java
index 4bacd19..3ff5b0a 100644
--- a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserEditor.java
+++ b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserEditor.java
@@ -309,8 +309,7 @@
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
String editorId = null;
- for (int i = 0; i < editors.length; i++) {
- IEditorDescriptor editor = editors[i];
+ for (IEditorDescriptor editor : editors) {
if (editor.getId().equals(id))
continue;
editorId = editor.getId();
diff --git a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreference.java b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreference.java
index 7a6327c..9b8dadc 100644
--- a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreference.java
+++ b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreference.java
@@ -168,8 +168,7 @@
// For each default editor that matches the oldId, change
// the default editor to the newId
- for (int i = 0; i < extensions.length; i++) {
- String[] ext = extensions[i];
+ for (String[] ext : extensions) {
IEditorDescriptor ddesc = registry.getDefaultEditor(ext[0]);
if (ddesc != null && ddesc.getId().equals(oldId)) {
registry.setDefaultEditor(ext[1], newId);
diff --git a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreferencePage.java b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreferencePage.java
index fef6aeb..ec86917 100644
--- a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreferencePage.java
+++ b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreferencePage.java
@@ -479,10 +479,7 @@
// Uncheck all the items except the current one that was just checked
protected void checkNewDefaultBrowser(Object browser) {
- TableItem[] children = tableViewer.getTable().getItems();
- for (int i = 0; i < children.length; i++) {
- TableItem item = children[i];
-
+ for (TableItem item : tableViewer.getTable().getItems()) {
if (!(item.getData().equals(browser)))
item.setChecked(false);
}
@@ -509,11 +506,11 @@
String[] names = directory.list();
List<File> subDirs = new ArrayList<>();
- for (int i = 0; i < names.length; i++) {
+ for (String name : names) {
if (monitor.isCanceled())
return;
- File file = new File(directory, names[i]);
+ File file = new File(directory, name);
if (existingPaths.contains(file.getAbsolutePath().toLowerCase()))
continue;
diff --git a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserUtil.java b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserUtil.java
index c5e4ba0..8eb89a1 100644
--- a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserUtil.java
+++ b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserUtil.java
@@ -254,12 +254,12 @@
if (!Platform.getOS().equals(Platform.OS_WIN32))
return roots;
ArrayList<File> list = new ArrayList<>();
- for (int i = 0; i < roots.length; i++) {
- String path = roots[i].getAbsolutePath();
+ for (File root : roots) {
+ String path = root.getAbsolutePath();
if (path != null
&& (path.toLowerCase().startsWith("a:") || path.toLowerCase().startsWith("b:"))) //$NON-NLS-1$ //$NON-NLS-2$
continue;
- list.add(roots[i]);
+ list.add(root);
}
return list.toArray(new File[list.size()]);
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/ContributorTrackingSet.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/ContributorTrackingSet.java
index 34d8bbb..2a4a9f1 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/ContributorTrackingSet.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/ContributorTrackingSet.java
@@ -50,8 +50,8 @@
*/
public ContributorTrackingSet(NavigatorContentService aContentService, Object[] elements) {
- for (int i = 0; i < elements.length; i++)
- super.add(elements[i]);
+ for (Object element : elements)
+ super.add(element);
contentService = aContentService;
}
@@ -111,8 +111,8 @@
public void setContents(Object[] contents) {
super.clear();
if(contents != null)
- for (int i = 0; i < contents.length; i++)
- add(contents[i]);
+ for (Object content : contents)
+ add(content);
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CustomAndExpression.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CustomAndExpression.java
index 40ef743..b2c0bcb 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CustomAndExpression.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CustomAndExpression.java
@@ -11,7 +11,6 @@
package org.eclipse.ui.internal.navigator;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.eclipse.core.expressions.ElementHandler;
@@ -50,9 +49,9 @@
@Override
public void run() throws Exception {
fExpressions = new ArrayList<Expression>();
- for (int i = 0; i < children.length; i++) {
+ for (IConfigurationElement configurationElement : children) {
fExpressions.add(ElementHandler.getDefault().create(
- ExpressionConverter.getDefault(), children[i]));
+ ExpressionConverter.getDefault(), configurationElement));
}
}
});
@@ -66,8 +65,7 @@
}
NavigatorPlugin.Evaluator evaluator = new NavigatorPlugin.Evaluator();
EvaluationResult result = EvaluationResult.TRUE;
- for (Iterator<Expression> iter = fExpressions.iterator(); iter.hasNext();) {
- Expression expression = iter.next();
+ for (Expression expression : fExpressions) {
evaluator.expression = expression;
evaluator.scope = scope;
SafeRunner.run(evaluator);
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorActivationService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorActivationService.java
index 548dcec..603d5cd 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorActivationService.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorActivationService.java
@@ -174,12 +174,12 @@
boolean toEnable) {
if (toEnable) {
- for (int i = 0; i < aNavigatorExtensionIds.length; i++) {
- activatedExtensionsMap.put(aNavigatorExtensionIds[i], Boolean.TRUE);
+ for (String aNavigatorExtensionId : aNavigatorExtensionIds) {
+ activatedExtensionsMap.put(aNavigatorExtensionId, Boolean.TRUE);
}
} else {
- for (int i = 0; i < aNavigatorExtensionIds.length; i++) {
- activatedExtensionsMap.put(aNavigatorExtensionIds[i], Boolean.FALSE);
+ for (String aNavigatorExtensionId : aNavigatorExtensionIds) {
+ activatedExtensionsMap.put(aNavigatorExtensionId, Boolean.FALSE);
}
}
notifyListeners(aNavigatorExtensionIds, toEnable);
@@ -248,8 +248,8 @@
Arrays.sort(navigatorExtensionIds);
Object[] listenerArray = listeners.getListeners();
- for (int i = 0; i < listenerArray.length; i++) {
- ((IExtensionActivationListener) listenerArray[i])
+ for (Object element : listenerArray) {
+ ((IExtensionActivationListener) element)
.onExtensionActivation(contentService.getViewerId(),
navigatorExtensionIds, toEnable);
}
@@ -272,15 +272,15 @@
String id = null;
String booleanString = null;
int indx=0;
- for (int i = 0; i < contentExtensionIds.length; i++) {
- if( (indx = contentExtensionIds[i].indexOf(EQUALS)) > -1) {
+ for (String contentExtensionId : contentExtensionIds) {
+ if( (indx = contentExtensionId.indexOf(EQUALS)) > -1) {
// up to but not including the equals
- id = contentExtensionIds[i].substring(0, indx);
- booleanString = contentExtensionIds[i].substring(indx+1, contentExtensionIds[i].length());
+ id = contentExtensionId.substring(0, indx);
+ booleanString = contentExtensionId.substring(indx+1, contentExtensionId.length());
activatedExtensionsMap.put(id, Boolean.valueOf(booleanString));
} else {
// IS THIS THE RIGHT WAY TO HANDLE THIS CASE?
- NavigatorContentDescriptor descriptor = CONTENT_DESCRIPTOR_REGISTRY.getContentDescriptor(contentExtensionIds[i]);
+ NavigatorContentDescriptor descriptor = CONTENT_DESCRIPTOR_REGISTRY.getContentDescriptor(contentExtensionId);
if(descriptor != null)
activatedExtensionsMap.put(id, Boolean.valueOf(descriptor.isActiveByDefault()));
}
@@ -295,9 +295,9 @@
*/
INavigatorContentDescriptor[] contentDescriptors = CONTENT_DESCRIPTOR_REGISTRY
.getAllContentDescriptors();
- for (int i = 0; i < contentDescriptors.length; i++) {
- if (contentDescriptors[i].isActiveByDefault()) {
- activatedExtensionsMap.put(contentDescriptors[i].getId(), Boolean.TRUE);
+ for (INavigatorContentDescriptor contentDescriptor : contentDescriptors) {
+ if (contentDescriptor.isActiveByDefault()) {
+ activatedExtensionsMap.put(contentDescriptor.getId(), Boolean.TRUE);
}
}
}
@@ -314,9 +314,9 @@
Set<NavigatorContentDescriptor> activatedDescriptors = new HashSet<NavigatorContentDescriptor>();
setActive(extensionIds, true);
- for (int extId = 0; extId < extensionIds.length; extId++) {
+ for (String extensionId : extensionIds) {
activatedDescriptors.add(CONTENT_DESCRIPTOR_REGISTRY
- .getContentDescriptor(extensionIds[extId]));
+ .getContentDescriptor(extensionId));
}
if (toDeactivateAllOthers) {
@@ -324,11 +324,10 @@
.getAllContentDescriptors();
List<NavigatorContentDescriptor> descriptorList = new ArrayList<NavigatorContentDescriptor>(Arrays.asList(descriptors));
- for (int descriptorIndx = 0; descriptorIndx < descriptors.length; descriptorIndx++) {
- for (int extId = 0; extId < extensionIds.length; extId++) {
- if (descriptors[descriptorIndx].getId().equals(
- extensionIds[extId])) {
- descriptorList.remove(descriptors[descriptorIndx]);
+ for (NavigatorContentDescriptor descriptor : descriptors) {
+ for (String extensionId : extensionIds) {
+ if (descriptor.getId().equals(extensionId)) {
+ descriptorList.remove(descriptor);
}
}
}
@@ -362,11 +361,10 @@
.getAllContentDescriptors();
List<NavigatorContentDescriptor> descriptorList = new ArrayList<NavigatorContentDescriptor>(Arrays.asList(descriptors));
- for (int descriptorIndx = 0; descriptorIndx < descriptors.length; descriptorIndx++) {
- for (int extId = 0; extId < extensionIds.length; extId++) {
- if (descriptors[descriptorIndx].getId().equals(
- extensionIds[extId])) {
- descriptorList.remove(descriptors[descriptorIndx]);
+ for (NavigatorContentDescriptor descriptor : descriptors) {
+ for (String extensionId : extensionIds) {
+ if (descriptor.getId().equals(extensionId)) {
+ descriptorList.remove(descriptor);
}
}
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentService.java
index 73bd95b..191477f 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentService.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentService.java
@@ -187,9 +187,9 @@
NavigatorContentDescriptor[] descriptors = CONTENT_DESCRIPTOR_REGISTRY
.getAllContentDescriptors();
- for (int i = 0; i < descriptors.length; i++) {
- if (assistant.isVisible(descriptors[i].getId())) {
- visibleExtensionIds.add(descriptors[i].getId());
+ for (NavigatorContentDescriptor descriptor : descriptors) {
+ if (assistant.isVisible(descriptor.getId())) {
+ visibleExtensionIds.add(descriptor.getId());
}
}
if (visibleExtensionIds.isEmpty()) {
@@ -206,9 +206,9 @@
NavigatorContentDescriptor[] descriptors = CONTENT_DESCRIPTOR_REGISTRY
.getAllContentDescriptors();
- for (int i = 0; i < descriptors.length; i++) {
- if (assistant.isVisible(descriptors[i].getId())) {
- visibleDescriptors.add(descriptors[i]);
+ for (NavigatorContentDescriptor descriptor : descriptors) {
+ if (assistant.isVisible(descriptor.getId())) {
+ visibleDescriptors.add(descriptor);
}
}
if (visibleDescriptors.isEmpty()) {
@@ -225,10 +225,10 @@
NavigatorContentDescriptor[] descriptors = CONTENT_DESCRIPTOR_REGISTRY
.getContentDescriptorsWithSaveables();
- for (int i = 0; i < descriptors.length; i++) {
- if (assistant.isVisible(descriptors[i].getId())
- && assistant.isActive(descriptors[i])) {
- result.add(descriptors[i]);
+ for (NavigatorContentDescriptor descriptor : descriptors) {
+ if (assistant.isVisible(descriptor.getId())
+ && assistant.isActive(descriptor)) {
+ result.add(descriptor);
}
}
if (result.isEmpty()) {
@@ -250,9 +250,9 @@
Set<INavigatorContentDescriptor> boundDescriptors = new HashSet<INavigatorContentDescriptor>();
INavigatorContentDescriptor descriptor;
- for (int i = 0; i < extensionIds.length; i++) {
+ for (String extensionId : extensionIds) {
descriptor = CONTENT_DESCRIPTOR_REGISTRY
- .getContentDescriptor(extensionIds[i]);
+ .getContentDescriptor(extensionId);
if (descriptor != null) {
boundDescriptors.add(descriptor);
}
@@ -324,9 +324,8 @@
assistant.removeListener(navigatorSorterService);
}
synchronized (this) {
- for (Iterator<NavigatorContentExtension> contentItr = contentExtensions.values().iterator(); contentItr
- .hasNext();) {
- contentItr.next().dispose();
+ for (NavigatorContentExtension navigatorContentExtension : contentExtensions.values()) {
+ navigatorContentExtension.dispose();
}
}
getActivationService().removeExtensionActivationListener(this);
@@ -429,8 +428,8 @@
possibleChildDescriptors.add(sourceDescriptor);
}
- for (Iterator<INavigatorContentDescriptor> iter = possibleChildDescriptors.iterator(); iter.hasNext();) {
- NavigatorContentDescriptor ncd = (NavigatorContentDescriptor) iter.next();
+ for (INavigatorContentDescriptor iNavigatorContentDescriptor : possibleChildDescriptors) {
+ NavigatorContentDescriptor ncd = (NavigatorContentDescriptor) iNavigatorContentDescriptor;
findOverridingLabelExtensions(anElement, ncd, contributors);
}
@@ -467,8 +466,8 @@
return NO_LABEL_PROVIDERS;
}
List<ICommonLabelProvider> resultProvidersList = new ArrayList<ICommonLabelProvider>();
- for (Iterator<NavigatorContentExtension> itr = extensions.iterator(); itr.hasNext();) {
- resultProvidersList.add(itr.next().getLabelProvider());
+ for (NavigatorContentExtension navigatorContentExtension : extensions) {
+ resultProvidersList.add(navigatorContentExtension.getLabelProvider());
}
return resultProvidersList.toArray(new ILabelProvider[resultProvidersList.size()]);
}
@@ -519,10 +518,10 @@
.getAllContentDescriptors();
NavigatorContentExtension extension = null;
- for (int i = 0; i < descriptors.length; i++) {
- if (isActive(descriptors[i].getId())
- && isRootExtension(descriptors[i].getId())) {
- extension = getExtension(descriptors[i]);
+ for (NavigatorContentDescriptor descriptor : descriptors) {
+ if (isActive(descriptor.getId())
+ && isRootExtension(descriptor.getId())) {
+ extension = getExtension(descriptor);
if (!extension.hasLoadingFailed()) {
rootExtensions.add(extension);
}
@@ -551,9 +550,7 @@
Set<NavigatorContentExtension> overrideableExtensions = new TreeSet<NavigatorContentExtension>(
ExtensionSequenceNumberComparator.INSTANCE);
Set<INavigatorContentDescriptor> descriptors = findDescriptorsWithPossibleChild(anElement, false);
- for (Iterator<INavigatorContentDescriptor> iter = descriptors.iterator(); iter.hasNext();) {
- INavigatorContentDescriptor descriptor = iter
- .next();
+ for (INavigatorContentDescriptor descriptor : descriptors) {
if (descriptor.hasOverridingExtensions()) {
overrideableExtensions.add(getExtension(descriptor));
}
@@ -1079,9 +1076,7 @@
final List<INavigatorContentServiceListener> failedListeners = new ArrayList<INavigatorContentServiceListener>();
- for (Iterator<INavigatorContentServiceListener> listenersItr = listeners.iterator(); listenersItr.hasNext();) {
- final INavigatorContentServiceListener listener = listenersItr
- .next();
+ for (INavigatorContentServiceListener listener : listeners) {
SafeRunner.run(new NavigatorSafeRunnable() {
@Override
@@ -1108,9 +1103,8 @@
return NO_CONTENT_PROVIDERS;
}
List<SafeDelegateTreeContentProvider> resultProvidersList = new ArrayList<SafeDelegateTreeContentProvider>();
- for (Iterator<NavigatorContentExtension> itr = theDescriptorInstances.iterator(); itr.hasNext();) {
- resultProvidersList.add(itr.next()
- .internalGetContentProvider());
+ for (NavigatorContentExtension navigatorContentExtension : theDescriptorInstances) {
+ resultProvidersList.add(navigatorContentExtension.internalGetContentProvider());
}
return resultProvidersList
.toArray(new ITreeContentProvider[resultProvidersList.size()]);
@@ -1122,14 +1116,10 @@
return Collections.EMPTY_SET;
}
Set<NavigatorContentExtension> resultInstances = new TreeSet<NavigatorContentExtension>(ExtensionSequenceNumberComparator.INSTANCE);
- for (Iterator<INavigatorContentDescriptor> descriptorIter = theDescriptors.iterator(); descriptorIter
- .hasNext();) {
- NavigatorContentExtension extension = getExtension(
- descriptorIter.next(),
- toLoadAllIfNecessary);
+ for (INavigatorContentDescriptor iNavigatorContentDescriptor : theDescriptors) {
+ NavigatorContentExtension extension = getExtension(iNavigatorContentDescriptor, toLoadAllIfNecessary);
if (extension != null) {
resultInstances.add(extension);
-
}
}
return resultInstances;
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceContentProvider.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceContentProvider.java
index 0d6f1cf..de2ef19 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceContentProvider.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceContentProvider.java
@@ -199,19 +199,17 @@
INavigatorContentDescriptor firstClassDescriptor, ContributorTrackingSet pipelinedChildren, boolean elements) {
IPipelinedTreeContentProvider pipelinedContentProvider;
NavigatorContentExtension[] overridingExtensions;
- for (int i = 0; i < theOverridingExtensions.length; i++) {
+ for (NavigatorContentExtension overridingExtension : theOverridingExtensions) {
- if (theOverridingExtensions[i].internalGetContentProvider().isPipelined()) {
- pipelinedContentProvider = (IPipelinedTreeContentProvider) theOverridingExtensions[i]
- .internalGetContentProvider();
- pipelinedChildren.setContributor(theOverridingExtensions[i]
- .getDescriptor(), firstClassDescriptor);
+ if (overridingExtension.internalGetContentProvider().isPipelined()) {
+ pipelinedContentProvider = overridingExtension.internalGetContentProvider();
+ pipelinedChildren.setContributor(overridingExtension.getDescriptor(), firstClassDescriptor);
if (elements) {
pipelinedContentProvider.getPipelinedElements(aParent, pipelinedChildren);
} else {
pipelinedContentProvider.getPipelinedChildren(aParent, pipelinedChildren);
}
- overridingExtensions = theOverridingExtensions[i].getOverridingExtensionsForTriggerPoint(aParent);
+ overridingExtensions = overridingExtension.getOverridingExtensionsForTriggerPoint(aParent);
if (overridingExtensions.length > 0) {
pipelineChildren(aParent, overridingExtensions, firstClassDescriptor, pipelinedChildren, elements);
}
@@ -354,15 +352,15 @@
IPipelinedTreeContentProvider pipelinedContentProvider;
NavigatorContentExtension[] overridingExtensions;
Object aSuggestedParent = null;
- for (int i = 0; i < theOverridingExtensions.length; i++) {
+ for (NavigatorContentExtension theOverridingExtension : theOverridingExtensions) {
- if (theOverridingExtensions[i].internalGetContentProvider().isPipelined()) {
- pipelinedContentProvider = (IPipelinedTreeContentProvider) theOverridingExtensions[i]
+ if (theOverridingExtension.internalGetContentProvider().isPipelined()) {
+ pipelinedContentProvider = theOverridingExtension
.internalGetContentProvider();
aSuggestedParent = pipelinedContentProvider.getPipelinedParent(anInputElement, aSuggestedParent);
- overridingExtensions = theOverridingExtensions[i]
+ overridingExtensions = theOverridingExtension
.getOverridingExtensionsForTriggerPoint(anInputElement);
if (overridingExtensions.length > 0) {
aSuggestedParent = pipelineParent(anInputElement, overridingExtensions, aSuggestedParent);
@@ -438,7 +436,7 @@
private boolean callNormalHasChildren(Object anElementOrPath, Object anElement, SafeDelegateTreeContentProvider cp) {
if (cp.isTreePath() && anElementOrPath instanceof TreePath) {
- ITreePathContentProvider tpcp = (ITreePathContentProvider) cp;
+ ITreePathContentProvider tpcp = cp;
return tpcp.hasChildren((TreePath) anElementOrPath);
}
return ((ITreeContentProvider) cp).hasChildren(anElement);
@@ -447,13 +445,13 @@
private boolean pipelineHasChildren(Object anElementOrPath, Object anElement,
NavigatorContentExtension[] theOverridingExtensions, boolean suggestedHasChildren) {
NavigatorContentExtension[] overridingExtensions;
- for (int i = 0; i < theOverridingExtensions.length; i++) {
+ for (NavigatorContentExtension theOverridingExtension : theOverridingExtensions) {
- SafeDelegateTreeContentProvider cp = theOverridingExtensions[i].internalGetContentProvider();
+ SafeDelegateTreeContentProvider cp = theOverridingExtension.internalGetContentProvider();
if (cp.isPipelinedHasChildren()) {
suggestedHasChildren = cp.hasPipelinedChildren(
anElement, suggestedHasChildren);
- overridingExtensions = theOverridingExtensions[i]
+ overridingExtensions = theOverridingExtension
.getOverridingExtensionsForTriggerPoint(anElement);
if (overridingExtensions.length > 0) {
suggestedHasChildren = pipelineHasChildren(anElementOrPath, anElement,
@@ -596,7 +594,7 @@
Set/* <TreePathCompiler> */foundPaths = Collections.EMPTY_SET;
if (parents.size() > 0) {
for (Iterator parentIter = parents.iterator(); parentIter.hasNext();) {
- Object parent = (Object) parentIter.next();
+ Object parent = parentIter.next();
TreePathCompiler c = new TreePathCompiler(aPathCompiler);
try {
c.addParent(parent);
@@ -635,9 +633,9 @@
TreePath[] parentTreePaths = ((ITreePathContentProvider) foundExtension
.internalGetContentProvider()).getParents(anElement);
- for (int i = 0; i < parentTreePaths.length; i++) {
+ for (TreePath parentTreePath : parentTreePaths) {
- parent = parentTreePaths[i].getLastSegment();
+ parent = parentTreePath.getLastSegment();
if ((parent = findParent(foundExtension, anElement, parent)) != null)
parents.add(parent);
}
@@ -673,16 +671,16 @@
IPipelinedTreeContentProvider piplineContentProvider;
NavigatorContentExtension[] overridingExtensions = anExtension
.getOverridingExtensionsForPossibleChild(anElement);
- for (int i = 0; i < overridingExtensions.length; i++) {
- if (overridingExtensions[i].internalGetContentProvider().isPipelined()) {
- piplineContentProvider = (IPipelinedTreeContentProvider) overridingExtensions[i].internalGetContentProvider();
+ for (NavigatorContentExtension overridingExtension : overridingExtensions) {
+ if (overridingExtension.internalGetContentProvider().isPipelined()) {
+ piplineContentProvider = overridingExtension.internalGetContentProvider();
suggestedOverriddenParent = piplineContentProvider.getPipelinedParent(anElement, lastValidParent);
if (suggestedOverriddenParent != null && !suggestedOverriddenParent.equals(aSuggestedParent))
lastValidParent = suggestedOverriddenParent;
// should never return null
- lastValidParent = findParent(overridingExtensions[i], anElement, lastValidParent);
+ lastValidParent = findParent(overridingExtension, anElement, lastValidParent);
}
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceLabelProvider.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceLabelProvider.java
index 44f5fd1..532bb25 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceLabelProvider.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceLabelProvider.java
@@ -18,6 +18,7 @@
import org.eclipse.core.commands.common.EventManager;
import org.eclipse.core.runtime.SafeRunner;
import org.eclipse.jface.util.SafeRunnable;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
import org.eclipse.jface.viewers.IColorProvider;
import org.eclipse.jface.viewers.IFontProvider;
import org.eclipse.jface.viewers.ILabelProvider;
@@ -28,7 +29,6 @@
import org.eclipse.jface.viewers.StyledString;
import org.eclipse.jface.viewers.TreePath;
import org.eclipse.jface.viewers.ViewerLabel;
-import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
@@ -131,11 +131,11 @@
if (labelProviders.length == 0)
return NLS.bind(CommonNavigatorMessages.NavigatorContentServiceLabelProvider_Error_no_label_provider_for_0_, makeSmallString(anElement));
String text = null;
- for (int i = 0; i < labelProviders.length; i++) {
- if (labelProviders[i] instanceof ITableLabelProvider && aColumn != -1)
- text = ((ITableLabelProvider)labelProviders[i]).getColumnText(anElement, aColumn);
+ for (ILabelProvider labelProvider : labelProviders) {
+ if (labelProvider instanceof ITableLabelProvider && aColumn != -1)
+ text = ((ITableLabelProvider)labelProvider).getColumnText(anElement, aColumn);
else
- text = labelProviders[i].getText(anElement);
+ text = labelProvider.getText(anElement);
if (text != null && text.length() > 0)
return text;
}
@@ -204,8 +204,7 @@
@Override
public Font getFont(Object anElement) {
ILabelProvider[] labelProviders = contentService.findRelevantLabelProviders(anElement);
- for (int i = 0; i < labelProviders.length; i++) {
- ILabelProvider provider = labelProviders[i];
+ for (ILabelProvider provider : labelProviders) {
if (provider instanceof IFontProvider) {
IFontProvider fontProvider = (IFontProvider) provider;
Font font = fontProvider.getFont(anElement);
@@ -220,8 +219,7 @@
@Override
public Color getForeground(Object anElement) {
ILabelProvider[] labelProviders = contentService.findRelevantLabelProviders(anElement);
- for (int i = 0; i < labelProviders.length; i++) {
- ILabelProvider provider = labelProviders[i];
+ for (ILabelProvider provider : labelProviders) {
if (provider instanceof IColorProvider) {
IColorProvider colorProvider = (IColorProvider) provider;
Color color = colorProvider.getForeground(anElement);
@@ -236,8 +234,7 @@
@Override
public Color getBackground(Object anElement) {
ILabelProvider[] labelProviders = contentService.findRelevantLabelProviders(anElement);
- for (int i = 0; i < labelProviders.length; i++) {
- ILabelProvider provider = labelProviders[i];
+ for (ILabelProvider provider : labelProviders) {
if (provider instanceof IColorProvider) {
IColorProvider colorProvider = (IColorProvider) provider;
Color color = colorProvider.getBackground(anElement);
@@ -331,13 +328,12 @@
*/
protected void fireLabelProviderChanged(
final LabelProviderChangedEvent event) {
- Object[] theListeners = getListeners();
- for (int i = 0; i < theListeners.length; ++i) {
- final ILabelProviderListener l = (ILabelProviderListener) theListeners[i];
+ for (Object listener : getListeners()) {
+ final ILabelProviderListener labelProviderListener = (ILabelProviderListener) listener;
SafeRunner.run(new SafeRunnable() {
@Override
public void run() {
- l.labelProviderChanged(event);
+ labelProviderListener.labelProviderChanged(event);
}
});
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorFilterService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorFilterService.java
index 053c888..787fffe 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorFilterService.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorFilterService.java
@@ -15,7 +15,6 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -74,15 +73,15 @@
String activatedFiltersPreferenceValue = prefs.get(
getFilterActivationPreferenceKey(), null);
String[] activeFilterIds = activatedFiltersPreferenceValue.split(DELIM);
- for (int i = 0; i < activeFilterIds.length; i++) {
- activeFilters.add(activeFilterIds[i]);
+ for (String activeFilterId : activeFilterIds) {
+ activeFilters.add(activeFilterId);
}
} else {
ICommonFilterDescriptor[] visibleFilterDescriptors = getVisibleFilterDescriptors();
- for (int i = 0; i < visibleFilterDescriptors.length; i++) {
- if (visibleFilterDescriptors[i].isActiveByDefault()) {
- activeFilters.add(visibleFilterDescriptors[i].getId());
+ for (ICommonFilterDescriptor visibleFilterDescriptor : visibleFilterDescriptors) {
+ if (visibleFilterDescriptor.isActiveByDefault()) {
+ activeFilters.add(visibleFilterDescriptor.getId());
}
}
}
@@ -103,8 +102,7 @@
*/
StringBuffer activatedFiltersPreferenceValue = new StringBuffer(DELIM);
- for (Iterator<String> activeItr = activeFilters.iterator(); activeItr.hasNext();) {
- String id = activeItr.next().toString();
+ for (String id : activeFilters) {
if (!dm.getFilterById(id).isVisibleInUi())
continue;
activatedFiltersPreferenceValue.append(id).append(DELIM);
@@ -141,9 +139,9 @@
List<ViewerFilter> filters = new ArrayList<ViewerFilter>();
ViewerFilter instance;
- for (int i = 0; i < descriptors.length; i++) {
- if (!toReturnOnlyActiveFilters || isActive(descriptors[i].getId())) {
- instance = getViewerFilter(descriptors[i]);
+ for (CommonFilterDescriptor descriptor : descriptors) {
+ if (!toReturnOnlyActiveFilters || isActive(descriptor.getId())) {
+ instance = getViewerFilter(descriptor);
if (instance != null) {
filters.add(instance);
}
@@ -245,8 +243,8 @@
/* If so, update */
if (updateFilterActivation) {
if (nonUiVisible != null) {
- for (int i = 0; i < filterIdsToActivate.length; i++)
- nonUiVisible.add(filterIdsToActivate[i]);
+ for (String filterIdToActivate : filterIdsToActivate)
+ nonUiVisible.add(filterIdToActivate);
filterIdsToActivate = nonUiVisible.toArray(new String[]{});
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPipelineService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPipelineService.java
index 765ca19..703184a 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPipelineService.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPipelineService.java
@@ -185,8 +185,7 @@
final NavigatorContentExtension[] overridingExtensions = overrideableExtension
.getOverridingExtensions();
- for (int i = 0; i < overridingExtensions.length; i++) {
- final NavigatorContentExtension nceLocal = overridingExtensions[i];
+ for (final NavigatorContentExtension nceLocal : overridingExtensions) {
if (nceLocal.internalGetContentProvider().isPipelined()) {
SafeRunner.run(new NavigatorSafeRunnable() {
@Override
@@ -239,9 +238,8 @@
final boolean[] intercepted = new boolean[1];
final NavigatorContentExtension[] overridingExtensions = overrideableExtension
.getOverridingExtensions();
- for (int i = 0; i < overridingExtensions.length; i++) {
- if (overridingExtensions[i].internalGetContentProvider().isPipelined()) {
- final NavigatorContentExtension nceLocal = overridingExtensions[i];
+ for (final NavigatorContentExtension nceLocal : overridingExtensions) {
+ if (nceLocal.internalGetContentProvider().isPipelined()) {
SafeRunner.run(new NavigatorSafeRunnable() {
@Override
public void run() throws Exception {
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPlugin.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPlugin.java
index 431d8b7..e116185 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPlugin.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPlugin.java
@@ -84,8 +84,8 @@
Object[] mesgs = messages.getListeners();
ILog pluginLog = getDefault().getLog();
- for (int i = 0; i < mesgs.length; i++) {
- pluginLog.log((IStatus)mesgs[i]);
+ for (Object mesg : mesgs) {
+ pluginLog.log((IStatus)mesg);
}
return Status.OK_STATUS;
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorSaveablesService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorSaveablesService.java
index 2bb4752..cfa32ec 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorSaveablesService.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorSaveablesService.java
@@ -90,17 +90,13 @@
synchronized(instances) {
if (event.getType() == BundleEvent.STARTED) {
// System.out.println("bundle started: " + event.getBundle().getSymbolicName()); //$NON-NLS-1$
- for (Iterator<NavigatorSaveablesService> it = instances.iterator(); it.hasNext();) {
- NavigatorSaveablesService instance = it
- .next();
+ for (NavigatorSaveablesService instance : instances) {
instance.handleBundleStarted(event.getBundle()
.getSymbolicName());
}
} else if (event.getType() == BundleEvent.STOPPED) {
// System.out.println("bundle stopped: " + event.getBundle().getSymbolicName()); //$NON-NLS-1$
- for (Iterator<NavigatorSaveablesService> it = instances.iterator(); it.hasNext();) {
- NavigatorSaveablesService instance = it
- .next();
+ for (NavigatorSaveablesService instance : instances) {
instance.handleBundleStopped(event.getBundle()
.getSymbolicName());
}
@@ -162,8 +158,8 @@
synchronized (instances) {
synchronized (NavigatorSaveablesService.this) {
if (saveablesProviders != null) {
- for (int i = 0; i < saveablesProviders.length; i++) {
- saveablesProviders[i].dispose();
+ for (SaveablesProvider saveablesProvider : saveablesProviders) {
+ saveablesProvider.dispose();
}
}
removeInstance(NavigatorSaveablesService.this);
@@ -239,11 +235,9 @@
Set<Object> roots = new HashSet<Object>(Arrays.asList(contentProvider
.getElements(viewerInput)));
SaveablesProvider[] saveablesProviders = getSaveablesProviders();
- for (int i = 0; i < saveablesProviders.length; i++) {
- SaveablesProvider saveablesProvider = saveablesProviders[i];
+ for (SaveablesProvider saveablesProvider : saveablesProviders) {
Saveable[] saveables = saveablesProvider.getSaveables();
- for (int j = 0; j < saveables.length; j++) {
- Saveable saveable = saveables[j];
+ for (Saveable saveable : saveables) {
Object[] elements = saveablesProvider.getElements(saveable);
// the saveable is added to the result if at least one of the
// elements representing the saveable appears in the tree, i.e.
@@ -310,8 +304,7 @@
ITreeSelection selection) {
Set<Saveable> result = new HashSet<Saveable>();
TreePath[] paths = selection.getPaths();
- for (int i = 0; i < paths.length; i++) {
- TreePath path = paths[i];
+ for (TreePath path : paths) {
Saveable saveable = findSaveable(path);
if (saveable != null) {
result.add(saveable);
@@ -384,8 +377,8 @@
* @return the saveable, or null
*/
private Saveable findSaveable(TreePath[] paths) {
- for (int i = 0; i < paths.length; i++) {
- Saveable saveable = findSaveable(paths[i]);
+ for (TreePath path : paths) {
+ Saveable saveable = findSaveable(path);
if (saveable != null) {
return saveable;
}
@@ -450,8 +443,8 @@
INavigatorContentDescriptor[] descriptors = contentService
.getActiveDescriptorsWithSaveables();
List<SaveablesProvider> result = new ArrayList<SaveablesProvider>();
- for (int i = 0; i < descriptors.length; i++) {
- NavigatorContentDescriptor descriptor = (NavigatorContentDescriptor) descriptors[i];
+ for (INavigatorContentDescriptor iDescriptor : descriptors) {
+ NavigatorContentDescriptor descriptor = (NavigatorContentDescriptor) iDescriptor;
String pluginId = descriptor
.getContribution().getPluginId();
if (Platform.getBundle(pluginId).getState() != Bundle.ACTIVE) {
@@ -500,8 +493,8 @@
// a bundle was stopped, dispose of all saveablesProviders and
// recompute
// TODO optimize this
- for (int i = 0; i < saveablesProviders.length; i++) {
- saveablesProviders[i].dispose();
+ for (SaveablesProvider saveablesProvider : saveablesProviders) {
+ saveablesProvider.dispose();
}
saveablesProviders = null;
} else if (startedBundleIdOrNull != null){
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/VisibilityAssistant.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/VisibilityAssistant.java
index 884a627..4c21831 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/VisibilityAssistant.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/VisibilityAssistant.java
@@ -86,10 +86,10 @@
if (theExtensions == null) {
return;
}
- for (int i = 0; i < theExtensions.length; i++) {
- programmaticVisibilityBindings.add(theExtensions[i]);
+ for (String extension : theExtensions) {
+ programmaticVisibilityBindings.add(extension);
if (isRoot) {
- programmaticRootBindings.add(theExtensions[i]);
+ programmaticRootBindings.add(extension);
}
}
notifyClients();
@@ -121,8 +121,8 @@
private void notifyClients() {
Object[] clients = listeners.getListeners();
- for (int i = 0; i < clients.length; i++) {
- ((VisibilityListener) clients[i]).onVisibilityOrActivationChange();
+ for (Object client : clients) {
+ ((VisibilityListener) client).onVisibilityOrActivationChange();
}
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/CommonActionDescriptorManager.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/CommonActionDescriptorManager.java
index 22f4d33..87b68ed 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/CommonActionDescriptorManager.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/CommonActionDescriptorManager.java
@@ -188,10 +188,9 @@
CommonActionProviderDescriptor[] unresolvedDescriptors = unresolvedDependentDescriptors
.toArray(new CommonActionProviderDescriptor[unresolvedDependentDescriptors
.size()]);
- for (int i = 0; i < unresolvedDescriptors.length; i++) {
- errorMessage
- .append(
- "\nUnresolved dependency specified for actionProvider: ").append(unresolvedDescriptors[i].getDefinedId()); //$NON-NLS-1$
+ for (CommonActionProviderDescriptor unresolvedDescriptor : unresolvedDescriptors) {
+ errorMessage.append("\nUnresolved dependency specified for actionProvider: ") //$NON-NLS-1$
+ .append(unresolvedDescriptor.getDefinedId());
}
NavigatorPlugin.log(IStatus.WARNING, 0, errorMessage.toString(),
@@ -330,12 +329,12 @@
"an <enablement/> or <possibleChildren /> expression. Please " + //$NON-NLS-1$
"review the documentation and correct this error.", null); //$NON-NLS-1$
}
- for (int i = 0; i < actionProviders.length; i++) {
+ for (IConfigurationElement actionProvider : actionProviders) {
if(defaultEnablement == null) {
NavigatorPlugin.logError(0,
- "Disabling actionProvider: " + actionProviders[i].getAttribute(ATT_ID), null); //$NON-NLS-1$
+ "Disabling actionProvider: " + actionProvider.getAttribute(ATT_ID), null); //$NON-NLS-1$
} else {
- SafeRunner.run(new AddProviderSafeRunner(actionProviders[i], defaultEnablement, defaultPriority, anElement));
+ SafeRunner.run(new AddProviderSafeRunner(actionProvider, defaultEnablement, defaultPriority, anElement));
}
}
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/CommonDropDescriptorManager.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/CommonDropDescriptorManager.java
index 14f4146..0086bf2 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/CommonDropDescriptorManager.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/CommonDropDescriptorManager.java
@@ -12,7 +12,6 @@
package org.eclipse.ui.internal.navigator.dnd;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -68,17 +67,11 @@
public CommonDropAdapterDescriptor[] findCommonDropAdapterAssistants(Object aDropTarget, INavigatorContentService aContentService) {
Set<CommonDropAdapterDescriptor> foundDescriptors = new LinkedHashSet<CommonDropAdapterDescriptor>();
- for (Iterator<INavigatorContentDescriptor> iter = dropDescriptors.keySet().iterator(); iter
- .hasNext();) {
- INavigatorContentDescriptor contentDescriptor = iter
- .next();
+ for (INavigatorContentDescriptor contentDescriptor : dropDescriptors.keySet()) {
if (aContentService.isVisible(contentDescriptor.getId())
&& aContentService.isActive(contentDescriptor.getId())) {
List<CommonDropAdapterDescriptor> dropDescriptors = getDropDescriptors(contentDescriptor);
- for (Iterator<CommonDropAdapterDescriptor> iterator = dropDescriptors.iterator(); iterator
- .hasNext();) {
- CommonDropAdapterDescriptor dropDescriptor = iterator
- .next();
+ for (CommonDropAdapterDescriptor dropDescriptor : dropDescriptors) {
if (dropDescriptor.isDropElementSupported(aDropTarget)) {
foundDescriptors.add(dropDescriptor);
}
@@ -144,9 +137,9 @@
IConfigurationElement[] commonDropAdapters = element
.getChildren(TAG_COMMON_DROP_ADAPTER);
- for (int i = 0; i < commonDropAdapters.length; i++) {
+ for (IConfigurationElement commonDropAdapter : commonDropAdapters) {
addCommonDropAdapter(contentDescriptor,
- new CommonDropAdapterDescriptor(commonDropAdapters[i], contentDescriptor));
+ new CommonDropAdapterDescriptor(commonDropAdapter, contentDescriptor));
}
}
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/NavigatorDnDService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/NavigatorDnDService.java
index b91f4ff..a58af06 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/NavigatorDnDService.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/NavigatorDnDService.java
@@ -147,8 +147,8 @@
TransferData aTransferType) {
Set assistants = new LinkedHashSet();
- for (int i = 0; i < descriptors.length; i++) {
- CommonDropAdapterAssistant asst = getAssistant(descriptors[i]);
+ for (CommonDropAdapterDescriptor descriptor : descriptors) {
+ CommonDropAdapterAssistant asst = getAssistant(descriptor);
if (asst.isSupportedType(aTransferType)) {
assistants.add(asst);
}
@@ -163,9 +163,9 @@
Set assistants = new LinkedHashSet();
- for (int i = 0; i < descriptors.length; i++) {
- if(descriptors[i].areDragElementsSupported(aSelection)) {
- assistants.add(getAssistant(descriptors[i]));
+ for (CommonDropAdapterDescriptor descriptor : descriptors) {
+ if(descriptor.areDragElementsSupported(aSelection)) {
+ assistants.add(getAssistant(descriptor));
}
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/NavigatorPluginDropAction.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/NavigatorPluginDropAction.java
index 8dd14e0..dacaf7f 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/NavigatorPluginDropAction.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/NavigatorPluginDropAction.java
@@ -61,10 +61,10 @@
selection);
IStatus valid = null;
- for (int i = 0; i < assistants.length; i++) {
- valid = assistants[i].validatePluginTransferDrop(selection, target);
+ for (CommonDropAdapterAssistant assistant : assistants) {
+ valid = assistant.validatePluginTransferDrop(selection, target);
if (valid != null && valid.isOK()) {
- valid = assistants[i].handlePluginTransferDrop(selection, target);
+ valid = assistant.handlePluginTransferDrop(selection, target);
return valid != null && valid.isOK();
}
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/Binding.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/Binding.java
index 27580da..f8173cd 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/Binding.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/Binding.java
@@ -50,8 +50,7 @@
return knownIds.get(anExtensionId).booleanValue();
}
- for (Iterator<Pattern> itr = excludePatterns.iterator(); itr.hasNext();) {
- Pattern pattern = itr.next();
+ for (Pattern pattern : excludePatterns) {
if (pattern.matcher(anExtensionId).matches()) {
knownIds.put(anExtensionId, Boolean.FALSE);
if (Policy.DEBUG_RESOLUTION) {
@@ -62,8 +61,7 @@
}
}
- for (Iterator<Pattern> itr = includePatterns.iterator(); itr.hasNext();) {
- Pattern pattern = itr.next();
+ for (Pattern pattern : includePatterns) {
if (pattern.matcher(anExtensionId).matches()) {
// keep track of the result for next time
knownIds.put(anExtensionId, Boolean.TRUE);
@@ -118,15 +116,15 @@
boolean isRoot = false;
String patternString = null;
Pattern compiledPattern = null;
- for (int i = 0; i < contentExtensionPatterns.length; i++) {
+ for (IConfigurationElement contentExtensionPattern : contentExtensionPatterns) {
if (toRespectRoots) {
- isRootString = contentExtensionPatterns[i]
+ isRootString = contentExtensionPattern
.getAttribute(NavigatorViewerDescriptor.ATT_IS_ROOT);
isRoot = (isRootString != null) ? Boolean.valueOf(
isRootString.trim()).booleanValue() : false;
}
- patternString = contentExtensionPatterns[i]
+ patternString = contentExtensionPattern
.getAttribute(NavigatorViewerDescriptor.ATT_PATTERN);
if (patternString == null) {
NavigatorPlugin
@@ -163,9 +161,9 @@
.getChildren(TAG_EXTENSION);
String patternString = null;
Pattern compiledPattern = null;
- for (int i = 0; i < contentExtensionPatterns.length; i++) {
+ for (IConfigurationElement contentExtensionPattern : contentExtensionPatterns) {
- patternString = contentExtensionPatterns[i]
+ patternString = contentExtensionPattern
.getAttribute(NavigatorViewerDescriptor.ATT_PATTERN);
if (patternString == null) {
NavigatorPlugin
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/ExtensionStateModel.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/ExtensionStateModel.java
index 360a4b0..4b17cc5 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/ExtensionStateModel.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/ExtensionStateModel.java
@@ -143,8 +143,8 @@
protected void firePropertyChangeEvent(PropertyChangeEvent anEvent) {
Object[] listeners = getListeners();
- for (int i = 0; i < listeners.length; ++i) {
- ((IPropertyChangeListener) listeners[i]).propertyChange(anEvent);
+ for (Object listener : listeners) {
+ ((IPropertyChangeListener) listener).propertyChange(anEvent);
}
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentDescriptorManager.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentDescriptorManager.java
index 2a236ce..4f58d24 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentDescriptorManager.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentDescriptorManager.java
@@ -169,9 +169,7 @@
addDescriptorsConsideringOverrides(anElement, firstClassDescriptorsSet, aVisibilityAssistant, descriptors, possibleChild);
} else {
/* Find other ContentProviders which enable for this object */
- for (Iterator<NavigatorContentDescriptor> contentDescriptorsItr = firstClassDescriptorsSet.iterator(); contentDescriptorsItr.hasNext();) {
- NavigatorContentDescriptor descriptor = contentDescriptorsItr.next();
-
+ for (NavigatorContentDescriptor descriptor : firstClassDescriptorsSet) {
if (aVisibilityAssistant.isActive(descriptor) && aVisibilityAssistant.isVisible(descriptor)
&& (possibleChild ? descriptor.isPossibleChild(anElement) : descriptor.isTriggerPoint(anElement))) {
descriptors.add(descriptor);
@@ -424,8 +422,8 @@
NavigatorContentDescriptor[] descs = getAllContentDescriptors();
LinkedList<NavigatorContentDescriptor> list = new LinkedList<NavigatorContentDescriptor>();
- for (int i = 0; i < descs.length; i++) {
- list.add(descs[i]);
+ for (NavigatorContentDescriptor desc : descs) {
+ list.add(desc);
}
boolean changed = true;
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptorManager.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptorManager.java
index 2e8c8e6..61253af 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptorManager.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptorManager.java
@@ -162,10 +162,10 @@
.getChildren(TAG_PROPERTY);
String name;
String value;
- for (int i = 0; i < properties.length; i++) {
- name = properties[i].getAttribute(ATT_NAME);
+ for (IConfigurationElement property : properties) {
+ name = property.getAttribute(ATT_NAME);
if (name != null) {
- value = properties[i].getAttribute(ATT_VALUE);
+ value = property.getAttribute(ATT_VALUE);
descriptor.setProperty(name, value);
}
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/RegistryReader.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/RegistryReader.java
index 9833aaa..1164385 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/RegistryReader.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/RegistryReader.java
@@ -180,8 +180,8 @@
}
IExtension[] extensions = point.getExtensions();
extensions = orderExtensions(extensions);
- for (int i = 0; i < extensions.length; i++) {
- readExtension(extensions[i]);
+ for (IExtension extension : extensions) {
+ readExtension(extension);
}
isInitialized = true;
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterDescriptorManager.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterDescriptorManager.java
index 0fd7df5..fff33d4 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterDescriptorManager.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterDescriptorManager.java
@@ -13,7 +13,6 @@
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -74,9 +73,7 @@
public CommonFilterDescriptor[] findVisibleFilters(INavigatorContentService contentService, boolean forUI) {
List<CommonFilterDescriptor> visibleFilters = new ArrayList<CommonFilterDescriptor>();
- CommonFilterDescriptor descriptor;
- for (Iterator filtersItr = filters.entrySet().iterator(); filtersItr.hasNext();) {
- descriptor = (CommonFilterDescriptor) ((Map.Entry)filtersItr.next()).getValue();
+ for (CommonFilterDescriptor descriptor : filters.values()) {
if (forUI && !descriptor.isVisibleInUi())
continue;
if (contentService.isVisible(descriptor.getId())) {
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterSelectionDialog.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterSelectionDialog.java
index e57feed..a8f879f 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterSelectionDialog.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterSelectionDialog.java
@@ -227,11 +227,11 @@
List<String> checkedExtensions = new ArrayList<String>();
TableItem[] tableItems = contentExtensionsTab.getTable().getItems();
INavigatorContentDescriptor descriptor;
- for (int i = 0; i < tableItems.length; i++) {
- descriptor = (INavigatorContentDescriptor) tableItems[i]
+ for (TableItem tableItem : tableItems) {
+ descriptor = (INavigatorContentDescriptor) tableItem
.getData();
- if (tableItems[i].getChecked()) {
+ if (tableItem.getChecked()) {
checkedExtensions.add(descriptor.getId());
}
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFiltersTab.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFiltersTab.java
index 235fd13..2de8f43 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFiltersTab.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFiltersTab.java
@@ -15,8 +15,6 @@
import java.util.Arrays;
import java.util.Comparator;
import java.util.Deque;
-import java.util.Iterator;
-import java.util.Set;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.ILabelProvider;
@@ -188,9 +186,9 @@
}
private TableItem getFirstHighlightedItem(TableItem[] items) {
- for (int i = 0; i < items.length; i++) {
- if (patternFilter.match(items[i].getText())) {
- return items[i];
+ for (TableItem item : items) {
+ if (patternFilter.match(item.getText())) {
+ return item;
}
}
return null;
@@ -213,25 +211,22 @@
patternFilter.setPattern(filterText.getText());
getTableViewer().refresh();
- Set<Object> checkedItems = getCheckedItems();
- for (Iterator<Object> iterator = checkedItems.iterator(); iterator.hasNext();) {
- getTableViewer().setChecked(iterator.next(), true);
+ for (Object checkedItem : getCheckedItems()) {
+ getTableViewer().setChecked(checkedItem, true);
}
}
private void updateFiltersCheckState() {
- Object[] children = filterContentProvider
- .getElements(getContentService());
ICommonFilterDescriptor filterDescriptor;
INavigatorFilterService filterService = getContentService()
.getFilterService();
- for (int i = 0; i < children.length; i++) {
- filterDescriptor = (ICommonFilterDescriptor) children[i];
+ for (Object child : filterContentProvider.getElements(getContentService())) {
+ filterDescriptor = (ICommonFilterDescriptor) child;
if(filterService.isActive(filterDescriptor.getId())) {
- getTableViewer().setChecked(children[i], true);
- getCheckedItems().add(children[i]);
+ getTableViewer().setChecked(child, true);
+ getCheckedItems().add(child);
} else {
- getTableViewer().setChecked(children[i], false);
+ getTableViewer().setChecked(child, false);
}
}
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/ContentDescriptorContentProvider.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/ContentDescriptorContentProvider.java
index 4f1190e..a857118 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/ContentDescriptorContentProvider.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/ContentDescriptorContentProvider.java
@@ -82,9 +82,9 @@
boolean enabled;
TableItem[] descriptorTableItems = talbleViewer.getTable().getItems();
- for (int i = 0; i < descriptorTableItems.length; i++) {
- if (descriptorTableItems[i].getData() instanceof INavigatorContentDescriptor) {
- descriptor = (INavigatorContentDescriptor) descriptorTableItems[i]
+ for (TableItem descriptorTableItem : descriptorTableItems) {
+ if (descriptorTableItem.getData() instanceof INavigatorContentDescriptor) {
+ descriptor = (INavigatorContentDescriptor) descriptorTableItem
.getData();
enabled = contentService.getActivationService()
.isNavigatorExtensionActive(descriptor.getId());
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/ContentExtensionsTab.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/ContentExtensionsTab.java
index 0aa5050..a5ce238 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/ContentExtensionsTab.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/ContentExtensionsTab.java
@@ -47,9 +47,9 @@
private void updateCheckedState() {
INavigatorContentDescriptor[] visibleExtensions = getContentService()
.getVisibleExtensions();
- for (int i = 0; i < visibleExtensions.length; i++) {
- if (getContentService().isActive(visibleExtensions[i].getId())) {
- getTableViewer().setChecked(visibleExtensions[i], true);
+ for (INavigatorContentDescriptor visibleExtension : visibleExtensions) {
+ if (getContentService().isActive(visibleExtension.getId())) {
+ getTableViewer().setChecked(visibleExtension, true);
}
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/FrameList.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/FrameList.java
index dfa9f7a..c36526d 100755
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/FrameList.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/FrameList.java
@@ -86,8 +86,8 @@
*/
protected void firePropertyChange(PropertyChangeEvent event) {
Object[] listeners = getListeners();
- for (int i = 0; i < listeners.length; ++i) {
- ((IPropertyChangeListener) listeners[i]).propertyChange(event);
+ for (Object listener : listeners) {
+ ((IPropertyChangeListener) listener).propertyChange(event);
}
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeFrame.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeFrame.java
index bdf023e..f103f37b 100755
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeFrame.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeFrame.java
@@ -126,13 +126,13 @@
IMemento[] elementMem = memento.getChildren(TAG_ELEMENT);
List<IAdaptable> elements = new ArrayList<IAdaptable>(elementMem.length);
- for (int i = 0; i < elementMem.length; i++) {
- String factoryID = elementMem[i].getString(TAG_FACTORY_ID);
+ for (IMemento element : elementMem) {
+ String factoryID = element.getString(TAG_FACTORY_ID);
if (factoryID != null) {
IElementFactory factory = PlatformUI.getWorkbench()
.getElementFactory(factoryID);
if (factory != null) {
- elements.add(factory.createElement(elementMem[i]));
+ elements.add(factory.createElement(element));
}
}
}
@@ -187,8 +187,8 @@
* @param memento memento to persist elements in
*/
private void saveElements(Object[] elements, IMemento memento) {
- for (int i = 0; i < elements.length; i++) {
- IPersistableElement persistable = Adapters.adapt(elements[i], IPersistableElement.class);
+ for (Object element : elements) {
+ IPersistableElement persistable = Adapters.adapt(element, IPersistableElement.class);
if (persistable != null) {
IMemento elementMem = memento.createChild(TAG_ELEMENT);
elementMem.putString(TAG_FACTORY_ID, persistable.getFactoryId());
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/CommonSorterDescriptorManager.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/CommonSorterDescriptorManager.java
index 1b60635..6ffbae6 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/CommonSorterDescriptorManager.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/CommonSorterDescriptorManager.java
@@ -140,9 +140,8 @@
if (children.length > 0) {
Set<CommonSorterDescriptor> localSorters = getCommonSorters(contentDescriptor);
- for (int i = 0; i < children.length; i++) {
- localSorters.add(new CommonSorterDescriptor(
- children[i]));
+ for (IConfigurationElement configurationElement : children) {
+ localSorters.add(new CommonSorterDescriptor(configurationElement));
}
return true;
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/NavigatorSorterService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/NavigatorSorterService.java
index 4b4e31e..e6deeba 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/NavigatorSorterService.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/NavigatorSorterService.java
@@ -52,13 +52,11 @@
}
private synchronized void computeSortOnlyDescriptors() {
- INavigatorContentDescriptor[] allDescriptors;
- allDescriptors = NavigatorContentDescriptorManager.getInstance().getSortOnlyContentDescriptors();
-
List sortOnlyList = new ArrayList();
- for (int i = 0; i < allDescriptors.length; i++) {
- if (contentService.isActive(allDescriptors[i].getId())) {
- sortOnlyList.add(allDescriptors[i]);
+ for (INavigatorContentDescriptor descriptor : NavigatorContentDescriptorManager.getInstance()
+ .getSortOnlyContentDescriptors()) {
+ if (contentService.isActive(descriptor.getId())) {
+ sortOnlyList.add(descriptor);
}
}
@@ -125,11 +123,11 @@
Map sorters = new HashMap();
int count = 0;
- for (int i = 0; i < descriptors.length; i++) {
- if(descriptors[i].getId() != null && descriptors[i].getId().length() > 0)
- sorters.put(descriptors[i].getId(), getSorter(descriptors[i]));
+ for (CommonSorterDescriptor descriptor : descriptors) {
+ if(descriptor.getId() != null && descriptor.getId().length() > 0)
+ sorters.put(descriptor.getId(), getSorter(descriptor));
else
- sorters.put(theSource.getId()+".sorter."+ (++count), getSorter(descriptors[i])); //$NON-NLS-1$
+ sorters.put(theSource.getId()+".sorter."+ (++count), getSorter(descriptor)); //$NON-NLS-1$
}
return sorters;
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/CommonWizardDescriptorManager.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/CommonWizardDescriptorManager.java
index 9d4a8e6..2243e9c 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/CommonWizardDescriptorManager.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/CommonWizardDescriptorManager.java
@@ -194,8 +194,7 @@
final String contentExtensionId = anElement.getAttribute(ATT_ID);
// In case there are none
retValue[0] = true;
- for (int i = 0; i < commonWizards.length; i++) {
- final IConfigurationElement element = commonWizards[i];
+ for (final IConfigurationElement element : commonWizards) {
// Assume it did not work
retValue[0] = false;
SafeRunner.run(new NavigatorSafeRunnable(element) {
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonDragAdapter.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonDragAdapter.java
index 3ac1290..252ac91 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonDragAdapter.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonDragAdapter.java
@@ -95,11 +95,11 @@
supportedTypes.add(PluginTransfer.getInstance());
supportedTypes.add(LocalSelectionTransfer.getTransfer());
Transfer[] transferTypes = null;
- for (int i = 0; i < assistants.length; i++) {
- transferTypes = assistants[i].getSupportedTransferTypes();
- for (int j = 0; j < transferTypes.length; j++) {
- if (transferTypes[j] != null) {
- supportedTypes.add(transferTypes[j]);
+ for (CommonDragAdapterAssistant assistant : assistants) {
+ transferTypes = assistant.getSupportedTransferTypes();
+ for (Transfer transferType : transferTypes) {
+ if (transferType != null) {
+ supportedTypes.add(transferType);
}
}
}
@@ -135,20 +135,20 @@
.getCommonDragAssistants();
if (assistants.length == 0)
doIt = true;
- for (int i = 0; i < assistants.length; i++) {
+ for (CommonDragAdapterAssistant assistant : assistants) {
if (Policy.DEBUG_DND) {
System.out
- .println("CommonDragAdapter.dragStart assistant: " + assistants[i]); //$NON-NLS-1$
+ .println("CommonDragAdapter.dragStart assistant: " + assistant); //$NON-NLS-1$
}
event.doit = true;
- assistants[i].dragStart(event, (IStructuredSelection) selection);
+ assistant.dragStart(event, (IStructuredSelection) selection);
doIt |= event.doit;
if (event.doit) {
if (Policy.DEBUG_DND) {
System.out
.println("CommonDragAdapter.dragStart assistant - event.doit == true"); //$NON-NLS-1$
}
- assistantsToUse.add(assistants[i]);
+ assistantsToUse.add(assistant);
}
}
@@ -209,8 +209,8 @@
Transfer[] supportedTransferTypes = assistant
.getSupportedTransferTypes();
final boolean[] getOut = new boolean[1];
- for (int j = 0; j < supportedTransferTypes.length; j++) {
- if (supportedTransferTypes[j].isSupportedType(event.dataType)) {
+ for (Transfer supportedTransferType : supportedTransferTypes) {
+ if (supportedTransferType.isSupportedType(event.dataType)) {
SafeRunner.run(new NavigatorSafeRunnable() {
@Override
public void run() throws Exception {
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonDropAdapter.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonDropAdapter.java
index d5fb4a8..9485180 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonDropAdapter.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonDropAdapter.java
@@ -96,10 +96,9 @@
if (Policy.DEBUG_DND) {
System.out.println("CommonDropAdapter.dragEnter: " + event); //$NON-NLS-1$
}
- for (int i = 0; i < event.dataTypes.length; i++) {
- if (LocalSelectionTransfer.getTransfer().isSupportedType(
- event.dataTypes[i])) {
- event.currentDataType = event.dataTypes[i];
+ for (TransferData dataType : event.dataTypes) {
+ if (LocalSelectionTransfer.getTransfer().isSupportedType(dataType)) {
+ event.currentDataType = dataType;
if (Policy.DEBUG_DND) {
System.out.println("CommonDropAdapter.dragEnter: local selection: " + event.currentDataType); //$NON-NLS-1$
}
@@ -108,9 +107,9 @@
}
}
- for (int i = 0; i < event.dataTypes.length; i++) {
- if (FileTransfer.getInstance().isSupportedType(event.dataTypes[i])) {
- event.currentDataType = event.dataTypes[i];
+ for (TransferData dataType : event.dataTypes) {
+ if (FileTransfer.getInstance().isSupportedType(dataType)) {
+ event.currentDataType = dataType;
event.detail = DND.DROP_COPY;
if (Policy.DEBUG_DND) {
System.out.println("CommonDropAdapter.dragEnter: file: " + event.currentDataType); //$NON-NLS-1$
@@ -120,10 +119,9 @@
}
}
- for (int i = 0; i < event.dataTypes.length; i++) {
- if (PluginTransfer.getInstance()
- .isSupportedType(event.dataTypes[i])) {
- event.currentDataType = event.dataTypes[i];
+ for (TransferData dataType : event.dataTypes) {
+ if (PluginTransfer.getInstance().isSupportedType(dataType)) {
+ event.currentDataType = dataType;
if (Policy.DEBUG_DND) {
System.out.println("CommonDropAdapter.dragEnter: plugin: " + event.currentDataType); //$NON-NLS-1$
}
@@ -172,8 +170,7 @@
getCurrentTransfer());
final boolean[] retValue = new boolean[1];
- for (int i = 0; i < assistants.length; i++) {
- final CommonDropAdapterAssistant localAssistant = assistants[i];
+ for (final CommonDropAdapterAssistant localAssistant : assistants) {
SafeRunner.run(new NavigatorSafeRunnable() {
@Override
public void run() throws Exception {
@@ -223,13 +220,11 @@
}
CommonDropAdapterAssistant[] assistants = dndService.findCommonDropAdapterAssistants(
target, theTransferData);
- for (int i = 0; i < assistants.length; i++) {
+ for (final CommonDropAdapterAssistant assistantLocal : assistants) {
if (Policy.DEBUG_DND) {
System.out
- .println("CommonDropAdapter.validateDrop checking assistant: \"" + assistants[i]); //$NON-NLS-1$
+ .println("CommonDropAdapter.validateDrop checking assistant: \"" + assistantLocal); //$NON-NLS-1$
}
- final CommonDropAdapterAssistant assistantLocal = assistants[i];
-
SafeRunner.run(new NavigatorSafeRunnable() {
@Override
public void run() throws Exception {
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonNavigator.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonNavigator.java
index 89bcb8d..acf1c49 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonNavigator.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonNavigator.java
@@ -193,8 +193,8 @@
INavigatorFilterService filterService = commonViewer
.getNavigatorContentService().getFilterService();
ViewerFilter[] visibleFilters = filterService.getVisibleFilters(true);
- for (int i = 0; i < visibleFilters.length; i++) {
- commonViewer.addFilter(visibleFilters[i]);
+ for (ViewerFilter visibleFilter : visibleFilters) {
+ commonViewer.addFilter(visibleFilter);
}
commonViewer.setSorter(new CommonViewerSorter());
@@ -651,8 +651,8 @@
@Override
public boolean isDirty() {
Saveable[] saveables = getSaveables();
- for (int i = 0; i < saveables.length; i++) {
- if(saveables[i].isDirty()) {
+ for (Saveable saveable : saveables) {
+ if(saveable.isDirty()) {
return true;
}
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewer.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewer.java
index c941796..92c7672 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewer.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewer.java
@@ -216,17 +216,17 @@
Object[] changed = event.getElements();
if (changed != null) {
List<Object> others = new ArrayList<Object>();
- for (int i = 0; i < changed.length; i++) {
- if (changed[i] == null)
+ for (Object changedElement : changed) {
+ if (changedElement == null)
continue;
if (_mapper != null) {
- if (_mapper.handlesObject(changed[i])) {
- _mapper.objectChanged(changed[i]);
+ if (_mapper.handlesObject(changedElement)) {
+ _mapper.objectChanged(changedElement);
continue;
}
}
- others.add(changed[i]);
+ others.add(changedElement);
}
if (others.isEmpty()) {
return;
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewerSorter.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewerSorter.java
index b229c79..d463704 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewerSorter.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewerSorter.java
@@ -149,8 +149,8 @@
// Have to get the parent path from the content provider
NavigatorContentServiceContentProvider cp = (NavigatorContentServiceContentProvider) contentService.createCommonContentProvider();
TreePath[] parentPaths = cp.getParents(element);
- for (int i = 0; i < parentPaths.length; i++) {
- if (isSorterProperty(parentPaths[i], element, property))
+ for (TreePath parentPath : parentPaths) {
+ if (isSorterProperty(parentPath, element, property))
return true;
}
return false;
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/LinkHelperService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/LinkHelperService.java
index fd042d0..5b7f7d2 100755
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/LinkHelperService.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/LinkHelperService.java
@@ -64,8 +64,8 @@
}
Set helpers = new LinkedHashSet();
- for (int i = 0; i < descriptors.length; i++) {
- helpers.add(getLinkHelper(descriptors[i]));
+ for (LinkHelperDescriptor descriptor : descriptors) {
+ helpers.add(getLinkHelper(descriptor));
}
if (helpers.size() == 0)
return CANT_GET_NO_HELP;
@@ -88,8 +88,8 @@
}
Set helpers = new LinkedHashSet();
- for (int i = 0; i < descriptors.length; i++) {
- helpers.add(getLinkHelper(descriptors[i]));
+ for (LinkHelperDescriptor descriptor : descriptors) {
+ helpers.add(getLinkHelper(descriptor));
}
if (helpers.size() == 0)
return CANT_GET_NO_HELP;
@@ -122,8 +122,8 @@
IStructuredSelection selection = StructuredSelection.EMPTY;
IStructuredSelection newSelection = StructuredSelection.EMPTY;
- for (int i = 0; i < helpers.length; i++) {
- selection = helpers[i].findSelection(input);
+ for (ILinkHelper helper : helpers) {
+ selection = helper.findSelection(input);
if (selection != null && !selection.isEmpty()) {
newSelection = mergeSelection(newSelection, selection);
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/NavigatorActionService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/NavigatorActionService.java
index b9594ee..0aa88b8 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/NavigatorActionService.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/NavigatorActionService.java
@@ -167,8 +167,8 @@
createMenuGroups();
}
- for (int i = 0; i < menuGroups.length; i++) {
- aMenu.add(menuGroups[i]);
+ for (IContributionItem menuGroup : menuGroups) {
+ aMenu.add(menuGroup);
}
addCommonActionProviderMenu(aMenu);
@@ -214,8 +214,8 @@
final CommonActionProviderDescriptor[] providerDescriptors = CommonActionDescriptorManager
.getInstance().findRelevantActionDescriptors(contentService, getContext());
if (providerDescriptors.length > 0) {
- for (int i = 0; i < providerDescriptors.length; i++) {
- final CommonActionProviderDescriptor providerDescriptorLocal = providerDescriptors[i];
+ for (CommonActionProviderDescriptor providerDescriptor : providerDescriptors) {
+ final CommonActionProviderDescriptor providerDescriptorLocal = providerDescriptor;
SafeRunner.run(new NavigatorSafeRunnable() {
@Override
public void run() throws Exception {
@@ -252,8 +252,8 @@
final CommonActionProviderDescriptor[] providerDescriptors = CommonActionDescriptorManager
.getInstance().findRelevantActionDescriptors(contentService, context);
if (providerDescriptors.length > 0) {
- for (int i = 0; i < providerDescriptors.length; i++) {
- final CommonActionProviderDescriptor providerDesciptorLocal = providerDescriptors[i];
+ for (CommonActionProviderDescriptor providerDescriptor : providerDescriptors) {
+ final CommonActionProviderDescriptor providerDesciptorLocal = providerDescriptor;
final ActionContext actionContextLocal = context;
SafeRunner.run(new NavigatorSafeRunnable() {
@Override
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/OverridePolicy.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/OverridePolicy.java
index 03ea58a..d010f58 100755
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/OverridePolicy.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/OverridePolicy.java
@@ -80,9 +80,9 @@
* InvokeAlwaysRegardlessOfSuppressedExt if aLiteral is invalid
*/
public static OverridePolicy get(String aLiteral) {
- for (int i = 0; i < ENUM_ARRAY.length; i++) {
- if (ENUM_ARRAY[i].getLiteral().equals(aLiteral)) {
- return ENUM_ARRAY[i];
+ for (OverridePolicy policy : ENUM_ARRAY) {
+ if (policy.getLiteral().equals(aLiteral)) {
+ return policy;
}
}
return InvokeAlwaysRegardlessOfSuppressedExt;
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/Priority.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/Priority.java
index a805744..6eceff9 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/Priority.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/Priority.java
@@ -152,9 +152,9 @@
* @return The corresponding Priority Enum or NORMAL if aLiteral is invalid
*/
public static Priority get(String aLiteral) {
- for (int i = 0; i < ENUM_ARRAY.length; i++) {
- if (ENUM_ARRAY[i].getLiteral().equals(aLiteral)) {
- return ENUM_ARRAY[i];
+ for (Priority priority : ENUM_ARRAY) {
+ if (priority.getLiteral().equals(aLiteral)) {
+ return priority;
}
}
return NORMAL;
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/WizardActionGroup.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/WizardActionGroup.java
index 90dc883..b229646 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/WizardActionGroup.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/WizardActionGroup.java
@@ -225,14 +225,14 @@
Map<String, SortedSet> groups = new TreeMap<String, SortedSet>();
SortedSet<IAction> sortedWizards = null;
String menuGroupId = null;
- for (int i = 0; i < descriptors.length; i++) {
- menuGroupId = descriptors[i].getMenuGroupId() != null ?
- descriptors[i].getMenuGroupId() : CommonWizardDescriptor.DEFAULT_MENU_GROUP_ID;
+ for (CommonWizardDescriptor descriptor : descriptors) {
+ menuGroupId = descriptor.getMenuGroupId() != null ?
+ descriptor.getMenuGroupId() : CommonWizardDescriptor.DEFAULT_MENU_GROUP_ID;
sortedWizards = groups.get(menuGroupId);
if(sortedWizards == null) {
- groups.put(descriptors[i].getMenuGroupId(), sortedWizards = new TreeSet<IAction>(ActionComparator.INSTANCE));
+ groups.put(descriptor.getMenuGroupId(), sortedWizards = new TreeSet<IAction>(ActionComparator.INSTANCE));
}
- if ((action = getAction(descriptors[i].getWizardId())) != null) {
+ if ((action = getAction(descriptor.getWizardId())) != null) {
sortedWizards.add(action);
}
}
