diff options
| author | Carsten Hammer | 2019-06-14 18:01:57 +0000 |
|---|---|---|
| committer | Paul Pazderski | 2019-06-15 15:17:08 +0000 |
| commit | 1e85f9c9c33e8d3b31e6dbe2d1ce40182a041857 (patch) | |
| tree | 7552c5a980252e5ed0a5e4c04bd4ff34d824a028 | |
| parent | 3a934d23cb1afac1bb9cc7302248ee2c3f126ed3 (diff) | |
| download | eclipse.platform.team-1e85f9c9c33e8d3b31e6dbe2d1ce40182a041857.tar.gz eclipse.platform.team-1e85f9c9c33e8d3b31e6dbe2d1ce40182a041857.tar.xz eclipse.platform.team-1e85f9c9c33e8d3b31e6dbe2d1ce40182a041857.zip | |
Use jdk 5 for-each loopI20190616-1800I20190615-1800
Replace simple uses of Iterator with a corresponding for-each loop. Also
add missing braces on loops as necessary.
Change-Id: I8cee98245fb49892d80949d1dcda89c9bf72f3e4
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
474 files changed, 2419 insertions, 3377 deletions
diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/FileDiffResult.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/FileDiffResult.java index ab64d83a3..02f765fb8 100644 --- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/FileDiffResult.java +++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/FileDiffResult.java @@ -18,7 +18,6 @@ import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -102,8 +101,8 @@ public class FileDiffResult implements IFilePatchResult { this.fBeforeLines = new ArrayList<>(getLines(content, false)); this.fAfterLines = this.fMatches ? new ArrayList<>() : this.fBeforeLines; IHunk[] hunks = this.fDiff.getHunks(); - for (int i = 0; i < hunks.length; i++) { - Hunk hunk = (Hunk) hunks[i]; + for (IHunk h : hunks) { + Hunk hunk = (Hunk) h; hunk.setCharset(getCharset()); HunkResult result = getHunkResult(hunk); result.setMatches(false); @@ -118,8 +117,8 @@ public class FileDiffResult implements IFilePatchResult { // Check to see if we have at least one hunk that matches this.fMatches = false; IHunk[] hunks = this.fDiff.getHunks(); - for (int i = 0; i < hunks.length; i++) { - Hunk hunk = (Hunk) hunks[i]; + for (IHunk h : hunks) { + Hunk hunk = (Hunk) h; HunkResult result = getHunkResult(hunk); if (result.isOK()) { this.fMatches = true; @@ -161,8 +160,8 @@ public class FileDiffResult implements IFilePatchResult { } int shift= 0; IHunk[] hunks = this.fDiff.getHunks(); - for (int i = 0; i < hunks.length; i++) { - Hunk hunk = (Hunk) hunks[i]; + for (IHunk h : hunks) { + Hunk hunk = (Hunk) h; hunk.setCharset(getCharset()); HunkResult result = getHunkResult(hunk); result.setShift(shift); @@ -184,8 +183,7 @@ public class FileDiffResult implements IFilePatchResult { public boolean containsProblems() { if (this.fDiffProblem) return true; - for (Iterator<HunkResult> iterator = this.fHunkResults.values().iterator(); iterator.hasNext();) { - HunkResult result = iterator.next(); + for (HunkResult result : this.fHunkResults.values()) { if (!result.isOK()) return true; } @@ -263,8 +261,8 @@ public class FileDiffResult implements IFilePatchResult { public List<Hunk> getFailedHunks() { List<Hunk> failedHunks = new ArrayList<>(); IHunk[] hunks = this.fDiff.getHunks(); - for (int i = 0; i < hunks.length; i++) { - HunkResult result = this.fHunkResults.get(hunks[i]); + for (IHunk hunk : hunks) { + HunkResult result = this.fHunkResults.get(hunk); if (result != null && !result.isOK()) failedHunks.add(result.getHunk()); } @@ -287,8 +285,8 @@ public class FileDiffResult implements IFilePatchResult { // return hunk results in the same order as hunks are placed in file diff List<HunkResult> results = new ArrayList<>(); IHunk[] hunks = this.fDiff.getHunks(); - for (int i = 0; i < hunks.length; i++) { - HunkResult result = this.fHunkResults.get(hunks[i]); + for (IHunk hunk : hunks) { + HunkResult result = this.fHunkResults.get(hunk); if (result != null) { results.add(result); } diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/FilePatch2.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/FilePatch2.java index 4160b131f..b108f3cd3 100644 --- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/FilePatch2.java +++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/FilePatch2.java @@ -223,8 +223,7 @@ public class FilePatch2 implements IFilePatch2 { adjustedNewPath = new Path(null, this.fProject.getName()).append(this.fNewPath); } FilePatch2 diff = create(adjustedOldPath, 0, adjustedNewPath, 0); - for (Iterator<Hunk> iterator = this.fHunks.iterator(); iterator.hasNext();) { - Hunk hunk = iterator.next(); + for (Hunk hunk : this.fHunks) { // Creating the hunk adds it to the parent diff new Hunk(diff, hunk); } diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/Hunk.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/Hunk.java index 2256d28b7..3a4f3dae8 100644 --- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/Hunk.java +++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/Hunk.java @@ -92,8 +92,7 @@ public class Hunk implements IHunk { */ public String getContent() { StringBuilder sb= new StringBuilder(); - for (int i= 0; i < this.fLines.length; i++) { - String line= this.fLines[i]; + for (String line : this.fLines) { sb.append(line.substring(0, LineReader.length(line))); sb.append('\n'); } @@ -183,8 +182,7 @@ public class Hunk implements IHunk { List<String> contextLines = new ArrayList<>(); boolean contextLinesMatched = true; boolean precedingLinesChecked = false; - for (int i= 0; i < this.fLines.length; i++) { - String s = this.fLines[i]; + for (String s : this.fLines) { Assert.isTrue(s.length() > 0); String line = s.substring(1); char controlChar = s.charAt(0); @@ -332,25 +330,24 @@ public class Hunk implements IHunk { boolean precedingLinesChecked = false; String lineDelimiter = getLineDelimiter(lines); - for (int i= 0; i < this.fLines.length; i++) { - String s= this.fLines[i]; + for (String s : this.fLines) { Assert.isTrue(s.length() > 0); String line= s.substring(1); char controlChar= s.charAt(0); if (controlChar == ' ') { // context lines - Assert.isTrue(pos < lines.size(), "doPatch: inconsistency in context"); //$NON-NLS-1$ - contextLines.add(line); - if (linesMatch(configuration, line, lines.get(pos))) { - pos++; - continue; - } else if (fuzz > 0) { - // doesn't match, use the fuzz factor - contextLinesMatched = false; - pos++; - continue; - } - Assert.isTrue(false, "doPatch: context doesn't match"); //$NON-NLS-1$ + Assert.isTrue(pos < lines.size(), "doPatch: inconsistency in context"); //$NON-NLS-1$ + contextLines.add(line); + if (linesMatch(configuration, line, lines.get(pos))) { + pos++; + continue; + } else if (fuzz > 0) { + // doesn't match, use the fuzz factor + contextLinesMatched = false; + pos++; + continue; + } + Assert.isTrue(false, "doPatch: context doesn't match"); //$NON-NLS-1$ // pos++; } else if (isDeletedDelimeter(controlChar, reverse)) { // deleted lines @@ -463,8 +460,7 @@ public class Hunk implements IHunk { public String getContents(boolean isAfterState, boolean reverse) { StringBuilder result= new StringBuilder(); - for (int i= 0; i<this.fLines.length; i++) { - String line= this.fLines[i]; + for (String line : this.fLines) { String rest= line.substring(1); char c = line.charAt(0); if (c == ' ') { diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/HunkResult.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/HunkResult.java index aeda0cc84..77a6849ff 100644 --- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/HunkResult.java +++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/HunkResult.java @@ -254,8 +254,8 @@ public class HunkResult { private boolean isEnabled(PatchConfiguration configuration) { IHunkFilter[] filters = configuration.getHunkFilters(); - for (int i = 0; i < filters.length; i++) { - if (!filters[i].select(this.fHunk)) { + for (IHunkFilter filter : filters) { + if (!filter.select(this.fHunk)) { return false; } } diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java index 7bf46f7c5..4ebb67735 100644 --- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java +++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java @@ -159,8 +159,7 @@ public class PatchReader { private String readUnifiedDiff(List<FilePatch2> diffs, LineReader lr, String line, String diffArgs, String fileName, DiffProject diffProject) throws IOException { List<FilePatch2> newDiffs= new ArrayList<>(); String nextLine= readUnifiedDiff(newDiffs, lr, line, diffArgs, fileName); - for (Iterator<FilePatch2> iter= newDiffs.iterator(); iter.hasNext();) { - FilePatch2 diff= iter.next(); + for (FilePatch2 diff : newDiffs) { diffProject.add(diff); diffs.add(diff); } @@ -595,10 +594,10 @@ public class PatchReader { private long extractDate(String[] args, int n) { if (n < args.length) { String line= args[n]; - for (int i= 0; i < this.fDateFormats.length; i++) { - this.fDateFormats[i].setLenient(true); + for (DateFormat dateFormat : this.fDateFormats) { + dateFormat.setLenient(true); try { - Date date= this.fDateFormats[i].parse(line); + Date date = dateFormat.parse(line); return date.getTime(); } catch (ParseException ex) { // silently ignored @@ -696,8 +695,7 @@ public class PatchReader { if (!isWorkspacePatch() || this.fDiffs.length == 0) return this.fDiffs; List<FilePatch2> result = new ArrayList<>(); - for (int i = 0; i < this.fDiffs.length; i++) { - FilePatch2 diff = this.fDiffs[i]; + for (FilePatch2 diff : this.fDiffs) { result.add(diff.asRelativeDiff()); } return result.toArray(new FilePatch2[result.size()]); diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/patch/PatchBuilder.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/patch/PatchBuilder.java index 4764ef408..2050d0d00 100644 --- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/patch/PatchBuilder.java +++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/patch/PatchBuilder.java @@ -94,8 +94,8 @@ public class PatchBuilder { IPath newPath, long newDate, IHunk[] hunks) { reorder(hunks); FilePatch2 fileDiff = new FilePatch2(oldPath, oldDate, newPath, newDate); - for (int i = 0; i < hunks.length; i++) { - fileDiff.add((Hunk) hunks[i]); + for (IHunk hunk : hunks) { + fileDiff.add((Hunk) hunk); } return fileDiff; } @@ -165,9 +165,9 @@ public class PatchBuilder { private static int getHunkLength(String[] lines, boolean old) { int length = 0; - for (int i = 0; i < lines.length; i++) { - if (lines[i].length() > 0) { - switch (lines[i].charAt(0)) { + for (String line : lines) { + if (line.length() > 0) { + switch (line.charAt(0)) { case ' ': length++; break; @@ -190,9 +190,9 @@ public class PatchBuilder { } private static boolean checkForPrefix(char prefix, String[] lines) { - for (int i = 0; i < lines.length; i++) { - if (lines[i].length() > 0) { - if (lines[i].charAt(0) == prefix) { + for (String line : lines) { + if (line.length() > 0) { + if (line.charAt(0) == prefix) { return true; } } @@ -210,8 +210,8 @@ public class PatchBuilder { private static IHunk[] removeHunks(IHunk[] hunks, IHunk[] toRemove) { int removed = 0; for (int i = 0; i < hunks.length; i++) { - for (int j = 0; j < toRemove.length; j++) { - if (toRemove[j] == hunks[i]) { + for (IHunk r : toRemove) { + if (r == hunks[i]) { hunks[i] = null; removed++; } @@ -229,8 +229,8 @@ public class PatchBuilder { private static void reorder(IHunk[] hunks) { Arrays.sort(hunks, new HunkComparator()); int shift = 0; - for (int i = 0; i < hunks.length; i++) { - Hunk hunk = (Hunk) hunks[i]; + for (IHunk h : hunks) { + Hunk hunk = (Hunk) h; int start = hunk.getStart(false) + shift; hunk.setStart(start, true); shift += hunk.getLength(true) - hunk.getLength(false); diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeDifferencer.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeDifferencer.java index fc88a0956..0035ef923 100644 --- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeDifferencer.java +++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeDifferencer.java @@ -294,9 +294,7 @@ public final class RangeDifferencer { int mstart= 0; int ystart= 0; - for (int i= 0; i < in.length; i++) { - RangeDifference es= in[i]; - + for (RangeDifference es : in) { rd= factory.createRangeDifference(RangeDifference.NOCHANGE, mstart, es.rightStart() - mstart, ystart, es.leftStart() - ystart); if (rd.maxLength() != 0) out.add(rd); @@ -375,9 +373,7 @@ public final class RangeDifferencer { int ystart= 0; int astart= 0; - for (int i= 0; i < in.length; i++) { - RangeDifference es= in[i]; - + for (RangeDifference es : in) { rd= factory.createRangeDifference(RangeDifference.NOCHANGE, mstart, es.rightStart() - mstart, ystart, es.leftStart() - ystart, astart, es.ancestorStart() - astart); if (rd.maxLength() > 0) out.add(rd); diff --git a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java index 9fd5fba76..1ad9cbd9c 100644 --- a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java +++ b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java @@ -438,8 +438,8 @@ public class WordMergeViewer extends AbstractMergeViewer implements IFlushable, private void firePropertyChange(String property, Object oldValue, Object newValue) { Object[] allListeners = listeners.getListeners(); final PropertyChangeEvent event = new PropertyChangeEvent(this, property, oldValue, newValue); - for (int i = 0; i < allListeners.length; i++) { - final IPropertyChangeListener listener = (IPropertyChangeListener)allListeners[i]; + for (Object allListener : allListeners) { + final IPropertyChangeListener listener = (IPropertyChangeListener) allListener; SafeRunner.run(new SafeRunnable() { public void run() throws Exception { listener.propertyChange(event); 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) { diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/Activator.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/Activator.java index 1604f2804..a115b9cf9 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/Activator.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/Activator.java @@ -130,8 +130,8 @@ public class Activator implements BundleActivator { if (status.isMultiStatus()) { IStatus[] children = status.getChildren(); - for (int i = 0; i < children.length; i++) { - childlist.add(getLog(children[i])); + for (IStatus child : children) { + childlist.add(getLog(child)); } } diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceManager.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceManager.java index d6bcc6860..1a47b6f04 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceManager.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceManager.java @@ -283,8 +283,7 @@ public class PreferenceManager { // migrate proxy data PreferenceManager instanceManager = PreferenceManager.createInstanceManager(instanceScope); - for (int i = 0; i < proxies.length; i++) { - ProxyType type = proxies[i]; + for (ProxyType type : proxies) { IProxyData data = type.getProxyData(ProxyType.DO_NOT_VERIFY); if (data.getHost() == null) { ProxyType instanceType = new ProxyType(type.getName(), instanceManager); @@ -315,8 +314,7 @@ public class PreferenceManager { if (httpProxyHost != null) { ProxyData proxyData = new ProxyData(IProxyData.HTTP_PROXY_TYPE, httpProxyHost, port, false, null); - for (int i = 0; i < proxies.length; i++) { - ProxyType type = proxies[i]; + for (ProxyType type : proxies) { if (type.getName().equals(proxyData.getType())) { type.updatePreferencesIfMissing(proxyData); } diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyManager.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyManager.java index 67a3b002d..d7453ea7f 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyManager.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyManager.java @@ -132,8 +132,7 @@ public class ProxyManager implements IProxyService, IPreferenceChangeListener { public void setNonProxiedHosts(String[] hosts) { checkMigrated(); Assert.isNotNull(hosts); - for (int i = 0; i < hosts.length; i++) { - String host = hosts[i]; + for (String host : hosts) { Assert.isNotNull(host); Assert.isTrue(host.length() > 0); } @@ -192,8 +191,7 @@ public class ProxyManager implements IProxyService, IPreferenceChangeListener { private IProxyData[] internalSetProxyData(IProxyData[] proxyDatas) { List<IProxyData> result = new ArrayList<>(); - for (int i = 0; i < proxyDatas.length; i++) { - IProxyData proxyData = proxyDatas[i]; + for (IProxyData proxyData : proxyDatas) { ProxyType type = getType(proxyData); if (type != null && type.setProxyData(proxyData)) { result.add(proxyData); @@ -203,8 +201,7 @@ public class ProxyManager implements IProxyService, IPreferenceChangeListener { } private ProxyType getType(IProxyData proxyData) { - for (int i = 0; i < proxies.length; i++) { - ProxyType type = proxies[i]; + for (ProxyType type : proxies) { if (type.getName().equals(proxyData.getType())) { return type; } @@ -252,8 +249,7 @@ public class ProxyManager implements IProxyService, IPreferenceChangeListener { } private void updateSystemProperties() { - for (int i = 0; i < proxies.length; i++) { - ProxyType type = proxies[i]; + for (ProxyType type : proxies) { type.updateSystemProperties(internalGetProxyData(type.getName(), ProxyType.DO_NOT_VERIFY)); } } @@ -262,8 +258,7 @@ public class ProxyManager implements IProxyService, IPreferenceChangeListener { checkMigrated(); preferenceManager.addPreferenceChangeListener(PreferenceManager.ROOT, this); // Now initialize each proxy type - for (int i = 0; i < proxies.length; i++) { - ProxyType type = proxies[i]; + for (ProxyType type : proxies) { type.initialize(); } registerAuthenticator(); @@ -276,8 +271,7 @@ public class ProxyManager implements IProxyService, IPreferenceChangeListener { } private IProxyData internalGetProxyData(String type, int verifySystemProperties) { - for (int i = 0; i < proxies.length; i++) { - ProxyType pt = proxies[i]; + for (ProxyType pt : proxies) { if (pt.getName().equals(type)) { return pt.getProxyData(verifySystemProperties); } @@ -303,8 +297,7 @@ public class ProxyManager implements IProxyService, IPreferenceChangeListener { return new IProxyData[0]; IProxyData[] data = getProxyData(); List<IProxyData> result = new ArrayList<>(); - for (int i = 0; i < data.length; i++) { - IProxyData proxyData = data[i]; + for (IProxyData proxyData : data) { if (proxyData.getHost() != null) result.add(proxyData); } @@ -326,8 +319,7 @@ public class ProxyManager implements IProxyService, IPreferenceChangeListener { private boolean isHostFiltered(URI uri) { String[] filters = getNonProxiedHosts(); - for (int i = 0; i < filters.length; i++) { - String filter = filters[i]; + for (String filter : filters) { if (StringUtil.hostMatchesFilter(uri.getHost(), filter)) return true; } @@ -350,8 +342,7 @@ public class ProxyManager implements IProxyService, IPreferenceChangeListener { } IProxyData[] data = getProxyDataForHost(host); - for (int i = 0; i < data.length; i++) { - IProxyData proxyData = data[i]; + for (IProxyData proxyData : data) { if (proxyData.getType().equalsIgnoreCase(type) && proxyData.getHost() != null) return resolveType(proxyData); @@ -457,8 +448,8 @@ public class ProxyManager implements IProxyService, IPreferenceChangeListener { if (data == null) { return null; } - for (int i = 0; i < data.length; i++) { - resolveType(data[i]); + for (IProxyData d : data) { + resolveType(d); } return data; } diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyType.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyType.java index d47165cc2..613733402 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyType.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyType.java @@ -104,9 +104,9 @@ public class ProxyType implements INodeChangeListener, IPreferenceChangeListener public static String[] convertPropertyStringToHosts(String property) { String hosts[] = StringUtil.split(property, new String[] { "|" }); //$NON-NLS-1$ ArrayList<String> ret = new ArrayList<>(); - for (int i = 0; i < hosts.length; i++) { - if (hosts[i].length() != 0) { - ret.add(hosts[i]); + for (String host : hosts) { + if (host.length() != 0) { + ret.add(host); } } return ret.toArray(new String[0]); @@ -436,9 +436,9 @@ public class ProxyType implements INodeChangeListener, IPreferenceChangeListener private IProxyData getProxyData(String type) { IProxyData data[] = ProxySelector.getProxyData(ProxySelector .getDefaultProvider()); - for (int i = 0; i < data.length; i++) { - if (data[i].getType().equalsIgnoreCase(type)) { - return data[i]; + for (IProxyData d : data) { + if (d.getType().equalsIgnoreCase(type)) { + return d; } } return new ProxyData(type, null, -1, false, null); diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/WindowsProxyProvider.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/WindowsProxyProvider.java index 8a45f5624..06ffc0dee 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/WindowsProxyProvider.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/WindowsProxyProvider.java @@ -55,8 +55,9 @@ public class WindowsProxyProvider extends AbstractProxyProvider { } if (Policy.DEBUG) { Policy.debug("WindowsProxyProvider#select result for [" + uri + "]"); //$NON-NLS-1$ //$NON-NLS-2$ - for (int i = 0; i < proxies.length; i++) - System.out.println(" " + proxies[i]); //$NON-NLS-1$ + for (IProxyData proxy : proxies) { + System.out.println(" " + proxy); //$NON-NLS-1$ + } } return proxies; } diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java index 097f08574..3f07bbe14 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java @@ -55,8 +55,8 @@ public class UnixProxyProvider extends AbstractProxyProvider { String[] nonProxyHosts = getNonProxiedHosts(); if (nonProxyHosts != null) { String host = uri.getHost(); - for (int npIndex = 0; npIndex < nonProxyHosts.length; npIndex++) { - if (StringUtil.hostMatchesFilter(host, nonProxyHosts[npIndex])) { + for (String nonProxyHost : nonProxyHosts) { + if (StringUtil.hostMatchesFilter(host, nonProxyHost)) { return new IProxyData[0]; } } @@ -70,8 +70,9 @@ public class UnixProxyProvider extends AbstractProxyProvider { } if (Policy.DEBUG) { Policy.debug("UnixProxyProvider#select result for [" + uri + "]"); //$NON-NLS-1$ //$NON-NLS-2$ - for (int i = 0; i < proxies.length; i++) - System.out.println(" " + proxies[i]); //$NON-NLS-1$ + for (IProxyData proxy : proxies) { + System.out.println(" " + proxy); //$NON-NLS-1$ + } } return proxies; } @@ -85,8 +86,7 @@ public class UnixProxyProvider extends AbstractProxyProvider { private IProxyData[] getProxyForTypes(String[] types) { ArrayList<IProxyData> allData = new ArrayList<>(); - for (int i = 0; i < types.length; i++) { - String type = types[i]; + for (String type : types) { ProxyData pd = getSystemProxyInfo(type); if (pd != null && pd.getHost() != null) { allData.add(pd); diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyBypass.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyBypass.java index 00dbc5dfc..30fa914a2 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyBypass.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyBypass.java @@ -68,8 +68,7 @@ public class ProxyBypass { * @return */ private boolean isInBypassList(String host) { - for (int i = 0; i < proxyBypassEntries.length; i++) { - String entry = proxyBypassEntries[i]; + for (String entry : proxyBypassEntries) { if (StringUtil.hostMatchesFilter(host, entry)) { return true; } diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/StaticProxyConfig.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/StaticProxyConfig.java index a1b3963dc..e1c0d08e3 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/StaticProxyConfig.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/StaticProxyConfig.java @@ -77,14 +77,14 @@ public class StaticProxyConfig { } else { IProxyData[] data = getUniversalProxiesData(); if (uri.getScheme() != null) { - for (int i = 0; i < data.length; i++) { - if (uri.getScheme().equalsIgnoreCase(data[i].getType())) { - proxies.add(data[i]); + for (IProxyData d : data) { + if (uri.getScheme().equalsIgnoreCase(d.getType())) { + proxies.add(d); } } } else { - for (int i = 0; i < data.length; i++) { - proxies.add(data[i]); + for (IProxyData d : data) { + proxies.add(d); } } } diff --git a/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/JSchCorePlugin.java b/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/JSchCorePlugin.java index fcc4a0bd0..2cbe82ef2 100644 --- a/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/JSchCorePlugin.java +++ b/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/JSchCorePlugin.java @@ -121,11 +121,9 @@ public class JSchCorePlugin extends Plugin{ String[] selected = Utils.getSelectedSSHAgent().split(","); //$NON-NLS-1$ IdentityRepository irepo = null; - for(int i=0; i<selected.length; i++){ - for(int j=0; j<repositories.length; j++){ - IdentityRepository _irepo = repositories[j]; - if(selected[i].equals(_irepo.getName()) && - _irepo.getStatus()==IdentityRepository.RUNNING){ + for(String s : selected) { + for(IdentityRepository _irepo : repositories) { + if(s.equals(_irepo.getName()) && _irepo.getStatus()==IdentityRepository.RUNNING) { irepo = _irepo; break; } @@ -153,8 +151,7 @@ public class JSchCorePlugin extends Plugin{ return new IdentityRepository[0]; ArrayList<IdentityRepository> tmp = new ArrayList<>(); - for(int i=0; i<extensions.length; i++){ - IExtension extension=extensions[i]; + for(IExtension extension : extensions) { IConfigurationElement[] configs=extension.getConfigurationElements(); if(configs.length==0){ JSchCorePlugin diff --git a/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/Utils.java b/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/Utils.java index 59bfc814a..d3bf31d5c 100644 --- a/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/Utils.java +++ b/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/Utils.java @@ -90,15 +90,15 @@ public class Utils{ String[] pkey=pkeys.split(","); //$NON-NLS-1$ String[] _pkey=current_pkeys.split(","); //$NON-NLS-1$ String result=""; //$NON-NLS-1$ - for(int i=0; i<pkey.length; i++){ - file=new java.io.File(pkey[i]); + for(String p : pkey){ + file=new java.io.File(p); if(!file.isAbsolute()){ - file=new java.io.File(ssh_home, pkey[i]); + file=new java.io.File(ssh_home, p); } if(file.exists()){ boolean notyet=true; - for(int j=0; j<_pkey.length; j++){ - if(pkey[i].equals(_pkey[j])){ + for(String _p : _pkey){ + if(p.equals(_p)){ notyet=false; break; } @@ -107,10 +107,10 @@ public class Utils{ if(notyet) jsch.addIdentity(file.getPath()); if(result.length()==0){ - result=pkey[i]; + result=p; } else{ - result+=(","+pkey[i]); //$NON-NLS-1$ + result+=(","+p); //$NON-NLS-1$ } } catch(JSchException e){ diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java index 6544592a8..d96831e5d 100644 --- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java +++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java @@ -259,8 +259,7 @@ protected Control createContents(Composite parent){ dir+=java.io.File.separator; } - for(int i=0; i<files.length; i++){ - String foo=files[i]; + for (String foo : files) { if(keys.length()!=0) keys=keys+","; //$NON-NLS-1$ keys=keys+dir+foo; @@ -788,10 +787,10 @@ protected Control createContents(Composite parent){ // Check if the generated key has been included in pkeys? String[] pkeysa=pkeys.split(","); //$NON-NLS-1$ - for(int i=0; i<pkeysa.length; i++){ - File pkey=new java.io.File(pkeysa[i]); - if(!pkey.isAbsolute()){ - pkey=new java.io.File(home, pkeysa[i]); + for (String p : pkeysa) { + File pkey = new java.io.File(p); + if (!pkey.isAbsolute()) { + pkey = new java.io.File(home, p); } if(pkey.equals(mypkey)) return; @@ -1069,11 +1068,10 @@ protected Control createContents(Composite parent){ Set<String> smethods = new HashSet<>(Arrays.asList(methods)); String[] order = Utils.getMethodsOrder().split(","); //$NON-NLS-1$ - - for(int i=0; i<order.length; i++){ + for (String o : order) { TableItem tableItem= new TableItem(preferedAuthMethodTable, SWT.NONE); - tableItem.setText(0, order[i]); - if(smethods.contains(order[i])){ + tableItem.setText(0, o); + if (smethods.contains(o)) { tableItem.setChecked(true); } } @@ -1198,11 +1196,10 @@ protected Control createContents(Composite parent){ Set<String> smethods = new HashSet<>(Arrays.asList(methods)); String[] order = Utils.getKEXMethodsOrder().split(","); //$NON-NLS-1$ - - for(int i=0; i<order.length; i++){ + for (String o : order) { TableItem tableItem= new TableItem(preferedKeyExchangeMethodTable, SWT.NONE); - tableItem.setText(0, order[i]); - if(smethods.contains(order[i])){ + tableItem.setText(0, o); + if (smethods.contains(o)) { tableItem.setChecked(true); } } @@ -1351,14 +1348,14 @@ protected Control createContents(Composite parent){ preferedSSHAgentTable.removeAll(); String[] methods = Utils.getAvailableSSHAgents().split(","); //$NON-NLS-1$ String[] selected = Utils.getSelectedSSHAgent().split(","); //$NON-NLS-1$ - - for(int i=0; i<methods.length; i++){ - if(methods[i].length()==0) + for (String method : methods) { + if (method.length() == 0) { continue; + } TableItem tableItem= new TableItem(preferedSSHAgentTable, SWT.NONE); - tableItem.setText(0, methods[i]); - for(int j=0; j<selected.length; j++){ - if(selected[j].equals(methods[i])){ + tableItem.setText(0, method); + for (String s : selected) { + if (s.equals(method)) { tableItem.setChecked(true); break; } @@ -1372,11 +1369,10 @@ protected Control createContents(Composite parent){ Set<String> smethods = new HashSet<>(Arrays.asList(methods)); String[] order = Utils.getMACMethodsOrder().split(","); //$NON-NLS-1$ - - for(int i=0; i<order.length; i++){ + for (String o : order) { TableItem tableItem= new TableItem(preferedMACMethodTable, SWT.NONE); - tableItem.setText(0, order[i]); - if(smethods.contains(order[i])){ + tableItem.setText(0, o); + if (smethods.contains(o)) { tableItem.setChecked(true); } } diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/SWTUtils.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/SWTUtils.java index 8523a9c16..7a619885f 100644 --- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/SWTUtils.java +++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/SWTUtils.java @@ -254,8 +254,8 @@ public class SWTUtils { public static int getWidthInCharsForLongest(PixelConverter converter, String [] strings) { int minimum= 0; - for (int i = 0; i < strings.length; i++) { - final int length= converter.convertWidthInCharsToPixels(strings[i].length()); + for (String string : strings) { + final int length = converter.convertWidthInCharsToPixels(string.length()); if (minimum < length) minimum= length; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetCapability.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetCapability.java index 63c86bd0c..1c3bbcc46 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetCapability.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetCapability.java @@ -240,8 +240,7 @@ public abstract class ProjectSetCapability { // Build a collection of existing projects final Collection<IProject> existingProjects = new ArrayList<>(); - for (int i = 0; i < projects.length; i++) { - IProject eachProj = projects[i]; + for (IProject eachProj : projects) { if (eachProj.exists()) { existingProjects.add(eachProj); } else if (new File(eachProj.getParent().getLocation().toFile(), eachProj.getName()).exists()) { @@ -267,8 +266,7 @@ public abstract class ProjectSetCapability { Collection<IProject> result = new ArrayList<>(projects.length); result.addAll(Arrays.asList(projects)); result.removeAll(existingProjects); - for (int i = 0; i < confirmed.length; i++) { - IProject eachProj = confirmed[i]; + for (IProject eachProj : confirmed) { if (existingProjects.contains(eachProj)) result.add(eachProj); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProvider.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProvider.java index 8e4ba1259..9ce34692a 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProvider.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProvider.java @@ -222,8 +222,7 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable { if (!provider.canHandleLinkedResources()) { try { IResource[] members = project.members(); - for (int i = 0; i < members.length; i++) { - IResource resource = members[i]; + for (IResource resource : members) { if (resource.isLinked()) { throw new TeamException(new Status(IStatus.ERROR, TeamPlugin.ID, IResourceStatus.LINKING_NOT_ALLOWED, NLS.bind(Messages.RepositoryProvider_linkedResourcesExist, new String[] { project.getName(), id }), null)); } @@ -502,13 +501,12 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable { Set<String> teamSet = new HashSet<>(); teamSet.addAll(AllProviderTypeIds); // add in all the ones we know via extension point - //fall back to old method of nature ID to find any for backwards compatibility - for (int i = 0; i < desc.length; i++) { - String[] setIds = desc[i].getNatureSetIds(); - for (int j = 0; j < setIds.length; j++) { - if(setIds[j].equals(TEAM_SETID)) { - teamSet.add(desc[i].getNatureId()); + for (IProjectNatureDescriptor d : desc) { + String[] setIds = d.getNatureSetIds(); + for (String setId : setIds) { + if (setId.equals(TEAM_SETID)) { + teamSet.add(d.getNatureId()); } } } @@ -550,14 +548,14 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable { IWorkspace workspace = ResourcesPlugin.getWorkspace(); // for every nature id on this project, find it's natures sets and check if it is // in the team set. - for (int i = 0; i < natureIds.length; i++) { - IProjectNatureDescriptor desc = workspace.getNatureDescriptor(natureIds[i]); + for (String natureId : natureIds) { + IProjectNatureDescriptor desc = workspace.getNatureDescriptor(natureId); // The descriptor can be null if the nature doesn't exist if (desc != null) { String[] setIds = desc.getNatureSetIds(); - for (int j = 0; j < setIds.length; j++) { - if(setIds[j].equals(TEAM_SETID)) { - return getProvider(project, natureIds[i]); + for (String setId : setIds) { + if (setId.equals(TEAM_SETID)) { + return getProvider(project, natureId); } } } @@ -631,8 +629,8 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable { return null; String[] setIds = desc.getNatureSetIds(); - for (int i = 0; i < setIds.length; i++) { - if(setIds[i].equals(TEAM_SETID)) { + for (String setId : setIds) { + if (setId.equals(TEAM_SETID)) { return (RepositoryProvider)project.getNature(id); } } @@ -714,10 +712,10 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable { IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(TeamPlugin.ID, TeamPlugin.REPOSITORY_EXTENSION); if (extension != null) { IExtension[] extensions = extension.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement [] configElements = extensions[i].getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { - String extensionId = configElements[j].getAttribute("id"); //$NON-NLS-1$ + for (IExtension e : extensions) { + IConfigurationElement[] configElements = e.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + String extensionId = configElement.getAttribute("id"); //$NON-NLS-1$ allIDs.add(extensionId); } } @@ -732,17 +730,17 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable { IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(TeamPlugin.ID, TeamPlugin.REPOSITORY_EXTENSION); if (extension != null) { IExtension[] extensions = extension.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement [] configElements = extensions[i].getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { - String extensionId = configElements[j].getAttribute("id"); //$NON-NLS-1$ + for (IExtension ext : extensions) { + IConfigurationElement[] configElements = ext.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + String extensionId = configElement.getAttribute("id"); //$NON-NLS-1$ if (extensionId != null && extensionId.equals(id)) { try { - return (RepositoryProvider) configElements[j].createExecutableExtension("class"); //$NON-NLS-1$ + return (RepositoryProvider) configElement.createExecutableExtension("class"); //$NON-NLS-1$ } catch (CoreException e) { TeamPlugin.log(e); } catch (ClassCastException e) { - String className = configElements[j].getAttribute("class"); //$NON-NLS-1$ + String className = configElement.getAttribute("class"); //$NON-NLS-1$ TeamPlugin.log(IStatus.ERROR, NLS.bind(Messages.RepositoryProvider_invalidClass, new String[] { id, className }), e); } return null; diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProviderType.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProviderType.java index 62ca83791..ac06da4d5 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProviderType.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProviderType.java @@ -14,7 +14,6 @@ package org.eclipse.team.core; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import org.eclipse.core.resources.IContainer; @@ -107,8 +106,7 @@ public abstract class RepositoryProviderType extends PlatformObject { * @since 3.2 */ public static RepositoryProviderType getTypeForScheme(String scheme) { - for (Iterator iter = allProviderTypes.values().iterator(); iter.hasNext();) { - RepositoryProviderType type = (RepositoryProviderType) iter.next(); + for (RepositoryProviderType type : allProviderTypes.values()) { if (type.getFileSystemScheme() != null && type.getFileSystemScheme().equals(scheme)) return type; } @@ -119,11 +117,11 @@ public abstract class RepositoryProviderType extends PlatformObject { IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(TeamPlugin.ID, TeamPlugin.REPOSITORY_EXTENSION); if (extension != null) { IExtension[] extensions = extension.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement [] configElements = extensions[i].getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { - String extensionId = configElements[j].getAttribute("id"); //$NON-NLS-1$ - String typeScheme = configElements[j].getAttribute("fileSystemScheme"); //$NON-NLS-1$ + for (IExtension ext : extensions) { + IConfigurationElement[] configElements = ext.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + String extensionId = configElement.getAttribute("id"); //$NON-NLS-1$ + String typeScheme = configElement.getAttribute("fileSystemScheme"); //$NON-NLS-1$ if (typeScheme != null && typeScheme.equals(scheme) && extensionId != null) { return newProviderType(extensionId); } @@ -141,30 +139,28 @@ public abstract class RepositoryProviderType extends PlatformObject { IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(TeamPlugin.ID, TeamPlugin.REPOSITORY_EXTENSION); if (extension != null) { IExtension[] extensions = extension.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement [] configElements = extensions[i].getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { - String extensionId = configElements[j].getAttribute("id"); //$NON-NLS-1$ - + for (IExtension ext : extensions) { + IConfigurationElement[] configElements = ext.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + String extensionId = configElement.getAttribute("id"); //$NON-NLS-1$ if (extensionId != null && extensionId.equals(id)) { try { RepositoryProviderType providerType; //Its ok not to have a typeClass extension. In this case, a default instance will be created. - if(configElements[j].getAttribute("typeClass") == null) { //$NON-NLS-1$ + if (configElement.getAttribute("typeClass") == null) { //$NON-NLS-1$ providerType = new DefaultRepositoryProviderType(); } else { - providerType = (RepositoryProviderType) configElements[j].createExecutableExtension("typeClass"); //$NON-NLS-1$ + providerType = (RepositoryProviderType) configElement.createExecutableExtension("typeClass"); //$NON-NLS-1$ } - providerType.setID(id); allProviderTypes.put(id, providerType); - String scheme = configElements[j].getAttribute("fileSystemScheme"); //$NON-NLS-1$ + String scheme = configElement.getAttribute("fileSystemScheme"); //$NON-NLS-1$ providerType.setFileSystemScheme(scheme); return providerType; } catch (CoreException e) { TeamPlugin.log(e); } catch (ClassCastException e) { - String className = configElements[j].getAttribute("typeClass"); //$NON-NLS-1$ + String className = configElement.getAttribute("typeClass"); //$NON-NLS-1$ TeamPlugin.log(IStatus.ERROR, "Class " + className + " registered for repository provider type id " + id + " is not a subclass of RepositoryProviderType", e); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } return null; diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java index d65e49f24..d25103c29 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java @@ -156,12 +156,14 @@ public final class Team { private static boolean matchesEnabledIgnore(IResource resource) { StringMatcher[] matchers = getStringMatchers(); - for (int i = 0; i < matchers.length; i++) { + for (StringMatcher matcher : matchers) { String resourceName = resource.getName(); - if(matchers[i].isPathPattern()) { + if (matcher.isPathPattern()) { resourceName = resource.getFullPath().toString(); } - if (matchers[i].match(resourceName)) return true; + if (matcher.match(resourceName)) { + return true; + } } return false; } @@ -249,9 +251,9 @@ public final class Team { if (ignoreMatchers==null) { IIgnoreInfo[] ignorePatterns = getAllIgnores(); ArrayList<StringMatcher> matchers = new ArrayList<>(ignorePatterns.length); - for (int i = 0; i < ignorePatterns.length; i++) { - if (ignorePatterns[i].getEnabled()) { - matchers.add(new StringMatcher(ignorePatterns[i].getPattern(), true, false)); + for (IIgnoreInfo ignorePattern : ignorePatterns) { + if (ignorePattern.getEnabled()) { + matchers.add(new StringMatcher(ignorePattern.getPattern(), true, false)); } } ignoreMatchers = new StringMatcher[matchers.size()]; @@ -295,13 +297,11 @@ public final class Team { } // Now set into preferences StringBuilder buf = new StringBuilder(); - Iterator e = globalIgnore.entrySet().iterator(); - while (e.hasNext()) { - Map.Entry entry = (Entry) e.next(); + for (Map.Entry entry : globalIgnore.entrySet()) { String pattern = (String) entry.getKey(); Boolean value = (Boolean) entry.getValue(); boolean isCustom = (!pluginIgnore.containsKey(pattern)) || - !pluginIgnore.get(pattern).equals(value); + !pluginIgnore.get(pattern).equals(value); if (isCustom) { buf.append(pattern); buf.append(PREF_TEAM_SEPARATOR); @@ -309,7 +309,6 @@ public final class Team { buf.append(en); buf.append(PREF_TEAM_SEPARATOR); } - } TeamPlugin.getPlugin().getPluginPreferences().setValue(PREF_TEAM_IGNORES, buf.toString()); } @@ -328,15 +327,15 @@ public final class Team { IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(TeamPlugin.ID, TeamPlugin.IGNORE_EXTENSION); if (extension != null) { IExtension[] extensions = extension.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement [] configElements = extensions[i].getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { - String pattern = configElements[j].getAttribute("pattern"); //$NON-NLS-1$ + for (IExtension ext : extensions) { + IConfigurationElement[] configElements = ext.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + String pattern = configElement.getAttribute("pattern"); //$NON-NLS-1$ if (pattern != null) { - String selected = configElements[j].getAttribute("enabled"); //$NON-NLS-1$ + String selected = configElement.getAttribute("enabled"); //$NON-NLS-1$ if (selected == null) { // Check for selected because this used to be the field name - selected = configElements[j].getAttribute("selected"); //$NON-NLS-1$ + selected = configElement.getAttribute("selected"); //$NON-NLS-1$ } boolean enabled = selected != null && selected.equalsIgnoreCase("true"); //$NON-NLS-1$ @@ -382,17 +381,15 @@ public final class Team { String patternToFind, IExtension[] extensions) { StringBuilder sb = new StringBuilder(); boolean isFirst = true; - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement[] configElements = extensions[i] - .getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { - if (patternToFind.equals(configElements[j] - .getAttribute("pattern"))) { //$NON-NLS-1$ + for (IExtension extension : extensions) { + IConfigurationElement[] configElements = extension.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + if (patternToFind.equals(configElement.getAttribute("pattern"))) { //$NON-NLS-1$ if (!isFirst) { sb.append(", "); //$NON-NLS-1$ } isFirst = false; - sb.append(extensions[i].getContributor().getName()); + sb.append(extension.getContributor().getName()); } } } @@ -494,13 +491,13 @@ public final class Team { IExtensionPoint extension = RegistryFactory.getRegistry().getExtensionPoint(TeamPlugin.ID, TeamPlugin.PROJECT_SET_EXTENSION); if (extension != null) { IExtension[] extensions = extension.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement [] configElements = extensions[i].getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { - String extensionId = configElements[j].getAttribute("id"); //$NON-NLS-1$ + for (IExtension ext : extensions) { + IConfigurationElement[] configElements = ext.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + String extensionId = configElement.getAttribute("id"); //$NON-NLS-1$ if (extensionId != null && extensionId.equals(id)) { try { - return (IProjectSetSerializer)configElements[j].createExecutableExtension("class"); //$NON-NLS-1$ + return (IProjectSetSerializer) configElement.createExecutableExtension("class"); //$NON-NLS-1$ } catch (CoreException e) { TeamPlugin.log(e); return null; @@ -642,8 +639,8 @@ public final class Team { IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(TeamPlugin.EXTENSION_POINT_BUNDLE_IMPORTERS); if (point != null) { IConfigurationElement[] infos = point.getConfigurationElements(); - for (int i = 0; i < infos.length; i++) { - fBundleImporters.add(new BundleImporterExtension(infos[i])); + for (IConfigurationElement info : infos) { + fBundleImporters.add(new BundleImporterExtension(info)); } } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java index 6163c84ba..5cb113a49 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java @@ -15,7 +15,6 @@ package org.eclipse.team.core.diff.provider; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.Map; import java.util.Set; @@ -93,8 +92,7 @@ public class DiffTree implements IDiffTree { if (depth == IResource.DEPTH_ZERO) return; IPath[] children = getChildren(path); - for (int i = 0; i < children.length; i++) { - IPath child = children[i]; + for (IPath child : children) { accept(child, visitor, depth == IResource.DEPTH_ONE ? IResource.DEPTH_ZERO : IResource.DEPTH_INFINITE); } } @@ -244,8 +242,8 @@ public class DiffTree implements IDiffTree { if(event.isEmpty() && ! event.isReset() && propertyChanges.isEmpty()) return; Object[] listeners = this.listeners.getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IDiffChangeListener listener = (IDiffChangeListener)listeners[i]; + for (Object l : listeners) { + final IDiffChangeListener listener = (IDiffChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -257,8 +255,7 @@ public class DiffTree implements IDiffTree { lockedForModification = true; if (!event.isEmpty() || event.isReset()) listener.diffsChanged(event, Policy.subMonitorFor(monitor, 100)); - for (Iterator<Integer> iter = propertyChanges.keySet().iterator(); iter.hasNext();) { - Integer key = iter.next(); + for (Integer key : propertyChanges.keySet()) { Set<IPath> paths = propertyChanges.get(key); listener.propertyChanged(DiffTree.this, key.intValue(), paths.toArray(new IPath[paths .size()])); @@ -371,8 +368,7 @@ public class DiffTree implements IDiffTree { changes = new HashSet<>(); propertyChanges.put(key, changes); } - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { changes.add(path); } } @@ -386,8 +382,7 @@ public class DiffTree implements IDiffTree { public void setBusy(IDiff[] diffs, IProgressMonitor monitor) { try { beginInput(); - for (int i = 0; i < diffs.length; i++) { - IDiff node = diffs[i]; + for (IDiff node : diffs) { setPropertyToRoot(node, P_BUSY_HINT, true); } } finally { @@ -400,8 +395,7 @@ public class DiffTree implements IDiffTree { try { beginInput(); IPath[] paths = pathTree.getPaths(); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { IPath[] changed = pathTree.setPropogatedProperty(path, P_BUSY_HINT, false); accumulatePropertyChanges(P_BUSY_HINT, changed); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/importing/provisional/BundleImporterDelegate.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/importing/provisional/BundleImporterDelegate.java index 1915ad01a..e5e43281e 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/importing/provisional/BundleImporterDelegate.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/importing/provisional/BundleImporterDelegate.java @@ -67,8 +67,7 @@ public abstract class BundleImporterDelegate implements IBundleImporterDelegate if (getSupportedValues().contains(prefix)) { try { ManifestElement[] elements = ManifestElement.parseHeader(ECLIPSE_SOURCE_REFERENCES, value); - for (int j = 0; j < elements.length; j++) { - ManifestElement element = elements[j]; + for (ManifestElement element : elements) { String url = element.toString(); String project = element.getAttribute(ATTR_PROJECT); if (project == null) { @@ -97,8 +96,7 @@ public abstract class BundleImporterDelegate implements IBundleImporterDelegate IProject[] result = null; if (psfCapability != null) { // collect and validate all header values - for (int i = 0; i < descriptions.length; i++) { - ScmUrlImportDescription description = descriptions[i]; + for (ScmUrlImportDescription description : descriptions) { references.add(psfCapability.asReference(description.getUri(), description.getProject())); } // create projects diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ChangeTracker.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ChangeTracker.java index c3d6cd6a1..dbf9c7b75 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ChangeTracker.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ChangeTracker.java @@ -59,8 +59,7 @@ public abstract class ChangeTracker { if (disposed) return; IResourceDelta delta = event.getDelta(); IResourceDelta[] projectDeltas = delta.getAffectedChildren(IResourceDelta.ADDED | IResourceDelta.CHANGED | IResourceDelta.REMOVED); - for (int i = 0; i < projectDeltas.length; i++) { - IResourceDelta projectDelta = projectDeltas[i]; + for (IResourceDelta projectDelta : projectDeltas) { IResource resource = projectDelta.getResource(); if (resource.getType() == IResource.PROJECT) { IProject project = (IProject)resource; @@ -117,8 +116,7 @@ public abstract class ChangeTracker { ResourcesPlugin.getWorkspace().addResourceChangeListener(changeListener, IResourceChangeEvent.POST_CHANGE); RepositoryProviderManager.getInstance().addListener(changeListener); IProject[] allProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); - for (int i = 0; i < allProjects.length; i++) { - IProject project = allProjects[i]; + for (IProject project : allProjects) { if (isProjectOfInterest(project)) trackProject(project); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ResourceMappingMerger.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ResourceMappingMerger.java index b3c994661..702087800 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ResourceMappingMerger.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ResourceMappingMerger.java @@ -71,11 +71,9 @@ public abstract class ResourceMappingMerger implements IResourceMappingMerger { public ISchedulingRule getMergeRule(IMergeContext context) { ResourceMapping[] mappings = context.getScope().getMappings(getModelProvider().getId()); ISchedulingRule rule = null; - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { IProject[] mappingProjects = mapping.getProjects(); - for (int j = 0; j < mappingProjects.length; j++) { - IProject project = mappingProjects[j]; + for (IProject project : mappingProjects) { if (rule == null) { rule = project; } else { @@ -105,12 +103,10 @@ public abstract class ResourceMappingMerger implements IResourceMappingMerger { private IDiff[] getSetToMerge(IMergeContext mergeContext) { ResourceMapping[] mappings = mergeContext.getScope().getMappings(getModelProvider().getDescriptor().getId()); Set<IDiff> result = new HashSet<>(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { ResourceTraversal[] traversals = mergeContext.getScope().getTraversals(mapping); IDiff[] deltas = mergeContext.getDiffTree().getDiffs(traversals); - for (int j = 0; j < deltas.length; j++) { - IDiff delta = deltas[j]; + for (IDiff delta : deltas) { result.add(delta); } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java index 5a29fe4ea..41ff492e5 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java @@ -86,8 +86,7 @@ public abstract class MergeContext extends SynchronizationContext implements IMe @Override public void reject(final IDiff[] diffs, IProgressMonitor monitor) throws CoreException { run(monitor1 -> { - for (int i = 0; i < diffs.length; i++) { - IDiff node = diffs[i]; + for (IDiff node : diffs) { reject(node, monitor1); } }, getMergeRule(diffs), IResource.NONE, monitor); @@ -96,8 +95,7 @@ public abstract class MergeContext extends SynchronizationContext implements IMe @Override public void markAsMerged(final IDiff[] nodes, final boolean inSyncHint, IProgressMonitor monitor) throws CoreException { run(monitor1 -> { - for (int i = 0; i < nodes.length; i++) { - IDiff node = nodes[i]; + for (IDiff node : nodes) { markAsMerged(node, inSyncHint, monitor1); } }, getMergeRule(nodes), IResource.NONE, monitor); @@ -109,8 +107,7 @@ public abstract class MergeContext extends SynchronizationContext implements IMe run(monitor1 -> { try { monitor1.beginTask(null, deltas.length * 100); - for (int i = 0; i < deltas.length; i++) { - IDiff delta = deltas[i]; + for (IDiff delta : deltas) { IStatus s = merge(delta, force, Policy.subMonitorFor(monitor1, 100)); if (!s.isOK()) { if (s.getCode() == IMergeStatus.CONFLICTS) { @@ -459,8 +456,7 @@ public abstract class MergeContext extends SynchronizationContext implements IMe @Override public ISchedulingRule getMergeRule(IDiff[] deltas) { ISchedulingRule result = null; - for (int i = 0; i < deltas.length; i++) { - IDiff node = deltas[i]; + for (IDiff node : deltas) { ISchedulingRule rule = getMergeRule(node); if (result == null) { result = rule; diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/ResourceDiffTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/ResourceDiffTree.java index 5926d6dcd..0f7bf3ebb 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/ResourceDiffTree.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/ResourceDiffTree.java @@ -83,11 +83,9 @@ public class ResourceDiffTree extends DiffTree implements IResourceDiffTree { @Override public void accept(ResourceTraversal[] traversals, IDiffVisitor visitor) { - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); - for (int j = 0; j < resources.length; j++) { - IResource resource = resources[j]; + for (IResource resource : resources) { accept(resource.getFullPath(), visitor, traversal.getDepth()); } } @@ -96,11 +94,9 @@ public class ResourceDiffTree extends DiffTree implements IResourceDiffTree { @Override public IDiff[] getDiffs(final ResourceTraversal[] traversals) { final Set<IDiff> result = new HashSet<>(); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); - for (int j = 0; j < resources.length; j++) { - IResource resource = resources[j]; + for (IResource resource : resources) { internalGetDiffs(resource, traversal.getDepth(), result); } } @@ -131,8 +127,7 @@ public class ResourceDiffTree extends DiffTree implements IResourceDiffTree { public IResource[] members(IResource resource) { List<IResource> result = new ArrayList<>(); IPath[] paths = getChildren(resource.getFullPath()); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { IDiff node = getDiff(path); if (node == null) { result.add(internalGetResource(path, true)); @@ -147,8 +142,7 @@ public class ResourceDiffTree extends DiffTree implements IResourceDiffTree { public IResource[] getAffectedResources() { List<IResource> result = new ArrayList<>(); IDiff[] nodes = getDiffs(); - for (int i = 0; i < nodes.length; i++) { - IDiff node = nodes[i]; + for (IDiff node : nodes) { result.add(getResource(node)); } return result.toArray(new IResource[result.size()]); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationScopeManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationScopeManager.java index b66e9021d..b6c694a8e 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationScopeManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationScopeManager.java @@ -99,8 +99,7 @@ public class SynchronizationScopeManager extends PlatformObject implements ISync Set<ResourceMapping> result = new HashSet<>(); IModelProviderDescriptor[] descriptors = ModelProvider .getModelProviderDescriptors(); - for (int i = 0; i < descriptors.length; i++) { - IModelProviderDescriptor descriptor = descriptors[i]; + for (IModelProviderDescriptor descriptor : descriptors) { ResourceMapping[] mappings = getMappings(descriptor, traversals, context, monitor); result.addAll(Arrays.asList(mappings)); @@ -153,8 +152,7 @@ public class SynchronizationScopeManager extends PlatformObject implements ISync public ISchedulingRule getSchedulingRule() { Set<IProject> projects = new HashSet<>(); ResourceMapping[] mappings = scope.getInputMappings(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { Object modelObject = mapping.getModelObject(); if (modelObject instanceof IResource) { IResource resource = (IResource) modelObject; @@ -229,8 +227,7 @@ public class SynchronizationScopeManager extends PlatformObject implements ISync ScopeChangeEvent change = new ScopeChangeEvent(scope); CompoundResourceTraversal refreshTraversals = new CompoundResourceTraversal(); CompoundResourceTraversal removedTraversals = new CompoundResourceTraversal(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { ResourceTraversal[] previousTraversals = scope.getTraversals(mapping); ResourceTraversal[] mappingTraversals = mapping.getTraversals( context, Policy.subMonitorFor(monitor, 100)); @@ -289,8 +286,7 @@ public class SynchronizationScopeManager extends PlatformObject implements ISync private ResourceMapping findAncestor(ResourceMapping mapping) { ResourceMapping[] mappings = scope.getMappings(mapping.getModelProviderId()); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping m = mappings[i]; + for (ResourceMapping m : mappings) { if (m.contains(mapping)) { return m; } @@ -389,8 +385,7 @@ public class SynchronizationScopeManager extends PlatformObject implements ISync IProgressMonitor monitor) throws CoreException { CompoundResourceTraversal result = new CompoundResourceTraversal(); ResourceMappingContext context = this.context; - for (int i = 0; i < targetMappings.length; i++) { - ResourceMapping mapping = targetMappings[i]; + for (ResourceMapping mapping : targetMappings) { if (scope.getTraversals(mapping) == null) { ResourceTraversal[] traversals = mapping.getTraversals(context, Policy.subMonitorFor(monitor, 100)); @@ -421,12 +416,10 @@ public class SynchronizationScopeManager extends PlatformObject implements ISync ResourceMapping[] mappings = scope.getMappings(); if (inputMappings.length == mappings.length) { Set<ResourceMapping> testSet = new HashSet<>(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { testSet.add(mapping); } - for (int i = 0; i < inputMappings.length; i++) { - ResourceMapping mapping = inputMappings[i]; + for (ResourceMapping mapping : inputMappings) { if (!testSet.contains(mapping)) { return true; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java index 4896b3421..3a3271f22 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java @@ -265,8 +265,7 @@ abstract public class Subscriber { public void collectOutOfSync(IResource[] resources, int depth, SyncInfoSet set, IProgressMonitor monitor) { try { monitor.beginTask(null, 100 * resources.length); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { IProgressMonitor subMonitor = Policy.subMonitorFor(monitor, 100); subMonitor.beginTask(null, IProgressMonitor.UNKNOWN); collect(resource, depth, set, subMonitor); @@ -290,8 +289,7 @@ abstract public class Subscriber { allListeners = listeners.toArray(new ISubscriberChangeListener[listeners.size()]); } // Notify the listeners safely so all will receive notification - for (int i = 0; i < allListeners.length; i++) { - final ISubscriberChangeListener listener = allListeners[i]; + for (ISubscriberChangeListener listener : allListeners) { SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -322,14 +320,10 @@ abstract public class Subscriber { && depth != IResource.DEPTH_ZERO) { try { IResource[] members = members(resource); - for (int i = 0; i < members.length; i++) { - collect( - members[i], - depth == IResource.DEPTH_INFINITE + for (IResource member : members) { + collect(member, depth == IResource.DEPTH_INFINITE ? IResource.DEPTH_INFINITE - : IResource.DEPTH_ZERO, - set, - monitor); + : IResource.DEPTH_ZERO, set, monitor); } } catch (TeamException e) { set.addError(new TeamStatus(IStatus.ERROR, TeamPlugin.ID, ITeamStatus.SYNC_INFO_SET_ERROR, NLS.bind(Messages.SubscriberEventHandler_8, new String[] { resource.getFullPath().toString(), e.getMessage() }), e, resource)); @@ -406,8 +400,7 @@ abstract public class Subscriber { * @since 3.2 */ public void accept(ResourceTraversal[] traversals, IDiffVisitor visitor) throws CoreException { - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { accept(traversal.getResources(), traversal.getDepth(), visitor); } } @@ -434,8 +427,7 @@ abstract public class Subscriber { * @since 3.2 */ public void accept(IResource[] resources, int depth, IDiffVisitor visitor) throws CoreException { - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { accept(resource, depth, visitor); } } @@ -449,8 +441,7 @@ abstract public class Subscriber { if (depth != IResource.DEPTH_ZERO) { IResource[] members = members(resource); int newDepth = depth == IResource.DEPTH_INFINITE ? IResource.DEPTH_INFINITE : IResource.DEPTH_ZERO; - for (int i = 0; i < members.length; i++) { - IResource member = members[i]; + for (IResource member : members) { accept(member, newDepth, visitor); } } @@ -476,8 +467,7 @@ abstract public class Subscriber { */ public void refresh(ResourceTraversal[] traversals, IProgressMonitor monitor) throws TeamException { monitor.beginTask(null, 100 * traversals.length); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { refresh(traversal.getResources(), traversal.getDepth(), Policy.subMonitorFor(monitor, 100)); } monitor.done(); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberResourceMappingContext.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberResourceMappingContext.java index b1f3d8817..695368f5a 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberResourceMappingContext.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberResourceMappingContext.java @@ -148,8 +148,7 @@ public class SubscriberResourceMappingContext extends RemoteResourceMappingConte @Override public final void refresh(ResourceTraversal[] traversals, int flags, IProgressMonitor monitor) throws CoreException { subscriber.refresh(traversals, monitor); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { refreshed(traversal.getResources(), traversal.getDepth()); } } @@ -178,8 +177,7 @@ public class SubscriberResourceMappingContext extends RemoteResourceMappingConte * @param depth the depth to which the resources were refreshed */ protected final void refreshed(IResource[] resources, int depth) { - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { // Include files and depth-one folders as shallow if (depth == IResource.DEPTH_ONE || resource.getType() == IResource.FILE) { shallowRefresh.add(resource); @@ -293,8 +291,7 @@ public class SubscriberResourceMappingContext extends RemoteResourceMappingConte public IProject[] getProjects() { Set<IProject> projects = new HashSet<>(); IResource[] roots = subscriber.roots(); - for (int i = 0; i < roots.length; i++) { - IResource resource = roots[i]; + for (IResource resource : roots) { projects.add(resource.getProject()); } return projects.toArray(new IProject[projects.size()]); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/FastSyncInfoFilter.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/FastSyncInfoFilter.java index 87342d7a5..aed94334d 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/FastSyncInfoFilter.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/FastSyncInfoFilter.java @@ -73,8 +73,7 @@ public class FastSyncInfoFilter extends SyncInfoFilter { } @Override public boolean select(SyncInfo info) { - for (int i = 0; i < filters.length; i++) { - FastSyncInfoFilter filter = filters[i]; + for (FastSyncInfoFilter filter : filters) { if (!filter.select(info)) { return false; } @@ -116,8 +115,7 @@ public class FastSyncInfoFilter extends SyncInfoFilter { } @Override public boolean select(SyncInfo info) { - for (int i = 0; i < filters.length; i++) { - FastSyncInfoFilter filter = filters[i]; + for (FastSyncInfoFilter filter : filters) { if (filter.select(info)) { return true; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoSet.java index beb723704..6e3a12b3d 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoSet.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoSet.java @@ -78,8 +78,8 @@ public class SyncInfoSet { public SyncInfoSet(SyncInfo[] infos) { this(); // use the internal add since we can't have listeners at this point anyway - for (int i = 0; i < infos.length; i++) { - internalAdd(infos[i]); + for (SyncInfo info : infos) { + internalAdd(info); } } @@ -102,8 +102,7 @@ public class SyncInfoSet { public IResource[] getResources() { SyncInfo[] infos = getSyncInfos(); List<IResource> resources = new ArrayList<>(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { resources.add(info.getLocal()); } return resources.toArray(new IResource[resources.size()]); @@ -346,8 +345,8 @@ public class SyncInfoSet { try { beginInput(); SyncInfo[] infos = set.getSyncInfos(); - for (int i = 0; i < infos.length; i++) { - add(infos[i]); + for (SyncInfo info : infos) { + add(info); } } finally { endInput(null); @@ -377,8 +376,8 @@ public class SyncInfoSet { public void removeAll(IResource[] resources) { try { beginInput(); - for (int i = 0; i < resources.length; i++) { - remove(resources[i]); + for (IResource resource : resources) { + remove(resource); } } finally { endInput(null); @@ -414,8 +413,7 @@ public class SyncInfoSet { */ public boolean hasNodes(FastSyncInfoFilter filter) { SyncInfo[] infos = getSyncInfos(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { if (info != null && filter.select(info)) { return true; } @@ -433,8 +431,7 @@ public class SyncInfoSet { try { beginInput(); SyncInfo[] infos = getSyncInfos(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { if (info == null || !filter.select(info)) { remove(info.getLocal()); } @@ -454,8 +451,7 @@ public class SyncInfoSet { try { beginInput(); SyncInfo[] infos = getSyncInfos(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { if (info != null && filter.select(info)) { remove(info.getLocal()); } @@ -474,8 +470,7 @@ public class SyncInfoSet { public SyncInfo[] getNodes(FastSyncInfoFilter filter) { List<SyncInfo> result = new ArrayList<>(); SyncInfo[] infos = getSyncInfos(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { if (info != null && filter.select(info)) { result.add(info); } @@ -580,8 +575,7 @@ public class SyncInfoSet { // Fire the events using an ISafeRunnable final ITeamStatus[] newErrors = event.getErrors(); monitor.beginTask(null, 100 + (newErrors.length > 0 ? 50 : 0) * allListeners.length); - for (int i = 0; i < allListeners.length; i++) { - final ISyncInfoSetChangeListener listener = allListeners[i]; + for (ISyncInfoSetChangeListener listener : allListeners) { SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoTree.java index 0a55b352a..1d73e387e 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoTree.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoTree.java @@ -59,8 +59,7 @@ public class SyncInfoTree extends SyncInfoSet { */ public SyncInfoTree(SyncInfo[] infos) { super(infos); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { IResource local = info.getLocal(); addToParents(local, local); } @@ -119,8 +118,7 @@ public class SyncInfoTree extends SyncInfoSet { result.add(info); } IResource[] members = members(resource); - for (int i = 0; i < members.length; i++) { - IResource member = members[i]; + for (IResource member : members) { info = getSyncInfo(member); if (info != null) { result.add(info); @@ -145,8 +143,7 @@ public class SyncInfoTree extends SyncInfoSet { private synchronized SyncInfo[] internalGetDeepSyncInfo(IContainer resource) { List<SyncInfo> infos = new ArrayList<>(); IResource[] children = internalGetOutOfSyncDescendants(resource); - for (int i = 0; i < children.length; i++) { - IResource child = children[i]; + for (IResource child : children) { SyncInfo info = getSyncInfo(child); if(info != null) { infos.add(info); @@ -284,16 +281,15 @@ public class SyncInfoTree extends SyncInfoSet { if (depth == IResource.DEPTH_ZERO || resource.getType() == IResource.FILE) return; if (depth == IResource.DEPTH_ONE) { IResource[] members = members(resource); - for (int i = 0; i < members.length; i++) { - IResource member = members[i]; + for (IResource member : members) { if (getSyncInfo(member) != null) { remove(member); } } } else if (depth == IResource.DEPTH_INFINITE) { IResource [] toRemove = internalGetOutOfSyncDescendants((IContainer)resource); - for (int i = 0; i < toRemove.length; i++) { - remove(toRemove[i]); + for (IResource t : toRemove) { + remove(t); } } } finally { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java index fe817cc17..a74000d3c 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java @@ -66,8 +66,7 @@ public abstract class AbstractResourceVariantTree implements IResourceVariantTre public IResource[] refresh(IResource[] resources, int depth, IProgressMonitor monitor) throws TeamException { List<IResource> changedResources = new ArrayList<>(); monitor.beginTask(null, 100 * resources.length); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { IResource[] changed = refresh(resource, depth, Policy.subMonitorFor(monitor, 100)); changedResources.addAll(Arrays.asList(changed)); } @@ -223,8 +222,7 @@ public abstract class AbstractResourceVariantTree implements IResourceVariantTre if (localChildren.length > 0) { localSet = new HashMap<>(10); - for (int i = 0; i < localChildren.length; i++) { - IResource localChild = localChildren[i]; + for (IResource localChild : localChildren) { String name = localChild.getName(); localSet.put(name, localChild); allSet.add(name); @@ -233,38 +231,34 @@ public abstract class AbstractResourceVariantTree implements IResourceVariantTre if (remoteChildren.length > 0) { remoteSet = new HashMap<>(10); - for (int i = 0; i < remoteChildren.length; i++) { - IResourceVariant remoteChild = remoteChildren[i]; + for (IResourceVariant remoteChild : remoteChildren) { String name = remoteChild.getName(); remoteSet.put(name, remoteChild); allSet.add(name); } } - Iterator e = allSet.iterator(); - while (e.hasNext()) { - String keyChildName = (String) e.next(); - + for (String keyChildName : allSet) { Policy.checkCanceled(progress); IResource localChild = - localSet != null ? (IResource) localSet.get(keyChildName) : null; - - IResourceVariant remoteChild = + localSet != null ? (IResource) localSet.get(keyChildName) : null; + + IResourceVariant remoteChild = remoteSet != null ? (IResourceVariant) remoteSet.get(keyChildName) : null; - - if (localChild == null) { - // there has to be a remote resource available if we got this far - Assert.isTrue(remoteChild != null); - boolean isContainer = remoteChild.isContainer(); - localChild = getResourceChild(local /* parent */, keyChildName, isContainer); - } - if (localChild == null) { - TeamPlugin.log(IStatus.ERROR, NLS.bind("File {0} cannot be the parent of remote resource {1}", //$NON-NLS-1$ - new Object[] { local.getFullPath(), keyChildName }), null); - } else { - mergedResources.put(localChild, remoteChild); - } + + if (localChild == null) { + // there has to be a remote resource available if we got this far + Assert.isTrue(remoteChild != null); + boolean isContainer = remoteChild.isContainer(); + localChild = getResourceChild(local /* parent */, keyChildName, isContainer); + } + if (localChild == null) { + TeamPlugin.log(IStatus.ERROR, NLS.bind("File {0} cannot be the parent of remote resource {1}", //$NON-NLS-1$ + new Object[] { local.getFullPath(), keyChildName }), null); + } else { + mergedResources.put(localChild, remoteChild); + } } } return mergedResources; diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/PersistantResourceVariantByteStore.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/PersistantResourceVariantByteStore.java index dea3b6181..3080d9609 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/PersistantResourceVariantByteStore.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/PersistantResourceVariantByteStore.java @@ -138,8 +138,7 @@ public class PersistantResourceVariantByteStore extends ResourceVariantByteStore // Filter and return only resources that have sync bytes in the cache. IResource[] members = ((IContainer)resource).members(true /* include phantoms */); List<IResource> filteredMembers = new ArrayList<>(members.length); - for (int i = 0; i < members.length; i++) { - IResource member = members[i]; + for (IResource member : members) { if(getBytes(member) != null) { filteredMembers.add(member); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java index 9d4420a3a..ea88f25f4 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java @@ -119,8 +119,7 @@ public abstract class ResourceVariantTreeSubscriber extends Subscriber { List<IStatus> cancels = new ArrayList<>(); try { monitor.beginTask(null, 1000 * resources.length); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (resource.getProject().isAccessible()) { IStatus status = refresh(resource, depth, Policy.subMonitorFor(monitor, 1000)); if (status.getSeverity() == IStatus.CANCEL) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/SessionResourceVariantByteStore.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/SessionResourceVariantByteStore.java index 2c7fb888b..5f4b61764 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/SessionResourceVariantByteStore.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/SessionResourceVariantByteStore.java @@ -53,8 +53,7 @@ public class SessionResourceVariantByteStore extends ResourceVariantByteStore { if (getSyncBytesCache().containsKey(resource)) { if (depth != IResource.DEPTH_ZERO) { IResource[] members = members(resource); - for (int i = 0; i < members.length; i++) { - IResource child = members[i]; + for (IResource child : members) { flushBytes(child, (depth == IResource.DEPTH_INFINITE) ? IResource.DEPTH_INFINITE: IResource.DEPTH_ZERO); } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySubscriber.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySubscriber.java index 0aeb221f8..297a045d4 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySubscriber.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySubscriber.java @@ -159,8 +159,7 @@ public abstract class ThreeWaySubscriber extends ResourceVariantTreeSubscriber i private boolean isChildOfRoot(IResource resource) { IResource[] roots = roots(); IPath fullPath = resource.getFullPath(); - for (int i = 0; i < roots.length; i++) { - IResource root = roots[i]; + for (IResource root : roots) { if (root.getFullPath().isPrefixOf(fullPath)) { return true; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java index 5ce6d8b81..94b4572ae 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java @@ -418,8 +418,7 @@ public class ThreeWaySynchronizer { allListeners = listeners.toArray(new ISynchronizerChangeListener[listeners.size()]); } // Notify the listeners safely so all will receive notification - for (int i = 0; i < allListeners.length; i++) { - final ISynchronizerChangeListener listener = allListeners[i]; + for (ISynchronizerChangeListener listener : allListeners) { SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/DefaultFileModificationValidator.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/DefaultFileModificationValidator.java index a01b75680..200035bfa 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/DefaultFileModificationValidator.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/DefaultFileModificationValidator.java @@ -87,8 +87,7 @@ public class DefaultFileModificationValidator extends FileModificationValidator private IFile[] getReadOnly(IFile[] files) { List<IFile> result = new ArrayList<>(files.length); - for (int i = 0; i < files.length; i++) { - IFile file = files[i]; + for (IFile file : files) { if (file.isReadOnly()) { result.add(file); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ExceptionCollector.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ExceptionCollector.java index 8c956d1a9..bc784a0d3 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ExceptionCollector.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ExceptionCollector.java @@ -104,8 +104,7 @@ public class ExceptionCollector { IStatus status = new Status(exceptionStatus.getSeverity(), exceptionStatus.getPlugin(), exceptionStatus.getCode(), exceptionStatus.getMessage(), exception); recordStatus(status); IStatus[] children = status.getChildren(); - for (int i = 0; i < children.length; i++) { - IStatus status2 = children[i]; + for (IStatus status2 : children) { recordStatus(status2); } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileModificationValidatorManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileModificationValidatorManager.java index c8dc7055e..3426ac6e3 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileModificationValidatorManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileModificationValidatorManager.java @@ -44,8 +44,7 @@ public class FileModificationValidatorManager extends FileModificationValidator Map<RepositoryProvider, List<IFile>> providersToFiles = new HashMap<>(files.length); //for each file, determine which provider, map providers to files - for (int i = 0; i < files.length; i++) { - IFile file = files[i]; + for (IFile file : files) { RepositoryProvider provider = RepositoryProvider.getProvider(file.getProject()); if (!providersToFiles.containsKey(provider)) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/PluginStringMappings.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/PluginStringMappings.java index 8193e6ae4..85ae03f65 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/PluginStringMappings.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/PluginStringMappings.java @@ -57,16 +57,13 @@ public class PluginStringMappings { final IExtension[] extensions = extension.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement[] configElements = extensions[i].getConfigurationElements(); - - for (int j = 0; j < configElements.length; j++) { - - final String ext = configElements[j].getAttribute(fAttributeName);//"extension"); - final String type = configElements[j].getAttribute("type"); //$NON-NLS-1$ + for (IExtension e : extensions) { + IConfigurationElement[] configElements = e.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + final String ext = configElement.getAttribute(fAttributeName); //"extension"); + final String type = configElement.getAttribute("type"); //$NON-NLS-1$ if (ext == null || type == null) continue; - if (type.equals("text")) { //$NON-NLS-1$ result.put(ext, Integer.valueOf(Team.TEXT)); } else if (type.equals("binary")) { //$NON-NLS-1$ diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/RepositoryProviderManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/RepositoryProviderManager.java index 48744eb2f..351a961e1 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/RepositoryProviderManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/RepositoryProviderManager.java @@ -32,8 +32,8 @@ public class RepositoryProviderManager implements IRepositoryProviderListener { @Override public void providerMapped(RepositoryProvider provider) { Object[] allListeners = listeners.getListeners(); - for (int i = 0; i < allListeners.length; i++) { - IRepositoryProviderListener listener = (IRepositoryProviderListener)allListeners[i]; + for (Object l : allListeners) { + IRepositoryProviderListener listener = (IRepositoryProviderListener) l; listener.providerMapped(provider); } } @@ -41,8 +41,8 @@ public class RepositoryProviderManager implements IRepositoryProviderListener { @Override public void providerUnmapped(IProject project) { Object[] allListeners = listeners.getListeners(); - for (int i = 0; i < allListeners.length; i++) { - IRepositoryProviderListener listener = (IRepositoryProviderListener)allListeners[i]; + for (Object l : allListeners) { + IRepositoryProviderListener listener = (IRepositoryProviderListener) l; listener.providerUnmapped(project); } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCache.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCache.java index ba1bf5be1..22d753890 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCache.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCache.java @@ -17,7 +17,6 @@ import java.io.File; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -100,8 +99,7 @@ public class ResourceVariantCache { public static synchronized void shutdown() { String[] keys = caches.keySet().toArray(new String[caches.size()]); - for (int i = 0; i < keys.length; i++) { - String id = keys[i]; + for (String id : keys) { disableCache(id); } } @@ -131,8 +129,7 @@ public class ResourceVariantCache { long current = new Date().getTime(); if ((lastCacheCleanup!=-1) && (current - lastCacheCleanup < CACHE_FILE_LIFESPAN)) return; List<ResourceVariantCacheEntry> stale = new ArrayList<>(); - for (Iterator iter = cacheEntries.values().iterator(); iter.hasNext();) { - ResourceVariantCacheEntry entry = (ResourceVariantCacheEntry) iter.next(); + for (ResourceVariantCacheEntry entry : cacheEntries.values()) { long lastHit = entry.getLastAccessTimeStamp(); if ((current - lastHit) > CACHE_FILE_LIFESPAN){ stale.add(entry); @@ -199,8 +196,8 @@ public class ResourceVariantCache { if(children == null) { throw new TeamException(NLS.bind(Messages.RemoteContentsCache_fileError, new String[] { file.getAbsolutePath() })); } - for (int i = 0; i < children.length; i++) { - deleteFile(children[i]); + for (File f : children) { + deleteFile(f); } } if (! file.delete()) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StorageMergerRegistry.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StorageMergerRegistry.java index 4c6095879..943b554cb 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StorageMergerRegistry.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StorageMergerRegistry.java @@ -96,12 +96,11 @@ public class StorageMergerRegistry { // collect all IStreamMergers IConfigurationElement[] elements= registry.getConfigurationElementsFor(TeamPlugin.ID, STORAGE_MERGER_EXTENSION_POINT); - for (int i= 0; i < elements.length; i++) { - IConfigurationElement element= elements[i]; - if (STORAGE_MERGER.equals(element.getName())) - register(element, new StorageMergerDescriptor(element)); - else if (CONTENT_TYPE_BINDING.equals(element.getName())) - createBinding(element, STORAGE_MERGER_ID_ATTRIBUTE); + for (IConfigurationElement element : elements) { + if (STORAGE_MERGER.equals(element.getName())) + register(element, new StorageMergerDescriptor(element)); + else if (CONTENT_TYPE_BINDING.equals(element.getName())) + createBinding(element, STORAGE_MERGER_ID_ATTRIBUTE); } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/TeamPlugin.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/TeamPlugin.java index b2b22a7e7..1a9cc76de 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/TeamPlugin.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/TeamPlugin.java @@ -184,12 +184,12 @@ final public class TeamPlugin extends Plugin { IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(TeamPlugin.ID, TeamPlugin.REPOSITORY_EXTENSION); if (extension != null) { IExtension[] extensions = extension.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement [] configElements = extensions[i].getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { - String aliasId = configElements[j].getAttribute("canImportId"); //$NON-NLS-1$ + for (IExtension ext : extensions) { + IConfigurationElement[] configElements = ext.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + String aliasId = configElement.getAttribute("canImportId"); //$NON-NLS-1$ if (aliasId != null && aliasId.equals(id)) { - String extensionId = configElements[j].getAttribute("id"); //$NON-NLS-1$ + String extensionId = configElement.getAttribute("id"); //$NON-NLS-1$ if (extensionId != null) { return RepositoryProviderType.getProviderType(extensionId); } @@ -204,11 +204,11 @@ final public class TeamPlugin extends Plugin { IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(TeamPlugin.ID, TeamPlugin.REPOSITORY_EXTENSION); if (extension != null) { IExtension[] extensions = extension.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement [] configElements = extensions[i].getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { - String extensionId = configElements[j].getAttribute("id"); //$NON-NLS-1$ - String metaFilePaths = configElements[j].getAttribute("metaFilePaths"); //$NON-NLS-1$ + for (IExtension ext : extensions) { + IConfigurationElement[] configElements = ext.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + String extensionId = configElement.getAttribute("id"); //$NON-NLS-1$ + String metaFilePaths = configElement.getAttribute("metaFilePaths"); //$NON-NLS-1$ if (extensionId != null && extensionId.equals(id) && metaFilePaths != null) { return getPaths(metaFilePaths); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/TeamResourceChangeListener.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/TeamResourceChangeListener.java index 6465386ba..39ce85a7a 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/TeamResourceChangeListener.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/TeamResourceChangeListener.java @@ -16,7 +16,6 @@ package org.eclipse.team.internal.core; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -45,8 +44,7 @@ public final class TeamResourceChangeListener implements IResourceChangeListener static { metaFilePaths = new HashMap<>(); String[] ids = RepositoryProvider.getAllProviderTypeIds(); - for (int i = 0; i < ids.length; i++) { - String id = ids[i]; + for (String id : ids) { IPath[] paths = TeamPlugin.getMetaFilePaths(id); if (paths != null) { metaFilePaths.put(id, paths); @@ -57,8 +55,7 @@ public final class TeamResourceChangeListener implements IResourceChangeListener @Override public void resourceChanged(IResourceChangeEvent event) { IResourceDelta[] projectDeltas = event.getDelta().getAffectedChildren(); - for (int i = 0; i < projectDeltas.length; i++) { - IResourceDelta delta = projectDeltas[i]; + for (IResourceDelta delta : projectDeltas) { IResource resource = delta.getResource(); IProject project = resource.getProject(); if (!RepositoryProvider.isShared(project)) { @@ -85,8 +82,7 @@ public final class TeamResourceChangeListener implements IResourceChangeListener Set<IContainer> metaFileContainers = new HashSet<>(); Set<String> badIds = new HashSet<>(); IFile[] files = getAddedFiles(delta); - for (int i = 0; i < files.length; i++) { - IFile file = files[i]; + for (IFile file : files) { String typeId = getMetaFileType(file); if (typeId != null) { // The file path matches the path for the given type id @@ -112,8 +108,7 @@ public final class TeamResourceChangeListener implements IResourceChangeListener IPath[] paths = metaFilePaths.get(typeId); IPath foundPath = null; IPath projectRelativePath = file.getProjectRelativePath(); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { if (isSuffix(projectRelativePath, path)) { foundPath = path; } @@ -131,11 +126,9 @@ public final class TeamResourceChangeListener implements IResourceChangeListener } private String getMetaFileType(IFile file) { - for (Iterator<String> iter = metaFilePaths.keySet().iterator(); iter.hasNext();) { - String id = iter.next(); + for (String id : metaFilePaths.keySet()) { IPath[] paths = metaFilePaths.get(id); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { if (isSuffix(file.getProjectRelativePath(), path)) { return id; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/history/LocalFileHistory.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/history/LocalFileHistory.java index d363481cc..3e90f2eb1 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/history/LocalFileHistory.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/history/LocalFileHistory.java @@ -47,15 +47,16 @@ public class LocalFileHistory extends FileHistory { //the predecessor is the file with a timestamp that is the largest timestamp //from the set of all timestamps smaller than the root file's timestamp IFileRevision fileRevision = null; - for (int i = 0; i < revisions.length; i++) { - if (((LocalFileRevision) revisions[i]).isPredecessorOf(revision)) { + for (IFileRevision r : revisions) { + if (((LocalFileRevision) r).isPredecessorOf(revision)) { //no revision has been set as of yet - if (fileRevision == null) - fileRevision = revisions[i]; + if (fileRevision == null) { + fileRevision = r; + } //this revision is a predecessor - now check to see if it comes //after the current predecessor, if it does make it the current predecessor - if (fileRevision != null && revisions[i].getTimestamp() > fileRevision.getTimestamp()) { - fileRevision = revisions[i]; + if (fileRevision != null && r.getTimestamp() > fileRevision.getTimestamp()) { + fileRevision = r; } } } @@ -67,8 +68,7 @@ public class LocalFileHistory extends FileHistory { @Override public IFileRevision getFileRevision(String id) { if (revisions != null) { - for (int i = 0; i < revisions.length; i++) { - IFileRevision revision = revisions[i]; + for (IFileRevision revision : revisions) { if (revision.getContentIdentifier().equals(id)) { return revision; } @@ -89,9 +89,9 @@ public class LocalFileHistory extends FileHistory { IFileRevision[] revisions = getFileRevisions(); ArrayList<IFileRevision> directDescendents = new ArrayList<>(); - for (int i = 0; i < revisions.length; i++) { - if (((LocalFileRevision) revisions[i]).isDescendentOf(revision)) { - directDescendents.add(revisions[i]); + for (IFileRevision r : revisions) { + if (((LocalFileRevision) r).isDescendentOf(revision)) { + directDescendents.add(r); } } return directDescendents.toArray(new IFileRevision[directDescendents.size()]); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/importing/BundleImporterExtension.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/importing/BundleImporterExtension.java index 1937f93f8..7a0de8202 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/importing/BundleImporterExtension.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/importing/BundleImporterExtension.java @@ -73,8 +73,8 @@ public class BundleImporterExtension implements IBundleImporter { if (supportedValues == null) { IConfigurationElement[] supported = element.getChildren("supports"); //$NON-NLS-1$ supportedValues = new HashSet<>(supported.length); - for (int i = 0; i < supported.length; i++) { - supportedValues.add(supported[i].getAttribute("prefix")); //$NON-NLS-1$ + for (IConfigurationElement s : supported) { + supportedValues.add(s.getAttribute("prefix")); //$NON-NLS-1$ } } return supportedValues; diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/AbstractResourceMappingScope.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/AbstractResourceMappingScope.java index a5a584907..3784d1e8f 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/AbstractResourceMappingScope.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/AbstractResourceMappingScope.java @@ -29,8 +29,7 @@ public abstract class AbstractResourceMappingScope extends AbstractSynchronizati @Override public ResourceMapping getMapping(Object modelObject) { ResourceMapping[] mappings = getMappings(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { if (mapping.getModelObject().equals(modelObject)) return mapping; } @@ -41,8 +40,7 @@ public abstract class AbstractResourceMappingScope extends AbstractSynchronizati public ResourceMapping[] getMappings(String id) { Set<ResourceMapping> result = new HashSet<>(); ResourceMapping[] mappings = getMappings(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { if (mapping.getModelProviderId().equals(id)) { result.add(mapping); } @@ -55,8 +53,7 @@ public abstract class AbstractResourceMappingScope extends AbstractSynchronizati public ResourceTraversal[] getTraversals(String modelProviderId) { ResourceMapping[] mappings = getMappings(modelProviderId); CompoundResourceTraversal traversal = new CompoundResourceTraversal(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { ResourceTraversal[] traversals = getTraversals(mapping); if (traversals != null) traversal.addTraversals(traversals); @@ -68,8 +65,7 @@ public abstract class AbstractResourceMappingScope extends AbstractSynchronizati public ModelProvider[] getModelProviders() { Set<ModelProvider> result = new HashSet<>(); ResourceMapping[] mappings = getMappings(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { ModelProvider modelProvider = mapping.getModelProvider(); if (modelProvider != null) result.add(modelProvider); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/CompoundResourceTraversal.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/CompoundResourceTraversal.java index 2d68ae9dd..d8e0ccf2f 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/CompoundResourceTraversal.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/CompoundResourceTraversal.java @@ -36,16 +36,14 @@ public class CompoundResourceTraversal { private Set<IResource> files = new HashSet<>(); public synchronized void addTraversals(ResourceTraversal[] traversals) { - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { addTraversal(traversal); } } public synchronized void addTraversal(ResourceTraversal traversal) { IResource[] resources = traversal.getResources(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { addResource(resource, traversal.getDepth()); } } @@ -175,8 +173,7 @@ public class CompoundResourceTraversal { } public synchronized void addResources(IResource[] resources, int depth) { - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { addResource(resource, depth); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ModelProviderResourceMapping.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ModelProviderResourceMapping.java index 24af159f1..9132666a4 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ModelProviderResourceMapping.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ModelProviderResourceMapping.java @@ -55,8 +55,7 @@ public class ModelProviderResourceMapping extends ResourceMapping { try { IResource[] resources = provider.getDescriptor().getMatchingResources(projects); Set<IProject> result = new HashSet<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (resource.isAccessible()) result.add(resource.getProject()); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ResourceMappingInputScope.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ResourceMappingInputScope.java index a9fcabc3f..549662686 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ResourceMappingInputScope.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ResourceMappingInputScope.java @@ -46,8 +46,7 @@ public class ResourceMappingInputScope extends AbstractResourceMappingScope { public ResourceTraversal[] getTraversals() { CompoundResourceTraversal result = new CompoundResourceTraversal(); ResourceMapping[] mappings = getMappings(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { ResourceTraversal[] traversals = getTraversals(mapping); result.addTraversals(traversals); } @@ -64,8 +63,7 @@ public class ResourceMappingInputScope extends AbstractResourceMappingScope { private boolean contains(ResourceMapping mapping) { ResourceMapping[] mappings = getMappings(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping child = mappings[i]; + for (ResourceMapping child : mappings) { if (child.equals(mapping)) { return true; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeChangeEvent.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeChangeEvent.java index 24073fc09..cd17a2c9b 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeChangeEvent.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeChangeEvent.java @@ -69,12 +69,10 @@ public class ScopeChangeEvent { // The number of mappings has increased so we should report the new mappings Set<ResourceMapping> originalSet = new HashSet<>(); List<ResourceMapping> result = new ArrayList<>(); - for (int i = 0; i < originalMappings.length; i++) { - ResourceMapping mapping = originalMappings[i]; + for (ResourceMapping mapping : originalMappings) { originalSet.add(mapping); } - for (int i = 0; i < currentMappings.length; i++) { - ResourceMapping mapping = currentMappings[i]; + for (ResourceMapping mapping : currentMappings) { if (!originalSet.contains(mapping)) { result.add(mapping); } @@ -84,12 +82,10 @@ public class ScopeChangeEvent { // The number of mappings may be smaller so report the removed mappings Set<ResourceMapping> finalSet = new HashSet<>(); List<ResourceMapping> result = new ArrayList<>(); - for (int i = 0; i < currentMappings.length; i++) { - ResourceMapping mapping = currentMappings[i]; + for (ResourceMapping mapping : currentMappings) { finalSet.add(mapping); } - for (int i = 0; i < originalMappings.length; i++) { - ResourceMapping mapping = originalMappings[i]; + for (ResourceMapping mapping : originalMappings) { if (!finalSet.contains(mapping)) { result.add(mapping); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeManagerEventHandler.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeManagerEventHandler.java index d0c2bcf98..271a1f986 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeManagerEventHandler.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeManagerEventHandler.java @@ -65,8 +65,7 @@ public class ScopeManagerEventHandler extends BackgroundEventHandler { throws CoreException { if (event instanceof ResourceMappingEvent) { ResourceMappingEvent rme = (ResourceMappingEvent) event; - for (int i = 0; i < rme.mappings.length; i++) { - ResourceMapping mapping = rme.mappings[i]; + for (ResourceMapping mapping : rme.mappings) { toRefresh.add(mapping); } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/TextStorageMerger.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/TextStorageMerger.java index 18e63582f..3f7db7f07 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/TextStorageMerger.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/TextStorageMerger.java @@ -55,8 +55,7 @@ public class TextStorageMerger implements IStorageMerger { 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.team.core/src/org/eclipse/team/internal/core/subscribers/AbstractSynchronizationScope.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/AbstractSynchronizationScope.java index 1aba78078..e1f36e6bb 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/AbstractSynchronizationScope.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/AbstractSynchronizationScope.java @@ -40,11 +40,9 @@ public abstract class AbstractSynchronizationScope implements ISynchronizationSc public IResource[] getRoots() { List<IResource> result = new ArrayList<>(); ResourceTraversal[] traversals = getTraversals(); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); - for (int j = 0; j < resources.length; j++) { - IResource resource = resources[j]; + for (IResource resource : resources) { accumulateRoots(result, resource); } } @@ -54,8 +52,7 @@ public abstract class AbstractSynchronizationScope implements ISynchronizationSc @Override public boolean contains(IResource resource) { ResourceTraversal[] traversals = getTraversals(); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { if (traversal.contains(resource)) return true; } @@ -89,8 +86,7 @@ public abstract class AbstractSynchronizationScope implements ISynchronizationSc */ public void fireTraversalsChangedEvent(final ResourceTraversal[] newTraversals, final ResourceMapping[] newMappings) { Object[] allListeners = listeners.getListeners(); - for (int i = 0; i < allListeners.length; i++) { - final Object listener = allListeners[i]; + for (Object listener : allListeners) { SafeRunner.run(new ISafeRunnable() { @Override public void run() throws Exception { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSet.java index 59608f687..dcd56d931 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSet.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSet.java @@ -138,8 +138,7 @@ public class ActiveChangeSet extends DiffChangeSet { if (!isEmpty()) { StringBuilder buffer = new StringBuilder(); IResource[] resources = getResources(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { buffer.append(resource.getFullPath().toString()); buffer.append('\n'); } @@ -207,8 +206,7 @@ public class ActiveChangeSet extends DiffChangeSet { */ public void add(IResource[] resources) throws CoreException { List<IDiff> toAdd = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { IDiff diff = getManager().getDiff(resource); if (diff != null) { toAdd.add(diff); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSetManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSetManager.java index a5b35c1ef..307c1978d 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSetManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSetManager.java @@ -60,8 +60,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements */ protected ChangeSet getChangeSet(IResourceDiffTree tree) { ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet changeSet = sets[i]; + for (ChangeSet changeSet : sets) { if (((DiffChangeSet)changeSet).getDiffTree() == tree) { return changeSet; } @@ -143,8 +142,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements */ public ActiveChangeSet getSet(String name) { ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { if (set.getName().equals(name) && set instanceof ActiveChangeSet) { return (ActiveChangeSet)set; } @@ -162,8 +160,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements */ public ActiveChangeSet createSet(String title, IFile[] files) throws CoreException { List<IDiff> infos = new ArrayList<>(); - for (int i = 0; i < files.length; i++) { - IFile file = files[i]; + for (IFile file : files) { IDiff diff = getDiff(file); if (diff != null) { infos.add(diff); @@ -214,18 +211,15 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements private IPath[] getAllResources(IDiffChangeEvent event) { Set<IPath> allResources = new HashSet<>(); IDiff[] addedResources = event.getAdditions(); - for (int i = 0; i < addedResources.length; i++) { - IDiff diff = addedResources[i]; + for (IDiff diff : addedResources) { allResources.add(diff.getPath()); } IDiff[] changedResources = event.getChanges(); - for (int i = 0; i < changedResources.length; i++) { - IDiff diff = changedResources[i]; + for (IDiff diff : changedResources) { allResources.add(diff.getPath()); } IPath[] removals = event.getRemovals(); - for (int i = 0; i < removals.length; i++) { - IPath path = removals[i]; + for (IPath path : removals) { allResources.add(path); } return allResources.toArray(new IPath[allResources.size()]); @@ -244,8 +238,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements } // Remove the added files from any other set that contains them ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet otherSet = sets[i]; + for (ChangeSet otherSet : sets) { if (otherSet != set && ((ActiveChangeSet)otherSet).isUserCreated()) { otherSet.remove(resources); } @@ -309,8 +302,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements CompoundResourceTraversal traversal = new CompoundResourceTraversal(); traversal.addTraversals(traversals); ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { handleIntersect(traversal, set); } return traversal.asTraversals(); @@ -318,8 +310,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements private void handleIntersect(CompoundResourceTraversal traversal, ChangeSet set) { IResource[] resources = set.getResources(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (traversal.isCovered(resource, IResource.DEPTH_ZERO)) { traversal.addResources(resources, IResource.DEPTH_ZERO); return; @@ -339,16 +330,14 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements // Clear the persisted state before saving the new state try { String[] oldSetNames = prefs.childrenNames(); - for (int i = 0; i < oldSetNames.length; i++) { - String string = oldSetNames[i]; + for (String string : oldSetNames) { prefs.node(string).removeNode(); } } catch (BackingStoreException e) { TeamPlugin.log(IStatus.ERROR, NLS.bind(Messages.SubscriberChangeSetCollector_5, new String[] { getName() }), e); } ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { if (set instanceof ActiveChangeSet && !set.isEmpty()) { // Since the change set title is stored explicitly, the name of // the child preference node doesn't matter as long as it @@ -408,8 +397,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements String defaultSetTitle = prefs.get(CTX_DEFAULT_SET, null); try { String[] childNames = prefs.childrenNames(); - for (int i = 0; i < childNames.length; i++) { - String string = childNames[i]; + for (String string : childNames) { Preferences childPrefs = prefs.node(string); ActiveChangeSet set = createSet(childPrefs); if (!set.isEmpty()) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingChangeSetManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingChangeSetManager.java index f94fd8972..cd4ad4d80 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingChangeSetManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingChangeSetManager.java @@ -64,12 +64,10 @@ public class BatchingChangeSetManager extends ChangeSetManager { changed.put(changeSet, allAffectedResources); } else { Set<IPath> allPaths = new HashSet<>(); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { allPaths.add(path); } - for (int i = 0; i < allAffectedResources.length; i++) { - IPath path = allAffectedResources[i]; + for (IPath path : allAffectedResources) { allPaths.add(path); } changed.put(changeSet, allPaths.toArray(new IPath[allPaths.size()])); @@ -130,8 +128,8 @@ public class BatchingChangeSetManager extends ChangeSetManager { final CollectorChangeEvent event = changes; changes = new CollectorChangeEvent(this); Object[] listeners = getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IChangeSetChangeListener listener = (IChangeSetChangeListener)listeners[i]; + for (Object l : listeners) { + final IChangeSetChangeListener listener = (IChangeSetChangeListener) l; if (listener instanceof IChangeSetCollectorChangeListener) { final IChangeSetCollectorChangeListener csccl = (IChangeSetCollectorChangeListener) listener; SafeRunner.run(new ISafeRunnable() { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingLock.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingLock.java index 7c551b763..426710046 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingLock.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingLock.java @@ -146,8 +146,7 @@ public class BatchingLock { // Create a MultiRule for all projects from the given rule ISchedulingRule[] rules = ((MultiRule)resourceRule).getChildren(); Set<ISchedulingRule> projects = new HashSet<>(); - for (int i = 0; i < rules.length; i++) { - ISchedulingRule childRule = rules[i]; + for (ISchedulingRule childRule : rules) { if (childRule instanceof IResource) { projects.add(((IResource)childRule).getProject()); } @@ -255,8 +254,7 @@ public class BatchingLock { private ThreadInfo getThreadInfo(IResource resource) { synchronized (infos) { - for (Iterator iter = infos.values().iterator(); iter.hasNext();) { - ThreadInfo info = (ThreadInfo) iter.next(); + for (ThreadInfo info : infos.values()) { if (info.ruleContains(resource)) { return info; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSet.java index 03c9e2e3e..5eb583fab 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSet.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSet.java @@ -69,8 +69,7 @@ public abstract class ChangeSet { * @param resources the resources to be removed */ public void remove(IResource[] resources) { - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { remove(resource); } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSetManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSetManager.java index ca446b0a3..1cf0e10ac 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSetManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSetManager.java @@ -49,8 +49,8 @@ public abstract class ChangeSetManager { return; if (contains(set)) { Object[] listeners = getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IChangeSetChangeListener listener = (IChangeSetChangeListener)listeners[i]; + for (Object l : listeners) { + final IChangeSetChangeListener listener = (IChangeSetChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -75,8 +75,8 @@ public abstract class ChangeSetManager { if (initializing) return; Object[] listeners = getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IChangeSetChangeListener listener = (IChangeSetChangeListener)listeners[i]; + for (Object l : listeners) { + final IChangeSetChangeListener listener = (IChangeSetChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -109,8 +109,8 @@ public abstract class ChangeSetManager { if (initializing) return; Object[] listeners = getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IChangeSetChangeListener listener = (IChangeSetChangeListener)listeners[i]; + for (Object l : listeners) { + final IChangeSetChangeListener listener = (IChangeSetChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -143,8 +143,8 @@ public abstract class ChangeSetManager { if (initializing) return; Object[] listeners = getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IChangeSetChangeListener listener = (IChangeSetChangeListener)listeners[i]; + for (Object l : listeners) { + final IChangeSetChangeListener listener = (IChangeSetChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -208,8 +208,8 @@ public abstract class ChangeSetManager { if (initializing) return; Object[] listeners = getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IChangeSetChangeListener listener = (IChangeSetChangeListener)listeners[i]; + for (Object l : listeners) { + final IChangeSetChangeListener listener = (IChangeSetChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/CheckedInChangeSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/CheckedInChangeSet.java index 92a65d4a2..fa19cd488 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/CheckedInChangeSet.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/CheckedInChangeSet.java @@ -105,8 +105,7 @@ public abstract class CheckedInChangeSet extends ChangeSet { public void add(SyncInfo[] infos) { try { set.beginInput(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { add(info); } } finally { @@ -131,8 +130,7 @@ public abstract class CheckedInChangeSet extends ChangeSet { */ @Override public void remove(IResource[] resources) { - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { remove(resource); } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DescendantResourceVariantByteStore.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DescendantResourceVariantByteStore.java index ee7fbca4c..49532b35b 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DescendantResourceVariantByteStore.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DescendantResourceVariantByteStore.java @@ -155,11 +155,10 @@ public abstract class DescendantResourceVariantByteStore extends ResourceVariant IResource[] remoteMembers = getRemoteStore().members(resource); IResource[] baseMembers = getBaseStore().members(resource); Set<IResource> members = new HashSet<>(); - for (int i = 0; i < remoteMembers.length; i++) { - members.add(remoteMembers[i]); + for (IResource remoteMember : remoteMembers) { + members.add(remoteMember); } - for (int i = 0; i < baseMembers.length; i++) { - IResource member = baseMembers[i]; + for (IResource member : baseMembers) { // Add the base only if the remote does not know about it // (i.e. hasn't marked it as deleted if (!isVariantKnown(member)) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffChangeSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffChangeSet.java index cfb3a92e1..12068ac78 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffChangeSet.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffChangeSet.java @@ -101,8 +101,7 @@ public class DiffChangeSet extends ChangeSet { public void add(IDiff[] diffs) { try { tree.beginInput(); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { add(diff); } } finally { @@ -133,8 +132,7 @@ public class DiffChangeSet extends ChangeSet { if (diffs.length > 0) { try { tree.beginInput(); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { IResource r = tree.getResource(diff); if (r != null) tree.remove(r); @@ -157,8 +155,7 @@ public class DiffChangeSet extends ChangeSet { public void remove(IPath[] paths) { try { tree.beginInput(); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { tree.remove(path); } } finally { @@ -170,8 +167,7 @@ public class DiffChangeSet extends ChangeSet { public void remove(IResource[] resources) { try { tree.beginInput(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { tree.remove(resource); } } finally { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java index 2fb946549..7cd58fbd0 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java @@ -107,9 +107,7 @@ public class DiffTreeStatistics { @Override public String toString() { StringBuilder out = new StringBuilder(); - Iterator it = stats.keySet().iterator(); - while (it.hasNext()) { - Integer kind = (Integer) it.next(); + for (Integer kind : stats.keySet()) { out.append(SyncInfo.kindToString(kind.intValue()) + ": " + stats.get(kind) + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ } return out.toString(); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/RootResourceSynchronizationScope.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/RootResourceSynchronizationScope.java index 5331a4b09..e2f49e9b5 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/RootResourceSynchronizationScope.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/RootResourceSynchronizationScope.java @@ -64,8 +64,7 @@ public class RootResourceSynchronizationScope extends AbstractResourceMappingSco @Override public ResourceMapping[] getMappings() { List<ResourceMapping> result = new ArrayList<>(); - for (int i = 0; i < roots.length; i++) { - IResource resource = roots[i]; + for (IResource resource : roots) { Object o = resource.getAdapter(ResourceMapping.class); if (o instanceof ResourceMapping) { result.add((ResourceMapping) o); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberChangeSetManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberChangeSetManager.java index c34010237..2f6bf680d 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberChangeSetManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberChangeSetManager.java @@ -15,7 +15,6 @@ package org.eclipse.team.internal.core.subscribers; import java.util.ArrayList; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Set; @@ -79,8 +78,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { ResourceDiffTree[] locked = null; try { locked = beginDispath(); - for (Iterator iter = dispatchEvents.iterator(); iter.hasNext();) { - Event event = (Event) iter.next(); + for (Event event : dispatchEvents) { switch (event.getType()) { case RESOURCE_REMOVAL: handleRemove(event.getResource()); @@ -115,8 +113,8 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { ChangeSet[] sets = getSets(); List<ResourceDiffTree> lockedSets = new ArrayList<>(); try { - for (int i = 0; i < sets.length; i++) { - ActiveChangeSet set = (ActiveChangeSet)sets[i]; + for (ChangeSet s : sets) { + ActiveChangeSet set = (ActiveChangeSet) s; ResourceDiffTree tree = set.internalGetDiffTree(); lockedSets.add(tree); tree.beginInput(); @@ -124,8 +122,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { return lockedSets.toArray(new ResourceDiffTree[lockedSets.size()]); } catch (RuntimeException e) { try { - for (Iterator iter = lockedSets.iterator(); iter.hasNext();) { - ResourceDiffTree tree = (ResourceDiffTree) iter.next(); + for (ResourceDiffTree tree : lockedSets) { try { tree.endInput(null); } catch (Throwable e1) { @@ -145,8 +142,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { return; } monitor.beginTask(null, 100 * locked.length); - for (int i = 0; i < locked.length; i++) { - ResourceDiffTree tree = locked[i]; + for (ResourceDiffTree tree : locked) { try { tree.endInput(Policy.subMonitorFor(monitor, 100)); } catch (RuntimeException e) { @@ -170,8 +166,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { */ private void handleRemove(IResource resource) { ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { // This will remove any descendants from the set and callback to // resourcesChanged which will batch changes if (!set.isEmpty()) { @@ -197,8 +192,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { getDefaultSet().add(diff); } } else { - for (int i = 0; i < containingSets.length; i++) { - ActiveChangeSet set = containingSets[i]; + for (ActiveChangeSet set : containingSets) { // Update the sync info in the set set.add(diff); } @@ -208,8 +202,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { } if (depth != IResource.DEPTH_ZERO) { IResource[] members = getSubscriber().members(resource); - for (int i = 0; i < members.length; i++) { - IResource member = members[i]; + for (IResource member : members) { handleChange(member, depth == IResource.DEPTH_ONE ? IResource.DEPTH_ZERO : IResource.DEPTH_INFINITE); } } @@ -218,8 +211,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { private void removeFromAllSets(IResource resource) { List<ChangeSet> toRemove = new ArrayList<>(); ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { if (set.contains(resource)) { set.remove(resource); if (set.isEmpty()) { @@ -236,8 +228,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { private ActiveChangeSet[] getContainingSets(IResource resource) { Set<ActiveChangeSet> result = new HashSet<>(); ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { if (set.contains(resource)) { result.add((ActiveChangeSet) set); } @@ -282,8 +273,8 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { public boolean hasMembers(IResource resource) { ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ActiveChangeSet set = (ActiveChangeSet)sets[i]; + for (ChangeSet s : sets) { + ActiveChangeSet set = (ActiveChangeSet) s; if (set.getDiffTree().getChildren(resource.getFullPath()).length > 0) return true; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberDiffTreeEventHandler.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberDiffTreeEventHandler.java index 4fbe86525..576842e3c 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberDiffTreeEventHandler.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberDiffTreeEventHandler.java @@ -206,8 +206,7 @@ public class SubscriberDiffTreeEventHandler extends SubscriberEventHandler { IProgressMonitor monitor) { try { tree.beginInput(); - for (int i = 0; i < events.length; i++) { - SubscriberEvent event = events[i]; + for (SubscriberEvent event : events) { switch (event.getType()) { case SubscriberEvent.CHANGE : if (event instanceof SubscriberDiffChangedEvent) { @@ -220,10 +219,9 @@ public class SubscriberDiffTreeEventHandler extends SubscriberEventHandler { } } break; - case SubscriberEvent.REMOVAL : + case SubscriberEvent.REMOVAL: IDiff[] nodesToRemove = tree.getDiffs(new ResourceTraversal[] { event.asTraversal() }); - for (int j = 0; j < nodesToRemove.length; j++) { - IDiff node = nodesToRemove[j]; + for (IDiff node : nodesToRemove) { tree.remove(node.getPath()); } break; diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberEventHandler.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberEventHandler.java index 94e2495a4..050a0eae6 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberEventHandler.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberEventHandler.java @@ -199,13 +199,10 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { try { IResource[] members = getSubscriber().members(resource); - for (int i = 0; i < members.length; i++) { - collect( - members[i], - depth == IResource.DEPTH_INFINITE + for (IResource member : members) { + collect(member, depth == IResource.DEPTH_INFINITE ? IResource.DEPTH_INFINITE - : IResource.DEPTH_ZERO, - monitor); + : IResource.DEPTH_ZERO, monitor); } } catch (TeamException e) { // We only handle the exception if the resource's project is accessible. @@ -286,11 +283,10 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { * optimized recalculation if supported by the subscriber. */ protected void reset(ResourceTraversal[] traversals, int type) { - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); - for (int j = 0; j < resources.length; j++) { - queueEvent(new SubscriberEvent(resources[j], type, traversal.getDepth()), false); + for (IResource resource : resources) { + queueEvent(new SubscriberEvent(resource, type, traversal.getDepth()), false); } } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberResourceCollector.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberResourceCollector.java index 04b85e69f..78d9e4730 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberResourceCollector.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberResourceCollector.java @@ -68,19 +68,19 @@ public abstract class SubscriberResourceCollector implements IResourceChangeList try { beginInput(); IResource[] roots = getRoots(); - for (int i = 0; i < deltas.length; i++) { - switch (deltas[i].getFlags()) { - case ISubscriberChangeEvent.SYNC_CHANGED : - if (isAllRootsIncluded() || isDescendantOfRoot(deltas[i].getResource(), roots)) { - change(deltas[i].getResource(), IResource.DEPTH_ZERO); + for (ISubscriberChangeEvent delta : deltas) { + switch (delta.getFlags()) { + case ISubscriberChangeEvent.SYNC_CHANGED: + if (isAllRootsIncluded() || isDescendantOfRoot(delta.getResource(), roots)) { + change(delta.getResource(), IResource.DEPTH_ZERO); } break; - case ISubscriberChangeEvent.ROOT_REMOVED : - remove(deltas[i].getResource()); + case ISubscriberChangeEvent.ROOT_REMOVED: + remove(delta.getResource()); break; - case ISubscriberChangeEvent.ROOT_ADDED : - if (isAllRootsIncluded() || isDescendantOfRoot(deltas[i].getResource(), roots)) { - change(deltas[i].getResource(), IResource.DEPTH_INFINITE); + case ISubscriberChangeEvent.ROOT_ADDED: + if (isAllRootsIncluded() || isDescendantOfRoot(delta.getResource(), roots)) { + change(delta.getResource(), IResource.DEPTH_INFINITE); } break; } @@ -168,8 +168,8 @@ public abstract class SubscriberResourceCollector implements IResourceChangeList // Handle changed children if (visitChildren || isAncestorOfRoot(resource, roots)) { IResourceDelta[] affectedChildren = delta.getAffectedChildren(IResourceDelta.CHANGED | IResourceDelta.REMOVED | IResourceDelta.ADDED); - for (int i = 0; i < affectedChildren.length; i++) { - processDelta(affectedChildren[i], roots); + for (IResourceDelta c : affectedChildren) { + processDelta(c, roots); } } } @@ -222,8 +222,7 @@ public abstract class SubscriberResourceCollector implements IResourceChangeList private boolean isAncestorOfRoot(IResource parent, IResource[] roots) { // Always traverse into projects in case a root was removed if (parent.getType() == IResource.ROOT) return true; - for (int i = 0; i < roots.length; i++) { - IResource resource = roots[i]; + for (IResource resource : roots) { if (parent.getFullPath().isPrefixOf(resource.getFullPath())) { return true; } @@ -232,8 +231,7 @@ public abstract class SubscriberResourceCollector implements IResourceChangeList } private boolean isDescendantOfRoot(IResource resource, IResource[] roots) { - for (int i = 0; i < roots.length; i++) { - IResource root = roots[i]; + for (IResource root : roots) { if (root.getFullPath().isPrefixOf(resource.getFullPath())) { return true; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoEventHandler.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoEventHandler.java index 72379bb7c..9bfb1d862 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoEventHandler.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoEventHandler.java @@ -181,8 +181,7 @@ public class SubscriberSyncInfoEventHandler extends SubscriberEventHandler { SubscriberSyncInfoSet syncSet = syncSetInput.getSyncSet(); try { syncSet.beginInput(); - for (int i = 0; i < events.length; i++) { - SubscriberEvent event = events[i]; + for (SubscriberEvent event : events) { switch (event.getType()) { case SubscriberEvent.CHANGE : if (event instanceof SubscriberSyncInfoEvent) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncByteConverter.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncByteConverter.java index a627e32b7..d6c585941 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncByteConverter.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncByteConverter.java @@ -123,8 +123,7 @@ public class SyncByteConverter { public static byte[] toBytes(String[] slots) { StringBuilder buffer = new StringBuilder(); - for (int i = 0; i < slots.length; i++) { - String string = slots[i]; + for (String string : slots) { buffer.append(string); buffer.append(new String(new byte[] {SyncByteConverter.SEPARATOR_BYTE })); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoStatistics.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoStatistics.java index 25e615197..5876de23d 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoStatistics.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoStatistics.java @@ -101,9 +101,7 @@ public class SyncInfoStatistics { @Override public String toString() { StringBuilder out = new StringBuilder(); - Iterator it = stats.keySet().iterator(); - while (it.hasNext()) { - Integer kind = (Integer) it.next(); + for (Integer kind : stats.keySet()) { out.append(SyncInfo.kindToString(kind.intValue()) + ": " + stats.get(kind) + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ } return out.toString(); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoWorkingSetFilter.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoWorkingSetFilter.java index ff232a323..18e8d22dc 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoWorkingSetFilter.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoWorkingSetFilter.java @@ -46,8 +46,7 @@ public class SyncInfoWorkingSetFilter extends FastSyncInfoFilter { private boolean isIncluded(IResource resource) { // otherwise, if their is a parent of the resource in the set, // it is included - for (int i = 0; i < resources.length; i++) { - IResource setResource = resources[i]; + for (IResource setResource : resources) { if (isParent(setResource, resource)) { return true; } @@ -65,8 +64,7 @@ public class SyncInfoWorkingSetFilter extends FastSyncInfoFilter { // filter the roots by the selected working set Set<IResource> result = new HashSet<>(); - for (int i = 0; i < roots.length; i++) { - IResource resource = roots[i]; + for (IResource resource : roots) { result.addAll(Arrays.asList(getIntersectionWithSet(subscriber, resource))); } return result.toArray(new IResource[result.size()]); @@ -78,8 +76,7 @@ public class SyncInfoWorkingSetFilter extends FastSyncInfoFilter { */ private IResource[] getIntersectionWithSet(Subscriber subscriber, IResource resource) { List<IResource> result = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource setResource = resources[i]; + for (IResource setResource : resources) { if (setResource != null) { if (isParent(resource, setResource)) { try { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSyncSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSyncSet.java index 1ec6e245a..9aa0adf79 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSyncSet.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSyncSet.java @@ -46,8 +46,8 @@ public class SyncSetInputFromSyncSet extends SyncSetInput implements ISyncInfoSe protected void fetchInput(IProgressMonitor monitor) { if (inputSyncSet == null) return; SyncInfo[] infos = inputSyncSet.getSyncInfos(); - for (int i = 0; i < infos.length; i++) { - collect(infos[i], monitor); + for (SyncInfo info : infos) { + collect(info, monitor); } } @@ -66,14 +66,14 @@ public class SyncSetInputFromSyncSet extends SyncSetInput implements ISyncInfoSe } private void syncSetChanged(SyncInfo[] infos, IProgressMonitor monitor) { - for (int i = 0; i < infos.length; i++) { - collect(infos[i], monitor); + for (SyncInfo info : infos) { + collect(info, monitor); } } private void remove(IResource[] resources) { - for (int i = 0; i < resources.length; i++) { - remove(resources[i]); + for (IResource resource : resources) { + remove(resource); } } @@ -104,8 +104,7 @@ public class SyncSetInputFromSyncSet extends SyncSetInput implements ISyncInfoSe SubscriberSyncInfoSet syncSet = getSyncSet(); try { syncSet.beginInput(); - for (int i = 0; i < errors.length; i++) { - ITeamStatus status = errors[i]; + for (ITeamStatus status : errors) { syncSet.addError(status); } } finally { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCompareSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCompareSubscriber.java index 2df39fdfa..00a84652b 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCompareSubscriber.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCompareSubscriber.java @@ -61,8 +61,7 @@ public class CVSCompareSubscriber extends CVSSyncTreeSubscriber implements ISubs public void resetRoots(IResource[] resources, CVSTag[] tags) { if (this.resources != null) { List removed = new ArrayList(); - for (int i = 0; i < this.resources.length; i++) { - IResource resource = this.resources[i]; + for (IResource resource : this.resources) { removed.add(new SubscriberChangeEvent(this, ISubscriberChangeEvent.ROOT_REMOVED, resource)); } this.resources = new IResource[0]; @@ -118,8 +117,7 @@ public class CVSCompareSubscriber extends CVSSyncTreeSubscriber implements ISubs @Override public void subscriberResourceChanged(ISubscriberChangeEvent[] deltas) { List outgoingDeltas = new ArrayList(deltas.length); - for (int i = 0; i < deltas.length; i++) { - ISubscriberChangeEvent delta = deltas[i]; + for (ISubscriberChangeEvent delta : deltas) { if ((delta.getFlags() & ISubscriberChangeEvent.ROOT_REMOVED) != 0) { IResource resource = delta.getResource(); outgoingDeltas.addAll(Arrays.asList(handleRemovedRoot(resource))); @@ -142,8 +140,7 @@ public class CVSCompareSubscriber extends CVSSyncTreeSubscriber implements ISubs private SubscriberChangeEvent[] handleRemovedRoot(IResource removedRoot) { // Determine if any of the roots of the compare are affected List removals = new ArrayList(resources.length); - for (int j = 0; j < resources.length; j++) { - IResource root = resources[j]; + for (IResource root : resources) { if (removedRoot.getFullPath().isPrefixOf(root.getFullPath())) { // The root is no longer managed by CVS removals.add(root); @@ -180,8 +177,7 @@ public class CVSCompareSubscriber extends CVSSyncTreeSubscriber implements ISubs return false; } if (this.resources != null) { - for (int i = 0; i < resources.length; i++) { - IResource root = resources[i]; + for (IResource root : resources) { if (root.getFullPath().isPrefixOf(resource.getFullPath())) { return true; } @@ -221,8 +217,7 @@ public class CVSCompareSubscriber extends CVSSyncTreeSubscriber implements ISubs * */ public void primeRemoteTree() throws CVSException { - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); cvsResource.accept(new ICVSResourceVisitor() { public void visitFile(ICVSFile file) throws CVSException { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java index cc2be829e..ddfede413 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java @@ -140,8 +140,7 @@ public class CVSCoreFileModificationValidator extends FileModificationValidator } protected IStatus setWritable(final IFile[] files) { - for (int i = 0; i < files.length; i++) { - IFile file = files[i]; + for (IFile file : files) { ResourceAttributes attributes = file.getResourceAttributes(); if (attributes != null) { attributes.setReadOnly(false); @@ -157,8 +156,7 @@ public class CVSCoreFileModificationValidator extends FileModificationValidator private IFile[] getManagedReadOnlyFiles(IFile[] files) { List readOnlys = new ArrayList(); - for (int i = 0; i < files.length; i++) { - IFile iFile = files[i]; + for (IFile iFile : files) { if (needsCheckout(iFile)) { readOnlys.add(iFile); } @@ -168,8 +166,7 @@ public class CVSCoreFileModificationValidator extends FileModificationValidator protected IFile[] getUnmanagedReadOnlyFiles(IFile[] files) { List readOnlys = new ArrayList(); - for (int i = 0; i < files.length; i++) { - IFile iFile = files[i]; + for (IFile iFile : files) { if (iFile.isReadOnly() && !needsCheckout(iFile)) { readOnlys.add(iFile); } @@ -213,9 +210,11 @@ public class CVSCoreFileModificationValidator extends FileModificationValidator return isReadOnly(resources[0]) ? factory.getParent(resources[0]) : null; //need a lock on the parents of all read-only files HashSet rules = new HashSet(); - for (int i = 0; i < resources.length; i++) - if (isReadOnly(resources[i])) - rules.add(factory.getParent(resources[i])); + for (IResource resource : resources) { + if (isReadOnly(resource)) { + rules.add(factory.getParent(resource)); + } + } return createSchedulingRule(rules); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java index 5f38acc26..68e834b79 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java @@ -58,8 +58,7 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour public IResource[] refresh(IResource[] resources, int depth, IProgressMonitor monitor) throws TeamException { // Only refresh the base of a resource once as it should not change List unrefreshed = new ArrayList(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (!hasResourceVariant(resource)) { unrefreshed.add(resource); } @@ -172,8 +171,7 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour } public void merged(IResource[] resources) throws TeamException { - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { internalMerged(resource); } fireTeamResourceChange(SubscriberChangeEvent.asSyncChangedDeltas(this, resources)); @@ -279,8 +277,7 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour * @see org.eclipse.team.core.subscribers.ITeamResourceChangeListener#teamResourceChanged(org.eclipse.team.core.subscribers.TeamDelta[]) */ public void subscriberResourceChanged(ISubscriberChangeEvent[] deltas) { - for (int i = 0; i < deltas.length; i++) { - ISubscriberChangeEvent delta = deltas[i]; + for (ISubscriberChangeEvent delta : deltas) { switch(delta.getFlags()) { case ISubscriberChangeEvent.ROOT_REMOVED: IResource resource = delta.getResource(); @@ -317,8 +314,7 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour SyncInfoFilter.ContentComparisonSyncInfoFilter contentFilter = new SyncInfoFilter.ContentComparisonSyncInfoFilter(); monitor.beginTask(null, refreshed.length * 100); - for (int i = 0; i < refreshed.length; i++) { - IResource resource = refreshed[i]; + for (IResource resource : refreshed) { if (resource.getType() == IResource.FILE) { ICVSFile local = CVSWorkspaceRoot.getCVSFileFor((IFile)resource); byte[] localBytes = local.getSyncBytes(); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProjectSetCapability.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProjectSetCapability.java index 494172dac..276a7fbab 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProjectSetCapability.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProjectSetCapability.java @@ -221,8 +221,8 @@ public class CVSProjectSetCapability extends ProjectSetCapability { */ public static IProject[] asProjects(String[] referenceStrings, Map infoMap) throws CVSException { Collection result = new ArrayList(); - for (int i = 0; i < referenceStrings.length; i++) { - StringTokenizer tokenizer = new StringTokenizer(referenceStrings[i], ","); //$NON-NLS-1$ + for (String referenceString : referenceStrings) { + StringTokenizer tokenizer = new StringTokenizer(referenceString, ","); //$NON-NLS-1$ String version = tokenizer.nextToken(); // If this is a newer version, then ignore it if (!version.equals("1.0")) //$NON-NLS-1$ @@ -351,10 +351,9 @@ public class CVSProjectSetCapability extends ProjectSetCapability { if (useKnown && (newLocation.getUsername() == null || newLocation.getUsername().length() == 0)) { // look for an existing location that matches ICVSRepositoryLocation[] locations = CVSProviderPlugin.getPlugin().getKnownRepositories(); - for (int i = 0; i < locations.length; i++) { - ICVSRepositoryLocation location = locations[i]; + for (ICVSRepositoryLocation location : locations) { if (CVSRepositoryLocationMatcher.isMatching(newLocation, location)) - return location; + return location; } } if (addIfNotFound) @@ -520,8 +519,8 @@ public class CVSProjectSetCapability extends ProjectSetCapability { return ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(projects[0]); } else { Set rules = new HashSet(); - for (int i = 0; i < projects.length; i++) { - ISchedulingRule modifyRule = ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(projects[i]); + for (IProject project : projects) { + ISchedulingRule modifyRule = ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(project); if (modifyRule instanceof IResource && ((IResource)modifyRule).getType() == IResource.ROOT) { // One of the projects is mapped to a provider that locks the workspace. // Just return the workspace root rule @@ -538,8 +537,7 @@ public class CVSProjectSetCapability extends ProjectSetCapability { /* internal use only */ static void refreshProjects(IProject[] projects, IProgressMonitor monitor) throws CoreException, TeamException { monitor.beginTask(CVSMessages.CVSProvider_Creating_projects_2, projects.length * 100); try { - for (int i = 0; i < projects.length; i++) { - IProject project = projects[i]; + for (IProject project : projects) { // Register the project with Team RepositoryProvider.map(project, CVSProviderPlugin.getTypeId()); CVSTeamProvider provider = (CVSTeamProvider)RepositoryProvider.getProvider(project, CVSProviderPlugin.getTypeId()); @@ -561,8 +559,7 @@ public class CVSProjectSetCapability extends ProjectSetCapability { } monitor.beginTask(CVSMessages.CVSProvider_Scrubbing_projects_1, projects.length * 100); try { - for (int i=0;i<projects.length;i++) { - IProject project = projects[i]; + for (IProject project : projects) { if (project != null && project.exists()) { if(!project.isOpen()) { project.open(Policy.subMonitorFor(monitor, 10)); @@ -577,9 +574,9 @@ public class CVSProjectSetCapability extends ProjectSetCapability { IProgressMonitor subMonitor = Policy.subMonitorFor(monitor, 80); subMonitor.beginTask(null, children.length * 100); try { - for (int j = 0; j < children.length; j++) { - if ( ! children[j].getName().equals(".project")) {//$NON-NLS-1$ - children[j].delete(true /*force*/, Policy.subMonitorFor(subMonitor, 100)); + for (IResource c : children) { + if (!c.getName().equals(".project")) { //$NON-NLS-1$ + c.delete(true /*force*/, Policy.subMonitorFor(subMonitor, 100)); } } } finally { @@ -606,8 +603,8 @@ public class CVSProjectSetCapability extends ProjectSetCapability { if(fileList == null) { throw new CVSException("Content from directory '" + resource.getAbsolutePath() + "' can not be listed."); //$NON-NLS-1$ //$NON-NLS-2$ } - for (int i = 0; i < fileList.length; i++) { - deepDelete(fileList[i]); + for (File f : fileList) { + deepDelete(f); } } resource.delete(); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java index 7a61e6da0..70568ab3b 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java @@ -429,8 +429,7 @@ public class CVSProviderPlugin extends Plugin { synchronized(decoratorEnablementListeners) { listeners = (ICVSDecoratorEnablementListener[]) decoratorEnablementListeners.toArray(new ICVSDecoratorEnablementListener[decoratorEnablementListeners.size()]); } - for (int i = 0; i < listeners.length; i++) { - final ICVSDecoratorEnablementListener listener = listeners[i]; + for (ICVSDecoratorEnablementListener listener : listeners) { ISafeRunnable code = new ISafeRunnable() { public void run() throws Exception { listener.decoratorEnablementChanged(enabled); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java index ac05beb4f..e2357f1ad 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java @@ -128,8 +128,7 @@ public class CVSStatus extends TeamStatus { } if (status.isMultiStatus()) { IStatus[] children = status.getChildren(); - for (int i = 0; i < children.length; i++) { - IStatus child = children[i]; + for (IStatus child : children) { if (isInternalError(child)) { return true; } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java index af043f38c..dffed25ae 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java @@ -369,10 +369,10 @@ public class CVSSyncInfo extends SyncInfo { if (entries == null || entries.length == 0) return null; - for (int i = 0; i < entries.length; i++) { + for (ILogEntry entry : entries) { try { - if (localRevision.equals(entries[i].getRemoteFile().getRevision())) { - return entries[i].getAuthor(); + if (localRevision.equals(entry.getRemoteFile().getRevision())) { + return entry.getAuthor(); } } catch (TeamException e) { CVSProviderPlugin.log(e); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java index 0e738abf8..417b222d9 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java @@ -196,9 +196,9 @@ public class CVSTeamProvider extends RepositoryProvider { */ private String[] getValidArguments(IResource[] resources, LocalOption[] options) throws CVSException { List arguments = new ArrayList(resources.length); - for (int i=0;i<resources.length;i++) { - checkIsChild(resources[i]); - IPath cvsPath = resources[i].getFullPath().removeFirstSegments(1); + for (IResource resource : resources) { + checkIsChild(resource); + IPath cvsPath = resource.getFullPath().removeFirstSegments(1); if (cvsPath.segmentCount() == 0) { arguments.add(Session.CURRENT_LOCAL_FOLDER); } else { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProviderType.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProviderType.java index 7e3573456..1d8cd8062 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProviderType.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProviderType.java @@ -153,8 +153,7 @@ public class CVSTeamProviderType extends RepositoryProviderType implements IAdap @Override public void metaFilesDetected(IProject project, IContainer[] containers) { - for (int i = 0; i < containers.length; i++) { - IContainer container = containers[i]; + for (IContainer container : containers) { IContainer cvsDir = null; if (container.getName().equals("CVS")) { //$NON-NLS-1$ cvsDir = container; diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSWorkspaceSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSWorkspaceSubscriber.java index 004ccb559..dfbabc211 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSWorkspaceSubscriber.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSWorkspaceSubscriber.java @@ -85,8 +85,7 @@ public class CVSWorkspaceSubscriber extends CVSSyncTreeSubscriber implements IRe public IResource[] roots() { List result = new ArrayList(); IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); - for (int i = 0; i < projects.length; i++) { - IProject project = projects[i]; + for (IProject project : projects) { if(project.isOpen()) { RepositoryProvider provider = RepositoryProvider.getProvider(project, CVSProviderPlugin.getTypeId()); if(provider != null) { @@ -161,8 +160,7 @@ public class CVSWorkspaceSubscriber extends CVSSyncTreeSubscriber implements IRe @Override public void collectOutOfSync(IResource[] resources, int depth, final SyncInfoSet set, final IProgressMonitor monitor) { monitor.beginTask(null, IProgressMonitor.UNKNOWN); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { try { if (!isSupervised(resource)) { return; @@ -206,8 +204,7 @@ public class CVSWorkspaceSubscriber extends CVSSyncTreeSubscriber implements IRe boolean keepGoing = visitor.visit(resource); if (keepGoing && depth != IResource.DEPTH_ZERO) { IResource[] members = members(resource); - for (int i = 0; i < members.length; i++) { - IResource member = members[i]; + for (IResource member : members) { visit(member, visitor, depth == IResource.DEPTH_ONE ? IResource.DEPTH_ZERO : IResource.DEPTH_INFINITE); } } @@ -306,11 +303,9 @@ public class CVSWorkspaceSubscriber extends CVSSyncTreeSubscriber implements IRe private int getOutgoingKind(ResourceTraversal[] traversals, IProgressMonitor monitor) throws CoreException { int kind = 0; - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); - for (int j = 0; j < resources.length; j++) { - IResource resource = resources[j]; + for (IResource resource : resources) { IDiff node = getDiff(resource); if (node == null) return IDiff.CHANGE; @@ -329,41 +324,35 @@ public class CVSWorkspaceSubscriber extends CVSSyncTreeSubscriber implements IRe */ public boolean hasLocalChanges(ResourceTraversal[] traversals, IProgressMonitor monitor) throws CoreException { monitor = Policy.monitorFor(monitor); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); switch (traversal.getDepth()) { - case IResource.DEPTH_ZERO: - for (int j = 0; j < resources.length; j++) { - IResource resource = resources[j]; - if (isDirectlyDirty(resource, monitor)) { - return true; - } - } - break; - case IResource.DEPTH_INFINITE: - for (int j = 0; j < resources.length; j++) { - IResource resource = resources[j]; - if (isDirty(resource, monitor)) { - return true; + case IResource.DEPTH_ZERO: + for (IResource resource : resources) { + if (isDirectlyDirty(resource, monitor)) { + return true; + } } - } - break; - case IResource.DEPTH_ONE: - for (int j = 0; j < resources.length; j++) { - IResource resource = resources[j]; - if (isDirectlyDirty(resource, monitor)) { - return true; + break; + case IResource.DEPTH_INFINITE: + for (IResource resource : resources) { + if (isDirty(resource, monitor)) { + return true; + } } - IResource[] children = members(resource); - for (int k = 0; k < children.length; k++) { - IResource child = children[k]; - if (isDirectlyDirty(child, monitor)) { + break; + case IResource.DEPTH_ONE: + for (IResource resource : resources) { + if (isDirectlyDirty(resource, monitor)) { return true; + } IResource[] children = members(resource); + for (IResource child : children) { + if (isDirectlyDirty(child, monitor)) { + return true; + } } } - } - break; + break; } } return false; diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Add.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Add.java index 19dbdbba7..524f1af26 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Add.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Add.java @@ -36,8 +36,8 @@ public class Add extends Command { // Check that all the arguments can give you an // repo that you will need while traversing the // file-structure - for (int i = 0; i < resources.length; i++) { - Assert.isNotNull(resources[i].getRemoteLocation(session.getLocalRoot())); + for (ICVSResource resource : resources) { + Assert.isNotNull(resource.getRemoteLocation(session.getLocalRoot())); } // Get a vistor and use it on every resource we should @@ -59,9 +59,9 @@ public class Add extends Command { return status; } - for (int i = 0; i < resources.length; i++) { - if (resources[i].isFolder()) { - ICVSFolder mFolder = (ICVSFolder) resources[i]; + for (ICVSResource resource : resources) { + if (resource.isFolder()) { + ICVSFolder mFolder = (ICVSFolder) resource; FolderSyncInfo info = mFolder.getParent().getFolderSyncInfo(); if (info == null) { status = mergeStatus(status, new CVSStatus(IStatus.ERROR, NLS.bind(CVSMessages.Add_invalidParent, new String[] { mFolder.getRelativePath(session.getLocalRoot()) }))); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Checkout.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Checkout.java index 4b0193f9c..9571b6cd8 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Checkout.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Checkout.java @@ -85,8 +85,7 @@ public class Checkout extends Command { // Send the information about the local workspace resources to the server List resourcesToSend = new ArrayList(resources.length); - for (int i = 0; i < resources.length; i++) { - ICVSResource resource = resources[i]; + for (ICVSResource resource : resources) { if (resource.exists() && resource.isFolder() && ((ICVSFolder)resource).isCVSFolder()) { resourcesToSend.add(resource); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java index fd1e907fc..36471692c 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java @@ -379,13 +379,13 @@ public abstract class Command extends Request { /*** initiate command ***/ // send global options - for (int i = 0; i < globalOptions.length; i++) { - globalOptions[i].send(session); + for (GlobalOption globalOption : globalOptions) { + globalOption.send(session); } Policy.checkCanceled(monitor); // send local options - for (int i = 0; i < localOptions.length; i++) { - localOptions[i].send(session); + for (LocalOption localOption : localOptions) { + localOption.send(session); } Policy.checkCanceled(monitor); // compute the work resources @@ -574,8 +574,7 @@ public abstract class Command extends Request { return options; } List result = new ArrayList(); - for (int i = 0; i < options.length; i++) { - Command.LocalOption option = options[i]; + for (LocalOption option : options) { if (!option.equals(this)) { result.add(option); } @@ -808,8 +807,8 @@ public abstract class Command extends Request { protected String[] convertArgumentsForOpenSession(ICVSResource[] arguments, Session openSession) throws CVSException { // Convert arguments List stringArguments = new ArrayList(arguments.length); - for (int i = 0; i < arguments.length; i++) { - stringArguments.add(arguments[i].getRelativePath(openSession.getLocalRoot())); + for (ICVSResource argument : arguments) { + stringArguments.add(argument.getRelativePath(openSession.getLocalRoot())); } return (String[]) stringArguments.toArray(new String[stringArguments.size()]); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Commit.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Commit.java index 2980cd5f9..6c76478d3 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Commit.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Commit.java @@ -54,9 +54,9 @@ public class Commit extends Command { // Send the changed files as arguments (because this is what other cvs clients do) ICVSFile[] changedFiles = visitor.getModifiedFiles(); - for (int i = 0; i < changedFiles.length; i++) { + for (ICVSFile changedFile : changedFiles) { // escape file names, see bug 149683 - String fileName = changedFiles[i].getRelativePath(session.getLocalRoot()); + String fileName = changedFile.getRelativePath(session.getLocalRoot()); if(fileName.startsWith("-")){ //$NON-NLS-1$ fileName = "./" + fileName; //$NON-NLS-1$ } @@ -84,10 +84,9 @@ public class Commit extends Command { // Reset the timestamps of any committed files that are still dirty. // Only do so if there were no E messages from the server if (status.isOK()) { - for (int i = 0; i < resources.length; i++) { - ICVSResource resource = resources[i]; + for (ICVSResource resource : resources) { if (!resource.isFolder()) { - ICVSFile cvsFile = (ICVSFile)resources[i]; + ICVSFile cvsFile = (ICVSFile) resource; if (cvsFile.exists() && cvsFile.isModified(null)) { status = mergeStatus(status, clearModifiedState(cvsFile)); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ConsoleListeners.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ConsoleListeners.java index 7ab88ad15..c7630029b 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ConsoleListeners.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ConsoleListeners.java @@ -60,8 +60,7 @@ public class ConsoleListeners implements IConsoleListener { public void commandInvoked(final Session session, final String line) { if (listeners.isEmpty()) return; IConsoleListener[] listeners = getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IConsoleListener listener = listeners[i]; + for (IConsoleListener listener : listeners) { Platform.run(new ISafeRunnable() { public void handleException(Throwable exception) { // Exception logged by Platform @@ -77,8 +76,7 @@ public class ConsoleListeners implements IConsoleListener { public void messageLineReceived(final Session session, final String line, final IStatus status) { if (listeners.isEmpty()) return; IConsoleListener[] listeners = getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IConsoleListener listener = listeners[i]; + for (IConsoleListener listener : listeners) { Platform.run(new ISafeRunnable() { public void handleException(Throwable exception) { // Exception logged by Platform @@ -94,8 +92,7 @@ public class ConsoleListeners implements IConsoleListener { public void errorLineReceived(final Session session, final String line, final IStatus status) { if (listeners.isEmpty()) return; IConsoleListener[] listeners = getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IConsoleListener listener = listeners[i]; + for (IConsoleListener listener : listeners) { Platform.run(new ISafeRunnable() { public void handleException(Throwable exception) { // Exception logged by Platform @@ -111,8 +108,7 @@ public class ConsoleListeners implements IConsoleListener { public void commandCompleted(final Session session, final IStatus status, final Exception exception) { if (listeners.isEmpty()) return; IConsoleListener[] listeners = getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IConsoleListener listener = listeners[i]; + for (IConsoleListener listener : listeners) { Platform.run(new ISafeRunnable() { public void handleException(Throwable exception) { // Exception logged by Platform diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Diff.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Diff.java index 33babbc23..dac85d110 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Diff.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Diff.java @@ -48,8 +48,7 @@ public class Diff extends Command { if (status.getCode() == CVSStatus.SERVER_ERROR) { if (status.isMultiStatus()) { IStatus[] children = status.getChildren(); - for (int i = 0; i < children.length; i++) { - IStatus child = children[i]; + for (IStatus child : children) { if (child.getMessage().indexOf("[diff aborted]") != -1) { //$NON-NLS-1$ throw new CVSServerException(status); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java index f4bf92070..c8d64e84b 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java @@ -83,8 +83,7 @@ class FileStructureVisitor extends AbstractStructureVisitor { * @param children */ private void sendManagedFolders(ICVSResource[] children) throws CVSException { - for (int i = 0; i < children.length; i++) { - ICVSResource resource = children[i]; + for (ICVSResource resource : children) { if (resource.isFolder() && resource.isManaged()) { resource.accept(this); } @@ -96,8 +95,7 @@ class FileStructureVisitor extends AbstractStructureVisitor { * @param children */ private void sendQuestionableFolders(ICVSResource[] children) throws CVSException { - for (int i = 0; i < children.length; i++) { - ICVSResource resource = children[i]; + for (ICVSResource resource : children) { if (resource.isFolder() && ! resource.isManaged()) { resource.accept(this); } @@ -109,8 +107,7 @@ class FileStructureVisitor extends AbstractStructureVisitor { * @param children */ private void sendFiles(ICVSResource[] children) throws CVSException { - for (int i = 0; i < children.length; i++) { - ICVSResource resource = children[i]; + for (ICVSResource resource : children) { if (!resource.isFolder()) { resource.accept(this); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java index c37beec4b..427fd6720 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java @@ -81,13 +81,11 @@ class ImportStructureVisitor implements ICVSResourceVisitor { wrapMatcher = new FileNameMatcher(); - for (int i = 0; i < wrappers.length; i++) { - - if (!wrappers[i].contains(KEYWORD_OPTION)) { + for (String wrapper : wrappers) { + if (!wrapper.contains(KEYWORD_OPTION)) { continue; } - - StringTokenizer st = new StringTokenizer(wrappers[i]); + StringTokenizer st = new StringTokenizer(wrapper); String pattern = st.nextToken(); String option = st.nextToken(); // get rid of the quotes diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/PruneFolderVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/PruneFolderVisitor.java index a65ad5e92..e06a8c9b3 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/PruneFolderVisitor.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/PruneFolderVisitor.java @@ -51,8 +51,7 @@ public class PruneFolderVisitor implements ICVSResourceVisitor { // Visit the resources Set prunableParents = new HashSet(); - for (int i = 0; i < resources.length; i++) { - ICVSResource cvsResource = resources[i]; + for (ICVSResource cvsResource : resources) { // prune the resource and it's children when appropriate cvsResource.accept(this); // if the resource doesn't exists, attempt to prune it's parent diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RemoteCommand.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RemoteCommand.java index 58d8f5a46..8ca5978dc 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RemoteCommand.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RemoteCommand.java @@ -51,19 +51,18 @@ public abstract class RemoteCommand extends Command { Session openSession) throws CVSException { - // Convert arguments - List stringArguments = new ArrayList(arguments.length); - for (int i = 0; i < arguments.length; i++) { - ICVSResource resource = arguments[i]; - String remotePath; - if (isDefinedModule(resource)) { - remotePath = resource.getName(); - } else { - remotePath = resource.getRepositoryRelativePath(); - - } - stringArguments.add(remotePath); + // Convert arguments + List stringArguments = new ArrayList(arguments.length); + for (ICVSResource resource : arguments) { + String remotePath; + if (isDefinedModule(resource)) { + remotePath = resource.getName(); + } else { + remotePath = resource.getRepositoryRelativePath(); + } + stringArguments.add(remotePath); + } return (String[]) stringArguments.toArray(new String[stringArguments.size()]); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java index 341ed488d..b2eddd6fa 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java @@ -178,8 +178,7 @@ public abstract class Request { } else { // look for particularly bad errors in the accumulated statuses IStatus[] errors = session.getErrors(); - for (int i = 0; i < errors.length; i++) { - IStatus s = errors[i]; + for (IStatus s : errors) { if (s.getCode() == CVSStatus.PROTOCOL_ERROR) { throw new CVSServerException(status); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/ServerMessageLineMatcher.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/ServerMessageLineMatcher.java index f14bfe1c0..305a2c8e8 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/ServerMessageLineMatcher.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/ServerMessageLineMatcher.java @@ -79,8 +79,7 @@ public class ServerMessageLineMatcher { * Throw an exception if the found variables do not match the expected variables */ private void ensureMatches(String template, List variables, String[] expectedVariables) throws CVSException { - for (int i = 0; i < expectedVariables.length; i++) { - String expected = expectedVariables[i]; + for (String expected : expectedVariables) { if (!variables.contains(expected)) { IStatus status = new CVSStatus(IStatus.ERROR,NLS.bind(CVSMessages.ServerMessageLineMatcher_7, new String[] { expected, template })); throw new CVSException(status); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java index 5138d2cee..b9b1dd980 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java @@ -427,8 +427,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit connectionMethods.add(new PServerConnectionMethod()); } else { IExtension[] extensions = Platform.getExtensionRegistry().getExtensionPoint(CVSProviderPlugin.ID, CVSProviderPlugin.PT_CONNECTIONMETHODS).getExtensions(); - for(int i=0; i<extensions.length; i++) { - IExtension extension = extensions[i]; + for (IExtension extension : extensions) { IConfigurationElement[] configs = extension.getConfigurationElements(); if (configs.length == 0) { CVSProviderPlugin.log(IStatus.ERROR, NLS.bind("Connection method {0} is missing required fields", new Object[] {extension.getUniqueIdentifier()}), null);//$NON-NLS-1$ @@ -456,9 +455,10 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit private static IConnectionMethod getPluggedInConnectionMethod(String methodName) { Assert.isNotNull(methodName); IConnectionMethod[] methods = getPluggedInConnectionMethods(); - for(int i=0; i<methods.length; i++) { - if(methodName.equals(methods[i].getName())) - return methods[i]; + for (IConnectionMethod m : methods) { + if (methodName.equals(m.getName())) { + return m; + } } return null; } @@ -642,8 +642,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit // There is the off chance that there is a file in the root of the repository. // This is not supported by cvs so we need to make sure there are no files List<ICVSRemoteResource> folders = new ArrayList<ICVSRemoteResource>(resources.length); - for (int i = 0; i < resources.length; i++) { - ICVSRemoteResource remoteResource = resources[i]; + for (ICVSRemoteResource remoteResource : resources) { if (remoteResource.isContainer()) { folders.add(remoteResource); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSServerException.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSServerException.java index c4b7c7b7c..baace6ca0 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSServerException.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSServerException.java @@ -35,8 +35,8 @@ public class CVSServerException extends CVSException { if ( ! status.isMultiStatus()) return false; IStatus[] children = ((MultiStatus)status).getChildren(); - for (int i = 0; i < children.length; i++) { - if (children[i].getCode() == CVSStatus.NO_SUCH_TAG) { + for (IStatus child : children) { + if (child.getCode() == CVSStatus.NO_SUCH_TAG) { return true; } } @@ -51,9 +51,10 @@ public class CVSServerException extends CVSException { if ( ! status.isMultiStatus()) return status.getSeverity() == IStatus.ERROR; IStatus[] children = ((MultiStatus)status).getChildren(); - for (int i=0;i<children.length;i++) { - if (children[i].getSeverity() == IStatus.ERROR) + for (IStatus child : children) { + if (child.getSeverity() == IStatus.ERROR) { return true; + } } return false; } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filehistory/CVSFileHistory.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filehistory/CVSFileHistory.java index 4b96051cc..18e951e3b 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filehistory/CVSFileHistory.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filehistory/CVSFileHistory.java @@ -122,9 +122,9 @@ public class CVSFileHistory extends FileHistory { if (flag == IFileHistoryProvider.SINGLE_REVISION) { String revisionNumber = cvsFile.getSyncInfo().getRevision(); - for (int i = 0; i < entries.length; i++) { - if (entries[i].getRevision().equals(revisionNumber)) { - remoteRevisions = new IFileRevision[] {new CVSFileRevision(entries[i])}; + for (ILogEntry entry : entries) { + if (entry.getRevision().equals(revisionNumber)) { + remoteRevisions = new IFileRevision[]{new CVSFileRevision(entry)}; revisions = new IFileRevision[1]; //copy over remote revisions System.arraycopy(remoteRevisions, 0, revisions, 0, remoteRevisions.length); @@ -135,19 +135,18 @@ public class CVSFileHistory extends FileHistory { } else if (flag == IFileHistoryProvider.SINGLE_LINE_OF_DESCENT) { CVSTag tempTag = cvsFile.getSyncInfo().getTag(); ArrayList<ILogEntry> entriesOfInterest = new ArrayList<>(); - for (int i = 0; i < entries.length; i++) { - CVSTag[] tags = entries[i].getTags(); - for (int j = 0; j < tags.length; j++) { - if (tags[j].getType() == tempTag.getType()) { - if (tempTag.getType() == CVSTag.BRANCH && tempTag.getName().equals(tags[j].getName())) { - entriesOfInterest.add(entries[i]); + for (ILogEntry entry : entries) { + CVSTag[] tags = entry.getTags(); + for (CVSTag tag : tags) { + if (tag.getType() == tempTag.getType()) { + if (tempTag.getType() == CVSTag.BRANCH && tempTag.getName().equals(tag.getName())) { + entriesOfInterest.add(entry); break; } else { - entriesOfInterest.add(entries[i]); + entriesOfInterest.add(entry); break; } } - } } @@ -224,9 +223,10 @@ public class CVSFileHistory extends FileHistory { public IFileRevision getFileRevision(String id) { IFileRevision[] revisions = getFileRevisions(); - for (int i = 0; i < revisions.length; i++) { - if (revisions[i].getContentIdentifier().equals(id)) - return revisions[i]; + for (IFileRevision revision : revisions) { + if (revision.getContentIdentifier().equals(id)) { + return revision; + } } return null; } @@ -238,15 +238,16 @@ public class CVSFileHistory extends FileHistory { //the predecessor is the file with a timestamp that is the largest timestamp //from the set of all timestamps smaller than the root file's timestamp IFileRevision fileRevision = null; - for (int i = 0; i < revisions.length; i++) { - if (((CVSFileRevision) revisions[i]).isPredecessorOf(revision)) { + for (IFileRevision r : revisions) { + if (((CVSFileRevision) r).isPredecessorOf(revision)) { //no revision has been set as of yet - if (fileRevision == null) - fileRevision = revisions[i]; + if (fileRevision == null) { + fileRevision = r; + } //this revision is a predecessor - now check to see if it comes //after the current predecessor, if it does make it the current predecessor - if (revisions[i].getTimestamp() > fileRevision.getTimestamp()) { - fileRevision = revisions[i]; + if (r.getTimestamp() > fileRevision.getTimestamp()) { + fileRevision = r; } } } @@ -262,9 +263,9 @@ public class CVSFileHistory extends FileHistory { //from the set of all timestamps smaller than the root file's timestamp ArrayList<IFileRevision> directDescendents = new ArrayList<>(); - for (int i = 0; i < revisions.length; i++) { - if (((CVSFileRevision) revisions[i]).isDescendentOf(revision)) { - directDescendents.add(revisions[i]); + for (IFileRevision r : revisions) { + if (((CVSFileRevision) r).isDescendentOf(revision)) { + directDescendents.add(r); } } return directDescendents.toArray(new IFileRevision[directDescendents.size()]); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/CVSFileStore.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/CVSFileStore.java index 4af5b931d..688376b23 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/CVSFileStore.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/CVSFileStore.java @@ -102,8 +102,7 @@ public class CVSFileStore extends FileStore { } ICVSResource[] children = folder.fetchChildren(monitor); ICVSResource resource = null; - for (int i = 0; i < children.length; i++) { - ICVSResource child = children[i]; + for (ICVSResource child : children) { if (child.getName().equals(getName())) { resource = child; break; diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/CVSFileTree.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/CVSFileTree.java index 8668054bd..5cd57a811 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/CVSFileTree.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/CVSFileTree.java @@ -130,8 +130,7 @@ public class CVSFileTree { ICVSRemoteResource[] children =remoteFolder.getChildren(); ICVSResource resource = null; - for (int i = 0; i < children.length; i++) { - ICVSResource child = children[i]; + for (ICVSRemoteResource child : children) { if (child.getName().equals(resourceName)) { resource = child; break; diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/CVSURI.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/CVSURI.java index da89d3517..2d1832567 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/CVSURI.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/CVSURI.java @@ -87,15 +87,15 @@ public class CVSURI { sb.append(ssp.substring(i + 1, j)); String[] params = ssp.substring(j).split(";"); //$NON-NLS-1$ String projectName = ""; //$NON-NLS-1$ - for (int k = 0; k < params.length; k++) { + for (String param : params) { // PDE way of providing tags - if (params[k].startsWith("tag=")) { //$NON-NLS-1$ + if (param.startsWith("tag=")) { //$NON-NLS-1$ sb.append(",version="); //$NON-NLS-1$ - sb.append(params[k].substring(params[k].indexOf('=') + 1)); - } else if (params[k].startsWith("version=")) { //$NON-NLS-1$ - sb.append(',').append(params[k]); - } else if (params[k].startsWith("project=")) { //$NON-NLS-1$ - projectName = params[k].substring(params[k].indexOf('=') + 1); + sb.append(param.substring(param.indexOf('=') + 1)); + } else if (param.startsWith("version=")) { //$NON-NLS-1$ + sb.append(',').append(param); + } else if (param.startsWith("project=")) { //$NON-NLS-1$ + projectName = param.substring(param.indexOf('=') + 1); } } sb.append(',').append(projectName); // can be "" diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/LogEntryCache.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/LogEntryCache.java index 2a4803bbc..e837d78d3 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/LogEntryCache.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/LogEntryCache.java @@ -132,8 +132,7 @@ class LogEntryCache implements ILogEntryListener { * Return null if the revision wasn't found. */ ICVSRemoteFile findRevison(ILogEntry[] allLogs, String predecessorRevision) throws TeamException { - for (int i = 0; i < allLogs.length; i++) { - ILogEntry entry = allLogs[i]; + for (ILogEntry entry : allLogs) { ICVSRemoteFile file = entry.getRemoteFile(); if (file.getRevision().equals(predecessorRevision)) { return file; diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/RemoteLogger.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/RemoteLogger.java index 06992c31a..c414f3902 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/RemoteLogger.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/RemoteLogger.java @@ -78,9 +78,8 @@ public class RemoteLogger { String[] entry = this.cache.getCachedFilePaths(); treeBuilder = new RLogTreeBuilder(project.getRepository(), tag, cache); - for (int i = 0; i < entry.length; i++) { - ILogEntry[] logEntry = this.cache.getLogEntries(entry[i]); - + for (String e : entry) { + ILogEntry[] logEntry = this.cache.getLogEntries(e); //might not have state if this a branch entry if (logEntry[0].getState() != null && logEntry[0].getState().equals(DEAD_STATE)) continue; diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/mapping/ChangeSetResourceMapping.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/mapping/ChangeSetResourceMapping.java index 7ec0c2d30..aaf674188 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/mapping/ChangeSetResourceMapping.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/mapping/ChangeSetResourceMapping.java @@ -42,8 +42,7 @@ public class ChangeSetResourceMapping extends ResourceMapping { public IProject[] getProjects() { Set result = new HashSet(); IResource[] resources = changeSet.getResources(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { result.add(resource.getProject()); } return (IProject[]) result.toArray(new IProject[result.size()]); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java index d15a35d64..bc5a6f626 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java @@ -50,8 +50,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { boolean includeIgnored = ((flags & IGNORED_MEMBERS) != 0); boolean includeExisting = (((flags & EXISTING_MEMBERS) != 0) || ((flags & (EXISTING_MEMBERS | PHANTOM_MEMBERS)) == 0)); boolean includePhantoms = (((flags & PHANTOM_MEMBERS) != 0) || ((flags & (EXISTING_MEMBERS | PHANTOM_MEMBERS)) == 0)); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { int type = resource.getType(); if ((includeFiles && (type==IResource.FILE)) || (includeFolders && (type==IResource.FOLDER))) { @@ -134,12 +133,12 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { // Visit files and then folders ICVSResource[] subFiles = members(FILE_MEMBERS); - for (int i=0; i<subFiles.length; i++) { - subFiles[i].accept(visitor); + for (ICVSResource subFile : subFiles) { + subFile.accept(visitor); } ICVSResource[] subFolders = members(FOLDER_MEMBERS); - for (int i=0; i<subFolders.length; i++) { - subFolders[i].accept(visitor); + for (ICVSResource subFolder : subFolders) { + subFolder.accept(visitor); } } @@ -157,8 +156,8 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { } else { resources = members(ICVSFolder.FILE_MEMBERS); } - for (int i = 0; i < resources.length; i++) { - resources[i].accept(visitor, recurse); + for (ICVSResource r : resources) { + r.accept(visitor, recurse); } } @@ -230,9 +229,8 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { EclipseSynchronizer.getInstance().deleteFolderSync(container); IResource[] members = container.members(true); - for (int i = 0; i < members.length; i++) { + for (IResource resource : members) { monitor.worked(1); - IResource resource = members[i]; if (resource.getType() == IResource.FILE) { ResourceAttributes attrs = resource.getResourceAttributes(); if (attrs != null && attrs.isReadOnly()) { @@ -354,8 +352,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { private boolean calculateAndSaveChildModificationStates(IProgressMonitor monitor) throws CVSException { ICVSResource[] children = members(ALL_UNIGNORED_MEMBERS); - for (int i = 0; i < children.length; i++) { - ICVSResource resource = children[i]; + for (ICVSResource resource : children) { if (resource.isModified(null)) { // if a child resource is dirty consider the parent dirty as well, there // is no need to continue checking other siblings. diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java index fb010a389..7546634f8 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java @@ -179,8 +179,7 @@ public class EclipseSynchronizer implements IFlushOperation { // this is done first since deleting the folder sync may remove a phantom cacheResourceSyncForChildren(folder, true /* can modify workspace */); IResource[] children = folder.members(true); - for (int i = 0; i < children.length; i++) { - IResource resource = children[i]; + for (IResource resource : children) { resourceChanged(resource); // delete resource sync for all children getSyncInfoCacheFor(resource).setCachedSyncBytes(resource, null, true); @@ -405,8 +404,10 @@ public class EclipseSynchronizer implements IFlushOperation { String[] ignores = SyncFileWriter.readCVSIgnoreEntries(folder); if (ignores != null) { // verify that the pattern has not already been added - for (int i = 0; i < ignores.length; i++) { - if (ignores[i].equals(pattern)) return; + for (String ignore : ignores) { + if (ignore.equals(pattern)) { + return; + } } // add the pattern String[] oldIgnores = ignores; @@ -636,8 +637,7 @@ public class EclipseSynchronizer implements IFlushOperation { * listeners. */ public void ignoreFilesChanged(IContainer[] roots) throws CVSException { - for (int i = 0; i < roots.length; i++) { - IContainer container = roots[i]; + for (IContainer container : roots) { if (container.exists()) { ISchedulingRule rule = null; try { @@ -661,8 +661,7 @@ public class EclipseSynchronizer implements IFlushOperation { FileNameMatcher newIgnores = cacheFolderIgnores(container); try { IResource[] members = container.members(); - for (int j = 0; j < members.length; j++) { - IResource resource = members[j]; + for (IResource resource : members) { if (resource.getType() == IResource.FOLDER) { String name = resource.getName(); if (oldIgnores.match(name) && !newIgnores.match(name)) { @@ -692,15 +691,13 @@ public class EclipseSynchronizer implements IFlushOperation { public void syncFilesChangedExternally(IContainer[] changedMetaFiles, IFile[] externalDeletions) throws CVSException { List<IResource> changed = new ArrayList<>(); - for (int i = 0; i < changedMetaFiles.length; i++) { - IContainer container = changedMetaFiles[i]; + for (IContainer container : changedMetaFiles) { if (!isWithinActiveOperationScope(container)) { changed.addAll(Arrays.asList( - sessionPropertyCache.purgeCache(container, false /*don't flush children*/))); + sessionPropertyCache.purgeCache(container, false /*don't flush children*/))); } } - for (int i = 0; i < externalDeletions.length; i++) { - IFile file = externalDeletions[i]; + for (IFile file : externalDeletions) { if (!isWithinActiveOperationScope(file)) { sessionPropertyCache.purgeCache(file.getParent(), false /*don't flush children*/); changed.add(file); @@ -869,8 +866,7 @@ public class EclipseSynchronizer implements IFlushOperation { } try { if (infos != null) { - for (int i = 0; i < infos.length; i++) { - byte[] syncBytes = infos[i]; + for (byte[] syncBytes : infos) { IPath name = new Path(null, getName(syncBytes)); IResource resource; if (isFolder(syncBytes)) { @@ -924,8 +920,7 @@ public class EclipseSynchronizer implements IFlushOperation { private byte[] getSyncBytesFromDisk(IResource resource) throws CVSException { byte[][] infos = SyncFileWriter.readAllResourceSync(resource.getParent()); if (infos == null) return null; - for (int i = 0; i < infos.length; i++) { - byte[] syncBytes = infos[i]; + for (byte[] syncBytes : infos) { if (resource.getName().equals(getName(syncBytes))) { return syncBytes; } @@ -959,8 +954,7 @@ public class EclipseSynchronizer implements IFlushOperation { changedFolders = new IContainer[0]; } Set<IContainer> dirtyParents = new HashSet<>(); - for (int i = 0; i < changedResources.length; i++) { - IResource resource = changedResources[i]; + for (IResource resource : changedResources) { IContainer folder = resource.getParent(); dirtyParents.add(folder); } @@ -977,8 +971,7 @@ public class EclipseSynchronizer implements IFlushOperation { /*** write sync info to disk ***/ // folder sync info changes - for (int i = 0; i < changedFolders.length; i++) { - IContainer folder = changedFolders[i]; + for (IContainer folder : changedFolders) { if (folder.exists() && folder.getType() != IResource.ROOT) { try { beginOperation(); @@ -1020,8 +1013,7 @@ public class EclipseSynchronizer implements IFlushOperation { beginOperation(); List<byte[]> infos = new ArrayList<>(); IResource[] children = folder.members(true); - for (int i = 0; i < children.length; i++) { - IResource resource = children[i]; + for (IResource resource : children) { byte[] syncBytes = getSyncBytes(resource); if (syncBytes != null) { infos.add(syncBytes); @@ -1166,8 +1158,7 @@ public class EclipseSynchronizer implements IFlushOperation { IResource[] children = folder.members(); List<IResource> folders = new ArrayList<>(); // deal with all files first and then folders to be otimized for caching scheme - for (int i = 0; i < children.length; i++) { - IResource child = children[i]; + for (IResource child : children) { if(getCachedSyncBytes(child)==null) { possibleIgnores.add(child); } @@ -1205,8 +1196,7 @@ public class EclipseSynchronizer implements IFlushOperation { infos = new NotifyInfo[] { info }; } else { Map<String, NotifyInfo> infoMap = new HashMap<>(); - for (int i = 0; i < infos.length; i++) { - NotifyInfo notifyInfo = infos[i]; + for (NotifyInfo notifyInfo : infos) { infoMap.put(notifyInfo.getName(), notifyInfo); } if (info == null) { @@ -1235,8 +1225,7 @@ public class EclipseSynchronizer implements IFlushOperation { public NotifyInfo getNotifyInfo(IResource resource) throws CVSException { NotifyInfo[] infos = SyncFileWriter.readAllNotifyInfo(resource.getParent()); if (infos == null) return null; - for (int i = 0; i < infos.length; i++) { - NotifyInfo notifyInfo = infos[i]; + for (NotifyInfo notifyInfo : infos) { if (notifyInfo.getName().equals(resource.getName())) { return notifyInfo; } @@ -1252,8 +1241,7 @@ public class EclipseSynchronizer implements IFlushOperation { NotifyInfo[] infos = SyncFileWriter.readAllNotifyInfo(resource.getParent()); if (infos == null) return; Map<String, NotifyInfo> infoMap = new HashMap<>(); - for (int i = 0; i < infos.length; i++) { - NotifyInfo notifyInfo = infos[i]; + for (NotifyInfo notifyInfo : infos) { infoMap.put(notifyInfo.getName(), notifyInfo); } infoMap.remove(resource.getName()); @@ -1282,8 +1270,8 @@ public class EclipseSynchronizer implements IFlushOperation { infos = new BaserevInfo[] { info }; } else { Map<String, BaserevInfo> infoMap = new HashMap<>(); - for (int i = 0; i < infos.length; i++) { - infoMap.put(infos[i].getName(), infos[i]); + for (BaserevInfo i : infos) { + infoMap.put(i.getName(), i); } infoMap.put(info.getName(), info); BaserevInfo[] newInfos = new BaserevInfo[infoMap.size()]; @@ -1304,8 +1292,7 @@ public class EclipseSynchronizer implements IFlushOperation { public BaserevInfo getBaserevInfo(IResource resource) throws CVSException { BaserevInfo[] infos = SyncFileWriter.readAllBaserevInfo(resource.getParent()); if (infos == null) return null; - for (int i = 0; i < infos.length; i++) { - BaserevInfo info = infos[i]; + for (BaserevInfo info : infos) { if (info.getName().equals(resource.getName())) { return info; } @@ -1321,8 +1308,8 @@ public class EclipseSynchronizer implements IFlushOperation { BaserevInfo[] infos = SyncFileWriter.readAllBaserevInfo(resource.getParent()); if (infos == null) return; Map<String, BaserevInfo> infoMap = new HashMap<>(); - for (int i = 0; i < infos.length; i++) { - infoMap.put(infos[i].getName(), infos[i]); + for (BaserevInfo info : infos) { + infoMap.put(info.getName(), info); } infoMap.remove(resource.getName()); BaserevInfo[] newInfos = new BaserevInfo[infoMap.size()]; @@ -1389,8 +1376,7 @@ public class EclipseSynchronizer implements IFlushOperation { // get the folders involved IContainer[] folders = getParentFolders(resources, depth); // for all folders that have a CVS folder, ensure the sync info is cached - for (int i = 0; i < folders.length; i++) { - IContainer parent = folders[i]; + for (IContainer parent : folders) { if (!getSyncInfoCacheFor(parent).isSyncInfoLoaded(parent)) { return false; } @@ -1410,8 +1396,7 @@ public class EclipseSynchronizer implements IFlushOperation { // get the folders involved IContainer[] folders = getParentFolders(resources, depth); // Cache the sync info for all the folders - for (int i = 0; i < folders.length; i++) { - IContainer parent = folders[i]; + for (IContainer parent : folders) { ISchedulingRule rule = null; try { rule = beginBatching(parent, null); @@ -1435,8 +1420,7 @@ public class EclipseSynchronizer implements IFlushOperation { */ private IContainer[] getParentFolders(IResource[] resources, int depth) throws CVSException { final Set<IResource> folders = new HashSet<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { folders.add(resource.getProject()); if (resource.getType() != IResource.PROJECT) { folders.add(resource.getParent()); @@ -1755,8 +1739,8 @@ public class EclipseSynchronizer implements IFlushOperation { boolean okToSet = !modified; // Obtain the children while we're locked to ensure some were not added or changed ICVSResource[] children = cvsFolder.members(ICVSFolder.ALL_UNIGNORED_MEMBERS); - for (int i = 0; i < children.length; i++) { - IResource resource = children[i].getIResource(); + for (ICVSResource child : children) { + IResource resource = child.getIResource(); if (modified) { if (getDirtyIndicator(resource) == IS_DIRTY_INDICATOR) { okToSet = true; @@ -1805,8 +1789,7 @@ public class EclipseSynchronizer implements IFlushOperation { monitor = Policy.monitorFor(monitor); monitor.beginTask(null, 100); rule = beginBatching(projectsRule, monitor); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { try { created(resource); } catch (CVSException e) { @@ -1821,8 +1804,7 @@ public class EclipseSynchronizer implements IFlushOperation { private ISchedulingRule getProjectRule(IResource[] resources) { HashSet<IProject> set = new HashSet<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { set.add(resource.getProject()); } IProject[] projects = set.toArray(new IProject[set.size()]); @@ -1875,8 +1857,7 @@ public class EclipseSynchronizer implements IFlushOperation { // Purge new resource sync before restoring from phantom ICVSFolder cvsFolder = CVSWorkspaceRoot.getCVSFolderFor(folder); ICVSResource[] children = cvsFolder.members(ICVSFolder.MANAGED_MEMBERS); - for (int i = 0; i < children.length; i++) { - ICVSResource resource = children[i]; + for (ICVSResource resource : children) { deleteResourceSync(resource.getIResource()); } } @@ -1889,8 +1870,7 @@ public class EclipseSynchronizer implements IFlushOperation { // Indicate that a member has changed so the entries file gets written (see bug 181546) IResource[] members = members(folder); IResource changedResource = null; - for (int i = 0; i < members.length; i++) { - IResource resource = members[i]; + for (IResource resource : members) { if (getSyncBytes(resource) != null) { changedResource = resource; break; diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/FileContentCachingService.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/FileContentCachingService.java index dace20051..fe42611c1 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/FileContentCachingService.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/FileContentCachingService.java @@ -122,8 +122,7 @@ public class FileContentCachingService { private String[] getUncachedFiles() { if (fileDiffs.length == 0) return fileDiffs; List<String> existing = new ArrayList<>(); - for (int i = 0; i < fileDiffs.length; i++) { - String filePath = fileDiffs[i]; + for (String filePath : fileDiffs) { try { ICVSFile file = remoteRoot.getFile(filePath); if (file instanceof RemoteFile) { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java index 73d7d66c8..dba46aa20 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java @@ -94,8 +94,8 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC } else { resources = members(ICVSFolder.FILE_MEMBERS); } - for (int i = 0; i < resources.length; i++) { - resources[i].accept(visitor, recurse); + for (ICVSResource resource : resources) { + resource.accept(visitor, recurse); } } @@ -233,8 +233,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC boolean includeManaged = (((flags & MANAGED_MEMBERS) != 0) || ((flags & (MANAGED_MEMBERS | UNMANAGED_MEMBERS | IGNORED_MEMBERS)) == 0)); boolean includeUnmanaged = (((flags & UNMANAGED_MEMBERS) != 0) || ((flags & (MANAGED_MEMBERS | UNMANAGED_MEMBERS | IGNORED_MEMBERS)) == 0)); boolean includeIgnored = ((flags & IGNORED_MEMBERS) != 0); - for (int i = 0; i < resources.length; i++) { - ICVSResource cvsResource = resources[i]; + for (ICVSRemoteResource cvsResource : resources) { if ((includeFiles && ( ! cvsResource.isFolder())) || (includeFolders && (cvsResource.isFolder()))) { boolean isManaged = cvsResource.isManaged(); @@ -340,9 +339,10 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC IStatus status = new CVSStatus(IStatus.ERROR, CHILD_DOES_NOT_EXIST, NLS.bind(CVSMessages.RemoteFolder_invalidChild, new String[] { path, getName() }),repository); throw new CVSException(status); } - for (int i=0;i<children.length;i++) { - if (children[i].getName().equals(path)) - return children[i]; + for (ICVSRemoteResource c : children) { + if (c.getName().equals(path)) { + return c; + } } } IStatus status = new CVSStatus(IStatus.ERROR, CHILD_DOES_NOT_EXIST, NLS.bind(CVSMessages.RemoteFolder_invalidChild, new String[] { path, getName() }),repository); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java index b2bf01607..de7707516 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java @@ -295,12 +295,10 @@ public class RemoteFolderMemberFetcher implements IUpdateMessageListener, IStatu public ICVSRemoteResource[] getFetchedChildren() { ICVSRemoteResource[] resources = new ICVSRemoteResource[folders.size() + files.size()]; int count = 0; - for (Iterator iter = folders.iterator(); iter.hasNext();) { - ICVSRemoteResource resource = (ICVSRemoteResource) iter.next(); + for (ICVSRemoteResource resource : folders) { resources[count++] = resource; } - for (Iterator iter = files.iterator(); iter.hasNext();) { - ICVSRemoteResource resource = (ICVSRemoteResource) iter.next(); + for (ICVSRemoteResource resource : files) { resources[count++] = resource; } return resources; diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderSandbox.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderSandbox.java index 0171bc54d..85a38479a 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderSandbox.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderSandbox.java @@ -102,17 +102,17 @@ public class RemoteFolderSandbox extends RemoteFolder { public void acceptChildren(ICVSResourceVisitor visitor) throws CVSException { ICVSRemoteResource[] children = getChildren(); if (children == null) return; - for (int i=0; i<children.length; i++) { - ((ICVSResource)children[i]).accept(visitor); + for (ICVSRemoteResource c : children) { + ((ICVSResource) c).accept(visitor); } } public void remove(RemoteFile file) { ICVSRemoteResource[] children = getChildren(); ArrayList<ICVSRemoteResource> results = new ArrayList<>(); - for (int i = 0; i < children.length; i++) { - if (children[i] != file){ - results.add(children[i]); + for (ICVSRemoteResource c : children) { + if (c != file) { + results.add(c); } } setChildren(results.toArray(new ICVSRemoteResource[results.size()])); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTree.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTree.java index df979cff2..ab737997a 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTree.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTree.java @@ -67,8 +67,8 @@ public class RemoteFolderTree extends RemoteFolder { public void acceptChildren(ICVSResourceVisitor visitor) throws CVSException { ICVSRemoteResource[] children = getChildren(); if (children == null) return; - for (int i=0; i<children.length; i++) { - ((ICVSResource)children[i]).accept(visitor); + for (ICVSRemoteResource c : children) { + ((ICVSResource) c).accept(visitor); } } } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java index 6ff79882a..97b65a345 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java @@ -178,8 +178,7 @@ public class RemoteFolderTreeBuilder { // Get the arguments from the files ArrayList<String> arguments = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - ICVSResource resource = resources[i]; + for (ICVSResource resource : resources) { arguments.add(resource.getRelativePath(root)); } @@ -381,8 +380,8 @@ public class RemoteFolderTreeBuilder { // Build the child folders corresponding to local folders base ICVSResource[] folders = local.members(ICVSFolder.FOLDER_MEMBERS); - for (int i=0;i<folders.length;i++) { - ICVSFolder folder = (ICVSFolder)folders[i]; + for (ICVSResource f : folders) { + ICVSFolder folder = (ICVSFolder) f; if (folder.isManaged() && folder.isCVSFolder()) { monitor.worked(1); RemoteFolder tree = buildBaseTree(remote, folder, monitor); @@ -393,8 +392,8 @@ public class RemoteFolderTreeBuilder { // Build the child files corresponding to local files base ICVSResource[] files = local.members(ICVSFolder.FILE_MEMBERS); - for (int i=0;i<files.length;i++) { - ICVSFile file = (ICVSFile)files[i]; + for (ICVSResource f : files) { + ICVSFile file = (ICVSFile) f; byte[] syncBytes = file.getSyncBytes(); // if there is no sync info then there is no base if (syncBytes==null) @@ -459,21 +458,17 @@ public class RemoteFolderTreeBuilder { if (local != null) { // Build the child folders corresponding to local folders ICVSResource[] folders = local.members(ICVSFolder.FOLDER_MEMBERS); - for (int i=0;i<folders.length;i++) { - ICVSFolder folder = (ICVSFolder)folders[i]; + for (ICVSResource f : folders) { + ICVSFolder folder = (ICVSFolder) f; DeltaNode d = (DeltaNode)deltas.get(folder.getName()); if (folder.isCVSFolder() && ! isOrphanedSubtree(folder) && (d==null || d.getRevision() != DELETED)) { - children.put(folders[i].getName(), - new RemoteFolderTree(remote, folders[i].getName(), repository, - folder.getFolderSyncInfo().getRepository(), - tagForRemoteFolder(folder,tag))); + children.put(f.getName(), new RemoteFolderTree(remote, f.getName(), repository, folder.getFolderSyncInfo().getRepository(), tagForRemoteFolder(folder,tag))); } } // Build the child files corresponding to local files ICVSResource[] files = local.members(ICVSFolder.FILE_MEMBERS); - for (int i=0;i<files.length;i++) { - ICVSFile file = (ICVSFile)files[i]; - + for (ICVSResource f : files) { + ICVSFile file = (ICVSFile) f; DeltaNode d = (DeltaNode)deltas.get(file.getName()); byte[] syncBytes = file.getSyncBytes(); // if there is no sync info then there isn't a remote file for this local file on the diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java index 21b39973e..dc0dfc496 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java @@ -70,10 +70,9 @@ public class RemoteModule extends RemoteFolder { Map moduleAliases = new HashMap(); // First pass: Create the remote module instances based on remote mapping - for (int i = 0; i < moduleDefinitionStrings.length; i++) { - + for (String moduleDefinitionString : moduleDefinitionStrings) { // Read the module name - StringTokenizer tokenizer = new StringTokenizer(moduleDefinitionStrings[i]); + StringTokenizer tokenizer = new StringTokenizer(moduleDefinitionString); String moduleName = tokenizer.nextToken(); List<LocalOption> localOptionsList; String next; @@ -108,7 +107,7 @@ public class RemoteModule extends RemoteFolder { } } catch (NoSuchElementException e) { // There is an invalid entry in the modules file. Log it and continue - CVSProviderPlugin.log(IStatus.WARNING, NLS.bind(CVSMessages.RemoteModule_invalidDefinition, new String[] { moduleDefinitionStrings[i], repository.getLocation(true) }), null); + CVSProviderPlugin.log(IStatus.WARNING, NLS.bind(CVSMessages.RemoteModule_invalidDefinition, new String[]{moduleDefinitionString, repository.getLocation(true)}), null); continue; } LocalOption[] localOptions = localOptionsList.toArray(new LocalOption[localOptionsList.size()]); @@ -172,17 +171,17 @@ public class RemoteModule extends RemoteFolder { String[] expansion = (String[])moduleAliases.get(moduleName); List referencedFolders = new ArrayList(); boolean expandable = true; - for (int i = 0; i < expansion.length; i++) { - if (expansion[i].charAt(0) == '!') { + for (String e : expansion) { + if (e.charAt(0) == '!') { // XXX Unsupported for now expandable = false; } else { - IPath path = new Path(null, expansion[i]); + IPath path = new Path(null, e); if (path.segmentCount() > 1) { // XXX Unsupported for now expandable = false; } else { - RemoteModule child = (RemoteModule)modules.get(expansion[i]); + RemoteModule child = (RemoteModule) modules.get(e); if (child == null) { referencedFolders.add(new RemoteFolder(null, repository, path.toString(), tag)); } else { @@ -214,8 +213,8 @@ public class RemoteModule extends RemoteFolder { RemoteModule module = (RemoteModule)modules.get(moduleName); List<RemoteModule> referencedFolders = new ArrayList<>(); boolean expandable = true; - for (int i = 0; i < children.length; i++) { - RemoteModule child = (RemoteModule)modules.get(children[i].substring(1)); + for (String c : children) { + RemoteModule child = (RemoteModule) modules.get(c.substring(1)); if (child == null) { // invalid module definition expandable = false; @@ -316,8 +315,7 @@ public class RemoteModule extends RemoteFolder { ICVSRemoteResource[] children = getChildren(); if (children != null) { List taggedChildren = new ArrayList(children.length); - for (int i = 0; i < children.length; i++) { - ICVSRemoteResource resource = children[i]; + for (ICVSRemoteResource resource : children) { taggedChildren.add(((RemoteResource)resource).forTag(r, tagName)); } r.setChildren((ICVSRemoteResource[]) taggedChildren.toArray(new ICVSRemoteResource[taggedChildren.size()])); @@ -325,8 +323,8 @@ public class RemoteModule extends RemoteFolder { } if (referencedModules != null) { List taggedModules = new ArrayList(referencedModules.length); - for (int i = 0; i < referencedModules.length; i++) { - RemoteModule module = (RemoteModule)referencedModules[i]; + for (ICVSRemoteResource referencedModule : referencedModules) { + RemoteModule module = (RemoteModule) referencedModule; taggedModules.add(module.forTag(r, tagName)); } r.setReferencedModules((ICVSRemoteResource[]) taggedModules.toArray(new ICVSRemoteResource[taggedModules.size()])); @@ -358,9 +356,10 @@ public class RemoteModule extends RemoteFolder { // and use the inherited method in the other cases if (referencedModules != null) { if (!path.contains(Session.SERVER_SEPARATOR)) { - for (int i=0;i<referencedModules.length;i++) { - if (referencedModules[i].getName().equals(path)) - return referencedModules[i]; + for (ICVSRemoteResource referencedModule : referencedModules) { + if (referencedModule.getName().equals(path)) { + return referencedModule; + } } } } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java index 3ec9dc795..5d78afc5b 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java @@ -154,8 +154,7 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileWriter; EclipseSynchronizer.getInstance().adjustDirtyStateRecursively(container, RECOMPUTE_INDICATOR); } IResource[] members = container.members(); - for (int i = 0; i < members.length; i++) { - IResource resource = members[i]; + for (IResource resource : members) { purgeResourceSyncCache(resource); flushed.add(resource); if (deep && resource.getType() != IResource.FILE) { @@ -406,12 +405,11 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileWriter; } else { projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); } - for (int i = 0; i < projects.length; i++) { - IProject project = projects[i]; + for (IProject project : projects) { RepositoryProvider provider = RepositoryProvider.getProvider( - project, - CVSProviderPlugin.getTypeId()); - + project, + CVSProviderPlugin.getTypeId()); + // found a project managed by CVS, convert each session property on a // folder to a sync object. if (provider != null) { @@ -462,8 +460,8 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileWriter; if (resource.getType() != IResource.FILE) { ResourcesPlugin.getWorkspace().getSynchronizer().flushSyncInfo(FOLDER_DIRTY_STATE_KEY, resource, IResource.DEPTH_INFINITE); IResource[] members = ((IContainer)resource).members(); - for (int i = 0; i < members.length; i++) { - purgeDirtyCache(members[i]); + for (IResource member : members) { + purgeDirtyCache(member); } } } catch (CoreException e) { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java index c93f23583..58f091db6 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java @@ -254,8 +254,7 @@ import org.eclipse.team.internal.ccvs.core.util.Util; String indicator = NOT_DIRTY_INDICATOR; ICVSResource[] children = cvsFolder.members(ICVSFolder.MANAGED_MEMBERS | ICVSFolder.PHANTOM_MEMBERS); - for (int i = 0; i < children.length; i++) { - ICVSResource resource = children[i]; + for (ICVSResource resource : children) { // keep looking into phantom folders until a managed phantom file // is found. if (resource.isFolder()) { @@ -305,8 +304,7 @@ import org.eclipse.team.internal.ccvs.core.util.Util; IResource[] pendingWrites = getPendingCacheWrites(); if (pendingWrites != null){ HashSet<IResource> cachedResources = new HashSet<>(); - for (int i = 0; i < pendingWrites.length; i++) { - IResource resource = pendingWrites[i]; + for (IResource resource : pendingWrites) { if (resource.getParent().equals(folder)) cachedResources.add(resource); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java index c062b6a19..df4ba864f 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java @@ -235,8 +235,7 @@ public class UpdateContentCachingService implements IUpdateMessageListener { throw new CVSException(status); } } - for (Iterator iterator = removed.iterator(); iterator.hasNext();) { - ICVSResource resource = (ICVSResource) iterator.next(); + for (ICVSResource resource : removed) { if (resource.exists()) resource.delete(); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSDescendantResourceVariantByteStore.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSDescendantResourceVariantByteStore.java index 13e0bea0b..a87356a78 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSDescendantResourceVariantByteStore.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSDescendantResourceVariantByteStore.java @@ -79,8 +79,7 @@ public class CVSDescendantResourceVariantByteStore extends DescendantResourceVar public IStatus handleResourceChanges(IResource[] changedResources, boolean canModifyWorkspace) { // IMPORTANT NOTE: This will throw exceptions if performed during the POST_CHANGE delta phase!!! List errors = new ArrayList(); - for (int i = 0; i < changedResources.length; i++) { - IResource resource = changedResources[i]; + for (IResource resource : changedResources) { try { if (!isInCVSProject(resource)) continue; if (resource.getType() == IResource.FILE diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSResourceVariantTree.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSResourceVariantTree.java index d15e2158c..c6e060638 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSResourceVariantTree.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSResourceVariantTree.java @@ -89,8 +89,7 @@ public class CVSResourceVariantTree extends ResourceVariantTree { members.addAll(Arrays.asList(super.members(resource))); try { IResource[] localMembers = EclipseSynchronizer.getInstance().members((IContainer) resource); //((IContainer)resource).members(true); - for (int i = 0; i < localMembers.length; i++) { - IResource local = localMembers[i]; + for (IResource local : localMembers) { if (local.getType() != IResource.FILE) { ICVSFolder folder = CVSWorkspaceRoot.getCVSFolderFor((IContainer)local); if (folder.isCVSFolder()) { @@ -248,8 +247,7 @@ public class CVSResourceVariantTree extends ResourceVariantTree { List children = new ArrayList(); List changedResources = new ArrayList(); children.addAll(Arrays.asList(members)); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (!children.contains(resource)) { // These sync bytes are stale. Purge them flushVariants(resource, IResource.DEPTH_INFINITE); @@ -273,8 +271,7 @@ public class CVSResourceVariantTree extends ResourceVariantTree { if (local.getType() != IResource.FILE && (local.exists() || local.isPhantom())) { IResource[] allChildren = ((IContainer)local).members(true /* include phantoms */); List childrenWithSyncBytes = new ArrayList(); - for (int i = 0; i < allChildren.length; i++) { - IResource resource = allChildren[i]; + for (IResource resource : allChildren) { if (getByteStore().getBytes(resource) != null) { childrenWithSyncBytes.add(resource); } @@ -333,8 +330,7 @@ public class CVSResourceVariantTree extends ResourceVariantTree { private boolean isJobInFamilyRunning(Object family) { Job[] jobs = Job.getJobManager().find(family); if (jobs != null && jobs.length > 0) { - for (int i = 0; i < jobs.length; i++) { - Job job = jobs[i]; + for (Job job : jobs) { if (job.getState() != Job.NONE) { return true; } @@ -366,8 +362,7 @@ public class CVSResourceVariantTree extends ResourceVariantTree { RemoteFolderTree remote = RemoteFolderTree.fromBytes(parent, resource, remoteBytes); IResource[] members = members(resource); List children = new ArrayList(); - for (int i = 0; i < members.length; i++) { - IResource member = members[i]; + for (IResource member : members) { ICVSRemoteResource child = buildTree(remote, member, immutable, monitor); if (child != null) children.add(child); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/DeferredResourceChangeHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/DeferredResourceChangeHandler.java index 94c96483a..bf7c77fce 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/DeferredResourceChangeHandler.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/DeferredResourceChangeHandler.java @@ -107,8 +107,7 @@ public class DeferredResourceChangeHandler extends BackgroundEventHandler { } IResource[] deletions = (IResource[]) conflictingDeletion.toArray(new IResource[conflictingDeletion.size()]); conflictingDeletion.clear(); - for (int i = 0; i < deletions.length; i++) { - IResource resource = deletions[i]; + for (IResource resource : deletions) { ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); try { if(!cvsResource.isFolder() && cvsResource.isManaged()) { @@ -124,8 +123,7 @@ public class DeferredResourceChangeHandler extends BackgroundEventHandler { private Map getResourcesByProject(IResource[] resources) { Map result = new HashMap(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { IProject project = resource.getProject(); List projectResources = (List)result.get(project); if (projectResources == null) { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/BuildCleanupListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/BuildCleanupListener.java index 125df45d5..01e5c9d07 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/BuildCleanupListener.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/BuildCleanupListener.java @@ -100,8 +100,7 @@ public class BuildCleanupListener implements IResourceDeltaVisitor, IResourceCha try { IResourceDelta root = event.getDelta(); IResourceDelta[] projectDeltas = root.getAffectedChildren(); - for (int i = 0; i < projectDeltas.length; i++) { - final IResourceDelta delta = projectDeltas[i]; + for (IResourceDelta delta : projectDeltas) { IResource resource = delta.getResource(); if (resource.getType() == IResource.PROJECT) { @@ -109,8 +108,8 @@ public class BuildCleanupListener implements IResourceDeltaVisitor, IResourceCha if (!resource.isAccessible()) continue; } - RepositoryProvider provider = RepositoryProvider.getProvider(resource.getProject(), CVSProviderPlugin.getTypeId()); - + RepositoryProvider provider = RepositoryProvider.getProvider(resource.getProject(), CVSProviderPlugin.getTypeId()); + // Make sure that the project is a CVS folder. ICVSFolder folder = CVSWorkspaceRoot.getCVSFolderFor(resource.getProject()); if (provider != null) { @@ -125,7 +124,7 @@ public class BuildCleanupListener implements IResourceDeltaVisitor, IResourceCha } // if a project is moved the originating project will not be associated with the CVS provider - // however listeners will probably still be interested in the move delta. + // however listeners will probably still be interested in the move delta. if ((delta.getFlags() & IResourceDelta.MOVED_TO) > 0) { IResource destination = getResourceFor(resource.getProject(), resource, delta.getMovedToPath()); provider = RepositoryProvider.getProvider(destination.getProject()); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/FileNameMatcher.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/FileNameMatcher.java index 7a99deb94..d0745f538 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/FileNameMatcher.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/FileNameMatcher.java @@ -36,8 +36,8 @@ public class FileNameMatcher { } void register(String[] patterns) { - for (int i = 0; i < patterns.length; i++) { - register(patterns[i],TRUE); + for (String pattern : patterns) { + register(pattern, TRUE); } } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/KnownRepositories.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/KnownRepositories.java index 0a4ca0659..9b2de723b 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/KnownRepositories.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/KnownRepositories.java @@ -204,8 +204,7 @@ public class KnownRepositories implements INodeChangeListener, IPreferenceChange prefs.addNodeChangeListener(this); try { String[] keys = prefs.childrenNames(); - for (int i = 0; i < keys.length; i++) { - String key = keys[i]; + for (String key : keys) { try { IEclipsePreferences node = (IEclipsePreferences) prefs.node(key); node.addPreferenceChangeListener(this); @@ -238,10 +237,10 @@ public class KnownRepositories implements INodeChangeListener, IPreferenceChange // If the file did not exist, then prime the list of repositories with // the providers with which the projects in the workspace are shared. IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); - for (int i = 0; i < projects.length; i++) { - RepositoryProvider provider = RepositoryProvider.getProvider(projects[i], CVSProviderPlugin.getTypeId()); + for (IProject project : projects) { + RepositoryProvider provider = RepositoryProvider.getProvider(project, CVSProviderPlugin.getTypeId()); if (provider!=null) { - ICVSFolder folder = (ICVSFolder)CVSWorkspaceRoot.getCVSResourceFor(projects[i]); + ICVSFolder folder = (ICVSFolder) CVSWorkspaceRoot.getCVSResourceFor(project); FolderSyncInfo info = folder.getFolderSyncInfo(); if (info != null) { addRepository(getRepository(info.getRoot()), false); @@ -260,8 +259,7 @@ public class KnownRepositories implements INodeChangeListener, IPreferenceChange // Get a snapshot of the listeners so the list doesn't change while we're firing ICVSListener[] listeners = getListeners(); // Notify each listener in a safe manner (i.e. so their exceptions don't kill us) - for (int i = 0; i < listeners.length; i++) { - ICVSListener listener = listeners[i]; + for (ICVSListener listener : listeners) { notification.run(listener); } } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/MoveDeleteHook.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/MoveDeleteHook.java index cae80c613..b3660855c 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/MoveDeleteHook.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/MoveDeleteHook.java @@ -270,8 +270,7 @@ public class MoveDeleteHook implements IMoveDeleteHook { final List readOnlyFiles = new ArrayList(); try { // Find any read-only files - for (int i = 0; i < folders.length; i++) { - IFolder folder = folders[i]; + for (IFolder folder : folders) { if (folder.exists()) { folder.accept(resource -> { if (resource.getType() == IResource.FILE) { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java index 25a10777f..1ecdb5756 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java @@ -149,14 +149,13 @@ public class PrepareForReplaceVisitor implements ICVSResourceVisitor { folder.acceptChildren(this); } else if (depth == IResource.DEPTH_ONE) { ICVSResource[] files = folder.members(ICVSFolder.FILE_MEMBERS); - for (int i = 0; i < files.length; i++) { - files[i].accept(this); + for (ICVSResource file : files) { + file.accept(this); } } // Also delete ignored child files that start with .# ICVSResource[] ignoredFiles = folder.members(ICVSFolder.FILE_MEMBERS | ICVSFolder.IGNORED_MEMBERS); - for (int i = 0; i < ignoredFiles.length; i++) { - ICVSResource cvsResource = ignoredFiles[i]; + for (ICVSResource cvsResource : ignoredFiles) { if (cvsResource.getName().startsWith(".#")) { //$NON-NLS-1$ cvsResource.delete(); } @@ -171,11 +170,11 @@ public class PrepareForReplaceVisitor implements ICVSResourceVisitor { CVSWorkspaceRoot.getCVSFolderFor(project).run(pm1 -> { monitor = Policy.infiniteSubMonitorFor(pm1, 100); monitor.beginTask(null, 512); - for (int i = 0; i < resources.length; i++) { + for (ICVSResource resource : resources) { if (oneArgMessage != null) { - monitor.subTask(NLS.bind(oneArgMessage, new String[] { resources[i].getIResource().getFullPath().toString() })); + monitor.subTask(NLS.bind(oneArgMessage, new String[]{resource.getIResource().getFullPath().toString()})); } - resources[i].accept(PrepareForReplaceVisitor.this); + resource.accept(PrepareForReplaceVisitor.this); } monitor.done(); }, pm); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/ResourceStateChangeListeners.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/ResourceStateChangeListeners.java index 96c47ded4..99e2d1c89 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/ResourceStateChangeListeners.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/ResourceStateChangeListeners.java @@ -73,8 +73,7 @@ public class ResourceStateChangeListeners { // Get a snapshot of the listeners so the list doesn't change while we're firing IResourceStateChangeListener[] listeners = getListeners(); // Notify each listener in a safe manner (i.e. so their exceptions don't kill us) - for (int i = 0; i < listeners.length; i++) { - IResourceStateChangeListener listener = listeners[i]; + for (IResourceStateChangeListener listener : listeners) { notification.run(listener); } } @@ -149,8 +148,7 @@ public class ResourceStateChangeListeners { System.out.print(" from thread " + Thread.currentThread().getName()); //$NON-NLS-1$ System.out.print(" for the following " + resources.length + " resources"); //$NON-NLS-1$ //$NON-NLS-2$ System.out.println(":"); //$NON-NLS-1$ - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { System.out.println(resource.getFullPath().toString()); } } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileChangeListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileChangeListener.java index c04708776..e81337326 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileChangeListener.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileChangeListener.java @@ -133,8 +133,8 @@ public class SyncFileChangeListener implements IResourceChangeListener { if(isMetaFile(resource)) { IResource[] toBeNotified = handleChangedMetaFile(resource); if(toBeNotified.length>0 && isModifiedBy3rdParty(resource)) { - for (int i = 0; i < toBeNotified.length; i++) { - changedContainers.add(toBeNotified[i]); + for (IResource t : toBeNotified) { + changedContainers.add(t); } if(Policy.DEBUG_METAFILE_CHANGES) { System.out.println("[cvs] metafile changed by 3rd party: " + resource.getFullPath()); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileWriter.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileWriter.java index b63bf4a2e..5bdbdcce3 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileWriter.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileWriter.java @@ -84,8 +84,7 @@ public class SyncFileWriter { String[] entries = readLines(cvsSubDir.getFile(ENTRIES)); if (entries == null) return null; Map infos = new TreeMap(); - for (int i = 0; i < entries.length; i++) { - String line = entries[i]; + for (String line : entries) { if(!FOLDER_TAG.equals(line) && !"".equals(line)) { //$NON-NLS-1$ try { ResourceSyncInfo info = new ResourceSyncInfo(line, null); @@ -93,7 +92,7 @@ public class SyncFileWriter { } catch (CVSException e) { // There was a problem parsing the entry line. // Log the problem and skip the entry - CVSProviderPlugin.log(new CVSStatus(IStatus.ERROR, NLS.bind(CVSMessages.SyncFileWriter_0, new String[] { parent.getFullPath().toString() }), e)); + CVSProviderPlugin.log(new CVSStatus(IStatus.ERROR, NLS.bind(CVSMessages.SyncFileWriter_0, new String[] { parent.getFullPath().toString() }), e)); } } } @@ -101,8 +100,7 @@ public class SyncFileWriter { // process Entries.log file contents String[] entriesLog = readLines(cvsSubDir.getFile(ENTRIES_LOG)); if (entriesLog != null) { - for (int i = 0; i < entriesLog.length; i++) { - String line = entriesLog[i]; + for (String line : entriesLog) { if (line.startsWith(ADD_TAG)) { line = line.substring(ADD_TAG.length()); ResourceSyncInfo info = new ResourceSyncInfo(line, null); @@ -279,8 +277,7 @@ public class SyncFileWriter { return null; // Split each line on spaces and tabs. ArrayList/*<String>*/ entries = new ArrayList/*<String>*/(); - for (int ln = 0; ln < lines.length; ln++) { - String line = lines[ln]; + for (String line : lines) { int pos = 0; while (pos < line.length()) { if (line.charAt(pos) == ' ' || line.charAt(pos) == '\t') @@ -336,8 +333,7 @@ public class SyncFileWriter { String[] entries = readLines(cvsSubDir.getFile(NOTIFY)); if (entries == null) return null; Map infos = new TreeMap(); - for (int i = 0; i < entries.length; i++) { - String line = entries[i]; + for (String line : entries) { if(!"".equals(line)) { //$NON-NLS-1$ try { NotifyInfo info = new NotifyInfo(parent, line); @@ -402,8 +398,7 @@ public class SyncFileWriter { String[] entries = readLines(cvsSubDir.getFile(BASEREV)); if (entries == null) return null; Map infos = new TreeMap(); - for (int i = 0; i < entries.length; i++) { - String line = entries[i]; + for (String line : entries) { if(!"".equals(line)) { //$NON-NLS-1$ BaserevInfo info = new BaserevInfo(line); infos.put(info.getName(), info); @@ -616,8 +611,8 @@ public class SyncFileWriter { byte[] lineEnd = getLineDelimiter(); try { try { - for (int i = 0; i < contents.length; i++) { - os.write(contents[i].getBytes()); + for (String content : contents) { + os.write(content.getBytes()); os.write(lineEnd); } } finally { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/Util.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/Util.java index e8078ccbf..71f680f27 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/Util.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/Util.java @@ -368,8 +368,8 @@ public class Util { return tag; } - for (int i = 0; i < members.length; i++) { - if (members[i].getType() == IResource.FILE) { + for (IResource member : members) { + if (member.getType() == IResource.FILE) { return tag; } } diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2ServerConnection.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2ServerConnection.java index 700719e82..55e5c20c7 100644 --- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2ServerConnection.java +++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2ServerConnection.java @@ -95,10 +95,10 @@ public class PServerSSH2ServerConnection implements IServerConnection { String[] list = session.getPortForwardingL(); String name = ":" + rhost + ":" + rport; //$NON-NLS-1$ //$NON-NLS-2$ boolean done = false; - for (int i = 0; i < list.length; i++) { - if (list[i].endsWith(name)) { + for (String l : list) { + if (l.endsWith(name)) { try { - String foo = list[i].substring(0, list[i].indexOf(':')); + String foo = l.substring(0, l.indexOf(':')); lport = Integer.parseInt(foo); } catch (Exception ee) { // Ignore diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableHierarchicalResourceList.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableHierarchicalResourceList.java index 1daca5d76..460e6d4f1 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableHierarchicalResourceList.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableHierarchicalResourceList.java @@ -46,8 +46,7 @@ public class AdaptableHierarchicalResourceList extends AdaptableResourceList { private IResource[] getChildenFor(IContainer parent) { Set children = new HashSet(); IPath parentPath = parent.getFullPath(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { IPath resourcePath = resource.getFullPath(); if (parent instanceof IWorkspaceRoot) { children.add(((IWorkspaceRoot)parent).getProject(resourcePath.segment(0))); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoration.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoration.java index 06fbde3e5..50afc49af 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoration.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoration.java @@ -466,8 +466,7 @@ public class CVSDecoration { private boolean isRequestedProperty(String[] properties, String property) { if (properties == null) return true; - for (int i = 0; i < properties.length; i++) { - String string = properties[i]; + for (String string : properties) { if (string.equals(property)) return true; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java index 3ecbab3a8..75d75a502 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java @@ -138,8 +138,8 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork Object[] result = dialog.getResult(); - for (int i = 0; i < result.length; i++) { - fText.insert("{"+((Map.Entry)result[i]).getKey() +"}"); //$NON-NLS-1$ //$NON-NLS-2$ + for (Object r : result) { + fText.insert("{" + ((Map.Entry) r).getKey() + "}"); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -428,20 +428,20 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork } private void setColorsAndFonts(TreeItem[] items) { - for (int i = 0; i < items.length; i++) { + for (TreeItem item : items) { if (fGeneralTab.isFontDecorationEnabled()) { - Color backGroundColor = getBackground(items[i].getData()); - items[i].setBackground(backGroundColor); - Color foreGroundColor = getForeground(items[i].getData()); - items[i].setForeground(foreGroundColor); - Font font = getFont(items[i].getData()); - items[i].setFont(font); + Color backGroundColor = getBackground(item.getData()); + item.setBackground(backGroundColor); + Color foreGroundColor = getForeground(item.getData()); + item.setForeground(foreGroundColor); + Font font = getFont(item.getData()); + item.setFont(font); } else { - items[i].setBackground(null); - items[i].setForeground(null); - items[i].setFont(null); + item.setBackground(null); + item.setForeground(null); + item.setFont(null); } - setColorsAndFonts(items[i].getItems()); + setColorsAndFonts(item.getItems()); } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryFilter.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryFilter.java index 792359752..960ab5251 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryFilter.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryFilter.java @@ -69,8 +69,8 @@ public class CVSHistoryFilter extends ViewerFilter { protected boolean branchMatch(CVSFileRevision revision) { ITag[] branches = revision.getBranches(); - for (int i = 0; i < branches.length; i++) { - if ((branches[i].getName().toLowerCase().indexOf(branchName.toLowerCase()) != -1)) { + for (ITag branche : branches) { + if (branche.getName().toLowerCase().indexOf(branchName.toLowerCase()) != -1) { return true; } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java index 3329846d8..ec43c24a3 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java @@ -1154,9 +1154,9 @@ public class CVSHistoryPage extends HistoryPage implements IAdaptable, IHistoryC private IFileRevision getFileRevision(String revision) { if (entries != null) { - for (int i = 0; i < entries.length; i++) { - if (entries[i].getContentIdentifier().equals(revision)) { - return entries[i]; + for (IFileRevision entry : entries) { + if (entry.getContentIdentifier().equals(revision)) { + return entry; } } } else if (cvsFileHistory != null) { @@ -1172,17 +1172,17 @@ public class CVSHistoryPage extends HistoryPage implements IAdaptable, IHistoryC public void selectLocalRevision(long timeStamp){ IFileRevision entry = null; if (entries != null) { - for (int i = 0; i < entries.length; i++) { - if (entries[i].getTimestamp() == timeStamp) { - entry = entries[i]; + for (IFileRevision e : entries) { + if (e.getTimestamp() == timeStamp) { + entry = e; break; } } }else if (cvsFileHistory != null) { IFileRevision[] tempEntries = cvsFileHistory.getFileRevisions(); - for (int i = 0; i < tempEntries.length; i++) { - if (tempEntries[i].getTimestamp() == timeStamp) { - entry = tempEntries[i]; + for (IFileRevision tempEntry : tempEntries) { + if (tempEntry.getTimestamp() == timeStamp) { + entry = tempEntry; break; } } @@ -1627,16 +1627,16 @@ public class CVSHistoryPage extends HistoryPage implements IAdaptable, IHistoryC private void mapExpandedElements(Object[] expandedElements) { //store the names of the currently expanded categories in a map HashMap elementMap = new HashMap(); - for (int i=0; i<expandedElements.length; i++){ - elementMap.put(((DateHistoryCategory)expandedElements[i]).getName(), null); + for (Object expandedElement : expandedElements) { + elementMap.put(((DateHistoryCategory) expandedElement).getName(), null); } //Go through the new categories and keep track of the previously expanded ones ArrayList expandable = new ArrayList(); - for (int i = 0; i<categories.length; i++){ + for (AbstractHistoryCategory category : categories) { //check to see if this category is currently expanded - if (elementMap.containsKey(categories[i].getName())){ - expandable.add(categories[i]); + if (elementMap.containsKey(category.getName())) { + expandable.add(category); } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistorySearchFilter.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistorySearchFilter.java index b42ad4343..555e8f1d0 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistorySearchFilter.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistorySearchFilter.java @@ -92,8 +92,8 @@ public class CVSHistorySearchFilter extends org.eclipse.jface.viewers.ViewerFilt protected boolean branchNameMatch(CVSFileRevision revision) { ITag[] branches = revision.getBranches(); - for (int i = 0; i < branches.length; i++) { - String tag = branches[i].getName().toLowerCase(); + for (ITag branche : branches) { + String tag = branche.getName().toLowerCase(); Iterator iter = searchStrings.iterator(); while (iter.hasNext()) { if (!!tag.contains(((String) iter.next()).toLowerCase())) @@ -106,8 +106,8 @@ public class CVSHistorySearchFilter extends org.eclipse.jface.viewers.ViewerFilt protected boolean tagMatch(CVSFileRevision revision) { ITag[] tags = revision.getTags(); - for (int i = 0; i < tags.length; i++) { - String tag = tags[i].getName().toLowerCase(); + for (ITag t : tags) { + String tag = t.getName().toLowerCase(); Iterator iter = searchStrings.iterator(); while (iter.hasNext()) { if (!!tag.contains(((String) iter.next()).toLowerCase())) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryTableProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryTableProvider.java index fb9c4d991..ecbaae729 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryTableProvider.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryTableProvider.java @@ -317,8 +317,8 @@ public class CVSHistoryTableProvider { if (currentRevisionFont == null) { Font defaultFont = JFaceResources.getDefaultFont(); FontData[] data = defaultFont.getFontData(); - for (int i = 0; i < data.length; i++) { - data[i].setStyle(SWT.BOLD); + for (FontData d : data) { + d.setStyle(SWT.BOLD); } currentRevisionFont = new Font(viewer.getTree().getDisplay(), data); } @@ -593,8 +593,8 @@ public class CVSHistoryTableProvider { getSettingsInt(COL_AUTHOR_NAME), getSettingsInt(COL_COMMENT_NAME) }; ColumnLayoutData weightData[] = getWeightData(widths); - for (int i = 0; i < weightData.length; i++) { - layout.addColumnData(weightData[i]); + for (ColumnLayoutData w : weightData) { + layout.addColumnData(w); } String sortName = settings.get(SORT_COL_NAME); @@ -685,9 +685,8 @@ public class CVSHistoryTableProvider { public void saveColumnLayout() { TreeColumn columns[] = viewer.getTree().getColumns(); - for (int i = 0; i < columns.length; i++) { - settings.put((String) columns[i].getData(COL_NAME), columns[i] - .getWidth()); + for (TreeColumn column : columns) { + settings.put((String) column.getData(COL_NAME), column.getWidth()); } settings.put(SORT_COL_NAME, (String) viewer.getTree().getSortColumn() .getData(COL_NAME)); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java index 9a7f7608c..40ffd361b 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java @@ -90,12 +90,11 @@ public class CVSLightweightDecorator extends LabelProvider implements ILightweig private void ensureFontAndColorsCreated(final String[] fonts, final String[] colors) { CVSUIPlugin.getStandardDisplay().syncExec(() -> { ITheme theme = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme(); - for (int i1 = 0; i1 < colors.length; i1++) { - theme.getColorRegistry().get(colors[i1]); - + for (String color : colors) { + theme.getColorRegistry().get(color); } - for (int i2 = 0; i2 < fonts.length; i2++) { - theme.getFontRegistry().get(fonts[i2]); + for (String font : fonts) { + theme.getFontRegistry().get(font); } }); } @@ -188,8 +187,7 @@ public class CVSLightweightDecorator extends LabelProvider implements ILightweig private boolean isMappedToCVS(ResourceMapping mapping) { IProject[] projects = mapping.getProjects(); boolean foundOne = false; - for (int i = 0; i < projects.length; i++) { - IProject project = projects[i]; + for (IProject project : projects) { if (project != null) { RepositoryProvider provider = RepositoryProvider.getProvider(project); if (provider instanceof CVSTeamProvider) { @@ -248,8 +246,7 @@ public class CVSLightweightDecorator extends LabelProvider implements ILightweig private static boolean isSupervised(Object element) throws CoreException { IResource[] resources = getTraversalRoots(element); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (getSubscriber().isSupervised(resource)) return true; } @@ -261,11 +258,9 @@ public class CVSLightweightDecorator extends LabelProvider implements ILightweig ResourceMapping mapping = Utils.getResourceMapping(element); if (mapping != null) { ResourceTraversal[] traversals = mapping.getTraversals(ResourceMappingContext.LOCAL_CONTEXT, null); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); - for (int j = 0; j < resources.length; j++) { - IResource resource = resources[j]; + for (IResource resource : resources) { result.add(resource); } } @@ -391,8 +386,7 @@ public class CVSLightweightDecorator extends LabelProvider implements ILightweig IResource[] resources = getTraversalRoots(element); boolean first = true; CVSTag tag = null; - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (getSubscriber().isSupervised(resource)) { CVSTag nextTag = getTagToShow(resource); if (first) { @@ -522,9 +516,7 @@ public class CVSLightweightDecorator extends LabelProvider implements ILightweig IPreferenceStore store = CVSUIPlugin.getPlugin().getPreferenceStore(); boolean showingDeepDirtyIndicators = store.getBoolean(ICVSUIConstants.PREF_CALCULATE_DIRTY); - for (int i = 0; i < changedResources.length; i++) { - IResource resource = changedResources[i]; - + for (IResource resource : changedResources) { if(showingDeepDirtyIndicators) { addWithParents(resource, resourcesToUpdate); } else { @@ -584,8 +576,7 @@ public class CVSLightweightDecorator extends LabelProvider implements ILightweig } ResourceMapping mapping = Utils.getResourceMapping(element); IProject[] projects = mapping.getProjects(); - for (int i = 0; i < projects.length; i++) { - IProject project = projects[i]; + for (IProject project : projects) { if (!project.isAccessible()) { return; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java index ea9a9140a..db1f92bb2 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java @@ -296,8 +296,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref final KSubstOption[] options = KSubstOption.getAllKSubstOptions(); final ArrayList<KSubstOption> KSUBST_MODES= new ArrayList<>(); - for (int i = 0; i < options.length; i++) { - final KSubstOption option = options[i]; + for (KSubstOption option : options) { if (!option.isBinary()) { KSUBST_MODES.add(option); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java index 6a786d621..543f4f8e7 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java @@ -87,8 +87,7 @@ public class CVSProjectPropertiesPage extends CVSPropertiesPage { private void initialize(ICVSRepositoryLocation oldLocation) { allLocations = CVSUIPlugin.getPlugin().getRepositoryManager().getKnownRepositoryLocations(); List locations = new ArrayList(); - for (int i = 0; i < allLocations.length; i++) { - ICVSRepositoryLocation location = allLocations[i]; + for (ICVSRepositoryLocation location : allLocations) { if (isCompatible(location, oldLocation)) { locations.add(location); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java index c390dc1ae..a74736ced 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java @@ -163,8 +163,10 @@ public class CVSProjectSetSerializer implements IProjectSetSerializer { } } List result = new ArrayList(); - for (int i = 0; i < projects.length; i++) { - if (projects[i] != null) result.add(projects[i]); + for (IProject project : projects) { + if (project != null) { + result.add(project); + } } return (IProject[])result.toArray(new IProject[result.size()]); } @@ -175,13 +177,12 @@ public class CVSProjectSetSerializer implements IProjectSetSerializer { if (newLocation.getUsername() == null || newLocation.getUsername().length() == 0) { // look for an existing location that matched ICVSRepositoryLocation[] locations = KnownRepositories.getInstance().getRepositories(); - for (int i = 0; i < locations.length; i++) { - ICVSRepositoryLocation location = locations[i]; + for (ICVSRepositoryLocation location : locations) { if (location.getMethod() == newLocation.getMethod() - && location.getHost().equals(newLocation.getHost()) - && location.getPort() == newLocation.getPort() - && location.getRootDirectory().equals(newLocation.getRootDirectory())) - return location; + && location.getHost().equals(newLocation.getHost()) + && location.getPort() == newLocation.getPort() + && location.getRootDirectory().equals(newLocation.getRootDirectory())) + return location; } } return newLocation; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java index daf9546f3..a88999cd0 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java @@ -183,8 +183,8 @@ public class CVSUIPlugin extends AbstractUIPlugin { if (status.getCode() == IResourceStatus.OUT_OF_SYNC_LOCAL) { if (promptToRefresh(parent, resources, status)) { try { - for (int i = 0; i < resources.length; i++) { - resources[i].refreshLocal(IResource.DEPTH_INFINITE, null); + for (IResource resource : resources) { + resource.refreshLocal(IResource.DEPTH_INFINITE, null); } } catch (CoreException coreEx) { // Throw the original exception to the caller diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommentTemplatesPreferencePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommentTemplatesPreferencePage.java index 154a4f908..655fc6c07 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommentTemplatesPreferencePage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommentTemplatesPreferencePage.java @@ -101,8 +101,8 @@ public class CommentTemplatesPreferencePage extends PreferencePage implements // populate list String[] templates = CVSUIPlugin.getPlugin().getRepositoryManager().getCommentTemplates(); - for (int i = 0; i < templates.length; i++) { - viewer.add(templates[i]); + for (String template : templates) { + viewer.add(template); } createButtons(listAndButtons); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java index 11b8a76a2..fe47959c9 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java @@ -130,8 +130,7 @@ public class CommitCommentArea extends DialogArea { ICompletionProposal[] computeQuickAssistProposals = sourceViewer.getQuickAssistAssistant() .getQuickAssistProcessor() .computeQuickAssistProposals(sourceViewer.getQuickAssistInvocationContext()); - for (int i = 0; i < computeQuickAssistProposals.length; i++) { - final ICompletionProposal proposal = computeQuickAssistProposals[i]; + for (ICompletionProposal proposal : computeQuickAssistProposals) { quickFixMenu.add(new Action(proposal.getDisplayString()) { @Override @@ -375,12 +374,12 @@ public class CommitCommentArea extends DialogArea { fCombo.removeAll(); fCombo.add(fMessage); - for (int i = 0; i < fCommentTemplates.length; i++) { + for (String commentTemplate : fCommentTemplates) { fCombo.add(CVSUIMessages.CommitCommentArea_6 + ": " + //$NON-NLS-1$ - Util.flattenText(fCommentTemplates[i])); + Util.flattenText(commentTemplate)); } - for (int i = 0; i < fComments.length; i++) { - fCombo.add(Util.flattenText(fComments[i])); + for (String comment : fComments) { + fCombo.add(Util.flattenText(comment)); } fCombo.setText(fMessage); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsView.java index c9b45d214..dbdb7443e 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsView.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsView.java @@ -176,10 +176,10 @@ public class EditorsView extends ViewPart { */ private long extractDate(String dateString) { if (dateString != null) { - for (int i = 0; i < dateFormats.length; i++) { - dateFormats[i].setLenient(true); + for (DateFormat dateFormat : dateFormats) { + dateFormat.setLenient(true); try { - return dateFormats[i].parse(dateString).getTime(); + return dateFormat.parse(dateString).getTime(); } catch (ParseException ex) { // silently ignored } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java index 2ee5879ef..dff09346b 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java @@ -255,8 +255,8 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc cvsRshParameters.setText(parameters); cvsServer.setText(server); IConnectionMethod[] methods = CVSRepositoryLocation.getPluggedInConnectionMethods(); - for (int i = 0; i < methods.length; i++) { - String name = methods[i].getName(); + for (IConnectionMethod m : methods) { + String name = m.getName(); if (!name.equals("ext")) { //$NON-NLS-1$ methodType.add(name); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java index 3941ece06..e410183b2 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java @@ -246,8 +246,7 @@ public class FileModificationValidator extends CVSCoreFileModificationValidator try { CVSWorkspaceSubscriber subscriber = CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber(); subscriber.refresh(files, IResource.DEPTH_ZERO, monitor); - for (int i = 0; i < files.length; i++) { - IFile file = files[i]; + for (IFile file : files) { SyncInfo info = subscriber.getSyncInfo(file); int direction = info.getKind() & SyncInfo.DIRECTION_MASK; if (direction == SyncInfo.CONFLICTING || direction == SyncInfo.INCOMING) { @@ -279,8 +278,7 @@ public class FileModificationValidator extends CVSCoreFileModificationValidator if (!isNeverUpdate()) { // We may need to perform an update so we need to obtain the lock on each project Set projects = new HashSet(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (isReadOnly(resource)) projects.add(resource.getProject()); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryTableProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryTableProvider.java index 5e2cddfc5..e0ae44760 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryTableProvider.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryTableProvider.java @@ -151,8 +151,8 @@ public class HistoryTableProvider { if (currentRevisionFont == null) { Font defaultFont = JFaceResources.getDefaultFont(); FontData[] data = defaultFont.getFontData(); - for (int i = 0; i < data.length; i++) { - data[i].setStyle(SWT.BOLD); + for (FontData d : data) { + d.setStyle(SWT.BOLD); } currentRevisionFont = new Font(viewer.getTable().getDisplay(), data); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java index cdc1748cc..61eeea166 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java @@ -266,8 +266,8 @@ public class IgnoreResourcesDialog extends TitleAreaDialog { return; } FileNameMatcher matcher = new FileNameMatcher(new String[] { customPattern }); - for (int i = 0; i < resources.length; i++) { - String name = resources[i].getName(); + for (IResource resource : resources) { + String name = resource.getName(); if (! matcher.match(name)) { setError(NLS.bind(CVSUIMessages.IgnoreResourcesDialog_patternDoesNotMatchFile, new String[] { name })); return; @@ -329,25 +329,28 @@ public class IgnoreResourcesDialog extends TitleAreaDialog { } private IResource getResourceWithSpace() { - for (int i = 0; i < resources.length; i++) { - if (resources[i].getName().indexOf(" ") != -1) //$NON-NLS-1$ - return resources[i]; + for (IResource resource : resources) { + if (resource.getName().indexOf(" ") != -1) { //$NON-NLS-1$ + return resource; + } } return null; } private boolean checkIfAllResourcesWithSpacesHaveExtensions() { - for (int i = 0; i < resources.length; i++) { - if (resources[i].getName().indexOf(" ") != -1 && resources[i].getFileExtension() == null) //$NON-NLS-1$ + for (IResource resource : resources) { + if (resource.getName().indexOf(" ") != -1 && resource.getFileExtension() == null) { //$NON-NLS-1$ return false; + } } return true; } private boolean checkIfAllResourcesHaveExtensions() { - for (int i = 0; i < resources.length; i++) { - if (resources[i].getFileExtension() != null) + for (IResource resource : resources) { + if (resource.getFileExtension() != null) { return true; + } } // couldn't find a resource with an extension return false; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java index 2a82e1676..b7b6dedef 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java @@ -89,11 +89,10 @@ public class RemoteRevisionQuickDiffProvider implements IQuickDiffReferenceProvi @Override public void subscriberResourceChanged(ISubscriberChangeEvent[] deltas) { if(fReferenceInitialized) { - for (int i = 0; i < deltas.length; i++) { - ISubscriberChangeEvent delta = deltas[i]; + for (ISubscriberChangeEvent delta : deltas) { IResource resource = delta.getResource(); - if(resource.getType() == IResource.FILE && - fLastSyncState != null && resource.equals(fLastSyncState.getLocal())) { + if(resource.getType() == IResource.FILE && + fLastSyncState != null && resource.equals(fLastSyncState.getLocal())) { if(delta.getFlags() == ISubscriberChangeEvent.SYNC_CHANGED) { fetchContentsInJob(); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SelectionPropertyTester.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SelectionPropertyTester.java index d593e8abb..dfd655fa4 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SelectionPropertyTester.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SelectionPropertyTester.java @@ -92,9 +92,10 @@ public class SelectionPropertyTester extends PropertyTester { private static Method findMethod(Class clazz, String method) throws Exception { Method[] methods = clazz.getMethods(); - for (int i = 0; i < methods.length; i++) { - if (methods[i].getName().equals(method)) - return methods[i]; + for (Method m : methods) { + if (m.getName().equals(method)) { + return m; + } } return null; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java index 00943a978..f98fef82d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java @@ -41,15 +41,15 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator { // Initialize USE_ALTERNATE_PROMPTER IIgnoreInfo[] ignores = Team.getAllIgnores(); boolean found = false; - for (int i = 0; i < ignores.length; i++) { - if (ignores[i].getPattern().equals("*.notes")) { //$NON-NLS-1$ + for (IIgnoreInfo ignore : ignores) { + if (ignore.getPattern().equals("*.notes")) { //$NON-NLS-1$ found = true; } } if (!found) return; IStringMapping[] mappings = Team.getFileContentManager().getExtensionMappings(); - for (int i = 0; i < mappings.length; i++) { - if (mappings[i].getString().equals("notes")) { //$NON-NLS-1$ + for (IStringMapping mapping : mappings) { + if (mapping.getString().equals("notes")) { //$NON-NLS-1$ USE_ALTERNATE_PROMPTER = true; return; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java index 29a699e29..a76f60759 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java @@ -188,9 +188,9 @@ public class WorkingSetSelectionArea extends DialogArea { } // remove deleted working sets from the mru list box String[] mruNames = mruList.getItems(); - for (int i = 0; i < mruNames.length; i++) { - if (workingSetManager.getWorkingSet(mruNames[i]) == null) { - mruList.remove(mruNames[i]); + for (String mruName : mruNames) { + if (workingSetManager.getWorkingSet(mruName) == null) { + mruList.remove(mruName); } } } @@ -232,10 +232,10 @@ public class WorkingSetSelectionArea extends DialogArea { private void initializeMru() { IWorkingSet[] workingSets = PlatformUI.getWorkbench().getWorkingSetManager().getRecentWorkingSets(); - for (int i = 0; i < workingSets.length; i++) { - String workingSetName = workingSets[i].getName(); + for (IWorkingSet w : workingSets) { + String workingSetName = w.getName(); mruList.add(workingSetName); - mruList.setData(workingSetName, workingSets[i]); + mruList.setData(workingSetName, w); } if (workingSets.length > 0) { mruList.setText(workingSets[0].getName()); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddAction.java index 994318bf7..dad03bebf 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddAction.java @@ -56,8 +56,8 @@ public class AddAction extends WorkspaceTraversalAction { // TODO: What about non-root resources that are part of the model but would be ignored? IResource[] resources = getSelectedResourcesWithOverlap(); boolean prompt = false; - for (int i = 0; i < resources.length; i++) { - ICVSResource resource = getCVSResourceFor(resources[i]); + for (IResource r : resources) { + ICVSResource resource = getCVSResourceFor(r); try { if (resource.isIgnored()) { prompt = true; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/BranchAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/BranchAction.java index 18d5ae8e3..c4d578cd5 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/BranchAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/BranchAction.java @@ -46,8 +46,7 @@ public class BranchAction extends WorkspaceTraversalAction { private ResourceMapping[] getResourceMappings(IResource[] resources) { List<ResourceMapping> mappings = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { Object o = getAdapter(resource, ResourceMapping.class); if (o instanceof ResourceMapping) { ResourceMapping mapping = (ResourceMapping) o; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java index 3cc08cf6e..67b228fce 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java @@ -295,8 +295,8 @@ abstract public class CVSAction extends TeamAction implements IEditorActionDeleg return problems[0]; } MultiStatus combinedStatus = new MultiStatus(CVSUIPlugin.ID, 0, getMultiStatusMessage(), null); - for (int i = 0; i < problems.length; i++) { - combinedStatus.merge(problems[i]); + for (IStatus problem : problems) { + combinedStatus.merge(problem); } return combinedStatus; } @@ -317,8 +317,7 @@ abstract public class CVSAction extends TeamAction implements IEditorActionDeleg List<IStatus> problems = new ArrayList<>(); IStatus[] status = getAccumulatedStatus(); if (status != null) { - for (int i = 0; i < status.length; i++) { - IStatus iStatus = status[i]; + for (IStatus iStatus : status) { if ( ! iStatus.isOK() || iStatus.getCode() == CVSStatus.SERVER_ERROR) { problems.add(iStatus); } @@ -535,8 +534,7 @@ abstract public class CVSAction extends TeamAction implements IEditorActionDeleg final boolean[] result = new boolean[] { true }; - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (resource.getType() != IResource.PROJECT) { ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); CVSTag parentTag = cvsResource.getParent().getFolderSyncInfo().getTag(); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/GenerateDiffFileAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/GenerateDiffFileAction.java index 839ada0e8..5f5f43d46 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/GenerateDiffFileAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/GenerateDiffFileAction.java @@ -60,13 +60,11 @@ public class GenerateDiffFileAction extends WorkspaceTraversalAction{ private IResource[] getDeepResourcesToPatch(IProgressMonitor monitor) throws CoreException { ResourceMapping[] mappings = getCVSResourceMappings(); List<IResource> roots = new ArrayList<>(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { ResourceTraversal[] traversals = mapping.getTraversals( SubscriberResourceMappingContext.createContext(CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber()), monitor); - for (int j = 0; j < traversals.length; j++) { - ResourceTraversal traversal = traversals[j]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); if (traversal.getDepth() == IResource.DEPTH_INFINITE) { roots.addAll(Arrays.asList(resources)); @@ -74,8 +72,7 @@ public class GenerateDiffFileAction extends WorkspaceTraversalAction{ collectShallowFiles(resources, roots); } else if (traversal.getDepth() == IResource.DEPTH_ONE) { collectShallowFiles(resources, roots); - for (int k = 0; k < resources.length; k++) { - IResource resource = resources[k]; + for (IResource resource : resources) { if (resource.getType() != IResource.FILE) { collectShallowFiles(members(resource), roots); } @@ -87,8 +84,7 @@ public class GenerateDiffFileAction extends WorkspaceTraversalAction{ } private void collectShallowFiles(IResource[] resources, List<IResource> roots) { - for (int k = 0; k < resources.length; k++) { - IResource resource = resources[k]; + for (IResource resource : resources) { if (resource.getType() == IResource.FILE) roots.add(resource); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java index 7d6bf572f..b5ad49493 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java @@ -54,8 +54,7 @@ public class IgnoreAction extends WorkspaceTraversalAction { protected void execute(CVSTeamProvider provider, IResource[] resources, boolean recurse, IProgressMonitor monitor) throws CVSException, InterruptedException { try { monitor.beginTask(null, resources.length); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { String pattern = dialog.getIgnorePatternFor(resource); ICVSResource cvsResource = getCVSResourceFor(resource); cvsResource.setIgnoredAs(pattern); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MoveRemoteTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MoveRemoteTagAction.java index 69d8672d2..e8d43275c 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MoveRemoteTagAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MoveRemoteTagAction.java @@ -50,8 +50,7 @@ public class MoveRemoteTagAction extends TagInRepositoryAction { private boolean isFolderSelected() { ICVSResource[] resources = getSelectedCVSResources(); - for (int i = 0; i < resources.length; i++) { - ICVSResource resource = resources[i]; + for (ICVSResource resource : resources) { if (resource.isFolder()) return true; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java index d94b4948b..d46e39232 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java @@ -100,8 +100,7 @@ public class SyncAction extends WorkspaceTraversalAction { private IWorkingSet[] getSelectedWorkingSets() { ResourceMapping[] mappings = getCVSResourceMappings(); List<IWorkingSet> sets = new ArrayList<>(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { if (mapping.getModelObject() instanceof IWorkingSet) { IWorkingSet set = (IWorkingSet) mapping.getModelObject(); sets.add(set); @@ -116,8 +115,7 @@ public class SyncAction extends WorkspaceTraversalAction { private boolean includesAllCVSProjects(IResource[] resources) { // First, make sure all the selected thinsg are projects - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (resource.getType() != IResource.PROJECT) return false; } @@ -128,8 +126,7 @@ public class SyncAction extends WorkspaceTraversalAction { private IProject[] getAllCVSProjects() { IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); Set<IProject> cvsProjects = new HashSet<>(); - for (int i = 0; i < projects.length; i++) { - IProject project = projects[i]; + for (IProject project : projects) { if (RepositoryProvider.isShared(project) && RepositoryProvider.getProvider(project, CVSProviderPlugin.getTypeId()) != null) { cvsProjects.add(project); } @@ -148,8 +145,7 @@ public class SyncAction extends WorkspaceTraversalAction { if (!isShowModelSync()) return true; IModelProviderDescriptor[] descriptors = ModelProvider.getModelProviderDescriptors(); - for (int i = 0; i < descriptors.length; i++) { - IModelProviderDescriptor descriptor = descriptors[i]; + for (IModelProviderDescriptor descriptor : descriptors) { try { IResource[] resources = descriptor.getMatchingResources(new IResource[] { file }); if (resources.length > 0) { @@ -158,14 +154,11 @@ public class SyncAction extends WorkspaceTraversalAction { // However, we do not have a progress monitor so we'll just use a local context since, // it is unlikely that a model element will consist of one file locally but multiple files remotely ResourceMapping[] mappings = provider.getMappings(file, ResourceMappingContext.LOCAL_CONTEXT, null); - for (int j = 0; j < mappings.length; j++) { - ResourceMapping mapping = mappings[j]; + for (ResourceMapping mapping : mappings) { ResourceTraversal[] traversals = mapping.getTraversals(ResourceMappingContext.LOCAL_CONTEXT, null); - for (int k = 0; k < traversals.length; k++) { - ResourceTraversal traversal = traversals[k]; + for (ResourceTraversal traversal : traversals) { IResource[] tResources = traversal.getResources(); - for (int index = 0; index < tResources.length; index++) { - IResource tr = tResources[index]; + for (IResource tr : tResources) { if (!tr.equals(file)) return false; } @@ -269,12 +262,11 @@ public class SyncAction extends WorkspaceTraversalAction { if(sets == null) return projects; - for (int i = 0; i < sets.length; i++) { - IAdaptable ad[] = sets[i].getElements(); + for (IWorkingSet set : sets) { + IAdaptable[] ad = set.getElements(); if (ad != null) { - for (int j = 0; j < ad.length; j++) { - IResource resource = ad[j] - .getAdapter(IResource.class); + for (IAdaptable a : ad) { + IResource resource = a.getAdapter(IResource.class); if (resource != null) { projects.add(resource.getProject()); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java index b6ee44b18..9056ad357 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java @@ -134,8 +134,7 @@ public abstract class TagAction extends WorkspaceTraversalAction { @Override public void run(IProgressMonitor monitor) { try { - for (int i = 0; i < resources.length; i++) { - ICVSResource resource = resources[i]; + for (ICVSResource resource : resources) { // Cache the new tag creation even if the tag may have had warnings. manager.addTags(getRootParent(resource), new CVSTag[] {tag}); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java index 099bfacda..324b362d3 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java @@ -24,8 +24,10 @@ public class TagInRepositoryAction extends TagAction { public boolean isEnabled() { ICVSResource[] resources = getSelectedCVSResources(); if (resources.length == 0) return false; - for (int i = 0; i < resources.length; i++) { - if (resources[i] instanceof ICVSRepositoryLocation) return false; + for (ICVSResource resource : resources) { + if (resource instanceof ICVSRepositoryLocation) { + return false; + } } return true; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java index 7f64b1dd0..b08fab021 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java @@ -77,8 +77,7 @@ public abstract class WorkspaceAction extends CVSAction { private boolean handleOrphanedSubtrees() { // invoke the inherited method so that overlaps are maintained IResource[] resources = getSelectedResources(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { handleOrphanedSubtree(resource); } return false; @@ -169,8 +168,7 @@ public abstract class WorkspaceAction extends CVSAction { if (e.getStatus().getCode() == IResourceStatus.OUT_OF_SYNC_LOCAL) { // determine the projects of the resources involved Set<IProject> projects = new HashSet<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { projects.add(resource.getProject()); } // prompt to refresh @@ -302,9 +300,7 @@ public abstract class WorkspaceAction extends CVSAction { // validate enabled for each resource in the selection List<IPath> folderPaths = new ArrayList<>(); List<IPath> filePaths = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; - + for (IResource resource : resources) { // only enable for accessible resources if(resource.getType() == IResource.PROJECT) { if (! resource.isAccessible()) return false; @@ -464,16 +460,16 @@ public abstract class WorkspaceAction extends CVSAction { boolean sameTagType = true; boolean multipleSameNames = true; - for (int i = 0; i < resources.length; i++) { - ICVSResource cvsResource = getCVSResourceFor(resources[i]); + for (IResource resource : resources) { + ICVSResource cvsResource = getCVSResourceFor(resource); CVSTag tag = null; - if(cvsResource.isFolder()) { + if (cvsResource.isFolder()) { FolderSyncInfo info = ((ICVSFolder)cvsResource).getFolderSyncInfo(); if(info != null) { tag = info.getTag(); } if (tag != null && tag.getType() == CVSTag.BRANCH) { - tag = Util.getAccurateFolderTag(resources[i], tag); + tag = Util.getAccurateFolderTag(resource, tag); } } else { tag = CVSAction.getAccurateFileTag(cvsResource); @@ -535,8 +531,7 @@ public abstract class WorkspaceAction extends CVSAction { monitor = Policy.monitorFor(monitor); monitor.beginTask(null, selectedResources.length * 100); monitor.setTaskName(CVSUIMessages.ReplaceWithAction_calculatingDirtyResources); - for (int i = 0; i < selectedResources.length; i++) { - IResource resource = selectedResources[i]; + for (IResource resource : selectedResources) { ICVSResource cvsResource = getCVSResourceFor(resource); if(cvsResource.isModified(Policy.subMonitorFor(monitor, 100))) { dirtyResources.add(resource); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceTraversalAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceTraversalAction.java index 31a978cd6..430738ee6 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceTraversalAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceTraversalAction.java @@ -66,11 +66,9 @@ public abstract class WorkspaceTraversalAction extends WorkspaceAction { private static IResource[] getRootTraversalResources(ISynchronizationScopeManager manager, IProgressMonitor monitor) throws CoreException { Set<IResource> result = new HashSet<>(); ResourceTraversal[] traversals = getTraversals(null, manager, monitor); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); - for (int k = 0; k < resources.length; k++) { - IResource resource = resources[k]; + for (IResource resource : resources) { if (RepositoryProvider.getProvider(resource.getProject(), CVSProviderPlugin.getTypeId()) != null) { result.add(resource); } @@ -122,8 +120,7 @@ public abstract class WorkspaceTraversalAction extends WorkspaceAction { public static IResource[] getProjects(IResource[] resources) { Set<IProject> projects = new HashSet<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { projects.add(resource.getProject()); } return projects.toArray(new IResource[projects.size()]); @@ -138,8 +135,7 @@ public abstract class WorkspaceTraversalAction extends WorkspaceAction { */ @Deprecated public static boolean isLogicalModel(ResourceMapping[] mappings) { - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { if (! (mapping.getModelObject() instanceof IResource) ) { return true; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/CVSConsoleFactory.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/CVSConsoleFactory.java index b78d38f77..b04efa6f6 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/CVSConsoleFactory.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/CVSConsoleFactory.java @@ -40,9 +40,10 @@ public class CVSConsoleFactory implements IConsoleFactory { IConsoleManager manager = ConsolePlugin.getDefault().getConsoleManager(); IConsole[] existing = manager.getConsoles(); boolean exists = false; - for (int i = 0; i < existing.length; i++) { - if(console == existing[i]) + for (IConsole e : existing) { + if (console == e) { exists = true; + } } if(! exists) manager.addConsoles(new IConsole[] {console}); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/CVSOutputConsole.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/CVSOutputConsole.java index 962c76e19..e1e3e1f9b 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/CVSOutputConsole.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/CVSOutputConsole.java @@ -95,8 +95,7 @@ public class CVSOutputConsole extends MessageConsole implements IConsoleListener public class MyLifecycle implements org.eclipse.ui.console.IConsoleListener { @Override public void consolesAdded(IConsole[] consoles) { - for (int i = 0; i < consoles.length; i++) { - IConsole console = consoles[i]; + for (IConsole console : consoles) { if (console == CVSOutputConsole.this) { init(); } @@ -105,8 +104,7 @@ public class CVSOutputConsole extends MessageConsole implements IConsoleListener } @Override public void consolesRemoved(IConsole[] consoles) { - for (int i = 0; i < consoles.length; i++) { - IConsole console = consoles[i]; + for (IConsole console : consoles) { if (console == CVSOutputConsole.this) { ConsolePlugin.getDefault().getConsoleManager().removeConsoleListener(this); dispose(); @@ -191,8 +189,7 @@ public class CVSOutputConsole extends MessageConsole implements IConsoleListener synchronized(document) { visible = true; ConsoleDocument.ConsoleLine[] lines = document.getLines(); - for (int i = 0; i < lines.length; i++) { - ConsoleDocument.ConsoleLine line = lines[i]; + for (ConsoleDocument.ConsoleLine line : lines) { appendLine(line.type, line.line); } document.clear(); @@ -328,8 +325,8 @@ public class CVSOutputConsole extends MessageConsole implements IConsoleListener // Include child status IStatus[] children = status.getChildren(); - for (int i = 0; i < children.length; i++) { - outputStatus(children[i], true, nestingLevel); + for (IStatus c : children) { + outputStatus(c, true, nestingLevel); } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java index 38d60aaeb..46e0942c7 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java @@ -79,8 +79,7 @@ public abstract class AbstractCommitAction extends CVSModelProviderAction { public static IResource[] getOutgoingChanges(final IResourceDiffTree tree, ResourceTraversal[] traversals, IProgressMonitor monitor) { final List<IResource> resources = new ArrayList<>(); IDiff[] diffs = tree.getDiffs(traversals); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { if (hasLocalChange(diff)) { IResource resource = ResourceDiffTree.getResourceFor(diff); if (resource != null) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSModelProviderAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSModelProviderAction.java index 497c50608..b05486035 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSModelProviderAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSModelProviderAction.java @@ -72,17 +72,14 @@ public abstract class CVSModelProviderAction extends ResourceModelParticipantAct IStructuredSelection selection = getStructuredSelection(); Object[] objects = selection.toArray(); Set<IResource> roots = new HashSet<>(); - for (int i = 0; i < objects.length; i++) { - Object object = objects[i]; + for (Object object : objects) { ResourceMapping mapping = Utils.getResourceMapping(object); if (mapping != null) { try { ResourceTraversal[] traversals = mapping.getTraversals(ResourceMappingContext.LOCAL_CONTEXT, null); - for (int j = 0; j < traversals.length; j++) { - ResourceTraversal traversal = traversals[j]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); - for (int k = 0; k < resources.length; k++) { - IResource resource = resources[k]; + for (IResource resource : resources) { roots.add(resource); } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSModelSynchronizeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSModelSynchronizeParticipant.java index 21aebca24..1d29141cf 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSModelSynchronizeParticipant.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSModelSynchronizeParticipant.java @@ -52,8 +52,7 @@ public abstract class CVSModelSynchronizeParticipant extends ModelSynchronizePar public ModelProvider[] getEnabledModelProviders() { ModelProvider[] enabledProviders = super.getEnabledModelProviders(); if (this instanceof IChangeSetProvider) { - for (int i = 0; i < enabledProviders.length; i++) { - ModelProvider provider = enabledProviders[i]; + for (ModelProvider provider : enabledProviders) { if (provider.getId().equals(ChangeSetModelProvider.ID)) return enabledProviders; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSSubscriberMergeContext.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSSubscriberMergeContext.java index 93751c354..0056264dc 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSSubscriberMergeContext.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSSubscriberMergeContext.java @@ -125,8 +125,7 @@ public abstract class CVSSubscriberMergeContext extends SubscriberMergeContext { // the local file List<IDiff> fileDeletions = new ArrayList<>(); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { IResource resource = ResourceDiffTree.getResourceFor(diff); if (resource.getType() == IResource.FILE) { if (isIncomingDeletion(diff, ignoreLocalChanges)) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java index 1359a2098..b27c5359b 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java @@ -124,8 +124,8 @@ public class ChangeSetActionProvider extends ResourceModelActionProvider { } else { ChangeSet[] sets = getActiveChangeSetManager().getSets(); IResource[] resources = getResources(diffArray); - for (int i = 0; i < sets.length; i++) { - ActiveChangeSet activeSet = (ActiveChangeSet) sets[i]; + for (ChangeSet s : sets) { + ActiveChangeSet activeSet = (ActiveChangeSet) s; activeSet.remove(resources); } } @@ -188,8 +188,8 @@ public class ChangeSetActionProvider extends ResourceModelActionProvider { IDiff[] diffArray = getLocalChanges(getStructuredSelection()); ChangeSet[] sets = getActiveChangeSetManager().getSets(); IResource[] resources = getResources(diffArray); - for (int i = 0; i < sets.length; i++) { - ActiveChangeSet activeSet = (ActiveChangeSet) sets[i]; + for (ChangeSet set : sets) { + ActiveChangeSet activeSet = (ActiveChangeSet) set; activeSet.remove(resources); } } @@ -336,8 +336,7 @@ public class ChangeSetActionProvider extends ResourceModelActionProvider { private IResource[] getResources(IDiff[] diffArray) { List<IResource> result = new ArrayList<>(); - for (int i = 0; i < diffArray.length; i++) { - IDiff diff = diffArray[i]; + for (IDiff diff : diffArray) { IResource resource = ResourceDiffTree.getResourceFor(diff); if (resource != null) { result.add(resource); @@ -392,8 +391,8 @@ public class ChangeSetActionProvider extends ResourceModelActionProvider { createChangeSet.selectionChanged(selection); manager.add(createChangeSet); manager.add(new Separator()); - for (int i = 0; i < sets.length; i++) { - ActiveChangeSet set = (ActiveChangeSet) sets[i]; + for (ChangeSet s : sets) { + ActiveChangeSet set = (ActiveChangeSet) s; AddToChangeSetAction action = new AddToChangeSetAction( getSynchronizePageConfiguration(), set, selection); manager.add(action); @@ -458,11 +457,9 @@ public class ChangeSetActionProvider extends ResourceModelActionProvider { ITreeSelection ts = (ITreeSelection) selection; TreePath[] paths = ts.getPaths(); List<IDiff> result = new ArrayList<>(); - for (int i = 0; i < paths.length; i++) { - TreePath path = paths[i]; + for (TreePath path : paths) { IDiff[] diffs = getLocalChanges(path); - for (int j = 0; j < diffs.length; j++) { - IDiff diff = diffs[j]; + for (IDiff diff : diffs) { result.add(diff); } } @@ -489,10 +486,11 @@ public class ChangeSetActionProvider extends ResourceModelActionProvider { IDiff[] diffArray = getLocalChanges(selection); ChangeSet[] activeChangeSets = getActiveChangeSetManager().getSets(); IResource[] resources = getResources(diffArray); - for (int i = 0; i < activeChangeSets.length; i++) { - for (int j = 0; j < resources.length; j++) { - if (activeChangeSets[i].contains(resources[j])) + for (ChangeSet activeChangeSet : activeChangeSets) { + for (IResource resource : resources) { + if (activeChangeSet.contains(resource)) { return false; + } } } return true; @@ -502,8 +500,7 @@ public class ChangeSetActionProvider extends ResourceModelActionProvider { if (selection instanceof ITreeSelection) { ITreeSelection ts = (ITreeSelection) selection; TreePath[] paths = ts.getPaths(); - for (int i = 0; i < paths.length; i++) { - TreePath path = paths[i]; + for (TreePath path : paths) { if (!containsOnlyLocalChanges(path)) { return false; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java index 3f4d38414..8d47e6365 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java @@ -96,8 +96,7 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple private void handleSetRemoval(final ChangeSet set) { IResource[] resources = set.getResources(); List toAdd = new ArrayList(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { IDiff diff = getContext().getDiffTree().getDiff(resource); if (diff != null && !isContainedInSet(diff)) toAdd.add(diff); @@ -136,8 +135,7 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple private void handleSetChange(final ChangeSet set, final IPath[] paths) { try { getTheRest().beginInput(); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { boolean isContained = ((DiffChangeSet)set).contains(path); if (isContained) { IDiff diff = ((DiffChangeSet)set).getDiffTree().getDiff(path); @@ -174,8 +172,7 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple } if (visibleRemovedSets.length > 0) ((AbstractTreeViewer) getViewer()).remove(visibleRemovedSets); - for (int i = 0; i < visibleChangedSets.length; i++) { - ChangeSet set = visibleChangedSets[i]; + for (ChangeSet set : visibleChangedSets) { ((AbstractTreeViewer) getViewer()).refresh(set, true); } } finally { @@ -185,8 +182,7 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple } try { getTheRest().beginInput(); - for (int i = 0; i < addedSets.length; i++) { - ChangeSet set = addedSets[i]; + for (ChangeSet set : addedSets) { handleSetAddition(set); } if (removedSets.length > 0) { @@ -196,16 +192,14 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple // See bug 173138 addAllUnassignedToUnassignedSet(); } - for (int i = 0; i < changedSets.length; i++) { - ChangeSet set = changedSets[i]; + for (ChangeSet set : changedSets) { IPath[] paths = event.getChangesFor(set); if (event.getSource().contains(set)) { handleSetChange(set, paths); } else { try { getTheRest().beginInput(); - for (int j = 0; j < paths.length; j++) { - IPath path = paths[j]; + for (IPath path : paths) { IDiff diff = getContext().getDiffTree().getDiff(path); if (diff != null && !isContainedInSet(diff)) getTheRest().add(diff); @@ -222,8 +216,7 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple private ChangeSet[] getVisibleSets(ChangeSet[] sets) { List result = new ArrayList(sets.length); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { if (isVisibleInMode(set)) { result.add(set); } @@ -316,8 +309,7 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple } List result = new ArrayList(); ChangeSet[] sets = getAllSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { if (hasChildren(TreePath.EMPTY.createChildPath(set))) result.add(set); } @@ -362,8 +354,7 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple */ protected boolean isContainedInSet(IDiff diff) { ChangeSet[] sets = getAllSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { if (set.contains(ResourceDiffTree.getResourceFor(diff))) { return true; } @@ -405,8 +396,7 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple } Object[] children = getChildren(parent); Set result = new HashSet(); - for (int i = 0; i < children.length; i++) { - Object child = children[i]; + for (Object child : children) { if (isVisible(child, diffTree)) { result.add(child); } @@ -478,8 +468,7 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple return true; int depth = getTraversalCalculator().getLayoutDepth(resource, null); IDiff[] diffs = tree.getDiffs(resource, depth); - for (int i = 0; i < diffs.length; i++) { - IDiff child = diffs[i]; + for (IDiff child : diffs) { if (isVisible(child)) { return true; } @@ -501,8 +490,7 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple private boolean hasChildrenInContext(ChangeSet set) { IResource[] resources = set.getResources(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (getContext().getDiffTree().getDiff(resource) != null) return true; } @@ -519,8 +507,7 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple DiffChangeSet[] sets = getSetsContaining(resource); if (sets.length > 0) { List result = new ArrayList(); - for (int i = 0; i < sets.length; i++) { - DiffChangeSet set = sets[i]; + for (DiffChangeSet set : sets) { TreePath path = getPathForElement(set, resource.getParent()); if (path != null) result.add(path); @@ -539,8 +526,7 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple private DiffChangeSet[] getSetsContaining(IResource resource) { List result = new ArrayList(); DiffChangeSet[] allSets = getAllSets(); - for (int i = 0; i < allSets.length; i++) { - DiffChangeSet set = allSets[i]; + for (DiffChangeSet set : allSets) { if (isVisible(resource, set.getDiffTree())) { result.add(set); } @@ -559,15 +545,13 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple if (csc.supportsActiveChangeSets()) { ActiveChangeSetManager collector = csc.getActiveChangeSetManager(); ChangeSet[] sets = collector.getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { result.add(set); } } if (checkedInCollector != null) { ChangeSet[] sets = checkedInCollector.getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { result.add(set); } } @@ -698,19 +682,16 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple // Only adjust the set of the rest. The others will be handled by the collectors try { getTheRest().beginInput(); - for (int i = 0; i < removed.length; i++) { - IPath path = removed[i]; + for (IPath path : removed) { getTheRest().remove(path); } - for (int i = 0; i < added.length; i++) { - IDiff diff = added[i]; + for (IDiff diff : added) { // Only add the diff if it is not already in another set if (!isContainedInSet(diff)) { getTheRest().add(diff); } } - for (int i = 0; i < changed.length; i++) { - IDiff diff = changed[i]; + for (IDiff diff : changed) { // Only add the diff if it is already contained in the free set if (getTheRest().getDiff(diff.getPath()) != null) { getTheRest().add(diff); @@ -740,11 +721,9 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple private ChangeSet[] getSetsShowingPropogatedStateFrom(IPath[] paths) { Set result = new HashSet(); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { ChangeSet[] sets = getSetsShowingPropogatedStateFrom(path); - for (int j = 0; j < sets.length; j++) { - ChangeSet set = sets[j]; + for (ChangeSet set : sets) { result.add(set); } } @@ -754,8 +733,7 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple protected DiffChangeSet[] getSetsShowingPropogatedStateFrom(IPath path) { List result = new ArrayList(); DiffChangeSet[] allSets = getAllSets(); - for (int i = 0; i < allSets.length; i++) { - DiffChangeSet set = allSets[i]; + for (DiffChangeSet set : allSets) { if (set.getDiffTree().getDiff(path) != null || set.getDiffTree().getChildren(path).length > 0) { result.add(set); } @@ -777,8 +755,7 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple Tree tree = viewer.getTree(); TreeItem[] children = tree.getItems(); Set result = new HashSet(); - for (int i = 0; i < children.length; i++) { - TreeItem control = children[i]; + for (TreeItem control : children) { Object data = control.getData(); if (data instanceof ChangeSet) { ChangeSet set = (ChangeSet) data; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetLabelProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetLabelProvider.java index a989ed50c..be2d5f664 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetLabelProvider.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetLabelProvider.java @@ -99,8 +99,7 @@ public class ChangeSetLabelProvider extends ResourceModelLabelProvider { if (element instanceof DiffChangeSet) { DiffChangeSet dcs = (DiffChangeSet) element; IResource[] resources = dcs.getResources(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (getContext().getDiffTree().getProperty(resource.getFullPath(), IDiffTree.P_BUSY_HINT)) return true; } @@ -114,8 +113,7 @@ public class ChangeSetLabelProvider extends ResourceModelLabelProvider { if (element instanceof DiffChangeSet) { DiffChangeSet dcs = (DiffChangeSet) element; IResource[] resources = dcs.getResources(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (getContext().getDiffTree().getProperty(resource.getFullPath(), IDiffTree.P_HAS_DESCENDANT_CONFLICTS)) return true; } @@ -149,8 +147,7 @@ public class ChangeSetLabelProvider extends ResourceModelLabelProvider { Set projects = new HashSet(); IResource[] resources = dcs.getResources(); int severity = -1; - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { IProject project = resource.getProject(); if (!projects.contains(project)) { projects.add(project); @@ -172,14 +169,12 @@ public class ChangeSetLabelProvider extends ResourceModelLabelProvider { private Object[] addSetsContainingElements(Object[] elements) { Set result = new HashSet(); - for (int i = 0; i < elements.length; i++) { - Object object = elements[i]; + for (Object object : elements) { result.add(object); if (object instanceof IProject) { IProject project = (IProject) object; ChangeSet[] sets = getSetsContaing(project); - for (int j = 0; j < sets.length; j++) { - ChangeSet set = sets[j]; + for (ChangeSet set : sets) { result.add(set); } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CheckedInChangeSetCollector.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CheckedInChangeSetCollector.java index 756524d24..4590d1690 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CheckedInChangeSetCollector.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CheckedInChangeSetCollector.java @@ -86,18 +86,15 @@ public class CheckedInChangeSetCollector extends BatchingChangeSetManager implem private IPath[] getAffectedPaths(IDiffChangeEvent event) { Set<IPath> result = new HashSet<>(); IPath[] removed = event.getRemovals(); - for (int i = 0; i < removed.length; i++) { - IPath path = removed[i]; + for (IPath path : removed) { result.add(path); } IDiff[] diffs = event.getAdditions(); - for (int j = 0; j < diffs.length; j++) { - IDiff diff = diffs[j]; + for (IDiff diff : diffs) { result.add(diff.getPath()); } diffs = event.getChanges(); - for (int j = 0; j < diffs.length; j++) { - IDiff diff = diffs[j]; + for (IDiff diff : diffs) { result.add(diff.getPath()); } return result.toArray(new IPath[result.size()]); @@ -144,8 +141,7 @@ public class CheckedInChangeSetCollector extends BatchingChangeSetManager implem protected ChangeSet getChangeSet(IDiffTree tree) { ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet changeSet = sets[i]; + for (ChangeSet changeSet : sets) { if (((DiffChangeSet)changeSet).getDiffTree() == tree) { return changeSet; } @@ -159,8 +155,7 @@ public class CheckedInChangeSetCollector extends BatchingChangeSetManager implem removals.addAll(Arrays.asList(event.getRemovals())); additions.addAll(Arrays.asList(event.getAdditions())); IDiff[] changed = event.getChanges(); - for (int i = 0; i < changed.length; i++) { - IDiff diff = changed[i]; + for (IDiff diff : changed) { additions.add(diff); removals.add(diff.getPath()); } @@ -174,8 +169,8 @@ public class CheckedInChangeSetCollector extends BatchingChangeSetManager implem protected void remove(IPath[] paths) { ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - DiffChangeSet set = (DiffChangeSet)sets[i]; + for (ChangeSet s : sets) { + DiffChangeSet set = (DiffChangeSet) s; set.remove(paths); } } @@ -222,8 +217,7 @@ public class CheckedInChangeSetCollector extends BatchingChangeSetManager implem private SyncInfo[] getSyncInfos(IDiff[] diffs) { SyncInfoSet set = new SyncInfoSet(); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { set.add(getConverter().asSyncInfo(diff, getSubscriber().getResourceComparator())); } return set.getSyncInfos(); @@ -282,8 +276,8 @@ public class CheckedInChangeSetCollector extends BatchingChangeSetManager implem try { monitor.beginTask(null, commentInfos.length * 10); if (logs != null) { - for (int i = 0; i < commentInfos.length; i++) { - addSyncInfoToCommentNode(commentInfos[i], logs); + for (SyncInfo commentInfo : commentInfos) { + addSyncInfoToCommentNode(commentInfo, logs); monitor.worked(10); } } @@ -326,8 +320,7 @@ public class CheckedInChangeSetCollector extends BatchingChangeSetManager implem String remoteRevision = ((ICVSRemoteFile) remoteResource).getRevision(); if (isDeletedRemotely(info)) { ILogEntry[] logEntries = logs.getLogEntries(remoteResource); - for (int i = 0; i < logEntries.length; i++) { - ILogEntry entry = logEntries[i]; + for (ILogEntry entry : logEntries) { String revision = entry.getRevision(); if (entry.isDeletion() && ResourceSyncInfo.isLaterRevision(revision, remoteRevision)) { logEntry = entry; @@ -355,8 +348,7 @@ public class CheckedInChangeSetCollector extends BatchingChangeSetManager implem // remote. addRemoteChange(info, null, null); } else { - for (int i = 0; i < logEntries.length; i++) { - ILogEntry entry = logEntries[i]; + for (ILogEntry entry : logEntries) { addRemoteChange(info, remoteResource, entry); } } @@ -418,8 +410,7 @@ public class CheckedInChangeSetCollector extends BatchingChangeSetManager implem private CVSCheckedInChangeSet getChangeSetFor(ILogEntry logEntry) { ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { if (set instanceof CVSCheckedInChangeSet && set.getComment().equals(logEntry.getComment()) && ((CVSCheckedInChangeSet)set).getAuthor().equals(logEntry.getAuthor())) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CreatePatchAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CreatePatchAction.java index 63a741698..b5290422f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CreatePatchAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CreatePatchAction.java @@ -55,8 +55,7 @@ public class CreatePatchAction extends CVSModelProviderAction implements IDiffCh final Set resources = new HashSet(); final IResourceDiffTree diffTree = getSynchronizationContext().getDiffTree(); IDiff[] diffs = diffTree.getDiffs(traversals); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { IResource child = diffTree.getResource(diff); if (child.getType() == IResource.FILE && diff instanceof IThreeWayDiff) { IThreeWayDiff twd = (IThreeWayDiff) diff; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/MergeSubscriberContext.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/MergeSubscriberContext.java index 82f746f13..65e370e3e 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/MergeSubscriberContext.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/MergeSubscriberContext.java @@ -57,8 +57,7 @@ public class MergeSubscriberContext extends CVSSubscriberMergeContext { public void markAsMerged(final IDiff[] diffs, boolean inSyncHint, IProgressMonitor monitor) throws CoreException { run(monitor1 -> { List<IResource> result = new ArrayList<>(); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { result.add(getDiffTree().getResource(diff)); } ((CVSMergeSubscriber) getSubscriber()).merged(result.toArray(new IResource[result.size()])); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeParticipant.java index 8503f363f..8021bdb2c 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeParticipant.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeParticipant.java @@ -149,8 +149,7 @@ public class ModelMergeParticipant extends CVSModelSynchronizeParticipant { } List<IResource> resources = new ArrayList<>(); - for (int i = 0; i < rootNodes.length; i++) { - IMemento rootNode = rootNodes[i]; + for (IMemento rootNode : rootNodes) { IPath path = new Path(rootNode.getString(CTX_ROOT_PATH)); IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(path, true /* include phantoms */); if(resource != null) { @@ -178,8 +177,7 @@ public class ModelMergeParticipant extends CVSModelSynchronizeParticipant { // resource roots IResource[] roots = s.roots(); - for (int i = 0; i < roots.length; i++) { - IResource resource = roots[i]; + for (IResource resource : roots) { IMemento rootNode = memento.createChild(CTX_ROOT); rootNode.putString(CTX_ROOT_PATH, resource.getFullPath().toString()); } @@ -221,8 +219,7 @@ public class ModelMergeParticipant extends CVSModelSynchronizeParticipant { */ public static ModelMergeParticipant getMatchingParticipant(ResourceMapping[] mappings, CVSTag startTag, CVSTag endTag) { ISynchronizeParticipantReference[] refs = TeamUI.getSynchronizeManager().getSynchronizeParticipants(); - for (int i = 0; i < refs.length; i++) { - ISynchronizeParticipantReference reference = refs[i]; + for (ISynchronizeParticipantReference reference : refs) { if (reference.getId().equals(ID)) { ModelMergeParticipant p; try { @@ -234,9 +231,7 @@ public class ModelMergeParticipant extends CVSModelSynchronizeParticipant { ResourceMapping[] roots = scope.getMappings(); if (roots.length == mappings.length) { boolean match = true; - for (int j = 0; j < mappings.length; j++) { - - ResourceMapping mapping = mappings[j]; + for (ResourceMapping mapping : mappings) { if (scope.getTraversals(mapping) == null) { // The mapping is not in the scope so the participants don't match match = false; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java index 8c68411bd..20e39e040 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java @@ -88,10 +88,9 @@ public class ModelUpdateOperation extends AbstractModelMergeOperation { ct.addTraversals(getContext().getScope().getTraversals()); IResource[] roots = ct.getRoots(); List<ICVSResource> cvsResources = new ArrayList<>(); - for (int i = 0; i < roots.length; i++) { - IResource resource = roots[i]; + for (IResource resource : roots) { if (resource.getProject().isAccessible()) { - cvsResources.add(CVSWorkspaceRoot.getCVSResourceFor(roots[i])); + cvsResources.add(CVSWorkspaceRoot.getCVSResourceFor(resource)); } } new PruneFolderVisitor().visit( diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/OpenChangeSetAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/OpenChangeSetAction.java index 58b40232e..54ae477c1 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/OpenChangeSetAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/OpenChangeSetAction.java @@ -128,8 +128,7 @@ class OpenChangeSetAction extends ResourceModelParticipantAction { * Build the trees that will be compared */ private boolean buildTrees(CompareTreeBuilder builder, IDiff[] diffs) { - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { if (isFileChange(diff)) { IFileRevision remoteRevision = Utils.getRemote(diff); IResourceVariant remote = SyncInfoToDiffConverter.asResourceVariant(remoteRevision); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceChangeSetCapability.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceChangeSetCapability.java index 19ff7923d..67292b61e 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceChangeSetCapability.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceChangeSetCapability.java @@ -53,8 +53,7 @@ public class WorkspaceChangeSetCapability extends ModelParticipantChangeSetCapab private IResource[] getResources(IDiff[] diffs) { Set<IResource> result = new HashSet<>(); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { IResource resource = ResourceDiffTree.getResourceFor(diff); if (resource != null) result.add(resource); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java index 257dc6d4e..3da350d41 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java @@ -174,8 +174,7 @@ public class WorkspaceSubscriberContext extends CVSSubscriberMergeContext implem DiffTree tree = ((DiffTree)getDiffTree()); try { tree.beginInput(); - for (int i = 0; i < nodes.length; i++) { - IDiff diff = nodes[i]; + for (IDiff diff : nodes) { tree.remove(diff.getPath()); } } finally { @@ -466,8 +465,7 @@ public class WorkspaceSubscriberContext extends CVSSubscriberMergeContext implem private ResourceTraversal[] getTraversals(IDiff[] deltas) { List<IResource> result = new ArrayList<>(); - for (int i = 0; i < deltas.length; i++) { - IDiff diff = deltas[i]; + for (IDiff diff : deltas) { IResource resource = ResourceDiffTree.getResourceFor(diff); if (resource != null) { result.add(resource); @@ -480,8 +478,7 @@ public class WorkspaceSubscriberContext extends CVSSubscriberMergeContext implem private IResourceDiffTree getDiffTree(IDiff[] deltas) { ResourceDiffTree tree = new ResourceDiffTree(); - for (int i = 0; i < deltas.length; i++) { - IDiff diff = deltas[i]; + for (IDiff diff : deltas) { tree.add(diff); } return tree; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFilePropertySource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFilePropertySource.java index 342d709a1..f858a9e00 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFilePropertySource.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFilePropertySource.java @@ -139,9 +139,9 @@ public class CVSRemoteFilePropertySource implements IPropertySource { try { ILogEntry[] entries = file.getLogEntries(monitor); String revision = file.getRevision(); - for (int i = 0; i < entries.length; i++) { - if (entries[i].getRevision().equals(revision)) { - entry = entries[i]; + for (ILogEntry e : entries) { + if (e.getRevision().equals(revision)) { + entry = e; return; } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteContentProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteContentProvider.java index 7c596c2d1..e3eaeb93c 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteContentProvider.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteContentProvider.java @@ -114,8 +114,7 @@ public class RemoteContentProvider extends WorkbenchContentProvider { } } Object[] children = super.getChildren(element); - for (int i = 0; i < children.length; i++) { - Object object = children[i]; + for (Object object : children) { if (object instanceof CVSModelElement) ((CVSModelElement)object).setWorkingSet(getWorkingSet()); } @@ -124,8 +123,7 @@ public class RemoteContentProvider extends WorkbenchContentProvider { public void cancelJobs(RepositoryRoot[] roots) { if (manager != null) { - for (int i = 0; i < roots.length; i++) { - RepositoryRoot root = roots[i]; + for (RepositoryRoot root : roots) { cancelJobs(root.getRoot()); } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/AddOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/AddOperation.java index 7919b5806..2cad69889 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/AddOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/AddOperation.java @@ -104,10 +104,7 @@ public class AddOperation extends RepositoryProviderOperation { // and the depth isn't zero final Map /* from KSubstOption to Set */<KSubstOption, Set> files = new HashMap<>(); final CVSException[] eHolder = new CVSException[1]; - for (int i=0; i<resources.length; i++) { - - final IResource currentResource = resources[i]; - + for (IResource currentResource : resources) { try { // Auto-add parents if they are not already managed IContainer parent = currentResource.getParent(); @@ -181,20 +178,19 @@ public class AddOperation extends RepositoryProviderOperation { session.close(); } } - for (Iterator it = files.entrySet().iterator(); it.hasNext();) { - Map.Entry entry = (Map.Entry) it.next(); + for (Map.Entry entry : files.entrySet()) { final KSubstOption ksubst = (KSubstOption) entry.getKey(); final Set set = (Set) entry.getValue(); Session session = new Session(getRemoteLocation(provider), getLocalRoot(provider), true /* output to console */); session.open(Policy.subMonitorFor(progress, 2), true /* open for modification */); try { IStatus status = Command.ADD.execute( - session, - Command.NO_GLOBAL_OPTIONS, - new LocalOption[] { ksubst }, - (ICVSResource[])set.toArray(new ICVSResource[set.size()]), - null, - Policy.subMonitorFor(progress, 8)); + session, + Command.NO_GLOBAL_OPTIONS, + new LocalOption[] { ksubst }, + (ICVSResource[])set.toArray(new ICVSResource[set.size()]), + null, + Policy.subMonitorFor(progress, 8)); if (status.getCode() == CVSStatus.SERVER_ERROR) { throw new CVSServerException(status); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/BranchOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/BranchOperation.java index 4e350b773..b501d92b8 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/BranchOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/BranchOperation.java @@ -219,8 +219,8 @@ public class BranchOperation extends RepositoryProviderOperation { // Visit all the children folders in order to set the root in the folder sync // info - for (int i = 0; i < resources.length; i++) { - CVSWorkspaceRoot.getCVSResourceFor(resources[i]).accept(new ICVSResourceVisitor() { + for (IResource resource : resources) { + CVSWorkspaceRoot.getCVSResourceFor(resource).accept(new ICVSResourceVisitor() { @Override public void visitFile(ICVSFile file) throws CVSException { monitor1.worked(1); @@ -255,10 +255,9 @@ public class BranchOperation extends RepositoryProviderOperation { private void updateRememberedTags(IResource[] providerResources) throws CVSException { if (rootVersionTag != null || update) { - for (int i = 0; i < providerResources.length; i++) { - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(providerResources[i]); + for (IResource providerResource : providerResources) { + ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(providerResource); RepositoryManager manager = CVSUIPlugin.getPlugin().getRepositoryManager(); - if (rootVersionTag != null) { manager.addTags(cvsResource, new CVSTag[] { rootVersionTag }); } @@ -283,8 +282,10 @@ public class BranchOperation extends RepositoryProviderOperation { * Answers <code>true</code> if all resources in the array have a sticky tag */ private boolean areAllResourcesSticky(IResource[] resources) { - for (int i = 0; i < resources.length; i++) { - if(!hasStickyTag(resources[i])) return false; + for (IResource resource : resources) { + if (!hasStickyTag(resource)) { + return false; + } } return true; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java index 5030bfad1..335262329 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java @@ -154,8 +154,7 @@ public abstract class CVSOperation extends TeamOperation implements IShellProvid throw new CVSException(errors[0]); } MultiStatus result = new MultiStatus(CVSUIPlugin.ID, 0, getErrorMessage(errors, statusCount), null); - for (int i = 0; i < errors.length; i++) { - IStatus s = errors[i]; + for (IStatus s : errors) { if (s.isMultiStatus()) { result.add(new CVSStatus(s.getSeverity(), s.getMessage(), s.getException())); result.addAll(s); @@ -178,14 +177,12 @@ public abstract class CVSOperation extends TeamOperation implements IShellProvid // We are only concerned with reportable errors. // Others will appear in the console List<IStatus> reportableErrors = new ArrayList<>(); - for (int i = 0; i < errors.length; i++) { - IStatus status = errors[i]; + for (IStatus status : errors) { if (isReportableError(status)) { reportableErrors.add(status); } else if (status.isMultiStatus()) { IStatus[] children = status.getChildren(); - for (int j = 0; j < children.length; j++) { - IStatus child = children[j]; + for (IStatus child : children) { if (isReportableError(child)) { reportableErrors.add(status); break; @@ -262,8 +259,7 @@ public abstract class CVSOperation extends TeamOperation implements IShellProvid if (isReportableError(status)) return true; if (status.isMultiStatus()) { IStatus[] children = status.getChildren(); - for (int j = 0; j < children.length; j++) { - IStatus child = children[j]; + for (IStatus child : children) { if (isReportableError(child)) { return true; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheBaseContentsOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheBaseContentsOperation.java index 1fc91f696..27c970d50 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheBaseContentsOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheBaseContentsOperation.java @@ -75,11 +75,9 @@ public class CacheBaseContentsOperation extends CacheTreeContentsOperation { private IResource[] getFilesWithLocalChanges(IResource[] resources, boolean recurse) { ArrayList<IResource> result = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { IDiff[] nodes = getTree().getDiffs(resource, recurse ? IResource.DEPTH_INFINITE: IResource.DEPTH_ONE); - for (int j = 0; j < nodes.length; j++) { - IDiff node = nodes[j]; + for (IDiff node : nodes) { if (isFileWithLocalChange(node)) { result.add(getTree().getResource(node)); } @@ -102,8 +100,7 @@ public class CacheBaseContentsOperation extends CacheTreeContentsOperation { final ContentComparisonSyncInfoFilter comparator = new SyncInfoFilter.ContentComparisonSyncInfoFilter(false); folder.run(monitor1 -> { monitor1.beginTask(null, resources.length * 100); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (resource.exists() && resource.getType() == IResource.FILE) { IResourceVariant remoteResource = (IResourceVariant) CVSWorkspaceRoot .getRemoteResourceFor(resource); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheTreeContentsOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheTreeContentsOperation.java index b0955b832..add9d7e5a 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheTreeContentsOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheTreeContentsOperation.java @@ -58,11 +58,9 @@ public abstract class CacheTreeContentsOperation extends SingleCommandOperation private IResource[] getFilesWithUncachedContents(IResource[] resources, boolean recurse) { ArrayList<IResource> result = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { IDiff[] nodes = tree.getDiffs(resource, recurse ? IResource.DEPTH_INFINITE: IResource.DEPTH_ONE); - for (int j = 0; j < nodes.length; j++) { - IDiff node = nodes[j]; + for (IDiff node : nodes) { if (needsContents(node)) { result.add(tree.getResource(node)); } @@ -129,8 +127,7 @@ public abstract class CacheTreeContentsOperation extends SingleCommandOperation @Override protected ICVSResource[] getCVSArguments(Session session, IResource[] resources) { List<ICVSResource> result = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { try { ICVSResource file = session.getLocalRoot().getChild(resource.getProjectRelativePath().toString()); result.add(file); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java index 0eb05d5a5..b314a6c69 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java @@ -135,8 +135,8 @@ public class CheckoutIntoOperation extends CheckoutOperation { // Convert the module expansions to target folders String[] expansions = session.getModuleExpansions(); - for (int j = 0; j < expansions.length; j++) { - String childPath = new Path(null, expansions[j]).segment(0); + for (String expansion : expansions) { + String childPath = new Path(null, expansion).segment(0); ICVSResource resource = parentFolder.getChild(childPath); if (resource != null && !resource.isFolder()) { // The target folder conflicts with an existing file @@ -174,8 +174,7 @@ public class CheckoutIntoOperation extends CheckoutOperation { * Ensure that the new folders will not conflict with existing folders (even those that are pruned). */ private IStatus validateTargetFolders(ICVSRemoteFolder remoteFolder, ICVSFolder[] targetFolders, IProgressMonitor monitor) throws CVSException { - for (int i = 0; i < targetFolders.length; i++) { - ICVSFolder targetFolder = targetFolders[i]; + for (ICVSFolder targetFolder : targetFolders) { FolderSyncInfo localInfo = targetFolder.getFolderSyncInfo(); FolderSyncInfo remoteInfo = remoteFolder.getFolderSyncInfo(); @@ -274,15 +273,13 @@ public class CheckoutIntoOperation extends CheckoutOperation { if (targetFolders.length > 1) { setInvolvesMultipleResources(true); } - for (int i=0;i<targetFolders.length;i++) { - ICVSFolder targetFolder = targetFolders[i]; + for (ICVSFolder targetFolder : targetFolders) { if (needsPromptForOverwrite(targetFolder, Policy.subMonitorFor(monitor, 50)) && !promptToOverwrite(targetFolder)) { return new CVSStatus(IStatus.INFO, NLS.bind(CVSUIMessages.CheckoutIntoOperation_cancelled, new String[] { remoteFolder.getName() })); } } - - for (int i = 0; i < targetFolders.length; i++) { - IStatus status = scrubFolder(targetFolders[i], Policy.subMonitorFor(monitor, 50)); + for (ICVSFolder targetFolder : targetFolders) { + IStatus status = scrubFolder(targetFolder, Policy.subMonitorFor(monitor, 50)); if (!status.isOK()) return status; } monitor.done(); @@ -371,8 +368,8 @@ public class CheckoutIntoOperation extends CheckoutOperation { } private void manageFolders(ICVSFolder[] targetFolders, String root) throws CVSException { - for (int i = 0; i < targetFolders.length; i++) { - manageFolder(targetFolders[i], root); + for (ICVSFolder targetFolder : targetFolders) { + manageFolder(targetFolder, root); } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutOperation.java index 863931ea3..6f2afc594 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutOperation.java @@ -43,8 +43,7 @@ public abstract class CheckoutOperation extends RemoteOperation { */ protected void checkout(ICVSRemoteFolder[] folders, IProgressMonitor monitor) throws CVSException { monitor.beginTask(null, folders.length * 100); - for (int i = 0; i < folders.length; i++) { - ICVSRemoteFolder folder = folders[i]; + for (ICVSRemoteFolder folder : folders) { IStatus result = checkout(folder, Policy.subMonitorFor(monitor, 100)); collectStatus(result); Policy.checkCanceled(monitor); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java index 23d0c5845..4c3988e08 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java @@ -175,8 +175,9 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation { } IWorkingSet[] ws = getWorkingSets(); if (ws != null) { - for (int i = 0; i < ws.length; i++) - createWorkingSet(ws[i].getName(), targetProjects); + for (IWorkingSet w : ws) { + createWorkingSet(w.getName(), targetProjects); + } } return result[0]; } catch (CVSException e) { @@ -195,8 +196,8 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation { return ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(projects[0]); } else { Set<ISchedulingRule> rules = new HashSet<>(); - for (int i = 0; i < projects.length; i++) { - ISchedulingRule modifyRule = ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(projects[i]); + for (IProject project : projects) { + ISchedulingRule modifyRule = ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(project); if (modifyRule instanceof IResource && ((IResource)modifyRule).getType() == IResource.ROOT) { // One of the projects is mapped to a provider that locks the workspace. // Just return the workspace root rule @@ -326,8 +327,8 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation { } targetProjectSet.add(ResourcesPlugin.getWorkspace().getRoot().getProject(lastSegment)); } else { - for (int j = 0; j < expansions.length; j++) { - targetProjectSet.add(ResourcesPlugin.getWorkspace().getRoot().getProject(new Path(null, expansions[j]).segment(0))); + for (String expansion : expansions) { + targetProjectSet.add(ResourcesPlugin.getWorkspace().getRoot().getProject(new Path(null, expansion).segment(0))); } } @@ -361,8 +362,7 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation { if (projects.length > 1) { setInvolvesMultipleResources(true); } - for (int i=0;i<projects.length;i++) { - IProject project = projects[i]; + for (IProject project : projects) { Policy.checkCanceled(monitor); if (needsPromptForOverwrite(project) && !promptToOverwrite(remoteFolder, project)) { // User said no to this project but not no to all @@ -371,8 +371,7 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation { } // Create the projects and remove any previous content monitor.beginTask(null, projects.length * 100); - for (int i=0;i<projects.length;i++) { - IProject project = projects[i]; + for (IProject project : projects) { createAndOpenProject(project, Policy.subMonitorFor(monitor, 10)); scrubProject(project, Policy.subMonitorFor(monitor, 90)); } @@ -392,9 +391,9 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation { monitor.beginTask(null, 100 + children.length * 100); monitor.subTask(NLS.bind(CVSUIMessages.CheckoutOperation_scrubbingProject, new String[] { project.getName() })); // try { - for (int j = 0; j < children.length; j++) { - if ( ! children[j].getName().equals(".project")) {//$NON-NLS-1$ - children[j].delete(true /*force*/, Policy.subMonitorFor(monitor, 100)); + for (IResource child : children) { + if (!child.getName().equals(".project")) { //$NON-NLS-1$ + child.delete(true /*force*/, Policy.subMonitorFor(monitor, 100)); } } // Make sure there is no sync info cached for the project since @@ -480,8 +479,7 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation { private void refreshProjects(IProject[] projects, IProgressMonitor monitor) throws CVSException { monitor.beginTask(null, projects.length * 100); try { - for (int i = 0; i < projects.length; i++) { - IProject project = projects[i]; + for (IProject project : projects) { // Register the project with Team try { monitor.subTask(NLS.bind(CVSUIMessages.CheckoutOperation_refreshingProject, new String[] { project.getName() })); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java index 96ca3a870..37fb05a7b 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java @@ -218,8 +218,7 @@ public abstract class DiffOperation extends SingleCommandOperation { monitor.beginTask(null,100); final IProgressMonitor subMonitor = Policy.subMonitorFor(monitor,10); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); cvsResource.accept(new ICVSResourceVisitor() { @Override @@ -261,10 +260,9 @@ public abstract class DiffOperation extends SingleCommandOperation { int format = STANDARD_FORMAT; LocalOption[] localoptions = getLocalOptions(recurse); - for (int i = 0; i < localoptions.length; i++) { - LocalOption option = localoptions[i]; + for (LocalOption option : localoptions) { if (option.equals(Diff.UNIFIED_FORMAT) || - isMultiPatch) { + isMultiPatch) { format = UNIFIED_FORMAT; } else if (option.equals(Diff.CONTEXT_FORMAT)) { format = CONTEXT_FORMAT; @@ -338,15 +336,14 @@ public abstract class DiffOperation extends SingleCommandOperation { List<IStatus> toShow = new ArrayList<>(); IStatus children[] = status.getChildren(); boolean may = true; - for (int i = 0; i < children.length; i++) { + for (IStatus child : children) { // ignore all errors except those found by DiffListener - if (children[i].getCode() == CVSStatus.BINARY_FILES_DIFFER - || children[i].getCode() == CVSStatus.PROTOCOL_ERROR - || children[i].getCode() == CVSStatus.ERROR_LINE) { - toShow.add(children[i]); - if (children[i].getCode() == CVSStatus.BINARY_FILES_DIFFER) + if (child.getCode() == CVSStatus.BINARY_FILES_DIFFER || child.getCode() == CVSStatus.PROTOCOL_ERROR || child.getCode() == CVSStatus.ERROR_LINE) { + toShow.add(child); + if (child.getCode() == CVSStatus.BINARY_FILES_DIFFER) { // the patch does not contain some changes for sure may = false; + } } } if (toShow.size() > 0) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FetchAllMembersOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FetchAllMembersOperation.java index df4b39a09..c95b5e0cb 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FetchAllMembersOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FetchAllMembersOperation.java @@ -135,22 +135,18 @@ public class FetchAllMembersOperation extends RemoteOperation { String[] entry = cache.getCachedFilePaths(); //Strip repo + project info from entries RLogTreeBuilder treeBuilder = new RLogTreeBuilder(project.getRepository(),tag); - for (int i = 0; i < entry.length; i++) { - ILogEntry[] logEntry = cache.getLogEntries(entry[i]); - + for (String e : entry) { + ILogEntry[] logEntry = cache.getLogEntries(e); //might not have state if this a branch entry if (logEntry[0].getState() != null && - logEntry[0].getState().equals(DEAD_STATE)) + logEntry[0].getState().equals(DEAD_STATE)) continue; - - ICVSRemoteFile remoteFile = logEntry[0].getRemoteFile(); //if the current folder tag is a branch tag, we need to take the extra step //of making sure that the file's revision number has been set appropriately if (tag.getType() == CVSTag.BRANCH && - remoteFile.getRevision().equals(LogListener.BRANCH_REVISION)) + remoteFile.getRevision().equals(LogListener.BRANCH_REVISION)) verifyRevision(tag, logEntry[0], remoteFile); - IPath logPath = new Path(null,remoteFile.getRepositoryRelativePath()); if (logPath.segmentCount()>0) logPath = logPath.removeFirstSegments(1); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReconcileProjectOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReconcileProjectOperation.java index 5e432a224..2242c5981 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReconcileProjectOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReconcileProjectOperation.java @@ -127,8 +127,7 @@ public class ReconcileProjectOperation extends ShareProjectOperation { // Traverse the children of the remote // (The members were prefetched). ICVSRemoteResource[] members = remote.members(monitor); - for (int i = 0; i < members.length; i++) { - ICVSRemoteResource member = members[i]; + for (ICVSRemoteResource member : members) { populateWorkspace(getLocalChild((IContainer)resource, member), member, monitor); } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java index 97d82aeeb..0ec76423f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java @@ -217,10 +217,8 @@ public class RemoteCompareOperation extends RemoteOperation { String[] leftFiles = getFilePaths(leftTree); String[] rightFiles = getFilePaths(rightTree); Set<String> set = new HashSet<>(); - for (int i = 0; i < rightFiles.length; i++) { - String rightFile = rightFiles[i]; - for (int j = 0; j < leftFiles.length; j++) { - String leftFile = leftFiles[j]; + for (String rightFile : rightFiles) { + for (String leftFile : leftFiles) { if (leftFile.equals(rightFile)) { set.add(leftFile); } @@ -236,8 +234,7 @@ public class RemoteCompareOperation extends RemoteOperation { private String[] getFilePaths(RemoteFolderTree tree) { ICVSRemoteResource[] children = tree.getChildren(); List<String> result = new ArrayList<>(); - for (int i = 0; i < children.length; i++) { - ICVSRemoteResource resource = children[i]; + for (ICVSRemoteResource resource : children) { if (resource.isContainer()) { result.addAll(Arrays.asList(getFilePaths((RemoteFolderTree)resource))); } else { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java index 0c9a56b0d..521acc8b0 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java @@ -155,8 +155,7 @@ public class RemoteLogOperation extends RepositoryLocationOperation { * Return null if the revision wasn't found. */ private ICVSRemoteFile findRevison(ILogEntry[] allLogs, String predecessorRevision) throws TeamException { - for (int i = 0; i < allLogs.length; i++) { - ILogEntry entry = allLogs[i]; + for (ILogEntry entry : allLogs) { ICVSRemoteFile file = entry.getRemoteFile(); if (file.getRevision().equals(predecessorRevision)) { return file; @@ -251,8 +250,7 @@ public class RemoteLogOperation extends RepositoryLocationOperation { // Optimize the cases were we are only fetching the history for a single revision. If it is // already cached, don't fetch it again. ArrayList<ICVSRemoteResource> unCachedRemotes = new ArrayList<>(); - for (int i = 0; i < remoteResources.length; i++) { - ICVSRemoteResource r = remoteResources[i]; + for (ICVSRemoteResource r : remoteResources) { if(entryCache.getLogEntry(r) == null) { unCachedRemotes.add(r); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java index 0962590cb..3d5c20536 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java @@ -132,8 +132,7 @@ public class ReplaceOperation extends UpdateOperation { // Accumulate the managed resources from the list of provided resources List<ICVSResource> managedResources = new ArrayList<>(); monitor.beginTask(null, resources.length * 100); - for (int i = 0; i < resources.length; i++) { - ICVSResource resource = resources[i]; + for (ICVSResource resource : resources) { if ((resource.isFolder() && ((ICVSFolder)resource).isCVSFolder())) { addResourceIfTagExists(managedResources, resource, Policy.subMonitorFor(monitor, 100)); } else if (!resource.isFolder()){ diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryLocationOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryLocationOperation.java index 450b29a3c..2e1d7a4d5 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryLocationOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryLocationOperation.java @@ -58,8 +58,7 @@ public abstract class RepositoryLocationOperation extends RemoteOperation { */ private Map getLocationMapping(ICVSRemoteResource[] remoteResources) { Map locationsMap = new HashMap(); - for (int i = 0; i < remoteResources.length; i++) { - ICVSRemoteResource resource = remoteResources[i]; + for (ICVSRemoteResource resource : remoteResources) { ICVSRepositoryLocation location = resource.getRepository(); List resources = (List)locationsMap.get(location); if (resources == null) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java index 594210167..e2bb41b8c 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java @@ -87,8 +87,7 @@ public abstract class RepositoryProviderOperation extends CVSOperation { * @param traversals the traversals */ public void add(ResourceTraversal[] traversals) { - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { add(traversal); } } @@ -98,8 +97,7 @@ public abstract class RepositoryProviderOperation extends CVSOperation { */ public void add(ResourceTraversal traversal) { IResource[] resources = traversal.getResources(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (resource.getProject().equals(provider.getProject())) { if (resource.getType() == IResource.FILE) { files.add(resource); @@ -327,12 +325,10 @@ public abstract class RepositoryProviderOperation extends CVSOperation { Map getProviderTraversalMapping(IProgressMonitor monitor) throws CoreException { Map<RepositoryProvider, TraversalMapEntry> result = new HashMap<>(); ResourceMapping[] mappings = getScope().getMappings(); - for (int j = 0; j < mappings.length; j++) { - ResourceMapping mapping = mappings[j]; + for (ResourceMapping mapping : mappings) { IProject[] projects = mapping.getProjects(); ResourceTraversal[] traversals = getScope().getTraversals(mapping); - for (int k = 0; k < projects.length; k++) { - IProject project = projects[k]; + for (IProject project : projects) { RepositoryProvider provider = RepositoryProvider.getProvider(project, CVSProviderPlugin.getTypeId()); if (provider != null) { TraversalMapEntry entry = result.get(provider); @@ -394,8 +390,8 @@ public abstract class RepositoryProviderOperation extends CVSOperation { */ protected String[] getStringArguments(IResource[] resources) throws CVSException { List<String> arguments = new ArrayList<>(resources.length); - for (int i=0;i<resources.length;i++) { - IPath cvsPath = resources[i].getFullPath().removeFirstSegments(1); + for (IResource resource : resources) { + IPath cvsPath = resource.getFullPath().removeFirstSegments(1); if (cvsPath.segmentCount() == 0) { arguments.add(Session.CURRENT_LOCAL_FOLDER); } else { @@ -429,8 +425,7 @@ public abstract class RepositoryProviderOperation extends CVSOperation { protected void updateWorkspaceSubscriber(CVSTeamProvider provider, ICVSResource[] resources, boolean recurse, IProgressMonitor monitor) { CVSWorkspaceSubscriber s = CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber(); monitor.beginTask(null, 100 * resources.length); - for (int i = 0; i < resources.length; i++) { - ICVSResource resource = resources[i]; + for (ICVSResource resource : resources) { if (resource.isFolder()) { try { s.updateRemote(provider, (ICVSFolder)resource, recurse, Policy.subMonitorFor(monitor, 100)); @@ -464,8 +459,7 @@ public abstract class RepositoryProviderOperation extends CVSOperation { protected IResource[] getTraversalRoots() { List<IResource> result = new ArrayList<>(); ResourceTraversal[] traversals = getTraversals(); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { result.addAll(Arrays.asList(traversal.getResources())); } return result.toArray(new IResource[result.size()]); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java index 7e043bbe0..2f9260afd 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java @@ -190,8 +190,7 @@ public class ShowAnnotationOperation extends CVSOperation { if (fCVSResource instanceof ICVSFile) { try { ILogEntry[] logEntries= ((ICVSFile) fCVSResource).getLogEntries(monitor); - for (int i= 0; i < logEntries.length; i++) { - ILogEntry entry= logEntries[i]; + for (ILogEntry entry : logEntries) { logEntriesByRevision.put(entry.getRevision(), entry); } } catch (CVSException e) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java index 3efb9d265..c46d24ace 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java @@ -41,8 +41,8 @@ public class TagInRepositoryOperation extends RemoteOperation implements ITagOpe public void execute(IProgressMonitor monitor) throws CVSException, InterruptedException { ICVSRemoteResource[] resources = getRemoteResources(); monitor.beginTask(null, 1000 * resources.length); - for (int i = 0; i < resources.length; i++) { - IStatus status = resources[i].tag(getTag(), getLocalOptions(), SubMonitor.convert(monitor, 1000)); + for (ICVSRemoteResource resource : resources) { + IStatus status = resource.tag(getTag(), getLocalOptions(), SubMonitor.convert(monitor, 1000)); collectStatus(status); } if (!errorsOccurred()) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java index a525ba91e..0fce0b699 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java @@ -167,8 +167,7 @@ public class TagOperation extends RepositoryProviderOperation implements ITagOpe private IProject[] getProjects() { ResourceMapping[] mappings = getSelectedMappings(); Set<IProject> projects = new HashSet<>(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { projects.addAll(Arrays.asList(mapping.getProjects())); } return projects.toArray(new IProject[projects.size()]); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/WorkspaceResourceMapper.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/WorkspaceResourceMapper.java index 2ba9ce323..a66dc41a8 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/WorkspaceResourceMapper.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/WorkspaceResourceMapper.java @@ -46,8 +46,7 @@ public final class WorkspaceResourceMapper extends ResourceMapping { */ public static ResourceMapping[] asResourceMappers(final IResource[] resources, int depth) { List<WorkspaceResourceMapper> result = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { result.add(new WorkspaceResourceMapper(resource, depth)); } return result.toArray(new ResourceMapping[result.size()]); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java index fa8e05390..d092b8272 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java @@ -73,8 +73,7 @@ public class AddToBranchAction extends CVSAction { protected ICVSRemoteFolder getSelectedRootFolder() { ICVSRemoteFolder[] folders = getSelectedRemoteFolders(); ICVSRemoteFolder selectedFolder = null; - for (int i = 0; i < folders.length; i++) { - ICVSRemoteFolder folder = folders[i]; + for (ICVSRemoteFolder folder : folders) { if (folder.isDefinedModule() || new Path(null, folder.getRepositoryRelativePath()).segmentCount()==1) { // only return a folder if one valid one is selected. if (selectedFolder != null) return null; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java index ff40e8262..bac07be69 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java @@ -281,8 +281,8 @@ public class CVSRepositoryPropertiesPage extends PropertyPage { connectionInfoChanged = false; IConnectionMethod[] methods = CVSRepositoryLocation.getPluggedInConnectionMethods(); - for (int i = 0; i < methods.length; i++) { - methodType.add(methods[i].getName()); + for (IConnectionMethod method : methods) { + methodType.add(method.getName()); } String method = location.getMethod().getName(); methodType.select(methodType.indexOf(method)); @@ -364,12 +364,12 @@ public class CVSRepositoryPropertiesPage extends PropertyPage { // For each project shared with the old location, set connection info to the new one List projects = new ArrayList(); IProject[] allProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); - for (int i = 0; i < allProjects.length; i++) { - RepositoryProvider teamProvider = RepositoryProvider.getProvider(allProjects[i], CVSProviderPlugin.getTypeId()); + for (IProject project : allProjects) { + RepositoryProvider teamProvider = RepositoryProvider.getProvider(project, CVSProviderPlugin.getTypeId()); if (teamProvider != null) { CVSTeamProvider cvsProvider = (CVSTeamProvider)teamProvider; if (cvsProvider.getCVSWorkspaceRoot().getRemoteLocation().equals(location)) { - projects.add(allProjects[i]); + projects.add(project); } } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java index ce5df81d7..a34fe4e16 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java @@ -155,8 +155,7 @@ public class RefreshRemoteProjectSelectionPage extends CVSWizardPage { listArea.getViewer().setAllChecked(false); RepositoryManager manager = CVSUIPlugin.getPlugin().getRepositoryManager(); ICVSRemoteResource[] resources = manager.filterResources(workingSet, rootFolders); - for (int i = 0; i < resources.length; i++) { - ICVSRemoteResource resource = resources[i]; + for (ICVSRemoteResource resource : resources) { listArea.getViewer().setChecked(resource, true); } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectWizard.java index b6b56db1c..c7c110b5f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectWizard.java @@ -131,19 +131,19 @@ public class RefreshRemoteProjectWizard extends Wizard { private ICVSRemoteResource[] internalRefresh(final RepositoryManager manager, final ICVSRemoteResource[] selectedFolders, final boolean recurse, IProgressMonitor monitor) throws InvocationTargetException { List failedFolders = new ArrayList(); monitor.beginTask(null, 100 * selectedFolders.length); - for (int i = 0; i < selectedFolders.length; i++) { - try { - ICVSRemoteResource resource = selectedFolders[i]; - if (resource instanceof ICVSFolder) { - CVSTag[] tags = manager.refreshDefinedTags((ICVSFolder)resource, recurse, true /* notify */, Policy.subMonitorFor(monitor, 100)); - if (tags.length == 0) { - failedFolders.add(resource); - } + for (ICVSRemoteResource selectedFolder : selectedFolders) { + try { + ICVSRemoteResource resource = selectedFolder; + if (resource instanceof ICVSFolder) { + CVSTag[] tags = manager.refreshDefinedTags((ICVSFolder)resource, recurse, true /* notify */, Policy.subMonitorFor(monitor, 100)); + if (tags.length == 0) { + failedFolders.add(resource); } - } catch (TeamException e) { - CVSUIPlugin.log(IStatus.ERROR, NLS.bind("An error occurred while fetching the tags for {0}", selectedFolders[i].getName()), e); //$NON-NLS-1$ } + } catch (TeamException e) { + CVSUIPlugin.log(IStatus.ERROR, NLS.bind("An error occurred while fetching the tags for {0}", selectedFolder.getName()), e); //$NON-NLS-1$ } + } return (ICVSRemoteResource[]) failedFolders.toArray(new ICVSRemoteResource[failedFolders.size()]); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveDateTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveDateTagAction.java index 4358c0824..169efb3ca 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveDateTagAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveDateTagAction.java @@ -35,11 +35,11 @@ public class RemoveDateTagAction extends SelectionListenerAction { public void run() { CVSTagElement[] elements = getSelectedCVSTagElements(); if (elements.length == 0) return; - for(int i = 0; i < elements.length; i++){ + for (CVSTagElement element : elements) { RepositoryManager mgr = CVSUIPlugin.getPlugin().getRepositoryManager(); - CVSTag tag = elements[i].getTag(); - if(tag.getType() == CVSTag.DATE){ - mgr.removeDateTag(elements[i].getRoot(),tag); + CVSTag tag = element.getTag(); + if (tag.getType() == CVSTag.DATE) { + mgr.removeDateTag(element.getRoot(), tag); } } } @@ -54,8 +54,8 @@ public class RemoveDateTagAction extends SelectionListenerAction { private boolean containsDataTag(){ CVSTagElement[] elements = getSelectedCVSTagElements(); if (elements.length > 0){ - for(int i = 0; i < elements.length; i++){ - CVSTag tag = elements[i].getTag(); + for (CVSTagElement element : elements) { + CVSTag tag = element.getTag(); if(tag.getType() == CVSTag.DATE){ return true; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java index e0cdec34b..5ab40e041 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java @@ -96,25 +96,24 @@ public class RemoveRootAction extends SelectionListenerAction { if(!proceed[0]){ return; } - for (int i = 0; i < roots.length; i++) { - final ICVSRepositoryLocation root = roots[i]; + for (ICVSRepositoryLocation root : roots) { try { // Check if any projects are shared with the repository IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); final ArrayList shared = new ArrayList(); - for (int j = 0; j < projects.length; j++) { - RepositoryProvider teamProvider = RepositoryProvider.getProvider(projects[j], CVSProviderPlugin.getTypeId()); + for (IProject project : projects) { + RepositoryProvider teamProvider = RepositoryProvider.getProvider(project, CVSProviderPlugin.getTypeId()); if (teamProvider!=null) { CVSTeamProvider cvsProvider = (CVSTeamProvider)teamProvider; - if (cvsProvider.getCVSWorkspaceRoot().getRemoteLocation().equals(roots[i])) { - shared.add(projects[j]); + if (cvsProvider.getCVSWorkspaceRoot().getRemoteLocation().equals(root)) { + shared.add(project); } } } // This will notify the RepositoryManager of the removal if (!shared.isEmpty()) { - final String location = roots[i].getLocation(true); + final String location = root.getLocation(true); shell.getDisplay().syncExec(() -> { DetailsDialogWithProjects dialog = new DetailsDialogWithProjects(shell, CVSUIMessages.RemoteRootAction_Unable_to_Discard_Location_1, diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java index 6b0ad1e5c..5bd1966bd 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java @@ -97,8 +97,8 @@ public class RepositoriesView extends RemoteViewPart { if(selection!=null) { final Object[] array = selection.toArray(); // event.doit = Utils.getResources(array).length > 0; - for (int i = 0; i < array.length; i++) { - if (array[i] instanceof ICVSRemoteFile) { + for (Object a : array) { + if (a instanceof ICVSRemoteFile) { event.doit = true; return; } @@ -111,17 +111,17 @@ public class RepositoriesView extends RemoteViewPart { public void dragSetData(DragSourceEvent event) { if (selection!=null && CVSResourceTransfer.getInstance().isSupportedType(event.dataType)) { final Object[] array = selection.toArray(); - for (int i = 0; i < array.length; i++) { - if (array[i] instanceof ICVSRemoteFile) { - event.data = array[i]; + for (Object a : array) { + if (a instanceof ICVSRemoteFile) { + event.data = a; return; } } } else if (PluginTransfer.getInstance().isSupportedType(event.dataType)) { final Object[] array = selection.toArray(); - for (int i = 0; i < array.length; i++) { - if (array[i] instanceof ICVSRemoteFile) { - event.data = new PluginTransferData("org.eclipse.team.cvs.ui.cvsRemoteDrop", CVSResourceTransfer.getInstance().toByteArray((ICVSRemoteFile) array[i])); //$NON-NLS-1$ + for (Object a : array) { + if (a instanceof ICVSRemoteFile) { + event.data = new PluginTransferData("org.eclipse.team.cvs.ui.cvsRemoteDrop", CVSResourceTransfer.getInstance().toByteArray((ICVSRemoteFile) a)); //$NON-NLS-1$ return; } } @@ -447,8 +447,8 @@ public class RepositoriesView extends RemoteViewPart { if (event.keyCode == SWT.F5) { if (WorkbenchUserAuthenticator.USE_ALTERNATE_PROMPTER) { ICVSRepositoryLocation[] locations = KnownRepositories.getInstance().getRepositories(); - for (int i = 0; i < locations.length; i++) { - locations[i].flushUserInfo(); + for (ICVSRepositoryLocation location : locations) { + location.flushUserInfo(); } } else { refreshAll(); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryEncodingPropertyPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryEncodingPropertyPage.java index b573eedd8..0880db8c5 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryEncodingPropertyPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryEncodingPropertyPage.java @@ -86,8 +86,7 @@ public class RepositoryEncodingPropertyPage extends PropertyPage implements IPro public boolean contains(String name) { try { String[] keys = preferences.keys(); - for (int i = 0; i < keys.length; i++) { - String string = keys[i]; + for (String string : keys) { if (string.equals(name)) { return true; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java index d37c958be..6ef78e44d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java @@ -103,8 +103,7 @@ public class RepositoryManager { */ private RepositoryRoot[] getRepositoryRoots(ICVSRepositoryLocation[] locations) { List<RepositoryRoot> roots = new ArrayList<>(); - for (int i = 0; i < locations.length; i++) { - ICVSRepositoryLocation location = locations[i]; + for (ICVSRepositoryLocation location : locations) { RepositoryRoot root = getRepositoryRootFor(location); if (root != null) roots.add(root); @@ -123,8 +122,7 @@ public class RepositoryManager { try { CVSTag[] tags = getKnownTags(project); Set<CVSTag> result = new HashSet<>(); - for (int i = 0; i < tags.length; i++) { - CVSTag tag = tags[i]; + for (CVSTag tag : tags) { if (tag.getType() == tagType) result.add(tag); } @@ -144,8 +142,7 @@ public class RepositoryManager { RepositoryRoot root = repositoryRoots.get(location.getLocation(false)); if (root != null) { CVSTag[] tags = root.getAllKnownTags(); - for (int i = 0; i < tags.length; i++) { - CVSTag tag = tags[i]; + for (CVSTag tag : tags) { if (tag.getType() == tagType) result.add(tag); } @@ -168,8 +165,8 @@ public class RepositoryManager { ICVSRemoteResource[] folders = getFoldersForTag(repository, CVSTag.DEFAULT, monitor); folders = filterResources(set, folders); Set<CVSTag> tags = new HashSet<>(); - for (int i = 0; i < folders.length; i++) { - ICVSRemoteFolder folder = (ICVSRemoteFolder)folders[i]; + for (ICVSRemoteResource f : folders) { + ICVSRemoteFolder folder = (ICVSRemoteFolder) f; tags.addAll(Arrays.asList(getKnownTags(folder, tagType))); } return tags.toArray(new CVSTag[tags.size()]); @@ -188,8 +185,7 @@ public class RepositoryManager { Map<String, Set<CVSTag>> knownTags = new HashMap<>(); RepositoryRoot root = getRepositoryRootFor(location); String[] paths = root.getKnownRemotePaths(); - for (int i = 0; i < paths.length; i++) { - String path = paths[i]; + for (String path : paths) { Set<CVSTag> result = new HashSet<>(); result.addAll(Arrays.asList(root.getAllKnownTags(path))); knownTags.put(path, result); @@ -223,8 +219,7 @@ public class RepositoryManager { // Get the tags for the location RepositoryRoot root = getRepositoryRootFor(location); String[] paths = root.getRemoteChildrenForTag(null, tag); - for (int i = 0; i < paths.length; i++) { - String path = paths[i]; + for (String path : paths) { ICVSRemoteFolder remote = root.getRemoteFolder(path, tag, Policy.subMonitorFor(monitor, 100)); result.add(remote); @@ -276,8 +271,7 @@ public class RepositoryManager { new String[] { parentFolder.getName(), tag.getName() }) }), 10 * paths.length); try { - for (int i = 0; i < paths.length; i++) { - String path = paths[i]; + for (String path : paths) { ICVSRemoteFolder remote = root.getRemoteFolder(path, tag, Policy.subMonitorFor(monitor, 10)); result.add(remote); @@ -305,9 +299,7 @@ public class RepositoryManager { * A repository root has been added. Notify any listeners. */ public void rootAdded(ICVSRepositoryLocation root) { - Iterator it = listeners.iterator(); - while (it.hasNext()) { - IRepositoryListener listener = (IRepositoryListener)it.next(); + for (IRepositoryListener listener : listeners) { listener.repositoryAdded(root); } } @@ -742,9 +734,7 @@ public class RepositoryManager { private void broadcastRepositoriesChanged(ICVSRepositoryLocation[] roots) { if (roots.length == 0) return; - Iterator it = listeners.iterator(); - while (it.hasNext()) { - IRepositoryListener listener = (IRepositoryListener)it.next(); + for (IRepositoryListener listener : listeners) { listener.repositoriesChanged(roots); } } @@ -794,8 +784,7 @@ public class RepositoryManager { // get the projects associated with the working set IAdaptable[] adaptables = workingSet.getElements(); Set<IProject> projects = new HashSet<>(); - for (int i = 0; i < adaptables.length; i++) { - IAdaptable adaptable = adaptables[i]; + for (IAdaptable adaptable : adaptables) { Object adapted = adaptable.getAdapter(IResource.class); if (adapted != null) { // Can this code be generalized? @@ -804,8 +793,7 @@ public class RepositoryManager { } } List<ICVSRemoteResource> result = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - ICVSRemoteResource resource = resources[i]; + for (ICVSRemoteResource resource : resources) { for (Iterator iter = projects.iterator(); iter.hasNext();) { IProject project = (IProject) iter.next(); if (project.getName().equals(resource.getName())) { @@ -872,8 +860,7 @@ public class RepositoryManager { * Purge any cahced information. */ public void purgeCache() { - for (Iterator iter = repositoryRoots.values().iterator(); iter.hasNext();) { - RepositoryRoot root = (RepositoryRoot) iter.next(); + for (RepositoryRoot root : repositoryRoots.values()) { root.clearCache(); } } @@ -985,14 +972,15 @@ public class RepositoryManager { private void writeCommentTemplates(XMLWriter writer) { writer.startTag(ELEMENT_COMMENT_TEMPLATES, null, false); - for (int i = 0; i < commentTemplates.length; i++) - writer.printSimpleTag(ELEMENT_COMMIT_COMMENT, commentTemplates[i]); + for (String commentTemplate : commentTemplates) { + writer.printSimpleTag(ELEMENT_COMMIT_COMMENT, commentTemplate); + } writer.endTag(ELEMENT_COMMENT_TEMPLATES); } private boolean containsCommentTemplate(String comment) { - for (int i = 0; i < commentTemplates.length; i++) { - if (commentTemplates[i].equals(comment)) { + for (String commentTemplate : commentTemplates) { + if (commentTemplate.equals(comment)) { return true; } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java index fb73fefcc..ad3b107f6 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java @@ -149,8 +149,7 @@ public class RepositoryRoot extends PlatformObject { ICVSRemoteResource[] folders = root.members(CVSTag.DEFAULT, true, monitor); synchronized(modulesCacheLock) { modulesCache = new HashMap(); - for (int i = 0; i < folders.length; i++) { - ICVSRemoteResource resource = folders[i]; + for (ICVSRemoteResource resource : folders) { modulesCache.put(resource.getName(), resource); } } @@ -223,9 +222,9 @@ public class RepositoryRoot extends PlatformObject { } private void addDateTags(CVSTag[] tags){ - for(int i = 0; i < tags.length; i++){ - if(tags[i].getType() == CVSTag.DATE){ - dateTags.add(tags[i]); + for (CVSTag tag : tags) { + if (tag.getType() == CVSTag.DATE) { + dateTags.add(tag); } } } @@ -234,13 +233,13 @@ public class RepositoryRoot extends PlatformObject { TagCacheEntry entry = getTagCacheEntryFor(remotePath, true); // Store the tag with the appropriate ancestor - for (int i = 0; i < tags.length; i++) { - if (tags[i].getType() != CVSTag.DATE) { + for (CVSTag tag : tags) { + if (tag.getType() != CVSTag.DATE) { Set parentTags = new HashSet(); addAllKnownTagsForParents(entry, parentTags); - if (!parentTags.contains(tags[i])) { - entry.getTags().add(tags[i]); - removeTagFromChildrenCacheEntries(entry, tags[i]); + if (!parentTags.contains(tag)) { + entry.getTags().add(tag); + removeTagFromChildrenCacheEntries(entry, tag); } } } @@ -281,8 +280,8 @@ public class RepositoryRoot extends PlatformObject { private void removeDateTags(CVSTag[] tags) { if(dateTags.isEmpty())return; // Store the tag with the appropriate ancestor - for (int i = 0; i < tags.length; i++) { - dateTags.remove(tags[i]); + for (CVSTag tag : tags) { + dateTags.remove(tag); } } @@ -295,23 +294,23 @@ public class RepositoryRoot extends PlatformObject { // remove tags from all parents of this path entry = getKnownParentTagCacheEntryFor(remotePath); - for (int i = 0; i < tags.length; i++) { - if (entry.getTags().contains(tags[i])) { - entry.getTags().remove(tags[i]); + for (CVSTag tag : tags) { + if (entry.getTags().contains(tag)) { + entry.getTags().remove(tag); continue; } TagCacheEntry currentEntry = entry; while (currentEntry.parent != null) { - if (currentEntry.parent.getTags().contains(tags[i])) { + if (currentEntry.parent.getTags().contains(tag)) { // remove tag from parent and add it to siblings - currentEntry.parent.getTags().remove(tags[i]); + currentEntry.parent.getTags().remove(tag); Iterator siblingIterator = currentEntry.parent .getChildrenIterator(); while (siblingIterator.hasNext()) { TagCacheEntry sibling = (TagCacheEntry) siblingIterator .next(); if (!sibling.equals(currentEntry)) { - sibling.getTags().add(tags[i]); + sibling.getTags().add(tag); } } break; @@ -339,8 +338,7 @@ public class RepositoryRoot extends PlatformObject { return new String[0]; } List<String> result = new ArrayList<>(); - for (int i = 0; i < DEFAULT_AUTO_REFRESH_FILES.length; i++) { - String relativePath = DEFAULT_AUTO_REFRESH_FILES[i]; + for (String relativePath : DEFAULT_AUTO_REFRESH_FILES) { result.add(new Path(null, remotePath).append(relativePath).toString()); } return result.toArray(new String[result.size()]); @@ -360,8 +358,7 @@ public class RepositoryRoot extends PlatformObject { // Check to see if the auto-refresh files are the default files if (autoRefreshFiles.length == DEFAULT_AUTO_REFRESH_FILES.length) { boolean isDefault = true; - for (int i = 0; i < DEFAULT_AUTO_REFRESH_FILES.length; i++) { - String filePath = DEFAULT_AUTO_REFRESH_FILES[i]; + for (String filePath : DEFAULT_AUTO_REFRESH_FILES) { if (!newFiles.contains(new Path(null, remotePath).append(filePath).toString())) { isDefault = false; break; @@ -407,11 +404,10 @@ public class RepositoryRoot extends PlatformObject { folder.fetchChildren(Policy.subMonitorFor(monitor, 10)); ICVSResource[] children = folder .members(ICVSFolder.FOLDER_MEMBERS); - for (int i = 0; i < children.length; i++) { - tagsSet.addAll(Arrays.asList(refreshDefinedTags( - (ICVSFolder) children[i], recurse, Policy - .subMonitorFor(monitor, - 100 / children.length)))); + for (ICVSResource child : children) { + tagsSet.addAll(Arrays.asList(refreshDefinedTags((ICVSFolder) child, recurse, Policy + .subMonitorFor(monitor, + 100 / children.length)))); } tags = tagsSet.toArray(new CVSTag[tagsSet.size()]); } @@ -442,11 +438,9 @@ public class RepositoryRoot extends PlatformObject { } String[] keys = logEntries.getCachedFilePaths(); Set<CVSTag> tags = new HashSet<>(); - for (int i = 0; i < keys.length; i++) { - String key = keys[i]; + for (String key : keys) { ILogEntry[] entries = logEntries.getLogEntries(key); - for (int j = 0; j < entries.length; j++) { - ILogEntry entry = entries[j]; + for (ILogEntry entry : entries) { tags.addAll(Arrays.asList(entry.getTags())); } } @@ -469,8 +463,8 @@ public class RepositoryRoot extends PlatformObject { try { monitor.beginTask(null, filesToRefresh.length * 10); List<CVSTag> tags = new ArrayList<>(); - for (int i = 0; i < filesToRefresh.length; i++) { - ICVSRemoteFile file = root.getRemoteFile(filesToRefresh[i], CVSTag.DEFAULT); + for (String f : filesToRefresh) { + ICVSRemoteFile file = root.getRemoteFile(f, CVSTag.DEFAULT); try { tags.addAll(Arrays.asList(fetchTags(file, Policy.subMonitorFor(monitor, 5)))); } catch (TeamException e) { @@ -500,10 +494,10 @@ public class RepositoryRoot extends PlatformObject { private CVSTag[] fetchTags(ICVSRemoteFile file, IProgressMonitor monitor) throws TeamException { Set<CVSTag> tagSet = new HashSet<>(); ILogEntry[] entries = file.getLogEntries(monitor); - for (int j = 0; j < entries.length; j++) { - CVSTag[] tags = entries[j].getTags(); - for (int k = 0; k < tags.length; k++) { - tagSet.add(tags[k]); + for (ILogEntry entry : entries) { + CVSTag[] tags = entry.getTags(); + for (CVSTag tag : tags) { + tagSet.add(tag); } } return tagSet.toArray(new CVSTag[0]); @@ -534,8 +528,7 @@ public class RepositoryRoot extends PlatformObject { private TagCacheEntry getKnownParentTagCacheEntryFor(String remotePath) { String[] segments = new Path(null, remotePath).segments(); TagCacheEntry currentTagCacheEntry = rootTagCacheEntry; - for (int i = 0; i < segments.length; i++) { - String segment = segments[i]; + for (String segment : segments) { if (currentTagCacheEntry.children.containsKey(segment)) { currentTagCacheEntry = currentTagCacheEntry.children .get(segment); @@ -548,8 +541,8 @@ public class RepositoryRoot extends PlatformObject { private void removeTagsFromChildrenCacheEntries(TagCacheEntry entry, CVSTag[] tags) { - for (int i = 0; i < tags.length; i++) { - removeTagFromChildrenCacheEntries(entry, tags[i]); + for (CVSTag tag : tags) { + removeTagFromChildrenCacheEntries(entry, tag); } entry.getTags().removeAll(Arrays.asList(tags)); if (entry.isEmpty()) { @@ -621,8 +614,7 @@ public class RepositoryRoot extends PlatformObject { // Gather all the modules that have tags and/or auto-refresh files // for each module, write the moduel, tags and auto-refresh files. String[] paths = getKnownRemotePaths(); - for (int i = 0; i < paths.length; i++) { - String path = paths[i]; + for (String path : paths) { attributes.clear(); String name = path; if (isDefinedModuleName(path)) { @@ -761,8 +753,7 @@ public class RepositoryRoot extends PlatformObject { String path = folder.getRepositoryRelativePath(); CVSTag[] tags = getAllKnownTags(path); CVSTag tag = folder.getTag(); - for (int i = 0; i < tags.length; i++) { - CVSTag knownTag = tags[i]; + for (CVSTag knownTag : tags) { if (knownTag.equals(tag)) return true; } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java index a4234e41a..0a39c6ec8 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java @@ -222,8 +222,8 @@ public class CVSChangeSetCollector extends SyncInfoSetChangeSetCollector impleme try { monitor.beginTask(null, commentInfos.length * 10); if (logs != null) { - for (int i = 0; i < commentInfos.length; i++) { - addSyncInfoToCommentNode(commentInfos[i], logs); + for (SyncInfo commentInfo : commentInfos) { + addSyncInfoToCommentNode(commentInfo, logs); monitor.worked(10); } } @@ -266,8 +266,7 @@ public class CVSChangeSetCollector extends SyncInfoSetChangeSetCollector impleme String remoteRevision = ((ICVSRemoteFile) remoteResource).getRevision(); if (isDeletedRemotely(info)) { ILogEntry[] logEntries = logs.getLogEntries(remoteResource); - for (int i = 0; i < logEntries.length; i++) { - ILogEntry entry = logEntries[i]; + for (ILogEntry entry : logEntries) { String revision = entry.getRevision(); if (entry.isDeletion() && ResourceSyncInfo.isLaterRevision(revision, remoteRevision)) { logEntry = entry; @@ -295,8 +294,7 @@ public class CVSChangeSetCollector extends SyncInfoSetChangeSetCollector impleme // remote. addRemoteChange(info, null, null); } else { - for (int i = 0; i < logEntries.length; i++) { - ILogEntry entry = logEntries[i]; + for (ILogEntry entry : logEntries) { addRemoteChange(info, remoteResource, entry); } } @@ -366,8 +364,7 @@ public class CVSChangeSetCollector extends SyncInfoSetChangeSetCollector impleme private CheckedInChangeSet getChangeSetFor(ILogEntry logEntry) { ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { if (set instanceof CheckedInChangeSet && set.getComment().equals(logEntry.getComment()) && ((CheckedInChangeSet)set).getAuthor().equals(logEntry.getAuthor())) { @@ -379,8 +376,7 @@ public class CVSChangeSetCollector extends SyncInfoSetChangeSetCollector impleme private CheckedInChangeSet getChangeSetFor(String name) { ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { if (set.getName().equals(name)) { return (CheckedInChangeSet)set; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberOperation.java index 588c34f9a..db93ea647 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberOperation.java @@ -107,8 +107,7 @@ public abstract class CVSSubscriberOperation extends SynchronizeModelOperation { // node itself. We must do this for all incoming folder creations (recursively) // in the case where there are multiple levels of incoming folder creations. monitor.beginTask(null, folders.length); - for (int i = 0; i < folders.length; i++) { - SyncInfo resource = folders[i]; + for (SyncInfo resource : folders) { makeInSync(resource); monitor.worked(1); } @@ -154,8 +153,7 @@ public abstract class CVSSubscriberOperation extends SynchronizeModelOperation { // node itself. We must do this for all incoming folder creations (recursively) // in the case where there are multiple levels of incoming folder creations. monitor.beginTask(null, 100 * folders.length); - for (int i = 0; i < folders.length; i++) { - SyncInfo info = folders[i]; + for (SyncInfo info : folders) { makeOutgoing(info, Policy.subMonitorFor(monitor, 100)); } monitor.done(); @@ -228,8 +226,8 @@ public abstract class CVSSubscriberOperation extends SynchronizeModelOperation { protected IResource[] getIResourcesFrom(SyncInfo[] nodes) { List resources = new ArrayList(nodes.length); - for (int i = 0; i < nodes.length; i++) { - resources.add(nodes[i].getLocal()); + for (SyncInfo node : nodes) { + resources.add(node.getLocal()); } return (IResource[]) resources.toArray(new IResource[resources.size()]); } @@ -320,8 +318,7 @@ public abstract class CVSSubscriberOperation extends SynchronizeModelOperation { Map map = new HashMap(); SyncInfoSet all = getSyncInfoSet(); SyncInfo[] infos = all.getSyncInfos(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { IProject project = info.getLocal().getProject(); SyncInfoSet set = (SyncInfoSet)map.get(project); if (set == null) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java index 7d3e007b4..629af4140 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java @@ -148,8 +148,7 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha */ public static CompareParticipant getMatchingParticipant(IResource[] resources, CVSTag tag) { ISynchronizeParticipantReference[] refs = TeamUI.getSynchronizeManager().getSynchronizeParticipants(); - for (int i = 0; i < refs.length; i++) { - ISynchronizeParticipantReference reference = refs[i]; + for (ISynchronizeParticipantReference reference : refs) { if (reference.getId().equals(CVSCompareSubscriber.ID)) { try { CompareParticipant p = (CompareParticipant) reference.getParticipant(); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareRevertOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareRevertOperation.java index 30f8a8376..fc4e0bc30 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareRevertOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareRevertOperation.java @@ -53,9 +53,7 @@ public class CompareRevertOperation extends CVSSubscriberOperation { // (incoming addition or previously pruned) Set parentCreationElements = new HashSet(); - for (int i = 0; i < changed.length; i++) { - SyncInfo changedNode = changed[i]; - + for (SyncInfo changedNode : changed) { // Make sure that parent folders exist SyncInfo parent = getParent(changedNode); if (parent != null && isOutOfSync(parent)) { @@ -98,8 +96,7 @@ public class CompareRevertOperation extends CVSSubscriberOperation { private void runUpdate(SyncInfo[] infos, IProgressMonitor monitor) throws TeamException { monitor.beginTask(null, 100 * infos.length); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { makeRemoteLocal(info, Policy.subMonitorFor(monitor, 100)); } monitor.done(); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ConfirmMergedOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ConfirmMergedOperation.java index 57aba8f18..ae3bd97f6 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ConfirmMergedOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ConfirmMergedOperation.java @@ -49,8 +49,7 @@ public class ConfirmMergedOperation extends CVSSubscriberOperation { SyncInfo[] syncResources = syncSet.getSyncInfos(); monitor.beginTask(null, 100 * syncResources.length); try { - for (int i = 0; i < syncResources.length; i++) { - SyncInfo info = syncResources[i]; + for (SyncInfo info : syncResources) { if (!makeOutgoing(info, Policy.subMonitorFor(monitor, 100))) { // Failure was logged in makeOutgoing } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CreatePatchAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CreatePatchAction.java index 8b738501a..268dac92a 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CreatePatchAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CreatePatchAction.java @@ -51,8 +51,7 @@ public class CreatePatchAction extends CVSParticipantAction { private SyncInfoSet getSyncInfoSet() { IDiffElement [] elements= getFilteredDiffElements(); SyncInfoSet filtered = new SyncInfoSet(); - for (int i = 0; i < elements.length; i++) { - IDiffElement e = elements[i]; + for (IDiffElement e : elements) { if (e instanceof SyncInfoModelElement) { filtered.add(((SyncInfoModelElement)e).getSyncInfo()); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/LogEntryCacheUpdateHandler.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/LogEntryCacheUpdateHandler.java index ff57ec0e4..71b84d282 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/LogEntryCacheUpdateHandler.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/LogEntryCacheUpdateHandler.java @@ -360,9 +360,8 @@ public class LogEntryCacheUpdateHandler extends BackgroundEventHandler { private void change(SyncInfo[] collected) { Subscriber subscriber = getSubscriber(); - for (int i = 0; i < collected.length; i++) { + for (SyncInfo info : collected) { try { - SyncInfo info = collected[i]; SyncInfo newInfo = subscriber.getSyncInfo(info.getLocal()); if (newInfo == null || !newInfo.equals(info)) { // The cached log entry no longer applies to the new sync info. @@ -468,8 +467,7 @@ public class LogEntryCacheUpdateHandler extends BackgroundEventHandler { for (Iterator iter = fetches.iterator(); iter.hasNext();) { FetchRequest request = (FetchRequest) iter.next(); SyncInfo[] infos = request.getInfos(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { IProject project = info.getLocal().getProject(); SyncInfoSet infoSet = result.get(project); if (infoSet == null) { @@ -624,8 +622,7 @@ public class LogEntryCacheUpdateHandler extends BackgroundEventHandler { for (Iterator iter = set.iterator(); iter.hasNext();) { SyncInfo info = (SyncInfo) iter.next(); IPath localPath = info.getLocal().getFullPath(); - for (int j = 0; j < roots.length; j++) { - IResource resource = roots[j]; + for (IResource resource : roots) { if (resource.getFullPath().isPrefixOf(localPath)) { SyncInfoSet infoList = rootToInfosMap.get(resource); if (infoList == null) { @@ -652,8 +649,7 @@ public class LogEntryCacheUpdateHandler extends BackgroundEventHandler { private ICVSRemoteResource[] getRemotesToFetch(SyncInfo[] infos) { List<ICVSRemoteResource> remotes = new ArrayList<>(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { if (isFetchRequired(info)) { ICVSRemoteResource remote = getRemoteResource(info); if(remote != null) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java index d8eeee466..500ccd56b 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java @@ -172,8 +172,7 @@ public class MergeSynchronizeParticipant extends CVSParticipant { */ public static MergeSynchronizeParticipant getMatchingParticipant(IResource[] resources, CVSTag startTag, CVSTag endTag) { ISynchronizeParticipantReference[] refs = TeamUI.getSynchronizeManager().getSynchronizeParticipants(); - for (int i = 0; i < refs.length; i++) { - ISynchronizeParticipantReference reference = refs[i]; + for (ISynchronizeParticipantReference reference : refs) { if (reference.getId().equals(CVSMergeSubscriber.ID)) { MergeSynchronizeParticipant p; try { @@ -203,8 +202,7 @@ public class MergeSynchronizeParticipant extends CVSParticipant { // resource roots IResource[] roots = s.roots(); - for (int i = 0; i < roots.length; i++) { - IResource resource = roots[i]; + for (IResource resource : roots) { IMemento rootNode = memento.createChild(CTX_ROOT); rootNode.putString(CTX_ROOT_PATH, resource.getFullPath().toString()); } @@ -220,8 +218,7 @@ public class MergeSynchronizeParticipant extends CVSParticipant { } List<IResource> resources = new ArrayList<>(); - for (int i = 0; i < rootNodes.length; i++) { - IMemento rootNode = rootNodes[i]; + for (IMemento rootNode : rootNodes) { IPath path = new Path(rootNode.getString(CTX_ROOT_PATH)); IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(path, true /* include phantoms */); if(resource != null) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateOperation.java index db00c0d42..50cf9dda7 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateOperation.java @@ -70,8 +70,8 @@ public class MergeUpdateOperation extends SafeUpdateOperation { // indicate an outgoing deletion try { monitor.beginTask(null, 100 * nodes.length); - for (int i = 0; i < nodes.length; i++) { - IResource resource = nodes[i].getLocal(); + for (SyncInfo node : nodes) { + IResource resource = node.getLocal(); if (resource.getType() == IResource.FILE) { ((IFile)resource).delete(false /* force */, true /* keep local history */, Policy.subMonitorFor(monitor, 100)); } @@ -93,8 +93,7 @@ public class MergeUpdateOperation extends SafeUpdateOperation { // Incoming additions require different handling then incoming changes and deletions List<SyncInfo> additions = new ArrayList<>(); List<SyncInfo> changes = new ArrayList<>(); - for (int i = 0; i < nodes.length; i++) { - SyncInfo resource = nodes[i]; + for (SyncInfo resource : nodes) { int kind = resource.getKind(); if ((kind & SyncInfo.CHANGE_MASK) == SyncInfo.ADDITION) { additions.add(resource); @@ -151,8 +150,8 @@ public class MergeUpdateOperation extends SafeUpdateOperation { setSubscriber(nodes[0]); monitor.beginTask(null, 1000 * nodes.length); try { - for (int i = 0; i < nodes.length; i++) { - makeRemoteLocal(nodes[i], Policy.subMonitorFor(monitor, 1000)); + for (SyncInfo node : nodes) { + makeRemoteLocal(node, Policy.subMonitorFor(monitor, 1000)); } } finally { monitor.done(); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java index c9a670084..b418330f3 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java @@ -78,8 +78,7 @@ class OpenChangeSetAction extends SynchronizeModelAction { private ChangeSet getChangeSet(Object[] elements) { ChangeSet foundSet = null; - for (int i = 0; i < elements.length; i++) { - Object object = elements[i]; + for (Object object : elements) { ChangeSet set = getChangeSet((ISynchronizeModelElement)object); if (set == null) return null; if (foundSet == null) { @@ -141,8 +140,7 @@ class OpenChangeSetAction extends SynchronizeModelAction { private String getCompareToolTip() { IDiffElement[] elements = getSelectedDiffElements(); - for (int i = 0; i < elements.length; i++) { - IDiffElement element = elements[i]; + for (IDiffElement element : elements) { while (element != null) { if (element instanceof ChangeSetDiffNode) { return ((ChangeSetDiffNode)element).getName(); @@ -179,8 +177,7 @@ class OpenChangeSetAction extends SynchronizeModelAction { * Build the trees that will be compared */ private boolean buildTrees(CompareTreeBuilder builder, SyncInfo[] infos) { - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { IResourceVariant remote = info.getRemote(); if (remote == null) { IResourceVariant predecessor = info.getBase(); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateSubscriberOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateSubscriberOperation.java index 94a497634..92cf89d9b 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateSubscriberOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateSubscriberOperation.java @@ -44,8 +44,7 @@ public class OverrideAndUpdateSubscriberOperation extends CVSSubscriberOperation try { SyncInfo[] conflicts = set.getNodes(getConflictingAdditionFilter()); List<IResource> conflictingResources = new ArrayList<>(); - for (int i = 0; i < conflicts.length; i++) { - SyncInfo info = conflicts[i]; + for (SyncInfo info : conflicts) { conflictingResources.add(info.getLocal()); } new OverrideAndUpdateOperation(getPart(), project, set.getResources(), conflictingResources.toArray(new IResource[conflictingResources.size()]), null /* tag */, false /* recurse */).run(monitor); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RefreshDirtyStateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RefreshDirtyStateOperation.java index c12a06936..af8c8315b 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RefreshDirtyStateOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RefreshDirtyStateOperation.java @@ -61,8 +61,7 @@ public class RefreshDirtyStateOperation extends CVSSubscriberOperation { final ContentComparisonSyncInfoFilter comparator = new SyncInfoFilter.ContentComparisonSyncInfoFilter(false); folder.run(monitor1 -> { monitor1.beginTask(null, infos.length * 100); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { IResource resource = info.getLocal(); if (resource.getType() == IResource.FILE) { if (comparator.compareContents((IFile) resource, info.getBase(), @@ -78,8 +77,7 @@ public class RefreshDirtyStateOperation extends CVSSubscriberOperation { private void ensureBaseContentsCached(IProject project, SyncInfo[] infos, IProgressMonitor monitor) throws CVSException { List<IDiff> diffs = new ArrayList<>(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { IDiff node = getConverter().getDeltaFor(info); diffs.add(node); } @@ -96,8 +94,7 @@ public class RefreshDirtyStateOperation extends CVSSubscriberOperation { private void ensureBaseContentsCached(final IProject project, IDiff[] nodes, IProgressMonitor monitor) throws CVSException { try { ResourceDiffTree tree = new ResourceDiffTree(); - for (int i = 0; i < nodes.length; i++) { - IDiff node = nodes[i]; + for (IDiff node : nodes) { tree.add(node); } new CacheBaseContentsOperation(getPart(), new ResourceMapping[] { project.getAdapter(ResourceMapping.class) }, diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateOperation.java index 0ed91f517..20dad2ccc 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateOperation.java @@ -110,14 +110,13 @@ public abstract class SafeUpdateOperation extends CVSSubscriberOperation { private ISchedulingRule getUpdateRule(SynchronizationScopeManager manager) { ISchedulingRule rule = null; ResourceMapping[] mappings = manager.getScope().getMappings(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { IProject[] mappingProjects = mapping.getProjects(); - for (int j = 0; j < mappingProjects.length; j++) { + for (IProject mappingProject : mappingProjects) { if (rule == null) { - rule = mappingProjects[j]; + rule = mappingProject; } else { - rule = MultiRule.combine(rule, mappingProjects[j]); + rule = MultiRule.combine(rule, mappingProject); } } } @@ -171,8 +170,7 @@ public abstract class SafeUpdateOperation extends CVSSubscriberOperation { FastSyncInfoFilter failFilter = getKnownFailureCases(); SyncInfo[] willFail = syncSet.getNodes(failFilter); syncSet.rejectNodes(failFilter); - for (int i = 0; i < willFail.length; i++) { - SyncInfo info = willFail[i]; + for (SyncInfo info : willFail) { skipped.add(info); } return syncSet; @@ -220,9 +218,7 @@ public abstract class SafeUpdateOperation extends CVSSubscriberOperation { // We do these first to avoid case conflicts List<SyncInfo> updateDeletions = new ArrayList<>(); - for (int i = 0; i < changed.length; i++) { - SyncInfo changedNode = changed[i]; - + for (SyncInfo changedNode : changed) { // Make sure that parent folders exist SyncInfo parent = getParent(changedNode); if (parent != null && isOutOfSync(parent)) { @@ -440,8 +436,7 @@ public abstract class SafeUpdateOperation extends CVSSubscriberOperation { private void addSkippedFiles(IFile[] files) { SyncInfoSet set = getSyncInfoSet(); - for (int i = 0; i < files.length; i++) { - IFile file = files[i]; + for (IFile file : files) { skipped.add(set.getSyncInfo(file)); } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SyncInfoSetDetailsDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SyncInfoSetDetailsDialog.java index 496def9fa..a4a519b53 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SyncInfoSetDetailsDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SyncInfoSetDetailsDialog.java @@ -170,8 +170,10 @@ public abstract class SyncInfoSetDetailsDialog extends DetailsDialog { @Override public boolean select(SyncInfo info) { IResource local = info.getLocal(); - for (int i = 0; i < selectedResources.length; i++) { - if (local.equals(selectedResources[i])) return true; + for (Object selectedResource : selectedResources) { + if (local.equals(selectedResource)) { + return true; + } } return false; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java index 67f774500..35683c90e 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java @@ -72,8 +72,7 @@ public class WorkspaceCommitAction extends CVSParticipantAction { private SyncInfoSet getSyncInfoSet() { IDiffElement [] elements= getFilteredDiffElements(); SyncInfoSet filtered = new SyncInfoSet(); - for (int i = 0; i < elements.length; i++) { - IDiffElement e = elements[i]; + for (IDiffElement e : elements) { if (e instanceof SyncInfoModelElement) { filtered.add(((SyncInfoModelElement)e).getSyncInfo()); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitOperation.java index cce336271..a5d1a171e 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitOperation.java @@ -132,8 +132,7 @@ public class WorkspaceCommitOperation extends CVSSubscriberOperation { // A list of out-of-sync folders that must be made in-sync final List<SyncInfo> makeInSync = new ArrayList<>(); - for (int i = 0; i < changed.length; i++) { - SyncInfo changedNode = changed[i]; + for (SyncInfo changedNode : changed) { int kind = changedNode.getKind(); IResource resource = changedNode.getLocal(); @@ -279,8 +278,7 @@ public class WorkspaceCommitOperation extends CVSSubscriberOperation { ChangeSet[] sets = CVSUIPlugin.getPlugin().getChangeSetManager().getSets(); Arrays.sort(sets, new ChangeSetComparator()); int numMatchedSets = 0; - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { if (containsOne(set, resourcesToCommit)) { if(numMatchedSets > 0) comment.append(System.getProperty("line.separator")); //$NON-NLS-1$ comment.append(set.getComment()); @@ -291,8 +289,7 @@ public class WorkspaceCommitOperation extends CVSSubscriberOperation { } private boolean containsOne(ChangeSet set, IResource[] resourcesToCommit) { - for (int j = 0; j < resourcesToCommit.length; j++) { - IResource resource = resourcesToCommit[j]; + for (IResource resource : resourcesToCommit) { if (set.contains(resource)) { return true; } @@ -320,11 +317,9 @@ public class WorkspaceCommitOperation extends CVSSubscriberOperation { // remove unshared resources that were not selected by the user if (unadded != null && unadded.length > 0) { List<IResource> resourcesToRemove = new ArrayList<>(unadded.length); - for (int i = 0; i < unadded.length; i++) { - IResource unaddedResource = unadded[i]; + for (IResource unaddedResource : unadded) { boolean included = false; - for (int j = 0; j < toBeAdded.length; j++) { - IResource resourceToAdd = toBeAdded[j]; + for (IResource resourceToAdd : toBeAdded) { if (unaddedResource.equals(resourceToAdd)) { included = true; break; @@ -343,8 +338,7 @@ public class WorkspaceCommitOperation extends CVSSubscriberOperation { // could be considered to be under version control already) IResource[] resources = syncSet.getResources(); List<IResource> result = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (!isAdded(resource)) { result.add(resource); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java index e0f53fc75..6b1af9001 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java @@ -157,8 +157,7 @@ public class WorkspaceSynchronizeParticipant extends ScopableSubscriberParticipa private IResource[] getResources(IDiff[] diffs) { Set<IResource> result = new HashSet<>(); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { IResource resource = ResourceDiffTree.getResourceFor(diff); if (resource != null) result.add(resource); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateOperation.java index facf43d0d..2bcb010cc 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateOperation.java @@ -42,8 +42,7 @@ public class WorkspaceUpdateOperation extends SafeUpdateOperation { @Override protected void runUpdateDeletions(SyncInfo[] nodes, IProgressMonitor monitor) throws TeamException { monitor.beginTask(null, nodes.length * 100); - for (int i = 0; i < nodes.length; i++) { - SyncInfo node = nodes[i]; + for (SyncInfo node : nodes) { unmanage(node, Policy.subMonitorFor(monitor, 50)); deleteAndKeepHistory(node.getLocal(), Policy.subMonitorFor(monitor, 50)); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/FilteredTagList.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/FilteredTagList.java index 1669f2c5e..4fc7231be 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/FilteredTagList.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/FilteredTagList.java @@ -40,8 +40,7 @@ public class FilteredTagList implements IWorkbenchAdapter, IAdaptable { public Object[] getChildren(Object o) { CVSTag[] tags = getTags(); List<TagElement> filtered = new ArrayList<>(); - for (int i = 0; i < tags.length; i++) { - CVSTag tag = tags[i]; + for (CVSTag tag : tags) { if (select(tag)) { filtered.add(new TagElement(this, tag)); } @@ -89,8 +88,7 @@ public class FilteredTagList implements IWorkbenchAdapter, IAdaptable { public CVSTag[] getMatchingTags() { CVSTag[] tags = getTags(); List<CVSTag> filtered = new ArrayList<>(); - for (int i = 0; i < tags.length; i++) { - CVSTag tag = tags[i]; + for (CVSTag tag : tags) { if (select(tag)) { filtered.add(tag); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/LocalProjectTagSource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/LocalProjectTagSource.java index b679a7530..a26b159bc 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/LocalProjectTagSource.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/LocalProjectTagSource.java @@ -61,8 +61,7 @@ public class LocalProjectTagSource extends TagSource { private static ICVSRemoteFolder[] getProjectRemoteFolders() { IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); List<ICVSRemoteFolder> result = new ArrayList<>(); - for (int i = 0; i < projects.length; i++) { - IProject project = projects[i]; + for (IProject project : projects) { try { if (project.isAccessible() && RepositoryProvider.isShared(project)) { ICVSRemoteFolder remote = (ICVSRemoteFolder)CVSWorkspaceRoot.getRemoteResourceFor(project); @@ -111,8 +110,7 @@ public class LocalProjectTagSource extends TagSource { } // Accumulate the tags for all folders Set<CVSTag> allTags = new HashSet<>(); - for (int i = 0; i < remoteFolders.length; i++) { - ICVSRemoteFolder folder = remoteFolders[i]; + for (ICVSRemoteFolder folder : remoteFolders) { CVSTag[] tags = SingleFolderTagSource.getTags(folder, type); allTags.addAll(Arrays.asList(tags)); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/MultiFolderTagSource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/MultiFolderTagSource.java index 6fd4f1600..d87099b39 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/MultiFolderTagSource.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/MultiFolderTagSource.java @@ -50,8 +50,8 @@ public class MultiFolderTagSource extends SingleFolderTagSource { return super.getTags(type); } Set<CVSTag> tags = new HashSet<>(); - for (int i= 0; i < folders.length; i++) { - tags.addAll(Arrays.asList(getTags(folders[i], type))); + for (ICVSFolder folder : folders) { + tags.addAll(Arrays.asList(getTags(folder, type))); } return tags.toArray(new CVSTag[tags.size()]); } @@ -60,8 +60,7 @@ public class MultiFolderTagSource extends SingleFolderTagSource { public CVSTag[] refresh(boolean bestEffort, IProgressMonitor monitor) throws TeamException { monitor.beginTask("", folders.length); //$NON-NLS-1$ Set<CVSTag> result = new HashSet<>(); - for (int i= 0; i < folders.length; i++) { - ICVSFolder folder= folders[i]; + for (ICVSFolder folder : folders) { CVSTag[] tags = CVSUIPlugin.getPlugin().getRepositoryManager().refreshDefinedTags(folder, bestEffort /* recurse */, true /* notify */, Policy.subMonitorFor(monitor, 1)); result.addAll(Arrays.asList(tags)); } @@ -86,12 +85,12 @@ public class MultiFolderTagSource extends SingleFolderTagSource { manager.run(monitor1 -> { try { ICVSFolder[] folders = getFolders(); - for (int i = 0; i < folders.length; i++) { + for (ICVSFolder folder : folders) { if (replace) { - CVSTag[] oldTags = manager.getKnownTags(folders[i]); - manager.removeTags(folders[i], oldTags); + CVSTag[] oldTags = manager.getKnownTags(folder); + manager.removeTags(folder, oldTags); } - manager.addTags(folders[i], tags); + manager.addTags(folder, tags); } } catch (CVSException e) { throw new InvocationTargetException(e); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/SingleFileTagSource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/SingleFileTagSource.java index a469a84b7..9ab4fff58 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/SingleFileTagSource.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/SingleFileTagSource.java @@ -29,11 +29,9 @@ public class SingleFileTagSource extends TagSource { public static CVSTag[] fetchTagsFor(ICVSFile file, IProgressMonitor monitor) throws TeamException { Set<CVSTag> tagSet = new HashSet<>(); - ILogEntry[] entries = file.getLogEntries(monitor); - for (int j = 0; j < entries.length; j++) { - CVSTag[] tags = entries[j].getTags(); - for (int k = 0; k < tags.length; k++) { - tagSet.add(tags[k]); + for (ILogEntry entry : file.getLogEntries(monitor)) { + for (CVSTag tag : entry.getTags()) { + tagSet.add(tag); } } return tagSet.toArray(new CVSTag[tagSet.size()]); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagConfigurationDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagConfigurationDialog.java index 8ad20ec49..7c1c927b1 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagConfigurationDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagConfigurationDialog.java @@ -155,8 +155,7 @@ public class TagConfigurationDialog extends TrayDialog { } public void remove(CVSTag[] tags) { - for (int i = 0; i < tags.length; i++) { - CVSTag tag = tags[i]; + for (CVSTag tag : tags) { List list = getTagList(tag.getType()); if (list != null) list.remove(tag); @@ -164,8 +163,7 @@ public class TagConfigurationDialog extends TrayDialog { } public void add(CVSTag[] tags) { - for (int i = 0; i < tags.length; i++) { - CVSTag tag = tags[i]; + for (CVSTag tag : tags) { List<CVSTag> list = getTagList(tag.getType()); if (list != null) list.add(tag); @@ -462,8 +460,8 @@ public class TagConfigurationDialog extends TrayDialog { removeFileButton.setLayoutData(data); removeFileButton.addListener(SWT.Selection, event -> { String[] selected = autoRefreshFileList.getSelection(); - for (int i = 0; i < selected.length; i++) { - autoRefreshFileList.remove(selected[i]); + for (String s : selected) { + autoRefreshFileList.remove(s); autoRefreshFileList.setFocus(); } }); @@ -490,8 +488,8 @@ public class TagConfigurationDialog extends TrayDialog { CVSUIPlugin.runWithProgress(getShell(), true /*cancelable*/, monitor -> { monitor.beginTask(CVSUIMessages.TagConfigurationDialog_22, filesSelection.length); try { - for (int i = 0; i < filesSelection.length; i++) { - ICVSFile file = filesSelection[i].getCVSFile(); + for (CVSFileElement f : filesSelection) { + ICVSFile file = f.getCVSFile(); tags.addAll(Arrays.asList(getTagsFor(file, Policy.subMonitorFor(monitor, 1)))); } } catch (TeamException e) { @@ -571,8 +569,8 @@ public class TagConfigurationDialog extends TrayDialog { private void rememberCheckedTags() { Object[] checked = cvsTagTree.getCheckedElements(); List<CVSTag> tagsToAdd = new ArrayList<>(); - for (int i = 0; i < checked.length; i++) { - CVSTag tag = ((TagElement)checked[i]).getTag(); + for (Object c : checked) { + CVSTag tag = ((TagElement) c).getTag(); tagsToAdd.add(tag); } if (!tagsToAdd.isEmpty()) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagContentAssistProcessor.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagContentAssistProcessor.java index fb8e75424..6f83dd62c 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagContentAssistProcessor.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagContentAssistProcessor.java @@ -68,8 +68,7 @@ public class TagContentAssistProcessor implements ISubjectControlContentAssistPr CVSTag[] matching = tags.getMatchingTags(); if (matching.length > 0) { List<CompletionProposal> proposals = new ArrayList<>(); - for (int i = 0; i < matching.length; i++) { - CVSTag tag = matching[i]; + for (CVSTag tag : matching) { String name = tag.getName(); ImageDescriptor desc = TagElement.getImageDescriptor(tag); Image image = null; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionArea.java index c06143fb8..c3f5b2d5f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionArea.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionArea.java @@ -248,8 +248,7 @@ public class TagSelectionArea extends DialogArea { private int getMaxWidth(Object[] children) { PixelConverter converter = new PixelConverter(tagTable.getTable()); int maxWidth = 0; - for (int i = 0; i < children.length; i++) { - Object object = children[i]; + for (Object object : children) { if (object instanceof TagElement) { TagElement tag = (TagElement) object; int width = tag.getTag().getName().length(); @@ -401,9 +400,9 @@ public class TagSelectionArea extends DialogArea { private void deleteDateTag() { TagElement[] selectedDateTagElements = getSelectedDateTagElement(); if (selectedDateTagElements.length == 0) return; - for(int i = 0; i < selectedDateTagElements.length; i++){ + for (TagElement selectedDateTagElement : selectedDateTagElements) { RepositoryManager mgr = CVSUIPlugin.getPlugin().getRepositoryManager(); - CVSTag tag = selectedDateTagElements[i].getTag(); + CVSTag tag = selectedDateTagElement.getTag(); if(tag.getType() == CVSTag.DATE){ mgr.removeDateTag(getLocation(),tag); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSource.java index 890142793..bc52d58ef 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSource.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSource.java @@ -117,8 +117,8 @@ public abstract class TagSource { private static ICVSFolder[] getFolders(ICVSResource[] resources) { HashSet<ICVSFolder> result = new HashSet<>(); - for (int i= 0; i < resources.length; i++) { - result.add(getFirstFolder(resources[i])); + for (ICVSResource resource : resources) { + result.add(getFirstFolder(resource)); } return result.toArray(new ICVSFolder[result.size()]); } @@ -143,8 +143,7 @@ public abstract class TagSource { private static IResource[] getProjects(ResourceMapping[] mappers) { Set<IProject> projects = new HashSet<>(); - for (int i = 0; i < mappers.length; i++) { - ResourceMapping mapper = mappers[i]; + for (ResourceMapping mapper : mappers) { projects.addAll(Arrays.asList(mapper.getProjects())); } return projects.toArray(new IResource[projects.size()]); @@ -152,8 +151,7 @@ public abstract class TagSource { private static IResource[] getProjects(IResource[] resources) { Set<IProject> result = new HashSet<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { result.add(resource.getProject()); } return result.toArray(new IResource[result.size()]); @@ -170,8 +168,7 @@ public abstract class TagSource { private static ICVSResource[] getCVSResources(IResource[] resources) { List<ICVSResource> cvsResources = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { cvsResources.add(CVSWorkspaceRoot.getCVSResourceFor(resource)); } return cvsResources.toArray(new ICVSResource[cvsResources.size()]); @@ -249,8 +246,8 @@ public abstract class TagSource { */ public void fireChange() { Object[] list = listeners.getListeners(); - for (int i = 0; i < list.length; i++) { - final ITagSourceChangeListener listener = (ITagSourceChangeListener)list[i]; + for (Object o : list) { + final ITagSourceChangeListener listener = (ITagSourceChangeListener) o; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSourceResourceAdapter.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSourceResourceAdapter.java index 744fc482d..6f18233b4 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSourceResourceAdapter.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSourceResourceAdapter.java @@ -43,8 +43,7 @@ public class TagSourceResourceAdapter implements IAdaptable, IWorkbenchAdapter { ICVSResource[] children = tagSource.getCVSResources(); if (children.length == 0) return new Object[0]; List<CVSResourceElement> result = new ArrayList<>(); - for (int i = 0; i < children.length; i++) { - ICVSResource resource = children[i]; + for (ICVSResource resource : children) { if (resource.isFolder()) { result.add(new CVSFolderElement((ICVSFolder)resource, false)); } else { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AddWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AddWizard.java index 4aa2694ef..8d5bb6330 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AddWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AddWizard.java @@ -58,11 +58,9 @@ public class AddWizard extends ResizableWizard { final List<IResource> unadded = new ArrayList<>(); PlatformUI.getWorkbench().getProgressService().busyCursorWhile(monitor -> { final IFileContentManager manager = Team.getFileContentManager(); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); - for (int j = 0; j < resources.length; j++) { - final IResource resource = resources[j]; + for (IResource resource : resources) { try { resource.accept((IResourceVisitor) resource1 -> { if (resource1.getType() == IResource.FILE) { @@ -120,9 +118,7 @@ public class AddWizard extends ResizableWizard { final IFileContentManager manager= Team.getFileContentManager(); - for (int i = 0; i < files.length; i++) { - IFile file = files[i]; - + for (IFile file : files) { final String extension= file.getFileExtension(); if (extension != null && !manager.isKnownExtension(extension)) { extensions.add(extension); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSScmUrlImportWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSScmUrlImportWizardPage.java index 5850924e2..0a76e6287 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSScmUrlImportWizardPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSScmUrlImportWizardPage.java @@ -160,9 +160,9 @@ public class CVSScmUrlImportWizardPage extends WizardPage implements IScmUrlImpo if (head) { // modify tags on bundle import descriptions - for (int i = 0; i < descriptions.length; i++) { - URI scmUri = descriptions[i].getUri(); - descriptions[i].setUrl(removeTag(scmUri)); + for (ScmUrlImportDescription description : descriptions) { + URI scmUri = description.getUri(); + description.setUrl(removeTag(scmUri)); } } @@ -212,15 +212,16 @@ public class CVSScmUrlImportWizardPage extends WizardPage implements IScmUrlImpo if (j != -1) { sb.append(ssp.substring(0, j)); String[] params = ssp.substring(j).split(";"); //$NON-NLS-1$ - for (int k = 0; k < params.length; k++) { + for (String param : params) { // PDE way of providing tags - if (params[k].startsWith("tag=")) { //$NON-NLS-1$ + if (param.startsWith("tag=")) { //$NON-NLS-1$ // ignore - } else if (params[k].startsWith("version=")) { //$NON-NLS-1$ + } else if (param.startsWith("version=")) { //$NON-NLS-1$ // ignore } else { - if (params[k] != null && !params[k].equals("")) //$NON-NLS-1$ - sb.append(';').append(params[k]); + if (param != null && !param.equals("")) { //$NON-NLS-1$ + sb.append(';').append(param); + } } } } else { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSWizardPage.java index 48d0f85d4..2dc1197da 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSWizardPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSWizardPage.java @@ -262,10 +262,10 @@ public abstract class CVSWizardPage extends WizardPage { //filter out the desired resource types ArrayList<IResource> results = new ArrayList<>(); - for (int i = 0; i < members.length; i++) { + for (IResource member : members) { //And the test bits with the resource types to see if they are what we want - if ((members[i].getType() & resourceType) > 0) { - results.add(members[i]); + if ((member.getType() & resourceType) > 0) { + results.add(member); } } return results.toArray(); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java index 111b1ef9d..55c630c0f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java @@ -191,11 +191,12 @@ public class CheckoutAsLocationSelectionPage extends CVSWizardPage { if (settings != null) { String[] previouseLocations = settings.getArray(STORE_PREVIOUS_LOCATIONS); if (previouseLocations != null) { - for (int i = 0; i < previouseLocations.length; i++) { - if(isSingleFolder()) - locationPathField.add(new Path(previouseLocations[i]).append(getSingleProject().getName()).toOSString()); - else - locationPathField.add(previouseLocations[i]); + for (String previouseLocation : previouseLocations) { + if (isSingleFolder()) { + locationPathField.add(new Path(previouseLocation).append(getSingleProject().getName()).toOSString()); + } else { + locationPathField.add(previouseLocation); + } } } } @@ -283,11 +284,11 @@ public class CheckoutAsLocationSelectionPage extends CVSWizardPage { if (!locationStatus.isOK()) return locationStatus.getMessage(); } else { - for (int i = 0; i < remoteFolders.length; i++) { - String projectName = getPreferredFolderName(remoteFolders[i]); + for (ICVSRemoteFolder remoteFolder : remoteFolders) { + String projectName = getPreferredFolderName(remoteFolder); IStatus locationStatus = ResourcesPlugin.getWorkspace().validateProjectLocation( - ResourcesPlugin.getWorkspace().getRoot().getProject(projectName), - new Path(targetLocation).append(projectName)); + ResourcesPlugin.getWorkspace().getRoot().getProject(projectName), + new Path(targetLocation).append(projectName)); if (!locationStatus.isOK()) return locationStatus.getMessage(); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java index 53f47a364..435d9657a 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java @@ -196,8 +196,7 @@ public class CheckoutAsProjectSelectionPage extends CVSWizardPage { List<IProject> validTargets = new ArrayList<>(); try { IResource[] projects = ResourcesPlugin.getWorkspace().getRoot().members(); - for (int i = 0; i < projects.length; i++) { - IResource resource = projects[i]; + for (IResource resource : projects) { if (resource instanceof IProject) { IProject project = (IProject) resource; if (project.isAccessible()) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java index 7bae109da..6a645203d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java @@ -53,8 +53,7 @@ public class CheckoutAsWizard extends Wizard { public void resourceChanged(IResourceChangeEvent event) { IResourceDelta root = event.getDelta(); IResourceDelta[] projectDeltas = root.getAffectedChildren(); - for (int i = 0; i < projectDeltas.length; i++) { - IResourceDelta delta = projectDeltas[i]; + for (IResourceDelta delta : projectDeltas) { IResource resource = delta.getResource(); if (delta.getKind() == IResourceDelta.ADDED) { newProject = (IProject)resource; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java index 65c1d25cf..3acb28443 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java @@ -171,8 +171,7 @@ public class CheckoutWizard extends Wizard implements ICVSWizard, INewWizard { if (page == modulePage) { ICVSRemoteFolder[] selectedModules = getSelectedModules(); if (selectedModules.length == 0) return null; - for (int i = 0; i < selectedModules.length; i++) { - ICVSRemoteFolder folder = selectedModules[i]; + for (ICVSRemoteFolder folder : selectedModules) { if (folder.isDefinedModule()) { // No further configuration is possible for defined modules return null; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java index 1e98440b5..1eb53405f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java @@ -230,8 +230,7 @@ public class CommitWizard extends ResizableWizard { IResource[] resources = getDiffTree().getAffectedResources(); int mostSeriousSeverity = -1; - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { try { int severity = resource.findMaxProblemSeverity(IMarker.PROBLEM, true, IResource.DEPTH_ZERO); if (severity > mostSeriousSeverity) { @@ -439,9 +438,7 @@ public class CommitWizard extends ResizableWizard { final IFileContentManager manager= Team.getFileContentManager(); - for (int i = 0; i < resources.length; i++) { - - IResource local = resources[i]; + for (IResource local : resources) { if (local instanceof IFile && manager.getType((IFile)local) == Team.UNKNOWN) { final String extension= local.getFileExtension(); if (extension != null && !manager.isKnownExtension(extension)) { @@ -457,9 +454,9 @@ public class CommitWizard extends ResizableWizard { private IResource[] getUnaddedResources(IResource[] resources) throws CVSException { List/* <IResource> */<IResource> unadded = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - if (!isAdded(resources[i])) { - unadded.add(resources[i]); + for (IResource resource : resources) { + if (!isAdded(resource)) { + unadded.add(resource); } } return unadded.toArray(new IResource[0]); @@ -467,9 +464,10 @@ public class CommitWizard extends ResizableWizard { private IResource[] getFiles(IResource[] resources) { final List<IResource> files = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - if (resources[i].getType() == IResource.FILE) - files.add(resources[i]); + for (IResource resource : resources) { + if (resource.getType() == IResource.FILE) { + files.add(resource); + } } return files.toArray(new IResource[0]); } @@ -484,8 +482,7 @@ public class CommitWizard extends ResizableWizard { private static IResource[] getDeepResourcesToCommit(ResourceTraversal[] traversals, IProgressMonitor monitor) throws CoreException { List<IResource> roots = new ArrayList<>(); - for (int j = 0; j < traversals.length; j++) { - ResourceTraversal traversal = traversals[j]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); if (traversal.getDepth() == IResource.DEPTH_INFINITE) { roots.addAll(Arrays.asList(resources)); @@ -493,8 +490,7 @@ public class CommitWizard extends ResizableWizard { collectShallowFiles(resources, roots); } else if (traversal.getDepth() == IResource.DEPTH_ONE) { collectShallowFiles(resources, roots); - for (int k = 0; k < resources.length; k++) { - IResource resource = resources[k]; + for (IResource resource : resources) { if (resource.getType() != IResource.FILE) { collectShallowFiles(members(resource), roots); } @@ -509,8 +505,7 @@ public class CommitWizard extends ResizableWizard { } private static void collectShallowFiles(IResource[] resources, List<IResource> roots) { - for (int k = 0; k < resources.length; k++) { - IResource resource = resources[k]; + for (IResource resource : resources) { if (resource.getType() == IResource.FILE) roots.add(resource); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java index eeffa376b..b21d2ab19 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java @@ -423,8 +423,7 @@ public class CommitWizardCommitPage extends WizardPage implements IPropertyChang ChangeSet[] sets = CVSUIPlugin.getPlugin().getChangeSetManager().getSets(); Arrays.sort(sets, new ChangeSetComparator()); int numMatchedSets = 0; - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { if (isUserSet(set) && containsOne(set, resourcesToCommit)) { if(numMatchedSets > 0) comment.append(System.getProperty("line.separator")); //$NON-NLS-1$ comment.append(set.getComment()); @@ -443,8 +442,7 @@ public class CommitWizardCommitPage extends WizardPage implements IPropertyChang } private boolean containsOne(ChangeSet set, IResource[] resourcesToCommit) { - for (int j = 0; j < resourcesToCommit.length; j++) { - IResource resource = resourcesToCommit[j]; + for (IResource resource : resourcesToCommit) { if (set.contains(resource)) { return true; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java index 72d65b803..81347366f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java @@ -368,20 +368,20 @@ public class ConfigurationWizardMainPage extends CVSWizardPage { if (settings != null) { String[] hostNames = settings.getArray(STORE_HOSTNAME_ID); if (hostNames != null) { - for (int i = 0; i < hostNames.length; i++) { - hostCombo.add(hostNames[i]); + for (String hostName : hostNames) { + hostCombo.add(hostName); } } String[] paths = settings.getArray(STORE_PATH_ID); if (paths != null) { - for (int i = 0; i < paths.length; i++) { - repositoryPathCombo.add(paths[i]); + for (String path : paths) { + repositoryPathCombo.add(path); } } String[] userNames = settings.getArray(STORE_USERNAME_ID); if (userNames != null) { - for (int i = 0; i < userNames.length; i++) { - userCombo.add(userNames[i]); + for (String userName : userNames) { + userCombo.add(userName); } } userCombo.add(ANONYMOUS_USER); @@ -393,8 +393,8 @@ public class ConfigurationWizardMainPage extends CVSWizardPage { // Initialize other values and widget states IConnectionMethod[] methods = CVSRepositoryLocation.getPluggedInConnectionMethods(); - for (int i = 0; i < methods.length; i++) { - connectionMethodCombo.add(methods[i].getName()); + for (IConnectionMethod method : methods) { + connectionMethodCombo.add(method.getName()); } // pserver is a default connection method @@ -615,8 +615,7 @@ public class ConfigurationWizardMainPage extends CVSWizardPage { } IPath path = new Path(null, pathString); String[] segments = path.segments(); - for (int i = 0; i < segments.length; i++) { - String string = segments[i]; + for (String string : segments) { if (string.charAt(0) == ' ' || string.charAt(string.length() -1) == ' ') { return new Status(IStatus.ERROR, CVSUIPlugin.ID, INVALID_FIELD_CONTENTS, CVSUIMessages.ConfigurationWizardMainPage_invalidPathWithSpaces, null); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java index cd22913fa..5975becf6 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java @@ -148,9 +148,9 @@ public class GenerateDiffFileWizard extends Wizard { return allProjects; ArrayList<IProject> accessibleProjects = new ArrayList<>(); - for (int i = 0; i < allProjects.length; i++) { - if (allProjects[i].isOpen()) { - accessibleProjects.add(allProjects[i]); + for (IProject project : allProjects) { + if (project.isOpen()) { + accessibleProjects.add(project); } } return accessibleProjects.toArray(); @@ -894,8 +894,8 @@ public class GenerateDiffFileWizard extends Wizard { Viewer viewer = page.getViewer(); if (viewer instanceof CheckboxTreeViewer) { TreeItem[] items=((CheckboxTreeViewer)viewer).getTree().getItems(); - for (int i = 0; i < items.length; i++) { - ((CheckboxTreeViewer)viewer).setChecked(items[i].getData(), true); + for (TreeItem item : items) { + ((CheckboxTreeViewer)viewer).setChecked(item.getData(), true); } } } @@ -909,8 +909,7 @@ public class GenerateDiffFileWizard extends Wizard { Object[] elements = ((CheckboxTreeViewer)viewer).getCheckedElements(); IResource[]selectedResources = Utils.getResources(elements); ArrayList<IResource> result = new ArrayList<>(); - for (int i = 0; i < selectedResources.length; i++) { - IResource resource = selectedResources[i]; + for (IResource resource : selectedResources) { if (fConfiguration.getSyncInfoSet().getSyncInfo(resource) != null) { result.add(resource); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizard.java index 838639e01..4f879a6ef 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizard.java @@ -128,8 +128,7 @@ public class MergeWizard extends Wizard { private IResource[] getProjects(IResource[] resources) { Set<IProject> projects = new HashSet<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { projects.add(resource.getProject()); } return projects.toArray(new IResource[projects.size()]); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java index b00039397..99eca7e05 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java @@ -205,8 +205,7 @@ public class MergeWizardPage extends CVSWizardPage { } else { tags = tagSource.getTags(new int[] { CVSTag.VERSION, CVSTag.BRANCH, CVSTag.DATE }); } - for (int i = 0; i < tags.length; i++) { - CVSTag tag = tags[i]; + for (CVSTag tag : tags) { if (tag.getName().equals(text)) { return tag; } @@ -250,8 +249,7 @@ public class MergeWizardPage extends CVSWizardPage { private CVSTag findCommonBaseTag(CVSTag tag) { CVSTag[] tags = tagSource.getTags(CVSTag.VERSION); - for (int i = 0; i < tags.length; i++) { - CVSTag potentialMatch = tags[i]; + for (CVSTag potentialMatch : tags) { if (potentialMatch.getName().indexOf(tag.getName()) != -1) { return potentialMatch; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModeWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModeWizard.java index 9c0df66ec..ccfa34157 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModeWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModeWizard.java @@ -130,8 +130,7 @@ public class ModeWizard extends ResizableWizard { final ArrayList<ModeChange> changes = new ArrayList<>(); final HashSet<IResource> visited = new HashSet<>(); - for (int i = 0; i < resources.length; i++) { - final IResource currentResource = resources[i]; + for (IResource currentResource : resources) { try { currentResource.accept((IResourceVisitor) resource -> { try { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java index 504afc838..bb81ea9df 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java @@ -355,8 +355,7 @@ public class RestoreFromRepositoryFileSelectionPage extends CVSWizardPage { revisionsTable.setChecked(selectedEntry, true); } // Disable entries that represent deletions since they can't be loaded - for (int i = 0; i < entries.length; i++) { - ILogEntry entry = entries[i]; + for (ILogEntry entry : entries) { if (entry.isDeletion()) { revisionsTable.setGrayed(entry, true); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java index dd1f9b330..b8e317098 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java @@ -66,11 +66,9 @@ public class UpdateWizard extends ResizableWizard { */ private CVSTag getInitialSelection() { try { - for (int i = 0; i < mappers.length; i++) { - ResourceMapping mapper = mappers[i]; + for (ResourceMapping mapper : mappers) { IProject[] projects = mapper.getProjects(); - for (int k = 0; k < projects.length; k++) { - IProject project = projects[k]; + for (IProject project : projects) { ICVSFolder folder = CVSWorkspaceRoot.getCVSFolderFor(project); FolderSyncInfo info = folder.getFolderSyncInfo(); if (info != null) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/DefaultUIFileModificationValidator.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/DefaultUIFileModificationValidator.java index 99ac0ba6a..011105714 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/DefaultUIFileModificationValidator.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/DefaultUIFileModificationValidator.java @@ -74,8 +74,8 @@ public class DefaultUIFileModificationValidator extends DefaultFileModificationV data.grabExcessHorizontalSpace = true; fileList.setLayoutData(data); fileList.setFont(parent.getFont()); - for (int i = 0; i < files.length; i++) { - fileList.add(files[i].getFullPath().toString()); + for (IFile file : files) { + fileList.add(file.getFullPath().toString()); } return composite; } @@ -169,8 +169,7 @@ public class DefaultUIFileModificationValidator extends DefaultFileModificationV private IFile[] getReadOnlyFiles(IFile[] files) { List<IFile> result = new ArrayList<>(); - for (int i = 0; i < files.length; i++) { - IFile file = files[i]; + for (IFile file : files) { if (file.isReadOnly()) { result.add(file); } @@ -179,8 +178,7 @@ public class DefaultUIFileModificationValidator extends DefaultFileModificationV } protected IStatus setWritable(final IFile[] files) { - for (int i = 0; i < files.length; i++) { - IFile file = files[i]; + for (IFile file : files) { ResourceAttributes attributes = file.getResourceAttributes(); if (attributes != null) { attributes.setReadOnly(false); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetImporter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetImporter.java index 70e5d16dc..d8bcb7f67 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetImporter.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetImporter.java @@ -112,14 +112,14 @@ public class ProjectSetImporter { UIProjectSetSerializationContext context = new UIProjectSetSerializationContext(shell, filename); List<TeamException> errors = new ArrayList<TeamException>(); IMemento[] providers = xmlMemento.getChildren("provider"); //$NON-NLS-1$ - for (int i = 0; i < providers.length; i++) { + for (IMemento provider : providers) { ArrayList<String> referenceStrings= new ArrayList<>(); - IMemento[] projects = providers[i].getChildren("project"); //$NON-NLS-1$ - for (int j = 0; j < projects.length; j++) { - referenceStrings.add(projects[j].getString("reference")); //$NON-NLS-1$ + IMemento[] projects = provider.getChildren("project"); //$NON-NLS-1$ + for (IMemento project : projects) { + referenceStrings.add(project.getString("reference")); //$NON-NLS-1$ } try { - String id = providers[i].getString("id"); //$NON-NLS-1$ + String id = provider.getString("id"); //$NON-NLS-1$ TeamCapabilityHelper.getInstance().processRepositoryId(id, PlatformUI.getWorkbench().getActivitySupport()); RepositoryProviderType providerType = RepositoryProviderType.getProviderType(id); @@ -157,8 +157,8 @@ public class ProjectSetImporter { boolean mergeAll = false; boolean skipAll = false; - for (int i = 0; i < sets.length; i++) { - IWorkingSet newWs = wsManager.createWorkingSet(sets[i]); + for (IMemento set : sets) { + IWorkingSet newWs = wsManager.createWorkingSet(set); if (newWs != null) { IWorkingSet oldWs = wsManager.getWorkingSet(newWs .getName()); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/PropertyChangeHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/PropertyChangeHandler.java index 8ac7d6259..1237e8395 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/PropertyChangeHandler.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/PropertyChangeHandler.java @@ -56,8 +56,8 @@ public class PropertyChangeHandler { } fEvent = event; Object[] copiedListeners = fListeners.getListeners(); - for (int i = 0; i < copiedListeners.length; i++) { - fListener = (IPropertyChangeListener) copiedListeners[i]; + for (Object copiedListener : copiedListeners) { + fListener = (IPropertyChangeListener) copiedListener; SafeRunner.run(this); } fListener = null; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/SWTUtils.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/SWTUtils.java index 18e26ea52..348f34989 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/SWTUtils.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/SWTUtils.java @@ -328,8 +328,8 @@ public class SWTUtils { public static int getWidthInCharsForLongest(PixelConverter converter, String [] strings) { int minimum= 0; - for (int i = 0; i < strings.length; i++) { - final int length= converter.convertWidthInCharsToPixels(strings[i].length()); + for (String string : strings) { + final int length = converter.convertWidthInCharsToPixels(string.length()); if (minimum < length) minimum= length; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamCapabilityHelper.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamCapabilityHelper.java index a864f5f78..c4aea1529 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamCapabilityHelper.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamCapabilityHelper.java @@ -75,9 +75,9 @@ public class TeamCapabilityHelper { // crawl the initial projects IProject [] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); IWorkbenchActivitySupport workbenchActivitySupport = PlatformUI.getWorkbench().getActivitySupport(); - for (int i = 0; i < projects.length; i++) { + for (IProject project : projects) { try { - processProject(projects[i], workbenchActivitySupport); + processProject(project, workbenchActivitySupport); } catch (CoreException e) { // do nothing } @@ -92,11 +92,9 @@ public class TeamCapabilityHelper { IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.team.core.repository"); //$NON-NLS-1$ if (point != null) { IExtension[] extensions = point.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IExtension extension = extensions[i]; + for (IExtension extension : extensions) { IConfigurationElement[] elements = extension.getConfigurationElements(); - for (int j = 0; j < elements.length; j++) { - IConfigurationElement element = elements[j]; + for (IConfigurationElement element : elements) { final String pluginId = extension.getNamespace(); if (element.getName().equals(TeamPlugin.REPOSITORY_EXTENSION)) { final String id = element.getAttribute("id"); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java index a3b8755b5..df2ad53da 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java @@ -623,8 +623,7 @@ public class Utils { private static IResource[] getResources(Object[] elements, List<Object> nonResources, boolean isContributed, boolean includeMappingResources) { List<IResource> resources = new ArrayList<>(); - for (int i = 0; i < elements.length; i++) { - Object element = elements[i]; + for (Object element : elements) { boolean isResource = false; if (element instanceof IResource) { resources.add((IResource) element); @@ -676,11 +675,9 @@ public class Utils { private static void getResources(ResourceMapping element, List<IResource> resources) { try { ResourceTraversal[] traversals = element.getTraversals(ResourceMappingContext.LOCAL_CONTEXT, null); - for (int k = 0; k < traversals.length; k++) { - ResourceTraversal traversal = traversals[k]; + for (ResourceTraversal traversal : traversals) { IResource[] resourceArray = traversal.getResources(); - for (int j = 0; j < resourceArray.length; j++) { - IResource resource = resourceArray[j]; + for (IResource resource : resourceArray) { resources.add(resource); } } @@ -731,8 +728,7 @@ public class Utils { } } IDiffElement[] children = element.getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement child = children[i]; + for (IDiffElement child : children) { if (child instanceof ISynchronizeModelElement) { if (hasMatchingDescendant((ISynchronizeModelElement)child, filter)) { return true; @@ -751,8 +747,7 @@ public class Utils { */ public static IDiffElement[] getDiffNodes(Object[] selected) { Set<IDiffElement> result = new HashSet<>(); - for (int i = 0; i < selected.length; i++) { - Object object = selected[i]; + for (Object object : selected) { if(object instanceof IDiffElement) { collectAllNodes((IDiffElement)object, result); } @@ -766,8 +761,8 @@ public class Utils { } if(element instanceof IDiffContainer) { IDiffElement[] children = ((IDiffContainer)element).getChildren(); - for (int i = 0; i < children.length; i++) { - collectAllNodes(children[i], nodes); + for (IDiffElement c : children) { + collectAllNodes(c, nodes); } } } @@ -985,8 +980,7 @@ public class Utils { public static ResourceMapping[] getResourceMappings(Object[] objects) { List<ResourceMapping> result = new ArrayList<>(); - for (int i = 0; i < objects.length; i++) { - Object object = objects[i]; + for (Object object : objects) { ResourceMapping mapping = getResourceMapping(object); if (mapping != null) result.add(mapping); @@ -1033,8 +1027,7 @@ public class Utils { public static String convertSelection(ResourceMapping[] mappings) { StringBuilder buffer = new StringBuilder(); boolean hadOne = false; - for (int i = 0; i < mappings.length; i++) { - ResourceMapping resourceMapping = mappings[i]; + for (ResourceMapping resourceMapping : mappings) { String label = getLabel(resourceMapping); if (label != null) { if(hadOne) buffer.append(", "); //$NON-NLS-1$ @@ -1047,8 +1040,7 @@ public class Utils { public static ResourceTraversal[] getTraversals(Object[] elements) throws CoreException { CompoundResourceTraversal traversal = new CompoundResourceTraversal(); - for (int i = 0; i < elements.length; i++) { - Object object = elements[i]; + for (Object object : elements) { ResourceMapping mapping = getResourceMapping(object); if (mapping != null) { traversal.addTraversals(mapping.getTraversals(ResourceMappingContext.LOCAL_CONTEXT, null)); @@ -1224,15 +1216,15 @@ public class Utils { Class[] editorInputClasses) { IEditorReference[] editorRefs = page.getEditorReferences(); // first loop looking for an editor with the same input - for (int i = 0; i < editorRefs.length; i++) { - IEditorPart part = editorRefs[i].getEditor(false); + for (IEditorReference editorRef : editorRefs) { + IEditorPart part = editorRef.getEditor(false); if (part != null && part instanceof IReusableEditor) { - for (int j = 0; j < editorInputClasses.length; j++) { + for (Class editorInputClasse : editorInputClasses) { // check if the editor input type // complies with the types given by the caller - if (editorInputClasses[j].isInstance(part.getEditorInput()) - && part.getEditorInput().equals(input)) + if (editorInputClasse.isInstance(part.getEditorInput()) && part.getEditorInput().equals(input)) { return part; + } } } } @@ -1240,8 +1232,8 @@ public class Utils { // a non-dirty editor if (TeamUIPlugin.getPlugin().getPreferenceStore() .getBoolean(IPreferenceIds.REUSE_OPEN_COMPARE_EDITOR)) { - for (int i = 0; i < editorRefs.length; i++) { - IEditorPart part = editorRefs[i].getEditor(false); + for (IEditorReference editorRef : editorRefs) { + IEditorPart part = editorRef.getEditor(false); if (part != null && (part.getEditorInput() instanceof SaveableCompareEditorInput) && part instanceof IReusableEditor && !part.isDirty()) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/CompareRevisionAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/CompareRevisionAction.java index 447d6d50a..33663e246 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/CompareRevisionAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/CompareRevisionAction.java @@ -226,13 +226,12 @@ public class CompareRevisionAction extends BaseSelectionListenerAction { if (objArray.length == 0) return false; - for (int i = 0; i < objArray.length; i++) { - + for (Object obj : objArray) { //Don't bother showing if this a category - if (objArray[i] instanceof AbstractHistoryCategory) + if (obj instanceof AbstractHistoryCategory) { return false; - - IFileRevision revision = (IFileRevision) objArray[i]; + } + IFileRevision revision = (IFileRevision) obj; //check to see if any of the selected revisions are deleted revisions if (revision != null && !revision.exists()) return false; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/ConfigureProjectAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/ConfigureProjectAction.java index dcfeb5047..a2c4c430f 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/ConfigureProjectAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/ConfigureProjectAction.java @@ -50,8 +50,7 @@ public class ConfigureProjectAction extends TeamAction { @Override public boolean isEnabled() { IProject[] selectedProjects = getSelectedProjects(); - for (int i = 0; i < selectedProjects.length; i++) { - IProject project = selectedProjects[i]; + for (IProject project : selectedProjects) { if (!project.isAccessible()) return false; if (RepositoryProvider.isShared(project)) return false; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/OpenRevisionAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/OpenRevisionAction.java index 829e2eb41..66a1d91bc 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/OpenRevisionAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/OpenRevisionAction.java @@ -48,8 +48,7 @@ public class OpenRevisionAction extends BaseSelectionListenerAction { Object[] objArray = structSel.toArray(); - for (int i = 0; i < objArray.length; i++) { - Object tempRevision = objArray[i]; + for (Object tempRevision : objArray) { //If not a revision, don't try opening if (tempRevision instanceof AbstractHistoryCategory) continue; @@ -75,7 +74,6 @@ public class OpenRevisionAction extends BaseSelectionListenerAction { } catch (InterruptedException e) { } } - } } @@ -92,12 +90,12 @@ public class OpenRevisionAction extends BaseSelectionListenerAction { if (objArray.length == 0) return false; - for (int i = 0; i < objArray.length; i++) { + for (Object obj : objArray) { //Don't bother showing if this a category - if (objArray[i] instanceof AbstractHistoryCategory) + if (obj instanceof AbstractHistoryCategory) { return false; - - IFileRevision revision = (IFileRevision) objArray[i]; + } + IFileRevision revision = (IFileRevision) obj; //check to see if any of the selected revisions are deleted revisions if (revision != null && !revision.exists()) return false; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/OpenWithMenu.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/OpenWithMenu.java index a45398cd7..8e0a1efa2 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/OpenWithMenu.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/OpenWithMenu.java @@ -236,8 +236,7 @@ public class OpenWithMenu extends ContributionItem { // if the same editor goes to two mappings. ArrayList<IEditorDescriptor> alreadyMapped = new ArrayList<>(); - for (int i = 0; i < editors.length; i++) { - IEditorDescriptor editor = editors[i]; + for (IEditorDescriptor editor : editors) { if (!alreadyMapped.contains(editor)) { createMenuItem(menu, editor, preferredEditor); if (defaultTextEditor != null @@ -325,8 +324,7 @@ public class OpenWithMenu extends ContributionItem { Object[] objArray = structSel.toArray(); - for (int i = 0; i < objArray.length; i++) { - Object tempRevision = objArray[i]; + for (Object tempRevision : objArray) { // If not a revision, don't try opening if (tempRevision instanceof AbstractHistoryCategory) continue; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java index a4f627bca..b7e6d1513 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java @@ -191,8 +191,7 @@ public abstract class TeamAction extends AbstractHandler implements IObjectActio IResource[] selectedResources = getSelectedResources(); if (selectedResources.length == 0) return new IProject[0]; ArrayList<IProject> projects = new ArrayList<>(); - for (int i = 0; i < selectedResources.length; i++) { - IResource resource = selectedResources[i]; + for (IResource resource : selectedResources) { if (resource.getType() == IResource.PROJECT) { projects.add((IProject) resource); } @@ -236,8 +235,7 @@ public abstract class TeamAction extends AbstractHandler implements IObjectActio protected ResourceMapping[] getSelectedResourceMappings(String providerId) { Object[] elements = getSelection().toArray(); ArrayList<ResourceMapping> providerMappings = new ArrayList<>(); - for (int i = 0; i < elements.length; i++) { - Object object = elements[i]; + for (Object object : elements) { Object adapted = getResourceMapping(object); if (adapted instanceof ResourceMapping) { ResourceMapping mapping = (ResourceMapping) adapted; @@ -257,8 +255,7 @@ public abstract class TeamAction extends AbstractHandler implements IObjectActio private boolean isMappedToProvider(ResourceMapping element, String providerId) { IProject[] projects = element.getProjects(); - for (int k = 0; k < projects.length; k++) { - IProject project = projects[k]; + for (IProject project : projects) { RepositoryProvider provider = RepositoryProvider.getProvider(project); if (provider != null && provider.getID().equals(providerId)) { return true; @@ -397,14 +394,14 @@ public abstract class TeamAction extends AbstractHandler implements IObjectActio */ protected Hashtable<RepositoryProvider, List<IResource>> getProviderMapping(IResource[] resources) { Hashtable<RepositoryProvider, List<IResource>> result = new Hashtable<>(); - for (int i = 0; i < resources.length; i++) { - RepositoryProvider provider = RepositoryProvider.getProvider(resources[i].getProject()); + for (IResource resource : resources) { + RepositoryProvider provider = RepositoryProvider.getProvider(resource.getProject()); List<IResource> list = result.get(provider); if (list == null) { list = new ArrayList<>(); result.put(provider, list); } - list.add(resources[i]); + list.add(resource); } return result; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialogWithProjects.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialogWithProjects.java index 918a5b9aa..3913032ab 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialogWithProjects.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialogWithProjects.java @@ -88,8 +88,8 @@ public class DetailsDialogWithProjects extends DetailsDialog { detailsList.setLayoutData(data); - for (int i = 0; i < projects.length; i++) { - detailsList.add(projects[i].getName()); + for (IProject project : projects) { + detailsList.add(project.getName()); } return composite; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java index 008107569..1303f383e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java @@ -110,8 +110,7 @@ public class PreferencePageContainerDialog extends TrayDialog @Override protected void okPressed() { - for (int i = 0; i < pages.length; i++) { - PreferencePage page = pages[i]; + for (PreferencePage page : pages) { page.performOk(); } @@ -163,8 +162,7 @@ public class PreferencePageContainerDialog extends TrayDialog tabFolder = new TabFolder(composite, SWT.NONE); tabFolder.setLayoutData(new GridData(GridData.FILL_BOTH)); - for (int i = 0; i < pages.length; i++) { - PreferencePage page = pages[i]; + for (PreferencePage page : pages) { // text decoration options TabItem tabItem = new TabItem(tabFolder, SWT.NONE); tabItem.setText(page.getTitle());// @@ -407,8 +405,7 @@ public class PreferencePageContainerDialog extends TrayDialog public void updateButtons() { if (fOkButton != null) { boolean isValid = true; - for (int i = 0; i < pages.length; i++) { - PreferencePage page = pages[i]; + for (PreferencePage page : pages) { if (!page.isValid()) { isValid = false; break; @@ -442,12 +439,11 @@ public class PreferencePageContainerDialog extends TrayDialog */ protected void handleSave() { // Save now in case tbe workbench does not shutdown cleanly - for (int i = 0; i < pages.length; i++) { - PreferencePage page = pages[i]; + for (PreferencePage page : pages) { IPreferenceStore store = page.getPreferenceStore(); if (store != null - && store.needsSaving() - && store instanceof IPersistentPreferenceStore) { + && store.needsSaving() + && store instanceof IPersistentPreferenceStore) { try { ((IPersistentPreferenceStore) store).save(); } catch (IOException e) { @@ -475,8 +471,8 @@ public class PreferencePageContainerDialog extends TrayDialog private void firePageChanged(final PageChangedEvent event) { Object[] listeners = pageChangedListeners.getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IPageChangedListener l = (IPageChangedListener) listeners[i]; + for (Object listener : listeners) { + final IPageChangedListener l = (IPageChangedListener) listener; SafeRunnable.run(new SafeRunnable() { @Override public void run() { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PromptingDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PromptingDialog.java index e9453943d..4b08473c5 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PromptingDialog.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PromptingDialog.java @@ -62,8 +62,7 @@ public class PromptingDialog extends MultipleYesNoPrompter { */ public IResource[] promptForMultiple() throws InterruptedException { List<IResource> targetResources = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (!condition.needsPrompt(resource) || shouldInclude(condition.promptMessage(resource))) { targetResources.add(resource); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingHierarchyArea.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingHierarchyArea.java index 945e99362..4baf67915 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingHierarchyArea.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingHierarchyArea.java @@ -88,8 +88,7 @@ public class ResourceMappingHierarchyArea extends DialogArea implements INavigat return new Object[0]; ResourceMapping[] mappings = scope.getMappings(); List<Object> result = new ArrayList<>(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { result.add(mapping.getModelObject()); } return result.toArray(new Object[result.size()]); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingResourceDisplayArea.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingResourceDisplayArea.java index c3fdbf671..361c256c0 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingResourceDisplayArea.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingResourceDisplayArea.java @@ -97,11 +97,9 @@ public class ResourceMappingResourceDisplayArea extends DialogArea { public Object[] getChildren(Object o) { ResourceTraversal[] traversals = getTraversals(); List<ResourceTraversalElement> result = new ArrayList<>(); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); - for (int j = 0; j < resources.length; j++) { - IResource resource = resources[j]; + for (IResource resource : resources) { if (isIncludedInFilter(resource, traversal)) result.add(new ResourceTraversalElement(this, traversal, resource, context)); } @@ -180,8 +178,7 @@ public class ResourceMappingResourceDisplayArea extends DialogArea { if (resource.getType() != IResource.FILE) { IResource[] members = members(((IContainer)resource)); List<ResourceTraversalElement> result = new ArrayList<ResourceTraversalElement>(); - for (int i = 0; i < members.length; i++) { - IResource child = members[i]; + for (IResource child : members) { if ((includeFolders || child.getType() == IResource.FILE) && isIncludedInFilter(child, traversal)) result.add(new ResourceTraversalElement(this, traversal, child, context)); @@ -320,8 +317,7 @@ public class ResourceMappingResourceDisplayArea extends DialogArea { try { monitor.beginTask(null, IProgressMonitor.UNKNOWN); ResourceTraversal[] traversals = mapping.getTraversals(context, Policy.subMonitorFor(monitor, IProgressMonitor.UNKNOWN)); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { buildFilteredResourceMap(mapping, traversal, Policy.subMonitorFor(monitor, IProgressMonitor.UNKNOWN), result); } } catch (CoreException e) { @@ -404,8 +400,7 @@ public class ResourceMappingResourceDisplayArea extends DialogArea { /* private */ static boolean isTraversalRoot(ResourceTraversal traversal, IResource resource) { IResource[] resources = traversal.getResources(); - for (int i = 0; i < resources.length; i++) { - IResource root = resources[i]; + for (IResource root : resources) { if (root.equals(resource)) { return true; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/DateHistoryCategory.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/DateHistoryCategory.java index 17abe4de7..e855d0647 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/DateHistoryCategory.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/DateHistoryCategory.java @@ -49,41 +49,38 @@ public class DateHistoryCategory extends AbstractHistoryCategory { ArrayList<IFileRevision> pertinentRevisions = new ArrayList<>(); ArrayList<IFileRevision> nonPertinentRevisions = new ArrayList<>(); - for (int i = 0; i < fileRevisions.length; i++) { + for (IFileRevision fileRevision : fileRevisions) { //get the current file revision's date Calendar fileRevDate = Calendar.getInstance(); - fileRevDate.setTimeInMillis(fileRevisions[i].getTimestamp()); - + fileRevDate.setTimeInMillis(fileRevision.getTimestamp()); int fileRevDay = fileRevDate.get(Calendar.DAY_OF_YEAR); int fileRevYear = fileRevDate.get(Calendar.YEAR); - - if (fromDate == null){ + if (fromDate == null) { //check to see if this revision is within the toDate range if (((fileRevDay<toDate.get(Calendar.DAY_OF_YEAR)) && (fileRevYear == toDate.get(Calendar.YEAR))) || - (fileRevYear < toDate.get(Calendar.YEAR))){ - pertinentRevisions.add(fileRevisions[i]); + (fileRevYear < toDate.get(Calendar.YEAR))) { + pertinentRevisions.add(fileRevision); } else { //revision is equal or later then the to date, add to rejects list - nonPertinentRevisions.add(fileRevisions[i]); + nonPertinentRevisions.add(fileRevision); } - } else if (toDate == null){ + } else if (toDate == null) { //check to see if this revision falls on the same day as the fromDate if ((fileRevDay == fromDate.get(Calendar.DAY_OF_YEAR)) && - (fileRevYear == fromDate.get(Calendar.YEAR))){ - pertinentRevisions.add(fileRevisions[i]); + (fileRevYear == fromDate.get(Calendar.YEAR))) { + pertinentRevisions.add(fileRevision); } else { - nonPertinentRevisions.add(fileRevisions[i]); + nonPertinentRevisions.add(fileRevision); } } else { //check the range if ((fileRevYear >= fromDate.get(Calendar.YEAR)) && - (fileRevYear <= toDate.get(Calendar.YEAR)) && - (fileRevDay >= fromDate.get(Calendar.DAY_OF_YEAR)) && - (fileRevDay < toDate.get(Calendar.DAY_OF_YEAR)) - ) { - pertinentRevisions.add(fileRevisions[i]); + (fileRevYear <= toDate.get(Calendar.YEAR)) && + (fileRevDay >= fromDate.get(Calendar.DAY_OF_YEAR)) && + (fileRevDay < toDate.get(Calendar.DAY_OF_YEAR))) { + pertinentRevisions.add(fileRevision); } else { - nonPertinentRevisions.add(fileRevisions[i]); + nonPertinentRevisions.add(fileRevision); } } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/EditionHistoryPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/EditionHistoryPage.java index 0a0f5e004..56722d06f 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/EditionHistoryPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/EditionHistoryPage.java @@ -171,8 +171,7 @@ public class EditionHistoryPage extends LocalHistoryPage { ITypedElement localEdition = null; try { localEdition = createLocalEdition(structureCreator, localFileElement, element); - for (int i = 0; i < revisions.length; i++) { - IFileRevision revision = revisions[i]; + for (IFileRevision revision : revisions) { ITypedElement edition = createEdition(structureCreator, element, new FileRevisionTypedElement(revision)); if (edition != null && !contentsEqual(structureCreator, localEdition, edition)) { return edition; @@ -245,8 +244,7 @@ public class EditionHistoryPage extends LocalHistoryPage { List<IFileRevision> result = new ArrayList<IFileRevision>(); sortDescending(revisions); editions.clear(); - for (int i = 0; i < revisions.length; i++) { - IFileRevision revision = revisions[i]; + for (IFileRevision revision : revisions) { ITypedElement edition = createEdition(new FileRevisionTypedElement(revision)); if (edition != null && !contentsEqual(structureCreator, previousEdition, edition)) { editions.put(revision, edition); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryTableProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryTableProvider.java index a1aeb09b2..29874301a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryTableProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryTableProvider.java @@ -122,8 +122,8 @@ public class GenericHistoryTableProvider { if (currentRevisionFont == null) { Font defaultFont = JFaceResources.getDefaultFont(); FontData[] data = defaultFont.getFontData(); - for (int i = 0; i < data.length; i++) { - data[i].setStyle(SWT.BOLD); + for (FontData d : data) { + d.setStyle(SWT.BOLD); } currentRevisionFont = new Font(viewer.getTable().getDisplay(), data); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java index 92bd5cf08..e6d3b622a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java @@ -178,8 +178,7 @@ public class GenericHistoryView extends PageBookView implements IHistoryView, IP public void updateName(IHistoryPage historyPage, IHistoryPageSource pageSource) { NavigationHistoryEntry[] historyEntries = getEntries(); - for (int i = 0; i < historyEntries.length; i++) { - NavigationHistoryEntry historyEntry = historyEntries[i]; + for (NavigationHistoryEntry historyEntry : historyEntries) { if (historyEntry.matches(historyPage, pageSource)) historyEntry.name = historyPage.getName(); } @@ -286,8 +285,7 @@ public class GenericHistoryView extends PageBookView implements IHistoryView, IP private IAction[] createActions() { NavigationHistoryEntry[] entries = getDropDownEntries(); List<NavigationHistoryEntryAction> actions = new ArrayList<NavigationHistoryEntryAction>(); - for (int i = 0; i < entries.length; i++) { - NavigationHistoryEntry navigationHistoryEntry = entries[i]; + for (NavigationHistoryEntry navigationHistoryEntry : entries) { actions.add(new NavigationHistoryEntryAction(navigationHistoryEntry)); } return actions.toArray(new IAction[actions.size()]); @@ -317,8 +315,7 @@ public class GenericHistoryView extends PageBookView implements IHistoryView, IP private void updateCheckState() { IAction[] actions = getActions(); - for (int i = 0; i < actions.length; i++) { - IAction action = actions[i]; + for (IAction action : actions) { if (action instanceof NavigationHistoryEntryAction) { NavigationHistoryEntryAction a = (NavigationHistoryEntryAction) action; a.update(); @@ -735,9 +732,9 @@ public class GenericHistoryView extends PageBookView implements IHistoryView, IP private IHistoryPage searchHistoryViewsForObject(Object object, boolean refresh, IHistoryPageSource pageSource) { IWorkbenchPage page = getSite().getPage(); IViewReference[] historyViews = page.getViewReferences(); - for (int i = 0; i < historyViews.length; i++) { - if (historyViews[i].getId().equals(VIEW_ID)){ - IViewPart historyView = historyViews[i].getView(true); + for (IViewReference h : historyViews) { + if (h.getId().equals(VIEW_ID)) { + IViewPart historyView = h.getView(true); if (historyView instanceof GenericHistoryView) { GenericHistoryView ghv = (GenericHistoryView)historyView; IHistoryPage historyPage = ghv.checkForExistingPage(object, refresh, pageSource); @@ -753,9 +750,9 @@ public class GenericHistoryView extends PageBookView implements IHistoryView, IP public GenericHistoryView findUnpinnedHistoryView(){ IWorkbenchPage page = getSite().getPage(); IViewReference[] historyViews = page.getViewReferences(); - for (int i = 0; i < historyViews.length; i++) { - if (historyViews[i].getId().equals(VIEW_ID)){ - IViewPart historyView = historyViews[i].getView(false); + for (IViewReference h : historyViews) { + if (h.getId().equals(VIEW_ID)) { + IViewPart historyView = h.getView(false); if (!((GenericHistoryView)historyView).isViewPinned()) return (GenericHistoryView) historyView; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java index 0781e390c..24fcddc09 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java @@ -843,16 +843,16 @@ public class LocalHistoryPage extends HistoryPage implements IHistoryCompareAdap private Object[] mapExpandedElements(AbstractHistoryCategory[] categories, Object[] expandedElements) { // Store the names of the currently expanded categories in a set. HashSet<String> names = new HashSet<>(); - for (int i = 0; i < expandedElements.length; i++){ - names.add(((DateHistoryCategory) expandedElements[i]).getName()); + for (Object expandedElement : expandedElements) { + names.add(((DateHistoryCategory) expandedElement).getName()); } //Go through the new categories and keep track of the previously expanded ones ArrayList<AbstractHistoryCategory> expandable = new ArrayList<>(); - for (int i = 0; i < categories.length; i++){ + for (AbstractHistoryCategory category : categories) { // Check to see if this category is currently expanded. - if (names.contains(categories[i].getName())){ - expandable.add(categories[i]); + if (names.contains(category.getName())) { + expandable.add(category); } } return expandable.toArray(new Object[expandable.size()]); @@ -879,10 +879,11 @@ public class LocalHistoryPage extends HistoryPage implements IHistoryCompareAdap tempCategories[3] = new DateHistoryCategory(TeamUIMessages.HistoryPage_Previous, null, monthCal); ArrayList<AbstractHistoryCategory> finalCategories = new ArrayList<AbstractHistoryCategory>(); - for (int i = 0; i<tempCategories.length; i++){ - tempCategories[i].collectFileRevisions(revisions, false); - if (tempCategories[i].hasRevisions()) - finalCategories.add(tempCategories[i]); + for (DateHistoryCategory tempCategory : tempCategories) { + tempCategory.collectFileRevisions(revisions, false); + if (tempCategory.hasRevisions()) { + finalCategories.add(tempCategory); + } } if (finalCategories.isEmpty()){ diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java index db61ac625..04931882e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java @@ -164,8 +164,8 @@ public class LocalHistoryTableProvider { if (currentRevisionFont == null) { Font defaultFont = JFaceResources.getDefaultFont(); FontData[] data = defaultFont.getFontData(); - for (int i = 0; i < data.length; i++) { - data[i].setStyle(SWT.BOLD); + for (FontData d : data) { + d.setStyle(SWT.BOLD); } currentRevisionFont = new Font(viewer.getTree().getDisplay(), data); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/OpenLocalFileAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/OpenLocalFileAction.java index 71559ad67..60101a8ae 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/OpenLocalFileAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/OpenLocalFileAction.java @@ -42,8 +42,8 @@ public class OpenLocalFileAction extends BaseSelectionListenerAction { Object[] objArray = structSel.toArray(); - for (int i = 0; i < objArray.length; i++) { - IFileState state = (IFileState) objArray[i]; + for (Object obj : objArray) { + IFileState state = (IFileState) obj; if (!state.exists()) { MessageDialog.openError(TeamUIPlugin.getActivePage().getActivePart().getSite().getShell(), TeamUIMessages.OpenRevisionAction_DeletedRevisionTitle, TeamUIMessages.OpenRevisionAction_DeletedRevisionMessage); } else { @@ -53,7 +53,6 @@ public class OpenLocalFileAction extends BaseSelectionListenerAction { page.openEditor(new FileRevisionEditorInput(state), id); } } - } } catch (Exception e) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/AbstractCompareInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/AbstractCompareInput.java index c1e4ff3be..400e3a6b6 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/AbstractCompareInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/AbstractCompareInput.java @@ -69,8 +69,8 @@ public abstract class AbstractCompareInput implements ICompareInput { protected void fireChange() { if (!listeners.isEmpty()) { Object[] allListeners = listeners.getListeners(); - for (int i = 0; i < allListeners.length; i++) { - final ICompareInputChangeListener listener = (ICompareInputChangeListener)allListeners[i]; + for (Object l : allListeners) { + final ICompareInputChangeListener listener = (ICompareInputChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void run() throws Exception { @@ -89,8 +89,7 @@ public abstract class AbstractCompareInput implements ICompareInput { if (listeners.isEmpty()) return false; Object[] allListeners = listeners.getListeners(); - for (int i = 0; i < allListeners.length; i++) { - Object object = allListeners[i]; + for (Object object : allListeners) { if (object == listener) return true; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/CommonViewerAdvisor.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/CommonViewerAdvisor.java index 661484491..1d75b8b98 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/CommonViewerAdvisor.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/CommonViewerAdvisor.java @@ -175,8 +175,7 @@ public class CommonViewerAdvisor extends AbstractTreeViewerAdvisor implements IN private void internalCollectVisibleExpanded(ArrayList<TreePath> result, Widget widget) { Item[] items = getChildren(widget); - for (int i = 0; i < items.length; i++) { - Item item = items[i]; + for (Item item : items) { if (getExpanded(item)) { TreePath path = getTreePathFromItem(item); if (path != null) { @@ -299,8 +298,7 @@ public class CommonViewerAdvisor extends AbstractTreeViewerAdvisor implements IN Set<String> result = new HashSet<>(); Object property = configuration.getProperty(ITeamContentProviderManager.PROP_PAGE_LAYOUT); boolean isFlatLayout = property != null && property.equals(ITeamContentProviderManager.FLAT_LAYOUT); - for (int i = 0; i < providers.length; i++) { - ModelProvider provider = providers[i]; + for (ModelProvider provider : providers) { ITeamContentProviderDescriptor desc = TeamUI.getTeamContentProviderManager().getDescriptor(provider.getId()); if (desc != null && desc.isEnabled() && (!isFlatLayout || desc.isFlatLayoutSupported())) result.add(desc.getContentExtensionId()); @@ -312,8 +310,7 @@ public class CommonViewerAdvisor extends AbstractTreeViewerAdvisor implements IN ITeamContentProviderManager teamContentProviderManager = TeamUI.getTeamContentProviderManager(); ITeamContentProviderDescriptor[] descriptors = teamContentProviderManager.getDescriptors(); Set<String> toBind = new HashSet<>(); - for (int i = 0; i < descriptors.length; i++) { - ITeamContentProviderDescriptor descriptor = descriptors[i]; + for (ITeamContentProviderDescriptor descriptor : descriptors) { toBind.add(descriptor.getContentExtensionId()); } v.getNavigatorContentService().bindExtensions(toBind.toArray(new String[toBind.size()]), true); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/CompareInputChangeNotifier.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/CompareInputChangeNotifier.java index 9835054c9..9c52a1eec 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/CompareInputChangeNotifier.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/CompareInputChangeNotifier.java @@ -110,8 +110,7 @@ public abstract class CompareInputChangeNotifier implements } } dispatchChanges(toDispatch, monitor); - for (int i = 0; i < events.length; i++) { - RunnableEvent event = events[i]; + for (RunnableEvent event : events) { executeRunnableNow(event, monitor); } return true; @@ -134,8 +133,7 @@ public abstract class CompareInputChangeNotifier implements InputChangeEvent changeEvent = (InputChangeEvent) event; ICompareInput[] inputs = changeEvent.getChangedInputs(); synchronized (changedInputs) { - for (int i = 0; i < inputs.length; i++) { - ICompareInput input = inputs[i]; + for (ICompareInput input : inputs) { changedInputs.add(input); } } @@ -276,8 +274,7 @@ public abstract class CompareInputChangeNotifier implements */ protected void prepareInputs(ICompareInput[] inputs, IProgressMonitor monitor) { monitor.beginTask(null, inputs.length * 100); - for (int i = 0; i < inputs.length; i++) { - ICompareInput input = inputs[i]; + for (ICompareInput input : inputs) { prepareInput(input, Policy.subMonitorFor(monitor, 100)); } monitor.done(); @@ -303,8 +300,7 @@ public abstract class CompareInputChangeNotifier implements * @param inputs the changed inputs */ protected void fireChanges(ICompareInput[] inputs) { - for (int i = 0; i < inputs.length; i++) { - ICompareInput input = inputs[i]; + for (ICompareInput input : inputs) { fireChange(input); } } @@ -321,11 +317,9 @@ public abstract class CompareInputChangeNotifier implements public void resourceChanged(IResourceChangeEvent event) { List<ICompareInput> changedInputs = new ArrayList<>(); ICompareInput[] inputs = getConnectedInputs(); - for (int i = 0; i < inputs.length; i++) { - ICompareInput input = inputs[i]; + for (ICompareInput input : inputs) { IResource[] resources = getResources(input); - for (int j = 0; j < resources.length; j++) { - IResource resource = resources[j]; + for (IResource resource : resources) { if (resource != null) { IResourceDelta delta = event.getDelta().findMember(resource.getFullPath()); if (delta != null) { @@ -362,8 +356,7 @@ public abstract class CompareInputChangeNotifier implements realChanges = inputs; } else { List<ICompareInput> result = new ArrayList<>(); - for (int i = 0; i < inputs.length; i++) { - ICompareInput input = inputs[i]; + for (ICompareInput input : inputs) { if (isChanged(input)) { result.add(input); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java index 1b242233f..7f9523a15 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java @@ -277,8 +277,7 @@ public class DiffTreeChangesSection extends ForwardingChangesSection implements // same mode before offering to change modes. ModelProvider[] providers =findModelsWithChangesInMode(getConfiguration().getMode()); ModelProvider currentProvider = null; - for (int i = 0; i < providers.length; i++) { - ModelProvider provider = providers[i]; + for (ModelProvider provider : providers) { if (isEnabled(provider)) { if (provider.getDescriptor().getId().equals(id)) { currentProvider = provider; @@ -300,8 +299,7 @@ public class DiffTreeChangesSection extends ForwardingChangesSection implements private boolean isAtLeastOneProviderDisabled() { ModelProvider[] providers =findModelsWithChangesInMode(getConfiguration().getMode()); - for (int i = 0; i < providers.length; i++) { - ModelProvider provider = providers[i]; + for (ModelProvider provider : providers) { if (!isEnabled(provider)) { return true; } @@ -313,8 +311,7 @@ public class DiffTreeChangesSection extends ForwardingChangesSection implements ModelProvider[] providers =context.getScope().getModelProviders(); providers = ModelOperation.sortByExtension(providers); List<ModelProvider> result = new ArrayList<>(); - for (int i = 0; i < providers.length; i++) { - ModelProvider provider = providers[i]; + for (ModelProvider provider : providers) { ISynchronizationCompareAdapter adapter = Utils.getCompareAdapter(provider); if (adapter != null) { boolean hasChanges = hasChangesInMode(provider.getId(), adapter, getConfiguration().getMode()); @@ -367,8 +364,7 @@ public class DiffTreeChangesSection extends ForwardingChangesSection implements ModelProvider[] providers = participant.getEnabledModelProviders(); Set<ITeamContentProviderDescriptor> toEnable = new HashSet<>(); toEnable.addAll(Arrays.asList(descriptors)); - for (int i = 0; i < providers.length; i++) { - ModelProvider provider = providers[i]; + for (ModelProvider provider : providers) { ITeamContentProviderDescriptor desc = TeamUI.getTeamContentProviderManager().getDescriptor(provider.getId()); if (desc != null && !desc.isEnabled()) { toEnable.add(desc); @@ -389,8 +385,7 @@ public class DiffTreeChangesSection extends ForwardingChangesSection implements ModelSynchronizeParticipant participant = (ModelSynchronizeParticipant)getConfiguration().getParticipant(); ModelProvider[] providers = participant.getEnabledModelProviders(); Set<ITeamContentProviderDescriptor> result = new HashSet<>(); - for (int i = 0; i < providers.length; i++) { - ModelProvider provider = providers[i]; + for (ModelProvider provider : providers) { ITeamContentProviderDescriptor desc = TeamUI.getTeamContentProviderManager().getDescriptor(provider.getId()); if (desc != null && desc.isEnabled()) result.add(desc); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelElementSelectionPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelElementSelectionPage.java index f26ee68b3..55e3a64eb 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelElementSelectionPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelElementSelectionPage.java @@ -63,8 +63,7 @@ public class ModelElementSelectionPage extends GlobalRefreshElementSelectionPage setDescription(TeamUIMessages.GlobalRefreshResourceSelectionPage_2); setTitle(TeamUIMessages.GlobalRefreshResourceSelectionPage_3); List<ResourceMapping> result = new ArrayList<>(); - for (int i = 0; i < roots.length; i++) { - IResource resource = roots[i]; + for (IResource resource : roots) { result.add(Utils.getResourceMapping(resource)); } manager = new SynchronizationScopeManager(TeamUIMessages.ModelElementSelectionPage_0, result.toArray(new ResourceMapping[result.size()]), @@ -124,8 +123,7 @@ public class ModelElementSelectionPage extends GlobalRefreshElementSelectionPage if (isWorkingSetSelected()) { List<ResourceMapping> result = new ArrayList<>(); IWorkingSet[] sets = getWorkingSets(); - for (int i = 0; i < sets.length; i++) { - IWorkingSet set = sets[i]; + for (IWorkingSet set : sets) { result.add(Utils.getResourceMapping(set)); } return result.toArray(new ResourceMapping[result.size()]); @@ -146,8 +144,7 @@ public class ModelElementSelectionPage extends GlobalRefreshElementSelectionPage } List<ResourceMapping> result = new ArrayList<>(); Object[] objects = getRootElement(); - for (int i = 0; i < objects.length; i++) { - Object object = objects[i]; + for (Object object : objects) { ResourceMapping mapping = Utils.getResourceMapping(object); if (mapping != null) { result.add(mapping); @@ -171,8 +168,7 @@ public class ModelElementSelectionPage extends GlobalRefreshElementSelectionPage protected boolean checkWorkingSetElements() { List allWorkingSetElements = new ArrayList(); IWorkingSet[] workingSets = getWorkingSets(); - for (int i = 0; i < workingSets.length; i++) { - IWorkingSet set = workingSets[i]; + for (IWorkingSet set : workingSets) { allWorkingSetElements.addAll(computeSelectedResources(new StructuredSelection(set.getElements()))); } getViewer().setCheckedElements(allWorkingSetElements.toArray()); @@ -193,8 +189,7 @@ public class ModelElementSelectionPage extends GlobalRefreshElementSelectionPage private boolean scopeContainsMapping(ResourceMapping mapping) { ResourceMapping[] mappings = manager.getScope().getMappings(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping m = mappings[i]; + for (ResourceMapping m : mappings) { if (m.contains(mapping)) { return true; } @@ -217,8 +212,8 @@ public class ModelElementSelectionPage extends GlobalRefreshElementSelectionPage ISynchronizationScope syncScope = manager.getScope(); ModelProvider[] providers = syncScope.getModelProviders(); boolean foundEnabledModelProvider = false; - for (int i = 0; i < providers.length; i++) { - if (isEnabled(providers[i])){ + for (ModelProvider provider : providers) { + if (isEnabled(provider)) { foundEnabledModelProvider = true; break; } @@ -227,8 +222,9 @@ public class ModelElementSelectionPage extends GlobalRefreshElementSelectionPage if (!foundEnabledModelProvider){ if (MessageDialog.openConfirm(getShell(), TeamUIMessages.ModelElementSelectionPage_AllModelsDisabledTitle, TeamUIMessages.ModelElementSelectionPage_AllModelsDisabledMessage)) { ArrayList<ITeamContentProviderDescriptor> teamProviderDescriptors = new ArrayList<>(); - for (int i = 0; i < providers.length; i++) - teamProviderDescriptors.add(TeamUI.getTeamContentProviderManager().getDescriptor(providers[i].getId())); + for (ModelProvider provider : providers) { + teamProviderDescriptors.add(TeamUI.getTeamContentProviderManager().getDescriptor(provider.getId())); + } ITeamContentProviderDescriptor[] desc = teamProviderDescriptors.toArray(new ITeamContentProviderDescriptor[teamProviderDescriptors.size()]); TeamUI.getTeamContentProviderManager().setEnabledDescriptors(desc); @@ -269,9 +265,9 @@ public class ModelElementSelectionPage extends GlobalRefreshElementSelectionPage if (!isSelectedResourcesSelected()) { ModelProvider[] providers = manager.getScope().getModelProviders(); ArrayList<ModelProvider> disabledProviders = new ArrayList<>(); - for (int i = 0; i < providers.length; i++) { - if (!providers[i].getId().equals(modelProviderId)) { - disabledProviders.add(providers[i]); + for (ModelProvider provider : providers) { + if (!provider.getId().equals(modelProviderId)) { + disabledProviders.add(provider); } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelEnablementPreferencePage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelEnablementPreferencePage.java index 8eaec737d..99697694f 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelEnablementPreferencePage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelEnablementPreferencePage.java @@ -167,8 +167,7 @@ public class ModelEnablementPreferencePage extends PreferencePage implements IWo private void updateChecks() { ITeamContentProviderDescriptor[] descriptors = TeamUI.getTeamContentProviderManager().getDescriptors(); - for (int i = 0; i < descriptors.length; i++) { - ITeamContentProviderDescriptor descriptor = descriptors[i]; + for (ITeamContentProviderDescriptor descriptor : descriptors) { if (descriptor.isEnabled()) { previosulyEnabled.add(descriptor); } @@ -192,11 +191,10 @@ public class ModelEnablementPreferencePage extends PreferencePage implements IWo private boolean hasDescriptorEnablementChanged(Object[] checked) { ITeamContentProviderDescriptor[] descriptors = TeamUI.getTeamContentProviderManager().getDescriptors(); - for (int i = 0; i < descriptors.length; i++) { - ITeamContentProviderDescriptor descriptor = descriptors[i]; + for (ITeamContentProviderDescriptor descriptor : descriptors) { boolean enable = false; - for (int j = 0; j < checked.length; j++) { - ITeamContentProviderDescriptor checkedDesc = (ITeamContentProviderDescriptor)checked[j]; + for (Object c : checked) { + ITeamContentProviderDescriptor checkedDesc = (ITeamContentProviderDescriptor) c; if (checkedDesc.getModelProviderId().equals(descriptor.getModelProviderId())) { enable = true; break; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSelectionDropDownAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSelectionDropDownAction.java index 18916fa08..21ab79e6f 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSelectionDropDownAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSelectionDropDownAction.java @@ -148,8 +148,7 @@ public class ModelSelectionDropDownAction extends Action implements ISynchroniza Set<ModelProvider> result = new HashSet<>(); ModelProvider[] providers = ((ModelSynchronizeParticipant)configuration.getParticipant()).getEnabledModelProviders(); providers = ModelMergeOperation.sortByExtension(providers); - for (int i = 0; i < providers.length; i++) { - ModelProvider provider = providers[i]; + for (ModelProvider provider : providers) { ITeamContentProviderDescriptor desc = TeamUI.getTeamContentProviderManager().getDescriptor(provider.getId()); if (desc != null && desc.isEnabled()) { result.add(provider); @@ -160,8 +159,7 @@ public class ModelSelectionDropDownAction extends Action implements ISynchroniza private void addModelsToMenu(ModelProvider[] modelProviders) { String id = getActiveProviderId(); - for (int i = 0; i < modelProviders.length; i++) { - ModelProvider provider = modelProviders[i]; + for (ModelProvider provider : modelProviders) { Action action = new ShowModelProviderAction(configuration, provider); action.setChecked(provider.getDescriptor().getId().equals(id)); menuManager.add(action); @@ -206,8 +204,7 @@ public class ModelSelectionDropDownAction extends Action implements ISynchroniza showAllAction.setChecked(getActiveProviderId().equals(ModelSynchronizeParticipant.ALL_MODEL_PROVIDERS_VISIBLE)); showAllFlatAction.setChecked(isFlatEnabled()); IContributionItem[] items = menuManager.getItems(); - for (int i = 0; i < items.length; i++) { - IContributionItem item = items[i]; + for (IContributionItem item : items) { if (item instanceof ActionContributionItem) { ActionContributionItem aci = (ActionContributionItem) item; IAction a = aci.getAction(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/RemoveFromViewAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/RemoveFromViewAction.java index 2112cc6da..1bac330f9 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/RemoveFromViewAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/RemoveFromViewAction.java @@ -72,8 +72,7 @@ public class RemoveFromViewAction extends ResourceModelParticipantAction { ResourceDiffTree tree = (ResourceDiffTree)getSynchronizationContext().getDiffTree(); try { tree.beginInput(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { tree.remove(resource); } } finally { @@ -85,8 +84,7 @@ public class RemoveFromViewAction extends ResourceModelParticipantAction { ResourceTraversal[] traversals = getResourceTraversals(getStructuredSelection(), monitor); IDiff[] diffs = getSynchronizationContext().getDiffTree().getDiffs(traversals); List<IResource> result = new ArrayList<>(); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { if (isVisible(diff)) { result.add(ResourceDiffTree.getResourceFor(diff)); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceCompareInputChangeNotifier.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceCompareInputChangeNotifier.java index 94e56f543..b9e867a33 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceCompareInputChangeNotifier.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceCompareInputChangeNotifier.java @@ -217,22 +217,19 @@ public class ResourceCompareInputChangeNotifier extends CompareInputChangeNotifi public void diffsChanged(IDiffChangeEvent event, IProgressMonitor monitor) { Set<ICompareInput> changedInputs = new HashSet<>(); IDiff[] added = event.getAdditions(); - for (int i = 0; i < added.length; i++) { - IDiff diff = added[i]; + for (IDiff diff : added) { ICompareInput input = findInput(ResourceDiffTree.getResourceFor(diff)); if (input != null) changedInputs.add(input); } IDiff[] changed = event.getChanges(); - for (int i = 0; i < changed.length; i++) { - IDiff diff = changed[i]; + for (IDiff diff : changed) { ICompareInput input = findInput(ResourceDiffTree.getResourceFor(diff)); if (input != null) changedInputs.add(input); } IPath[] paths = event.getRemovals(); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { ICompareInput input = findInput(path); if (input != null) changedInputs.add(input); @@ -265,8 +262,7 @@ public class ResourceCompareInputChangeNotifier extends CompareInputChangeNotifi private ICompareInput findInput(IPath path) { ICompareInput[] inputs = getConnectedInputs(); - for (int i = 0; i < inputs.length; i++) { - ICompareInput input = inputs[i]; + for (ICompareInput input : inputs) { IResource inputResource = getResource(input); if (inputResource != null && inputResource.getFullPath().equals(path)) { return input; @@ -277,8 +273,7 @@ public class ResourceCompareInputChangeNotifier extends CompareInputChangeNotifi private ICompareInput findInput(IResource resource) { ICompareInput[] inputs = getConnectedInputs(); - for (int i = 0; i < inputs.length; i++) { - ICompareInput input = inputs[i]; + for (ICompareInput input : inputs) { IResource inputResource = getResource(input); if (inputResource != null && inputResource.equals(resource)) { return input; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMarkAsMergedHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMarkAsMergedHandler.java index 5f1386a90..499292554 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMarkAsMergedHandler.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMarkAsMergedHandler.java @@ -63,8 +63,7 @@ public class ResourceMarkAsMergedHandler extends ResourceMergeActionHandler { private ISchedulingRule getMergeRule(IMergeContext context, IDiff[] deltas) { ISchedulingRule result = null; - for (int i = 0; i < deltas.length; i++) { - IDiff node = deltas[i]; + for (IDiff node : deltas) { ISchedulingRule rule = context.getMergeRule(node); if (result == null) { result = rule; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMergeActionHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMergeActionHandler.java index a7f3ca23c..6a740b220 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMergeActionHandler.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMergeActionHandler.java @@ -65,17 +65,14 @@ public abstract class ResourceMergeActionHandler extends MergeActionHandler impl IStructuredSelection selection = getStructuredSelection(); Object[] objects = selection.toArray(); Set<IResource> roots = new HashSet<>(); - for (int i = 0; i < objects.length; i++) { - Object object = objects[i]; + for (Object object : objects) { ResourceMapping mapping = Utils.getResourceMapping(object); if (mapping != null) { try { ResourceTraversal[] traversals = mapping.getTraversals(ResourceMappingContext.LOCAL_CONTEXT, null); - for (int j = 0; j < traversals.length; j++) { - ResourceTraversal traversal = traversals[j]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); - for (int k = 0; k < resources.length; k++) { - IResource resource = resources[k]; + for (IResource resource : resources) { roots.add(resource); } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelContentProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelContentProvider.java index 3b098fb06..a64b04009 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelContentProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelContentProvider.java @@ -106,8 +106,7 @@ public class ResourceModelContentProvider extends SynchronizationContentProvider if (!resource.isAccessible()) return false; IResource[] roots = scope.getRoots(); - for (int i = 0; i < roots.length; i++) { - IResource root = roots[i]; + for (IResource root : roots) { if (resource.getFullPath().isPrefixOf(root.getFullPath())) return true; } @@ -157,8 +156,7 @@ public class ResourceModelContentProvider extends SynchronizationContentProvider private Object[] internalGetChildren(ISynchronizationContext context, Object parent, Object[] children) { List<Object> result = new ArrayList<>(children.length); - for (int i = 0; i < children.length; i++) { - Object object = children[i]; + for (Object object : children) { // If the parent is a TreePath then the subclass is // TreePath aware and we can send a TrePath to the // isVisible method @@ -193,8 +191,7 @@ public class ResourceModelContentProvider extends SynchronizationContentProvider if(traversals == null) { return result.toArray(new ResourceTraversal[result.size()]); } - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { if (traversal.contains(resource)) { boolean include = false; int depth = traversal.getDepth(); @@ -202,8 +199,7 @@ public class ResourceModelContentProvider extends SynchronizationContentProvider include = true; } else { IResource[] roots = traversal.getResources(); - for (int j = 0; j < roots.length; j++) { - IResource root = roots[j]; + for (IResource root : roots) { if (root.equals(resource)) { include = true; break; @@ -227,8 +223,7 @@ public class ResourceModelContentProvider extends SynchronizationContentProvider // TODO: fails due to use of roots ResourceMapping[] mappings = scope.getMappings(ModelProvider.RESOURCE_MODEL_PROVIDER_ID); List<ResourceTraversal> result = new ArrayList<>(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping resourceMapping = mappings[i]; + for (ResourceMapping resourceMapping : mappings) { Object element = resourceMapping.getModelObject(); IResource root = getResource(element); if (root != null) { @@ -273,8 +268,7 @@ public class ResourceModelContentProvider extends SynchronizationContentProvider private IResource[] getResources(ISynchronizationContext context, IPath[] paths) { List<IResource> resources = new ArrayList<>(); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { IResource resource = getResource(context, path); if (resource != null) resources.add(resource); @@ -419,8 +413,7 @@ public class ResourceModelContentProvider extends SynchronizationContentProvider if (isFlatPresentation()) { Set existingResources = getVisibleResources(); IResource[] changedResources = getChangedResources(event, existingResources); - for (int i = 0; i < changedResources.length; i++) { - IResource resource = changedResources[i]; + for (IResource resource : changedResources) { if (event.getTree().getDiff(resource.getFullPath()) != null) { if (existingResources.contains(resource)) { refreshes.add(resource); @@ -435,8 +428,7 @@ public class ResourceModelContentProvider extends SynchronizationContentProvider } else { IProject[] changedProjects = getChangedProjects(event); Set existingProjects = getVisibleProjects(); - for (int i = 0; i < changedProjects.length; i++) { - IProject project = changedProjects[i]; + for (IProject project : changedProjects) { if (hasVisibleChanges(event.getTree(), project)) { if (existingProjects.contains(project)) { refreshes.add(project); @@ -491,24 +483,21 @@ public class ResourceModelContentProvider extends SynchronizationContentProvider private IProject[] getChangedProjects(IDiffChangeEvent event) { Set<IResource> result = new HashSet<>(); IDiff[] changes = event.getChanges(); - for (int i = 0; i < changes.length; i++) { - IDiff diff = changes[i]; + for (IDiff diff : changes) { IResource resource = ResourceDiffTree.getResourceFor(diff); if (resource != null) { result.add(resource.getProject()); } } IDiff[] additions = event.getAdditions(); - for (int i = 0; i < additions.length; i++) { - IDiff diff = additions[i]; + for (IDiff diff : additions) { IResource resource = ResourceDiffTree.getResourceFor(diff); if (resource != null) { result.add(resource.getProject()); } } IPath[] removals = event.getRemovals(); - for (int i = 0; i < removals.length; i++) { - IPath path = removals[i]; + for (IPath path : removals) { if (path.segmentCount() > 0) { IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(path.segment(0)); result.add(project); @@ -522,8 +511,7 @@ public class ResourceModelContentProvider extends SynchronizationContentProvider Tree tree = viewer.getTree(); TreeItem[] children = tree.getItems(); Set<IResource> result = new HashSet<>(); - for (int i = 0; i < children.length; i++) { - TreeItem control = children[i]; + for (TreeItem control : children) { Object data = control.getData(); IResource resource = Utils.getResource(data); if (resource != null && resource.getType() == IResource.PROJECT) { @@ -538,8 +526,7 @@ public class ResourceModelContentProvider extends SynchronizationContentProvider Tree tree = viewer.getTree(); TreeItem[] children = tree.getItems(); Set<IResource> result = new HashSet<>(); - for (int i = 0; i < children.length; i++) { - TreeItem control = children[i]; + for (TreeItem control : children) { Object data = control.getData(); IResource resource = Utils.getResource(data); if (resource != null) { @@ -552,24 +539,21 @@ public class ResourceModelContentProvider extends SynchronizationContentProvider private IResource[] getChangedResources(IDiffChangeEvent event, Set existingResources) { Set<IResource> result = new HashSet<>(); IDiff[] changes = event.getChanges(); - for (int i = 0; i < changes.length; i++) { - IDiff diff = changes[i]; + for (IDiff diff : changes) { IResource resource = ResourceDiffTree.getResourceFor(diff); if (resource != null) { result.add(resource); } } IDiff[] additions = event.getAdditions(); - for (int i = 0; i < additions.length; i++) { - IDiff diff = additions[i]; + for (IDiff diff : additions) { IResource resource = ResourceDiffTree.getResourceFor(diff); if (resource != null) { result.add(resource); } } IPath[] removals = event.getRemovals(); - for (int i = 0; i < removals.length; i++) { - IPath path = removals[i]; + for (IPath path : removals) { if (path.segmentCount() > 0) { IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(path); if (resource != null) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelLabelProvider.java index 0a018ee68..ab8a0989c 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelLabelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelLabelProvider.java @@ -161,17 +161,16 @@ public class ResourceModelLabelProvider extends // Accumulate all distinct resources that have had problem marker // changes - for (int idx = 0; idx < markerTypes.length; idx++) { - IMarkerDelta[] markerDeltas = event.findMarkerDeltas(markerTypes[idx], true); - for (int i = 0; i < markerDeltas.length; i++) { - IMarkerDelta delta = markerDeltas[i]; - IResource resource = delta.getResource(); - while (resource != null && resource.getType() != IResource.ROOT && !handledResources.contains(resource)) { - handledResources.add(resource); - resource = resource.getParent(); - } + for (String markerType : markerTypes) { + IMarkerDelta[] markerDeltas = event.findMarkerDeltas(markerType, true); + for (IMarkerDelta delta : markerDeltas) { + IResource resource = delta.getResource(); + while (resource != null && resource.getType() != IResource.ROOT && !handledResources.contains(resource)) { + handledResources.add(resource); + resource = resource.getParent(); } } + } if (!handledResources.isEmpty()) { final IResource[] resources = handledResources.toArray(new IResource[handledResources.size()]); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelParticipantAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelParticipantAction.java index 46521c574..2f503e029 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelParticipantAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelParticipantAction.java @@ -55,8 +55,7 @@ public abstract class ResourceModelParticipantAction extends ModelParticipantAct if (selection instanceof ITreeSelection) { ITreeSelection ts = (ITreeSelection) selection; TreePath[] paths = ts.getPaths(); - for (int i = 0; i < paths.length; i++) { - TreePath path = paths[i]; + for (TreePath path : paths) { ResourceTraversal[] traversals = getTraversals(path, Policy.subMonitorFor(monitor, 100)); traversal.addTraversals(traversals); } @@ -113,8 +112,7 @@ public abstract class ResourceModelParticipantAction extends ModelParticipantAct int depth = getTraversalCalculator().getLayoutDepth(resource, path); IDiff[] diffs = set.getDiffTree().getDiffs(resource, depth); Set<IResource> resources = new HashSet<>(); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { IResource r = ResourceDiffTree.getResourceFor(diff); if (r != null) resources.add(r); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelPersistenceAdapter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelPersistenceAdapter.java index 74c3e06aa..0479e7952 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelPersistenceAdapter.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelPersistenceAdapter.java @@ -46,8 +46,7 @@ public class ResourceModelPersistenceAdapter extends SynchronizationCompareAdapt @Override public void save(ResourceMapping[] mappings, IMemento memento) { - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { Object object = mapping.getModelObject(); if (object instanceof IResource) { IResource resource = (IResource) object; @@ -70,8 +69,7 @@ public class ResourceModelPersistenceAdapter extends SynchronizationCompareAdapt public ResourceMapping[] restore(IMemento memento) { IMemento[] children = memento.getChildren(RESOURCES); List<ResourceMapping> result = new ArrayList<>(); - for (int i = 0; i < children.length; i++) { - IMemento child = children[i]; + for (IMemento child : children) { Integer typeInt = child.getInteger(RESOURCE_TYPE); if (typeInt == null) continue; @@ -106,8 +104,7 @@ public class ResourceModelPersistenceAdapter extends SynchronizationCompareAdapt } } children = memento.getChildren(WORKING_SETS); - for (int i = 0; i < children.length; i++) { - IMemento child = children[i]; + for (IMemento child : children) { String name = child.getString(WORKING_SET_NAME); if (name == null) continue; @@ -119,8 +116,7 @@ public class ResourceModelPersistenceAdapter extends SynchronizationCompareAdapt } } children = memento.getChildren(MODEL_PROVIDERS); - for (int i = 0; i < children.length; i++) { - IMemento child = children[i]; + for (IMemento child : children) { String id = child.getString(MODEL_PROVIDER_ID); if (id == null) continue; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelProviderOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelProviderOperation.java index cd8e86bf8..b8e8b386b 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelProviderOperation.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelProviderOperation.java @@ -59,11 +59,9 @@ public abstract class ResourceModelProviderOperation extends SynchronizationOper */ private IDiff[] getFileDeltas(Object[] pathOrElements) { Set<IDiff> result = new HashSet<>(); - for (int i = 0; i < pathOrElements.length; i++) { - Object pathOrElement = pathOrElements[i]; + for (Object pathOrElement : pathOrElements) { IDiff[] diffs = getFileDeltas(pathOrElement); - for (int j = 0; j < diffs.length; j++) { - IDiff node = diffs[j]; + for (IDiff node : diffs) { result.add(node); } } @@ -78,8 +76,7 @@ public abstract class ResourceModelProviderOperation extends SynchronizationOper final IResourceDiffTree diffTree = context.getDiffTree(); IDiff[] diffs = diffTree.getDiffs(traversals); // Now filter the by the mode of the configuration - for (int i = 0; i < diffs.length; i++) { - IDiff node = diffs[i]; + for (IDiff node : diffs) { if (isVisible(node) && getDiffFilter().select(node)) result.add(node); } @@ -155,8 +152,7 @@ public abstract class ResourceModelProviderOperation extends SynchronizationOper @Override public boolean shouldRun() { Object[] elements = getElements(); - for (int i = 0; i < elements.length; i++) { - Object object = elements[i]; + for (Object object : elements) { if (Utils.getResourceMapping(internalGetElement(object)) != null) { return true; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelScopeParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelScopeParticipant.java index 3043a8fa9..87542afe3 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelScopeParticipant.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelScopeParticipant.java @@ -55,8 +55,7 @@ public class ResourceModelScopeParticipant implements private boolean hasWorkingSetMappings() { ResourceMapping[] mappings = scope.getMappings(provider.getDescriptor().getId()); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { Object modelObject = mapping.getModelObject(); if (modelObject instanceof IWorkingSet) { return true; @@ -67,8 +66,7 @@ public class ResourceModelScopeParticipant implements private boolean hasWorkspaceMapping() { ResourceMapping[] mappings = scope.getMappings(provider.getDescriptor().getId()); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { Object modelObject = mapping.getModelObject(); if (modelObject instanceof IResource) { IResource resource = (IResource) modelObject; @@ -90,8 +88,7 @@ public class ResourceModelScopeParticipant implements ISynchronizationScope scope, IResource[] resources, IProject[] projects) { Set<ResourceMapping> result = new HashSet<>(); - for (int i = 0; i < projects.length; i++) { - IProject project = projects[i]; + for (IProject project : projects) { collectMappings(project, result); } return result.toArray(new ResourceMapping[result.size()]); @@ -99,20 +96,17 @@ public class ResourceModelScopeParticipant implements private void collectMappings(IProject project, Set<ResourceMapping> result) { ResourceMapping[] mappings = scope.getMappings(provider.getDescriptor().getId()); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { boolean refresh = false; Object modelObject = mapping.getModelObject(); if (modelObject instanceof IWorkingSet) { IWorkingSet set = (IWorkingSet)modelObject; IAdaptable[] elements = set.getElements(); - for (int j = 0; j < elements.length; j++) { - IAdaptable adaptable = elements[j]; + for (IAdaptable adaptable : elements) { ResourceMapping m = Adapters.adapt(adaptable, ResourceMapping.class); if (m != null) { IProject[] p = m.getProjects(); - for (int k = 0; k < p.length; k++) { - IProject mp = p[k]; + for (IProject mp : p) { if (mp.equals(project)) { refresh = true; break; @@ -156,12 +150,11 @@ public class ResourceModelScopeParticipant implements // Only interested in project additions and removals Set<ResourceMapping> result = new HashSet<>(); IResourceDelta[] children = event.getDelta().getAffectedChildren(); - for (int i = 0; i < children.length; i++) { - IResourceDelta delta = children[i]; + for (IResourceDelta delta : children) { IResource resource = delta.getResource(); if (resource.getType() == IResource.PROJECT && ((delta.getKind() & (IResourceDelta.ADDED | IResourceDelta.REMOVED)) != 0 - || (delta.getFlags() & IResourceDelta.OPEN) != 0)) { + || (delta.getFlags() & IResourceDelta.OPEN) != 0)) { if (isInContext(resource)) collectMappings((IProject)resource, result); } @@ -174,8 +167,7 @@ public class ResourceModelScopeParticipant implements private boolean isInContext(IResource resource) { IProject[] projects = scope.getProjects(); - for (int i = 0; i < projects.length; i++) { - IProject project = projects[i]; + for (IProject project : projects) { if (project.equals(resource.getProject())) { return true; } @@ -192,8 +184,7 @@ public class ResourceModelScopeParticipant implements if (event.getProperty() == IWorkingSetManager.CHANGE_WORKING_SET_CONTENT_CHANGE) { IWorkingSet newSet = (IWorkingSet) event.getNewValue(); ResourceMapping[] mappings = scope.getMappings(provider.getDescriptor().getId()); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { if (newSet == mapping.getModelObject()) { fireChange(new ResourceMapping[] { mapping }); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelTraversalCalculator.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelTraversalCalculator.java index 2052d44d6..aa1b7dd06 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelTraversalCalculator.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelTraversalCalculator.java @@ -113,8 +113,7 @@ public class ResourceModelTraversalCalculator { private Object[] getCompressedChildren(IResourceDiffTree diffTree, IProject project, Object[] children) { Set<Object> result = new HashSet<>(); IDiff[] diffs = diffTree.getDiffs(project, IResource.DEPTH_INFINITE); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { IResource resource = diffTree.getResource(diff); if (resource.getType() == IResource.FILE) { IContainer parent = resource.getParent(); @@ -133,8 +132,7 @@ public class ResourceModelTraversalCalculator { */ private Object[] getCompressedChildren(IResourceDiffTree diffTree, IFolder folder, Object[] children) { Set<Object> result = new HashSet<>(); - for (int i = 0; i < children.length; i++) { - Object object = children[i]; + for (Object object : children) { if (object instanceof IResource) { IResource resource = (IResource) object; if (resource.getType() == IResource.FILE) @@ -142,8 +140,7 @@ public class ResourceModelTraversalCalculator { } } IDiff[] diffs = diffTree.getDiffs(folder, IResource.DEPTH_ONE); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { IResource resource = diffTree.getResource(diff); if (resource.getType() == IResource.FILE) result.add(resource); @@ -155,8 +152,7 @@ public class ResourceModelTraversalCalculator { Object[] allChildren; IDiff[] diffs = diffTree.getDiffs(resource, IResource.DEPTH_INFINITE); ArrayList<Object> result = new ArrayList<>(); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { result.add(diffTree.getResource(diff)); } allChildren = result.toArray(); @@ -165,13 +161,11 @@ public class ResourceModelTraversalCalculator { private Object[] getTreeChildren(IResourceDiffTree diffTree, IResource resource, Object[] children) { Set<Object> result = new HashSet<>(); - for (int i = 0; i < children.length; i++) { - Object object = children[i]; + for (Object object : children) { result.add(object); } IResource[] setChildren = getChildren(diffTree, resource); - for (int i = 0; i < setChildren.length; i++) { - IResource child = setChildren[i]; + for (IResource child : setChildren) { result.add(child); } Object[] allChildren = result.toArray(new Object[result.size()]); @@ -181,8 +175,7 @@ public class ResourceModelTraversalCalculator { public static IResource[] getChildren(IResourceDiffTree diffTree, IResource resource) { Set<IResource> result = new HashSet<>(); IPath[] childPaths = diffTree.getChildren(resource.getFullPath()); - for (int i = 0; i < childPaths.length; i++) { - IPath path = childPaths[i]; + for (IPath path : childPaths) { IDiff delta = diffTree.getDiff(path); IResource child; if (delta == null) { @@ -215,8 +208,7 @@ public class ResourceModelTraversalCalculator { IResource resource = (IResource) o; int depth = getLayoutDepth(resource, tp); IDiff[] diffs = dcs.getDiffTree().getDiffs(resource, depth); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { IResource r = ResourceDiffTree.getResourceFor(diff); if (r != null) result.add(r); @@ -325,8 +317,7 @@ public class ResourceModelTraversalCalculator { if (members.length > 0) { if (depth == IResource.DEPTH_INFINITE) return true; - for (int i = 0; i < members.length; i++) { - IResource resource = members[i]; + for (IResource resource : members) { if (resource.getType() == IResource.FILE) return true; } @@ -361,8 +352,7 @@ public class ResourceModelTraversalCalculator { resourcePath[i] = parent; parent = parent.getParent(); } - for (int i = 0; i < resourcePath.length; i++) { - IResource r = resourcePath[i]; + for (IResource r : resourcePath) { treePath = treePath.createChildPath(r); } return treePath; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/SynchronizationResourceMappingContext.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/SynchronizationResourceMappingContext.java index f5f11739f..b4933656a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/SynchronizationResourceMappingContext.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/SynchronizationResourceMappingContext.java @@ -122,13 +122,11 @@ public final class SynchronizationResourceMappingContext extends public IResource[] fetchMembers(IContainer container, IProgressMonitor monitor) throws CoreException { Set<IResource> result = new HashSet<>(); IResource[] children = container.members(); - for (int i = 0; i < children.length; i++) { - IResource resource = children[i]; + for (IResource resource : children) { result.add(resource); } IPath[] childPaths = context.getDiffTree().getChildren(container.getFullPath()); - for (int i = 0; i < childPaths.length; i++) { - IPath path = childPaths[i]; + for (IPath path : childPaths) { IDiff delta = context.getDiffTree().getDiff(path); IResource child; if (delta == null) { @@ -159,8 +157,7 @@ public final class SynchronizationResourceMappingContext extends public IProject[] getProjects() { Set<IProject> projects = new HashSet<>(); IResource[] roots = context.getScope().getRoots(); - for (int i = 0; i < roots.length; i++) { - IResource resource = roots[i]; + for (IResource resource : roots) { projects.add(resource.getProject()); } return projects.toArray(new IProject[projects.size()]); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/TeamViewerSorter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/TeamViewerSorter.java index e875cb58a..d3717d017 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/TeamViewerSorter.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/TeamViewerSorter.java @@ -78,14 +78,12 @@ public class TeamViewerSorter extends TreePathViewerSorter { private boolean isExtends(ModelProvider mp1, IModelProviderDescriptor desc) { String[] extended = mp1.getDescriptor().getExtendedModels(); - for (int i = 0; i < extended.length; i++) { - String id = extended[i]; + for (String id : extended) { if (id.equals(desc.getId())) { return true; } } - for (int i = 0; i < extended.length; i++) { - String id = extended[i]; + for (String id : extended) { IModelProviderDescriptor desc2 = ModelProvider.getModelProviderDescriptor(id); if (isExtends(mp1, desc2)) { return true; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/WorkspaceTeamStateProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/WorkspaceTeamStateProvider.java index d28d1496f..30c319df3 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/WorkspaceTeamStateProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/WorkspaceTeamStateProvider.java @@ -57,8 +57,7 @@ public class WorkspaceTeamStateProvider extends TeamStateProvider IResourceChangeEvent.POST_CHANGE); IProject[] allProjects = ResourcesPlugin.getWorkspace().getRoot() .getProjects(); - for (int i = 0; i < allProjects.length; i++) { - IProject project = allProjects[i]; + for (IProject project : allProjects) { handleProject(project); } } @@ -143,8 +142,7 @@ public class WorkspaceTeamStateProvider extends TeamStateProvider private String getProviderId(IProject[] projects) { String id = null; - for (int i = 0; i < projects.length; i++) { - IProject project = projects[i]; + for (IProject project : projects) { String nextId = getProviderId(project); if (id == null) id = nextId; @@ -211,8 +209,7 @@ public class WorkspaceTeamStateProvider extends TeamStateProvider IResourceDelta[] projectDeltas = delta .getAffectedChildren(IResourceDelta.ADDED | IResourceDelta.CHANGED); - for (int i = 0; i < projectDeltas.length; i++) { - IResourceDelta projectDelta = projectDeltas[i]; + for (IResourceDelta projectDelta : projectDeltas) { IResource resource = projectDelta.getResource(); if ((projectDelta.getFlags() & IResourceDelta.OPEN) != 0 && resource.getType() == IResource.PROJECT) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/IgnorePreferencePage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/IgnorePreferencePage.java index e5e0a119e..25540e020 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/IgnorePreferencePage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/IgnorePreferencePage.java @@ -137,8 +137,7 @@ public class IgnorePreferencePage extends PreferencePage implements IWorkbenchPr * @param ignore */ private void fillTable(IIgnoreInfo[] ignore) { - for (int i = 0; i < ignore.length; i++) { - IIgnoreInfo info = ignore[i]; + for (IIgnoreInfo info : ignore) { TableItem item = new TableItem(ignoreTable, SWT.NONE); item.setText(TextProcessor.process(info.getPattern(), ".*")); //$NON-NLS-1$ item.setChecked(info.getEnabled()); @@ -162,8 +161,8 @@ public class IgnorePreferencePage extends PreferencePage implements IWorkbenchPr if (pattern.equals("")) return; //$NON-NLS-1$ // Check if the item already exists TableItem[] items = ignoreTable.getItems(); - for (int i = 0; i < items.length; i++) { - if (items[i].getText().equals(pattern)) { + for (TableItem item : items) { + if (item.getText().equals(pattern)) { MessageDialog.openWarning(getShell(), TeamUIMessages.IgnorePreferencePage_patternExistsShort, TeamUIMessages.IgnorePreferencePage_patternExistsLong); return; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/TextPreferencePage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/TextPreferencePage.java index 036b52df9..40bab1aa1 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/TextPreferencePage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/TextPreferencePage.java @@ -131,15 +131,12 @@ public class TextPreferencePage extends PreferencePage implements IWorkbenchPref Set fPluginNames= makeSetOfStrings(manager.getDefaultNameMappings()); Set fPluginExtensions= makeSetOfStrings(manager.getDefaultExtensionMappings()); - for (int i = 0; i < extensionInfoArray.length; i++) { - final IStringMapping info= extensionInfoArray[i]; + for (IStringMapping info : extensionInfoArray) { final FileTypeTable.Extension extension= new FileTypeTable.Extension(info.getString(), fPluginExtensions.contains(info.getString())); extension.mode= info.getType(); fItems.add(extension); } - - for (int i = 0; i < nameInfoArray.length; i++) { - final IStringMapping info= nameInfoArray[i]; + for (IStringMapping info : nameInfoArray) { final FileTypeTable.Name name= new FileTypeTable.Name(info.getString(), fPluginNames.contains(info.getString())); name.mode= info.getType(); fItems.add(name); @@ -149,8 +146,8 @@ public class TextPreferencePage extends PreferencePage implements IWorkbenchPref private static Set<String> makeSetOfStrings(IStringMapping [] mappings) { final Set<String> set= new HashSet<>(mappings.length); - for (int i = 0; i < mappings.length; i++) { - set.add(mappings[i].getString()); + for (IStringMapping mapping : mappings) { + set.add(mapping.getString()); } return set; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/RegistryReader.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/RegistryReader.java index ce3abbdbf..c9b660fdc 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/RegistryReader.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/RegistryReader.java @@ -178,9 +178,10 @@ public abstract class RegistryReader { * Logs an error if the element was not recognized. */ protected void readElements(IConfigurationElement[] elements) { - for (int i = 0; i < elements.length; i++) { - if (!readElement(elements[i])) - logUnknownElement(elements[i]); + for (IConfigurationElement element : elements) { + if (!readElement(element)) { + logUnknownElement(element); + } } } /** @@ -206,7 +207,8 @@ public abstract class RegistryReader { extensions = point.getExtensions(); extensionPoints.put(pointId, extensions); } - for (int i = 0; i < extensions.length; i++) - readExtension(extensions[i]); + for (IExtension extension : extensions) { + readExtension(extension); + } } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/TeamContentProviderManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/TeamContentProviderManager.java index fe085336b..690f330a1 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/TeamContentProviderManager.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/TeamContentProviderManager.java @@ -62,8 +62,7 @@ public class TeamContentProviderManager implements ITeamContentProviderManager { public String[] getContentProviderIds(ISynchronizationScope scope) { List<String> result = new ArrayList<>(); ITeamContentProviderDescriptor[] descriptors = getDescriptors(); - for (int i = 0; i < descriptors.length; i++) { - ITeamContentProviderDescriptor descriptor = descriptors[i]; + for (ITeamContentProviderDescriptor descriptor : descriptors) { if (descriptor.isEnabled() && scope.getMappings(descriptor.getModelProviderId()).length > 0) result.add(descriptor.getContentExtensionId()); } @@ -106,8 +105,8 @@ public class TeamContentProviderManager implements ITeamContentProviderManager { private void firePropertyChange(final PropertyChangeEvent event) { Object[] allListeners = listeners.getListeners(); - for (int i = 0; i < allListeners.length; i++) { - final IPropertyChangeListener listener = (IPropertyChangeListener)allListeners[i]; + for (Object l : allListeners) { + final IPropertyChangeListener listener = (IPropertyChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void run() throws Exception { @@ -135,8 +134,8 @@ public class TeamContentProviderManager implements ITeamContentProviderManager { descriptor.setEnabled(false); } } - for (int i = 0; i < descriptors.length; i++) { - TeamContentProviderDescriptor descriptor = (TeamContentProviderDescriptor)descriptors[i]; + for (ITeamContentProviderDescriptor d : descriptors) { + TeamContentProviderDescriptor descriptor = (TeamContentProviderDescriptor) d; descriptor.setEnabled(true); } enablementChanged(previouslyEnabled.toArray(new ITeamContentProviderDescriptor[previouslyEnabled.size()]), diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java index c570a8ba8..2756ed5c1 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java @@ -262,8 +262,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo if (resource != null && resource.exists()) { try { IMarker[] markers = resource.findMarkers(IMarker.PROBLEM, true, getLogicalModelDepth(resource)); - for (int i = 0; i < markers.length; i++) { - IMarker marker = markers[i]; + for (IMarker marker : markers) { try { Integer severity = (Integer) marker.getAttribute(IMarker.SEVERITY); if (severity != null) { @@ -300,8 +299,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo } else if (resource == null) { // For non-resource elements, show the same propogaqted marker as the children IDiffElement[] children = element.getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement child = children[i]; + for (IDiffElement child : children) { if (child instanceof ISynchronizeModelElement) { ISynchronizeModelElement childElement = (ISynchronizeModelElement)child; if (childElement.getProperty(ISynchronizeModelElement.PROPAGATED_ERROR_MARKER_PROPERTY)) { @@ -416,15 +414,13 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo protected IResource[] getExpandedResources() { Set<IResource> expanded = new HashSet<>(); IResource[] savedExpansionState = getCachedResources(P_VIEWER_EXPANSION_STATE); - for (int i = 0; i < savedExpansionState.length; i++) { - IResource resource = savedExpansionState[i]; + for (IResource resource : savedExpansionState) { expanded.add(resource); } StructuredViewer viewer = getViewer(); Object[] objects = ((AbstractTreeViewer) viewer).getVisibleExpandedElements(); IResource[] currentExpansionState = getResources(objects); - for (int i = 0; i < currentExpansionState.length; i++) { - IResource resource = currentExpansionState[i]; + for (IResource resource : currentExpansionState) { expanded.add(resource); } return expanded.toArray(new IResource[expanded.size()]); @@ -462,13 +458,11 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo protected void expandResources(IResource[] resources) { Set<ISynchronizeModelElement> expandedElements = new HashSet<>(); StructuredViewer viewer = getViewer(); - for (int j = 0; j < resources.length; j++) { - IResource resource = resources[j]; + for (IResource resource : resources) { ISynchronizeModelElement[] elements = getModelObjects(resource); // Only expand when there is one element per resource if (elements.length == 1) { - for (int i = 0; i < elements.length; i++) { - ISynchronizeModelElement element = elements[i]; + for (ISynchronizeModelElement element : elements) { // Add all parents of the element to the expansion set while (element != null) { expandedElements.add(element); @@ -484,9 +478,9 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo protected IResource[] getResources(Object[] objects) { Set<IResource> result = new HashSet<>(); if (objects.length > 0) { - for (int i = 0; i < objects.length; i++) { - if (objects[i] instanceof ISynchronizeModelElement) { - IResource resource = ((ISynchronizeModelElement)objects[i]).getResource(); + for (Object object : objects) { + if (object instanceof ISynchronizeModelElement) { + IResource resource = ((ISynchronizeModelElement) object).getResource(); if(resource != null) result.add(resource); } @@ -503,8 +497,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo if (resources.length > 0) { ISynchronizePageConfiguration config = getConfiguration(); ArrayList<String> paths = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { String path = resource.getFullPath().toString(); if (resource.getType() != IResource.FILE && path.charAt(path.length() - 1) != IPath.SEPARATOR) { // Include a trailing slash on folders and projects. @@ -591,8 +584,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo protected void selectResources(IResource[] resourcesToSelect) { StructuredViewer viewer = getViewer(); final ArrayList<ISynchronizeModelElement> selectedElements = new ArrayList<>(); - for (int i = 0; i < resourcesToSelect.length; i++) { - IResource resource = resourcesToSelect[i]; + for (IResource resource : resourcesToSelect) { ISynchronizeModelElement[] elements = getModelObjects(resource); // Only preserve the selection if there is one element for the resource if (elements.length == 1) { @@ -613,16 +605,13 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo if (!(viewer instanceof CheckboxTreeViewer)) return; - for (int j = 0; j < resourcesToCheck.length; j++) { - IResource resource = resourcesToCheck[j]; + for (IResource resource : resourcesToCheck) { if (resource.getType() != IResource.FILE) continue; - ISynchronizeModelElement[] elements = getModelObjects(resource); // Only expand when there is one element per resource if (elements.length == 1) { - for (int i = 0; i < elements.length; i++) { - ISynchronizeModelElement element = elements[i]; + for (ISynchronizeModelElement element : elements) { checkedElements.add(element); } } @@ -845,8 +834,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo */ protected void removeFromViewer(ISynchronizeModelElement[] nodes) { List<ISynchronizeModelElement> rootsToClear = new ArrayList<>(); - for (int i = 0; i < nodes.length; i++) { - ISynchronizeModelElement node = nodes[i]; + for (ISynchronizeModelElement node : nodes) { if (DEBUG) { System.out.println("Removing model element " + node.getName()); //$NON-NLS-1$ } @@ -864,8 +852,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo if (Utils.canUpdateViewer(getViewer())) { doRemove(roots); } - for (int i = 0; i < roots.length; i++) { - ISynchronizeModelElement element = roots[i]; + for (ISynchronizeModelElement element : roots) { updateHandler.nodeRemoved(element, this); } } @@ -886,8 +873,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo recursiveClearModelObjects(rootToClear); if (node == getModelRoot()) { IDiffElement[] children = node.getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement element = children[i]; + for (IDiffElement element : children) { ((SynchronizeModelElement)node).remove(element); } } else { @@ -903,8 +889,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo protected void recursiveClearModelObjects(ISynchronizeModelElement node) { // Clear all the children of the node IDiffElement[] children = node.getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement element = children[i]; + for (IDiffElement element : children) { if (element instanceof ISynchronizeModelElement) { ISynchronizeModelElement sme = (ISynchronizeModelElement) element; ISynchronizeModelProvider provider = getProvider(sme); @@ -979,8 +964,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo TeamUIPlugin.log(IStatus.ERROR, "An error occurred removing elements from the synchronize view", e); //$NON-NLS-1$ } if (DEBUG) { - for (int i = 0; i < elements.length; i++) { - ISynchronizeModelElement element = elements[i]; + for (ISynchronizeModelElement element : elements) { System.out.println("Removing view item " + element.getName()); //$NON-NLS-1$ } } @@ -1048,8 +1032,8 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo allListeners = listeners.getListeners(); } final PropertyChangeEvent event = new PropertyChangeEvent(this, key, oldValue, newValue); - for (int i = 0; i < allListeners.length; i++) { - final IPropertyChangeListener listener = (IPropertyChangeListener)allListeners[i]; + for (Object l : allListeners) { + final IPropertyChangeListener listener = (IPropertyChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java index 6d76eb831..aed41a072 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java @@ -109,8 +109,7 @@ public class ActiveChangeSetCollector implements IDiffChangeListener { // Look for any resources that were removed from the set but are still out-of sync. // Re-add those resources final List<SyncInfo> outOfSync = new ArrayList<>(); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { if (!((DiffChangeSet)set).contains(path)) { SyncInfo info = getSyncInfo(path); if (info != null && info.getKind() != SyncInfo.IN_SYNC) { @@ -168,8 +167,7 @@ public class ActiveChangeSetCollector implements IDiffChangeListener { // First, clean up rootSet.clear(); ChangeSet[] sets = activeSets.keySet().toArray(new ChangeSet[activeSets.size()]); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { remove(set); } activeSets.clear(); @@ -179,15 +177,13 @@ public class ActiveChangeSetCollector implements IDiffChangeListener { if (getConfiguration().getComparisonType() == ISynchronizePageConfiguration.THREE_WAY) { // Show all active change sets even if they are empty sets = getActiveChangeSetManager().getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { add(set); } // The above will add all sync info that are contained in sets. // We still need to add uncontained infos to the root set SyncInfo[] syncInfos = seedSet.getSyncInfos(); - for (int i = 0; i < syncInfos.length; i++) { - SyncInfo info = syncInfos[i]; + for (SyncInfo info : syncInfos) { if (isLocalChange(info)) { ChangeSet[] containingSets = findChangeSets(info); if (containingSets.length == 0) { @@ -221,8 +217,7 @@ public class ActiveChangeSetCollector implements IDiffChangeListener { removals.addAll(Arrays.asList(event.getRemovedResources())); additions.addAll(Arrays.asList(event.getAddedResources())); SyncInfo[] changed = event.getChangedResources(); - for (int i = 0; i < changed.length; i++) { - SyncInfo info = changed[i]; + for (SyncInfo info : changed) { additions.add(info); removals.add(info.getLocal()); } @@ -248,15 +243,13 @@ public class ActiveChangeSetCollector implements IDiffChangeListener { protected void add(SyncInfo[] infos) { rootSet.beginInput(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { if (isLocalChange(info) && select(info)) { ChangeSet[] sets = findChangeSets(info); if (sets.length == 0) { rootSet.add(info); } else { - for (int j = 0; j < sets.length; j++) { - ChangeSet set = sets[j]; + for (ChangeSet set : sets) { SyncInfoSet targetSet = getSyncInfoSet(set); if (targetSet == null) { // This will add all the appropriate sync info to the set @@ -275,8 +268,7 @@ public class ActiveChangeSetCollector implements IDiffChangeListener { ActiveChangeSetManager manager = getActiveChangeSetManager(); ChangeSet[] sets = manager.getSets(); List<ChangeSet> result = new ArrayList<>(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { if (set.contains(info.getLocal())) { result.add(set); } @@ -353,8 +345,7 @@ public class ActiveChangeSetCollector implements IDiffChangeListener { private SyncInfoSet asSyncInfoSet(IDiff[] diffs) { SyncInfoSet result = new SyncInfoSet(); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { if (select(diff)) { SyncInfo info = asSyncInfo(diff); if (info != null) @@ -383,8 +374,7 @@ public class ActiveChangeSetCollector implements IDiffChangeListener { /* private */ IResource[] getResources(SyncInfoSet set, IPath[] paths) { List<IResource> result = new ArrayList<>(); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { SyncInfo info = getSyncInfo(set, path); if (info != null) { result.add(info.getLocal()); @@ -395,8 +385,7 @@ public class ActiveChangeSetCollector implements IDiffChangeListener { private SyncInfo getSyncInfo(SyncInfoSet set, IPath path) { SyncInfo[] infos = set.getSyncInfos(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { if (info.getLocal().getFullPath().equals(path)) return info; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetLabelDecorator.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetLabelDecorator.java index 60bf1dd88..80b416082 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetLabelDecorator.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetLabelDecorator.java @@ -72,8 +72,8 @@ public class ChangeSetLabelDecorator extends LabelProvider implements ILabelDeco if (boldFont == null) { Font defaultFont = JFaceResources.getDefaultFont(); FontData[] data = defaultFont.getFontData(); - for (int i = 0; i < data.length; i++) { - data[i].setStyle(SWT.BOLD); + for (FontData d : data) { + d.setStyle(SWT.BOLD); } boldFont = new Font(TeamUIPlugin.getStandardDisplay(), data); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java index 09084d186..f1031a6d5 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java @@ -149,13 +149,11 @@ public class ChangeSetModelProvider extends CompositeModelProvider { set.beginInput(); set.removeAll(event.getRemovedResources()); SyncInfo[] added = event.getAddedResources(); - for (int i = 0; i < added.length; i++) { - SyncInfo info = added[i]; + for (SyncInfo info : added) { set.add(info); } SyncInfo[] changed = event.getChangedResources(); - for (int i = 0; i < changed.length; i++) { - SyncInfo info = changed[i]; + for (SyncInfo info : changed) { set.add(info); } } finally { @@ -318,8 +316,7 @@ public class ChangeSetModelProvider extends CompositeModelProvider { */ protected ISynchronizeModelElement getModelElement(ChangeSet set) { IDiffElement[] children = getModelRoot().getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement element = children[i]; + for (IDiffElement element : children) { if (element instanceof ChangeSetDiffNode && ((ChangeSetDiffNode)element).getSet() == set) { return (ISynchronizeModelElement)element; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompositeModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompositeModelProvider.java index e3a55a7f2..dc57dd375 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompositeModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompositeModelProvider.java @@ -15,7 +15,6 @@ package org.eclipse.team.internal.ui.synchronize; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -76,12 +75,10 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro return ((AbstractSynchronizeModelProvider)providers[0]).getClosestExistingParents(resource); } List<ISynchronizeModelElement> result = new ArrayList<>(); - for (int i = 0; i < providers.length; i++) { - ISynchronizeModelProvider provider = providers[i]; + for (ISynchronizeModelProvider provider : providers) { if (provider instanceof AbstractSynchronizeModelProvider) { ISynchronizeModelElement[] elements = ((AbstractSynchronizeModelProvider)provider).getClosestExistingParents(resource); - for (int j = 0; j < elements.length; j++) { - ISynchronizeModelElement element = elements[j]; + for (ISynchronizeModelElement element : elements) { result.add(element); } } @@ -108,8 +105,7 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro return new ISynchronizeModelProvider[0]; } List<ISynchronizeModelProvider> result = new ArrayList<>(); - for (Iterator<ISynchronizeModelElement> iter = elements.iterator(); iter.hasNext();) { - ISynchronizeModelElement element = iter.next(); + for (ISynchronizeModelElement element : elements) { result.add(getProvider(element)); } return result.toArray(new ISynchronizeModelProvider[result.size()]); @@ -126,8 +122,7 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro * @param resources */ protected void handleAdditions(SyncInfo[] resources) { - for (int i = 0; i < resources.length; i++) { - SyncInfo info = resources[i]; + for (SyncInfo info : resources) { handleAddition(info); } } @@ -141,8 +136,7 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro @Override protected final void handleResourceChanges(ISyncInfoTreeChangeEvent event) { SyncInfo[] infos = event.getChangedResources(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { handleChange(info); } } @@ -160,8 +154,7 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro @Override protected final void handleResourceRemovals(ISyncInfoTreeChangeEvent event) { IResource[] resources = event.getRemovedResources(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { handleRemoval(resource); } } @@ -172,8 +165,7 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro */ protected void handleRemoval(IResource resource) { ISynchronizeModelProvider[] providers = getProvidersContaining(resource); - for (int i = 0; i < providers.length; i++) { - ISynchronizeModelProvider provider = providers[i]; + for (ISynchronizeModelProvider provider : providers) { removeFromProvider(resource, provider); } } @@ -232,8 +224,7 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro } private void clearProviders() { - for (Iterator iter = providers.iterator(); iter.hasNext();) { - ISynchronizeModelProvider provider = (ISynchronizeModelProvider) iter.next(); + for (ISynchronizeModelProvider provider : providers) { provider.dispose(); } providers.clear(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompressedFoldersModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompressedFoldersModelProvider.java index e2f967c15..768f6df1e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompressedFoldersModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompressedFoldersModelProvider.java @@ -147,8 +147,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider { // Folders will only contain out-of-sync children IResource[] children = getSyncInfoTree().members(resource); List<IDiffElement> result = new ArrayList<>(); - for (int i = 0; i < children.length; i++) { - IResource child = children[i]; + for (IResource child : children) { if (child.getType() == IResource.FILE) { result.add(createModelObject(parent, child)); } @@ -162,8 +161,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider { SyncInfo[] outOfSync = getSyncInfoTree().getSyncInfos(project, IResource.DEPTH_INFINITE); Set<IDiffElement> result = new HashSet<>(); Set<IResource> resourcesToShow = new HashSet<>(); - for (int i = 0; i < outOfSync.length; i++) { - SyncInfo info = outOfSync[i]; + for (SyncInfo info : outOfSync) { IResource local = info.getLocal(); if (local.getProjectRelativePath().segmentCount() == 1 && local.getType() == IResource.FILE) { resourcesToShow.add(local); @@ -208,8 +206,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider { @Override protected void handleResourceAdditions(ISyncInfoTreeChangeEvent event) { SyncInfo[] infos = event.getAddedResources(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { addResource(info); } } @@ -255,8 +252,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider { // First, deal with any projects that have been removed List<IResource> removedProjects = new ArrayList<>(); - for (int i = 0; i < roots.length; i++) { - IResource resource = roots[i]; + for (IResource resource : roots) { if (resource.getType() == IResource.PROJECT) { removeFromViewer(resource); removedProjects.add(resource); @@ -266,8 +262,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider { IResource[] resources = event.getRemovedResources(); List<IResource> resourcesToRemove = new ArrayList<IResource>(); List<SyncInfo> resourcesToAdd = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (!removedProjects.contains(resource.getProject())) { if (resource.getType() == IResource.FILE) { if (isCompressedParentEmpty(resource) && !isOutOfSync(resource.getParent())) { @@ -314,8 +309,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider { private boolean hasFileMembers(IContainer parent) { // Check if the sync set has any file children of the parent IResource[] members = getSyncInfoTree().members(parent); - for (int i = 0; i < members.length; i++) { - IResource member = members[i]; + for (IResource member : members) { if (member.getType() == IResource.FILE) { return true; } @@ -328,13 +322,13 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider { // Check if the sync set has any file children of the parent List<SyncInfo> result = new ArrayList<>(); IResource[] members = getSyncInfoTree().members(parent); - for (int i = 0; i < members.length; i++) { - SyncInfo info = getSyncInfoTree().getSyncInfo(members[i]); + for (IResource member : members) { + SyncInfo info = getSyncInfoTree().getSyncInfo(member); if (info != null) { result.add(info); } - if (members[i] instanceof IContainer) { - result.addAll(Arrays.asList(this.getSyncInfosForFileMembers((IContainer)members[i]))); + if (member instanceof IContainer) { + result.addAll(Arrays.asList(this.getSyncInfosForFileMembers((IContainer) member))); } } return result.toArray(new SyncInfo[result.size()]); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/FlatModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/FlatModelProvider.java index 1323b9662..01580ddd6 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/FlatModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/FlatModelProvider.java @@ -246,8 +246,7 @@ public class FlatModelProvider extends SynchronizeModelProvider { if (node == getModelRoot()); SyncInfo[] infos = getSyncInfoSet().getSyncInfos(); List result = new ArrayList(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { result.add(createModelObject(node, info)); } return (IDiffElement[]) result.toArray(new IDiffElement[result.size()]); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshElementSelectionPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshElementSelectionPage.java index 64cca1c54..63719d1ab 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshElementSelectionPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshElementSelectionPage.java @@ -229,8 +229,7 @@ public abstract class GlobalRefreshElementSelectionPage extends WizardPage { */ private boolean areAnyElementsChecked() { TreeItem[] item = fViewer.getTree().getItems(); - for (int i = 0; i < item.length; i++) { - TreeItem child = item[i]; + for (TreeItem child : item) { if(child.getChecked() || child.getGrayed()) { return true; } @@ -247,8 +246,7 @@ public abstract class GlobalRefreshElementSelectionPage extends WizardPage { public Object[] getRootElement() { TreeItem[] item = fViewer.getTree().getItems(); List checked = new ArrayList(); - for (int i = 0; i < item.length; i++) { - TreeItem child = item[i]; + for (TreeItem child : item) { collectCheckedItems(child, checked); } return checked.toArray(new Object[checked.size()]); @@ -348,8 +346,7 @@ public abstract class GlobalRefreshElementSelectionPage extends WizardPage { checked.add(item.getData()); } else if(item.getGrayed()) { TreeItem[] children = item.getItems(); - for (int i = 0; i < children.length; i++) { - TreeItem child = children[i]; + for (TreeItem child : children) { collectCheckedItems(child, checked); } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshResourceSelectionPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshResourceSelectionPage.java index 462054bb6..0750c74cb 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshResourceSelectionPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshResourceSelectionPage.java @@ -125,8 +125,7 @@ public class GlobalRefreshResourceSelectionPage extends GlobalRefreshElementSele protected boolean checkWorkingSetElements() { List allWorkingSetResources = new ArrayList(); IWorkingSet[] workingSets = getWorkingSets(); - for (int i = 0; i < workingSets.length; i++) { - IWorkingSet set = workingSets[i]; + for (IWorkingSet set : workingSets) { allWorkingSetResources.addAll(IDE.computeSelectedResources(new StructuredSelection(set.getElements()))); } getViewer().setCheckedElements(allWorkingSetResources.toArray(new IResource[allWorkingSetResources.size()])); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java index bd5d3971f..cf3d4c1d8 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java @@ -157,8 +157,7 @@ public class HierarchicalModelProvider extends SynchronizeModelProvider { } protected void addResources(IResource[] added) { - for (int i = 0; i < added.length; i++) { - IResource resource = added[i]; + for (IResource resource : added) { addResource(resource); } } @@ -181,8 +180,7 @@ public class HierarchicalModelProvider extends SynchronizeModelProvider { @Override protected IDiffElement[] buildModelObjects(ISynchronizeModelElement node) { IDiffElement[] children = createModelObjects(node); - for (int i = 0; i < children.length; i++) { - IDiffElement element = children[i]; + for (IDiffElement element : children) { if (element instanceof ISynchronizeModelElement) { buildModelObjects((ISynchronizeModelElement) element); } @@ -194,8 +192,7 @@ public class HierarchicalModelProvider extends SynchronizeModelProvider { protected void handleResourceAdditions(ISyncInfoTreeChangeEvent event) { SyncInfo[] infos = event.getAddedResources(); HashSet<IProject> set = new HashSet<>(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { set.add(info.getLocal().getProject()); } for (Iterator it = set.iterator(); it.hasNext(); ) { @@ -211,8 +208,7 @@ public class HierarchicalModelProvider extends SynchronizeModelProvider { // We have to look for folders that may no longer be in the set // (i.e. are in-sync) but still have descendants in the set IResource[] removedResources = event.getRemovedResources(); - for (int i = 0; i < removedResources.length; i++) { - IResource resource = removedResources[i]; + for (IResource resource : removedResources) { if (resource.getType() != IResource.FILE) { ISynchronizeModelElement node = getModelObject(resource); if (node != null) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/MultiLabelDecorator.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/MultiLabelDecorator.java index 51562f8f4..bebd0451d 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/MultiLabelDecorator.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/MultiLabelDecorator.java @@ -30,8 +30,7 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon @Override public Image decorateImage(Image image, Object element) { - for (int i = 0; i < decorators.length; i++) { - ILabelDecorator decorator = decorators[i]; + for (ILabelDecorator decorator : decorators) { Image newImage = decorator.decorateImage(image, element); if (newImage != null) { image = newImage; @@ -42,8 +41,7 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon @Override public String decorateText(String text, Object element) { - for (int i = 0; i < decorators.length; i++) { - ILabelDecorator decorator = decorators[i]; + for (ILabelDecorator decorator : decorators) { String newText = decorator.decorateText(text, element); if (newText != null) { text = newText; @@ -54,16 +52,14 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon @Override public void dispose() { - for (int i = 0; i < decorators.length; i++) { - ILabelDecorator d = decorators[i]; + for (ILabelDecorator d : decorators) { d.dispose(); } } @Override public Font decorateFont(Object element) { - for (int i = 0; i < decorators.length; i++) { - ILabelDecorator decorator = decorators[i]; + for (ILabelDecorator decorator : decorators) { if(decorator instanceof IFontDecorator) { return ((IFontDecorator)decorator).decorateFont(element); } @@ -73,8 +69,7 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon @Override public Color decorateForeground(Object element) { - for (int i = 0; i < decorators.length; i++) { - ILabelDecorator decorator = decorators[i]; + for (ILabelDecorator decorator : decorators) { if(decorator instanceof IColorDecorator) { return ((IColorDecorator)decorator).decorateForeground(element); } @@ -84,8 +79,7 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon @Override public Color decorateBackground(Object element) { - for (int i = 0; i < decorators.length; i++) { - ILabelDecorator decorator = decorators[i]; + for (ILabelDecorator decorator : decorators) { if(decorator instanceof IColorDecorator) { return ((IColorDecorator)decorator).decorateBackground(element); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshChangeListener.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshChangeListener.java index 7b2da501d..b48b1fe68 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshChangeListener.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshChangeListener.java @@ -36,8 +36,7 @@ public class RefreshChangeListener implements ISubscriberChangeListener, IChange } @Override public void subscriberResourceChanged(ISubscriberChangeEvent[] deltas) { - for (int i = 0; i < deltas.length; i++) { - ISubscriberChangeEvent delta = deltas[i]; + for (ISubscriberChangeEvent delta : deltas) { if (delta.getFlags() == ISubscriberChangeEvent.SYNC_CHANGED) { changes.add(delta); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshModelParticipantJob.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshModelParticipantJob.java index f5a42ae35..ac10c047b 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshModelParticipantJob.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshModelParticipantJob.java @@ -51,13 +51,11 @@ public class RefreshModelParticipantJob extends RefreshParticipantJob { @Override public void diffsChanged(IDiffChangeEvent event, IProgressMonitor monitor) { IDiff[] additions = event.getAdditions(); - for (int i = 0; i < additions.length; i++) { - IDiff node = additions[i]; + for (IDiff node : additions) { changes.put(node.getPath(), node); } IDiff[] changed = event.getChanges(); - for (int i = 0; i < changed.length; i++) { - IDiff node = changed[i]; + for (IDiff node : changed) { changes.put(node.getPath(), node); } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshParticipantJob.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshParticipantJob.java index 23402f815..b2e9c8e63 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshParticipantJob.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshParticipantJob.java @@ -403,8 +403,7 @@ public abstract class RefreshParticipantJob extends Job { private boolean isJobInFamilyRunning(Object family) { Job[] jobs = Job.getJobManager().find(family); if (jobs != null && jobs.length > 0) { - for (int i = 0; i < jobs.length; i++) { - Job job = jobs[i]; + for (Job job : jobs) { if (job.getState() != Job.NONE) { return true; } @@ -583,8 +582,7 @@ public abstract class RefreshParticipantJob extends Job { listenerArray = listeners.toArray(new IRefreshSubscriberListener[listeners.size()]); } // Notify each listener in a safe manner (i.e. so their exceptions don't kill us) - for (int i = 0; i < listenerArray.length; i++) { - IRefreshSubscriberListener listener = listenerArray[i]; + for (IRefreshSubscriberListener listener : listenerArray) { Notification notification = new Notification() { @Override protected void notify(IRefreshSubscriberListener listener) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberParticipantJob.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberParticipantJob.java index 99d6c6474..3e6d34636 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberParticipantJob.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberParticipantJob.java @@ -46,8 +46,7 @@ public class RefreshSubscriberParticipantJob extends RefreshParticipantJob { SubscriberSyncInfoCollector collector = getCollector(); if (collector != null) { SyncInfoTree set = collector.getSyncInfoSet(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { SyncInfo[] infos = set.getSyncInfos(resource, IResource.DEPTH_INFINITE); if(infos != null && infos.length > 0) { numChanges += infos.length; @@ -72,12 +71,11 @@ public class RefreshSubscriberParticipantJob extends RefreshParticipantJob { SubscriberSyncInfoCollector collector = getCollector(); if (collector != null) { SyncInfoTree set = collector.getSyncInfoSet(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { SyncInfo[] infos = set.getSyncInfos(resource, IResource.DEPTH_INFINITE); - if(infos != null && infos.length > 0) { - for(int j = 0; j < infos.length; j++) { - if((infos[j].getKind() & kind)>0) { + if (infos != null && infos.length > 0) { + for (SyncInfo info : infos) { + if ((info.getKind() & kind) > 0) { numChanges++; } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshUserNotificationPolicy.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshUserNotificationPolicy.java index 47bee12f5..97f26ac76 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshUserNotificationPolicy.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshUserNotificationPolicy.java @@ -112,8 +112,8 @@ public class RefreshUserNotificationPolicy implements IRefreshSubscriberListener SyncInfo[] infos = ((RefreshChangeListener)event.getChangeDescription()).getChanges(); List<IResource> selectedResources = new ArrayList<>(); selectedResources.addAll(Arrays.asList(((RefreshChangeListener)event.getChangeDescription()).getResources())); - for (int i = 0; i < infos.length; i++) { - selectedResources.add(infos[i].getLocal()); + for (SyncInfo info : infos) { + selectedResources.add(info.getLocal()); } IResource[] resources = selectedResources.toArray(new IResource[selectedResources.size()]); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffComparator.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffComparator.java index 9176a40c1..70047bc8c 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffComparator.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffComparator.java @@ -41,8 +41,7 @@ public class RegexDiffComparator extends RangeDifferenceComparator { protected boolean compareRangeDifferences(RangeDifference[] ranges, IDocument lDoc, IDocument rDoc) { try { - for (int i = 0; i < ranges.length; i++) { - RangeDifference diff = ranges[i]; + for (RangeDifference diff : ranges) { if (diff.kind() == RangeDifference.NOCHANGE) continue; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java index 2f7b2a21a..43542dfd9 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java @@ -619,8 +619,8 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements if (!inputChangeListeners.isEmpty()) { Object[] allListeners = inputChangeListeners.getListeners(); final ICompareInput compareResult = (ICompareInput) getCompareResult(); - for (int i = 0; i < allListeners.length; i++) { - final ICompareInputChangeListener listener = (ICompareInputChangeListener) allListeners[i]; + for (Object l : allListeners) { + final ICompareInputChangeListener listener = (ICompareInputChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void run() throws Exception { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java index aaf139b8d..946ae0f5c 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java @@ -218,8 +218,7 @@ public abstract class StructuredViewerAdvisor extends AbstractViewerAdvisor { o = ISynchronizePageConfiguration.DEFAULT_TOOLBAR_MENU; } String[] groups = (String[])o; - for (int i = 0; i < groups.length; i++) { - String group = groups[i]; + for (String group : groups) { // The groupIds must be converted to be unique since the toolbar is shared manager.add(new Separator(getGroupId(group))); } @@ -234,8 +233,7 @@ public abstract class StructuredViewerAdvisor extends AbstractViewerAdvisor { } groups = (String[]) o; initializeStatusLine(actionBars); - for (int i = 0; i < groups.length; i++) { - String group = groups[i]; + for (String group : groups) { // The groupIds must be converted to be unique since the // view menu is shared menu.add(new Separator(getGroupId(group))); @@ -289,8 +287,7 @@ public abstract class StructuredViewerAdvisor extends AbstractViewerAdvisor { @Override public void menuShown(MenuEvent e) { IContributionItem[] items = menuMgr.getItems(); - for (int i = 0; i < items.length; i++) { - IContributionItem item = items[i]; + for (IContributionItem item : items) { if (item instanceof ActionContributionItem) { IAction actionItem = ((ActionContributionItem) item).getAction(); if (actionItem instanceof SynchronizeModelAction) { @@ -375,8 +372,7 @@ public abstract class StructuredViewerAdvisor extends AbstractViewerAdvisor { o = ISynchronizePageConfiguration.DEFAULT_CONTEXT_MENU; } String[] groups = (String[])o; - for (int i = 0; i < groups.length; i++) { - String group = groups[i]; + for (String group : groups) { // There is no need to adjust the group ids in a context menu (see setActionBars) manager.add(new Separator(group)); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangeSetCollector.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangeSetCollector.java index 327151fe5..98d626e51 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangeSetCollector.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangeSetCollector.java @@ -126,8 +126,7 @@ public abstract class SyncInfoSetChangeSetCollector extends ChangeSetManager { */ protected void remove(IResource[] resources) { ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { set.remove(resources); } } @@ -157,8 +156,7 @@ public abstract class SyncInfoSetChangeSetCollector extends ChangeSetManager { public void reset(SyncInfoSet seedSet) { // First, remove all the sets ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set2 = sets[i]; + for (ChangeSet set2 : sets) { remove(set2); } if (seedSet != null) { @@ -186,8 +184,7 @@ public abstract class SyncInfoSetChangeSetCollector extends ChangeSetManager { removals.addAll(Arrays.asList(event.getRemovedResources())); additions.addAll(Arrays.asList(event.getAddedResources())); SyncInfo[] changed = event.getChangedResources(); - for (int i = 0; i < changed.length; i++) { - SyncInfo info = changed[i]; + for (SyncInfo info : changed) { additions.add(info); removals.add(info.getLocal()); } @@ -267,8 +264,7 @@ public abstract class SyncInfoSetChangeSetCollector extends ChangeSetManager { */ protected ChangeSet getChangeSet(SyncInfoSet set) { ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet changeSet = sets[i]; + for (ChangeSet changeSet : sets) { if (((CheckedInChangeSet)changeSet).getSyncInfoSet() == set) { return changeSet; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java index 578915be5..7cd1eb76d 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java @@ -173,8 +173,8 @@ public class SynchronizeManager implements ISynchronizeManager { fChanged = participants; fType = update; Object[] copiedListeners = fListeners.getListeners(); - for (int i = 0; i < copiedListeners.length; i++) { - fListener = (ISynchronizeParticipantListener) copiedListeners[i]; + for (Object copiedListener : copiedListeners) { + fListener = (ISynchronizeParticipantListener) copiedListener; SafeRunner.run(this); } fChanged = null; @@ -364,8 +364,7 @@ public class SynchronizeManager implements ISynchronizeManager { public synchronized void addSynchronizeParticipants(ISynchronizeParticipant[] participants) { // renamed to createSynchronizeParticipant(id) List<ISynchronizeParticipant> added = new ArrayList<>(participants.length); - for (int i = 0; i < participants.length; i++) { - ISynchronizeParticipant participant = participants[i]; + for (ISynchronizeParticipant participant : participants) { String key = Utils.getKey(participant.getId(), participant.getSecondaryId()); if(! participantReferences.containsKey(key)) { try { @@ -390,8 +389,7 @@ public class SynchronizeManager implements ISynchronizeManager { ISynchronizeParticipantReference[] refs = get(id); if (refs.length > 0) { // Find an un-pinned participant and replace it - for (int i = 0; i < refs.length; i++) { - ISynchronizeParticipantReference reference = refs[i]; + for (ISynchronizeParticipantReference reference : refs) { ISynchronizeParticipant p; try { p = reference.getParticipant(); @@ -420,8 +418,7 @@ public class SynchronizeManager implements ISynchronizeManager { @Override public synchronized void removeSynchronizeParticipants(ISynchronizeParticipant[] participants) { List<ISynchronizeParticipant> removed = new ArrayList<>(participants.length); - for (int i = 0; i < participants.length; i++) { - ISynchronizeParticipant participant = participants[i]; + for (ISynchronizeParticipant participant : participants) { String key = Utils.getKey(participant.getId(), participant.getSecondaryId()); if(participantReferences.containsKey(key)) { ParticipantInstance ref = (ParticipantInstance)participantReferences.remove(key); @@ -447,8 +444,7 @@ public class SynchronizeManager implements ISynchronizeManager { public ISynchronizeParticipantReference[] get(String id) { ISynchronizeParticipantReference[] refs = getSynchronizeParticipants(); ArrayList<ISynchronizeParticipantReference> refsForId = new ArrayList<>(); - for (int i = 0; i < refs.length; i++) { - ISynchronizeParticipantReference reference = refs[i]; + for (ISynchronizeParticipantReference reference : refs) { if(reference.getId().equals(id)) { refsForId.add(reference); } @@ -606,8 +602,7 @@ public class SynchronizeManager implements ISynchronizeManager { } IMemento memento = XMLMemento.createReadRoot(reader); IMemento[] participantNodes = memento.getChildren(CTX_PARTICIPANT); - for (int i = 0; i < participantNodes.length; i++) { - IMemento memento2 = participantNodes[i]; + for (IMemento memento2 : participantNodes) { String id = memento2.getString(CTX_ID); String secondayId = memento2.getString(CTX_SECONDARY_ID); if (secondayId != null) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElement.java index 39d728aec..9b94b40d6 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElement.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElement.java @@ -159,8 +159,7 @@ public abstract class SynchronizeModelElement extends DiffNode implements IAdapt } boolean set = getProperty(propertyName); final PropertyChangeEvent event = new PropertyChangeEvent(this, propertyName, Boolean.valueOf(!set), Boolean.valueOf(set)); - for (int i = 0; i < allListeners.length; i++) { - Object object = allListeners[i]; + for (Object object : allListeners) { if (object instanceof IPropertyChangeListener) { final IPropertyChangeListener listener = (IPropertyChangeListener)object; SafeRunner.run(new ISafeRunnable() { @@ -196,8 +195,7 @@ public abstract class SynchronizeModelElement extends DiffNode implements IAdapt private boolean hasChildWithFlag(String flag) { IDiffElement[] childen = getChildren(); - for (int i = 0; i < childen.length; i++) { - IDiffElement element = childen[i]; + for (IDiffElement element : childen) { if (((SynchronizeModelElement)element).getProperty(flag)) { return true; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementLabelProvider.java index 4fa15f001..b1062c531 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementLabelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementLabelProvider.java @@ -83,8 +83,8 @@ public class SynchronizeModelElementLabelProvider extends LabelProvider implemen if (busyFont == null) { Font defaultFont = JFaceResources.getDefaultFont(); FontData[] data = defaultFont.getFontData(); - for (int i = 0; i < data.length; i++) { - data[i].setStyle(SWT.ITALIC); + for (FontData d : data) { + d.setStyle(SWT.ITALIC); } busyFont = new Font(TeamUIPlugin.getStandardDisplay(), data); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelManager.java index dc68ea5a1..25dfb6e70 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelManager.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelManager.java @@ -233,8 +233,7 @@ public abstract class SynchronizeModelManager extends SynchronizePageActionGroup // We only need switching of layouts if there is more than one model provider if (providers.length > 1) { toggleModelProviderActions = new ArrayList(); - for (int i = 0; i < providers.length; i++) { - final ISynchronizeModelProviderDescriptor provider = providers[i]; + for (ISynchronizeModelProviderDescriptor provider : providers) { toggleModelProviderActions.add(new ToggleModelProviderAction(provider)); } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelProvider.java index 2520c08e3..2c6439d05 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelProvider.java @@ -131,8 +131,7 @@ public abstract class SynchronizeModelProvider extends AbstractSynchronizeModelP */ protected void removeFromViewer(IResource[] resources) { List<ISynchronizeModelElement> elements = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { ISynchronizeModelElement element = getModelObject(resource); if(element != null) { elements.add(element); @@ -195,8 +194,7 @@ public abstract class SynchronizeModelProvider extends AbstractSynchronizeModelP protected void handleResourceChanges(ISyncInfoTreeChangeEvent event) { // Refresh the viewer for each changed resource SyncInfo[] infos = event.getChangedResources(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { IResource local = info.getLocal(); ISynchronizeModelElement diffNode = getModelObject(local); if (diffNode != null) { @@ -233,8 +231,7 @@ public abstract class SynchronizeModelProvider extends AbstractSynchronizeModelP * @param added the added infos */ protected void addResources(SyncInfo[] added) { - for (int i = 0; i < added.length; i++) { - SyncInfo info = added[i]; + for (SyncInfo info : added) { addResource(info); } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java index e027dffc3..62c55d288 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java @@ -17,7 +17,6 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.Map; import java.util.Set; @@ -175,23 +174,21 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem // Accumulate all distinct resources that have had problem marker // changes - for (int idx = 0; idx < markerTypes.length; idx++) { - IMarkerDelta[] markerDeltas = event.findMarkerDeltas(markerTypes[idx], true); - for (int i = 0; i < markerDeltas.length; i++) { - IMarkerDelta delta = markerDeltas[i]; - IResource resource = delta.getResource(); - if (!handledResources.contains(resource)) { - handledResources.add(resource); - ISynchronizeModelElement[] elements = provider.getClosestExistingParents(delta.getResource()); - if(elements != null && elements.length > 0) { - for (int j = 0; j < elements.length; j++) { - ISynchronizeModelElement element = elements[j]; - changes.add(element); - } - } + for (String markerType : markerTypes) { + IMarkerDelta[] markerDeltas = event.findMarkerDeltas(markerType, true); + for (IMarkerDelta delta : markerDeltas) { + IResource resource = delta.getResource(); + if (!handledResources.contains(resource)) { + handledResources.add(resource); + ISynchronizeModelElement[] elements = provider.getClosestExistingParents(delta.getResource()); + if (elements != null && elements.length > 0) { + for (ISynchronizeModelElement element : elements) { + changes.add(element); } } } + } + } if (!changes.isEmpty()) { updateMarkersFor(changes.toArray(new ISynchronizeModelElement[changes.size()])); @@ -216,8 +213,7 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem // Changes contains all elements that need their labels updated long start = System.currentTimeMillis(); ISynchronizeModelElement[] elements = getChangedElements(event); - for (int i = 0; i < elements.length; i++) { - ISynchronizeModelElement element = elements[i]; + for (ISynchronizeModelElement element : elements) { propagateProblemMarkers(element); updateParentLabels(element); } @@ -564,8 +560,7 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem if (Utils.canUpdateViewer(viewer)) { try { if (additionsMap != null && !additionsMap.isEmpty() && Utils.canUpdateViewer(viewer)) { - for (Iterator iter = additionsMap.keySet().iterator(); iter.hasNext();) { - ISynchronizeModelElement parent = (ISynchronizeModelElement) iter.next(); + for (ISynchronizeModelElement parent : additionsMap.keySet()) { if (Policy.DEBUG_SYNC_MODELS) { System.out.println("Adding child view items of " + parent.getName()); //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizePageConfiguration.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizePageConfiguration.java index 3380973b9..1013d8cbd 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizePageConfiguration.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizePageConfiguration.java @@ -226,8 +226,8 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp listeners = propertyChangeListeners.getListeners(); } final PropertyChangeEvent event = new PropertyChangeEvent(this, key, oldValue, newValue); - for (int i = 0; i < listeners.length; i++) { - final IPropertyChangeListener listener = (IPropertyChangeListener)listeners[i]; + for (Object l : listeners) { + final IPropertyChangeListener listener = (IPropertyChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -254,8 +254,8 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp actionState = INITIALIZED; listeners = actionContributions.getListeners(); } - for (int i= 0; i < listeners.length; i++) { - final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i]; + for (Object listener : listeners) { + final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup) listener; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -276,8 +276,8 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp synchronized(actionContributions) { listeners = actionContributions.getListeners(); } - for (int i= 0; i < listeners.length; i++) { - final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i]; + for (Object listener : listeners) { + final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup) listener; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -302,8 +302,8 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp synchronized(actionContributions) { listeners = actionContributions.getListeners(); } - for (int i= 0; i < listeners.length; i++) { - final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i]; + for (Object listener : listeners) { + final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup) listener; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -330,8 +330,8 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp synchronized(actionContributions) { listeners = actionContributions.getListeners(); } - for (int i= 0; i < listeners.length; i++) { - final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i]; + for (Object listener : listeners) { + final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup) listener; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -351,8 +351,8 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp synchronized(actionContributions) { listeners = actionContributions.getListeners(); } - for (int i= 0; i < listeners.length; i++) { - final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i]; + for (Object listener : listeners) { + final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup) listener; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -372,8 +372,8 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp synchronized(actionContributions) { listeners = actionContributions.getListeners(); } - for (int i= 0; i < listeners.length; i++) { - final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i]; + for (Object listener : listeners) { + final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup) listener; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -395,8 +395,8 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp listeners = actionContributions.getListeners(); actionState = DISPOSED; } - for (int i= 0; i < listeners.length; i++) { - final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i]; + for (Object listener : listeners) { + final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup) listener; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -433,8 +433,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp if (groups == null) { groups = getDefault(menuPropertyId); } - for (int i = 0; i < groups.length; i++) { - String string = groups[i]; + for (String string : groups) { if (string.equals(groupId)) return true; } return false; @@ -459,8 +458,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp decorators = new ILabelDecorator[0]; } // Ensure we don't have it registered already - for (int i = 0; i < decorators.length; i++) { - ILabelDecorator d = decorators[i]; + for (ILabelDecorator d : decorators) { if (d == decorator) { return; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java index bb2bffbd6..08935bb8a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java @@ -357,8 +357,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I @Override public void participantsAdded(final ISynchronizeParticipant[] participants) { - for (int i = 0; i < participants.length; i++) { - ISynchronizeParticipant participant = participants[i]; + for (ISynchronizeParticipant participant : participants) { if (isAvailable() && select(TeamUI.getSynchronizeManager().get(participant.getId(), participant.getSecondaryId()))) { SynchronizeViewWorkbenchPart part = new SynchronizeViewWorkbenchPart(participant, getSite()); fParticipantToPart.put(participant, part); @@ -372,8 +371,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I public void participantsRemoved(final ISynchronizeParticipant[] participants) { if (isAvailable()) { Runnable r = () -> { - for (int i = 0; i < participants.length; i++) { - ISynchronizeParticipant participant = participants[i]; + for (ISynchronizeParticipant participant : participants) { if (isAvailable()) { SynchronizeViewWorkbenchPart part = (SynchronizeViewWorkbenchPart)fParticipantToPart.get(participant); if (part != null) { @@ -612,8 +610,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I // create pages List<ISynchronizeParticipantReference> participants = new ArrayList<>(); ISynchronizeParticipantReference[] refs = manager.getSynchronizeParticipants(); - for (int i = 0; i < refs.length; i++) { - ISynchronizeParticipantReference ref =refs[i]; + for (ISynchronizeParticipantReference ref : refs) { if(select(ref)) { participants.add(ref); } @@ -718,8 +715,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I if (saveables.length == 0) return; monitor.beginTask(null, 100* saveables.length); - for (int i = 0; i < saveables.length; i++) { - Saveable saveable = saveables[i]; + for (Saveable saveable : saveables) { try { saveable.doSave(Policy.subMonitorFor(monitor, 100)); } catch (CoreException e) { @@ -739,8 +735,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I @Override public boolean isDirty() { Saveable[] saveables = getSaveables(); - for (int i = 0; i < saveables.length; i++) { - Saveable saveable = saveables[i]; + for (Saveable saveable : saveables) { if (saveable.isDirty()) return true; } @@ -1014,10 +1009,11 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I IEditorPart editor = p.findEditor(input); if (editor == null) { IEditorReference[] er = p.getEditorReferences(); - for (int i = 0; i < er.length; i++) - if (er[i].getId().equals( - "org.eclipse.compare.CompareEditor") && matches(er[i], input)) //$NON-NLS-1$ - editor = er[i].getEditor(false); + for (IEditorReference e : er) { + if (e.getId().equals("org.eclipse.compare.CompareEditor") && matches(e, input)) { //$NON-NLS-1$ + editor = e.getEditor(false); + } + } } return editor; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java index 65839d020..6fe2c9cc6 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java @@ -228,8 +228,8 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup { set.add(diffArray); } else { ChangeSet[] sets = getActiveChangeSetManager().getSets(); - for (int i = 0; i < sets.length; i++) { - ActiveChangeSet activeSet = (ActiveChangeSet)sets[i]; + for (ChangeSet s : sets) { + ActiveChangeSet activeSet = (ActiveChangeSet) s; activeSet.remove(resources); } } @@ -391,8 +391,8 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup { createChangeSet.selectionChanged(selection); addToChangeSet.add(createChangeSet); addToChangeSet.add(new Separator()); - for (int i = 0; i < sets.length; i++) { - ActiveChangeSet set = (ActiveChangeSet)sets[i]; + for (ChangeSet s : sets) { + ActiveChangeSet set = (ActiveChangeSet) s; AddToChangeSetAction action = new AddToChangeSetAction(getConfiguration(), set, selection); manager.add(action); } @@ -472,8 +472,7 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup { private IDiff[] getDiffs(IResource[] resources) { List<IDiff> diffs = new ArrayList<>(); Subscriber s = ((SubscriberParticipant)getConfiguration().getParticipant()).getSubscriber(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { try { IDiff diff = s.getDiff(resource); if (diff != null) diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/CopyToClipboardAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/CopyToClipboardAction.java index b3e010c0d..5efd85260 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/CopyToClipboardAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/CopyToClipboardAction.java @@ -89,8 +89,7 @@ class CopyToClipboardAction extends SelectionListenerAction { if (structuredSelection instanceof TreeSelection) { TreeSelection ts = (TreeSelection) structuredSelection; TreePath[] paths = ts.getPaths(); - for (int j = 0; j < paths.length; j++) { - TreePath path = paths[j]; + for (TreePath path : paths) { String text = getTextFor(path); if (text != null && text.length() > 0) { if (i > 0) diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java index 4ac48f61d..366b2f6a3 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java @@ -94,17 +94,17 @@ public class OpenInCompareAction extends Action { // model synchronize if (participant instanceof ModelSynchronizeParticipant) { ModelSynchronizeParticipant msp = (ModelSynchronizeParticipant) participant; - for (int i = 0; i < elements.length; i++) { + for (Object element : elements) { // TODO: This is inefficient - if (!msp.hasCompareInputFor(elements[i])) { + if (!msp.hasCompareInputFor(element)) { return false; } } } else { // all files IResource resources[] = Utils.getResources(elements); - for (int i = 0; i < resources.length; i++) { - if (resources[i].getType() != IResource.FILE) { + for (IResource resource : resources) { + if (resource.getType() != IResource.FILE) { // Only supported if all the items are files. return false; } @@ -248,8 +248,8 @@ public class OpenInCompareAction extends Action { public static IEditorPart findOpenCompareEditor(IWorkbenchPartSite site, IResource resource) { IWorkbenchPage page = site.getPage(); IEditorReference[] editorRefs = page.getEditorReferences(); - for (int i = 0; i < editorRefs.length; i++) { - final IEditorPart part = editorRefs[i].getEditor(false /* don't restore editor */); + for (IEditorReference editorRef : editorRefs) { + final IEditorPart part = editorRef.getEditor(false /* don't restore editor */); if(part != null) { IEditorInput input = part.getEditorInput(); if(part != null && input instanceof SyncInfoCompareInput) { @@ -279,8 +279,8 @@ public class OpenInCompareAction extends Action { } IWorkbenchPage page = site.getPage(); IEditorReference[] editorRefs = page.getEditorReferences(); - for (int i = 0; i < editorRefs.length; i++) { - final IEditorPart part = editorRefs[i].getEditor(false /* don't restore editor */); + for (IEditorReference editorRef : editorRefs) { + final IEditorPart part = editorRef.getEditor(false /* don't restore editor */); if(part != null) { IEditorInput input = part.getEditorInput(); if(input instanceof ModelCompareEditorInput) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenWithActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenWithActionGroup.java index fba0cd937..c8eb249b2 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenWithActionGroup.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenWithActionGroup.java @@ -103,8 +103,8 @@ public class OpenWithActionGroup extends ActionGroup { if (participant instanceof ModelSynchronizeParticipant) { ModelSynchronizeParticipant msp = (ModelSynchronizeParticipant) participant; boolean allElementsHaveCompareInput = true; - for (int i = 0; i < elements.length; i++) { - if (!msp.hasCompareInputFor(elements[i])) { + for (Object element : elements) { + if (!msp.hasCompareInputFor(element)) { allElementsHaveCompareInput = false; break; } @@ -124,8 +124,8 @@ public class OpenWithActionGroup extends ActionGroup { } boolean allFiles = true; - for (int i = 0; i < resources.length; i++) { - if (resources[i].getType() != IResource.FILE) { + for (IResource resource : resources) { + if (resource.getType() != IResource.FILE) { // Open actions are only supported if all the items are files. allFiles = false; break; @@ -138,8 +138,8 @@ public class OpenWithActionGroup extends ActionGroup { } } - for (int i = 0; i < resources.length; i++) { - if (!resources[i].exists()) { + for (IResource resource : resources) { + if (!resource.exists()) { // Only support non-compare actions if all resources exist. return; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PasteAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PasteAction.java index 513b361ca..fc556c1a1 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PasteAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PasteAction.java @@ -151,9 +151,10 @@ public class PasteAction extends SelectionListenerAction { private static boolean isAvailable(Transfer transfer, TransferData[] availableDataTypes) { - for (int i = 0; i < availableDataTypes.length; i++) { - if (transfer.isSupportedType(availableDataTypes[i])) + for (TransferData availableDataType : availableDataTypes) { + if (transfer.isSupportedType(availableDataType)) { return true; + } } return false; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java index cd7c571b0..1fff5e791 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java @@ -108,8 +108,7 @@ public class RemoveSynchronizeParticipantAction extends Action { ISynchronizeManager manager = TeamUI.getSynchronizeManager(); ISynchronizeParticipantReference[] refs = manager.getSynchronizeParticipants(); ArrayList<ISynchronizeParticipant> removals = new ArrayList<>(); - for (int i = 0; i < refs.length; i++) { - ISynchronizeParticipantReference reference = refs[i]; + for (ISynchronizeParticipantReference reference : refs) { ISynchronizeParticipant p; try { p = reference.getParticipant(); @@ -211,8 +210,7 @@ public class RemoveSynchronizeParticipantAction extends Action { private List<Saveable> getDirtyModels(ISynchronizeParticipant[] participants) { List<Saveable> result = new ArrayList<>(); - for (int i = 0; i < participants.length; i++) { - ISynchronizeParticipant participant = participants[i]; + for (ISynchronizeParticipant participant : participants) { if (participant instanceof ModelSynchronizeParticipant) { ModelSynchronizeParticipant msp = (ModelSynchronizeParticipant) participant; Saveable s = msp.getActiveSaveable(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java index dea81fdc5..1fea90603 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java @@ -99,8 +99,7 @@ public class SynchronizePageDropDownAction extends Action implements IMenuCreato protected void addParticipantsToMenu(ISynchronizeParticipantReference[] refs) { ISynchronizeParticipant current = fView.getParticipant(); - for (int i = 0; i < refs.length; i++) { - ISynchronizeParticipantReference page = refs[i]; + for (ISynchronizeParticipantReference page : refs) { Action action = new ShowSynchronizeParticipantAction(fView, page); try { boolean isCurrent = page.getParticipant().equals(current); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java index e4a1968cb..862d2e375 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java @@ -124,8 +124,7 @@ public class ApplyPatchModelSynchronizeParticipant extends public ModelProvider[] getEnabledModelProviders() { ModelProvider[] enabledProviders = super.getEnabledModelProviders(); // add Patch model provider if it's not there - for (int i = 0; i < enabledProviders.length; i++) { - ModelProvider provider = enabledProviders[i]; + for (ModelProvider provider : enabledProviders) { if (provider.getId().equals(PatchModelProvider.ID)) return enabledProviders; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java index 4fe421e5d..93c523fac 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java @@ -58,9 +58,10 @@ public class ApplyPatchSubscriber extends Subscriber { if (getRemote() != null) { FilePatch2 filePatch2 = ((PatchedFileVariant)getRemote()).getDiff(); IHunk[] hunks = filePatch2.getHunks(); - for (int i = 0; i < hunks.length; i++) { - if (patcher.isManuallyMerged((Hunk) hunks[i])) + for (IHunk hunk : hunks) { + if (patcher.isManuallyMerged((Hunk) hunk)) { return IN_SYNC; + } } } else { // deletions don't have the remote variant, but still can be manually merged @@ -68,9 +69,10 @@ public class ApplyPatchSubscriber extends Subscriber { if (patchObject instanceof FilePatch2) { FilePatch2 filePatch2 = (FilePatch2) patchObject; IHunk[] hunks = filePatch2.getHunks(); - for (int i = 0; i < hunks.length; i++) { - if (patcher.isManuallyMerged((Hunk) hunks[i])) + for (IHunk hunk : hunks) { + if (patcher.isManuallyMerged((Hunk) hunk)) { return IN_SYNC; + } } } } @@ -147,8 +149,8 @@ public class ApplyPatchSubscriber extends Subscriber { // patch members, subscriber location FilePatch2[] diffs = getPatcher().getDiffs(); - for (int i = 0; i < diffs.length; i++) { - IResource file = PatchModelProvider.getFile(diffs[i], getPatcher()); + for (FilePatch2 diff : diffs) { + IResource file = PatchModelProvider.getFile(diff, getPatcher()); if (container.getFullPath().isPrefixOf(file.getFullPath())) { // XXX: check segments if (!container.exists(file.getProjectRelativePath())) { @@ -166,9 +168,8 @@ public class ApplyPatchSubscriber extends Subscriber { public void refresh(IResource[] resources, int depth, IProgressMonitor monitor) throws TeamException { Set<FilePatch2> diffs = new HashSet<>(); - for (int i = 0; i < resources.length; i++) { - Object object = PatchModelProvider.getPatchObject(resources[i], - getPatcher()); + for (IResource resource : resources) { + Object object = PatchModelProvider.getPatchObject(resource, getPatcher()); if (object instanceof FilePatch2) { FilePatch2 filePatch = (FilePatch2) object; diffs.add(filePatch); @@ -182,9 +183,9 @@ public class ApplyPatchSubscriber extends Subscriber { Set<IResource> roots = new HashSet<>(); if (getPatcher().isWorkspacePatch()) { IDiffElement[] children = PatchModelProvider.getPatchWorkspace(this).getChildren(); - for (int i = 0; i < children.length; i++) { + for (IDiffElement child : children) { // return array of projects from the patch - DiffProject diffProject = ((PatchProjectDiffNode)children[i]).getDiffProject(); + DiffProject diffProject = ((PatchProjectDiffNode) child).getDiffProject(); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(diffProject.getName()); if (project.isAccessible()) roots.add(project); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriberMergeContext.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriberMergeContext.java index f09ca4d79..bd1181f46 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriberMergeContext.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriberMergeContext.java @@ -56,14 +56,15 @@ public class ApplyPatchSubscriberMergeContext extends SubscriberMergeContext { Object object = PatchModelProvider.getPatchObject(resource, patcher); if (object instanceof FilePatch2) { HunkResult[] hunkResults = patcher.getDiffResult((FilePatch2) object).getHunkResults(); - for (int i = 0; i < hunkResults.length; i++) { + for (HunkResult hunkResult : hunkResults) { if (inSyncHint) { // clean Merge > disable hunks that have merged - if (hunkResults[i].isOK()) - patcher.setEnabled(hunkResults[i].getHunk(), false); + if (hunkResult.isOK()) { + patcher.setEnabled(hunkResult.getHunk(), false); + } } else { // Mark as Merged > mark *all* hunks from the file as manually merged - patcher.setManuallyMerged(hunkResults[i].getHunk(), true); + patcher.setManuallyMerged(hunkResult.getHunk(), true); } } } else { @@ -88,12 +89,12 @@ public class ApplyPatchSubscriberMergeContext extends SubscriberMergeContext { Object object = PatchModelProvider.getPatchObject(resource, patcher); if (object instanceof FilePatch2) { HunkResult[] hunkResults = patcher.getDiffResult((FilePatch2) object).getHunkResults(); - for (int i = 0; i < hunkResults.length; i++) { + for (HunkResult hunkResult : hunkResults) { // ... unmark them and exclude those properly merged - if (patcher.isManuallyMerged(hunkResults[i].getHunk())) { - patcher.setManuallyMerged(hunkResults[i].getHunk(), false); - if (hunkResults[i].isOK()) { - patcher.setEnabled(hunkResults[i].getHunk(), false); + if (patcher.isManuallyMerged(hunkResult.getHunk())) { + patcher.setManuallyMerged(hunkResult.getHunk(), false); + if (hunkResult.isOK()) { + patcher.setEnabled(hunkResult.getHunk(), false); } } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java index 662c39263..6a3488197 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java @@ -39,8 +39,8 @@ public class ApplyPatchSynchronizationActionProvider extends super.updateEnablement(selection); // disable merge for hunks Object[] elements = getOperation().getElements(); - for (int i = 0; i < elements.length; i++) { - if (elements[i] instanceof HunkDiffNode) { + for (Object element : elements) { + if (element instanceof HunkDiffNode) { setEnabled(false); return; } @@ -54,8 +54,8 @@ public class ApplyPatchSynchronizationActionProvider extends super.updateEnablement(selection); // disable mark as merged for hunks Object[] elements = getOperation().getElements(); - for (int i = 0; i < elements.length; i++) { - if (elements[i] instanceof HunkDiffNode) { + for (Object element : elements) { + if (element instanceof HunkDiffNode) { setEnabled(false); return; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationWizard.java index c9e04734d..e142f601f 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationWizard.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationWizard.java @@ -132,9 +132,8 @@ public class ApplyPatchSynchronizationWizard extends PatchWizard implements private boolean isTargetingInaccessibleProjects() { DiffProject[] diffProjects = getPatcher().getDiffProjects(); if (diffProjects != null) { - for (int i = 0; i < diffProjects.length; i++) { - IProject project = ResourcesPlugin.getWorkspace().getRoot() - .getProject(diffProjects[i].getName()); + for (DiffProject diffProject : diffProjects) { + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(diffProject.getName()); if (!project.isAccessible()) return true; } @@ -175,8 +174,7 @@ public class ApplyPatchSynchronizationWizard extends PatchWizard implements IStatus.ERROR, TeamUIMessages.PatchInaccessibleProjectsPage_openingProjects, null); - for (int i = 0; i < projects.length; i++) { - IProject project = projects[i]; + for (IProject project : projects) { try { project.open(SubMonitor.convert(monitor, 1)); } catch (CoreException e) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/DiffProjectResourceMapping.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/DiffProjectResourceMapping.java index ef6b8e8d2..49fbcc858 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/DiffProjectResourceMapping.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/DiffProjectResourceMapping.java @@ -72,10 +72,10 @@ public class DiffProjectResourceMapping extends ResourceMapping { FileDiffResult filePatch = (FileDiffResult) mapping .getModelObject(); FilePatch2[] filePatches = object.getFileDiffs(); - for (int i = 0; i < filePatches.length; i++) { - if (filePatches[i].getPath(false).equals( - filePatch.getTargetPath())) + for (FilePatch2 filePatche : filePatches) { + if (filePatche.getPath(false).equals(filePatch.getTargetPath())) { return true; + } } } else if (mapping instanceof HunkResourceMapping) { HunkResult hunk = (HunkResult) mapping.getModelObject(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchModelProvider.java index 3c075bc30..b35970891 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchModelProvider.java @@ -88,16 +88,17 @@ public class PatchModelProvider extends ModelProvider { if (resource.getType() == IResource.PROJECT) { if (patcher.isWorkspacePatch()) { DiffProject[] diffProjects = patcher.getDiffProjects(); - for (int i = 0; i < diffProjects.length; i++) { - if (diffProjects[i].getName().equals(resource.getName())) - return diffProjects[i]; + for (DiffProject diffProject : diffProjects) { + if (diffProject.getName().equals(resource.getName())) { + return diffProject; + } } } } else if (resource.getType() == IResource.FILE) { FilePatch2[] diffs = patcher.getDiffs(); - for (int i = 0; i < diffs.length; i++) { - if (resource.equals(getFile(diffs[i], patcher))) { - return diffs[i]; + for (FilePatch2 diff : diffs) { + if (resource.equals(getFile(diff, patcher))) { + return diff; } } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchSyncContentProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchSyncContentProvider.java index 15650e607..910445115 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchSyncContentProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchSyncContentProvider.java @@ -117,9 +117,9 @@ public class PatchSyncContentProvider extends SynchronizationContentProvider { public Object[] getChildren(Object parent) { Object[] children = super.getChildren(parent); List result = new ArrayList(); - for (int i = 0; i < children.length; i++) { - if (children[i] instanceof PatchDiffNode) { - PatchDiffNode node = (PatchDiffNode) children[i]; + for (Object c : children) { + if (c instanceof PatchDiffNode) { + PatchDiffNode node = (PatchDiffNode) c; if (node.isEnabled()) result.add(node); // hide disabled nodes } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkspace.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkspace.java index 6c770a103..0ac93d379 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkspace.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkspace.java @@ -85,8 +85,8 @@ public class PatchWorkspace extends DiffNode implements IAdaptable { // see org.eclipse.compare.internal.patch.PatchCompareEditorInput.processDiffs(FilePatch2[]) private IDiffElement[] processDiffs(FilePatch2[] diffs) { List<IDiffElement> result = new ArrayList<>(); - for (int i = 0; i < diffs.length; i++) { - result.addAll(processDiff(diffs[i], this)); + for (FilePatch2 diff : diffs) { + result.addAll(processDiff(diff, this)); } return result.toArray(new IDiffElement[result.size()]); } @@ -94,12 +94,11 @@ public class PatchWorkspace extends DiffNode implements IAdaptable { // see org.eclipse.compare.internal.patch.PatchCompareEditorInput.processProjects(DiffProject[]) private IDiffElement[] processProjects(DiffProject[] diffProjects) { List<IDiffElement> result = new ArrayList<>(); - for (int i = 0; i < diffProjects.length; i++) { - PatchProjectDiffNode projectNode = new PatchProjectDiffNode(this, diffProjects[i], getPatcher().getConfiguration()); + for (DiffProject diffProject : diffProjects) { + PatchProjectDiffNode projectNode = new PatchProjectDiffNode(this, diffProject, getPatcher().getConfiguration()); result.add(projectNode); - FilePatch2[] diffs = diffProjects[i].getFileDiffs(); - for (int j = 0; j < diffs.length; j++) { - FilePatch2 fileDiff = diffs[j]; + FilePatch2[] diffs = diffProject.getFileDiffs(); + for (FilePatch2 fileDiff : diffs) { processDiff(fileDiff, projectNode); } } @@ -113,8 +112,7 @@ public class PatchWorkspace extends DiffNode implements IAdaptable { PatchFileDiffNode node = new PatchFileDiffNode(diffResult, parent, PatchFileDiffNode.getKind(diffResult), PatchFileDiffNode.getAncestorElement(diffResult), getLeftElement(diffResult), PatchFileDiffNode.getRightElement(diffResult)); result.add(node); HunkResult[] hunkResults = diffResult.getHunkResults(); - for (int i = 0; i < hunkResults.length; i++) { - HunkResult hunkResult = hunkResults[i]; + for (HunkResult hunkResult : hunkResults) { new HunkDiffNode(hunkResult, node, Differencer.CHANGE, HunkDiffNode.getAncestorElement(hunkResult, false), getLeftElement(hunkResult), HunkDiffNode.getRightElement(hunkResult, false)); // result.add(hunkDiffNode); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizard.java index 4cea0114b..d3bc256ac 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizard.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizard.java @@ -141,10 +141,9 @@ public class ConfigureProjectWizard extends Wizard { IExtensionPoint point = registry.getExtensionPoint(TeamUIPlugin.PLUGIN_ID, PT_CONFIGURATION); if (point != null) { IExtension[] extensions = point.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement[] elements = extensions[i].getConfigurationElements(); - for (int j = 0; j < elements.length; j++) { - IConfigurationElement element = elements[j]; + for (IExtension extension : extensions) { + IConfigurationElement[] elements = extension.getConfigurationElements(); + for (IConfigurationElement element : elements) { if (element.getName().equals(TAG_WIZARD)) { ConfigurationWizardElement wizard = createWizardElement(element); if (wizard != null && filterItem(element)) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java index e71ea8741..91a9d2c92 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java @@ -206,8 +206,7 @@ public class ConfigureProjectWizardMainPage extends WizardPage { /* package */ IProject[] getUnsharedProjects() { java.util.List<IProject> unshared = new ArrayList<>(); - for (int i = 0; i < projects.length; i++) { - IProject project = projects[i]; + for (IProject project : projects) { if (!RepositoryProvider.isShared(project)) unshared.add(project); } @@ -263,9 +262,9 @@ public class ConfigureProjectWizardMainPage extends WizardPage { // TODO: any checks here? Object[] children = ((AdaptableList) viewer.getInput()).getChildren(); - for (int i = 0; i < children.length; i++) { + for (Object child : children) { try { - ConfigurationWizardElement element = (ConfigurationWizardElement)children[i]; + ConfigurationWizardElement element = (ConfigurationWizardElement) child; if (element.getID().equals(selectedWizardId)) { viewer.setSelection(new StructuredSelection(element)); return; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetLocationPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetLocationPage.java index 70ac215aa..4809f5dad 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetLocationPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetLocationPage.java @@ -417,9 +417,9 @@ public class ExportProjectSetLocationPage extends TeamWizardPage { return allProjects; ArrayList accessibleProjects = new ArrayList(); - for (int i = 0; i < allProjects.length; i++) { - if (allProjects[i].isOpen()) { - accessibleProjects.add(allProjects[i]); + for (IProject project : allProjects) { + if (project.isOpen()) { + accessibleProjects.add(project); } } return accessibleProjects.toArray(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java index 1b19680d7..f555d5d35 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java @@ -96,11 +96,11 @@ public class ExportProjectSetMainPage extends TeamWizardPage { if (element instanceof IProject){ ArrayList<IWorkingSet> treePaths = new ArrayList<>(); IWorkingSet[] workingSets = TeamUIPlugin.getPlugin().getWorkbench().getWorkingSetManager().getWorkingSets(); - for (int i = 0; i < workingSets.length; i++) { - IAdaptable[] elements = workingSets[i].getElements(); - for (int j = 0; j < elements.length; j++) { - if (elements[j].equals(element)){ - treePaths.add(workingSets[i]); + for (IWorkingSet workingSet : workingSets) { + IAdaptable[] elements = workingSet.getElements(); + for (IAdaptable d : elements) { + if (d.equals(element)) { + treePaths.add(workingSet); break; } } @@ -125,9 +125,9 @@ public class ExportProjectSetMainPage extends TeamWizardPage { IWorkspaceRoot root = (IWorkspaceRoot) inputElement; List<IProject> projectList = new ArrayList<>(); IProject[] workspaceProjects = root.getProjects(); - for (int i = 0; i < workspaceProjects.length; i++) { - if (isProjectExportable(workspaceProjects[i])) { - projectList.add(workspaceProjects[i]); + for (IProject workspaceProject : workspaceProjects) { + if (isProjectExportable(workspaceProject)) { + projectList.add(workspaceProject); } } return projectList.toArray(new IProject[projectList.size()]); @@ -135,9 +135,11 @@ public class ExportProjectSetMainPage extends TeamWizardPage { IWorkingSetManager manager = (IWorkingSetManager) inputElement; IWorkingSet[] allSets = manager.getAllWorkingSets(); ArrayList<IWorkingSet> resourceSets = new ArrayList<>(); - for (int i = 0; i < allSets.length; i++) - if (isWorkingSetSupported(allSets[i])) - resourceSets.add(allSets[i]); + for (IWorkingSet set : allSets) { + if (isWorkingSetSupported(set)) { + resourceSets.add(set); + } + } return resourceSets.toArray(new IWorkingSet[resourceSets.size()]); } else if (inputElement instanceof IAdaptable){ @@ -202,8 +204,8 @@ public class ExportProjectSetMainPage extends TeamWizardPage { private IProject[] getProjectsForAdaptables(IAdaptable[] adaptable) { Set<IProject> projectSet = new HashSet<>(); - for (int i = 0; i < adaptable.length; i++) { - IProject[] projects = getProjectsForObject(adaptable[i]); + for (IAdaptable a : adaptable) { + IProject[] projects = getProjectsForObject(a); if (projects != null) projectSet.addAll(Arrays.asList(projects)); } @@ -216,8 +218,8 @@ public class ExportProjectSetMainPage extends TeamWizardPage { private static boolean isWorkingSetSupported(IWorkingSet workingSet) { if (!workingSet.isEmpty() && !workingSet.isAggregateWorkingSet()) { IAdaptable[] elements = workingSet.getElements(); - for (int i = 0; i < elements.length; i++) { - IResource resource = ResourceUtil.getResource(elements[i]); + for (IAdaptable element : elements) { + IResource resource = ResourceUtil.getResource(element); if (resource != null) // support a working set if it contains at least one resource return true; @@ -380,13 +382,13 @@ public class ExportProjectSetMainPage extends TeamWizardPage { IWorkingSet workingSet = (IWorkingSet) temp; if (event.getChecked()){ IAdaptable[] elements1 = workingSet.getElements(); - for (int i1 = 0; i1 < elements1.length; i1++) { - selectedProjects.add(elements1[i1]); + for (IAdaptable element : elements1) { + selectedProjects.add(element); } } else { IAdaptable[] elements2 = workingSet.getElements(); - for (int i2 = 0; i2 < elements2.length; i2++) { - selectedProjects.remove(elements2[i2]); + for (IAdaptable element : elements2) { + selectedProjects.remove(element); } } } @@ -413,8 +415,8 @@ public class ExportProjectSetMainPage extends TeamWizardPage { tableViewer.setAllChecked(true); selectedProjects.removeAll(selectedProjects); Object[] checked = tableViewer.getCheckedElements(); - for (int i = 0; i < checked.length; i++) { - selectedProjects.add(checked[i]); + for (Object c : checked) { + selectedProjects.add(c); } updateEnablement(); }); @@ -584,10 +586,10 @@ public class ExportProjectSetMainPage extends TeamWizardPage { selectedProjects.removeAll(selectedProjects); selectedWorkingSet.removeAll(selectedWorkingSet); Object[] checked = wsTableViewer.getCheckedElements(); - for (int i = 0; i < checked.length; i++) { - selectedWorkingSet.add(checked[i]); - if (checked[i] instanceof IWorkingSet){ - IWorkingSet ws = (IWorkingSet) checked[i]; + for (Object c : checked) { + selectedWorkingSet.add(c); + if (c instanceof IWorkingSet) { + IWorkingSet ws = (IWorkingSet) c; IAdaptable[] elements = ws.getElements(); addProjects(elements); } @@ -640,10 +642,10 @@ public class ExportProjectSetMainPage extends TeamWizardPage { selectedProjects.removeAll(selectedProjects); wsTableViewer.setInput(workingSetManager); Object[] checked = wsTableViewer.getCheckedElements(); - for (int i = 0; i < checked.length; i++) { - selectedWorkingSet.add(checked[i]); - if (checked[i] instanceof IWorkingSet) { - IWorkingSet ws = (IWorkingSet) checked[i]; + for (Object c : checked) { + selectedWorkingSet.add(c); + if (c instanceof IWorkingSet) { + IWorkingSet ws = (IWorkingSet) c; IAdaptable[] elements = ws.getElements(); addProjects(elements); } @@ -739,8 +741,8 @@ public class ExportProjectSetMainPage extends TeamWizardPage { selectedWorkingSet.remove(workingSet); Set<IProject> tempSet = new HashSet<>(); - for (int i = 0; i < elements.length; i++) { - IProject[] projects = getProjectsForObject(elements[i]); + for (IAdaptable element : elements) { + IProject[] projects = getProjectsForObject(element); if (projects != null) tempSet.addAll(Arrays.asList(projects)); } @@ -757,8 +759,8 @@ public class ExportProjectSetMainPage extends TeamWizardPage { private void addProjects(IAdaptable[] elements) { Set<IProject> tempSet = new HashSet<>(); - for (int j = 0; j < elements.length; j++) { - IProject[] projects = getProjectsForObject(elements[j]); + for (IAdaptable element : elements) { + IProject[] projects = getProjectsForObject(element); if (projects != null) tempSet.addAll(Arrays.asList(projects)); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalRefreshWizardSelectionPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalRefreshWizardSelectionPage.java index 93cc65318..67c5a6ba1 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalRefreshWizardSelectionPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalRefreshWizardSelectionPage.java @@ -173,9 +173,9 @@ public class GlobalRefreshWizardSelectionPage extends WizardPage implements IDou final SynchronizeManager syncManager= (SynchronizeManager)TeamUI.getSynchronizeManager(); final SynchronizeWizardDescription [] wizards= syncManager.getWizardDescriptors(); - for (int i = 0; i < wizards.length; i++) { - if (defaultSelection.equals(wizards[i].getId())) { - return wizards[i]; + for (SynchronizeWizardDescription w : wizards) { + if (defaultSelection.equals(w.getId())) { + return w; } } return null; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java index b6abc5fb1..f8d5c95d6 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java @@ -114,8 +114,8 @@ public class ImportProjectSetOperation extends TeamOperation { private void createWorkingSet(IWorkingSet[] workingSets, IProject[] projects) { IWorkingSetManager manager = TeamUIPlugin.getPlugin().getWorkbench().getWorkingSetManager(); String workingSetName; - for (int i = 0; i < workingSets.length; i++) { - workingSetName = workingSets[i].getName(); + for (IWorkingSet workingSet : workingSets) { + workingSetName = workingSet.getName(); IWorkingSet oldSet = manager.getWorkingSet(workingSetName); if (oldSet == null) { IWorkingSet newSet = manager.createWorkingSet(workingSetName, projects); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PatchInaccessibleProjectsPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PatchInaccessibleProjectsPage.java index 7254e72df..baceab88c 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PatchInaccessibleProjectsPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PatchInaccessibleProjectsPage.java @@ -140,9 +140,8 @@ public class PatchInaccessibleProjectsPage extends WizardPage { DiffProject[] diffProjects = fPatcher.getDiffProjects(); List<IProject> projects = new ArrayList<>(); if (diffProjects != null) { - for (int i = 0; i < diffProjects.length; i++) { - IProject project = ResourcesPlugin.getWorkspace().getRoot() - .getProject(diffProjects[i].getName()); + for (DiffProject diffProject : diffProjects) { + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(diffProject.getName()); if (!project.isAccessible()) projects.add(project); } @@ -169,8 +168,9 @@ public class PatchInaccessibleProjectsPage extends WizardPage { public IProject[] getSelectedProjects() { Object elements[] = checkList.getCheckedElements(); List<IProject> projects = new ArrayList<>(); - for (int i = 0; i < elements.length; i++) - projects.add((IProject) elements[i]); + for (Object element : elements) { + projects.add((IProject) element); + } return projects.toArray(new IProject[] {}); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSetExportWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSetExportWizard.java index e50143720..4f98146e8 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSetExportWizard.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSetExportWizard.java @@ -117,8 +117,7 @@ public class ProjectSetExportWizard extends Wizard implements IExportWizard { // Hash the projects by provider IProject[] projects = mainPage.getSelectedProjects(); Map<String, Set<IProject>> map = new HashMap<>(); - for (int i = 0; i < projects.length; i++) { - IProject project = projects[i]; + for (IProject project : projects) { RepositoryProvider provider = RepositoryProvider.getProvider(project); if (provider != null) { String id = provider.getID(); @@ -156,16 +155,16 @@ public class ProjectSetExportWizard extends Wizard implements IExportWizard { ProjectSetCapability.ensureBackwardsCompatible(providerType, serializer); if (serializer != null) { String[] references = serializer.asReference(projectArray, context, SubMonitor.convert(monitor, 990)); - for (int i = 0; i < references.length; i++) { + for (String reference : references) { IMemento proj = memento.createChild("project"); //$NON-NLS-1$ - proj.putString("reference", references[i]); //$NON-NLS-1$ + proj.putString("reference", reference); //$NON-NLS-1$ } } } if (workingSets != null){ - for (int i = 0; i < workingSets.length; i++) { + for (IWorkingSet workingSet : workingSets) { IMemento memento =xmlMemento.createChild("workingSets"); //$NON-NLS-1$ - workingSets[i].saveState(memento); + workingSet.saveState(memento); } } xmlMemento.save(writer); @@ -193,8 +192,7 @@ public class ProjectSetExportWizard extends Wizard implements IExportWizard { } // notify provider types of the project set write - for (Iterator iter = map.keySet().iterator();iter.hasNext();) { - String id = (String) iter.next(); + for (String id : map.keySet()) { RepositoryProviderType type = RepositoryProviderType.getProviderType(id); if (type != null) { ProjectSetCapability capability = type.getProjectSetCapability(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageSaveablePart.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageSaveablePart.java index 3b5ed5ddd..2221dad7e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageSaveablePart.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageSaveablePart.java @@ -15,7 +15,6 @@ package org.eclipse.team.ui; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; -import java.util.Iterator; import org.eclipse.compare.CompareConfiguration; import org.eclipse.compare.CompareEditorInput; @@ -413,10 +412,7 @@ public abstract class PageSaveablePart extends SaveablePartAdapter implements IC } private void flushViewers(IProgressMonitor monitor) { - Iterator iter = fDirtyViewers.iterator(); - - for (int i=0; i<fDirtyViewers.size(); i++){ - Object element = iter.next(); + for (Object element : fDirtyViewers) { IFlushable flushable = Adapters.adapt(element, IFlushable.class); if (flushable != null) flushable.flush(monitor); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamUI.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamUI.java index 5c8b1c71d..22db1f328 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamUI.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamUI.java @@ -175,12 +175,10 @@ public class TeamUI { IScmUrlImportWizardPage.ATT_EXTENSION); if (elements.length > 0) { Set<IScmUrlImportWizardPage> pages = new HashSet<>(); - for (int i = 0; i < elements.length; i++) { - String pageImporterId = elements[i] - .getAttribute(IScmUrlImportWizardPage.ATT_IMPORTER); + for (IConfigurationElement element : elements) { + String pageImporterId = element.getAttribute(IScmUrlImportWizardPage.ATT_IMPORTER); if (importerId.equals(pageImporterId)) { - Object ext = TeamUIPlugin.createExtension(elements[i], - IScmUrlImportWizardPage.ATT_PAGE); + Object ext = TeamUIPlugin.createExtension(element, IScmUrlImportWizardPage.ATT_PAGE); IScmUrlImportWizardPage page = (IScmUrlImportWizardPage) ext; pages.add(page); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java index 02c54d98a..aba0d322e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java @@ -217,8 +217,7 @@ public abstract class RevisionAnnotationController { } private static AbstractDecoratedTextEditor findTextEditor(IWorkbenchPage page, IEditorPart[] editors, IEditorInput input) { - for (int i = 0; i < editors.length; i++) { - IEditorPart editor = editors[i]; + for (IEditorPart editor : editors) { AbstractDecoratedTextEditor te = findTextEditorPart(page, editor, input); if (te != null) return te; @@ -232,8 +231,7 @@ public abstract class RevisionAnnotationController { if (editor instanceof MultiPageEditorPart) { MultiPageEditorPart mpep = (MultiPageEditorPart) editor; IEditorPart[] parts = mpep.findEditors(input); - for (int i = 0; i < parts.length; i++) { - IEditorPart editorPart = parts[i]; + for (IEditorPart editorPart : parts) { if (editorPart instanceof AbstractDecoratedTextEditor) { page.activate(mpep); mpep.setActiveEditor(editorPart); @@ -247,8 +245,7 @@ public abstract class RevisionAnnotationController { private static IEditorPart[] findOpenEditorsForFile(IWorkbenchPage page, FileEditorInput input) { final IEditorReference[] references= page.findEditors(input, null, IWorkbenchPage.MATCH_INPUT); final List<IEditorPart> editors = new ArrayList<>(); - for (int i= 0; i < references.length; i++) { - IEditorReference reference= references[i]; + for (IEditorReference reference : references) { IEditorPart editor= reference.getEditor(false); editors.add(editor); } @@ -266,8 +263,7 @@ public abstract class RevisionAnnotationController { final IWorkbench workbench= PlatformUI.getWorkbench(); final IWorkbenchWindow window = workbench.getActiveWorkbenchWindow(); IEditorReference[] references= window.getActivePage().getEditorReferences(); - for (int i= 0; i < references.length; i++) { - IEditorReference reference= references[i]; + for (IEditorReference reference : references) { try { if (object.equals(reference.getEditorInput())) { IEditorPart editor= reference.getEditor(false); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SaveableComparison.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SaveableComparison.java index 221dc057b..8c837f1a7 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SaveableComparison.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SaveableComparison.java @@ -110,8 +110,7 @@ public abstract class SaveableComparison extends Saveable { */ protected void firePropertyChange(final int property) { Object[] allListeners = listeners.getListeners(); - for (int i = 0; i < allListeners.length; i++) { - final Object object = allListeners[i]; + for (Object object : allListeners) { SafeRunner.run(new ISafeRunnable() { @Override public void run() throws Exception { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationActionProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationActionProvider.java index 9ecf1b83e..700eb483b 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationActionProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationActionProvider.java @@ -161,8 +161,7 @@ public class SynchronizationActionProvider extends CommonActionProvider { super.fillContextMenu(menu); if (menu instanceof CommonMenuManager) { CommonMenuManager manager = (CommonMenuManager) menu; - for (Iterator iter = handlers.keySet().iterator(); iter.hasNext();) { - String actionId = (String) iter.next(); + for (String actionId : handlers.keySet()) { manager.registerHandler(actionId, handlers.get(actionId)); } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationCompareAdapter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationCompareAdapter.java index fbf59dc7e..1a47ec6ae 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationCompareAdapter.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationCompareAdapter.java @@ -14,7 +14,6 @@ package org.eclipse.team.ui.mapping; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.eclipse.compare.structuremergeviewer.ICompareInput; @@ -106,8 +105,7 @@ public abstract class SynchronizationCompareAdapter implements ISynchronizationC } while (parent != null); if (!segments.isEmpty()) { IPath path = Path.EMPTY; - for (Iterator iter = segments.iterator(); iter.hasNext();) { - String segment = (String) iter.next(); + for (String segment : segments) { path = path.append(segment); } return path.toString(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java index ef965eb1b..32cddb510 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java @@ -227,8 +227,7 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr ResourceMapping mapping = Utils.getResourceMapping(internalGetElement(element)); if (mapping != null) { ResourceMapping[] mappings = scope.getMappings(mapping.getModelProviderId()); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping sm = mappings[i]; + for (ResourceMapping sm : mappings) { if (mapping.contains(sm)) { return true; } @@ -466,8 +465,7 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr */ protected Object[] getChildrenInScope(ISynchronizationScope scope, Object parent, Object[] children) { List<Object> result = new ArrayList<>(); - for (int i = 0; i < children.length; i++) { - Object object = children[i]; + for (Object object : children) { if (object != null && isInScope(scope, parent, object)) { result.add(object); } @@ -506,19 +504,18 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr if (children.length == 0) return setChildren; Set<Object> result = new HashSet<>(children.length); - for (int i = 0; i < children.length; i++) { - result.add(children[i]); + for (Object c : children) { + result.add(c); } - for (int i = 0; i < setChildren.length; i++) { - result.add(setChildren[i]); + for (IResource s : setChildren) { + result.add(s); } return result.toArray(); } private Object[] internalGetChildren(ISynchronizationContext context, Object parent, Object[] children) { List<Object> result = new ArrayList<>(children.length); - for (int i = 0; i < children.length; i++) { - Object object = children[i]; + for (Object object : children) { // If the parent is a TreePath then the subclass is // TreePath aware and we can send a TrePath to the // isVisible method @@ -559,8 +556,7 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr private boolean isVisible(IDiff[] diffs) { if (diffs.length > 0) { - for (int j = 0; j < diffs.length; j++) { - IDiff diff = diffs[j]; + for (IDiff diff : diffs) { if (isVisible(diff)) { return true; } @@ -628,8 +624,7 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr ResourceMapping mapping = Utils.getResourceMapping(internalGetElement(element)); if (mapping != null) { ResourceMapping[] mappings = scope.getMappings(mapping.getModelProviderId()); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping sm = mappings[i]; + for (ResourceMapping sm : mappings) { if (mapping.contains(sm)) { return true; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeLabelProvider.java index d6ca571a2..c4592fcb7 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeLabelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeLabelProvider.java @@ -319,8 +319,7 @@ public abstract class AbstractSynchronizeLabelProvider implements ILabelProvider if (mapping != null) { try { IMarker[] markers = mapping.findMarkers(IMarker.PROBLEM, true, null); - for (int i = 0; i < markers.length; i++) { - IMarker marker = markers[i]; + for (IMarker marker : markers) { Integer severity = (Integer) marker.getAttribute(IMarker.SEVERITY); if (severity != null) { if (severity.intValue() == IMarker.SEVERITY_ERROR) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeScope.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeScope.java index 8ad236475..5e6d7317a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeScope.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeScope.java @@ -129,8 +129,8 @@ public abstract class AbstractSynchronizeScope implements ISynchronizeScope { synchronized(listeners) { allListeners = listeners.getListeners(); } - for (int i = 0; i < allListeners.length; i++) { - final IPropertyChangeListener listener = (IPropertyChangeListener)allListeners[i]; + for (Object l : allListeners) { + final IPropertyChangeListener listener = (IPropertyChangeListener) l; SafeRunner.run(new SafeRunnable() { @Override public void run() throws Exception { @@ -177,8 +177,7 @@ public abstract class AbstractSynchronizeScope implements ISynchronizeScope { public boolean contains(IResource resource) { IResource[] roots = getRoots(); IPath resourcePath = resource.getFullPath(); - for (int i = 0; i < roots.length; i++) { - IResource root = roots[i]; + for (IResource root : roots) { if (root.getFullPath().isPrefixOf(resourcePath)) { return true; } @@ -196,8 +195,7 @@ public abstract class AbstractSynchronizeScope implements ISynchronizeScope { public ResourceMapping[] getMappings() { List result = new ArrayList(); IResource[] roots = getRoots(); - for (int i = 0; i < roots.length; i++) { - IResource resource = roots[i]; + for (IResource resource : roots) { result.add(resource.getAdapter(ResourceMapping.class)); } return (ResourceMapping[]) result.toArray(new ResourceMapping[result.size()]); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java index a3954d833..2c3d941cf 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java @@ -76,8 +76,7 @@ public abstract class ModelMergeOperation extends ModelOperation { ModelProvider[] providers = context.getScope().getModelProviders(); monitor.beginTask(null, 100 * providers.length); List<IStatus> notOK = new ArrayList<>(); - for (int i = 0; i < providers.length; i++) { - ModelProvider provider = providers[i]; + for (ModelProvider provider : providers) { IStatus status = validateMerge(provider, context, Policy.subMonitorFor(monitor, 100)); if (!status.isOK()) notOK.add(status); @@ -288,8 +287,7 @@ public abstract class ModelMergeOperation extends ModelOperation { try { int ticks = 100; monitor1.beginTask(null, ticks + ((providers.length - 1) * 10)); - for (int i = 0; i < providers.length; i++) { - ModelProvider provider = providers[i]; + for (ModelProvider provider : providers) { IStatus status = performMerge(provider, Policy.subMonitorFor(monitor1, ticks)); ticks = 10; if (!status.isOK()) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelOperation.java index 3a8b51bde..0888ad168 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelOperation.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelOperation.java @@ -64,8 +64,7 @@ public abstract class ModelOperation extends TeamOperation { */ public static ModelProvider[] sortByExtension(ModelProvider[] providers) { List<ModelProvider> result = new ArrayList<>(); - for (int i = 0; i < providers.length; i++) { - ModelProvider providerToInsert = providers[i]; + for (ModelProvider providerToInsert : providers) { int index = result.size(); for (int j = 0; j < result.size(); j++) { ModelProvider provider = result.get(j); @@ -82,8 +81,7 @@ public abstract class ModelOperation extends TeamOperation { private static boolean extendsProvider(ModelProvider providerToInsert, ModelProvider provider) { String[] extended = providerToInsert.getDescriptor().getExtendedModels(); // First search immediate dependents - for (int i = 0; i < extended.length; i++) { - String id = extended[i]; + for (String id : extended) { if (id.equals(provider.getDescriptor().getId())) { return true; } @@ -202,8 +200,7 @@ public abstract class ModelOperation extends TeamOperation { // the input or if they are from a model that has no relationship to the input model String modelProviderId = inputModelProviders[0].getDescriptor().getId(); ResourceMapping[] mappings = getScope().getMappings(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { if (inputScope.getTraversals(mapping) == null) { // This mapping was not in the input String id = mapping.getModelProviderId(); @@ -219,16 +216,14 @@ public abstract class ModelOperation extends TeamOperation { } else { // We need to prompt if there are additional mappings from an input // provider whose traversals overlap those of the input mappings. - for (int i = 0; i < inputModelProviders.length; i++) { - ModelProvider provider = inputModelProviders[i]; + for (ModelProvider provider : inputModelProviders) { String id = provider.getDescriptor().getId(); ResourceMapping[] inputMappings = inputScope.getMappings(id); ResourceMapping[] scopeMappings = getScope().getMappings(id); if (inputMappings.length != scopeMappings.length) { // There are more mappings for this provider. // We need to see if any of the new ones overlap the old ones. - for (int j = 0; j < scopeMappings.length; j++) { - ResourceMapping mapping = scopeMappings[j]; + for (ResourceMapping mapping : scopeMappings) { ResourceTraversal[] inputTraversals = inputScope.getTraversals(mapping); if (inputTraversals == null) { // This mapping was not in the input. @@ -266,12 +261,10 @@ public abstract class ModelOperation extends TeamOperation { private boolean hasAdditionalMappingsFromIndependantModel(ModelProvider[] inputModelProviders, ModelProvider[] modelProviders) { ModelProvider[] additionalProviders = getAdditionalProviders(inputModelProviders, modelProviders); - for (int i = 0; i < additionalProviders.length; i++) { - ModelProvider additionalProvider = additionalProviders[i]; + for (ModelProvider additionalProvider : additionalProviders) { boolean independant = true; // Return true if the new provider is independant of all input providers - for (int j = 0; j < inputModelProviders.length; j++) { - ModelProvider inputProvider = inputModelProviders[j]; + for (ModelProvider inputProvider : inputModelProviders) { if (!isIndependantModel(additionalProvider.getDescriptor().getId(), inputProvider.getDescriptor().getId())) { independant = false; } @@ -286,8 +279,7 @@ public abstract class ModelOperation extends TeamOperation { Set<ModelProvider> input = new HashSet<>(); List<ModelProvider> result = new ArrayList<>(); input.addAll(Arrays.asList(inputModelProviders)); - for (int i = 0; i < modelProviders.length; i++) { - ModelProvider provider = modelProviders[i]; + for (ModelProvider provider : modelProviders) { if (!input.contains(provider)) result.add(provider); } @@ -295,10 +287,8 @@ public abstract class ModelOperation extends TeamOperation { } private boolean overlaps(ResourceTraversal[] scopeTraversals, ResourceTraversal[] inputModelTraversals) { - for (int i = 0; i < inputModelTraversals.length; i++) { - ResourceTraversal inputTraversal = inputModelTraversals[i]; - for (int j = 0; j < scopeTraversals.length; j++) { - ResourceTraversal scopeTraversal = scopeTraversals[j]; + for (ResourceTraversal inputTraversal : inputModelTraversals) { + for (ResourceTraversal scopeTraversal : scopeTraversals) { if (overlaps(inputTraversal, scopeTraversal)) { return true; } @@ -310,10 +300,8 @@ public abstract class ModelOperation extends TeamOperation { private boolean overlaps(ResourceTraversal inputTraversal, ResourceTraversal scopeTraversal) { IResource[] inputRoots = inputTraversal.getResources(); IResource[] scopeRoots = scopeTraversal.getResources(); - for (int i = 0; i < scopeRoots.length; i++) { - IResource scopeResource = scopeRoots[i]; - for (int j = 0; j < inputRoots.length; j++) { - IResource inputResource = inputRoots[j]; + for (IResource scopeResource : scopeRoots) { + for (IResource inputResource : inputRoots) { if (overlaps(scopeResource, scopeTraversal.getDepth(), inputResource, inputTraversal.getDepth())) return true; } @@ -341,8 +329,7 @@ public abstract class ModelOperation extends TeamOperation { private ResourceTraversal[] getTraversals(ISynchronizationScope inputScope, ResourceMapping[] inputMappings) { CompoundResourceTraversal result = new CompoundResourceTraversal(); - for (int i = 0; i < inputMappings.length; i++) { - ResourceMapping mapping = inputMappings[i]; + for (ResourceMapping mapping : inputMappings) { result.addTraversals(inputScope.getTraversals(mapping)); } return result.asTraversals(); @@ -362,15 +349,13 @@ public abstract class ModelOperation extends TeamOperation { private boolean isExtension(IModelProviderDescriptor desc1, IModelProviderDescriptor desc2) { String[] ids = desc1.getExtendedModels(); // First check direct extension - for (int i = 0; i < ids.length; i++) { - String id = ids[i]; + for (String id : ids) { if (id.equals(desc2.getId())) { return true; } } // Now check for indirect extension - for (int i = 0; i < ids.length; i++) { - String id = ids[i]; + for (String id : ids) { IModelProviderDescriptor desc3 = ModelProvider.getModelProviderDescriptor(id); if (isExtension(desc3, desc2)) { return true; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipant.java index bf5ad9a3c..ca6d731bb 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipant.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipant.java @@ -473,8 +473,7 @@ public class ModelSynchronizeParticipant extends private void saveMappings(IMemento settings) { ISynchronizationScope inputScope = getContext().getScope().asInputScope(); ModelProvider[] providers = inputScope.getModelProviders(); - for (int i = 0; i < providers.length; i++) { - ModelProvider provider = providers[i]; + for (ModelProvider provider : providers) { ISynchronizationCompareAdapter adapter = Utils.getCompareAdapter(provider); if (adapter != null) { IMemento child = settings.createChild(CTX_PARTICIPANT_MAPPINGS); @@ -511,8 +510,7 @@ public class ModelSynchronizeParticipant extends private ResourceMapping[] loadMappings(IMemento settings) throws PartInitException { List<ResourceMapping> result = new ArrayList<>(); IMemento[] children = settings.getChildren(CTX_PARTICIPANT_MAPPINGS); - for (int i = 0; i < children.length; i++) { - IMemento memento = children[i]; + for (IMemento memento : children) { String id = memento.getString(CTX_MODEL_PROVIDER_ID); if (id != null) { IModelProviderDescriptor desc = ModelProvider.getModelProviderDescriptor(id); @@ -521,8 +519,7 @@ public class ModelSynchronizeParticipant extends ISynchronizationCompareAdapter adapter = Utils.getCompareAdapter(provider); if (adapter != null) { ResourceMapping[] mappings = adapter.restore(memento.getChild(CTX_MODEL_PROVIDER_MAPPINGS)); - for (int j = 0; j < mappings.length; j++) { - ResourceMapping mapping = mappings[j]; + for (ResourceMapping mapping : mappings) { result.add(mapping); } } @@ -657,8 +654,7 @@ public class ModelSynchronizeParticipant extends pages.add(syncViewerPreferencePage); pages.add(new ModelEnablementPreferencePage()); ITeamContentProviderDescriptor[] descriptors = TeamUI.getTeamContentProviderManager().getDescriptors(); - for (int i = 0; i < descriptors.length; i++) { - ITeamContentProviderDescriptor descriptor = descriptors[i]; + for (ITeamContentProviderDescriptor descriptor : descriptors) { if (isIncluded(descriptor)) { try { PreferencePage page = (PreferencePage)descriptor.createPreferencePage(); @@ -678,8 +674,7 @@ public class ModelSynchronizeParticipant extends private boolean isIncluded(ITeamContentProviderDescriptor descriptor) { ModelProvider[] providers = getEnabledModelProviders(); - for (int i = 0; i < providers.length; i++) { - ModelProvider provider = providers[i]; + for (ModelProvider provider : providers) { if (provider.getId().equals(descriptor.getModelProviderId())) { return true; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java index b3222d10e..0c8c023c3 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java @@ -139,8 +139,8 @@ public class ModelSynchronizeParticipantActionGroup extends SynchronizePageActio if (fileGroup != null) { ModelSynchronizeParticipant msp = ((ModelSynchronizeParticipant)getConfiguration().getParticipant()); boolean allElementsHaveCompareInput = true; - for (int i = 0; i < elements.length; i++) { - if (!msp.hasCompareInputFor(elements[i])) { + for (Object element : elements) { + if (!msp.hasCompareInputFor(element)) { allElementsHaveCompareInput = false; break; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageCompareEditorInput.java index c53e2b822..4af94ef2b 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageCompareEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageCompareEditorInput.java @@ -264,8 +264,8 @@ public class ParticipantPageCompareEditorInput extends PageCompareEditorInput { ((LocalResourceTypedElement) right).commit(pm); IDiffElement[] children = node.getChildren(); - for (int i = 0; i < children.length; i++) { - commit(pm, (DiffNode)children[i]); + for (IDiffElement c : children) { + commit(pm, (DiffNode) c); } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java index d563cb125..9ef39e0fb 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java @@ -293,8 +293,8 @@ public class ParticipantPageSaveablePart extends PageSaveablePart implements ICo ((LocalResourceTypedElement) right).commit(pm); IDiffElement[] children = node.getChildren(); - for (int i = 0; i < children.length; i++) { - commit(pm, (DiffNode)children[i]); + for (IDiffElement c : children) { + commit(pm, (DiffNode) c); } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ResourceScope.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ResourceScope.java index 271660e45..bcbd82e6c 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ResourceScope.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ResourceScope.java @@ -88,8 +88,7 @@ public class ResourceScope extends AbstractSynchronizeScope { @Override public void saveState(IMemento memento) { if (resources != null) { - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { IMemento rootNode = memento.createChild(CTX_ROOT); rootNode.putString(CTX_ROOT_PATH, resource.getFullPath().toString()); } @@ -101,8 +100,7 @@ public class ResourceScope extends AbstractSynchronizeScope { IMemento[] rootNodes = memento.getChildren(CTX_ROOT); if(rootNodes != null) { List<IResource> resources = new ArrayList<>(); - for (int i = 0; i < rootNodes.length; i++) { - IMemento rootNode = rootNodes[i]; + for (IMemento rootNode : rootNodes) { IPath path = new Path(rootNode.getString(CTX_ROOT_PATH)); IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(path, true /* include phantoms */); if(resource != null) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java index cf5a8aea3..91a6ca488 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java @@ -378,8 +378,8 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl void propogateInputChange() { if (!inputChangeListeners.isEmpty()) { Object[] allListeners = inputChangeListeners.getListeners(); - for (int i = 0; i < allListeners.length; i++) { - final ICompareInputChangeListener listener = (ICompareInputChangeListener)allListeners[i]; + for (Object l : allListeners) { + final ICompareInputChangeListener listener = (ICompareInputChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void run() throws Exception { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java index bfe0fa805..84e913422 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java @@ -274,21 +274,20 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa */ public static SubscriberParticipant getMatchingParticipant(String ID, IResource[] resources) { ISynchronizeParticipantReference[] refs = TeamUI.getSynchronizeManager().getSynchronizeParticipants(); - for (int i = 0; i < refs.length; i++) { - ISynchronizeParticipantReference reference = refs[i]; + for (ISynchronizeParticipantReference reference : refs) { if(reference.getId().equals(ID)) { - SubscriberParticipant p; - try { - p = (SubscriberParticipant)reference.getParticipant(); - } catch (TeamException e) { - continue; - } - IResource[] roots = p.getResources(); - Arrays.sort(resources, Utils.resourceComparator); - Arrays.sort(roots, Utils.resourceComparator); - if (Arrays.equals(resources, roots)) { - return p; - } + SubscriberParticipant p; + try { + p = (SubscriberParticipant)reference.getParticipant(); + } catch (TeamException e) { + continue; + } + IResource[] roots = p.getResources(); + Arrays.sort(resources, Utils.resourceComparator); + Arrays.sort(roots, Utils.resourceComparator); + if (Arrays.equals(resources, roots)) { + return p; + } } } return null; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberTeamStateProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberTeamStateProvider.java index 422b4e633..23e5562d7 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberTeamStateProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberTeamStateProvider.java @@ -64,11 +64,9 @@ public class SubscriberTeamStateProvider extends TeamStateProvider implements IS if (mapping != null) { ResourceTraversal[] traversals = mapping.getTraversals( ResourceMappingContext.LOCAL_CONTEXT, null); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); - for (int j = 0; j < resources.length; j++) { - IResource resource = resources[j]; + for (IResource resource : resources) { if (getSubscriber().isSupervised(resource)) return true; } @@ -110,8 +108,7 @@ public class SubscriberTeamStateProvider extends TeamStateProvider implements IS return getSubscriber().getState(mapping, stateMask, monitor); } catch (CoreException e) { IProject[] projects = mapping.getProjects(); - for (int i = 0; i < projects.length; i++) { - IProject project = projects[i]; + for (IProject project : projects) { // Only through the exception if the project for the mapping // is accessible if (project.isAccessible()) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelAction.java index 6a8d5be1a..1a7392e8f 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelAction.java @@ -198,8 +198,7 @@ public abstract class SynchronizeModelAction extends BaseSelectionListenerAction protected final IDiffElement[] getFilteredDiffElements() { IDiffElement[] elements = getSelectedDiffElements(); List<IDiffElement> filtered = new ArrayList<>(); - for (int i = 0; i < elements.length; i++) { - IDiffElement e = elements[i]; + for (IDiffElement e : elements) { if (e instanceof SyncInfoModelElement) { SyncInfo info = ((SyncInfoModelElement) e).getSyncInfo(); if (info != null && getSyncInfoFilter().select(info)) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelOperation.java index dc2268d92..379c32f62 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelOperation.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelOperation.java @@ -99,8 +99,7 @@ public abstract class SynchronizeModelOperation extends TeamOperation { } private void markBusy(IDiffElement[] elements, boolean isBusy) { - for (int i = 0; i < elements.length; i++) { - IDiffElement element = elements[i]; + for (IDiffElement element : elements) { if (element instanceof ISynchronizeModelElement) { ((ISynchronizeModelElement)element).setPropertyToRoot(ISynchronizeModelElement.BUSY_PROPERTY, isBusy); } @@ -114,8 +113,7 @@ public abstract class SynchronizeModelOperation extends TeamOperation { */ private SyncInfo[] getSyncInfos() { List<SyncInfo> filtered = new ArrayList<>(); - for (int i = 0; i < elements.length; i++) { - IDiffElement e = elements[i]; + for (IDiffElement e : elements) { if (e instanceof SyncInfoModelElement) { filtered.add(((SyncInfoModelElement)e).getSyncInfo()); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizePageActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizePageActionGroup.java index 2f54bc694..de5f8c35e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizePageActionGroup.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizePageActionGroup.java @@ -337,8 +337,7 @@ public abstract class SynchronizePageActionGroup extends ActionGroup { private void fillMenu(IContributionManager menu, String menuId) { Map<String, List<Object>> groups = menuContributions.get(menuId); if (menu != null && groups != null) { - for (Iterator<String> iter = groups.keySet().iterator(); iter.hasNext(); ) { - String groupId = iter.next(); + for (String groupId : groups.keySet()) { List actions = groups.get(groupId); if (actions != null) { for (Iterator iter2 = actions.iterator(); iter2.hasNext();) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateChangeEvent.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateChangeEvent.java index 825af61ca..c420186cf 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateChangeEvent.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateChangeEvent.java @@ -42,8 +42,7 @@ public class TeamStateChangeEvent implements ITeamStateChangeEvent { * @param deltas the set of subscriber changes */ public TeamStateChangeEvent(ISubscriberChangeEvent[] deltas) { - for (int i = 0; i < deltas.length; i++) { - ISubscriberChangeEvent event = deltas[i]; + for (ISubscriberChangeEvent event : deltas) { IResource resource = event.getResource(); if ((event.getFlags() & ISubscriberChangeEvent.ROOT_ADDED) != 0) rootAdded(resource); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateDescription.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateDescription.java index ef6d6ef42..0442a9ee5 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateDescription.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateDescription.java @@ -80,8 +80,7 @@ public class TeamStateDescription implements ITeamStateDescription { if (dsd.getStateFlags() == state) { if (haveSameProperties(this, dsd)) { String[] properties = getPropertyNames(); - for (int i = 0; i < properties.length; i++) { - String property = properties[i]; + for (String property : properties) { Object o1 = this.getProperty(property); Object o2 = dsd.getProperty(property); if (!o1.equals(o2)) { @@ -102,11 +101,9 @@ public class TeamStateDescription implements ITeamStateDescription { if (p1.length != p2.length) { return false; } - for (int i = 0; i < p1.length; i++) { - String s1 = p1[i]; + for (String s1 : p1) { boolean found = false; - for (int j = 0; j < p2.length; j++) { - String s2 = p2[j]; + for (String s2 : p2) { if (s1.equals(s2)) { found = true; break; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateProvider.java index ff13a7ab3..0c7df767b 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateProvider.java @@ -101,8 +101,8 @@ public abstract class TeamStateProvider implements ITeamStateProvider { */ protected final void fireStateChangeEvent(final ITeamStateChangeEvent event) { Object[] allListeners = listeners.getListeners(); - for (int i = 0; i < allListeners.length; i++) { - final ITeamStateChangeListener listener = (ITeamStateChangeListener)allListeners[i]; + for (Object l : allListeners) { + final ITeamStateChangeListener listener = (ITeamStateChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void run() throws Exception { @@ -119,8 +119,7 @@ public abstract class TeamStateProvider implements ITeamStateProvider { private int internalGetDecoratedStateMask(IProject[] projects) { int stateMask = 0; String[] providerIds = getProviderIds(projects); - for (int i = 0; i < providerIds.length; i++) { - String providerId = providerIds[i]; + for (String providerId : providerIds) { stateMask |= internalGetDecoratedStateMask(providerId); } return stateMask; @@ -136,8 +135,7 @@ public abstract class TeamStateProvider implements ITeamStateProvider { private String[] getProviderIds(IProject[] projects) { Set<String> providerIds = new HashSet<>(); - for (int i = 0; i < projects.length; i++) { - IProject project = projects[i]; + for (IProject project : projects) { String id = getProviderId(project); if (id != null) providerIds.add(id); @@ -154,8 +152,7 @@ public abstract class TeamStateProvider implements ITeamStateProvider { private boolean internalIsDecorationEnabled(IProject[] projects) { String[] providerIds = getProviderIds(projects); - for (int i = 0; i < providerIds.length; i++) { - String providerId = providerIds[i]; + for (String providerId : providerIds) { if (internalIsDecorationEnabled(providerId)) { return true; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkingSetScope.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkingSetScope.java index 016d557bf..a5746673e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkingSetScope.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkingSetScope.java @@ -98,17 +98,15 @@ public class WorkingSetScope extends AbstractSynchronizeScope implements IProper return null; } HashSet<IResource> roots = new HashSet<>(); - for (int i = 0; i < sets.length; i++) { - IWorkingSet set = sets[i]; + for (IWorkingSet set : sets) { IResource[] resources = Utils.getResources(set.getElements()); addNonOverlapping(roots, resources); - } + } return roots.toArray(new IResource[roots.size()]); } private void addNonOverlapping(HashSet<IResource> roots, IResource[] resources) { - for (int i = 0; i < resources.length; i++) { - IResource newResource = resources[i]; + for (IResource newResource : resources) { boolean add = true; for (Iterator iter = roots.iterator(); iter.hasNext();) { IResource existingResource = (IResource) iter.next(); @@ -137,8 +135,7 @@ public class WorkingSetScope extends AbstractSynchronizeScope implements IProper public void propertyChange(PropertyChangeEvent event) { if (event.getProperty() == IWorkingSetManager.CHANGE_WORKING_SET_CONTENT_CHANGE) { IWorkingSet newSet = (IWorkingSet) event.getNewValue(); - for (int i = 0; i < sets.length; i++) { - IWorkingSet set = sets[i]; + for (IWorkingSet set : sets) { if (newSet == set) { fireRootsChanges(); return; @@ -159,8 +156,7 @@ public class WorkingSetScope extends AbstractSynchronizeScope implements IProper @Override public void saveState(IMemento memento) { super.saveState(memento); - for (int i = 0; i < sets.length; i++) { - IWorkingSet set = sets[i]; + for (IWorkingSet set : sets) { IMemento rootNode = memento.createChild(CTX_SETS); rootNode.putString(CTX_SET_NAME, set.getName()); } @@ -172,8 +168,7 @@ public class WorkingSetScope extends AbstractSynchronizeScope implements IProper IMemento[] rootNodes = memento.getChildren(CTX_SETS); if (rootNodes != null) { List<IWorkingSet> sets = new ArrayList<>(); - for (int i = 0; i < rootNodes.length; i++) { - IMemento rootNode = rootNodes[i]; + for (IMemento rootNode : rootNodes) { String setName = rootNode.getString(CTX_SET_NAME); IWorkingSet set = PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSet(setName); if (set != null) { diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsComposite.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsComposite.java index 6c96c865a..2e5781e36 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsComposite.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsComposite.java @@ -151,9 +151,8 @@ public class NonProxyHostsComposite extends Composite { protected void addHost() { String hosts[] = promptForHost(null); if (hosts != null) { - for (int i = 0; i < hosts.length; i++) { - bypassHosts.add(0, new ProxyBypassData(hosts[i], - getEditableProvider())); + for (String host : hosts) { + bypassHosts.add(0, new ProxyBypassData(host, getEditableProvider())); } hostsViewer.refresh(); setProvider(currentProvider); @@ -162,9 +161,9 @@ public class NonProxyHostsComposite extends Composite { private String getEditableProvider() { String providers[] = ProxySelector.getProviders(); - for (int i = 0; i < providers.length; i++) { - if (ProxySelector.canSetBypassHosts(providers[i])) { - return providers[i]; + for (String provider : providers) { + if (ProxySelector.canSetBypassHosts(provider)) { + return provider; } } return null; @@ -242,9 +241,9 @@ public class NonProxyHostsComposite extends Composite { String value = dialog.getValue(); String hosts[] = StringUtil.split(value, new String[] { ";", "|" }); //$NON-NLS-1$ //$NON-NLS-2$ ArrayList<String> filtered = new ArrayList<>(); - for (int i = 0; i < hosts.length; i++) { - if (hosts[i].length() != 0) { - filtered.add(hosts[i]); + for (String host : hosts) { + if (host.length() != 0) { + filtered.add(host); } } return filtered.toArray(new String[0]); @@ -261,8 +260,8 @@ public class NonProxyHostsComposite extends Composite { public void initializeValues() { String providers[] = ProxySelector.getProviders(); - for (int i = 0; i < providers.length; i++) { - bypassHosts.addAll(getProxyBypassData(providers[i])); + for (String provider : providers) { + bypassHosts.addAll(getProxyBypassData(provider)); } hostsViewer.setInput(bypassHosts); setProvider(ProxySelector.getDefaultProvider()); @@ -312,9 +311,9 @@ public class NonProxyHostsComposite extends Composite { } bypassHosts.removeAll(natives); String providers[] = ProxySelector.getProviders(); - for (int i = 0; i < providers.length; i++) { - if (!providers[i].equals(provider)) { - bypassHosts.addAll(getProxyBypassData(providers[i])); + for (String p : providers) { + if (!p.equals(provider)) { + bypassHosts.addAll(getProxyBypassData(p)); } } hostsViewer.refresh(); diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsLabelProvider.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsLabelProvider.java index db5824e1c..813a0d54a 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsLabelProvider.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsLabelProvider.java @@ -62,10 +62,10 @@ public class NonProxyHostsLabelProvider extends BaseLabelProvider implements "", //$NON-NLS-1$ NetUIMessages.ProxyPreferencePage_13, NetUIMessages.ProxyPreferencePage_14 }; - for (int i = 0; i < titles.length; i++) { + for (String title : titles) { TableColumn column = new TableViewerColumn(viewer, SWT.NONE) .getColumn(); - column.setText(titles[i]); + column.setText(title); column.setResizable(true); } } diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntriesComposite.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntriesComposite.java index 95d332775..c8f6df3c7 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntriesComposite.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntriesComposite.java @@ -165,9 +165,9 @@ public class ProxyEntriesComposite extends Composite { private String getEditableProvider() { String providers[] = ProxySelector.getProviders(); - for (int i = 0; i < providers.length; i++) { - if (ProxySelector.canSetProxyData(providers[i])) { - return providers[i]; + for (String provider : providers) { + if (ProxySelector.canSetProxyData(provider)) { + return provider; } } return null; @@ -236,8 +236,8 @@ public class ProxyEntriesComposite extends Composite { public void initializeValues() { String providers[] = ProxySelector.getProviders(); - for (int i = 0; i < providers.length; i++) { - proxyEntries.addAll(getProxyData(providers[i])); + for (String provider : providers) { + proxyEntries.addAll(getProxyData(provider)); } entriesViewer.setInput(proxyEntries); setProvider(ProxySelector.getDefaultProvider()); @@ -286,9 +286,9 @@ public class ProxyEntriesComposite extends Composite { } proxyEntries.removeAll(natives); String[] providers = ProxySelector.getProviders(); - for (int i = 0; i < providers.length; i++) { - if (!providers[i].equals(provider)) { - proxyEntries.addAll(getProxyData(providers[i])); + for (String p : providers) { + if (!p.equals(provider)) { + proxyEntries.addAll(getProxyData(p)); } } entriesViewer.refresh(); @@ -298,9 +298,9 @@ public class ProxyEntriesComposite extends Composite { private List<ProxyData> getProxyData(String provider) { List<ProxyData> proxyDatas = new ArrayList<>(); ProxyData[] entries = ProxySelector.getProxyData(provider); - for (int j = 0; j < entries.length; j++) { - entries[j].setSource(provider); - proxyDatas.add(entries[j]); + for (ProxyData entry : entries) { + entry.setSource(provider); + proxyDatas.add(entry); } return proxyDatas; } diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntriesLabelProvider.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntriesLabelProvider.java index 8709c51be..3c431e279 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntriesLabelProvider.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntriesLabelProvider.java @@ -91,10 +91,10 @@ public class ProxyEntriesLabelProvider extends BaseLabelProvider implements NetUIMessages.ProxyPreferencePage_6, NetUIMessages.ProxyPreferencePage_7, NetUIMessages.ProxyPreferencePage_8 }; - for (int i = 0; i < titles.length; i++) { + for (String title : titles) { TableColumn column = new TableViewerColumn(viewer, SWT.NONE) .getColumn(); - column.setText(titles[i]); + column.setText(title); column.setResizable(true); } } diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntryDialog.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntryDialog.java index 2537b6232..b897488cd 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntryDialog.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntryDialog.java @@ -219,8 +219,8 @@ public class ProxyEntryDialog extends StatusDialog { protected void updateStatus() { String type = typeText.getText(); - for (int i = 0; i < addedTypes.length; i++) { - if (addedTypes[i].equalsIgnoreCase(type)) { + for (String addedType : addedTypes) { + if (addedType.equalsIgnoreCase(type)) { updateStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.OK, NetUIMessages.ProxyEntryDialog_9, null)); return; diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/AbstractMatching.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/AbstractMatching.java index 032330665..41e19227c 100644 --- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/AbstractMatching.java +++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/AbstractMatching.java @@ -43,8 +43,9 @@ public abstract class AbstractMatching { leaves.add(root); } else { Object[] children = root.getChildren(); - for (int i=0; i<children.length; i++) - findLeaves((XMLNode) children[i], leaves); + for (Object child : children) { + findLeaves((XMLNode) child, leaves); + } } } @@ -60,8 +61,9 @@ public abstract class AbstractMatching { numbering.add(root); Object[] children = root.getChildren(); if (children != null) { - for (int i=0; i<children.length; i++) - numberNodes((XMLNode) children[i], numbering); + for (Object child : children) { + numberNodes((XMLNode) child, numbering); + } } } } @@ -72,8 +74,9 @@ public abstract class AbstractMatching { int count = 1; if (isLeaf(root)) return count; Object[] children = root.getChildren(); - for (int i=0; i<children.length; i++) - count+=countNodes((XMLNode) children[i]); + for (Object child : children) { + count += countNodes((XMLNode) child); + } return count; } @@ -182,8 +185,7 @@ public abstract class AbstractMatching { int cur_pos_left= 0; int cur_pos_right= 0; - for (int i= 0; i < differences.length; i++) { - RangeDifference rd= differences[i]; + for (RangeDifference rd : differences) { int equal_length= rd.leftStart(); //handle elements before current range which are unchanged while (cur_pos_left < equal_length) { @@ -197,7 +199,7 @@ public abstract class AbstractMatching { cur_pos_left++; cur_pos_right++; } - //now handle RangeDifference rd[i] + //now handle RangeDifference rd int smaller_length, greater_length; boolean leftGreater= rd.leftLength() > rd.rightLength(); if (leftGreater) { @@ -207,7 +209,6 @@ public abstract class AbstractMatching { smaller_length= rd.leftLength(); greater_length= rd.rightLength(); } - //handle elements elements in range for (int j=0; j < smaller_length; j++) { distance += dist((XMLNode) xc_elements[cur_pos_left], (XMLNode) yc_elements[cur_pos_right]); @@ -225,7 +226,7 @@ public abstract class AbstractMatching { } else { for (int j=smaller_length; j < greater_length; j++) { distance += countNodes((XMLNode) yc_elements[cur_pos_right]); - DTMatching.add(new Match( null, (XMLNode)yc_elements[cur_pos_right])); + DTMatching.add(new Match( null, (XMLNode)yc_elements[cur_pos_right])); cur_pos_right++; } } diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ChooseMatcherDropDownAction.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ChooseMatcherDropDownAction.java index d297f9265..3441593c0 100644 --- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ChooseMatcherDropDownAction.java +++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ChooseMatcherDropDownAction.java @@ -65,8 +65,8 @@ class ChooseMatcherDropDownAction extends Action implements IMenuCreator { } Object[] internalIdMapsA= internalIdMapsAL.toArray(); Arrays.sort(internalIdMapsA); - for (int i= 0; i < internalIdMapsA.length; i++) { - addActionToMenu(menu, new SelectMatcherAction((String)internalIdMapsA[i], fViewer)); + for (Object internalIdA : internalIdMapsA) { + addActionToMenu(menu, new SelectMatcherAction((String) internalIdA, fViewer)); } new MenuItem(menu, SWT.SEPARATOR); @@ -87,8 +87,8 @@ class ChooseMatcherDropDownAction extends Action implements IMenuCreator { Object[] userIdMapsA= userIdMapsAL.toArray(); Arrays.sort(userIdMapsA); - for (int i= 0; i < userIdMapsA.length; i++) { - addActionToMenu(menu, new SelectMatcherAction((String)userIdMapsA[i], fViewer)); + for (Object userIdA : userIdMapsA) { + addActionToMenu(menu, new SelectMatcherAction((String) userIdA, fViewer)); } return menu; diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/OrderedMatching.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/OrderedMatching.java index cb2ff4029..6f4086f3d 100644 --- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/OrderedMatching.java +++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/OrderedMatching.java @@ -38,23 +38,22 @@ public class OrderedMatching extends AbstractMatching { ArrayList<XMLNode> yc_attrsAL= new ArrayList<>(); //find attributes and elements and put them in xc_elementsAL and xc_attrsAL, respectively - for (int i= 0; i < xc.length; i++) { - XMLNode x_i= (XMLNode) xc[i]; + for (Object xc1 : xc) { + XMLNode x_i = (XMLNode) xc1; if (x_i.getXMLType().equals(XMLStructureCreator.TYPE_ELEMENT)) { xc_elementsAL.add(x_i); } else if ( - x_i.getXMLType().equals(XMLStructureCreator.TYPE_ATTRIBUTE)) { + x_i.getXMLType().equals(XMLStructureCreator.TYPE_ATTRIBUTE)) { xc_attrsAL.add(x_i); } } - - //do the same for yc - for (int i= 0; i < yc.length; i++) { - XMLNode y_i= (XMLNode) yc[i]; + //do the same for yc + for (Object yc1 : yc) { + XMLNode y_i = (XMLNode) yc1; if (y_i.getXMLType().equals(XMLStructureCreator.TYPE_ELEMENT)) { yc_elementsAL.add(y_i); } else if ( - y_i.getXMLType().equals(XMLStructureCreator.TYPE_ATTRIBUTE)) { + y_i.getXMLType().equals(XMLStructureCreator.TYPE_ATTRIBUTE)) { yc_attrsAL.add(y_i); } } @@ -188,12 +187,9 @@ public class OrderedMatching extends AbstractMatching { ArrayList<XMLNode> yc_attrs, ArrayList<Match> DTMatching) { int distance= 0; - x_for : for ( - Iterator<XMLNode> iter_xc= xc_attrs.iterator(); iter_xc.hasNext();) { - XMLNode x_attr= iter_xc.next(); + x_for : for (XMLNode x_attr : xc_attrs) { String x_attr_name= x_attr.getName(); - for (Iterator<XMLNode> iter_yc= yc_attrs.iterator(); iter_yc.hasNext();) { - XMLNode y_attr= iter_yc.next(); + for (XMLNode y_attr : yc_attrs) { if (y_attr.getName().equals(x_attr_name)) { if (!y_attr.getValue().equals(x_attr.getValue())) distance += 1; diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLComparePreferencePage.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLComparePreferencePage.java index 33d63ae39..f4eb8115d 100644 --- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLComparePreferencePage.java +++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLComparePreferencePage.java @@ -441,13 +441,13 @@ public class XMLComparePreferencePage extends PreferencePage implements IWorkben fOrderedElements.remove( IdMapName ); //All the corresponding ID Mappings must be removed as well TableItem[] itemsMappings = fMappingsTable.getItems(); - for (int i=0; i<itemsMappings.length; i++) { - itemsMappings[i].dispose(); + for (TableItem itemsMapping : itemsMappings) { + itemsMapping.dispose(); } //All the corresponding Ordered entries must be removed as well TableItem[] itemsOrdered= fOrderedTable.getItems(); - for (int i= 0; i < itemsOrdered.length; i++) { - itemsOrdered[i].dispose(); + for (TableItem itemsOrd : itemsOrdered) { + itemsOrd.dispose(); } //Remove extension if (!itemsIdMap[0].getText(2).equals("")) { //$NON-NLS-1$ diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java index d18c76dc9..84de2798f 100644 --- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java +++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java @@ -291,8 +291,7 @@ public final class XMLPlugin extends AbstractUIPlugin { IConfigurationElement[] idmaps= registry.getConfigurationElementsFor(PLUGIN_ID, ID_MAPPING_EXTENSION_POINT); fIdMapsInternal = new HashMap(); fOrderedElementsInternal= new HashMap(); - for (int i_idmap= 0; i_idmap < idmaps.length; i_idmap++) { - final IConfigurationElement idmap= idmaps[i_idmap]; + for (IConfigurationElement idmap : idmaps) { //handle IDMAP_NAME_ATTRIBUTE String idmap_name= idmap.getAttribute(IDMAP_NAME_ATTRIBUTE); //ignores idmap if its name equals the reserved name for unordered matching or the the name for ordered matching @@ -301,8 +300,7 @@ public final class XMLPlugin extends AbstractUIPlugin { HashMap idmapHM = new HashMap(); fIdMapsInternal.put(idmap_name, idmapHM); IConfigurationElement[] mappings = idmap.getChildren(MAPPING_ELEMENT_NAME); - for (int i_mapping= 0; i_mapping < mappings.length; i_mapping++) { - IConfigurationElement mapping = mappings[i_mapping]; + for (IConfigurationElement mapping : mappings) { //add SIGN_SEPARATOR at the end because not contained in signatures of plugin.xml //also add prefix at beginning String signature= mapping.getAttribute(MAPPING_SIGNATURE_ATTRIBUTE); @@ -321,8 +319,7 @@ public final class XMLPlugin extends AbstractUIPlugin { IConfigurationElement[] orderedEntries= idmap.getChildren(ORDERED_ELEMENT_NAME); if (orderedEntries.length > 0) { ArrayList orderedAL= new ArrayList(); - for (int i_ordered= 0; i_ordered < orderedEntries.length; i_ordered++) { - IConfigurationElement ordered= orderedEntries[i_ordered]; + for (IConfigurationElement ordered : orderedEntries) { //add SIGN_SEPARATOR at the end because not contained in signatures of plugin.xml //also add prefix at beginning String signature= ordered.getAttribute(ORDERED_SIGNATURE_ATTRIBUTE); @@ -383,8 +380,8 @@ public final class XMLPlugin extends AbstractUIPlugin { shell= shell.getParent(); } Shell shells[]= display.getShells(); - for (int i= 0; i < shells.length; i++) { - Object data= shells[i].getData(); + for (Shell s : shells) { + Object data = s.getData(); if (data instanceof IWorkbenchWindow) { windowRef.window= (IWorkbenchWindow)data; return; diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ui/StatusUtil.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ui/StatusUtil.java index 38dfc0aa9..39cfdc0cc 100644 --- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ui/StatusUtil.java +++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ui/StatusUtil.java @@ -40,8 +40,7 @@ public class StatusUtil { */ public static IStatus getMostSevere(IStatus[] status) { IStatus max= null; - for (int i= 0; i < status.length; i++) { - IStatus curr= status[i]; + for (IStatus curr : status) { if (curr.matches(IStatus.ERROR)) { return curr; } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ConfigurationWizard.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ConfigurationWizard.java index bb0639185..73826aa8b 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ConfigurationWizard.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ConfigurationWizard.java @@ -80,8 +80,7 @@ public class ConfigurationWizard extends Wizard implements IConfigurationWizard, FileSystemProvider provider = (FileSystemProvider) RepositoryProvider.getProvider(projects[0]); provider.setTargetLocation(mainPage.getLocation()); } else { - for (int i = 0; i < projects.length; i++) { - IProject project = projects[i]; + for (IProject project : projects) { RepositoryProvider.map(project, FileSystemPlugin.PROVIDER_ID); FileSystemProvider provider = (FileSystemProvider) RepositoryProvider.getProvider(project); String path = new Path(mainPage.getLocation()).append(project.getName()).toOSString(); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/OpenFileSystemRevisionAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/OpenFileSystemRevisionAction.java index 965c67188..b76fd02a8 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/OpenFileSystemRevisionAction.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/OpenFileSystemRevisionAction.java @@ -52,9 +52,7 @@ public class OpenFileSystemRevisionAction extends BaseSelectionListenerAction { Object[] objArray = structSel.toArray(); - for (int i = 0; i < objArray.length; i++) { - Object tempRevision = objArray[i]; - + for (Object tempRevision : objArray) { final IFileRevision revision = (IFileRevision) tempRevision; if (revision == null || !revision.exists()) { MessageDialog.openError(page.getSite().getShell(), "Deleted Revision", "Can't open a deleted revision"); @@ -88,7 +86,6 @@ public class OpenFileSystemRevisionAction extends BaseSelectionListenerAction { // ignore } } - } } @@ -133,8 +130,8 @@ public class OpenFileSystemRevisionAction extends BaseSelectionListenerAction { if (objArray.length == 0) return false; - for (int i = 0; i < objArray.length; i++) { - IFileRevision revision = (IFileRevision) objArray[i]; + for (Object obj : objArray) { + IFileRevision revision = (IFileRevision) obj; //check to see if any of the selected revisions are deleted revisions if (revision != null && !revision.exists()) return false; @@ -145,8 +142,8 @@ public class OpenFileSystemRevisionAction extends BaseSelectionListenerAction { boolean editorAlreadyOpenOnContents(FileSystemRevisionEditorInput input) { IEditorReference[] editorRefs = page.getSite().getPage().getEditorReferences(); - for (int i = 0; i < editorRefs.length; i++) { - IEditorPart part = editorRefs[i].getEditor(false); + for (IEditorReference editorRef : editorRefs) { + IEditorPart part = editorRef.getEditor(false); if (part != null && part.getEditorInput() instanceof FileSystemRevisionEditorInput) { IFileRevision inputRevision = input.getAdapter(IFileRevision.class); IFileRevision editorRevision = part.getEditorInput().getAdapter(IFileRevision.class); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/RevertAllOperation.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/RevertAllOperation.java index c1551e571..17a163aac 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/RevertAllOperation.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/RevertAllOperation.java @@ -40,8 +40,7 @@ public class RevertAllOperation extends SynchronizeModelOperation { public void execute(IProgressMonitor pm) throws InvocationTargetException { try { pm.beginTask("Reverting from local history", 100 * infos.length); //$NON-NLS-1$ - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { LocalHistoryVariant state = (LocalHistoryVariant)info.getRemote(); IFile file = (IFile)info.getLocal(); if(file.exists()) { diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/PessimisticDecorator.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/PessimisticDecorator.java index a5a66078c..463fe03bd 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/PessimisticDecorator.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/PessimisticDecorator.java @@ -89,8 +89,8 @@ public class PessimisticDecorator extends LabelProvider implements ILabelDecorat private void postLabelEvents(final LabelProviderChangedEvent[] events) { if (events != null && events.length > 0) { Display.getDefault().asyncExec(() -> { - for (int i= 0; i < events.length; i++) { - fireLabelProviderChanged(events[i]); + for (LabelProviderChangedEvent event : events) { + fireLabelProviderChanged(event); } }); } diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/DocLineComparatorTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/DocLineComparatorTest.java index 8afde80d0..50123fb89 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/DocLineComparatorTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/DocLineComparatorTest.java @@ -261,13 +261,12 @@ public class DocLineComparatorTest extends TestCase { IRangeComparator l, r; for (int i=0;i<docs.length;i++) for (int j=i+1;j<docs.length;j++) - for (int k=0;k<filters.length;k++) { - l = new DocLineComparator(docs[i], null, false, filters[k], 'L'); - r = new DocLineComparator(docs[j], null, false, filters[k], 'R'); + for (ICompareFilter[] filter : filters) { + l = new DocLineComparator(docs[i], null, false, filter, 'L'); + r = new DocLineComparator(docs[j], null, false, filter, 'R'); Assert.assertFalse(l.rangesEqual(0, r, 0)); - - l = new DocLineComparator(docs[i], null, true, filters[k], 'L'); - r = new DocLineComparator(docs[j], null, true, filters[k], 'R'); + l = new DocLineComparator(docs[i], null, true, filter, 'L'); + r = new DocLineComparator(docs[j], null, true, filter, 'R'); Assert.assertTrue(l.rangesEqual(0, r, 0)); } } diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchLinesTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchLinesTest.java index 3dea82a77..2f08d7731 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchLinesTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchLinesTest.java @@ -113,11 +113,9 @@ public class PatchLinesTest extends TestCase { int fileDiffSum = 0; FilePatch2[] diffs = patcher.getDiffs(); - for (int i = 0; i < diffs.length; i++) { - FilePatch2 fileDiff = diffs[i]; + for (FilePatch2 fileDiff : diffs) { IHunk[] hunks = fileDiff.getHunks(); - for (int j = 0; j < hunks.length; j++) { - IHunk hunk = hunks[j]; + for (IHunk hunk : hunks) { hunksLengthSum += getNewLength(hunk); hunksLengthSum -= getOldLength(hunk); } diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/StructureCreatorTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/StructureCreatorTest.java index 3f0a4de80..09b049059 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/StructureCreatorTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/StructureCreatorTest.java @@ -168,17 +168,14 @@ public class StructureCreatorTest extends TestCase { DocumentRangeNode l, r; for (int i = 0; i < docs.length; i++) for (int j = i + 1; j < docs.length; j++) - for (int k = 0; k < filters.length; k++) { - + for (ICompareFilter[] filter : filters) { l = new DocumentRangeNode(1, "ID", docs[i], 0, docs[i].getLength()); r = new DocumentRangeNode(1, "ID", docs[j], 0, docs[j].getLength()); - creator.contentsEquals(l, 'L', r, 'R', true, filters[k]); - Assert.assertFalse(creator.contentsEquals(l, 'L', r, 'R', - false, filters[k])); - Assert.assertTrue(creator.contentsEquals(l, 'L', r, 'R', - true, filters[k])); - } + creator.contentsEquals(l, 'L', r, 'R', true, filter); + Assert.assertFalse(creator.contentsEquals(l, 'L', r, 'R', false, filter)); + Assert.assertTrue(creator.contentsEquals(l, 'L', r, 'R', true, filter)); + } } }
\ No newline at end of file diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java index 0452e6085..8b5f16e11 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java @@ -99,9 +99,10 @@ public class WorkspaceTest extends ResourceTest { resources.addAll(Arrays.asList(buildResources(container, hierarchy))); IResource[] result = resources.toArray(new IResource[resources.size()]); ensureExistsInWorkspace(result, true); - for (int i = 0; i < result.length; i++) { - if (result[i].getType() == IResource.FILE) // 3786 bytes is the average size of Eclipse Java files! - ((IFile) result[i]).setContents(getRandomContents(100), true, false, null); + for (IResource r : result) { + if (r.getType() == IResource.FILE) { + ((IFile) r).setContents(getRandomContents(100), true, false, null); + } } return result; } diff --git a/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/NetTest.java b/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/NetTest.java index 54d39cc7c..734b4ab4c 100644 --- a/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/NetTest.java +++ b/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/NetTest.java @@ -54,8 +54,7 @@ public class NetTest { setProxiesEnabled(isProxiesDefault); setSystemProxiesEnabled(isSystemProxiesDefault); IProxyData[] data = getProxyManager().getProxyData(); - for (int i = 0; i < data.length; i++) { - IProxyData proxyData = data[i]; + for (IProxyData proxyData : data) { proxyData.disable(); } getProxyManager().setProxyData(data); @@ -227,8 +226,7 @@ public class NetTest { private void performSettingData() throws CoreException { IProxyData[] data = (IProxyData[]) dataCache.values().toArray(new IProxyData[dataCache.size()]); this.getProxyManager().setProxyData(data); - for (int i = 0; i < data.length; i++) { - IProxyData proxyData = data[i]; + for (IProxyData proxyData : data) { assertProxyDataEqual(proxyData); } isSetEnabled = true; @@ -241,8 +239,7 @@ public class NetTest { setDataTest(IProxyData.HTTPS_PROXY_TYPE); setDataTest(IProxyData.SOCKS_PROXY_TYPE); IProxyData[] data = this.getProxyManager().getProxyData(); - for (int i = 0; i < data.length; i++) { - IProxyData proxyData = data[i]; + for (IProxyData proxyData : data) { disableProxy(proxyData); } } @@ -257,8 +254,7 @@ public class NetTest { delaySettingData(); IProxyData[] data = this.getProxyManager().getProxyData(); - for (int i = 0; i < data.length; i++) { - IProxyData proxyData = data[i]; + for (IProxyData proxyData : data) { disableProxy(proxyData); } performSettingData(); diff --git a/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/SystemProxyTest.java b/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/SystemProxyTest.java index fdf46745f..918fee7b0 100644 --- a/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/SystemProxyTest.java +++ b/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/SystemProxyTest.java @@ -59,8 +59,7 @@ public class SystemProxyTest extends TestCase { setProxiesEnabled(isProxiesDefault); setSystemProxiesEnabled(isSystemProxiesDefault); IProxyData[] data = getProxyManager().getProxyData(); - for (int i = 0; i < data.length; i++) { - IProxyData proxyData = data[i]; + for (IProxyData proxyData : data) { proxyData.disable(); } getProxyManager().setProxyData(data); @@ -118,10 +117,9 @@ public class SystemProxyTest extends TestCase { assertNotNull(proxiesData); Map<String, String> typeMap = new HashMap<>(); - for (int i = 0; i < proxiesData.length; i++) { - assertProxyDataEqual(proxiesData[i], (IProxyData) proxyDataMap - .get(proxiesData[i].getType())); - typeMap.put(proxiesData[i].getType(), proxiesData[i].getType()); + for (IProxyData p : proxiesData) { + assertProxyDataEqual(p, (IProxyData) proxyDataMap.get(p.getType())); + typeMap.put(p.getType(), p.getType()); } assertEquals(3, typeMap.size()); @@ -132,10 +130,9 @@ public class SystemProxyTest extends TestCase { assertNotNull(proxiesData); Map<String, String> typeMap = new HashMap<>(); - for (int i = 0; i < proxiesData.length; i++) { - assertProxyDataEqual(proxiesData[i], (IProxyData) proxyDataMap - .get(proxiesData[i].getType())); - typeMap.put(proxiesData[i].getType(), proxiesData[i].getType()); + for (IProxyData p : proxiesData) { + assertProxyDataEqual(p, (IProxyData) proxyDataMap.get(p.getType())); + typeMap.put(p.getType(), p.getType()); } assertEquals(3, typeMap.size()); diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeBuildingTests.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeBuildingTests.java index 3791b47dc..6f4b6fd6e 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeBuildingTests.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeBuildingTests.java @@ -40,8 +40,7 @@ public class ScopeBuildingTests extends TeamTest { IProgressMonitor monitor) throws CoreException { super.initialize(monitor); // Add the additional test mappings to the scope - for (int i = 0; i < additionalMappings.length; i++) { - ResourceMapping mapping = additionalMappings[i]; + for (ResourceMapping mapping : additionalMappings) { ResourceTraversal[] traversals = mapping.getTraversals(getContext(), monitor); ((ResourceMappingScope)getScope()).addMapping(mapping, traversals); // TODO: The additional mappings and additional resources boolean will not be set diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeTests.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeTests.java index c5ec12e43..7db0fd74a 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeTests.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeTests.java @@ -85,8 +85,7 @@ public class ScopeTests extends TeamTest { private boolean isInWorkingSet(IProject project) { IAdaptable[] elements = workingSet.getElements(); - for (int i = 0; i < elements.length; i++) { - IAdaptable adaptable = elements[i]; + for (IAdaptable adaptable : elements) { if (adaptable.equals(project)) return true; } diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/synchronize/ResourceContentTests.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/synchronize/ResourceContentTests.java index 743c95943..f4d01f0b6 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/synchronize/ResourceContentTests.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/synchronize/ResourceContentTests.java @@ -101,8 +101,7 @@ public class ResourceContentTests extends TeamTest { private void assertContentsMatch(IResource[] resources) { Set paths = getPaths(ResourcesPlugin.getWorkspace().getRoot()); Set<Object> resourceSet = new HashSet<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { resourceSet.add(resource); } for (Iterator iterator = paths.iterator(); iterator.hasNext();) { @@ -124,8 +123,7 @@ public class ResourceContentTests extends TeamTest { private Set getPaths(Object root) { Set<Object> result = new HashSet<>(); Object[] elements = provider.getElements(root); - for (int i = 0; i < elements.length; i++) { - Object object = elements[i]; + for (Object object : elements) { TreePath path = new TreePath(new Object[] { object }); Set childPaths = getPaths(provider, path); result.addAll(childPaths); @@ -138,8 +136,7 @@ public class ResourceContentTests extends TeamTest { Set<TreePath> result = new HashSet<>(); if (children.length == 0) result.add(path); - for (int i = 0; i < children.length; i++) { - Object object = children[i]; + for (Object object : children) { TreePath childPath = path.createChildPath(object); Set childPaths = getPaths(provider, childPath); result.addAll(childPaths); @@ -172,8 +169,7 @@ public class ResourceContentTests extends TeamTest { private IResource[] asResources(IProject project, String[] resourcePaths) { List<IResource> resources = new ArrayList<>(); - for (int i = 0; i < resourcePaths.length; i++) { - String path = resourcePaths[i]; + for (String path : resourcePaths) { if (path.endsWith("/")) { resources.add(project.getFolder(path)); } else { diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CommandLineCVSClient.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CommandLineCVSClient.java index 89eddde14..3de1dac8b 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CommandLineCVSClient.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CommandLineCVSClient.java @@ -73,8 +73,7 @@ public class CommandLineCVSClient implements ICVSClient { } private static void appendStrings(StringBuffer commandLine, String[] strings) { - for (int i = 0; i < strings.length; i++) { - String string = strings[i]; + for (String string : strings) { if (string != null && string.length() != 0) { commandLine.append(" \""); commandLine.append(string); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseCVSClient.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseCVSClient.java index 60bd15983..576be08e4 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseCVSClient.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseCVSClient.java @@ -76,8 +76,8 @@ public class EclipseCVSClient implements ICVSClient { // get global options List<CustomGlobalOption> globals = new ArrayList<>(); - for (int i = 0; i < globalOptions.length; i++) { - globals.add(new CustomGlobalOption(globalOptions[i])); + for (String globalOption : globalOptions) { + globals.add(new CustomGlobalOption(globalOption)); } GlobalOption[] cvsGlobalOptions = globals.toArray(new GlobalOption[globals.size()]); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java index 4e9ecdb6d..a6cdf88e1 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java @@ -286,8 +286,8 @@ public class EclipseTest extends ResourceTest { */ public IResource[] changeResources(IContainer container, String[] hierarchy, boolean checkin) throws CoreException, TeamException { List<IResource> changedResources = new ArrayList<>(hierarchy.length); - for (int i=0;i<hierarchy.length;i++) { - IResource resource = container.findMember(hierarchy[i]); + for (String h : hierarchy) { + IResource resource = container.findMember(h); if (resource.getType() == IResource.FILE) { changedResources.add(resource); setContentsAndEnsureModified((IFile)resource); @@ -316,8 +316,7 @@ public class EclipseTest extends ResourceTest { */ protected void deleteResources(IResource[] resources) throws TeamException, CoreException { if (resources.length == 0) return; - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { delete(resource, IResource.NONE, DEFAULT_MONITOR); } } @@ -330,8 +329,8 @@ public class EclipseTest extends ResourceTest { } protected void unmanageResources(IResource[] resources) throws TeamException, CoreException { - for (int i=0;i<resources.length;i++) { - CVSWorkspaceRoot.getCVSResourceFor(resources[i]).unmanage(null); + for (IResource resource : resources) { + CVSWorkspaceRoot.getCVSResourceFor(resource).unmanage(null); } } @@ -552,10 +551,11 @@ public class EclipseTest extends ResourceTest { resources.add(container); IResource[] result = resources.toArray(new IResource[resources.size()]); ensureExistsInWorkspace(result, true); - for (int i = 0; i < result.length; i++) { - if (result[i].getType() == IResource.FILE) + for (IResource r : result) { + if (r.getType() == IResource.FILE) { // 3786 bytes is the average size of Eclipse Java files! - ((IFile) result[i]).setContents(getRandomContents(RANDOM_CONTENT_SIZE), true, false, null); + ((IFile) r).setContents(getRandomContents(RANDOM_CONTENT_SIZE), true, false, null); + } } return result; } @@ -645,8 +645,8 @@ public class EclipseTest extends ResourceTest { assertTrue("The number of resource in " + c1.getProjectRelativePath().toString() + " differs", c1.members().length == c2.members().length); IResource[] resources = c1.members(); - for (int i= 0;i <resources.length;i++) { - assertContentsEqual(resources[i], c2.findMember(resources[i].getName())); + for (IResource resource : resources) { + assertContentsEqual(resource, c2.findMember(resource.getName())); } } @@ -699,8 +699,8 @@ public class EclipseTest extends ResourceTest { container1.members(ICVSFolder.ALL_EXISTING_MEMBERS).length == container2.members(ICVSFolder.ALL_EXISTING_MEMBERS).length); ICVSResource[] resources = container1.members(ICVSFolder.ALL_EXISTING_MEMBERS); - for (int i= 0;i <resources.length;i++) { - assertEquals(path, resources[i], container2.getChild(resources[i].getName()), includeTimestamps, includeTags); + for (ICVSResource resource : resources) { + assertEquals(path, resource, container2.getChild(resource.getName()), includeTimestamps, includeTags); } } @@ -787,13 +787,13 @@ public class EclipseTest extends ResourceTest { ICVSRemoteResource[] members2 = container2.getMembers(DEFAULT_MONITOR); assertTrue("Number of members differ for " + path, members1.length == members2.length); Map<String, ICVSRemoteResource> memberMap2 = new HashMap<>(); - for (int i= 0; i < members2.length; i++) { - memberMap2.put(members2[i].getName(), members2[i]); + for (ICVSRemoteResource m : members2) { + memberMap2.put(m.getName(), m); } - for (int i= 0; i < members1.length; i++) { - ICVSRemoteResource member2 = memberMap2.get(members1[i].getName()); - assertNotNull("Resource does not exist: " + path.append(members1[i].getName()) + member2); - assertEquals(path, members1[i], member2, includeTags); + for (ICVSRemoteResource m : members1) { + ICVSRemoteResource member2 = memberMap2.get(m.getName()); + assertNotNull("Resource does not exist: " + path.append(m.getName()) + member2); + assertEquals(path, m, member2, includeTags); } } protected void assertEquals(IPath parent, ICVSRemoteResource resource1, ICVSRemoteResource resource2, boolean includeTags) throws CoreException, TeamException, IOException { @@ -820,8 +820,9 @@ public class EclipseTest extends ResourceTest { } protected void assertHasNoRemote(String prefix, IResource[] resources) { - for (int i=0;i<resources.length;i++) - assertHasNoRemote(prefix, resources[i]); + for (IResource resource : resources) { + assertHasNoRemote(prefix, resource); + } } protected void assertHasNoRemote(String prefix, IResource resource) { @@ -829,8 +830,9 @@ public class EclipseTest extends ResourceTest { } protected void assertHasRemote(String prefix, IResource[] resources) { - for (int i=0;i<resources.length;i++) - assertHasRemote(prefix, resources[i]); + for (IResource resource : resources) { + assertHasRemote(prefix, resource); + } } protected void assertHasRemote(String prefix, IResource resource) { @@ -838,8 +840,9 @@ public class EclipseTest extends ResourceTest { } protected void assertIsModified(String prefix, IResource[] resources) throws TeamException { - for (int i=0;i<resources.length;i++) - assertIsModified(prefix, resources[i]); + for (IResource resource : resources) { + assertIsModified(prefix, resource); + } } protected void assertIsModified(String prefix, IResource resource) throws TeamException { @@ -849,8 +852,9 @@ public class EclipseTest extends ResourceTest { } protected void assertNotModified(String prefix, IResource[] resources) throws TeamException { - for (int i=0;i<resources.length;i++) - assertNotModified(prefix, resources[i]); + for (IResource resource : resources) { + assertNotModified(prefix, resource); + } } protected void assertNotModified(String prefix, IResource resource) throws TeamException { @@ -869,8 +873,7 @@ public class EclipseTest extends ResourceTest { } protected void assertReadOnly(IResource[] resources, final boolean isReadOnly, final boolean recurse) throws CoreException { - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { resource.accept(resource1 -> { if (resource1.getType() == IResource.FILE) { assertEquals(isReadOnly, resource1.getResourceAttributes().isReadOnly()); @@ -1001,9 +1004,9 @@ public class EclipseTest extends ResourceTest { protected void commitNewProject(IProject project) throws CoreException, CVSException, TeamException { List<IResource> resourcesToAdd = new ArrayList<IResource>(); IResource[] members = project.members(); - for (int i = 0; i < members.length; i++) { - if ( ! CVSWorkspaceRoot.getCVSResourceFor(members[i]).isIgnored()) { - resourcesToAdd.add(members[i]); + for (IResource member : members) { + if (!CVSWorkspaceRoot.getCVSResourceFor(member).isIgnored()) { + resourcesToAdd.add(member); } } addResources(resourcesToAdd.toArray(new IResource[resourcesToAdd.size()])); @@ -1082,8 +1085,7 @@ public class EclipseTest extends ResourceTest { protected static void waitForDecorator() { // Wait for the decorator job Job[] decorators = Job.getJobManager().find(DecoratorManager.FAMILY_DECORATE); - for (int i = 0; i < decorators.length; i++) { - Job job = decorators[i]; + for (Job job : decorators) { waitForJobCompletion(job); } } @@ -1335,8 +1337,9 @@ public class EclipseTest extends ResourceTest { if (status.isMultiStatus()) { IStatus[] children = status.getChildren(); - for (int i = 0; i < children.length; i++) - write(children[i], indent + 1); + for (IStatus child : children) { + write(child, indent + 1); + } } } @@ -1371,8 +1374,7 @@ public class EclipseTest extends ResourceTest { if (status.getException() instanceof CVSCommunicationException) return true; if (status.isMultiStatus()) { IStatus[] children = status.getChildren(); - for (int i = 0; i < children.length; i++) { - IStatus child = children[i]; + for (IStatus child : children) { if (child.getException() instanceof CVSCommunicationException) return true; } } @@ -1395,8 +1397,7 @@ public class EclipseTest extends ResourceTest { if (allJobs.length == 0) { System.out.println("None"); //$NON-NLS-1$ } - for (int i = 0; i < allJobs.length; i++) { - Job job = allJobs[i]; + for (Job job : allJobs) { System.out.println(job.getName() + ": " + job.getState()); } if (CVSTestSetup.FAIL_IF_EXCEPTION_LOGGED) { @@ -1474,8 +1475,7 @@ public class EclipseTest extends ResourceTest { protected void assertStatusContainsCode(IStatus status, int code) { if (status.isMultiStatus()) { IStatus[] children = status.getChildren(); - for (int i = 0; i < children.length; i++) { - IStatus child = children[i]; + for (IStatus child : children) { if (child.getCode() == code) return; } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/FindCommittersTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/FindCommittersTest.java index 29a91a420..c55af8dde 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/FindCommittersTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/FindCommittersTest.java @@ -63,11 +63,9 @@ public class FindCommittersTest extends EclipseTest { private Set<String> getAuthors(RemoteLogOperation.LogEntryCache logEntryCache) { String[] paths = logEntryCache.getCachedFilePaths(); Set<String> authors = new HashSet<>(); - for (int i = 0; i < paths.length; i++) { - String path = paths[i]; + for (String path : paths) { ILogEntry[] entries = logEntryCache.getLogEntries(path); - for (int j = 0; j < entries.length; j++) { - ILogEntry entry = entries[j]; + for (ILogEntry entry : entries) { authors.add(entry.getAuthor()); } } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/JUnitTestCase.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/JUnitTestCase.java index 75af792ff..5e018d788 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/JUnitTestCase.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/JUnitTestCase.java @@ -146,8 +146,8 @@ public abstract class JUnitTestCase extends TestCase { ByteArrayOutputStream bos = new ByteArrayOutputStream(); PrintStream os = new PrintStream(bos); try { - for (int i = 0; i < contents.length; i++) { - os.println(contents[i]); + for (String content : contents) { + os.println(content); } ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); if (file.exists()) { @@ -299,8 +299,8 @@ public abstract class JUnitTestCase extends TestCase { */ protected static void createRandomFile(IContainer parent, String[] fileNameArray) throws IOException, CoreException { - for (int i = 0; i < fileNameArray.length; i++) { - IFile file = parent.getFile(new Path(fileNameArray[i])); + for (String fileName : fileNameArray) { + IFile file = parent.getFile(new Path(fileName)); createRandomFile(file); } } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/SameResultEnv.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/SameResultEnv.java index 974a020fe..1d72833ac 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/SameResultEnv.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/SameResultEnv.java @@ -67,6 +67,7 @@ public final class SameResultEnv extends JUnitTestCase { * Always to be called in the setUp of the testCase that wants to * use the same-result environment. */ + @Override public void setUp() throws Exception { super.setUp(); IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); @@ -91,6 +92,7 @@ public final class SameResultEnv extends JUnitTestCase { * Always to be called in the tearDown of the testCase that wants to * use the same-result environment. */ + @Override public void tearDown() throws Exception { // we deliberately don't clean up test projects to simplify debugging super.tearDown(); @@ -158,6 +160,7 @@ public final class SameResultEnv extends JUnitTestCase { /** * Deletes files on the both of the cvs-servers. */ + @Override public void magicDeleteRemote(String remoteName) throws CVSException { super.magicDeleteRemote(CompatibleTestSetup.referenceClientRepository, remoteName); super.magicDeleteRemote(CompatibleTestSetup.eclipseClientRepository, remoteName); @@ -181,6 +184,7 @@ public final class SameResultEnv extends JUnitTestCase { * Set up both of the repos on the cvs-server(s) with a file structure * resulting for your input in the parameter createResources. */ + @Override public void magicSetUpRepo(String projectName, String[] createResources) throws IOException, CoreException, CVSException { magicDeleteRemote(projectName); @@ -228,8 +232,8 @@ public final class SameResultEnv extends JUnitTestCase { } else if (! pathRelativeToRoot.endsWith("/")) { pathRelativeToRoot += "/"; } - for (int i = 0; i < relativeFileNames.length; i++) { - createRandomFile(pathRelativeToRoot + relativeFileNames[i]); + for (String relativeFileName : relativeFileNames) { + createRandomFile(pathRelativeToRoot + relativeFileName); } } @@ -438,16 +442,16 @@ public final class SameResultEnv extends JUnitTestCase { ICVSResource[] resourceList1 = mFolder1.members(ICVSFolder.FILE_MEMBERS | ICVSFolder.FOLDER_MEMBERS); ICVSResource[] resourceList2 = mFolder2.members(ICVSFolder.FILE_MEMBERS | ICVSFolder.FOLDER_MEMBERS); assertEquals(resourceList1.length, resourceList2.length); - for (int i=0; i<resourceList1.length; i++) { + for (ICVSResource r : resourceList1) { boolean resourceFound = false; - for (int j=0; j<resourceList2.length; j++) { - if (resourceList1[i].getName().equals(resourceList2[j].getName())) { - assertEquals(resourceList1[i], resourceList2[j]); + for (ICVSResource _r : resourceList2) { + if (r.getName().equals(_r.getName())) { + assertEquals(r, _r); resourceFound = true; break; } } - assertTrue("Resource " + resourceList1[i].getName() + " not found in the list",resourceFound); + assertTrue("Resource " + r.getName() + " not found in the list", resourceFound); } } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java index 4f9eec2f7..9527a9532 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java @@ -270,8 +270,7 @@ public class ModuleTest extends EclipseTest { } public RemoteModule getRemoteModule(String moduleName) { - for (int i = 0; i < remoteModules.length; i++) { - RemoteModule module = remoteModules[i]; + for (RemoteModule module : remoteModules) { // XXX shouldn't be getName if (module.getName().equals(moduleName)) return module; diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/RemoteResourceTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/RemoteResourceTest.java index 5e0f9dc21..3b2ba5ee3 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/RemoteResourceTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/RemoteResourceTest.java @@ -71,9 +71,10 @@ public class RemoteResourceTest extends EclipseTest { protected void getMembers(ICVSRemoteFolder folder, boolean deep) throws TeamException { ICVSRemoteResource[] children = folder.members(DEFAULT_MONITOR); if (deep) { - for (int i=0;i<children.length;i++) { - if (children[i].isContainer()) - getMembers((ICVSRemoteFolder)children[i], deep); + for (ICVSRemoteResource c : children) { + if (c.isContainer()) { + getMembers((ICVSRemoteFolder) c, deep); + } } } } @@ -243,10 +244,9 @@ public class RemoteResourceTest extends EclipseTest { ICVSRemoteFile remote = (ICVSRemoteFile)CVSWorkspaceRoot.getRemoteResourceFor(project.getFile("file.txt")); ILogEntry[] entries = remote.getLogEntries(DEFAULT_MONITOR); - for (int i=0;i<entries.length;i++) { - InputStream in = entries[i].getRemoteFile().getContents(DEFAULT_MONITOR); - - if (entries[i].getRevision().equals("1.2")) { + for (ILogEntry entry : entries) { + InputStream in = entry.getRemoteFile().getContents(DEFAULT_MONITOR); + if (entry.getRevision().equals("1.2")) { int count = 0; byte[] buffer = new byte[1024]; int c; @@ -256,7 +256,7 @@ public class RemoteResourceTest extends EclipseTest { } String contents = new String(buffer, 0, count); assertEquals("the contents of revision 1.2 are not equal", contents, "hi there"); - } else if (entries[i].getRevision().equals("1.3")) { + } else if (entry.getRevision().equals("1.3")) { int count = 0; byte[] buffer = new byte[1024]; int c; @@ -378,18 +378,20 @@ public class RemoteResourceTest extends EclipseTest { } private LogEntry getLogEntryByRevision(ILogEntry[] entries, String revision) { - for (int i = 0; i < entries.length; i++) { - if (entries[i].getRevision().equals(revision) && entries[i] instanceof LogEntry) { - return (LogEntry) entries[i]; + for (ILogEntry entry : entries) { + if (entry.getRevision().equals(revision) && entry instanceof LogEntry) { + return (LogEntry) entry; } } return null; } private CVSTag getTagByName(CVSTag[] tags, String name) { - for (int i = 0; i < tags.length; i++) - if (tags[i].getName().equals(name)) - return tags[i]; + for (CVSTag tag : tags) { + if (tag.getName().equals(name)) { + return tag; + } + } return null; } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ResourceDeltaTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ResourceDeltaTest.java index 30453f9fd..9af4d0526 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ResourceDeltaTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ResourceDeltaTest.java @@ -194,8 +194,7 @@ public class ResourceDeltaTest extends EclipseTest { return true; if (status.isMultiStatus()) { IStatus[] children = status.getChildren(); - for (int i = 0; i < children.length; i++) { - IStatus child = children[i]; + for (IStatus child : children) { if (containsCode(child,code)) return true; } @@ -233,8 +232,7 @@ public class ResourceDeltaTest extends EclipseTest { public void deleteIOFiles(IProject project, String[] cvsFolders) throws CoreException { IPath rootPath = project.getLocation(); - for (int i = 0; i < cvsFolders.length; i++) { - String childPath = cvsFolders[i]; + for (String childPath : cvsFolders) { IPath fullPath = rootPath.append(childPath); deepDelete(fullPath.toFile()); } @@ -244,8 +242,8 @@ public class ResourceDeltaTest extends EclipseTest { private static void deepDelete(File resource) { if (resource.isDirectory()) { File[] fileList = resource.listFiles(); - for (int i = 0; i < fileList.length; i++) { - deepDelete(fileList[i]); + for (File f : fileList) { + deepDelete(f); } } resource.delete(); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSChangeSetTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSChangeSetTests.java index a682ec377..7d1c58382 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSChangeSetTests.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSChangeSetTests.java @@ -68,8 +68,7 @@ public class CVSChangeSetTests extends CVSSyncSubscriberTest { List<IResource> filesInSet = new ArrayList<>(); getFileChildren(node, filesInSet); assertTrue("The number of files in the set do not match the expected number", files[i].length == filesInSet.size()); - for (int j = 0; j < files[i].length; j++) { - IFile file = files[i][j]; + for (IFile file : files[i]) { assertTrue("File " + file.getFullPath() + " is not in the set", filesInSet.contains(file)); } } @@ -88,8 +87,7 @@ public class CVSChangeSetTests extends CVSSyncSubscriberTest { } private void removeTreeItemsFromList(List<?> nodeList, TreeItem[] items) { - for (int i = 0; i < items.length; i++) { - TreeItem item = items[i]; + for (TreeItem item : items) { nodeList.remove(item.getData()); TreeItem[] children = item.getItems(); removeTreeItemsFromList(nodeList, children); @@ -99,8 +97,7 @@ public class CVSChangeSetTests extends CVSSyncSubscriberTest { private ChangeSetDiffNode[] getCheckedInChangeSetNodes(ISynchronizeModelElement root) { List<ChangeSetDiffNode> result = new ArrayList<>(); IDiffElement[] children = root.getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement element = children[i]; + for (IDiffElement element : children) { if (element instanceof ChangeSetDiffNode) { ChangeSetDiffNode node = (ChangeSetDiffNode)element; if (node.getSet() instanceof CheckedInChangeSet) { @@ -114,8 +111,7 @@ public class CVSChangeSetTests extends CVSSyncSubscriberTest { private ChangeSetDiffNode[] getActiveChangeSetNodes(ISynchronizeModelElement root) { List<ChangeSetDiffNode> result = new ArrayList<>(); IDiffElement[] children = root.getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement element = children[i]; + for (IDiffElement element : children) { if (element instanceof ChangeSetDiffNode) { ChangeSetDiffNode node = (ChangeSetDiffNode)element; if (node.getSet() instanceof ActiveChangeSet) { @@ -135,8 +131,7 @@ public class CVSChangeSetTests extends CVSSyncSubscriberTest { list.add(resource); } IDiffElement[] children = node.getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement child = children[i]; + for (IDiffElement child : children) { getFileChildren((ISynchronizeModelElement)child, list); } return; @@ -144,8 +139,7 @@ public class CVSChangeSetTests extends CVSSyncSubscriberTest { private ChangeSetDiffNode getCommitSetFor(ISynchronizeModelElement root, String message) { IDiffElement[] children = root.getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement element = children[i]; + for (IDiffElement element : children) { if (element instanceof ChangeSetDiffNode) { ChangeSetDiffNode node = (ChangeSetDiffNode)element; if (node.getSet().getComment().equals(message)) { @@ -235,11 +229,9 @@ public class CVSChangeSetTests extends CVSSyncSubscriberTest { assertResourcesAreTheSame(resources, outOfSync, true); // Assert that all active sets are visible in the view ChangeSet[] sets = getActiveChangeSetManager().getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet changeSet = sets[i]; + for (ChangeSet changeSet : sets) { node = getChangeSetNodeFor(root, changeSet); assertNotNull("The node for set " + set.getName() + " is not in the view", node); - } ChangeSetDiffNode[] nodes = getActiveChangeSetNodes(root); assertNodesInViewer(getWorkspaceSubscriber(), nodes); @@ -247,8 +239,7 @@ public class CVSChangeSetTests extends CVSSyncSubscriberTest { private ChangeSetDiffNode getChangeSetNodeFor(ISynchronizeModelElement root, ChangeSet set) { IDiffElement[] children = root.getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement element = children[i]; + for (IDiffElement element : children) { if (element instanceof ChangeSetDiffNode) { ChangeSetDiffNode node = (ChangeSetDiffNode)element; if (node.getSet() == set) { @@ -281,8 +272,7 @@ public class CVSChangeSetTests extends CVSSyncSubscriberTest { list.add(info); } IDiffElement[] children = node.getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement child = children[i]; + for (IDiffElement child : children) { getOutOfSync((ISynchronizeModelElement)child, list); } return; @@ -299,23 +289,19 @@ public class CVSChangeSetTests extends CVSSyncSubscriberTest { if (doNotAllowExtra) { if (resources1.length != resources2.length) { System.out.println("Expected"); - for (int i = 0; i < resources1.length; i++) { - IResource resource = resources1[i]; + for (IResource resource : resources1) { System.out.println(resource.getFullPath().toString()); } System.out.println("Actual"); - for (int i = 0; i < resources2.length; i++) { - IResource resource = resources2[i]; + for (IResource resource : resources2) { System.out.println(resource.getFullPath().toString()); } } assertEquals("The number of resources do not match the expected number", resources1.length, resources2.length); } - for (int i = 0; i < resources1.length; i++) { - IResource resource = resources1[i]; + for (IResource resource : resources1) { boolean found = false; - for (int j = 0; j < resources2.length; j++) { - IResource resource2 = resources2[j]; + for (IResource resource2 : resources2) { if (resource2.equals(resource)) { found = true; break; @@ -333,8 +319,7 @@ public class CVSChangeSetTests extends CVSSyncSubscriberTest { private void assertInRootSet(IResource[] resources) throws CoreException { ISynchronizeModelElement[] nodes = getNonChangeSetRoots(getModelRoot(((SubscriberChangeSetManager)getActiveChangeSetManager()).getSubscriber())); List<SyncInfo> list = new ArrayList<>(); - for (int i = 0; i < nodes.length; i++) { - ISynchronizeModelElement element = nodes[i]; + for (ISynchronizeModelElement element : nodes) { getOutOfSync(element, list); } IResource[] outOfSync = getResources(list.toArray(new SyncInfo[list.size()])); @@ -348,8 +333,7 @@ public class CVSChangeSetTests extends CVSSyncSubscriberTest { private ISynchronizeModelElement[] getNonChangeSetRoots(ISynchronizeModelElement modelRoot) { List<ISynchronizeModelElement> result = new ArrayList<>(); IDiffElement[] children = modelRoot.getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement element = children[i]; + for (IDiffElement element : children) { if (!(element instanceof ChangeSetDiffNode)) { result.add((ISynchronizeModelElement) element); } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSSyncSubscriberTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSSyncSubscriberTest.java index 23ae57dbc..0facedf0b 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSSyncSubscriberTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSSyncSubscriberTest.java @@ -91,11 +91,9 @@ public abstract class CVSSyncSubscriberTest extends EclipseTest { protected void assertSyncChangesMatch(ISubscriberChangeEvent[] changes, IResource[] resources) { // First, ensure that all the resources appear in the delta - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { boolean found = false; - for (int j = 0; j < changes.length; j++) { - ISubscriberChangeEvent delta = changes[j]; + for (ISubscriberChangeEvent delta : changes) { if (delta.getResource().equals(resource)) { found = true; break; @@ -119,14 +117,15 @@ public abstract class CVSSyncSubscriberTest extends EclipseTest { */ protected void assertDeleted(String message, IContainer root, String[] resourcePaths) { IResource[] resources = getResources(root, resourcePaths); - for (int i=0;i<resources.length;i++) { + for (IResource resource : resources) { try { - if (! resources[i].exists()) + if (!resource.exists()) { break; + } } catch (AssertionFailedError e) { break; } - assertTrue(message + ": resource " + resources[i] + " still exists in some form", false); + assertTrue(message + ": resource " + resource + " still exists in some form", false); } } @@ -139,8 +138,7 @@ public abstract class CVSSyncSubscriberTest extends EclipseTest { protected IResource[] collect(IResource[] resources, final ResourceCondition condition, int depth) throws CoreException, TeamException { final Set<IResource> affected = new HashSet<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (resource.exists() || resource.isPhantom()) { resource.accept(new IResourceVisitor() { public boolean visit(IResource r) throws CoreException { @@ -165,8 +163,7 @@ public abstract class CVSSyncSubscriberTest extends EclipseTest { protected IResource[] collectAncestors(IResource[] resources, ResourceCondition condition) throws CoreException, TeamException { Set<IResource> affected = new HashSet<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { while (resource.getType() != IResource.ROOT) { if (condition.matches(resource)) { affected.add(resource); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CompareEditorTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CompareEditorTests.java index 608bc2506..c6acde392 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CompareEditorTests.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CompareEditorTests.java @@ -124,8 +124,8 @@ public class CompareEditorTests extends CVSSyncSubscriberTest { private IEditorPart findOpenEditor(IEditorInput input) { IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); IEditorReference[] editorRefs = page.getEditorReferences(); - for (int i = 0; i < editorRefs.length; i++) { - final IEditorPart part = editorRefs[i].getEditor(false /* don't restore editor */); + for (IEditorReference editorRef : editorRefs) { + final IEditorPart part = editorRef.getEditor(false /* don't restore editor */); if(part != null) { IEditorInput testInput = part.getEditorInput(); if (testInput == input) diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/SyncInfoSource.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/SyncInfoSource.java index e91264443..d3685b4fd 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/SyncInfoSource.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/SyncInfoSource.java @@ -110,8 +110,7 @@ public class SyncInfoSource { protected void assertProjectRemoved(Subscriber subscriber, IProject project) { IResource[] roots = subscriber.roots(); - for (int i = 0; i < roots.length; i++) { - IResource resource = roots[i]; + for (IResource resource : roots) { if (resource.equals(project)) { throw new AssertionFailedError(); } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CVSProjectSetImportTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CVSProjectSetImportTest.java index cd4702192..7b881e10c 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CVSProjectSetImportTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CVSProjectSetImportTest.java @@ -58,8 +58,8 @@ public class CVSProjectSetImportTest extends TestCase { knownRepositories = KnownRepositories.getInstance(); savedRepositories = knownRepositories.getRepositories(); // dispose all known repositories - for (int i = 0; i < savedRepositories.length; i++) { - knownRepositories.disposeRepository(savedRepositories[i]); + for (ICVSRepositoryLocation savedRepository : savedRepositories) { + knownRepositories.disposeRepository(savedRepository); } } @@ -289,9 +289,8 @@ public class CVSProjectSetImportTest extends TestCase { */ private void _testPrepareSuggestedRepositoryLocations(String[] knownLocations, String[] referenceStrings, String[][] expectedSuggestions) throws Exception { - for (int i = 0; i < knownLocations.length; i++) { - knownRepositories.addRepository(CVSRepositoryLocation - .fromString(knownLocations[i]), false); + for (String knownLocation : knownLocations) { + knownRepositories.addRepository(CVSRepositoryLocation.fromString(knownLocation), false); } Map infoMap = new HashMap(referenceStrings.length); @@ -369,9 +368,8 @@ public class CVSProjectSetImportTest extends TestCase { String[] referenceStrings, String[] expectedSelections) throws Exception { // set up values to test - for (int i = 0; i < knownLocations.length; i++) { - knownRepositories.addRepository(CVSRepositoryLocation - .fromString(knownLocations[i]), false); + for (String knownLocation : knownLocations) { + knownRepositories.addRepository(CVSRepositoryLocation.fromString(knownLocation), false); } Map infoMap = new HashMap(referenceStrings.length); @@ -421,8 +419,7 @@ public class CVSProjectSetImportTest extends TestCase { ICVSRepositoryLocation[] repositories = knownRepositories .getRepositories(); boolean matchFound = false; - for (int j = 0; j < repositories.length; j++) { - ICVSRepositoryLocation rl = repositories[j]; + for (ICVSRepositoryLocation rl : repositories) { if (CVSRepositoryLocationMatcher.isMatching(referenceLocation, rl)) { assertFalse("There should be only one perfect match.", matchFound); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CreatePatchTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CreatePatchTest.java index c9350fec3..7b0a768f3 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CreatePatchTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CreatePatchTest.java @@ -343,8 +343,8 @@ public class CreatePatchTest extends EclipseTest { children.length > 0); boolean errorLineOccurred = false; - for (int i = 0; i < children.length; i++) { - if (children[i].getCode() == CVSStatus.ERROR_LINE) { + for (IStatus child : children) { + if (child.getCode() == CVSStatus.ERROR_LINE) { errorLineOccurred = true; break; } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ParticipantSyncInfoSource.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ParticipantSyncInfoSource.java index 76818f070..eedf96fbc 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ParticipantSyncInfoSource.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ParticipantSyncInfoSource.java @@ -58,9 +58,8 @@ public class ParticipantSyncInfoSource extends SyncInfoSource { public void tearDown() { ISynchronizeParticipantReference[] participants = TeamUI.getSynchronizeManager().getSynchronizeParticipants(); - for (int i = 0; i < participants.length; i++) { + for (ISynchronizeParticipantReference ref : participants) { try { - ISynchronizeParticipantReference ref = participants[i]; if(ref.getParticipant().getId().equals(CVSMergeSubscriber.ID)) { TeamUI.getSynchronizeManager().removeSynchronizeParticipants(new ISynchronizeParticipant[] {ref.getParticipant()}); } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchTreeTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchTreeTest.java index 9c6ffba85..fba91fe14 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchTreeTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchTreeTest.java @@ -98,16 +98,17 @@ public class PatchTreeTest extends EclipseTest { Object[] expected = { nodeC, nodeB, element, nodeA, nodeD }; assertEquals(expected.length, treeChildren.length); - for (int i = 0; i < treeChildren.length; i++) { - assertEquals(1, countByData(treeChildren, treeChildren[i])); + for (Item treeChild : treeChildren) { + assertEquals(1, countByData(treeChildren, treeChild)); } } private int countByData(final Item[] a, Item o) { int c = 0; - for (int i = 0; i < a.length; i++) { - if (a[i].getData() == o.getData()) + for (Item a1 : a) { + if (a1.getData() == o.getData()) { c++; + } } return c; } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/RepositoriesViewTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/RepositoriesViewTests.java index 3ebc90b65..54fe24b16 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/RepositoriesViewTests.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/RepositoriesViewTests.java @@ -44,9 +44,8 @@ public class RepositoriesViewTests extends EclipseTest { // clear repository root cache RepositoryRoot repositoryRoot = getRepositoryRoot(); String remotePaths[] = repositoryRoot.getKnownRemotePaths(); - for (int i = 0; i < remotePaths.length; i++) { - repositoryRoot.removeTags(remotePaths[i], - repositoryRoot.getAllKnownTags(remotePaths[i])); + for (String remotePath : remotePaths) { + repositoryRoot.removeTags(remotePath, repositoryRoot.getAllKnownTags(remotePath)); } } @@ -54,8 +53,8 @@ public class RepositoriesViewTests extends EclipseTest { RemoteContentProvider rcp = new RemoteContentProvider(); AllRootsElement are = new AllRootsElement(); Object[] repositoryRoots = rcp.getElements(are); - for (int i = 0; i < repositoryRoots.length; i++) { - RepositoryRoot repositoryRoot = (RepositoryRoot) repositoryRoots[i]; + for (Object root : repositoryRoots) { + RepositoryRoot repositoryRoot = (RepositoryRoot) root; if (getRepository().equals(repositoryRoot.getRoot())) { return repositoryRoot; } @@ -150,11 +149,9 @@ public class RepositoriesViewTests extends EclipseTest { // check if version exists for module assertTrue(categories[2] instanceof VersionCategory); Object[] modules = rcp.getChildren(categories[2]); - for (int i = 0; i < modules.length; i++) { - if (modules[i] instanceof RemoteModule - && ((RemoteModule) (modules[i])).getCVSResource().getName() - .equals(moduleName)) { - Object folders[] = rcp.getChildren(modules[i]); + for (Object module : modules) { + if (module instanceof RemoteModule && ((RemoteModule) (module)).getCVSResource().getName().equals(moduleName)) { + Object[] folders = rcp.getChildren(module); assertEquals(1, folders.length); assertEquals(versionName, ((RemoteFolder) folders[0]).getTag() .getName()); @@ -228,17 +225,15 @@ public class RepositoriesViewTests extends EclipseTest { // [Branch_1]/Module_1/Project_1 // [Branch_1]/Module_1/Module_2 assertEquals(2, modules.length); - for (int i = 0; i < modules.length; i++) { - if (((RemoteResource) (modules[i])).getName().equals( - project1.getName())) { + for (Object module : modules) { + if (((RemoteResource) (module)).getName().equals(project1.getName())) { // Project_1 should have contents retrieved from CVS - assertTrue(rcp.hasChildren(modules[i])); - } else if (((RemoteResource) (modules[i])).getName().equals( - secondModule)) { + assertTrue(rcp.hasChildren(module)); + } else if (((RemoteResource) (module)).getName().equals(secondModule)) { // should be only [Branch_1]/Module_1/Module_2/Project_2. // [Branch_1]/Module_1/Module_2/Project_3 should NOT be on the // list, it is not branched with Branch_1 - Object[] module2Children = rcp.getChildren(modules[i]); + Object[] module2Children = rcp.getChildren(module); assertEquals(1, module2Children.length); assertEquals(project2.getName(), ((RemoteResource) module2Children[0]).getName()); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkUtils.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkUtils.java index 98f5a47f2..e86cb12a6 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkUtils.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkUtils.java @@ -124,8 +124,8 @@ public class BenchmarkUtils { public static IStatus findStatusByCode(IStatus status, int code) { if (status.getCode() == code) return status; IStatus[] children = status.getChildren(); - for (int i = 0; i < children.length; i++) { - IStatus found = findStatusByCode(children[i], code); + for (IStatus child : children) { + IStatus found = findStatusByCode(child, code); if (found != null) return found; } return null; @@ -485,8 +485,8 @@ public class BenchmarkUtils { */ public static boolean isFolderEmpty(IFolder folder) throws CoreException { IResource[] members = folder.members(); - for (int i = 0; i < members.length; ++i) { - if (isValidFile(members[i]) || isValidFolder(members[i])) return false; + for (IResource member : members) { + if (isValidFile(member) || isValidFolder(member)) return false; } return true; } @@ -536,8 +536,8 @@ public class BenchmarkUtils { */ public static IResource[] filterResources(IResource[] resources) { List<IResource> list = new ArrayList<>(resources.length); - for (int i = 0; i < resources.length; ++i) { - if (isValidResource(resources[i])) list.add(resources[i]); + for (IResource resource : resources) { + if (isValidResource(resource)) list.add(resource); } if (list.size() != resources.length) { resources = list.toArray(new IResource[list.size()]); @@ -552,8 +552,10 @@ public class BenchmarkUtils { if (node == null) return true; if (node.getKind() != 0) return false; IDiffElement[] children = node.getChildren(); - for (int i = 0; i < children.length; i++) { - if (!isEmpty(children[i])) return false; + for (IDiffElement child : children) { + if (!isEmpty(child)) { + return false; + } } return true; } @@ -562,8 +564,10 @@ public class BenchmarkUtils { if (element.getKind() != 0) return false; if (element instanceof IDiffContainer) { IDiffElement[] children = ((DiffNode)element).getChildren(); - for (int i = 0; i < children.length; i++) { - if (!isEmpty(children[i])) return false; + for (IDiffElement child : children) { + if (!isEmpty(child)) { + return false; + } } } return true; |