diff options
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare')
42 files changed, 246 insertions, 294 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java index 82580fadd..b6a1a0c43 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java @@ -17,7 +17,6 @@ package org.eclipse.compare; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.Map; import java.util.Set; @@ -254,8 +253,7 @@ public class CompareConfiguration { @Override public void dispose() { - for (Iterator<ICompareInputLabelProvider> iterator = labelProviders.values().iterator(); iterator.hasNext();) { - ICompareInputLabelProvider lp = iterator.next(); + for (ICompareInputLabelProvider lp : labelProviders.values()) { lp.removeListener(this); } if (defaultLabelProvider != null) @@ -413,8 +411,8 @@ public class CompareConfiguration { PropertyChangeEvent event= null; Object[] listeners= fListeners.getListeners(); if (listeners != null) { - for (int i= 0; i < listeners.length; i++) { - IPropertyChangeListener l= (IPropertyChangeListener) listeners[i]; + for (Object listener : listeners) { + IPropertyChangeListener l = (IPropertyChangeListener) listener; if (event == null) event= new PropertyChangeEvent(this, propertyName, oldValue, newValue); l.propertyChange(event); diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java index 8b41e3510..1adba9f70 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java @@ -308,8 +308,9 @@ public class CompareViewerPane extends ViewForm implements ISelectionProvider, @Override public void open(OpenEvent event) { Object[] listeners= fOpenListener.getListeners(); - for (int i= 0; i < listeners.length; i++) - ((IOpenListener) listeners[i]).open(event); + for (Object listener : listeners) { + ((IOpenListener) listener).open(event); + } } @Override diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java index d1a76be5b..2a8c0e553 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java @@ -466,8 +466,9 @@ public class EditionSelectionDialog extends ResizableDialog { if (sco != null) { Object[] children= sco.getChildren(); if (children != null) - for (int i= 0; i < children.length; i++) - current.add(children[i]); + for (Object child : children) { + current.add(child); + } } final IStructureCreator sc= structureCreator; @@ -489,8 +490,8 @@ public class EditionSelectionDialog extends ResizableDialog { if (sco2 != null) { Object[] children= sco2.getChildren(); if (children != null) { - for (int i2= 0; i2 < children.length; i2++) { - ITypedElement child= (ITypedElement) children[i2]; + for (Object c : children) { + ITypedElement child = (ITypedElement) c; if (!current.contains(child)) sendPair(new Pair(sc, edition, child)); } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java index 1b3ff0866..e16b03d70 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java @@ -135,8 +135,8 @@ public class ResourceNode extends BufferedContent if (fResource instanceof IContainer) { try { IResource members[]= ((IContainer)fResource).members(); - for (int i= 0; i < members.length; i++) { - IStructureComparator child= createChild(members[i]); + for (IResource member : members) { + IStructureComparator child = createChild(member); if (child != null) fChildren.add(child); } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java index db23be7a3..a856d1d7f 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java @@ -1398,9 +1398,9 @@ public abstract class ContentMergeViewer extends ContentViewer } if (source != null) { Saveable[] saveables = source.getSaveables(); - for (int i = 0; i < saveables.length; i++) { - if (saveables[i] instanceof ISavingSaveable) { - ISavingSaveable saveable = (ISavingSaveable) saveables[i]; + for (Saveable s : saveables) { + if (s instanceof ISavingSaveable) { + ISavingSaveable saveable = (ISavingSaveable) s; if (saveable.isSaving()) return true; } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index 7c6f260f8..48d802d7c 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java @@ -1284,8 +1284,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { return; IRegion region= textPresentation.getExtent(); Diff[] changeDiffs = fMerger.getChangeDiffs(getLeg(viewer), region); - for (int i = 0; i < changeDiffs.length; i++) { - Diff diff = changeDiffs[i]; + for (Diff diff : changeDiffs) { StyleRange range = getStyleRange(diff, region); if (range != null) textPresentation.mergeStyleRange(range); @@ -3052,9 +3051,9 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { private boolean isCursorLinePainterInstalled(SourceViewer viewer) { Listener[] listeners = viewer.getTextWidget().getListeners(3001/*StyledText.LineGetBackground*/); - for (int i = 0; i < listeners.length; i++) { - if (listeners[i] instanceof TypedListener) { - TypedListener listener = (TypedListener) listeners[i]; + for (Listener l : listeners) { + if (l instanceof TypedListener) { + TypedListener listener = (TypedListener) l; if (listener.getEventListener() instanceof CursorLinePainter) return true; } @@ -3894,10 +3893,10 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { currentFiltersMatch = true; @SuppressWarnings("unchecked") List<ChangeCompareFilterPropertyAction> currentFilterActions = (List<ChangeCompareFilterPropertyAction>) current; - for (int i = 0; i < compareFilterDescriptors.length; i++) { + for (CompareFilterDescriptor compareFilterDescriptor : compareFilterDescriptors) { boolean match = false; for (int j = 0; j < currentFilterActions.size(); j++) { - if (compareFilterDescriptors[i].getFilterId().equals(currentFilterActions.get(j).getFilterId())) { + if (compareFilterDescriptor.getFilterId().equals(currentFilterActions.get(j).getFilterId())) { match = true; break; } @@ -3913,9 +3912,8 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { Boolean.TRUE); disposeCompareFilterActions(true); fCompareFilterActions.clear(); - for (int i = 0; i < compareFilterDescriptors.length; i++) { - ChangeCompareFilterPropertyAction compareFilterAction = new ChangeCompareFilterPropertyAction( - compareFilterDescriptors[i], getCompareConfiguration()); + for (CompareFilterDescriptor compareFilterDescriptor : compareFilterDescriptors) { + ChangeCompareFilterPropertyAction compareFilterAction = new ChangeCompareFilterPropertyAction(compareFilterDescriptor, getCompareConfiguration()); compareFilterAction.setInput(input, ancestor, left, right); fCompareFilterActions.add(compareFilterAction); fLeft.addTextAction(compareFilterAction); diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.java index 09e78479d..911e235a0 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.java @@ -55,8 +55,7 @@ public class AddFromHistoryAction extends BaseCompareAction { Object[] s= Utilities.getResources(selection); - for (int i= 0; i < s.length; i++) { - Object o= s[i]; + for (Object o : s) { if (o instanceof IContainer) { IContainer container= (IContainer) o; @@ -128,11 +127,10 @@ public class AddFromHistoryAction extends BaseCompareAction { String taskName= Utilities.getString(bundle, "taskName"); //$NON-NLS-1$ pm.beginTask(taskName, selected.length); - for (int i= 0; i < selected.length; i++) { - IFile file= selected[i].fFile; - IFileState fileState= selected[i].fFileState; + for (AddFromHistoryDialog.HistoryInput s : selected) { + IFile file = s.fFile; + IFileState fileState = s.fFileState; createContainers(file); - SubMonitor subMonitor= SubMonitor.convert(pm, 1); try { file.create(fileState.getContents(), false, subMonitor); diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java index ffeedc5c1..758bffe13 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java @@ -197,8 +197,7 @@ public class AddFromHistoryDialog extends ResizableDialog { String prefix= root.getFullPath().toString(); if (fMemberTable != null && !fMemberTable.isDisposed()) { - for (int i = 0; i < files.length; i++) { - IFile file = files[i]; + for (IFile file : files) { String path = file.getFullPath().toString(); // ignore a recently deleted file at the same path as the diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java index 4b1fea214..3026cc907 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java @@ -221,8 +221,7 @@ public class CompareContentViewerSwitchingPane extends CompareViewerSwitchingPan new MenuItem(menu, SWT.SEPARATOR); // Add others - for (int i = 0; i < vd.length; i++) { - final ViewerDescriptor vdi = vd[i]; + for (ViewerDescriptor vdi : vd) { label = vdi.getLabel(); if (label == null || label.isEmpty()) { String l = CompareUIPlugin.getDefault().findContentTypeNameOrType((ICompareInput) getInput(), diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java index 2d5d8c9f8..735ce130a 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java @@ -566,8 +566,7 @@ public class CompareEditor extends EditorPart if (init || knownSaveables == null) { recordSaveables(sourceSaveables); } else { - for (int i = 0; i < sourceSaveables.length; i++) { - Saveable saveable = sourceSaveables[i]; + for (Saveable saveable : sourceSaveables) { if (!knownSaveables.contains(saveable)) { CompareUIPlugin.logErrorMessage(NLS.bind("Saveable {0} was not added using a saveables lifecycle event.", saveable.getName())); //$NON-NLS-1$ knownSaveables.add(saveable); @@ -591,8 +590,7 @@ public class CompareEditor extends EditorPart if (sourceSaveables.length != knownSaveables.size()) { return false; } - for (int i = 0; i < sourceSaveables.length; i++) { - Saveable saveable = sourceSaveables[i]; + for (Saveable saveable : sourceSaveables) { if (!knownSaveables.contains(saveable)) { return false; } @@ -717,11 +715,10 @@ public class CompareEditor extends EditorPart return; java.util.List<Saveable> result = new ArrayList<>(); Saveable[] all = event.getSaveables(); - for (int i = 0; i < all.length; i++) { - Saveable saveable = all[i]; + for (Saveable saveable : all) { if (knownSaveables.contains(saveable)) result.add(saveable); - knownSaveables.remove(saveable); + knownSaveables.remove(saveable); } if (result.isEmpty()) return; diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java index 437189e75..1d54e91c2 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java @@ -124,21 +124,20 @@ public class CompareEditorContributor extends EditorActionBarContributor { IContributionItem[] items = actionBars.getToolBarManager() .getItems(); boolean inFilters = false; - for (int i = 0; i < items.length; i++) { - if (items[i].getId().equals(FILTER_SEPARATOR)) { + for (IContributionItem item : items) { + if (item.getId().equals(FILTER_SEPARATOR)) { inFilters = true; - } else if (items[i].getId().equals(BUILTIN_SEPARATOR)) { + } else if (item.getId().equals(BUILTIN_SEPARATOR)) { break; } else if (inFilters) { - if (items[i] instanceof ActionContributionItem) { - String definitionId = ((ActionContributionItem) items[i]) - .getAction().getActionDefinitionId(); + if (item instanceof ActionContributionItem) { + String definitionId = ((ActionContributionItem) item).getAction().getActionDefinitionId(); if (definitionId != null) { actionBars.setGlobalActionHandler(definitionId, null); } } - actionBars.getToolBarManager().remove(items[i]); + actionBars.getToolBarManager().remove(item); } } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorInputNavigator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorInputNavigator.java index c991b43d5..7773135c2 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorInputNavigator.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorInputNavigator.java @@ -53,8 +53,7 @@ public class CompareEditorInputNavigator extends CompareNavigator { protected INavigatable[] getNavigatables() { List<INavigatable> result = new ArrayList<>(); Object[] panes = getPanes(); - for (int i = 0; i < panes.length; i++) { - Object pane = panes[i]; + for (Object pane : panes) { INavigatable navigator= getNavigator(pane); if (navigator != null) result.add(navigator); diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorSelectionProvider.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorSelectionProvider.java index ea1004aa7..005cb0ae0 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorSelectionProvider.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorSelectionProvider.java @@ -88,8 +88,7 @@ public class CompareEditorSelectionProvider implements IPostSelectionProvider { InternalListener listener= new InternalListener(); fViewerInFocus= viewerInFocus; - for (int i= 0; i < fViewers.length; i++) { - TextViewer viewer= fViewers[i]; + for (TextViewer viewer : fViewers) { viewer.addSelectionChangedListener(listener); viewer.addPostSelectionChangedListener(new InternalPostSelectionListener()); StyledText textWidget = viewer.getTextWidget(); @@ -98,9 +97,9 @@ public class CompareEditorSelectionProvider implements IPostSelectionProvider { } private void doFocusChanged(Widget control) { - for (int i= 0; i < fViewers.length; i++) { - if (fViewers[i].getTextWidget() == control) { - propagateFocusChanged(fViewers[i]); + for (TextViewer viewer : fViewers) { + if (viewer.getTextWidget() == control) { + propagateFocusChanged(viewer); return; } } @@ -198,8 +197,9 @@ public class CompareEditorSelectionProvider implements IPostSelectionProvider { if (fViewers == null) return; - for (int i= 0; i < fViewers.length; i++) - fViewers[i].setVisibleRegion(0, fViewers[i].getDocument().getLength()); + for (TextViewer viewer : fViewers) { + viewer.setVisibleRegion(0, viewer.getDocument().getLength()); + } } /** diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java index 0441fba9e..94613e2f1 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java @@ -55,8 +55,8 @@ public class CompareResourceFilter { public static String validateResourceFilters(String text) { IWorkspace workspace= ResourcesPlugin.getWorkspace(); String[] filters= getTokens(text, ","); //$NON-NLS-1$ - for (int i= 0; i < filters.length; i++) { - String fileName= filters[i].replace('*', 'x'); + for (String filter : filters) { + String fileName = filter.replace('*', 'x'); int resourceType= IResource.FILE; int lastCharacter= fileName.length() - 1; if (lastCharacter >= 0 && fileName.charAt(lastCharacter) == '/') { diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareStructureViewerSwitchingPane.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareStructureViewerSwitchingPane.java index 844e772ba..1593d8577 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareStructureViewerSwitchingPane.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareStructureViewerSwitchingPane.java @@ -171,8 +171,7 @@ public class CompareStructureViewerSwitchingPane extends new MenuItem(menu, SWT.SEPARATOR); // add others - for (int i = 0; i < vd.length; i++) { - final ViewerDescriptor vdi = vd[i]; + for (ViewerDescriptor vdi : vd) { label = vdi.getLabel(); if (label == null || label.equals("")) { //$NON-NLS-1$ String l = CompareUIPlugin.getDefault().findStructureTypeNameOrType((ICompareInput) getInput(), vdi, getCompareConfiguration()); @@ -227,9 +226,9 @@ public class CompareStructureViewerSwitchingPane extends public void setText(String label) { Composite c = (Composite) getTopLeft(); Control[] children = c.getChildren(); - for (int i = 0; i < children.length; i++) { - if (children[i] instanceof CLabel) { - CLabel cl = (CLabel) children[i]; + for (Control child : children) { + if (child instanceof CLabel) { + CLabel cl = (CLabel) child; if (cl != null && !cl.isDisposed()) { cl.setText(label); c.layout(); @@ -243,9 +242,9 @@ public class CompareStructureViewerSwitchingPane extends public void setImage(Image image) { Composite c = (Composite) getTopLeft(); Control[] children = c.getChildren(); - for (int i = 0; i < children.length; i++) { - if (children[i] instanceof CLabel) { - CLabel cl = (CLabel) children[i]; + for (Control child : children) { + if (child instanceof CLabel) { + CLabel cl = (CLabel) child; if (cl != null && !cl.isDisposed()) cl.setImage(image); return; @@ -257,9 +256,9 @@ public class CompareStructureViewerSwitchingPane extends public void addMouseListener(MouseListener listener) { Composite c = (Composite) getTopLeft(); Control[] children = c.getChildren(); - for (int i = 0; i < children.length; i++) { - if (children[i] instanceof CLabel) { - CLabel cl = (CLabel) children[i]; + for (Control child : children) { + if (child instanceof CLabel) { + CLabel cl = (CLabel) child; cl.addMouseListener(listener); } } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java index 45f71276b..a26bfe772 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java @@ -361,21 +361,18 @@ public final class CompareUIPlugin extends AbstractUIPlugin { // collect all IStreamMergers IConfigurationElement[] elements= registry.getConfigurationElementsFor(PLUGIN_ID, STREAM_MERGER_EXTENSION_POINT); - for (int i= 0; i < elements.length; i++) { - IConfigurationElement element= elements[i]; - if (STREAM_MERGER.equals(element.getName())) + for (IConfigurationElement element : elements) { + if (STREAM_MERGER.equals(element.getName())) fStreamMergers.register(element, new StreamMergerDescriptor(element)); } - for (int i= 0; i < elements.length; i++) { - IConfigurationElement element= elements[i]; - if (CONTENT_TYPE_BINDING.equals(element.getName())) - fStreamMergers.createBinding(element, STREAM_MERGER_ID_ATTRIBUTE); + for (IConfigurationElement element : elements) { + if (CONTENT_TYPE_BINDING.equals(element.getName())) + fStreamMergers.createBinding(element, STREAM_MERGER_ID_ATTRIBUTE); } // collect all IStructureCreators elements= registry.getConfigurationElementsFor(PLUGIN_ID, STRUCTURE_CREATOR_EXTENSION_POINT); - for (int i= 0; i < elements.length; i++) { - IConfigurationElement element= elements[i]; + for (IConfigurationElement element : elements) { String name= element.getName(); if (!CONTENT_TYPE_BINDING.equals(name)) { if (!STRUCTURE_CREATOR.equals(name)) @@ -383,16 +380,14 @@ public final class CompareUIPlugin extends AbstractUIPlugin { fStructureCreators.register(element, new StructureCreatorDescriptor(element)); } } - for (int i= 0; i < elements.length; i++) { - IConfigurationElement element= elements[i]; + for (IConfigurationElement element : elements) { if (CONTENT_TYPE_BINDING.equals(element.getName())) fStructureCreators.createBinding(element, STRUCTURE_CREATOR_ID_ATTRIBUTE); } // collect all viewers which define the structure merge viewer extension point elements= registry.getConfigurationElementsFor(PLUGIN_ID, STRUCTURE_MERGE_VIEWER_EXTENSION_POINT); - for (int i= 0; i < elements.length; i++) { - IConfigurationElement element= elements[i]; + for (IConfigurationElement element : elements) { String name= element.getName(); if (!CONTENT_TYPE_BINDING.equals(name)) { if (!VIEWER_TAG.equals(name)) @@ -400,16 +395,14 @@ public final class CompareUIPlugin extends AbstractUIPlugin { fStructureMergeViewers.register(element, new ViewerDescriptor(element)); } } - for (int i= 0; i < elements.length; i++) { - IConfigurationElement element= elements[i]; + for (IConfigurationElement element : elements) { if (CONTENT_TYPE_BINDING.equals(element.getName())) fStructureMergeViewers.createBinding(element, STRUCTURE_MERGE_VIEWER_ID_ATTRIBUTE); } // collect all viewers which define the content merge viewer extension point elements= registry.getConfigurationElementsFor(PLUGIN_ID, CONTENT_MERGE_VIEWER_EXTENSION_POINT); - for (int i= 0; i < elements.length; i++) { - IConfigurationElement element= elements[i]; + for (IConfigurationElement element : elements) { String name= element.getName(); if (!CONTENT_TYPE_BINDING.equals(name)) { if (!VIEWER_TAG.equals(name)) @@ -417,8 +410,7 @@ public final class CompareUIPlugin extends AbstractUIPlugin { fContentMergeViewers.register(element, new ViewerDescriptor(element)); } } - for (int i= 0; i < elements.length; i++) { - IConfigurationElement element= elements[i]; + for (IConfigurationElement element : elements) { if (CONTENT_TYPE_BINDING.equals(element.getName())) fContentMergeViewers.createBinding(element, CONTENT_MERGE_VIEWER_ID_ATTRIBUTE); } @@ -426,8 +418,7 @@ public final class CompareUIPlugin extends AbstractUIPlugin { // collect all extensions that define the compare filter extension point elements = registry.getConfigurationElementsFor(PLUGIN_ID, COMPARE_FILTER_EXTENTION_POINT); - for (int i = 0; i < elements.length; i++) { - IConfigurationElement element = elements[i]; + for (IConfigurationElement element : elements) { String name = element.getName(); if (!CONTENT_TYPE_BINDING.equals(name)) { if (!FILTER_TAG.equals(name)) @@ -436,8 +427,7 @@ public final class CompareUIPlugin extends AbstractUIPlugin { fCompareFilters.register(element, new CompareFilterDescriptor(element)); } } - for (int i = 0; i < elements.length; i++) { - IConfigurationElement element = elements[i]; + for (IConfigurationElement element : elements) { if (CONTENT_TYPE_BINDING.equals(element.getName())) fCompareFilters.createBinding(element, COMPARE_FILTER_ID_ATTRIBUTE); @@ -445,8 +435,7 @@ public final class CompareUIPlugin extends AbstractUIPlugin { // collect all viewers which define the content viewer extension point elements= registry.getConfigurationElementsFor(PLUGIN_ID, CONTENT_VIEWER_EXTENSION_POINT); - for (int i= 0; i < elements.length; i++) { - IConfigurationElement element= elements[i]; + for (IConfigurationElement element : elements) { String name= element.getName(); if (!CONTENT_TYPE_BINDING.equals(name)) { if (!VIEWER_TAG.equals(name)) @@ -454,8 +443,7 @@ public final class CompareUIPlugin extends AbstractUIPlugin { fContentViewers.register(element, new ViewerDescriptor(element)); } } - for (int i= 0; i < elements.length; i++) { - IConfigurationElement element= elements[i]; + for (IConfigurationElement element : elements) { if (CONTENT_TYPE_BINDING.equals(element.getName())) fContentViewers.createBinding(element, CONTENT_VIEWER_ID_ATTRIBUTE); } @@ -958,12 +946,14 @@ public final class CompareUIPlugin extends AbstractUIPlugin { if (type == null) { int n = 0; - for (int i = 0; i < types.length; i++) - if (!ITypedElement.UNKNOWN_TYPE.equals(types[i])) { + for (String t : types) { + if (!ITypedElement.UNKNOWN_TYPE.equals(t)) { n++; - if (type == null) - type = types[i]; // remember the first known type + if (type == null) { + type = t; // remember the first known type + } } + } if (n > 1) // don't use the type if there were more than one type = null; } @@ -1043,12 +1033,14 @@ public final class CompareUIPlugin extends AbstractUIPlugin { if (type == null) { int n= 0; - for (int i= 0; i < types.length; i++) - if (!ITypedElement.UNKNOWN_TYPE.equals(types[i])) { + for (String t : types) { + if (!ITypedElement.UNKNOWN_TYPE.equals(t)) { n++; - if (type == null) - type= types[i]; // remember the first known type + if (type == null) { + type = t; // remember the first known type + } } + } if (n > 1) // don't use the type if there were more than one type= null; } @@ -1425,12 +1417,11 @@ public final class CompareUIPlugin extends AbstractUIPlugin { List<IEditorPart> result= new ArrayList<IEditorPart>(0); IWorkbench workbench= getDefault().getWorkbench(); IWorkbenchWindow[] windows= workbench.getWorkbenchWindows(); - for (int i= 0; i < windows.length; i++) { - IWorkbenchPage[] pages= windows[i].getPages(); - for (int x= 0; x < pages.length; x++) { - IEditorPart[] editors= pages[x].getDirtyEditors(); - for (int z= 0; z < editors.length; z++) { - IEditorPart ep= editors[z]; + for (IWorkbenchWindow window : windows) { + IWorkbenchPage[] pages = window.getPages(); + for (IWorkbenchPage page : pages) { + IEditorPart[] editors = page.getDirtyEditors(); + for (IEditorPart ep : editors) { IEditorInput input= ep.getEditorInput(); if (!inputs.contains(input)) { inputs.add(input); @@ -1476,12 +1467,14 @@ public final class CompareUIPlugin extends AbstractUIPlugin { if (type == null) { int n= 0; - for (int i= 0; i < types.length; i++) - if (!ITypedElement.UNKNOWN_TYPE.equals(types[i])) { + for (String t : types) { + if (!ITypedElement.UNKNOWN_TYPE.equals(t)) { n++; - if (type == null) - type= types[i]; // remember the first known type + if (type == null) { + type = t; // remember the first known type + } } + } if (n > 1) // don't use the type if there were more than one type= null; } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceDialog.java index 129132457..805c090f5 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceDialog.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceDialog.java @@ -403,8 +403,8 @@ public class CompareWithOtherResourceDialog extends TitleAreaDialog { private void addListenersToRadioButtons() { final ContentTypeElement[] elements = new ContentTypeElement[] { workspaceContent, externalFileContent, externalFolderContent }; - for (int i = 0; i < elements.length; i++) { - elements[i].getRadioButton().addListener(SWT.Selection, event -> { + for (ContentTypeElement e : elements) { + e.getRadioButton().addListener(SWT.Selection, event -> { for (ContentTypeElement element : elements) { if (event.widget != element.getRadioButton()) element.setEnabled(false); diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java index 5eb99ee55..d1ce02c0b 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java @@ -84,8 +84,8 @@ public class DocLineComparator implements ITokenComparator { boolean cacheFilteredLines = false; if (compareFilters != null && compareFilters.length > 0) { cacheFilteredLines = true; - for (int i = 0; i < compareFilters.length; i++) { - if (!compareFilters[i].canCacheFilteredRegions()) { + for (ICompareFilter compareFilter : compareFilters) { + if (!compareFilter.canCacheFilteredRegions()) { cacheFilteredLines = false; break; } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java index f974e5a2c..0bbfb7251 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java @@ -106,8 +106,9 @@ public class EditionAction extends BaseCompareAction { @Override protected void run(ISelection selection) { IFile[] files= Utilities.getFiles(selection); - for (int i= 0; i < files.length; i++) - doFromHistory(files[i]); + for (IFile file : files) { + doFromHistory(file); + } } private void doFromHistory(final IFile file) { @@ -228,12 +229,10 @@ public class EditionAction extends BaseCompareAction { FileEditorInput test= new FileEditorInput(file); - for (int i= 0; i < ws.length; i++) { - IWorkbenchWindow w= ws[i]; + for (IWorkbenchWindow w : ws) { IWorkbenchPage[] wps= w.getPages(); if (wps != null) { - for (int j= 0; j < wps.length; j++) { - IWorkbenchPage wp= wps[j]; + for (IWorkbenchPage wp : wps) { IEditorPart ep= wp.findEditor(test); if (ep instanceof ITextEditor) { ITextEditor te= (ITextEditor) ep; diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/OverlayPreferenceStore.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/OverlayPreferenceStore.java index 3b1a25c09..6159844c1 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/OverlayPreferenceStore.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/OverlayPreferenceStore.java @@ -73,9 +73,10 @@ public class OverlayPreferenceStore implements IPreferenceStore { } private OverlayKey findOverlayKey(String key) { - for (int i= 0; i < fOverlayKeys.length; i++) { - if (fOverlayKeys[i].fKey.equals(key)) - return fOverlayKeys[i]; + for (OverlayKey overlayKey : fOverlayKeys) { + if (overlayKey.fKey.equals(key)) { + return overlayKey; + } } return null; } @@ -139,8 +140,9 @@ public class OverlayPreferenceStore implements IPreferenceStore { } public void propagate() { - for (int i= 0; i < fOverlayKeys.length; i++) - propagateProperty(fStore, fOverlayKeys[i], fParent); + for (OverlayKey overlayKey : fOverlayKeys) { + propagateProperty(fStore, overlayKey, fParent); + } } private void loadProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target, boolean forceInitialization) { @@ -191,13 +193,15 @@ public class OverlayPreferenceStore implements IPreferenceStore { } public void load() { - for (int i= 0; i < fOverlayKeys.length; i++) - loadProperty(fParent, fOverlayKeys[i], fStore, true); + for (OverlayKey overlayKey : fOverlayKeys) { + loadProperty(fParent, overlayKey, fStore, true); + } } public void loadDefaults() { - for (int i= 0; i < fOverlayKeys.length; i++) - setToDefault(fOverlayKeys[i].fKey); + for (OverlayKey overlayKey : fOverlayKeys) { + setToDefault(overlayKey.fKey); + } } public void start() { diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java index 374523a14..94450efdf 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java @@ -292,9 +292,11 @@ class ResourceCompareInput extends CompareEditorInput { } private boolean checkSelection(IResource[] resources) { - for (int i = 0; i < resources.length; i++) - if (resources[i] == null) + for (IResource resource : resources) { + if (resource == null) { return false; + } + } return true; } @@ -492,8 +494,7 @@ class ResourceCompareInput extends CompareEditorInput { IDiffElement[] children= node.getChildren(); if (children != null) { - for (int i= 0; i < children.length; i++) { - IDiffElement element= children[i]; + for (IDiffElement element : children) { if (element instanceof DiffNode) commit(pm, (DiffNode) element); } @@ -546,8 +547,7 @@ class ResourceCompareInput extends CompareEditorInput { IDiffElement[] children= node.getChildren(); if (children != null) { - for (int i= 0; i < children.length; i++) { - IDiffElement element= children[i]; + for (IDiffElement element : children) { if (element instanceof DiffNode) collectDirtyResources(element, collector); } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ShowWhitespaceAction.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ShowWhitespaceAction.java index 998d4d18a..b2c66ecc0 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ShowWhitespaceAction.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ShowWhitespaceAction.java @@ -14,7 +14,6 @@ package org.eclipse.compare.internal; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import org.eclipse.jface.preference.IPreferenceStore; @@ -148,8 +147,7 @@ public class ShowWhitespaceAction extends TextEditorPropertyAction { private void hideWhitespace() { Map<MergeSourceViewer, WhitespaceCharacterPainter> painters = getPainters(); - for (Iterator<MergeSourceViewer> iterator = painters.keySet().iterator(); iterator.hasNext();) { - MergeSourceViewer viewer = iterator.next(); + for (MergeSourceViewer viewer : painters.keySet()) { WhitespaceCharacterPainter painter = painters.get(viewer); if (painter != null) { viewer.getSourceViewer().removePainter(painter); diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TabFolderLayout.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TabFolderLayout.java index 6493d3313..66dbc68c4 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TabFolderLayout.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TabFolderLayout.java @@ -51,8 +51,8 @@ public class TabFolderLayout extends Layout { Rectangle rect= composite.getClientArea(); Control[] children = composite.getChildren(); - for (int i = 0; i < children.length; i++) { - children[i].setBounds(rect); + for (Control c : children) { + c.setBounds(rect); } } } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextEditorPropertyAction.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextEditorPropertyAction.java index ee4947e41..055a7faf4 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextEditorPropertyAction.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextEditorPropertyAction.java @@ -38,8 +38,7 @@ public class TextEditorPropertyAction extends Action implements IPropertyChangeL } private void addActionToViewers() { - for (int i = 0; i < viewers.length; i++) { - MergeSourceViewer viewer = viewers[i]; + for (MergeSourceViewer viewer : viewers) { viewer.addTextAction(this); } } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java index 16dce1327..113ae4bdb 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java @@ -127,8 +127,9 @@ public class Utilities { public static void setEnableComposite(Composite composite, boolean enable) { Control[] children= composite.getChildren(); - for (int i= 0; i < children.length; i++) - children[i].setEnabled(enable); + for (Control c : children) { + c.setEnabled(enable); + } } public static boolean getBoolean(CompareConfiguration cc, String key, boolean dflt) { @@ -188,20 +189,20 @@ public class Utilities { if (selection instanceof IStructuredSelection) { Object[] s= ((IStructuredSelection) selection).toArray(); - for (int i= 0; i < s.length; i++) { + for (Object o : s) { IResource resource= null; - Object o= s[i]; if (type.isInstance(o)) { resource= (IResource) o; } else if (o instanceof ResourceMapping) { try { ResourceTraversal[] travs= ((ResourceMapping)o).getTraversals(ResourceMappingContext.LOCAL_CONTEXT, null); if (travs != null) { - for (int k= 0; k < travs.length; k++) { - IResource[] resources= travs[k].getResources(); - for (int j= 0; j < resources.length; j++) { - if (type.isInstance(resources[j]) && resources[j].isAccessible()) - tmp.add(resources[j]); + for (ResourceTraversal trav : travs) { + IResource[] resources = trav.getResources(); + for (IResource r : resources) { + if (type.isInstance(r) && r.isAccessible()) { + tmp.add(r); + } } } } @@ -809,10 +810,10 @@ public class Utilities { */ public static boolean setReadTimeout(URLConnection connection, int timeout) { Method[] methods = connection.getClass().getMethods(); - for (int i = 0; i < methods.length; i++) { - if (methods[i].getName().equals("setReadTimeout")) { //$NON-NLS-1$ + for (Method method : methods) { + if (method.getName().equals("setReadTimeout")) { //$NON-NLS-1$ try { - methods[i].invoke(connection, new Object[] {Integer.valueOf(timeout)}); + method.invoke(connection, new Object[] {Integer.valueOf(timeout)}); return true; } catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException e) { // ignore @@ -891,12 +892,12 @@ public class Utilities { } boolean[] ignored = new boolean[thisLine.length()]; - for (int j = 0; j < ignoredRegions.length; j++) { - if (ignoredRegions[j] != null) { - for (int k = 0; k < ignoredRegions[j].length; k++) { - if (ignoredRegions[j][k] != null) { - for (int l = 0; l < ignoredRegions[j][k].getLength(); l++) { - ignored[ignoredRegions[j][k].getOffset() + l] = true; + for (IRegion[] regions : ignoredRegions) { + if (regions != null) { + for (IRegion region : regions) { + if (region != null) { + for (int l = 0; l < region.getLength(); l++) { + ignored[region.getOffset() + l] = true; } } } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java index a96aa66cd..1d9320ed2 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java @@ -58,8 +58,8 @@ public class ViewerDescriptor implements IViewerDescriptor { if (currentViewer != null) { CompareHandlerService[] compareHandlerService = Adapters.adapt(currentViewer, CompareHandlerService[].class); if (compareHandlerService != null) { - for (int i = 0; i < compareHandlerService.length; i++) { - compareHandlerService[i].dispose(); + for (CompareHandlerService s : compareHandlerService) { + s.dispose(); } } } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/WorkerJob.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/WorkerJob.java index 52579620e..ac35a0c7a 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/WorkerJob.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/WorkerJob.java @@ -48,8 +48,7 @@ public class WorkerJob extends Job { if (errors.length == 1) return new Status(IStatus.ERROR, CompareUIPlugin.PLUGIN_ID, 0, errors[0].getMessage(), errors[0]); List<IStatus> statii = new ArrayList<>(); - for (int i = 0; i < errors.length; i++) { - Throwable throwable = errors[i]; + for (Throwable throwable : errors) { statii.add(new Status(IStatus.ERROR, CompareUIPlugin.PLUGIN_ID, 0, errors[0].getMessage(), throwable)); } return new MultiStatus(CompareUIPlugin.PLUGIN_ID, 0, statii.toArray(new IStatus[statii.size()]), CompareMessages.WorkerJob_0, null); diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java index faa11e67a..e34d14653 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java @@ -302,8 +302,7 @@ public class DocumentMerger { public Diff[] getChangeDiffs(int contributor, IRegion region) { if (fDiffs != null && intersectsRegion(contributor, region)) { List<Diff> result = new ArrayList<>(); - for (Iterator<Diff> iterator = fDiffs.iterator(); iterator.hasNext();) { - Diff diff = iterator.next(); + for (Diff diff : fDiffs) { if (diff.intersectsRegion(contributor, region)) { result.add(diff); } @@ -450,9 +449,7 @@ public class DocumentMerger { Boolean.FALSE); ArrayList<Diff> newAllDiffs = new ArrayList<>(); - for (int i= 0; i < e.length; i++) { - RangeDifference es= e[i]; - + for (RangeDifference es : e) { int ancestorStart= 0; int ancestorEnd= 0; if (sancestor != null) { @@ -589,9 +586,7 @@ public class DocumentMerger { } if (e != null) { - for (int i= 0; i < e.length; i++) { - RangeDifference es= e[i]; - + for (RangeDifference es : e) { int kind= es.kind(); int ancestorStart= 0; @@ -864,8 +859,7 @@ public class DocumentMerger { ITokenComparator sy= createTokenComparator(s); RangeDifference[] e= RangeDifferencer.findRanges(sa, sy, sm); - for (int i= 0; i < e.length; i++) { - RangeDifference es= e[i]; + for (RangeDifference es : e) { int kind= es.kind(); if (kind != RangeDifference.NOCHANGE) { @@ -977,8 +971,7 @@ public class DocumentMerger { } public Diff findDiff(Position p, boolean left) { - for (Iterator<Diff> iterator = fAllDiffs.iterator(); iterator.hasNext();) { - Diff diff = iterator.next(); + for (Diff diff : fAllDiffs) { Position diffPos; if (left) { diffPos = diff.fLeftPos; @@ -1127,11 +1120,9 @@ public class DocumentMerger { if (fChangeDiffs == null) return new Diff[0]; List<Diff> intersectingDiffs = new ArrayList<>(); - for (Iterator<Diff> iterator = fChangeDiffs.iterator(); iterator.hasNext();) { - Diff diff = iterator.next(); + for (Diff diff : fChangeDiffs) { Diff[] changeDiffs = diff.getChangeDiffs(contributor, region); - for (int i = 0; i < changeDiffs.length; i++) { - Diff changeDiff = changeDiffs[i]; + for (Diff changeDiff : changeDiffs) { intersectingDiffs.add(changeDiff); } } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java index f9a0d9b7f..f002e1212 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java @@ -53,8 +53,7 @@ public class TextStreamMerger implements IStreamMerger { RangeDifference[] diffs= RangeDifferencer.findRanges(monitor, a, t, o); - for (int i= 0; i < diffs.length; i++) { - RangeDifference rd= diffs[i]; + for (RangeDifference rd : diffs) { switch (rd.kind()) { case RangeDifference.ANCESTOR: // pseudo conflict case RangeDifference.NOCHANGE: diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DecoratorOverlayIcon.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DecoratorOverlayIcon.java index 20db8e922..a17082675 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DecoratorOverlayIcon.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DecoratorOverlayIcon.java @@ -99,9 +99,9 @@ class DecoratorOverlayIcon extends CompositeImageDescriptor { @Override public int hashCode() { int code = base.hashCode(); - for (int i = 0; i < overlays.length; i++) { - if (overlays[i] != null) { - code ^= overlays[i].hashCode(); + for (ImageDescriptor overlay : overlays) { + if (overlay != null) { + code ^= overlay.hashCode(); } } return code; diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/HunkDiffNode.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/HunkDiffNode.java index bc00a4f5c..c172454ef 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/HunkDiffNode.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/HunkDiffNode.java @@ -86,8 +86,7 @@ public class HunkDiffNode extends PatchDiffNode { if (fuzz > 0) { String[] lines = result.getHunk().getLines(); int contextLines = 0; - for (int i = 0; i < lines.length; i++) { - String line = lines[i]; + for (String line : lines) { char c = line.charAt(0); if (c == ' ') { contextLines++; diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java index 1a6a6f53e..0453443ff 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java @@ -727,9 +727,11 @@ public class InputPatchPage extends WizardPage { // set filenames history String[] sourceNames= settings.getArray(STORE_PATCH_FILES_ID); if (sourceNames != null) - for (int i= 0; i < sourceNames.length; i++) - if (sourceNames[i] != null && sourceNames[i].length() > 0) - fPatchFileNameField.add(sourceNames[i]); + for (String sourceName : sourceNames) { + if (sourceName != null && sourceName.length() > 0) { + fPatchFileNameField.add(sourceName); + } + } // set patch file path String patchFilePath= settings.get(STORE_PATCH_FILES_ID); @@ -739,9 +741,11 @@ public class InputPatchPage extends WizardPage { // set URLs history String[] sourceURLs= settings.getArray(STORE_PATCH_URLS_ID); if (sourceURLs != null) - for (int i= 0; i < sourceURLs.length; i++) - if (sourceURLs[i] != null && sourceURLs[i].length() > 0) - fPatchURLField.add(sourceURLs[i]); + for (String sourceURL : sourceURLs) { + if (sourceURL != null && sourceURL.length() > 0) { + fPatchURLField.add(sourceURL); + } + } // If the previous apply patch was used with a clipboard, we need to check // if there is a valid patch on the clipboard. This will be done in adjustToCurrentTarget() diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchCompareEditorInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchCompareEditorInput.java index f09d0ec26..91a54aa5b 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchCompareEditorInput.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchCompareEditorInput.java @@ -243,18 +243,17 @@ public abstract class PatchCompareEditorInput extends CompareEditorInput { } private void processDiffs(FilePatch2[] diffs) { - for (int i = 0; i < diffs.length; i++) { - processDiff(diffs[i], getRoot()); + for (FilePatch2 diff : diffs) { + processDiff(diff, getRoot()); } } private void processProjects(DiffProject[] diffProjects) { //create diffProject nodes - for (int i = 0; i < diffProjects.length; i++) { - PatchProjectDiffNode projectNode = new PatchProjectDiffNode(getRoot(), diffProjects[i], getPatcher().getConfiguration()); - FilePatch2[] diffs = diffProjects[i].getFileDiffs(); - for (int j = 0; j < diffs.length; j++) { - FilePatch2 fileDiff = diffs[j]; + for (DiffProject diffProject : diffProjects) { + PatchProjectDiffNode projectNode = new PatchProjectDiffNode(getRoot(), diffProject, getPatcher().getConfiguration()); + FilePatch2[] diffs = diffProject.getFileDiffs(); + for (FilePatch2 fileDiff : diffs) { processDiff(fileDiff, projectNode); } } @@ -264,8 +263,7 @@ public abstract class PatchCompareEditorInput extends CompareEditorInput { FileDiffResult diffResult = getPatcher().getDiffResult(diff); PatchFileDiffNode node = PatchFileDiffNode.createDiffNode(parent, diffResult); HunkResult[] hunkResults = diffResult.getHunkResults(); - for (int i = 0; i < hunkResults.length; i++) { - HunkResult hunkResult = hunkResults[i]; + for (HunkResult hunkResult : hunkResults) { if (!hunkResult.isOK()) { HunkDiffNode hunkNode = HunkDiffNode.createDiffNode(node, hunkResult, true); Object left = hunkNode.getLeft(); @@ -350,9 +348,8 @@ public abstract class PatchCompareEditorInput extends CompareEditorInput { tbm.removeAll(); tbm.add(new Separator("contributed")); //$NON-NLS-1$ - - for (int i = 0; i < actions.length; i++) { - tbm.appendToGroup("contributed", actions[i]); //$NON-NLS-1$ + for (Action action : actions) { + tbm.appendToGroup("contributed", action); //$NON-NLS-1$ } tbm.update(true); @@ -369,8 +366,7 @@ public abstract class PatchCompareEditorInput extends CompareEditorInput { public void resetRoot() { IDiffElement[] children = root.getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement child = children[i]; + for (IDiffElement child : children) { root.remove(child); } } @@ -403,8 +399,7 @@ public abstract class PatchCompareEditorInput extends CompareEditorInput { boolean atLeastOneIsEnabled = false; if (getViewer() != null) { IDiffElement[] elements = getRoot().getChildren(); - for (int i = 0; i < elements.length; i++) { - IDiffElement element = elements[i]; + for (IDiffElement element : elements) { if (isEnabled(element)) { atLeastOneIsEnabled = true; break; diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchProjectDiffNode.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchProjectDiffNode.java index d7cbafb9b..adfae47dc 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchProjectDiffNode.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchProjectDiffNode.java @@ -53,8 +53,7 @@ public class PatchProjectDiffNode extends PatchDiffNode { private boolean containsProblems() { IDiffElement[] elements = getChildren(); - for (int i = 0; i < elements.length; i++) { - IDiffElement diffElement = elements[i]; + for (IDiffElement diffElement : elements) { if (diffElement instanceof PatchFileDiffNode) { PatchFileDiffNode node = (PatchFileDiffNode) diffElement; if (node.getDiffResult().containsProblems()) diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java index 34f1b86dd..88204b43a 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java @@ -203,15 +203,14 @@ public class Patcher implements IHunkFilter { public void countLines() { FilePatch2[] fileDiffs = getDiffs(); - for (int i = 0; i < fileDiffs.length; i++) { + for (FilePatch2 fileDiff : fileDiffs) { int addedLines = 0; int removedLines = 0; - FilePatch2 fileDiff = fileDiffs[i]; for (int j = 0; j < fileDiff.getHunkCount(); j++) { IHunk hunk = fileDiff.getHunks()[j]; String[] lines = ((Hunk) hunk).getLines(); - for (int k = 0; k < lines.length; k++) { - char c = lines[k].charAt(0); + for (String line : lines) { + char c = line.charAt(0); switch (c) { case '+': addedLines++; @@ -517,8 +516,7 @@ public class Patcher implements IHunkFilter { //path segment contained in all diffs. int length= 99; if (fDiffs!=null) { - for (int i= 0; i<fDiffs.length; i++) { - FilePatch2 diff= fDiffs[i]; + for (FilePatch2 diff : fDiffs) { length= Math.min(length, diff.segmentCount()); } if (ResourcesPlugin.getWorkspace().getRoot().equals(fTarget)) @@ -537,9 +535,9 @@ public class Patcher implements IHunkFilter { public void removeDiff(FilePatch2 diffToRemove){ FilePatch2[] temp = new FilePatch2[fDiffs.length - 1]; int counter = 0; - for (int i = 0; i < fDiffs.length; i++) { - if (fDiffs[i] != diffToRemove){ - temp[counter++] = fDiffs[i]; + for (FilePatch2 diff : fDiffs) { + if (diff != diffToRemove) { + temp[counter++] = diff; } } fDiffs = temp; @@ -556,15 +554,15 @@ public class Patcher implements IHunkFilter { private void setEnabledProject(DiffProject projectDiff, boolean enabled) { FilePatch2[] diffFiles = projectDiff.getFileDiffs(); - for (int i = 0; i < diffFiles.length; i++) { - setEnabledFile(diffFiles[i], enabled); + for (FilePatch2 diffFile : diffFiles) { + setEnabledFile(diffFile, enabled); } } private void setEnabledFile(FilePatch2 fileDiff, boolean enabled) { IHunk[] hunks = fileDiff.getHunks(); - for (int i = 0; i < hunks.length; i++) { - setEnabledHunk((Hunk) hunks[i], enabled); + for (IHunk hunk : hunks) { + setEnabledHunk((Hunk) hunk, enabled); } } @@ -619,8 +617,7 @@ public class Patcher implements IHunkFilter { if (diffs==null||diffs.length<=0) return -1; int fuzz= -1; - for (int i= 0; i<diffs.length; i++) { - FilePatch2 d= diffs[i]; + for (FilePatch2 d : diffs) { IFile file= getTargetFile(d); if (file != null && file.exists()) { List<String> lines= LineReader.load(file, false); @@ -642,8 +639,7 @@ public class Patcher implements IHunkFilter { } public void refresh(FilePatch2[] diffs) { - for (int i = 0; i < diffs.length; i++) { - FilePatch2 diff = diffs[i]; + for (FilePatch2 diff : diffs) { FileDiffResult result = getDiffResult(diff); ((WorkspaceFileDiffResult)result).refresh(); } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java index 591b38335..4f72a8034 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java @@ -714,9 +714,9 @@ public class PreviewPatchPage2 extends WizardPage { fPatcher.countLines(); FilePatch2[] fileDiffs = fPatcher.getDiffs(); - for (int i = 0; i < fileDiffs.length; i++) { - added += fileDiffs[i].getAddedLines(); - removed += fileDiffs[i].getRemovedLines(); + for (FilePatch2 fileDiff : fileDiffs) { + added += fileDiff.getAddedLines(); + removed += fileDiff.getRemovedLines(); } } else { @@ -724,13 +724,9 @@ public class PreviewPatchPage2 extends WizardPage { Pattern addedPattern = Pattern.compile(addedLinesRegex); Pattern removedPattern = Pattern.compile(removedLinesRegex); - FilePatch2[] fileDiffs = fPatcher.getDiffs(); - for (int i = 0; i < fileDiffs.length; i++) { - IHunk[] hunks = fileDiffs[i].getHunks(); - for (int j = 0; j < hunks.length; j++) { - String[] lines = ((Hunk) hunks[j]).getLines(); - for (int k = 0; k < lines.length; k++) { - String line = lines[k]; + for (FilePatch2 fileDiff : fPatcher.getDiffs()) { + for (IHunk hunk : fileDiff.getHunks()) { + for (String line : ((Hunk) hunk).getLines()) { if (addedPattern.matcher(line).find()) added++; if (removedPattern.matcher(line).find()) diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/RetargetPatchElementDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/RetargetPatchElementDialog.java index 20f2a9314..5b9c50495 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/RetargetPatchElementDialog.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/RetargetPatchElementDialog.java @@ -57,9 +57,9 @@ class RetargetPatchElementDialog extends Dialog { // Don't show closed projects IProject[] allProjects= ((IWorkspaceRoot) element).getProjects(); ArrayList<IProject> accessibleProjects= new ArrayList<>(); - for (int i= 0; i<allProjects.length; i++) { - if (allProjects[i].isOpen()) { - accessibleProjects.add(allProjects[i]); + for (IProject allProject : allProjects) { + if (allProject.isOpen()) { + accessibleProjects.add(allProject); } } return accessibleProjects.toArray(); diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspacePatcher.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspacePatcher.java index 10535ba0f..6bebffe49 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspacePatcher.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspacePatcher.java @@ -95,8 +95,7 @@ public class WorkspacePatcher extends Patcher { // get all files to be modified in order to call validateEdit List<IFile> list= new ArrayList<>(); - for (int j= 0; j < fDiffProjects.length; j++) { - DiffProject diffProject= fDiffProjects[j]; + for (DiffProject diffProject : fDiffProjects) { if (Utilities.getProject(diffProject).isAccessible()) list.addAll(Arrays.asList(getTargetFiles(diffProject))); } @@ -111,11 +110,8 @@ public class WorkspacePatcher extends Patcher { pm.beginTask(message, diffs.length * WORK_UNIT); } - for (int i= 0; i < diffs.length; i++) { - + for (FilePatch2 diff : diffs) { int workTicks= WORK_UNIT; - - FilePatch2 diff= diffs[i]; if (isAccessible(diff)) { IFile file= getTargetFile(diff); IPath path= file.getProjectRelativePath(); @@ -191,8 +187,7 @@ public class WorkspacePatcher extends Patcher { public IFile[] getTargetFiles(DiffProject project) { List<IFile> files= new ArrayList<>(); FilePatch2[] diffs = project.getFileDiffs(); - for (int i = 0; i < diffs.length; i++) { - FilePatch2 diff = diffs[i]; + for (FilePatch2 diff : diffs) { if (isEnabled(diff)) { files.add(getTargetFile(diff)); } @@ -221,8 +216,8 @@ public class WorkspacePatcher extends Patcher { List<ISchedulingRule> projects= new ArrayList<>(); IResourceRuleFactory ruleFactory= ResourcesPlugin.getWorkspace().getRuleFactory(); // Determine the appropriate scheduling rules - for (int i= 0; i < fDiffProjects.length; i++) { - IProject tempProject= Utilities.getProject(fDiffProjects[i]); + for (DiffProject diffProject : fDiffProjects) { + IProject tempProject = Utilities.getProject(diffProject); // The goal here is to lock as little of the workspace as necessary // but still allow the patcher to obtain the locks it needs. // As such, we need to get the modify rules from the rule factory for the .project file. A pessimistic @@ -244,9 +239,9 @@ public class WorkspacePatcher extends Patcher { public void removeProject(DiffProject project) { DiffProject[] temp = new DiffProject[fDiffProjects.length - 1]; int counter = 0; - for (int i = 0; i < fDiffProjects.length; i++) { - if (fDiffProjects[i] != project){ - temp[counter++] = fDiffProjects[i]; + for (DiffProject diffProject : fDiffProjects) { + if (diffProject != project) { + temp[counter++] = diffProject; } } fDiffProjects = temp; @@ -256,8 +251,7 @@ public class WorkspacePatcher extends Patcher { protected Object getElementParent(Object element) { if (element instanceof FilePatch2 && fDiffProjects != null) { FilePatch2 diff = (FilePatch2) element; - for (int i = 0; i < fDiffProjects.length; i++) { - DiffProject project = fDiffProjects[i]; + for (DiffProject project : fDiffProjects) { if (project.contains(diff)) return project; } @@ -283,8 +277,8 @@ public class WorkspacePatcher extends Patcher { } removeDiff(diff); FilePatch2 newDiff = getDiffForFile(file); - for (int i = 0; i < hunks.length; i++) { - Hunk hunk = (Hunk) hunks[i]; + for (IHunk h : hunks) { + Hunk hunk = (Hunk) h; newDiff.add(hunk); } } @@ -296,9 +290,9 @@ public class WorkspacePatcher extends Patcher { // Check if the diff project already exists for the file IProject project = file.getProject(); DiffProject[] diffProjects = getDiffProjects(); - for (int i = 0; i < diffProjects.length; i++) { - if (Utilities.getProject(diffProjects[i]).equals(project)){ - diffProject = diffProjects[i]; + for (DiffProject d : diffProjects) { + if (Utilities.getProject(d).equals(project)) { + diffProject = d; break; } } @@ -311,8 +305,7 @@ public class WorkspacePatcher extends Patcher { diffsToCheck = getDiffs(); } // Check to see if a diff already exists for the file - for (int i = 0; i < diffsToCheck.length; i++) { - FilePatch2 fileDiff = diffsToCheck[i]; + for (FilePatch2 fileDiff : diffsToCheck) { if (isDiffForFile(fileDiff, file)) { return fileDiff; } @@ -362,8 +355,8 @@ public class WorkspacePatcher extends Patcher { if (selectedProject == null) selectedProject = addDiffProjectForProject(targetProject); // Copy over the diffs to the new project - for (int i = 0; i < diffs.length; i++) { - selectedProject.add(diffs[i]); + for (FilePatch2 diff : diffs) { + selectedProject.add(diff); } // Since the project has been retargeted, remove it from the patcher removeProject(project); @@ -381,9 +374,10 @@ public class WorkspacePatcher extends Patcher { if (!isWorkspacePatch()) return null; DiffProject[] projects = getDiffProjects(); - for (int i = 0; i < projects.length; i++) { - if (Utilities.getProject(projects[i]).equals(project)) - return projects[i]; + for (DiffProject p : projects) { + if (Utilities.getProject(p).equals(project)) { + return p; + } } return null; } @@ -401,9 +395,9 @@ public class WorkspacePatcher extends Patcher { if (diffs.length == 0) return -1; int skip = -1; - for (int i = 0; i < diffs.length; i++) { - IPath oldPath = diffs[i].getPath(false); - IPath newPath = diffs[i].getPath(true); + for (FilePatch2 diff : diffs) { + IPath oldPath = diff.getPath(false); + IPath newPath = diff.getPath(true); if (checkFirstSegments(new IPath[] { oldPath, newPath }, new String[][] { { "a", "b" }, // change //$NON-NLS-1$ //$NON-NLS-2$ { "b", "b" }, // addition //$NON-NLS-1$ //$NON-NLS-2$ @@ -428,10 +422,11 @@ public class WorkspacePatcher extends Patcher { } private boolean checkFirstSegments(IPath[] paths, String[][] segments) { - SEGMENTS: for (int i = 0; i < segments.length; i++) { + SEGMENTS: for (String[] segment : segments) { for (int j = 0; j < paths.length; j++) { - if (!paths[j].segment(0).equals(segments[i][j])) + if (!paths[j].segment(0).equals(segment[j])) { continue SEGMENTS; + } } return true; } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffContainer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffContainer.java index 2a5db27b8..231f235b7 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffContainer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffContainer.java @@ -44,8 +44,8 @@ public abstract class DiffContainer extends DiffElement implements IDiffContaine */ public IDiffElement findChild(String name) { Object[] children= getChildren(); - for (int i= 0; i < children.length; i++) { - IDiffElement child= (IDiffElement) children[i]; + for (Object c : children) { + IDiffElement child = (IDiffElement) c; if (name.equals(child.getName())) return child; } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java index 978a02232..1c91d01e2 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java @@ -136,8 +136,9 @@ public class DiffNode extends DiffContainer implements ICompareInput { protected void fireChange() { if (fListener != null) { Object[] listeners= fListener.getListeners(); - for (int i= 0; i < listeners.length; i++) - ((ICompareInputChangeListener) listeners[i]).compareInputChanged(this); + for (Object listener : listeners) { + ((ICompareInputChangeListener) listener).compareInputChanged(this); + } } } @@ -317,8 +318,7 @@ public class DiffNode extends DiffContainer implements ICompareInput { public int hashCode() { String[] path= getPath(this, 0); int hashCode= 1; - for (int i= 0; i < path.length; i++) { - String s= path[i]; + for (String s : path) { hashCode= (31 * hashCode) + (s != null ? s.hashCode() : 0); } return hashCode; diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java index b698b1334..02898cf5b 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java @@ -260,8 +260,7 @@ public class Differencer { if (ancestorChildren != null) { ancestorSet= new HashMap<>(10); - for (int i= 0; i < ancestorChildren.length; i++) { - Object ancestorChild= ancestorChildren[i]; + for (Object ancestorChild : ancestorChildren) { ancestorSet.put(ancestorChild, ancestorChild); allSet.add(ancestorChild); } @@ -269,8 +268,7 @@ public class Differencer { if (rightChildren != null) { rightSet= new HashMap<>(10); - for (int i= 0; i < rightChildren.length; i++) { - Object rightChild= rightChildren[i]; + for (Object rightChild : rightChildren) { rightSet.put(rightChild, rightChild); allSet.add(rightChild); } @@ -278,8 +276,7 @@ public class Differencer { if (leftChildren != null) { leftSet= new HashMap<>(10); - for (int i= 0; i < leftChildren.length; i++) { - Object leftChild= leftChildren[i]; + for (Object leftChild : leftChildren) { leftSet.put(leftChild, leftChild); allSet.add(leftChild); } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureCreator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureCreator.java index ac4ae690e..824323d3d 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureCreator.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureCreator.java @@ -378,8 +378,8 @@ public abstract class StructureCreator implements IStructureCreator2 { if (tree != null) { Object[] children= tree.getChildren(); if (children != null) { - for (int i= 0; i < children.length; i++) { - IStructureComparator child= (IStructureComparator) children[i]; + for (Object c : children) { + IStructureComparator child = (IStructureComparator) c; if (child instanceof ITypedElement && child instanceof DocumentRangeNode) { String n1= ((DocumentRangeNode)child).getId(); if (n1 == null) { |