diff options
Diffstat (limited to 'bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers')
31 files changed, 310 insertions, 310 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/AbstractSynchronizationScope.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/AbstractSynchronizationScope.java index 3b9e346f2..c1ee04158 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/AbstractSynchronizationScope.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/AbstractSynchronizationScope.java @@ -21,7 +21,7 @@ import org.eclipse.team.core.mapping.ISynchronizationScopeChangeListener; /** * An abstract implementation of an {@link ISynchronizationScope}. - * + * * @since 3.2 */ public abstract class AbstractSynchronizationScope implements ISynchronizationScope { @@ -44,7 +44,7 @@ public abstract class AbstractSynchronizationScope implements ISynchronizationSc } return (IResource[]) result.toArray(new IResource[result.size()]); } - + /* (non-Javadoc) * @see org.eclipse.team.core.mapping.ISynchronizationScope#contains(org.eclipse.core.resources.IResource) */ @@ -57,7 +57,7 @@ public abstract class AbstractSynchronizationScope implements ISynchronizationSc } return false; } - + /* * Add the resource to the list if it isn't there already * or is not a child of an existing resource. @@ -77,7 +77,7 @@ public abstract class AbstractSynchronizationScope implements ISynchronizationSc // There were no higher resources, so add this one roots.add(resource); } - + /** * Fire the scope change event * @param newTraversals the new traversals (may be empty) diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSet.java index 01d8af75a..3daba8f6a 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSet.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSet.java @@ -25,16 +25,16 @@ import org.osgi.service.prefs.Preferences; * @since 3.1 */ public class ActiveChangeSet extends DiffChangeSet { - + private static final String CTX_TITLE = "title"; //$NON-NLS-1$ private static final String CTX_COMMENT = "comment"; //$NON-NLS-1$ private static final String CTX_RESOURCES = "resources"; //$NON-NLS-1$ private static final String CTX_USER_CREATED = "userCreated"; //$NON-NLS-1$ - + private final ActiveChangeSetManager manager; private String comment; private boolean userCreated = true; - + /** * Create a change set with the given title * @param manager the manager that owns this set @@ -54,7 +54,7 @@ public class ActiveChangeSet extends DiffChangeSet { public String getTitle() { return getName(); } - + /** * Set the title of the set. The title is used * as the comment when the set is committed if no comment @@ -77,7 +77,7 @@ public class ActiveChangeSet extends DiffChangeSet { } return comment; } - + /** * Set the comment to be used when the change set is committed. * If <code>null</code> is passed, the title of the set @@ -118,7 +118,7 @@ public class ActiveChangeSet extends DiffChangeSet { public boolean hasComment() { return comment != null; } - + public void save(Preferences prefs) { prefs.put(CTX_TITLE, getTitle()); if (comment != null) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSetManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSetManager.java index 941fa5966..4f12c624b 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSetManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSetManager.java @@ -33,7 +33,7 @@ import org.osgi.service.prefs.Preferences; public abstract class ActiveChangeSetManager extends ChangeSetManager implements IDiffChangeListener, IChangeGroupingRequestor { private static final String CTX_DEFAULT_SET = "defaultSet"; //$NON-NLS-1$ - + private ActiveChangeSet defaultSet; /** @@ -52,7 +52,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements } return null; } - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.subscribers.ChangeSetManager#add(org.eclipse.team.internal.core.subscribers.ChangeSet) */ @@ -60,7 +60,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements Assert.isTrue(set instanceof ActiveChangeSet); super.add(set); } - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.subscribers.AbstractChangeSetCollector#handleSetAdded(org.eclipse.team.internal.core.subscribers.ChangeSet) */ @@ -70,7 +70,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements super.handleSetAdded(set); handleAddedResources(set, ((ActiveChangeSet)set).internalGetDiffTree().getDiffs()); } - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.subscribers.AbstractChangeSetCollector#handleSetRemoved(org.eclipse.team.internal.core.subscribers.ChangeSet) */ @@ -78,7 +78,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements ((DiffChangeSet)set).getDiffTree().removeDiffChangeListener(getDiffTreeListener()); super.handleSetRemoved(set); } - + /** * Return the listener that is registered with the diff trees associated with * the sets for this manager. @@ -88,7 +88,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements protected IDiffChangeListener getDiffTreeListener() { return this; } - + /* (non-Javadoc) * @see org.eclipse.team.core.diff.IDiffChangeListener#diffsChanged(org.eclipse.team.core.diff.IDiffChangeEvent, org.eclipse.core.runtime.IProgressMonitor) */ @@ -96,21 +96,21 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements IResourceDiffTree tree = (IResourceDiffTree)event.getTree(); handleSyncSetChange(tree, event.getAdditions(), getAllResources(event)); } - + /* (non-Javadoc) * @see org.eclipse.team.core.diff.IDiffChangeListener#propertyChanged(org.eclipse.team.core.diff.IDiffTree, int, org.eclipse.core.runtime.IPath[]) */ public void propertyChanged(IDiffTree tree, int property, IPath[] paths) { // ignore } - + public boolean isModified(IFile file) throws CoreException { IDiff diff = getDiff(file); if (diff != null) return isModified(diff); return false; } - + /** * Return whether the given diff represents a local change. * @param diff the diff @@ -258,7 +258,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements /** * Make the given set the default set into which all new modifications that * are not already in another set go. - * + * * @param set * the set which is to become the default set or * <code>null</code> to unset the default set @@ -282,7 +282,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements public boolean isDefault(ActiveChangeSet set) { return set == defaultSet; } - + /** * Return the set which is currently the default or * <code>null</code> if there is no default set. @@ -291,7 +291,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements public ActiveChangeSet getDefaultSet() { return defaultSet; } - + /** * If the given traversals contain any resources in the active change sets, ensure * that the traversals cover all the resources in the overlapping change set. @@ -360,15 +360,15 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements try { prefs.flush(); } catch (BackingStoreException e) { - TeamPlugin.log(IStatus.ERROR, NLS.bind(Messages.SubscriberChangeSetCollector_3, new String[] { getName() }), e); + TeamPlugin.log(IStatus.ERROR, NLS.bind(Messages.SubscriberChangeSetCollector_3, new String[] { getName() }), e); } } - + /** * Escape the given string for safe use as a preference node name by * translating / to \s (so it's a single path component) and \ to \\ (to * preserve uniqueness). - * + * * @param string * Input string * @return Escaped output string @@ -390,10 +390,10 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements } return out.toString(); } - + /** * Load the manager's state from the given preferences node. - * + * * @param prefs * a preferences node */ @@ -413,10 +413,10 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements } } } catch (BackingStoreException e) { - TeamPlugin.log(IStatus.ERROR, NLS.bind(Messages.SubscriberChangeSetCollector_4, new String[] { getName() }), e); + TeamPlugin.log(IStatus.ERROR, NLS.bind(Messages.SubscriberChangeSetCollector_4, new String[] { getName() }), e); } } - + /** * Return the name of this change set manager. * @return the name of this change set manager @@ -424,7 +424,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements protected abstract String getName(); /** - * Create a change set from the given preferences that were + * Create a change set from the given preferences that were * previously saved. * @param childPrefs the previously saved preferences * @return the created change set @@ -436,7 +436,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements changeSet.init(childPrefs); return changeSet; } - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.IChangeGroupingRequestor#ensureChangesGrouped(org.eclipse.core.resources.IProject, org.eclipse.core.resources.IFile[], java.lang.String) */ diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingChangeSetManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingChangeSetManager.java index 09a9c52ea..c52cc1ae8 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingChangeSetManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingChangeSetManager.java @@ -23,14 +23,14 @@ import org.eclipse.team.internal.core.Policy; public class BatchingChangeSetManager extends ChangeSetManager { private ILock lock = Job.getJobManager().newLock(); - + public static class CollectorChangeEvent { Set added = new HashSet(); Set removed = new HashSet(); Map changed = new HashMap(); private final BatchingChangeSetManager collector; - + public CollectorChangeEvent(BatchingChangeSetManager collector) { this.collector = collector; } @@ -91,13 +91,13 @@ public class BatchingChangeSetManager extends ChangeSetManager { return collector; } } - + public static interface IChangeSetCollectorChangeListener { public void changeSetChanges(CollectorChangeEvent event, IProgressMonitor monitor); } - + private CollectorChangeEvent changes = new CollectorChangeEvent(this); - + public void beginInput() { lock.acquire(); } @@ -105,7 +105,7 @@ public class BatchingChangeSetManager extends ChangeSetManager { public void endInput(IProgressMonitor monitor) { try { if (lock.getDepth() == 1) { - // Remain locked while firing the events so the handlers + // Remain locked while firing the events so the handlers // can expect the set to remain constant while they process the events fireChanges(Policy.monitorFor(monitor)); } @@ -113,7 +113,7 @@ public class BatchingChangeSetManager extends ChangeSetManager { lock.release(); } } - + private void fireChanges(final IProgressMonitor monitor) { if (changes.isEmpty()) { return; @@ -136,7 +136,7 @@ public class BatchingChangeSetManager extends ChangeSetManager { } } } - + public void add(ChangeSet set) { try { beginInput(); @@ -146,7 +146,7 @@ public class BatchingChangeSetManager extends ChangeSetManager { endInput(null); } } - + public void remove(ChangeSet set) { try { beginInput(); @@ -156,7 +156,7 @@ public class BatchingChangeSetManager extends ChangeSetManager { endInput(null); } } - + protected void fireResourcesChangedEvent(ChangeSet changeSet, IPath[] allAffectedResources) { super.fireResourcesChangedEvent(changeSet, allAffectedResources); try { @@ -166,7 +166,7 @@ public class BatchingChangeSetManager extends ChangeSetManager { endInput(null); } } - + protected void initializeSets() { // Nothing to do } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingLock.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingLock.java index 6f27f4f38..0fcf72138 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingLock.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingLock.java @@ -23,10 +23,10 @@ import org.eclipse.team.internal.core.*; * lock on a specific resource by calling acquire(). Subsequently, acquire() can be called * multiple times on the resource or any of its children from within the same thread * without blocking. Other threads that try - * and acquire the lock on those same resources will be blocked until the first + * and acquire the lock on those same resources will be blocked until the first * thread releases all it's nested locks. * <p> - * The locking is managed by the platform via scheduling rules. This class simply + * The locking is managed by the platform via scheduling rules. This class simply * provides the nesting mechanism in order to allow the client to determine when * the lock for the thread has been released. Therefore, this lock will block if * another thread already locks the same resource.</p> @@ -41,7 +41,7 @@ public class BatchingLock { return false; } }; - + public class ThreadInfo { private Set changedResources = new HashSet(); private IFlushOperation operation; @@ -53,7 +53,7 @@ public class BatchingLock { * Push a scheduling rule onto the stack for this thread and * acquire the rule if it is not the workspace root. * @param resource - * @param monitor + * @param monitor * @return the scheduling rule that was obtained */ public ISchedulingRule pushRule(ISchedulingRule resource, IProgressMonitor monitor) { @@ -88,11 +88,11 @@ public class BatchingLock { } /** * Pop the scheduling rule from the stack and release it if it - * is not the workspace root. Flush any changed sync info to + * is not the workspace root. Flush any changed sync info to * disk if necessary. A flush is necessary if the stack is empty * or if the top-most non-null scheduling rule was popped as a result * of this operation. - * @param rule + * @param rule * @param monitor * @throws TeamException */ @@ -150,7 +150,7 @@ public class BatchingLock { /** * Return <code>true</code> if we are still nested in * an acquire for this thread. - * + * * @return whether there are still rules on the stack */ public boolean isNested() { @@ -198,7 +198,7 @@ public class BatchingLock { return true; } private void handleAbortedFlush(Throwable t) { - TeamPlugin.log(IStatus.ERROR, Messages.BatchingLock_11, t); + TeamPlugin.log(IStatus.ERROR, Messages.BatchingLock_11, t); } private void addRule(ISchedulingRule rule) { rules.add(rule); @@ -216,13 +216,13 @@ public class BatchingLock { return false; } } - + public interface IFlushOperation { public void flush(ThreadInfo info, IProgressMonitor monitor) throws TeamException; } - + private Map infos = new HashMap(); - + /** * Return the thread info for the current thread * @return the thread info for the current thread @@ -234,7 +234,7 @@ public class BatchingLock { return info; } } - + private ThreadInfo getThreadInfo(IResource resource) { synchronized (infos) { for (Iterator iter = infos.values().iterator(); iter.hasNext();) { @@ -246,7 +246,7 @@ public class BatchingLock { return null; } } - + public ISchedulingRule acquire(ISchedulingRule resourceRule, IFlushOperation operation, IProgressMonitor monitor) { ThreadInfo info = getThreadInfo(); boolean added = false; @@ -272,9 +272,9 @@ public class BatchingLock { throw e; } } - + /** - * Create the ThreadInfo instance used to cache the lock state for the + * Create the ThreadInfo instance used to cache the lock state for the * current thread. Subclass can override to provide a subclass of * ThreadInfo. * @param operation the flush operation @@ -291,7 +291,7 @@ public class BatchingLock { * the the flush operation provided in the acquire method will be executed. * @param rule the scheduling rule * @param monitor a progress monitor - * @throws TeamException + * @throws TeamException */ public void release(ISchedulingRule rule, IProgressMonitor monitor) throws TeamException { ThreadInfo info = getThreadInfo(); @@ -316,7 +316,7 @@ public class BatchingLock { /** * Flush any changes accumulated by the lock so far. * @param monitor a progress monitor - * @throws TeamException + * @throws TeamException */ public void flush(IProgressMonitor monitor) throws TeamException { ThreadInfo info = getThreadInfo(); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSet.java index 944777106..31d374fbc 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSet.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSet.java @@ -16,7 +16,7 @@ import org.eclipse.core.resources.IResource; * A set that contains a group of related changes */ public abstract class ChangeSet { - + private String name; /** @@ -27,7 +27,7 @@ public abstract class ChangeSet { protected ChangeSet() { super(); } - + /** * Create a change set with the given name. * @param name the name of the change set @@ -41,7 +41,7 @@ public abstract class ChangeSet { * @return the resources that are contained in this set */ public abstract IResource[] getResources(); - + /** * Return whether the set contains any files. * @return whether the set contains any files @@ -54,13 +54,13 @@ public abstract class ChangeSet { * @return true if the given file is included in this set */ public abstract boolean contains(IResource local); - + /** * Remove the resource from the set. * @param resource the resource to be removed */ public abstract void remove(IResource resource); - + /** * Remove the resources from the set. * @param resources the resources to be removed @@ -71,7 +71,7 @@ public abstract class ChangeSet { remove(resource); } } - + /** * Remove the resource and it's descendants to the given depth. * @param resource the resource to be removed @@ -79,7 +79,7 @@ public abstract class ChangeSet { * <code>IResource.DEPTH_ZERO, IResource.DEPTH_ONE, IResource.DEPTH_INFINITE)</code> */ public abstract void rootRemoved(IResource resource, int depth); - + /** * Return a comment describing the change. * @return a comment describing the change diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSetManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSetManager.java index 96e6a7783..6164daae2 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSetManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSetManager.java @@ -22,7 +22,7 @@ public abstract class ChangeSetManager { private ListenerList listeners = new ListenerList(ListenerList.IDENTITY); private Set sets; private boolean initializing; - + /** * Return the list of listeners registered with this change set manager. * @return the list of listeners registered with this change set manager @@ -30,7 +30,7 @@ public abstract class ChangeSetManager { protected Object[] getListeners() { return listeners.getListeners(); } - + /** * Method that can be invoked by subclasses when the name of * a managed change set changes. @@ -54,7 +54,7 @@ public abstract class ChangeSetManager { } } } - + /** * Method which allows subclasses to notify listeners that the default * set has changed. @@ -77,7 +77,7 @@ public abstract class ChangeSetManager { }); } } - + /** * Add the set to the list of active sets. * @param set the set to be added @@ -175,7 +175,7 @@ public abstract class ChangeSetManager { Set sets = internalGetSets(); return (ChangeSet[]) sets.toArray(new ChangeSet[sets.size()]); } - + /** * Dispose of any resources maintained by the manager */ @@ -204,7 +204,7 @@ public abstract class ChangeSetManager { }); } } - + private Set internalGetSets() { if (sets == null) { sets = Collections.synchronizedSet(new HashSet()); @@ -223,7 +223,7 @@ public abstract class ChangeSetManager { * This method is called the first time the sets are accessed. */ protected abstract void initializeSets(); - + public boolean isInitialized() { return sets != null; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/CheckedInChangeSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/CheckedInChangeSet.java index 514d041f6..473238e35 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/CheckedInChangeSet.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/CheckedInChangeSet.java @@ -19,7 +19,7 @@ import org.eclipse.team.core.synchronize.SyncInfoTree; /** * A checked-in change set represents a group of resource * changes that were previously checked into a repository - * as a single logical change. + * as a single logical change. * <p> * A previously checked-in set of changes may not apply directly * to the local versions of the resources involved. However, @@ -29,13 +29,13 @@ import org.eclipse.team.core.synchronize.SyncInfoTree; * @since 3.1 */ public abstract class CheckedInChangeSet extends ChangeSet { - + private final SyncInfoTree set = new SyncInfoTree(); - + public abstract String getAuthor(); - + public abstract Date getDate(); - + /** * Return the SyncInfoSet that contains the resources that belong to this change set. * @return the SyncInfoSet that contains the resources that belong to this change set @@ -51,7 +51,7 @@ public abstract class CheckedInChangeSet extends ChangeSet { public IResource[] getResources() { return set.getResources(); } - + /** * Return whether the set contains any files. * @return whether the set contains any files @@ -68,7 +68,7 @@ public abstract class CheckedInChangeSet extends ChangeSet { public boolean contains(IResource local) { return set.getSyncInfo(local) != null; } - + /** * Add the resource to this set if it is modified * w.r.t. the subscriber. @@ -79,7 +79,7 @@ public abstract class CheckedInChangeSet extends ChangeSet { set.add(info); } } - + /** * Return whether the given sync info is a valid change * and can be included in this set. This method is used @@ -107,7 +107,7 @@ public abstract class CheckedInChangeSet extends ChangeSet { set.endInput(null); } } - + /** * Remove the resource from the set. * @param resource the resource to be removed @@ -117,7 +117,7 @@ public abstract class CheckedInChangeSet extends ChangeSet { set.remove(resource); } } - + /** * Remove the resources from the set. * @param resources the resources to be removed @@ -128,7 +128,7 @@ public abstract class CheckedInChangeSet extends ChangeSet { remove(resource); } } - + /** * Remove the resource and it's descendants to the given depth. * @param resource the resource to be removed @@ -145,7 +145,7 @@ public abstract class CheckedInChangeSet extends ChangeSet { set.removeAll(resources); } } - + public boolean containsChildren(IResource resource, int depth) { return set.getSyncInfos(resource, depth).length > 0; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ContentComparator.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ContentComparator.java index 9e2e05bca..7f99fcf4e 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ContentComparator.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ContentComparator.java @@ -30,7 +30,7 @@ public class ContentComparator extends AbstractContentComparator{ /** * Returns <code>true</code> if both input streams byte contents is * identical. - * + * * @param is1 * first input to contents compare * @param is2 diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ContentComparisonDiffFilter.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ContentComparisonDiffFilter.java index 5c520db9b..236e4435c 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ContentComparisonDiffFilter.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ContentComparisonDiffFilter.java @@ -22,7 +22,7 @@ import org.eclipse.team.internal.core.mapping.SyncInfoToDiffConverter; public class ContentComparisonDiffFilter extends DiffFilter { ContentComparator criteria = new ContentComparator(false); - + /** * Create a filter that does not ignore whitespace. */ @@ -36,7 +36,7 @@ public class ContentComparisonDiffFilter extends DiffFilter { public ContentComparisonDiffFilter(boolean ignoreWhitespace) { criteria = new ContentComparator(ignoreWhitespace); } - + /** * Compare the contents of the local file and its variant. * This is used by the <code>select</code> method to compare the @@ -51,7 +51,7 @@ public class ContentComparisonDiffFilter extends DiffFilter { Assert.isNotNull(remote); return criteria.compare(local, remote, monitor); } - + public boolean select(IDiff diff, IProgressMonitor monitor) { IFileRevision remote = SyncInfoToDiffConverter.getRemote(diff); IResource local = ResourceDiffTree.getResourceFor(diff); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DescendantResourceVariantByteStore.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DescendantResourceVariantByteStore.java index b5f36b8ab..9645ac22b 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DescendantResourceVariantByteStore.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DescendantResourceVariantByteStore.java @@ -34,18 +34,18 @@ import org.eclipse.team.core.variants.*; * ways that invalidate the stored remote variants. For example, if the local * resources are moved from the main trunk to a branch, any cached remote * resource variants would be stale. - * + * * @since 3.0 */ public abstract class DescendantResourceVariantByteStore extends ResourceVariantByteStore { - + ResourceVariantByteStore baseStore, remoteStore; public DescendantResourceVariantByteStore(ResourceVariantByteStore baseCache, ResourceVariantByteStore remoteCache) { this.baseStore = baseCache; this.remoteStore = remoteCache; } - + /** * This method will dispose the remote cache but not the base cache. * @see org.eclipse.team.core.variants.ResourceVariantByteStore#dispose() @@ -94,7 +94,7 @@ public abstract class DescendantResourceVariantByteStore extends ResourceVariant return remoteStore.flushBytes(resource, IResource.DEPTH_ZERO); } else { return remoteStore.setBytes(resource, bytes); - } + } } /* (non-Javadoc) @@ -105,14 +105,14 @@ public abstract class DescendantResourceVariantByteStore extends ResourceVariant } /** - * Return <code>true</code> if the variant associated with the given local + * Return <code>true</code> if the variant associated with the given local * resource has been cached. This method is useful for those cases when * there are no bytes for a resource variant and the client wants to * know if this means that the remote does exist (i.e. this method returns * <code>true</code>) or the remote has not been fetched (i.e. this method returns * <code>false</code>). * @param resource the local resource - * @return <code>true</code> if the variant associated with the given local + * @return <code>true</code> if the variant associated with the given local * resource has been cached. * @throws TeamException */ @@ -129,7 +129,7 @@ public abstract class DescendantResourceVariantByteStore extends ResourceVariant * @return whether the remote bytes are later on the same line-of-descent as the base bytes */ protected abstract boolean isDescendant(IResource resource, byte[] baseBytes, byte[] remoteBytes) throws TeamException; - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.subscribers.caches.ResourceVariantByteStore#setVariantDoesNotExist(org.eclipse.core.resources.IResource) */ @@ -153,7 +153,7 @@ public abstract class DescendantResourceVariantByteStore extends ResourceVariant protected ResourceVariantByteStore getRemoteStore() { return remoteStore; } - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.subscribers.caches.ResourceVariantByteStore#members(org.eclipse.core.resources.IResource) */ @@ -174,7 +174,7 @@ public abstract class DescendantResourceVariantByteStore extends ResourceVariant } return (IResource[]) members.toArray(new IResource[members.size()]); } - + /* (non-Javadoc) * @see org.eclipse.team.core.variants.ResourceVariantByteStore#run(org.eclipse.core.resources.IResource, org.eclipse.core.resources.IWorkspaceRunnable, org.eclipse.core.runtime.IProgressMonitor) */ diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffChangeSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffChangeSet.java index e0e2985fe..d29fd15b3 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffChangeSet.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffChangeSet.java @@ -19,15 +19,15 @@ import org.eclipse.team.core.mapping.provider.ResourceDiffTree; public class DiffChangeSet extends ChangeSet { private final ResourceDiffTree tree = new ResourceDiffTree(); - + public DiffChangeSet() { super(); } - + public DiffChangeSet(String name) { super(name); } - + /** * Return the diff tree that contains the resources that belong to this change set. * @return the diff tree that contains the resources that belong to this change set @@ -35,7 +35,7 @@ public class DiffChangeSet extends ChangeSet { public IResourceDiffTree getDiffTree() { return tree; } - + protected ResourceDiffTree internalGetDiffTree() { return tree; } @@ -47,7 +47,7 @@ public class DiffChangeSet extends ChangeSet { public IResource[] getResources() { return tree.getAffectedResources(); } - + /** * Return whether the set contains any files. * @return whether the set contains any files @@ -64,7 +64,7 @@ public class DiffChangeSet extends ChangeSet { public boolean contains(IResource local) { return tree.getDiff(local) != null; } - + /** * Add the resource to this set if it is modified * w.r.t. the subscriber. @@ -75,7 +75,7 @@ public class DiffChangeSet extends ChangeSet { tree.add(diff); } } - + /** * Return whether the given sync info is a valid change * and can be included in this set. This method is used @@ -103,7 +103,7 @@ public class DiffChangeSet extends ChangeSet { tree.endInput(null); } } - + /** * Remove the resource from the set. * @param resource the resource to be removed @@ -113,7 +113,7 @@ public class DiffChangeSet extends ChangeSet { tree.remove(resource); } } - + /** * Remove the resource and it's descendants to the given depth. * @param resource the resource to be removed @@ -136,11 +136,11 @@ public class DiffChangeSet extends ChangeSet { } } } - + public boolean contains(IPath path) { return getDiffTree().getDiff(path) != null; } - + public boolean containsChildren(IResource resource, int depth) { return getDiffTree().getDiffs(resource, depth).length > 0; } @@ -156,7 +156,7 @@ public class DiffChangeSet extends ChangeSet { tree.endInput(null); } } - + public void remove(IResource[] resources) { try { tree.beginInput(); @@ -168,7 +168,7 @@ public class DiffChangeSet extends ChangeSet { tree.endInput(null); } } - + public String getComment() { return null; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java index ceacbfa73..13706b9c6 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java @@ -34,19 +34,19 @@ public class DiffTreeStatistics { } stats.put(new Integer(state), new Long(count.longValue() + 1)); } - + /** * Remove this sync kind. - * @param state the info type to remove - */ + * @param state the info type to remove + */ public void remove(int state) { // update stats Integer kind = new Integer(state); Long count = (Long)stats.get(kind); if(count == null) { // error condition, shouldn't be removing if we haven't added yet - // programmer error calling remove before add. - } else { + // programmer error calling remove before add. + } else { long newCount = count.intValue() - 1; if(newCount > 0) { stats.put(kind, new Long(newCount)); @@ -55,13 +55,13 @@ public class DiffTreeStatistics { } } } - + /** * Return the count of sync infos for the specified sync kind. A mask can be used to accumulate * counts for specific directions or change types. * To return the number of outgoing changes: * long outgoingChanges = stats.countFor(SyncInfo.OUTGOING, SyncInfo.DIRECTION_MASK); - * + * * @param state the sync kind for which to return the count * @param mask the mask applied to the stored sync kind * @return the number of sync info types added for the specific kind @@ -93,7 +93,7 @@ public class DiffTreeStatistics { public void clear() { stats.clear(); } - + /** * For debugging */ diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/IChangeSetChangeListener.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/IChangeSetChangeListener.java index b67f60932..9d9a9d0fc 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/IChangeSetChangeListener.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/IChangeSetChangeListener.java @@ -24,22 +24,22 @@ public interface IChangeSetChangeListener { * @param set the added set */ void setAdded(ChangeSet set); - + /** * The default change set has change to be the given set. * All new modifications will be placed in the default * set. - * @param previousDefault + * @param previousDefault * @param set the default set */ void defaultSetChanged(ChangeSet previousDefault, ChangeSet set); - + /** * The given set has been removed from the set manager. * @param set the removed set */ void setRemoved(ChangeSet set); - + /** * The title of the given set has changed. * @param set the set whose title changed @@ -48,7 +48,7 @@ public interface IChangeSetChangeListener { /** * The state of the given resources have change with respect to the - * given set. This means that the resource have either been added + * given set. This means that the resource have either been added * or removed from the set. Callers can use the resources contained * in the set to determine if each resource is an addition or removal. * @param set the set that has changed diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberChangeSetManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberChangeSetManager.java index 2988ff72c..2d7466c62 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberChangeSetManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberChangeSetManager.java @@ -28,22 +28,22 @@ import org.osgi.service.prefs.Preferences; * This class manages the active change sets associated with a subscriber. */ public class SubscriberChangeSetManager extends ActiveChangeSetManager { - + private static final String PREF_CHANGE_SETS = "changeSets"; //$NON-NLS-1$ - + private static final int RESOURCE_REMOVAL = 1; private static final int RESOURCE_CHANGE = 2; - + private EventHandler handler; private ResourceCollector collector; - + /* * Background event handler for serializing and batching change set changes */ private class EventHandler extends BackgroundEventHandler { private List dispatchEvents = new ArrayList(); - + protected EventHandler(String jobName, String errorTitle) { super(jobName, errorTitle); } @@ -57,7 +57,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { throw new OperationCanceledException(); dispatchEvents.add(event); } - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.BackgroundEventHandler#doDispatchEvents(org.eclipse.core.runtime.IProgressMonitor) */ @@ -98,7 +98,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { } /* - * Begin input on all the sets and return the sync sets that were + * Begin input on all the sets and return the sync sets that were * locked. If this method throws an exception then the client * can assume that no sets were locked */ @@ -143,13 +143,13 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { } catch (RuntimeException e) { // Don't worry about ending every set if an error occurs. // Instead, log the error and suggest a restart. - TeamPlugin.log(IStatus.ERROR, Messages.SubscriberChangeSetCollector_0, e); + TeamPlugin.log(IStatus.ERROR, Messages.SubscriberChangeSetCollector_0, e); throw e; } } monitor.done(); } - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.BackgroundEventHandler#queueEvent(org.eclipse.team.internal.core.BackgroundEventHandler.Event, boolean) */ @@ -157,7 +157,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { // Override to allow access from enclosing class super.queueEvent(event, front); } - + /* * Handle the removal */ @@ -165,7 +165,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { ChangeSet[] sets = getSets(); for (int i = 0; i < sets.length; i++) { ChangeSet set = sets[i]; - // This will remove any descendants from the set and callback to + // This will remove any descendants from the set and callback to // resourcesChanged which will batch changes if (!set.isEmpty()) { set.rootRemoved(resource, IResource.DEPTH_INFINITE); @@ -175,7 +175,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { } } } - + /* * Handle the change */ @@ -207,7 +207,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { } } } - + private void removeFromAllSets(IResource resource) { List toRemove = new ArrayList(); ChangeSet[] sets = getSets(); @@ -238,7 +238,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { return (ActiveChangeSet[]) result.toArray(new ActiveChangeSet[result.size()]); } } - + private class ResourceCollector extends SubscriberResourceCollector { public ResourceCollector(Subscriber subscriber) { @@ -260,24 +260,24 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { if (handler != null) handler.queueEvent(new BackgroundEventHandler.ResourceEvent(resource, RESOURCE_CHANGE, depth), false); } - + protected boolean hasMembers(IResource resource) { return SubscriberChangeSetManager.this.hasMembers(resource); } } - + public SubscriberChangeSetManager(Subscriber subscriber) { collector = new ResourceCollector(subscriber); - handler = new EventHandler(NLS.bind(Messages.SubscriberChangeSetCollector_1, new String[] { subscriber.getName() }), NLS.bind(Messages.SubscriberChangeSetCollector_2, new String[] { subscriber.getName() })); // + handler = new EventHandler(NLS.bind(Messages.SubscriberChangeSetCollector_1, new String[] { subscriber.getName() }), NLS.bind(Messages.SubscriberChangeSetCollector_2, new String[] { subscriber.getName() })); // } - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.subscribers.ChangeSetManager#initializeSets() */ protected void initializeSets() { load(getPreferences()); } - + public boolean hasMembers(IResource resource) { ChangeSet[] sets = getSets(); for (int i = 0; i < sets.length; i++) { @@ -301,7 +301,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { Subscriber subscriber = getSubscriber(); return subscriber.getDiff(resource); } - + /** * Return the subscriber associated with this collector. * @return the subscriber associated with this collector @@ -323,15 +323,15 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { private Preferences getPreferences() { return getParentPreferences().node(getSubscriberIdentifier()); } - + private static Preferences getParentPreferences() { return getTeamPreferences().node(PREF_CHANGE_SETS); } - + private static Preferences getTeamPreferences() { return InstanceScope.INSTANCE.getNode(TeamPlugin.getPlugin().getBundle().getSymbolicName()); } - + /** * Return the id that will uniquely identify the subscriber across * restarts. @@ -344,7 +344,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { /** * Wait until the collector is done processing any events. * This method is for testing purposes only. - * @param monitor + * @param monitor */ public void waitUntilDone(IProgressMonitor monitor) { monitor.worked(1); @@ -352,7 +352,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { while(handler.getEventHandlerJob().getState() != Job.NONE) { monitor.worked(1); try { - Thread.sleep(10); + Thread.sleep(10); } catch (InterruptedException e) { } Policy.checkCanceled(monitor); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberDiffTreeEventHandler.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberDiffTreeEventHandler.java index 236a10ac3..ac568651e 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberDiffTreeEventHandler.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberDiffTreeEventHandler.java @@ -34,12 +34,12 @@ public class SubscriberDiffTreeEventHandler extends SubscriberEventHandler { private static final int STATE_OK_TO_INITIALIZE = 3; private static final int STATE_COLLECTING_CHANGES = 5; private static final int STATE_SHUTDOWN = 8; - + // state constants for exceptions private static final int EXCEPTION_NONE = 0; private static final int EXCEPTION_CANCELED = 1; private static final int EXCEPTION_ERROR = 2; - + private ResourceDiffTree tree; private SubscriberDiffCollector collector; private ISynchronizationScopeManager manager; @@ -62,7 +62,7 @@ public class SubscriberDiffTreeEventHandler extends SubscriberEventHandler { return node; } } - + /* * Collects resource and subscriber changes */ @@ -93,7 +93,7 @@ public class SubscriberDiffTreeEventHandler extends SubscriberEventHandler { SubscriberDiffTreeEventHandler.this.change(resource, depth); } } - + /** * Create the handler * @param subscriber the subscriber for the handler @@ -138,12 +138,12 @@ public class SubscriberDiffTreeEventHandler extends SubscriberEventHandler { super.reset(traversals, type); } } - + public void reset(){ reset(getScope().getTraversals(), SubscriberEventHandler.SubscriberEvent.INITIALIZE); } - + protected void prepareScope(IProgressMonitor monitor) { try { manager.initialize(monitor); @@ -248,21 +248,21 @@ public class SubscriberDiffTreeEventHandler extends SubscriberEventHandler { } /** - * Return the resource diff tree that contains the out-of-sync diffs for the + * Return the resource diff tree that contains the out-of-sync diffs for the * subscriber. * @return the resource diff tree */ public IResourceDiffTree getTree() { return tree; } - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.subscribers.SubscriberEventHandler#getSubscriber() */ public Subscriber getSubscriber() { return super.getSubscriber(); } - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.subscribers.SubscriberEventHandler#shutdown() */ @@ -278,7 +278,7 @@ public class SubscriberDiffTreeEventHandler extends SubscriberEventHandler { protected Object getJobFamiliy() { return family; } - + /** * Set the family of this handler to the given object * @param family the family of the handler's job @@ -286,7 +286,7 @@ public class SubscriberDiffTreeEventHandler extends SubscriberEventHandler { public void setJobFamily(Object family) { this.family = family; } - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.subscribers.SubscriberEventHandler#handleException(org.eclipse.core.runtime.CoreException, org.eclipse.core.resources.IResource, int, java.lang.String) */ @@ -295,7 +295,7 @@ public class SubscriberDiffTreeEventHandler extends SubscriberEventHandler { tree.reportError(new TeamStatus(IStatus.ERROR, TeamPlugin.ID, code, message, e, resource)); exceptionState = EXCEPTION_ERROR; } - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.subscribers.SubscriberEventHandler#handleCancel(org.eclipse.core.runtime.OperationCanceledException) */ @@ -336,20 +336,20 @@ public class SubscriberDiffTreeEventHandler extends SubscriberEventHandler { public int getState() { return state; } - + protected boolean isSystemJob() { if (manager != null && !manager.isInitialized()) return false; return super.isSystemJob(); } - + public synchronized void remove(IResource resource) { // Don't queue changes if we haven't been initialized if (state == STATE_STARTED) return; super.remove(resource); } - + public void change(IResource resource, int depth) { // Don't queue changes if we haven't been initialized if (state == STATE_STARTED) diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberEventHandler.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberEventHandler.java index 7dd78d455..3a183527a 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberEventHandler.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberEventHandler.java @@ -31,7 +31,7 @@ import org.eclipse.team.internal.core.*; /** * This handler collects changes and removals to resources and calculates their * synchronization state in a background job. The result is fed input the SyncSetInput. - * + * * Exceptions that occur when the job is processing the events are collected and * returned as part of the Job's status. */ @@ -39,7 +39,7 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { // Changes accumulated by the event handler private List resultCache = new ArrayList(); - + private boolean started = false; private boolean initializing = true; @@ -51,7 +51,7 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { private ISynchronizationScope scope; private ISynchronizationScopeChangeListener scopeChangeListener; - + /** * Internal resource synchronization event. Can contain a result. */ @@ -79,7 +79,7 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { return new ResourceTraversal(new IResource[] { getResource() }, getDepth(), IResource.NONE); } } - + /** * Create a handler. This will initialize all resources for the subscriber associated with * the set. @@ -88,7 +88,7 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { */ public SubscriberEventHandler(Subscriber subscriber, ISynchronizationScope scope) { super( - NLS.bind(Messages.SubscriberEventHandler_jobName, new String[] { subscriber.getName() }), + NLS.bind(Messages.SubscriberEventHandler_jobName, new String[] { subscriber.getName() }), NLS.bind(Messages.SubscriberEventHandler_errors, new String[] { subscriber.getName() })); this.subscriber = subscriber; this.scope = scope; @@ -101,7 +101,7 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { }; this.scope.addScopeChangeListener(scopeChangeListener); } - + /** * The traversals of the scope have changed * @param oldTraversals the old traversals @@ -112,7 +112,7 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { } /** - * Start the event handler by queuing events to prime the sync set input with the out-of-sync + * Start the event handler by queuing events to prime the sync set input with the out-of-sync * resources of the subscriber. */ public synchronized void start() { @@ -149,8 +149,8 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { protected boolean isSystemJob() { return !initializing; } - - + + /* (non-Javadoc) * @see org.eclipse.team.internal.core.BackgroundEventHandler#jobDone(org.eclipse.core.runtime.jobs.IJobChangeEvent) */ @@ -158,17 +158,17 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { super.jobDone(event); progressGroup = null; } - + /** * Called by a client to indicate that a resource has changed and its synchronization state - * should be recalculated. + * should be recalculated. * @param resource the changed resource * @param depth the depth of the change calculation */ public void change(IResource resource, int depth) { queueEvent(new SubscriberEvent(resource, SubscriberEvent.CHANGE, depth), false); } - + /** * Called by a client to indicate that a resource has been removed and should be removed. The * removal will propagate to the set. @@ -178,7 +178,7 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { queueEvent( new SubscriberEvent(resource, SubscriberEvent.REMOVAL, IResource.DEPTH_INFINITE), false); } - + /** * Collect the calculated synchronization information for the given resource at the given depth. The * results are added to the provided list. @@ -187,12 +187,12 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { IResource resource, int depth, IProgressMonitor monitor) { - + Policy.checkCanceled(monitor); - + // handle any preemptive events before continuing handlePreemptiveEvents(monitor); - + if (resource.getType() != IResource.FILE && depth != IResource.DEPTH_ZERO) { try { @@ -210,16 +210,16 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { // We only handle the exception if the resource's project is accessible. // The project close delta will clean up. if (resource.getProject().isAccessible()) - handleException(e, resource, ITeamStatus.SYNC_INFO_SET_ERROR, NLS.bind(Messages.SubscriberEventHandler_8, new String[] { resource.getFullPath().toString(), e.getMessage() })); + handleException(e, resource, ITeamStatus.SYNC_INFO_SET_ERROR, NLS.bind(Messages.SubscriberEventHandler_8, new String[] { resource.getFullPath().toString(), e.getMessage() })); } } - monitor.subTask(NLS.bind(Messages.SubscriberEventHandler_2, new String[] { resource.getFullPath().toString() })); + monitor.subTask(NLS.bind(Messages.SubscriberEventHandler_2, new String[] { resource.getFullPath().toString() })); try { handleChange(resource); handlePendingDispatch(monitor); } catch (CoreException e) { - handleException(e, resource, ITeamStatus.RESOURCE_SYNC_INFO_ERROR, NLS.bind(Messages.SubscriberEventHandler_9, new String[] { resource.getFullPath().toString(), e.getMessage() })); + handleException(e, resource, ITeamStatus.RESOURCE_SYNC_INFO_ERROR, NLS.bind(Messages.SubscriberEventHandler_9, new String[] { resource.getFullPath().toString(), e.getMessage() })); } monitor.worked(1); } @@ -261,7 +261,7 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { /** * Called to initialize to calculate the synchronization information using the optimized subscriber method. For - * subscribers that don't support the optimization, all resources in the subscriber are manually re-calculated. + * subscribers that don't support the optimization, all resources in the subscriber are manually re-calculated. * @param resource the resources to check * @param depth the depth * @param monitor @@ -273,11 +273,11 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { /** * Feed the given events to the set. The appropriate method on the set is called - * for each event type. + * for each event type. * @param events */ protected abstract void dispatchEvents(SubscriberEvent[] events, IProgressMonitor monitor); - + /** * Initialize all resources for the subscriber associated with the set. This will basically recalculate * all synchronization information for the subscriber. @@ -313,7 +313,7 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { monitor); break; case SubscriberEvent.INITIALIZE : - monitor.subTask(NLS.bind(Messages.SubscriberEventHandler_2, new String[] { event.getResource().getFullPath().toString() })); + monitor.subTask(NLS.bind(Messages.SubscriberEventHandler_2, new String[] { event.getResource().getFullPath().toString() })); collectAll( event.getResource(), ((ResourceEvent)event).getDepth(), @@ -321,9 +321,9 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { break; } } catch (OperationCanceledException e) { - // the job has been canceled. + // the job has been canceled. // Clear the queue and propagate the cancellation through the sets. - handleCancel(e); + handleCancel(e); } catch (RuntimeException e) { // handle the exception and keep processing if (event.getType() == BackgroundEventHandler.RUNNABLE_EVENT ) { @@ -349,7 +349,7 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { protected void handleCancel(OperationCanceledException e) { resultCache.clear(); } - + /* * Execute the RunnableEvent */ @@ -392,12 +392,12 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { public void run(IWorkspaceRunnable runnable, boolean frontOnQueue) { queueEvent(new RunnableEvent(runnable, frontOnQueue), frontOnQueue); } - + public void setProgressGroupHint(IProgressMonitor progressGroup, int ticks) { this.progressGroup = progressGroup; this.ticks = ticks; } - + protected void handlePreemptiveEvents(IProgressMonitor monitor) { Event event = peek(); if (event instanceof RunnableEvent && ((RunnableEvent)event).isPreemtive()) { @@ -413,7 +413,7 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { protected ISynchronizationScope getScope() { return scope; } - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.BackgroundEventHandler#shutdown() */ diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberResourceCollector.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberResourceCollector.java index 352a92ef4..bde9700a0 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberResourceCollector.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberResourceCollector.java @@ -21,9 +21,9 @@ import org.eclipse.team.core.subscribers.*; * that are supervised by a subscriber may have changed. */ public abstract class SubscriberResourceCollector implements IResourceChangeListener, ISubscriberChangeListener { - + Subscriber subscriber; - + /** * Create the collector and register it as a listener with the workspace * and the subscriber. @@ -35,24 +35,24 @@ public abstract class SubscriberResourceCollector implements IResourceChangeList ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE); subscriber.addListener(this); } - + /** * Returns the <code>Subscriber</code> associated with this collector. - * + * * @return the <code>Subscriber</code> associated with this collector. */ public Subscriber getSubscriber() { return subscriber; } - + /** * De-register the listeners for this collector. */ public void dispose() { - getSubscriber().removeListener(this); + getSubscriber().removeListener(this); ResourcesPlugin.getWorkspace().removeResourceChangeListener(this); } - + /* (non-Javadoc) * @see org.eclipse.team.core.sync.ITeamResourceChangeListener#teamResourceChanged(org.eclipse.team.core.sync.TeamDelta[]) */ @@ -91,7 +91,7 @@ public abstract class SubscriberResourceCollector implements IResourceChangeList protected void beginInput() { // Do nothing by default } - + /** * The processing of the resource or subscriber delta has finished. * Subclasses can accumulate removals and changes and handle them @@ -100,7 +100,7 @@ public abstract class SubscriberResourceCollector implements IResourceChangeList protected void endInput() { // Do nothing by default } - + /*(non-Javadoc) * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent) @@ -113,11 +113,11 @@ public abstract class SubscriberResourceCollector implements IResourceChangeList endInput(); } } - + /** * Process the resource delta and posts all necessary events to the background * event handler. - * + * * @param delta the resource delta to analyze */ protected void processDelta(IResourceDelta delta, IResource[] roots) { @@ -126,7 +126,7 @@ public abstract class SubscriberResourceCollector implements IResourceChangeList if (resource.getType() == IResource.PROJECT) { // Handle projects that should be removed from the collector - if (((kind & IResourceDelta.REMOVED) != 0) /* deleted project */ + if (((kind & IResourceDelta.REMOVED) != 0) /* deleted project */ || (delta.getFlags() & IResourceDelta.OPEN) != 0 && !((IProject) resource).isOpen() /* closed project */ || !isAncestorOfRoot(resource, roots)) /* not within subscriber roots */ { // If the project has any entries in the sync set, remove them @@ -145,14 +145,14 @@ public abstract class SubscriberResourceCollector implements IResourceChangeList remove(resource); change(resource, IResource.DEPTH_INFINITE); } - + // Check the flags for changes the SyncSet cares about. // Notice we don't care about MARKERS currently. int changeFlags = delta.getFlags(); if ((changeFlags & (IResourceDelta.OPEN | IResourceDelta.CONTENT)) != 0) { change(resource, IResource.DEPTH_ZERO); } - + // Check the kind and deal with those we care about if ((delta.getKind() & (IResourceDelta.REMOVED | IResourceDelta.ADDED)) != 0) { change(resource, IResource.DEPTH_ZERO); @@ -167,7 +167,7 @@ public abstract class SubscriberResourceCollector implements IResourceChangeList } } } - + /** * Return the root resources that are to be considered by this handler. * These may be either the subscriber roots or a set of resources that are @@ -187,7 +187,7 @@ public abstract class SubscriberResourceCollector implements IResourceChangeList * by this handler. */ protected abstract boolean hasMembers(IResource resource); - + /** * The resource is no longer of concern to the subscriber. * Remove the resource and any of it's descendants @@ -203,7 +203,7 @@ public abstract class SubscriberResourceCollector implements IResourceChangeList * @param depth the depth */ protected abstract void change(IResource resource, int depth); - + /** * Return whether all roots of a subscriber are included or * if the collector is only consider a subset of the resources. diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoCollector.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoCollector.java index 150a987d5..8a49a57cd 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoCollector.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoCollector.java @@ -19,7 +19,7 @@ import org.eclipse.team.internal.core.Policy; /** * This collector maintains a {@link SyncInfoSet} for a particular team subscriber keeping - * it up-to-date with both incoming changes and outgoing changes as they occur for + * it up-to-date with both incoming changes and outgoing changes as they occur for * resources in the workspace. The collector can be configured to consider all the subscriber's * roots or only a subset. * <p> @@ -34,7 +34,7 @@ public final class SubscriberSyncInfoCollector extends SubscriberResourceCollect private SyncSetInputFromSyncSet filteredInput; private SubscriberSyncInfoEventHandler eventHandler; private IResource[] roots; - + /** * Create a collector that collects out-of-sync resources that are children of * the given roots. If the roots are <code>null</code>, then all out-of-sync resources @@ -57,13 +57,13 @@ public final class SubscriberSyncInfoCollector extends SubscriberResourceCollect }); } - + public void setProgressGroup(IProgressMonitor monitor, int ticks) { getEventHandler().setProgressGroupHint(monitor, ticks); } - + /** - * Start the collector. + * Start the collector. */ public void start() { eventHandler.start(); @@ -72,7 +72,7 @@ public final class SubscriberSyncInfoCollector extends SubscriberResourceCollect /** * This causes the calling thread to wait any background collection of * out-of-sync resources to stop before returning. - * + * * @param monitor * a progress monitor */ @@ -86,24 +86,24 @@ public final class SubscriberSyncInfoCollector extends SubscriberResourceCollect } catch (InterruptedException e) { } Policy.checkCanceled(monitor); - - // increment the counter or reset it if the job is running + + // increment the counter or reset it if the job is running i = (eventHandler.getEventHandlerJob().getState() == Job.NONE) ? i + 1 : 0; - - // 50 positive checks in a row + + // 50 positive checks in a row if (i == 50) break; } monitor.worked(1); } - + /** * Clears this collector's sync info sets and causes them to be recreated from the * associated <code>Subscriber</code>. The reset will occur in the background. If the - * caller wishes to wait for the reset to complete, they should call + * caller wishes to wait for the reset to complete, they should call * waitForCollector(IProgressMonitor). */ - public void reset() { + public void reset() { eventHandler.reset(getRoots()); } @@ -120,7 +120,7 @@ public final class SubscriberSyncInfoCollector extends SubscriberResourceCollect } super.dispose(); } - + /** * Return the roots that are being considered by this collector. * By default, the collector is interested in the roots of its @@ -134,17 +134,17 @@ public final class SubscriberSyncInfoCollector extends SubscriberResourceCollect return roots; } } - + /* * Returns whether the collector is configured to collect for * all roots of the subscriber or not - * @return <code>true</code> if the collector is considering all + * @return <code>true</code> if the collector is considering all * roots of the subscriber and <code>false</code> otherwise */ public boolean isAllRootsIncluded() { return roots == null; } - + /** * Return the event handler that performs the background processing for this collector. * The event handler also serves the purpose of serializing the modifications and adjustments @@ -155,7 +155,7 @@ public final class SubscriberSyncInfoCollector extends SubscriberResourceCollect protected SubscriberEventHandler getEventHandler() { return eventHandler; } - + /** * Return the <code>SyncInfoSet</code> that contains all the out-of-sync resources for the * subscriber that are descendants of the roots of this collector. The set will contain only those resources that are children of the roots @@ -166,11 +166,11 @@ public final class SubscriberSyncInfoCollector extends SubscriberResourceCollect public SyncInfoTree getSubscriberSyncInfoSet() { return subscriberInput.getSyncSet(); } - + public SyncInfoTree getSyncInfoSet() { return filteredInput.getSyncSet(); } - + /** * Set the filter for this collector. Only elements that match the filter will * be in the out sync info set. diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoEventHandler.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoEventHandler.java index 046843646..cc5ed5b17 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoEventHandler.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoEventHandler.java @@ -24,11 +24,11 @@ import org.eclipse.team.internal.core.TeamPlugin; * An event handler that collects {@link SyncInfo} in a {@link SyncInfoTree}. */ public class SubscriberSyncInfoEventHandler extends SubscriberEventHandler { - + // The set that receives notification when the resource synchronization state // has been calculated by the job. private final SyncSetInputFromSubscriber syncSetInput; - + private class SubscriberSyncInfoEvent extends SubscriberEvent { private final SyncInfo result; @@ -40,13 +40,13 @@ public class SubscriberSyncInfoEventHandler extends SubscriberEventHandler { return result; } } - + public static ISynchronizationScope createScope(IResource[] roots, Subscriber subscriber) { if (roots == null) roots = subscriber.roots(); return new RootResourceSynchronizationScope(roots); } - + /** * Create the event handler for the given subscriber and roots * @param subscriber the subscriber @@ -65,7 +65,7 @@ public class SubscriberSyncInfoEventHandler extends SubscriberEventHandler { super.handleException(e, resource, code, message); syncSetInput.handleError(new TeamStatus(IStatus.ERROR, TeamPlugin.ID, code, message, e, resource)); } - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.subscribers.SubscriberEventHandler#handleCancel(org.eclipse.core.runtime.OperationCanceledException) */ @@ -73,7 +73,7 @@ public class SubscriberSyncInfoEventHandler extends SubscriberEventHandler { super.handleCancel(e); syncSetInput.handleError(new TeamStatus(IStatus.ERROR, TeamPlugin.ID, ITeamStatus.SYNC_INFO_SET_CANCELLATION, Messages.SubscriberEventHandler_12, e, ResourcesPlugin.getWorkspace().getRoot())); } - + /** * Return the sync set input that was created by this event handler * @return the sync set input @@ -81,7 +81,7 @@ public class SubscriberSyncInfoEventHandler extends SubscriberEventHandler { public SyncSetInputFromSubscriber getSyncSetInput() { return syncSetInput; } - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.subscribers.SubscriberEventHandler#handleChange(org.eclipse.core.resources.IResource) */ @@ -96,7 +96,7 @@ public class SubscriberSyncInfoEventHandler extends SubscriberEventHandler { new SubscriberSyncInfoEvent(resource, SubscriberEvent.CHANGE, IResource.DEPTH_ZERO, info)); } } - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.subscribers.SubscriberEventHandler#collectAll(org.eclipse.core.resources.IResource, int, org.eclipse.core.runtime.IProgressMonitor) */ @@ -104,10 +104,10 @@ public class SubscriberSyncInfoEventHandler extends SubscriberEventHandler { IResource resource, int depth, IProgressMonitor monitor) { - + monitor.beginTask(null, IProgressMonitor.UNKNOWN); try { - + // Create a monitor that will handle preemption and dispatch if required IProgressMonitor collectionMonitor = new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN) { boolean dispatching = false; @@ -130,7 +130,7 @@ public class SubscriberSyncInfoEventHandler extends SubscriberEventHandler { super.worked(work); } }; - + // Create a sync set that queues up resources and errors for dispatch SyncInfoSet collectionSet = new SyncInfoSet() { public void add(SyncInfo info) { @@ -158,9 +158,9 @@ public class SubscriberSyncInfoEventHandler extends SubscriberEventHandler { new SubscriberEvent(resource, SubscriberEvent.REMOVAL, IResource.DEPTH_ZERO)); } }; - + syncSetInput.getSubscriber().collectOutOfSync(new IResource[] { resource }, depth, collectionSet, collectionMonitor); - + } finally { monitor.done(); } @@ -192,7 +192,7 @@ public class SubscriberSyncInfoEventHandler extends SubscriberEventHandler { syncSet.endInput(monitor); } } - + /** * Initialize all resources for the subscriber associated with the set. This * will basically recalculate all synchronization information for the @@ -200,7 +200,7 @@ public class SubscriberSyncInfoEventHandler extends SubscriberEventHandler { * <p> * This method is synchronized with the queueEvent method to ensure that the * two events queued by this method are back-to-back. - * + * * @param roots * the new roots or <code>null</code> if the roots from the * subscriber should be used. @@ -211,7 +211,7 @@ public class SubscriberSyncInfoEventHandler extends SubscriberEventHandler { roots = getSubscriber().roots(); scope.setRoots(roots); } - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.subscribers.SubscriberEventHandler#reset(org.eclipse.core.resources.mapping.ResourceTraversal[], org.eclipse.core.resources.mapping.ResourceTraversal[]) */ diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoSet.java index 441093f59..ddc71bcc3 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoSet.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoSet.java @@ -18,25 +18,25 @@ import org.eclipse.team.internal.core.Policy; /** * The <code>SubscriberSyncInfoSet</code> is a <code>SyncInfoSet</code> that provides the ability to add, - * remove and change <code>SyncInfo</code> and fires change event notifications to registered listeners. + * remove and change <code>SyncInfo</code> and fires change event notifications to registered listeners. * It also provides the ability * to batch changes in a single change notification as well as optimizations for sync info retrieval. - * + * * This class uses synchronized methods and synchronized blocks to protect internal data structures during both access * and modify operations and uses an <code>ILock</code> to make modification operations thread-safe. The events * are fired while this lock is held so clients responding to these events should not obtain their own internal locks * while processing change events. - * + * * TODO: Override modification methods to enforce use with handler - * + * */ public class SubscriberSyncInfoSet extends SyncInfoTree { - + protected SubscriberEventHandler handler; - + public SubscriberSyncInfoSet(SubscriberEventHandler handler) { this.handler = handler; - } + } /* (non-Javadoc) * @see org.eclipse.team.core.synchronize.SyncInfoSet#connect(org.eclipse.team.core.synchronize.ISyncInfoSetChangeListener, org.eclipse.core.runtime.IProgressMonitor) diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncByteConverter.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncByteConverter.java index 0739562cf..f48d06aaa 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncByteConverter.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncByteConverter.java @@ -15,7 +15,7 @@ import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.core.Messages; /** - * Utility for managing slash separated sync information fields. + * Utility for managing slash separated sync information fields. */ public class SyncByteConverter { @@ -32,7 +32,7 @@ public class SyncByteConverter { public static byte[] setSlot(byte[] syncBytes, int slot, byte[] newBytes) throws TeamException { int start = startOfSlot(syncBytes, slot); if (start == -1) { - throw new TeamException(NLS.bind(Messages.SyncByteConverter_1, new String[] { new String(syncBytes) })); + throw new TeamException(NLS.bind(Messages.SyncByteConverter_1, new String[] { new String(syncBytes) })); } int end = startOfSlot(syncBytes, slot + 1); int totalLength = start + 1 + newBytes.length; @@ -52,7 +52,7 @@ public class SyncByteConverter { * Method startOfSlot returns the index of the slash that occurs before the * given slot index. The provided index should be >= 1 which assumes that * slot zero occurs before the first slash. - * + * * @param syncBytes * @param i * @return int @@ -63,11 +63,11 @@ public class SyncByteConverter { if (syncBytes[j] == SEPARATOR_BYTE) { count++; if (count == slot) return j; - } + } } return -1; } - + /** * Return the offset the the Nth delimeter from the given start index. * @param bytes @@ -85,7 +85,7 @@ public class SyncByteConverter { // the Nth delimeter was not found return -1; } - + /** * Get the bytes in the given slot. * @param bytes the sync bytes @@ -117,7 +117,7 @@ public class SyncByteConverter { System.arraycopy(bytes, start + 1, result, 0, length); return result; } - + public static byte[] toBytes(String[] slots) { StringBuffer buffer = new StringBuffer(); for (int i = 0; i < slots.length; i++) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoStatistics.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoStatistics.java index 1e869e5b9..39b4a5e75 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoStatistics.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoStatistics.java @@ -35,19 +35,19 @@ public class SyncInfoStatistics { } stats.put(new Integer(info.getKind()), new Long(count.longValue() + 1)); } - + /** * Remove this sync kind. - * @param info the info type to remove - */ + * @param info the info type to remove + */ public void remove(SyncInfo info) { // update stats Integer kind = new Integer(info.getKind()); Long count = (Long)stats.get(kind); if(count == null) { // error condition, shouldn't be removing if we haven't added yet - // programmer error calling remove before add. - } else { + // programmer error calling remove before add. + } else { long newCount = count.intValue() - 1; if(newCount > 0) { stats.put(kind, new Long(newCount)); @@ -56,13 +56,13 @@ public class SyncInfoStatistics { } } } - + /** * Return the count of sync infos for the specified sync kind. A mask can be used to acucmulate * counts for specific directions or change types. * To return the number of outgoing changes: * long outgoingChanges = stats.countFor(SyncInfo.OUTGOING, SyncInfo.DIRECTION_MASK); - * + * * @param kind the sync kind for which to return the count * @param mask the mask applied to the stored sync kind * @return the number of sync info types added for the specific kind @@ -91,7 +91,7 @@ public class SyncInfoStatistics { public void clear() { stats.clear(); } - + /** * For debugging */ diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoTreeChangeEvent.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoTreeChangeEvent.java index f75e185af..5a4d9ec5a 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoTreeChangeEvent.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoTreeChangeEvent.java @@ -87,7 +87,7 @@ public class SyncInfoTreeChangeEvent extends SyncInfoSetChangeEvent implements I public IResource[] getRemovedSubtreeRoots() { return (IResource[]) removedSubtrees.toArray(new IResource[removedSubtrees.size()]); } - + public boolean isEmpty() { return super.isEmpty() && removedSubtrees.isEmpty() && addedSubtrees.isEmpty(); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoWorkingSetFilter.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoWorkingSetFilter.java index a43990d32..c118f3878 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoWorkingSetFilter.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoWorkingSetFilter.java @@ -24,7 +24,7 @@ import org.eclipse.team.internal.core.TeamPlugin; public class SyncInfoWorkingSetFilter extends FastSyncInfoFilter { private IResource[] resources; - + /* (non-Javadoc) * @see org.eclipse.team.ui.sync.SyncInfoFilter#select(org.eclipse.team.core.subscribers.SyncInfo) */ @@ -52,14 +52,14 @@ public class SyncInfoWorkingSetFilter extends FastSyncInfoFilter { private boolean isParent(IResource parent, IResource child) { return (parent.getFullPath().isPrefixOf(child.getFullPath())); } - + /* (non-Javadoc) * @see org.eclipse.team.internal.ui.sync.views.SyncSetInputFromSubscriber#getRoots() */ public IResource[] getRoots(Subscriber subscriber) { IResource[] roots = subscriber.roots(); if (isEmpty()) return roots; - + // filter the roots by the selected working set Set result = new HashSet(); for (int i = 0; i < roots.length; i++) { @@ -99,11 +99,11 @@ public class SyncInfoWorkingSetFilter extends FastSyncInfoFilter { public void setWorkingSet(IResource[] resources) { this.resources = resources; } - + public IResource[] getWorkingSet() { return this.resources; } - + private boolean isEmpty() { return resources == null || resources.length == 0; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInput.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInput.java index 4d8dc0414..d463fe62e 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInput.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInput.java @@ -20,18 +20,18 @@ import org.eclipse.team.internal.core.Policy; * This is the superclass for all SyncSet input providers */ public abstract class SyncSetInput { - + private SubscriberSyncInfoSet syncSet; private SyncInfoFilter filter = new FastSyncInfoFilter(); - + public SyncSetInput(SubscriberEventHandler handler) { syncSet = new SubscriberSyncInfoSet(handler); } - + public SubscriberSyncInfoSet getSyncSet() { return syncSet; } - + /** * This method is invoked from reset to get all the sync information from * the input source. @@ -42,13 +42,13 @@ public abstract class SyncSetInput { * The input is no longer being used. Disconnect it from its source. */ public abstract void disconnect(); - + /** * Reset the input. This will clear the current contents of the sync set and * obtain the contents from the input source. */ public void reset(IProgressMonitor monitor) throws TeamException { - + try { syncSet.beginInput(); monitor = Policy.monitorFor(monitor); @@ -81,7 +81,7 @@ public abstract class SyncSetInput { syncSet.remove(resource); } } - + public SyncInfoFilter getFilter() { return filter; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSubscriber.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSubscriber.java index 4d1ec78b5..09f7d7b59 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSubscriber.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSubscriber.java @@ -16,7 +16,7 @@ import org.eclipse.team.core.TeamException; import org.eclipse.team.core.subscribers.Subscriber; /** - * Records resource synchronization changes from a Team subscriber. The actual changes + * Records resource synchronization changes from a Team subscriber. The actual changes * are calculated via the SubscriberEventHandler and stored in this input. */ public class SyncSetInputFromSubscriber extends SyncSetInput { @@ -27,29 +27,29 @@ public class SyncSetInputFromSubscriber extends SyncSetInput { super(handler); this.subscriber = subscriber; } - + public void disconnect() { } - + public Subscriber getSubscriber() { return subscriber; } - + /* (non-Javadoc) * @see org.eclipse.team.internal.ui.sync.views.SyncSetInput#fetchInput(org.eclipse.core.runtime.IProgressMonitor) */ protected void fetchInput(IProgressMonitor monitor) throws TeamException { // don't calculate changes. The SubscriberEventHandler will fetch the - // input in a job and update this sync set when the changes are - // calculated. + // input in a job and update this sync set when the changes are + // calculated. } /** * Handle an error that occurred while populating the receiver's set. - * The <code>ITeamStatus</code> includes the resource for which the + * The <code>ITeamStatus</code> includes the resource for which the * error occurred. * This error is propogated to any set listeners. - * @param status the error status + * @param status the error status */ public void handleError(ITeamStatus status) { getSyncSet().addError(status); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSyncSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSyncSet.java index 1aa887c66..87da1959b 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSyncSet.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSyncSet.java @@ -28,7 +28,7 @@ public class SyncSetInputFromSyncSet extends SyncSetInput implements ISyncInfoSe this.inputSyncSet = set; inputSyncSet.addSyncSetChangedListener(this); } - + public void disconnect() { if (inputSyncSet == null) return; inputSyncSet.removeSyncSetChangedListener(this); @@ -54,7 +54,7 @@ public class SyncSetInputFromSyncSet extends SyncSetInput implements ISyncInfoSe try { syncSet.beginInput(); monitor.beginTask(null, 105); - syncSetChanged(event.getChangedResources(), Policy.subMonitorFor(monitor, 50)); + syncSetChanged(event.getChangedResources(), Policy.subMonitorFor(monitor, 50)); syncSetChanged(event.getAddedResources(), Policy.subMonitorFor(monitor, 50)); remove(event.getRemovedResources()); } finally { @@ -67,13 +67,13 @@ public class SyncSetInputFromSyncSet extends SyncSetInput implements ISyncInfoSe collect(infos[i], monitor); } } - + private void remove(IResource[] resources) { for (int i = 0; i < resources.length; i++) { remove(resources[i]); } } - + public void reset() { inputSyncSet.connect(this); } @@ -95,7 +95,7 @@ public class SyncSetInputFromSyncSet extends SyncSetInput implements ISyncInfoSe syncSet.endInput(Policy.subMonitorFor(monitor, 5)); monitor.done(); } - } + } } /* (non-Javadoc) diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ThreeWayBaseTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ThreeWayBaseTree.java index 8b8108589..c4a1a20cd 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ThreeWayBaseTree.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ThreeWayBaseTree.java @@ -58,7 +58,7 @@ public final class ThreeWayBaseTree extends ResourceVariantTree { return subscriber.getSynchronizer().members(resource); } } - + /** * Create a base resource variant tree that accesses the base bytes * from a three-way synchronizer. @@ -68,7 +68,7 @@ public final class ThreeWayBaseTree extends ResourceVariantTree { super(new BaseResourceVariantByteStore(subscriber)); this.subscriber = subscriber; } - + /* (non-Javadoc) * @see org.eclipse.team.internal.core.subscribers.caches.AbstractResourceVariantTree#refresh(org.eclipse.core.resources.IResource[], int, org.eclipse.core.runtime.IProgressMonitor) */ @@ -109,5 +109,5 @@ public final class ThreeWayBaseTree extends ResourceVariantTree { private ThreeWaySubscriber getSubscriber() { return subscriber; } - + } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/WorkingSetFilteredSyncInfoCollector.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/WorkingSetFilteredSyncInfoCollector.java index 923d48215..9c71fc2a2 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/WorkingSetFilteredSyncInfoCollector.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/WorkingSetFilteredSyncInfoCollector.java @@ -17,7 +17,7 @@ import org.eclipse.team.core.synchronize.*; /** * This collector maintains a {@link SyncInfoSet} for a particular team subscriber keeping - * it up-to-date with both incoming changes and outgoing changes as they occur for + * it up-to-date with both incoming changes and outgoing changes as they occur for * resources in the workspace. The collector can be configured to consider all the subscriber's * roots or only a subset. * <p> @@ -31,7 +31,7 @@ public final class WorkingSetFilteredSyncInfoCollector { private WorkingSetSyncSetInput workingSetInput; private SyncSetInputFromSyncSet filteredInput; private SubscriberEventHandler eventHandler; - + /** * Create a collector that collects out-of-sync resources that are children of * the given roots. If the roots are <code>null</code>, then all out-of-sync resources @@ -42,7 +42,7 @@ public final class WorkingSetFilteredSyncInfoCollector { * @param roots the roots of the out-of-sync resources to be collected */ public WorkingSetFilteredSyncInfoCollector(SubscriberSyncInfoCollector collector, IResource[] roots) { - this.eventHandler = collector.getEventHandler(); + this.eventHandler = collector.getEventHandler(); // TODO: optimize and don't use working set if no roots are passed in workingSetInput = new WorkingSetSyncSetInput((SubscriberSyncInfoSet)collector.getSyncInfoSet(), getEventHandler()); filteredInput = new SyncSetInputFromSyncSet(workingSetInput.getSyncSet(), getEventHandler()); @@ -52,11 +52,11 @@ public final class WorkingSetFilteredSyncInfoCollector { } }); } - + /** * Return the set that provides access to the out-of-sync resources for the collector's * subscriber that are descendants of the roots for the collector, - * are in the collector's working set and match the collectors filter. + * are in the collector's working set and match the collectors filter. * @return a SyncInfoSet containing out-of-sync resources */ public SyncInfoTree getSyncInfoTree() { @@ -66,10 +66,10 @@ public final class WorkingSetFilteredSyncInfoCollector { /** * Clears this collector's sync info sets and causes them to be recreated from the * associated <code>Subscriber</code>. The reset will occur in the background. If the - * caller wishes to wait for the reset to complete, they should call + * caller wishes to wait for the reset to complete, they should call * waitForCollector(IProgressMonitor). */ - public void reset() { + public void reset() { workingSetInput.reset(); } @@ -84,7 +84,7 @@ public final class WorkingSetFilteredSyncInfoCollector { filteredInput.disconnect(); } } - + /** * Return the event handler that performs the background processing for this collector. * The event handler also serves the purpose of serializing the modifications and adjustments @@ -95,7 +95,7 @@ public final class WorkingSetFilteredSyncInfoCollector { protected SubscriberEventHandler getEventHandler() { return eventHandler; } - + /** * Set the filter for this collector. Only elements that match the filter will * be in the out sync info set. @@ -105,7 +105,7 @@ public final class WorkingSetFilteredSyncInfoCollector { filteredInput.setFilter(filter); filteredInput.reset(); } - + /** * Return a <code>SyncInfoSet</code> that contains the out-of-sync elements * from the subsciber sync info set filtered diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/WorkingSetSyncSetInput.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/WorkingSetSyncSetInput.java index 9942f2001..a15b37616 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/WorkingSetSyncSetInput.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/WorkingSetSyncSetInput.java @@ -15,16 +15,16 @@ import org.eclipse.core.resources.IResource; public class WorkingSetSyncSetInput extends SyncSetInputFromSyncSet { private SyncInfoWorkingSetFilter workingSetFilter = new SyncInfoWorkingSetFilter(); - + public WorkingSetSyncSetInput(SubscriberSyncInfoSet set, SubscriberEventHandler handler) { super(set, handler); setFilter(workingSetFilter); } - + public void setWorkingSet(IResource[] resources) { workingSetFilter.setWorkingSet(resources); } - + public IResource[] getWorkingSet() { return workingSetFilter.getWorkingSet(); } |