diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core/src/org/eclipse/team')
55 files changed, 291 insertions, 396 deletions
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; } } |