diff options
| author | Michael Valenta | 2004-04-05 17:40:19 +0000 |
|---|---|---|
| committer | Michael Valenta | 2004-04-05 17:40:19 +0000 |
| commit | 403ea8cc9dbc9fdee1ff39d5d27a2c5a16c83507 (patch) | |
| tree | 7c3e3e7cccd22a869c9ba7f869d6dac272d724fd /bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java | |
| parent | f826fd0a2822473fdf46c528d8785a30d0b235a8 (diff) | |
| download | eclipse.platform.team-403ea8cc9dbc9fdee1ff39d5d27a2c5a16c83507.tar.gz eclipse.platform.team-403ea8cc9dbc9fdee1ff39d5d27a2c5a16c83507.tar.xz eclipse.platform.team-403ea8cc9dbc9fdee1ff39d5d27a2c5a16c83507.zip | |
Handle existance of old merge participants
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java')
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java index 823918d50..aed548d21 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java @@ -319,14 +319,19 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I ISynchronizeManager manager = TeamUI.getSynchronizeManager(); // create pages for consoles ISynchronizeParticipantReference[] participants = manager.getSynchronizeParticipants(); + boolean errorOccurred = false; for (int i = 0; i < participants.length; i++) { try { participantsAdded(new ISynchronizeParticipant[] {participants[i].getParticipant()}); } catch (TeamException e) { + errorOccurred = true; continue; } } + if (errorOccurred) { + participants = manager.getSynchronizeParticipants(); + } try { // decide which participant to show on startup if (participants.length > 0) { |