Fixed adapter factory

4 files changed, 2 insertions, 53 deletions

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingLabelProvider.java
index f169210cb..574020c4b 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingLabelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingLabelProvider.java
@@ -24,7 +24,7 @@ public class ResourceMappingLabelProvider extends LabelProvider {
 		if (element instanceof ResourceMapping) {
 			ResourceMapping mapping = (ResourceMapping) element;
 			text = provider.getText(mapping.getModelObject());
-			if (text != null)
+			if (text != null && text.length() > 0)
 				return text;
 		}
 		return super.getText(element);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/ResourceMappingContentProviderFactory.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/ResourceMappingContentProviderFactory.java
deleted file mode 100644
index 34fe6b6d8..000000000
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/ResourceMappingContentProviderFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.team.ui;
-
-import org.eclipse.core.resources.mapping.ResourceMapping;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.team.internal.ui.ResourceMappingContentProvider;
-import org.eclipse.team.internal.ui.ResourceMappingTree;
-import org.eclipse.team.internal.ui.dialogs.ResourceMappingLabelProvider;
-import org.eclipse.team.internal.ui.synchronize.ISynchronizeModelProvider;
-
-public class ResourceMappingContentProviderFactory implements IResourceMappingContentProviderFactory {
-	
-	private static final ResourceMappingTree RESOURCE_MAPPING_TREE = new ResourceMappingTree();
-	private static final ResourceMappingLabelProvider RESOURCE_MAPPING_LABEL_PROVIDER = new ResourceMappingLabelProvider();
-
-	public IResourceMappingContentProvider createContentProvider(ResourceMapping[] mappings) {
-	    return new ResourceMappingContentProvider(mappings);
-	}
-
-	public ISynchronizeModelProvider createSynchronizeModelProvider(ResourceMapping[] mappings, ISynchronizeModelProviderConfiguration configuration) {
-	    // TODO Auto-generated method stub
-	    return null;
-	}
-
-	public ILabelProvider getLabelProvider() {
-		return RESOURCE_MAPPING_LABEL_PROVIDER;
-	}
-
-	public IResourceMappingTreeItem getResourceMappingTree() {
-		return RESOURCE_MAPPING_TREE;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamUI.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamUI.java
index e673779e1..95e86ed7c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamUI.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamUI.java
@@ -26,8 +26,6 @@ public class TeamUI {
 	// manages synchronize participants
 	private static ISynchronizeManager synchronizeManager;
 
-    private static IResourceMappingContentProviderFactory defaultModelContentProviderFactory = new ResourceMappingContentProviderFactory();
-
 	/**
 	 * Property constant indicating the global ignores list has changed. 
 	 */
@@ -69,12 +67,4 @@ public class TeamUI {
 	public static void removePropertyChangeListener(IPropertyChangeListener listener) {
 		TeamUIPlugin.removePropertyChangeListener(listener);
 	}
-    
-    public static IResourceMappingContentProviderFactory getFactory(ResourceMapping mapping) {
-        Object o = mapping.getAdapter(IResourceMappingContentProviderFactory.class);
-        if (o instanceof IResourceMappingContentProviderFactory) {
-            return (IResourceMappingContentProviderFactory) o;
-        }
-        return defaultModelContentProviderFactory;
-    }
 }
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/ResourceMappingOperationInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/ResourceMappingOperationInput.java
index 6b196b2de..cd4ee2841 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/ResourceMappingOperationInput.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/ResourceMappingOperationInput.java
@@ -90,7 +90,7 @@ public class ResourceMappingOperationInput extends SimpleResourceMappingOperatio
 				for (Iterator iter = newResources.iterator(); iter.hasNext();) {
 					IResource resource = (IResource) iter.next();
 					if (handledResources.contains(resource)) {
-						newResources.remove(resource);
+						iter.remove();
 					}
 				}
 			}