diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources')
15 files changed, 316 insertions, 316 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSEntryLineTag.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSEntryLineTag.java index 3f9315fdc..e0d4904e1 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSEntryLineTag.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSEntryLineTag.java @@ -23,10 +23,10 @@ import org.eclipse.team.internal.ccvs.core.*; public class CVSEntryLineTag extends CVSTag { - /* - * This is the format of a date as it appears in the entry line. The date in an entry - * line is always in GMT. - */ + /* + * This is the format of a date as it appears in the entry line. The date in an entry + * line is always in GMT. + */ private static final String ENTRY_LINE_DATE_TAG_FORMAT = "yyyy.MM.dd.HH.mm.ss"; //$NON-NLS-1$ /* @@ -62,7 +62,7 @@ public class CVSEntryLineTag extends CVSTag { static synchronized public Date entryLineToDate(String text){ try { - entryLineDateTagFormatter.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ + entryLineDateTagFormatter.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ return entryLineDateTagFormatter.parse(text); } catch (ParseException e) { CVSProviderPlugin.log(new CVSStatus(IStatus.ERROR, CVSStatus.ERROR, "Tag name " + text + " is not of the expected format " + ENTRY_LINE_DATE_TAG_FORMAT, e)); //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java index 12c2553d2..b0ce6e55d 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java @@ -54,12 +54,12 @@ public class CVSWorkspaceRoot { if ( ! info.equals(folderInfo)) { throw new CVSException(new CVSStatus(IStatus.ERROR, NLS.bind(CVSMessages.CVSProvider_infoMismatch, new String[] { project.getName() }))); } - - // Ensure that the repository location format is supported - String root = info.getRoot(); - // This will try to create a repository location for the root. - // If it fails, an exception is thrown. - KnownRepositories.getInstance().getRepository(root); + + // Ensure that the repository location format is supported + String root = info.getRoot(); + // This will try to create a repository location for the root. + // If it fails, an exception is thrown. + KnownRepositories.getInstance().getRepository(root); // Register the project with Team RepositoryProvider.map(project, CVSProviderPlugin.getTypeId()); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java index 4c094f94d..fc7f6e359 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java @@ -59,12 +59,12 @@ public class EclipseFile extends EclipseResource implements ICVSFile { } public InputStream getContents() throws CVSException { - try { + try { return getIFile().getContents(); } catch (CoreException e) { - throw CVSException.wrapException(resource, NLS.bind(CVSMessages.EclipseFile_Problem_accessing_resource, new String[] { resource.getFullPath().toString(), e.getStatus().getMessage() }), e); // - } - } + throw CVSException.wrapException(resource, NLS.bind(CVSMessages.EclipseFile_Problem_accessing_resource, new String[] { resource.getFullPath().toString(), e.getStatus().getMessage() }), e); // + } + } @Override public Date getTimeStamp() { @@ -204,10 +204,10 @@ public class EclipseFile extends EclipseResource implements ICVSFile { if (attributes != null) { attributes.setReadOnly(readOnly); try { - resource.setResourceAttributes(attributes); - } catch (CoreException e) { - throw CVSException.wrapException(e); - } + resource.setResourceAttributes(attributes); + } catch (CoreException e) { + throw CVSException.wrapException(e); + } } } @@ -222,10 +222,10 @@ public class EclipseFile extends EclipseResource implements ICVSFile { if (attributes != null) { attributes.setExecutable(executable); try { - resource.setResourceAttributes(attributes); - } catch (CoreException e) { - throw CVSException.wrapException(e); - } + resource.setResourceAttributes(attributes); + } catch (CoreException e) { + throw CVSException.wrapException(e); + } } } @@ -355,12 +355,12 @@ public class EclipseFile extends EclipseResource implements ICVSFile { } try { - // allow editing - setReadOnly(false); - } catch (CVSException e) { - // Just log and keep going - CVSProviderPlugin.log(e); - } + // allow editing + setReadOnly(false); + } catch (CVSException e) { + // Just log and keep going + CVSProviderPlugin.log(e); + } }, monitor); } @@ -400,12 +400,12 @@ public class EclipseFile extends EclipseResource implements ICVSFile { setBaserevInfo(null); try { - // prevent editing - setReadOnly(true); - } catch (CVSException e) { - // Just log and keep going - CVSProviderPlugin.log(e); - } + // prevent editing + setReadOnly(true); + } catch (CVSException e) { + // Just log and keep going + CVSProviderPlugin.log(e); + } }, monitor); } @@ -442,28 +442,28 @@ public class EclipseFile extends EclipseResource implements ICVSFile { modificationState = ICVSFile.DIRTY; } else { // cvs commit: commit of a changed file - // cvs update: update of a file whose contents match the server contents - Date timeStamp; - if (commit) { - // This is a commit. Put the file timestamp in the entry - timeStamp = getTimeStamp(); - } else { - // This is an update. We need to change the tiemstamp in the - // entry file to match the file timestamp returned by Java - timeStamp = oldInfo.getTimeStamp(); - if (timeStamp == null) { - timeStamp = getTimeStamp(); - } else { - // First, set the timestamp of the file to the timestamp from the entry - // There is a chance this will do nothing as the call to Java on some - // file systems munges the timestamps - setTimeStamp(timeStamp); - // To compensate for the above, reset the timestamp in the entry - // to match the timestamp in the file - timeStamp = getTimeStamp(); - } - } - newInfo = new ResourceSyncInfo(entryLine, timeStamp); + // cvs update: update of a file whose contents match the server contents + Date timeStamp; + if (commit) { + // This is a commit. Put the file timestamp in the entry + timeStamp = getTimeStamp(); + } else { + // This is an update. We need to change the tiemstamp in the + // entry file to match the file timestamp returned by Java + timeStamp = oldInfo.getTimeStamp(); + if (timeStamp == null) { + timeStamp = getTimeStamp(); + } else { + // First, set the timestamp of the file to the timestamp from the entry + // There is a chance this will do nothing as the call to Java on some + // file systems munges the timestamps + setTimeStamp(timeStamp); + // To compensate for the above, reset the timestamp in the entry + // to match the timestamp in the file + timeStamp = getTimeStamp(); + } + } + newInfo = new ResourceSyncInfo(entryLine, timeStamp); } //see bug 106876 @@ -483,23 +483,23 @@ public class EclipseFile extends EclipseResource implements ICVSFile { if (base != null) { setBaserevInfo(null); try { - setReadOnly(true); - } catch (CVSException e) { - // Just log and keep going - CVSProviderPlugin.log(e); - } + setReadOnly(true); + } catch (CVSException e) { + // Just log and keep going + CVSProviderPlugin.log(e); + } } else { - // Check to see if watch-edit is enabled for the project - CVSTeamProvider provider = (CVSTeamProvider)RepositoryProvider.getProvider(resource.getProject(), CVSProviderPlugin.getTypeId()); - if (provider != null && provider.isWatchEditEnabled()) { - try { - setReadOnly(true); - } catch (CVSException e) { - // Just log and keep going - CVSProviderPlugin.log(e); - } - } - } + // Check to see if watch-edit is enabled for the project + CVSTeamProvider provider = (CVSTeamProvider)RepositoryProvider.getProvider(resource.getProject(), CVSProviderPlugin.getTypeId()); + if (provider != null && provider.isWatchEditEnabled()) { + try { + setReadOnly(true); + } catch (CVSException e) { + // Just log and keep going + CVSProviderPlugin.log(e); + } + } + } } @Override 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 5ccf5374f..d15a35d64 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 @@ -53,31 +53,31 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { for (int i = 0; i < resources.length; i++) { IResource resource = resources[i]; int type = resource.getType(); - if ((includeFiles && (type==IResource.FILE)) + if ((includeFiles && (type==IResource.FILE)) || (includeFolders && (type==IResource.FOLDER))) { - boolean exists = resource.exists(); - if ((includeExisting && exists) || (includePhantoms && !exists)) { - ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); - boolean includeResource = false; - if ((includeManaged && includeUnmanaged && includeIgnored)) { - includeResource = true; - } else { - boolean isManaged = cvsResource.isManaged(); - if (isManaged && includeManaged) { - includeResource = true; - } else if (exists) { - boolean isIgnored = cvsResource.isIgnored(); - if (isIgnored && includeIgnored) { - includeResource = true; - } else if (! isManaged && ! isIgnored && includeUnmanaged) { - includeResource = true; - } - } - } - if (includeResource) { - result.add(cvsResource); - } - } + boolean exists = resource.exists(); + if ((includeExisting && exists) || (includePhantoms && !exists)) { + ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); + boolean includeResource = false; + if ((includeManaged && includeUnmanaged && includeIgnored)) { + includeResource = true; + } else { + boolean isManaged = cvsResource.isManaged(); + if (isManaged && includeManaged) { + includeResource = true; + } else if (exists) { + boolean isIgnored = cvsResource.isIgnored(); + if (isIgnored && includeIgnored) { + includeResource = true; + } else if (! isManaged && ! isIgnored && includeUnmanaged) { + includeResource = true; + } + } + } + if (includeResource) { + result.add(cvsResource); + } + } } } return result.toArray(new ICVSResource[result.size()]); @@ -234,12 +234,12 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { monitor.worked(1); IResource resource = members[i]; if (resource.getType() == IResource.FILE) { - ResourceAttributes attrs = resource.getResourceAttributes(); - if (attrs != null && attrs.isReadOnly()) { - attrs.setReadOnly(false); - resource.setResourceAttributes(attrs); - } - } else { + ResourceAttributes attrs = resource.getResourceAttributes(); + if (attrs != null && attrs.isReadOnly()) { + attrs.setReadOnly(false); + resource.setResourceAttributes(attrs); + } + } else { recursiveUnmanage((IContainer) resource, monitor); } } @@ -260,12 +260,12 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { @Override public ICVSResource getChild(String namedPath) throws CVSException { - if (namedPath.equals(Session.CURRENT_LOCAL_FOLDER)) { - return this; - } + if (namedPath.equals(Session.CURRENT_LOCAL_FOLDER)) { + return this; + } IPath path = new Path(null, namedPath); if(path.segmentCount()==0) { - return this; + return this; } IResource child = ((IContainer)resource).findMember(path, true /* include phantoms */); if(child!=null) { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java index be79effb9..30f4a16f8 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java @@ -33,8 +33,8 @@ import org.eclipse.team.internal.ccvs.core.util.Util; */ abstract class EclipseResource implements ICVSResource, Comparable { - // The separator that must be used when creating CVS resource paths. Never use - // the platform default separator since it is not compatible with CVS resources. + // The separator that must be used when creating CVS resource paths. Never use + // the platform default separator since it is not compatible with CVS resources. protected static final String SEPARATOR = Session.SERVER_SEPARATOR; protected static final String CURRENT_LOCAL_FOLDER = Session.CURRENT_LOCAL_FOLDER; 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 11fdf0b81..fb010a389 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 @@ -148,10 +148,10 @@ public class EclipseSynchronizer implements IFlushOperation { */ public FolderSyncInfo getFolderSync(IContainer folder) throws CVSException { if (folder.getType() == IResource.ROOT || !isValid(folder)) return null; - // Do a check outside the lock for any folder sync info - FolderSyncInfo info = getSyncInfoCacheFor(folder).getCachedFolderSync(folder, false /* not thread safe */); - if (info != null) - return info; + // Do a check outside the lock for any folder sync info + FolderSyncInfo info = getSyncInfoCacheFor(folder).getCachedFolderSync(folder, false /* not thread safe */); + if (info != null) + return info; try { beginOperation(); cacheFolderSync(folder); @@ -262,10 +262,10 @@ public class EclipseSynchronizer implements IFlushOperation { public byte[] getSyncBytes(IResource resource) throws CVSException { IContainer parent = resource.getParent(); if (parent == null || parent.getType() == IResource.ROOT || !isValid(parent)) return null; - // Do a quick check outside the lock to see if there are sync butes for the resource. - byte[] info = getSyncInfoCacheFor(resource).getCachedSyncBytes(resource, false /* not thread safe */); - if (info != null) - return info; + // Do a quick check outside the lock to see if there are sync butes for the resource. + byte[] info = getSyncInfoCacheFor(resource).getCachedSyncBytes(resource, false /* not thread safe */); + if (info != null) + return info; try { beginOperation(); // cache resource sync for siblings, then return for self @@ -368,20 +368,20 @@ public class EclipseSynchronizer implements IFlushOperation { */ public boolean isIgnored(IResource resource) throws CVSException { if (resource.getType() == IResource.ROOT || - resource.getType() == IResource.PROJECT || - ! resource.exists()) { + resource.getType() == IResource.PROJECT || + ! resource.exists()) { return false; } IContainer parent = resource.getParent(); - FileNameMatcher matcher = sessionPropertyCache.getFolderIgnores(parent, false /* not thread safe */); - if (matcher == null) { - try { - beginOperation(); - matcher = cacheFolderIgnores(parent); - } finally { - endOperation(); - } - } + FileNameMatcher matcher = sessionPropertyCache.getFolderIgnores(parent, false /* not thread safe */); + if (matcher == null) { + try { + beginOperation(); + matcher = cacheFolderIgnores(parent); + } finally { + endOperation(); + } + } return matcher.match(resource.getName()); } @@ -499,10 +499,10 @@ public class EclipseSynchronizer implements IFlushOperation { */ public void endBatching(ISchedulingRule rule, IProgressMonitor monitor) throws CVSException { try { - resourceLock.release(rule, monitor); - } catch (TeamException e) { - throw CVSException.wrapException(e); - } + resourceLock.release(rule, monitor); + } catch (TeamException e) { + throw CVSException.wrapException(e); + } } /* @@ -532,21 +532,21 @@ public class EclipseSynchronizer implements IFlushOperation { */ private void beginOperation() { try { - // Do not try to acquire the lock if the resources tree is locked - // The reason for this is that during the resource delta phase (i.e. when the tree is locked) - // the workspace lock is held. If we obtain our lock, there is - // a chance of dealock. It is OK if we don't as we are still protected - // by scheduling rules and the workspace lock. - if (ResourcesPlugin.getWorkspace().isTreeLocked()) return; - } catch (RuntimeException e) { - // If we are not active, throw a cancel. Otherwise, propogate it. - // (see bug 78303) - if (Platform.getBundle(CVSProviderPlugin.ID).getState() == Bundle.ACTIVE) { - throw e; - } else { - throw new OperationCanceledException(); - } - } + // Do not try to acquire the lock if the resources tree is locked + // The reason for this is that during the resource delta phase (i.e. when the tree is locked) + // the workspace lock is held. If we obtain our lock, there is + // a chance of dealock. It is OK if we don't as we are still protected + // by scheduling rules and the workspace lock. + if (ResourcesPlugin.getWorkspace().isTreeLocked()) return; + } catch (RuntimeException e) { + // If we are not active, throw a cancel. Otherwise, propogate it. + // (see bug 78303) + if (Platform.getBundle(CVSProviderPlugin.ID).getState() == Bundle.ACTIVE) { + throw e; + } else { + throw new OperationCanceledException(); + } + } lock.acquire(); } @@ -555,17 +555,17 @@ public class EclipseSynchronizer implements IFlushOperation { */ private void endOperation() { try { - // See beginOperation() for a description of why the lock is not obtained when the tree is locked - if (ResourcesPlugin.getWorkspace().isTreeLocked()) return; - } catch (RuntimeException e) { - // If we are not active, throw a cancel. Otherwise, propogate it. - // (see bug 78303) - if (Platform.getBundle(CVSProviderPlugin.ID).getState() == Bundle.ACTIVE) { - throw e; - } else { - throw new OperationCanceledException(); - } - } + // See beginOperation() for a description of why the lock is not obtained when the tree is locked + if (ResourcesPlugin.getWorkspace().isTreeLocked()) return; + } catch (RuntimeException e) { + // If we are not active, throw a cancel. Otherwise, propogate it. + // (see bug 78303) + if (Platform.getBundle(CVSProviderPlugin.ID).getState() == Bundle.ACTIVE) { + throw e; + } else { + throw new OperationCanceledException(); + } + } lock.release(); } @@ -595,8 +595,8 @@ public class EclipseSynchronizer implements IFlushOperation { // Flush changes to disk resourceLock.flush(Policy.subMonitorFor(monitor, 8)); } catch (TeamException e) { - throw CVSException.wrapException(e); - } finally { + throw CVSException.wrapException(e); + } finally { // Purge the in-memory cache sessionPropertyCache.purgeCache(root, deep); } @@ -638,55 +638,55 @@ public class EclipseSynchronizer implements IFlushOperation { public void ignoreFilesChanged(IContainer[] roots) throws CVSException { for (int i = 0; i < roots.length; i++) { IContainer container = roots[i]; - if (container.exists()) { - ISchedulingRule rule = null; - try { - Set<IResource> changed = new HashSet<>(); - rule = beginBatching(container, null); - try { - beginOperation(); - - // Record the previous ignore pattterns - FileNameMatcher oldIgnores = null; - if (sessionPropertyCache.isFolderSyncInfoCached(container)) { - oldIgnores = cacheFolderIgnores(container); - } - - // Purge the cached state for direct children of the container - changed.addAll(Arrays.asList( - sessionPropertyCache.purgeCache(container, oldIgnores == null /*flush deeply if the old patterns are not known*/))); - - // Purge the state for any children of previously ignored containers - if (oldIgnores != null) { - FileNameMatcher newIgnores = cacheFolderIgnores(container); - try { - IResource[] members = container.members(); - for (int j = 0; j < members.length; j++) { - IResource resource = members[j]; - if (resource.getType() == IResource.FOLDER) { - String name = resource.getName(); - if (oldIgnores.match(name) && !newIgnores.match(name)) { - changed.addAll(Arrays.asList( - sessionPropertyCache.purgeCache((IContainer)resource, true /*flush deeply*/))); - } - } - } - } catch (CoreException e) { - // Just log and continue - CVSProviderPlugin.log(e); - } - } - } finally { - endOperation(); - } - if (!changed.isEmpty()) { - ResourceStateChangeListeners.getListener().resourceSyncInfoChanged( - changed.toArray(new IResource[changed.size()])); - } - } finally { - if (rule != null) endBatching(rule, null); - } - } + if (container.exists()) { + ISchedulingRule rule = null; + try { + Set<IResource> changed = new HashSet<>(); + rule = beginBatching(container, null); + try { + beginOperation(); + + // Record the previous ignore pattterns + FileNameMatcher oldIgnores = null; + if (sessionPropertyCache.isFolderSyncInfoCached(container)) { + oldIgnores = cacheFolderIgnores(container); + } + + // Purge the cached state for direct children of the container + changed.addAll(Arrays.asList( + sessionPropertyCache.purgeCache(container, oldIgnores == null /*flush deeply if the old patterns are not known*/))); + + // Purge the state for any children of previously ignored containers + if (oldIgnores != null) { + FileNameMatcher newIgnores = cacheFolderIgnores(container); + try { + IResource[] members = container.members(); + for (int j = 0; j < members.length; j++) { + IResource resource = members[j]; + if (resource.getType() == IResource.FOLDER) { + String name = resource.getName(); + if (oldIgnores.match(name) && !newIgnores.match(name)) { + changed.addAll(Arrays.asList( + sessionPropertyCache.purgeCache((IContainer)resource, true /*flush deeply*/))); + } + } + } + } catch (CoreException e) { + // Just log and continue + CVSProviderPlugin.log(e); + } + } + } finally { + endOperation(); + } + if (!changed.isEmpty()) { + ResourceStateChangeListeners.getListener().resourceSyncInfoChanged( + changed.toArray(new IResource[changed.size()])); + } + } finally { + if (rule != null) endBatching(rule, null); + } + } } } @@ -954,9 +954,9 @@ public class EclipseSynchronizer implements IFlushOperation { IResource[] changedResources = threadInfo.getChangedResources(); IContainer[] changedFolders; if (threadInfo instanceof CVSThreadInfo) { - changedFolders = ((CVSThreadInfo)threadInfo).getChangedFolders(); + changedFolders = ((CVSThreadInfo)threadInfo).getChangedFolders(); } else { - changedFolders = new IContainer[0]; + changedFolders = new IContainer[0]; } Set<IContainer> dirtyParents = new HashSet<>(); for (int i = 0; i < changedResources.length; i++) { @@ -981,7 +981,7 @@ public class EclipseSynchronizer implements IFlushOperation { IContainer folder = changedFolders[i]; if (folder.exists() && folder.getType() != IResource.ROOT) { try { - beginOperation(); + beginOperation(); FolderSyncInfo info = sessionPropertyCache.getCachedFolderSync(folder, true); // Do not write the folder sync for linked resources if (info == null) { @@ -1002,8 +1002,8 @@ public class EclipseSynchronizer implements IFlushOperation { } errors.add(e.getStatus()); } finally { - endOperation(); - } + endOperation(); + } } monitor.worked(1); } @@ -1017,7 +1017,7 @@ public class EclipseSynchronizer implements IFlushOperation { if (folder.exists() && folder.getType() != IResource.ROOT) { // write sync info for all children in one go try { - beginOperation(); + beginOperation(); List<byte[]> infos = new ArrayList<>(); IResource[] children = folder.members(true); for (int i = 0; i < children.length; i++) { @@ -1046,8 +1046,8 @@ public class EclipseSynchronizer implements IFlushOperation { } errors.add(e.getStatus()); } finally { - endOperation(); - } + endOperation(); + } } monitor.worked(1); } @@ -1114,9 +1114,9 @@ public class EclipseSynchronizer implements IFlushOperation { } /** - * Sets the resource sync info for the resource; if null, deletes it. Parent - * must exist and must not be the workspace root. The resource sync info for - * the children of the parent container MUST ALREADY BE CACHED. + * Sets the resource sync info for the resource; if null, deletes it. Parent + * must exist and must not be the workspace root. The resource sync info for + * the children of the parent container MUST ALREADY BE CACHED. * * @param resource the resource * @param info the new resource sync info @@ -1523,10 +1523,10 @@ public class EclipseSynchronizer implements IFlushOperation { } protected String getDirtyIndicator(IResource resource) throws CVSException { - // Do a check outside the lock for the dirty indicator - String indicator = getSyncInfoCacheFor(resource).getDirtyIndicator(resource, false /* not thread safe */); - if (indicator != null) - return indicator; + // Do a check outside the lock for the dirty indicator + String indicator = getSyncInfoCacheFor(resource).getDirtyIndicator(resource, false /* not thread safe */); + if (indicator != null) + return indicator; try { beginOperation(); return getSyncInfoCacheFor(resource).getDirtyIndicator(resource, true); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java index 3a9b0e33f..f1521f44c 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java @@ -40,23 +40,23 @@ import org.eclipse.team.internal.ccvs.core.syncinfo.*; * use by the repository and sync view. */ public class RemoteFile extends RemoteResource implements ICVSRemoteFile { - /* - * Listener for accumulating the entries fetched using the "cvs log" command - */ + /* + * Listener for accumulating the entries fetched using the "cvs log" command + */ private final class LogEntryListener implements ILogEntryListener { - private final List<ILogEntry> entries = new ArrayList<>(); - @Override + private final List<ILogEntry> entries = new ArrayList<>(); + @Override public void handleLogEntryReceived(ILogEntry entry) { - if (entry.getRemoteFile().getRepositoryRelativePath().equals(getRepositoryRelativePath())) { - entries.add(entry); - } - } - public ILogEntry[] getEntries() { - return entries.toArray(new ILogEntry[entries.size()]); - } - } + if (entry.getRemoteFile().getRepositoryRelativePath().equals(getRepositoryRelativePath())) { + entries.add(entry); + } + } + public ILogEntry[] getEntries() { + return entries.toArray(new ILogEntry[entries.size()]); + } + } - // sync info in byte form + // sync info in byte form private byte[] syncBytes; // cache the log entry for the remote file private ILogEntry entry; @@ -204,7 +204,7 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile { private void internalFetchContents(IProgressMonitor monitor) throws CVSException { monitor.beginTask(CVSMessages.RemoteFile_getContents, 100); - monitor.subTask(CVSMessages.RemoteFile_getContents); + monitor.subTask(CVSMessages.RemoteFile_getContents); if (getRevision().equals(ResourceSyncInfo.ADDED_REVISION)) { // The revision of the remote file is not known so we need to use the tag to get the status of the file CVSTag tag = getSyncInfo().getTag(); @@ -242,7 +242,7 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile { session.open(Policy.subMonitorFor(monitor, 10), false /* read-only */); try { try { - LogEntryListener listener = new LogEntryListener(); + LogEntryListener listener = new LogEntryListener(); IStatus status = Command.LOG.execute( session, Command.NO_GLOBAL_OPTIONS, @@ -423,7 +423,7 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile { @Override public void setReadOnly(boolean readOnly) { // RemoteFiles are always read only - } + } @Override public boolean isReadOnly() { @@ -465,7 +465,7 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile { * * The revision of the remote file is used as the base for the tagging operation */ - @Override + @Override public IStatus tag(final CVSTag tag, final LocalOption[] localOptions, IProgressMonitor monitor) throws CVSException { monitor = Policy.monitorFor(monitor); monitor.beginTask(null, 100); @@ -483,7 +483,7 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile { } finally { session.close(); } - } + } @Override public boolean equals(Object target) { @@ -602,7 +602,7 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile { * @throws TeamException */ public void setContents(IFile file, IProgressMonitor monitor) throws TeamException, CoreException { - setContents(file.getContents(), monitor); + setContents(file.getContents(), monitor); } @Override 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 567c90813..8b5770dc4 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 @@ -412,9 +412,9 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC * @see ICVSRemoteFolder#setTag(String) */ public void setTag(CVSTag tag) { - MutableFolderSyncInfo newInfo = folderInfo.cloneMutable(); - newInfo.setTag(tag); - setFolderSyncInfo(newInfo); + MutableFolderSyncInfo newInfo = folderInfo.cloneMutable(); + newInfo.setTag(tag); + setFolderSyncInfo(newInfo); } @Override @@ -451,8 +451,8 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC } finally { session.close(); } - } - + } + @Override public ICVSResource[] fetchChildren(IProgressMonitor monitor) throws CVSException { try { 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 d6d297ffc..b2bf01607 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 @@ -175,10 +175,10 @@ public class RemoteFolderMemberFetcher implements IUpdateMessageListener, IStatu try { IPath path = this.parentFolder.getRelativePathFromRootRelativePath(commandRoot, new Path(null, stringPath)); if (path.segmentCount() == 1) { - String pathName = path.lastSegment(); - if (!pathName.equals(".")) { //$NON-NLS-1$ - recordFolder(path.lastSegment()); - } + String pathName = path.lastSegment(); + if (!pathName.equals(".")) { //$NON-NLS-1$ + recordFolder(path.lastSegment()); + } } } catch (CVSException e) { exceptions.add(e); 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 4c2f3a2ae..6ff79882a 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 @@ -126,7 +126,7 @@ public class RemoteFolderTreeBuilder { IProgressMonitor subProgress = Policy.infiniteSubMonitorFor(progress, 100); subProgress.beginTask(null, 512); subProgress.subTask(NLS.bind(CVSMessages.RemoteFolderTreeBuilder_buildingBase, new String[] { root.getName() })); - return builder.buildBaseTree(null, root, subProgress); + return builder.buildBaseTree(null, root, subProgress); } finally { progress.done(); } @@ -138,11 +138,11 @@ public class RemoteFolderTreeBuilder { public static RemoteFolderTree buildRemoteTree(CVSRepositoryLocation repository, ICVSFolder root, CVSTag tag, IProgressMonitor monitor) throws CVSException { RemoteFolderTreeBuilder builder = new RemoteFolderTreeBuilder(repository, root, tag); - return builder.buildTree(new ICVSResource[] { root }, monitor); + return builder.buildTree(new ICVSResource[] { root }, monitor); } public static RemoteFile buildRemoteTree(CVSRepositoryLocation repository, ICVSFile file, CVSTag tag, IProgressMonitor monitor) throws CVSException { RemoteFolderTreeBuilder builder = new RemoteFolderTreeBuilder(repository, file.getParent(), tag); - return builder.buildTree(file, monitor); + return builder.buildTree(file, monitor); } /* package */ RemoteFolderTree buildTree(ICVSResource[] resources, IProgressMonitor monitor) throws CVSException { @@ -215,24 +215,24 @@ public class RemoteFolderTreeBuilder { Session session; FolderSyncInfo folderSyncInfo = root.getFolderSyncInfo(); if (folderSyncInfo == null) { - // We've lost the mapping in the local workspace. - // This could be due to the project being deleted. - if (root.exists()) { - IResource resource = root.getIResource(); - String path; - if (resource == null) { - path = root.getName(); - } else { - path = resource.getFullPath().toString(); - } - IStatus status = new CVSStatus(IStatus.ERROR, CVSStatus.ERROR, NLS.bind(CVSMessages.RemoteFolderTreeBuilder_0, new String[] { path }), root); - throw new CVSException(status); - } else { - // Just return. The remote tree will be null - return; - } + // We've lost the mapping in the local workspace. + // This could be due to the project being deleted. + if (root.exists()) { + IResource resource = root.getIResource(); + String path; + if (resource == null) { + path = root.getName(); + } else { + path = resource.getFullPath().toString(); + } + IStatus status = new CVSStatus(IStatus.ERROR, CVSStatus.ERROR, NLS.bind(CVSMessages.RemoteFolderTreeBuilder_0, new String[] { path }), root); + throw new CVSException(status); + } else { + // Just return. The remote tree will be null + return; + } } - remoteRoot = + remoteRoot = new RemoteFolderTree(null, root.getName(), repository, folderSyncInfo.getRepository(), tagForRemoteFolder(root, tag)); @@ -374,7 +374,7 @@ public class RemoteFolderTreeBuilder { // Create a remote folder tree corresponding to the local resource FolderSyncInfo folderSyncInfo = local.getFolderSyncInfo(); if (folderSyncInfo == null) return null; - RemoteFolder remote = createRemoteFolder(local, parent, folderSyncInfo); + RemoteFolder remote = createRemoteFolder(local, parent, folderSyncInfo); // Create a List to contain the created children List<RemoteResource> children = new ArrayList<>(); @@ -387,7 +387,7 @@ public class RemoteFolderTreeBuilder { monitor.worked(1); RemoteFolder tree = buildBaseTree(remote, folder, monitor); if (tree != null) - children.add(tree); + children.add(tree); } } 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 0877316bb..09935efe9 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 @@ -54,11 +54,11 @@ public class RemoteModule extends RemoteFolder { } } - private static ICVSFolder getRemoteRootFolder(ICVSRepositoryLocation repository) { - return new RemoteFolder(null, repository, "/", null); //$NON-NLS-1$ - } + private static ICVSFolder getRemoteRootFolder(ICVSRepositoryLocation repository) { + return new RemoteFolder(null, repository, "/", null); //$NON-NLS-1$ + } - /** + /** * Create a set of RemoteModules from the provided module definition strings returned from the server * * At the moment, we are very restrictive on the types of modules we support. @@ -191,7 +191,7 @@ public class RemoteModule extends RemoteFolder { // XXX Unsupported for now expandable = false; } else { - referencedFolders.add(child); + referencedFolders.add(child); } } } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java index 33e526700..0af77ed00 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java @@ -62,13 +62,13 @@ public abstract class RemoteResource extends CachedResourceVariant implements IC public abstract ICVSRepositoryLocation getRepository(); - public int getWorkspaceSyncState() { - return workspaceSyncState; - } - - public void setWorkspaceSyncState(int workspaceSyncState) { - this.workspaceSyncState = workspaceSyncState; - } + public int getWorkspaceSyncState() { + return workspaceSyncState; + } + + public void setWorkspaceSyncState(int workspaceSyncState) { + this.workspaceSyncState = workspaceSyncState; + } public void delete() { // For now, do nothing but we could provide this in the future. @@ -92,7 +92,7 @@ public abstract class RemoteResource extends CachedResourceVariant implements IC public ICVSFolder getParent() { return parent; - } + } public boolean isIgnored() { return false; 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 0c09bafc6..3ec9dc795 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 @@ -82,10 +82,10 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileWriter; } return matcher; } - - /* package */ boolean isIgnoresCached(IContainer container) throws CVSException { - return safeGetSessionProperty(container, IGNORE_SYNC_KEY) != null; - } + + /* package */ boolean isIgnoresCached(IContainer container) throws CVSException { + return safeGetSessionProperty(container, IGNORE_SYNC_KEY) != null; + } /*package*/ boolean isFolderSyncInfoCached(IContainer container) throws CVSException { Object info = safeGetSessionProperty(container, FOLDER_SYNC_KEY); @@ -115,9 +115,9 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileWriter; */ FolderSyncInfo getCachedFolderSync(IContainer container, boolean threadSafeAccess) throws CVSException { FolderSyncInfo info = (FolderSyncInfo)safeGetSessionProperty(container, FOLDER_SYNC_KEY); - // If we are not thread safe, just return whatever was found in the session property - if (!threadSafeAccess) - return info == NULL_FOLDER_SYNC_INFO ? null : info; + // If we are not thread safe, just return whatever was found in the session property + if (!threadSafeAccess) + return info == NULL_FOLDER_SYNC_INFO ? null : info; if (info == null) { // Defer to the synchronizer in case the folder was recreated info = synchronizerCache.getCachedFolderSync(container, true); @@ -258,10 +258,10 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileWriter; } else { di = RECOMPUTE_INDICATOR; } - // Only set the session property if we are thread safe - if (threadSafeAccess) { - setDirtyIndicator(container, di); - } + // Only set the session property if we are thread safe + if (threadSafeAccess) { + setDirtyIndicator(container, di); + } } return di; } catch (CoreException e) { @@ -306,8 +306,8 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileWriter; byte[] getCachedSyncBytes(IResource resource, boolean threadSafeAccess) throws CVSException { byte[] bytes = (byte[])safeGetSessionProperty(resource, RESOURCE_SYNC_KEY); // If we are not thread safe, just return whatever was found in the session property - if (!threadSafeAccess) - return bytes; + if (!threadSafeAccess) + return bytes; if (bytes == null) { // Defer to the synchronizer in case the file was recreated bytes = synchronizerCache.getCachedSyncBytes(resource, true); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SyncInfoCache.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SyncInfoCache.java index 75077dfe5..2dcbbb1e2 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SyncInfoCache.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SyncInfoCache.java @@ -54,7 +54,7 @@ import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; * holds a scheduling rule that encompasses the resource and the workspace is * open for modification. * @param container the container - * @param threadSafeAccess if false, the return value can only be used if not null + * @param threadSafeAccess if false, the return value can only be used if not null * @param canModifyWorkspace indicates if it is OK to modify the ISycnrhonizer * * @return the folder sync info for the folder, or null if none. 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 18280a3d2..c062b6a19 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 @@ -97,10 +97,10 @@ public class UpdateContentCachingService implements IUpdateMessageListener { // Handle execute try { if (executable) mFile.setExecutable(true); - } catch (CVSException e) { - // Just log and keep going - CVSProviderPlugin.log(e); - } + } catch (CVSException e) { + // Just log and keep going + CVSProviderPlugin.log(e); + } } } @@ -164,14 +164,14 @@ public class UpdateContentCachingService implements IUpdateMessageListener { IProgressMonitor subProgress = Policy.infiniteSubMonitorFor(progress, 100); subProgress.beginTask(null, 512); subProgress.subTask(NLS.bind(CVSMessages.RemoteFolderTreeBuilder_buildingBase, new String[] { root.getName() })); - RemoteFolder tree = builder.buildBaseTree(null, root, subProgress); - if (tree == null) { - // The local tree is empty and was pruned. - // Return the root folder so that the operation can proceed - FolderSyncInfo folderSyncInfo = root.getFolderSyncInfo(); - if (folderSyncInfo == null) return null; - return new RemoteFolderSandbox(null, root.getName(), repository, folderSyncInfo.getRepository(), folderSyncInfo.getTag(), folderSyncInfo.getIsStatic()); - } + RemoteFolder tree = builder.buildBaseTree(null, root, subProgress); + if (tree == null) { + // The local tree is empty and was pruned. + // Return the root folder so that the operation can proceed + FolderSyncInfo folderSyncInfo = root.getFolderSyncInfo(); + if (folderSyncInfo == null) return null; + return new RemoteFolderSandbox(null, root.getName(), repository, folderSyncInfo.getRepository(), folderSyncInfo.getTag(), folderSyncInfo.getIsStatic()); + } return tree; } finally { progress.done(); @@ -250,8 +250,8 @@ public class UpdateContentCachingService implements IUpdateMessageListener { private boolean isReportableError(IStatus status) { return CVSStatus.isInternalError(status) || status.getCode() == TeamException.UNABLE - || status.getCode() == CVSStatus.INVALID_LOCAL_RESOURCE_PATH - || status.getCode() == CVSStatus.RESPONSE_HANDLING_FAILURE; + || status.getCode() == CVSStatus.INVALID_LOCAL_RESOURCE_PATH + || status.getCode() == CVSStatus.RESPONSE_HANDLING_FAILURE; } private LocalOption[] getLocalOptions() { |