diff options
author | Michael Valenta | 2002-06-11 17:16:05 +0000 |
---|---|---|
committer | Michael Valenta | 2002-06-11 17:16:05 +0000 |
commit | 3d6dc987cfed4b05fd79c83a81fb5e4795be771a (patch) | |
tree | 74190ef3553c92bd0cfdc754eacec4c3f3107885 | |
parent | 615aa191853dd387ccbf2f86c3c832f99ab0695a (diff) | |
download | eclipse.platform.team-3d6dc987cfed4b05fd79c83a81fb5e4795be771a.tar.gz eclipse.platform.team-3d6dc987cfed4b05fd79c83a81fb5e4795be771a.tar.xz eclipse.platform.team-3d6dc987cfed4b05fd79c83a81fb5e4795be771a.zip |
19141: CVS Merge Editor and File Content Compare Icon in toolbar
-rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ContentAction.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ContentAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ContentAction.java index a1e46cd5e..72ed4c85f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ContentAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ContentAction.java @@ -58,7 +58,10 @@ public class ContentAction extends ActionDelegate implements IEditorActionDelega if (result && dialog.isDontShowAgain()) { store.setValue(ICVSUIConstants.PREF_PROMPT_ON_CHANGE_GRANULARITY, false); } - if (!result) return; + if (!result) { + action.setChecked(! action.isChecked()); + return; + } } syncInput.setSyncGranularity(action.isChecked() ? ILocalSyncElement.GRANULARITY_CONTENTS : ILocalSyncElement.GRANULARITY_TIMESTAMP); } |