diff options
| author | Michael Valenta | 2007-07-25 13:55:25 +0000 |
|---|---|---|
| committer | Michael Valenta | 2007-07-25 13:55:25 +0000 |
| commit | 0313028ad58fbdd1d920f0498a6d68d2755ff3a3 (patch) | |
| tree | 8cbc6b5ea044a2fb5f336d046c6c8335cb367dea | |
| parent | 48de89c47ed5c846ef2b0a6b1a237d32c6067282 (diff) | |
| download | eclipse.platform.team-0313028ad58fbdd1d920f0498a6d68d2755ff3a3.tar.gz eclipse.platform.team-0313028ad58fbdd1d920f0498a6d68d2755ff3a3.tar.xz eclipse.platform.team-0313028ad58fbdd1d920f0498a6d68d2755ff3a3.zip | |
Bug 196157 [SyncView] "Remove from View" does not work when compare->with another version action is performed
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantAction.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantAction.java index 7d1535fb5..cf410b967 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantAction.java @@ -22,8 +22,7 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.diff.IDiff; -import org.eclipse.team.core.diff.IThreeWayDiff; +import org.eclipse.team.core.diff.*; import org.eclipse.team.core.mapping.ISynchronizationContext; import org.eclipse.team.internal.ui.TeamUIMessages; import org.eclipse.team.ui.mapping.*; @@ -135,6 +134,9 @@ public abstract class ModelParticipantAction extends BaseSelectionListenerAction case ISynchronizePageConfiguration.BOTH_MODE: return true; } + } else if (configuration.getComparisonType() == ISynchronizePageConfiguration.TWO_WAY + && node instanceof ITwoWayDiff) { + return true; } return false; } |