diff options
author | Michael Valenta | 2004-03-03 20:34:47 +0000 |
---|---|---|
committer | Michael Valenta | 2004-03-03 20:34:47 +0000 |
commit | d91bdf8213f1b4c1e36d59fb63e9b696cde197b3 (patch) | |
tree | a6b59b2a79d31a3dc173632941a29fb18b16a782 | |
parent | 4872b79886cb6135c1433138b47aa95daa51c01e (diff) | |
download | eclipse.platform.team-d91bdf8213f1b4c1e36d59fb63e9b696cde197b3.tar.gz eclipse.platform.team-d91bdf8213f1b4c1e36d59fb63e9b696cde197b3.tar.xz eclipse.platform.team-d91bdf8213f1b4c1e36d59fb63e9b696cde197b3.zip |
53572: unable to compare to HEAD
-rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java | 47 |
1 files changed, 40 insertions, 7 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java index 83cbf6711..5e6f95f1b 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java @@ -10,18 +10,51 @@ *******************************************************************************/ package org.eclipse.team.internal.ui.synchronize; -import java.io.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Reader; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; -import org.eclipse.core.runtime.*; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.ISafeRunnable; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; import org.eclipse.jface.util.ListenerList; import org.eclipse.team.core.TeamException; -import org.eclipse.team.internal.ui.*; +import org.eclipse.team.internal.ui.IPreferenceIds; +import org.eclipse.team.internal.ui.Policy; +import org.eclipse.team.internal.ui.TeamUIPlugin; +import org.eclipse.team.internal.ui.Utils; import org.eclipse.team.internal.ui.registry.SynchronizeParticipantDescriptor; import org.eclipse.team.internal.ui.registry.SynchronizeParticipantRegistry; import org.eclipse.team.ui.ITeamUIConstants; -import org.eclipse.team.ui.synchronize.*; -import org.eclipse.ui.*; +import org.eclipse.team.ui.synchronize.ISynchronizeManager; +import org.eclipse.team.ui.synchronize.ISynchronizeParticipant; +import org.eclipse.team.ui.synchronize.ISynchronizeParticipantDescriptor; +import org.eclipse.team.ui.synchronize.ISynchronizeParticipantListener; +import org.eclipse.team.ui.synchronize.ISynchronizeView; +import org.eclipse.ui.IMemento; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.WorkbenchException; +import org.eclipse.ui.XMLMemento; /** * Manages the registered synchronize participants. It handles notification of @@ -289,7 +322,7 @@ public class SynchronizeManager implements ISynchronizeManager { } } catch (TeamException e) { // Participant instance is invalid - remove from list - synchronizeParticipants.remove(instance.getId()); + it.remove(); TeamUIPlugin.log(e); } } |