Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-02-01 19:35:17 -0500
committerMichael Valenta2004-02-01 19:35:17 -0500
commit2efd72516e6abde6b05c6717e1de2ff6aa4c2b5e (patch)
tree3feeb1356c004058aff2b1e85f9567ee19ab8c13
parent548bdfe7a25afe56f3457d735fbe852332503e4c (diff)
downloadeclipse.platform.team-2efd72516e6abde6b05c6717e1de2ff6aa4c2b5e.tar.gz
eclipse.platform.team-2efd72516e6abde6b05c6717e1de2ff6aa4c2b5e.tar.xz
eclipse.platform.team-2efd72516e6abde6b05c6717e1de2ff6aa4c2b5e.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/TeamSubscriberSyncInfoCollector.java1
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/utils/SynchronizationCacheRefreshOperation.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties1
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/views/SyncInfoDiffNodeBuilder.java1
5 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/TeamSubscriberSyncInfoCollector.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/TeamSubscriberSyncInfoCollector.java
index 1cee1880d..481ee2c5f 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/TeamSubscriberSyncInfoCollector.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/TeamSubscriberSyncInfoCollector.java
@@ -105,6 +105,7 @@ public final class TeamSubscriberSyncInfoCollector implements IResourceChangeLis
public void reset(IProgressMonitor monitor) throws TeamException {
monitor.beginTask(null, 100);
set.reset(Policy.subMonitorFor(monitor, 100));
+ // TODO: This is a problem
eventHandler.initialize(getRoots());
monitor.done();
}
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/utils/SynchronizationCacheRefreshOperation.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/utils/SynchronizationCacheRefreshOperation.java
index f2a509fb5..9245012ef 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/utils/SynchronizationCacheRefreshOperation.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/utils/SynchronizationCacheRefreshOperation.java
@@ -58,7 +58,7 @@ public abstract class SynchronizationCacheRefreshOperation {
return new IResource[0];
}
- monitor.setTaskName(Policy.bind("RemoteTagSynchronizer.0", resource.getFullPath().makeRelative().toString())); //$NON-NLS-1$
+ monitor.setTaskName(Policy.bind("SynchronizationCacheRefreshOperation.0", resource.getFullPath().makeRelative().toString())); //$NON-NLS-1$
// build the remote tree only if an initial tree hasn't been provided
ISubscriberResource tree = getRemoteTree(resource, depth, cacheFileContentsHint, Policy.subMonitorFor(monitor, 70));
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
index 5e3b5c7f9..019a109d5 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
@@ -116,3 +116,4 @@ DeploymentProviderManager.13={0} is already mapped to {1}
DeploymentProviderManager.15=An I/O error occurred while persisting the deployment configurations for project {0}.
DeploymentProviderManager.16=Previously deployed folder {0} in project {1} no longer exists.
DeploymentProviderManager.17=Previously deployed resource {0} in project {1} is now a file and cannot be deployed.
+SynchronizationCacheRefreshOperation.0=Refreshing {0}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
index 292f10f41..7a2eb31f4 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
@@ -322,7 +322,6 @@ CVSProviderPlugin.20=CVS Workspace
CVSProviderPlugin.21=Synchronizes the CVS managed resources in your workspace with their associated remote location
CVSSyncTreeSubscriber.0={0} is not a valid comparison criteria for subscriber {1}
CVSRevisionNumberCompareCriteria.1=Comparing revision numbers
-RemoteTagSynchronizer.0={0}
ReentrantLock.9=An error occurred writting CVS synchronization information to disk. Some information may be lost.
CRLFDetectInputStream.0=CVS file {0} either contains invalid line endings on the server (CR/LF instead of just LF) or is a binary file that is not marked as -kb.
SynchronizerSyncInfoCache.0=Synchronization information could not be cached for {0}. The only negative effect of this may be decreased performance.
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/views/SyncInfoDiffNodeBuilder.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/views/SyncInfoDiffNodeBuilder.java
index a7768407c..7bb773fa1 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/views/SyncInfoDiffNodeBuilder.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/views/SyncInfoDiffNodeBuilder.java
@@ -144,6 +144,7 @@ public class SyncInfoDiffNodeBuilder implements ISyncSetChangedListener {
viewer.getControl().setRedraw(false);
resourceMap.clear();
clearModelObjects(getRoot(), viewer);
+ removeAllFromTree();
buildTree(getRoot());
viewer.refresh();
if(viewer instanceof INavigatable) {

Back to the top