From 83ef29445c3a4bf2a8c80e2039a72e08bde0fd4c Mon Sep 17 00:00:00 2001
From: Michael Valenta
Date: Wed, 1 Jun 2005 15:27:42 +0000
Subject: Bug 97818 entry in .cvsignore is not ignored on update/sync

---
 .../team/core/variants/AbstractResourceVariantTree.java       | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java
index 53d70f5e5..807793002 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java
@@ -10,15 +10,7 @@
  *******************************************************************************/
 package org.eclipse.team.core.variants;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IResource;
@@ -175,7 +167,6 @@ public abstract class AbstractResourceVariantTree implements IResourceVariantTre
 	protected abstract boolean setVariant(IResource local, IResourceVariant remote) throws TeamException;
 
 	private void collectChanges(IResource local, IResourceVariant remote, Collection changedResources, int depth, IProgressMonitor monitor) throws TeamException {
-        monitor.subTask(NLS.bind(Messages.AbstractResourceVariantTree_0, new String[] {local.getFullPath().toString()}));
 		boolean changed = setVariant(local, remote);
 		if (changed) {
 			changedResources.add(local);
-- 
cgit v1.2.3