Attachment #25738 for bug #35997

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 225-230 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java (+1 lines)
225	public static String CVSPreferencesPage_42;	225	public static String CVSPreferencesPage_42;
226	public static String CVSPreferencesPage_43;	226	public static String CVSPreferencesPage_43;
227	public static String CVSPreferencesPage_44;	227	public static String CVSPreferencesPage_44;
		228	public static String CVSPreferencesPage_45;
228	public static String CVSPropertiesPage_virtualModule;	229	public static String CVSPropertiesPage_virtualModule;
229		230
230		231

Lines 531-536 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java (+1 lines)
531	store.setDefault(ICVSUIConstants.PREF_COMMIT_SET_DEFAULT_ENABLEMENT, false);	531	store.setDefault(ICVSUIConstants.PREF_COMMIT_SET_DEFAULT_ENABLEMENT, false);
532	store.setDefault(ICVSUIConstants.PREF_AUTO_REFRESH_TAGS_IN_TAG_SELECTION_DIALOG, false);	532	store.setDefault(ICVSUIConstants.PREF_AUTO_REFRESH_TAGS_IN_TAG_SELECTION_DIALOG, false);
533	store.setDefault(ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT, true);	533	store.setDefault(ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT, true);
		534	store.setDefault(ICVSUIConstants.PREF_ENABLE_WATCH_ON_EDIT, false);
534	store.setDefault(ICVSUIConstants.PREF_COMMIT_FILES_DISPLAY_THRESHOLD, 1000);	535	store.setDefault(ICVSUIConstants.PREF_COMMIT_FILES_DISPLAY_THRESHOLD, 1000);
535		536
536	PreferenceConverter.setDefault(store, ICVSUIConstants.PREF_CONSOLE_COMMAND_COLOR, new RGB(0, 0, 0));	537	PreferenceConverter.setDefault(store, ICVSUIConstants.PREF_CONSOLE_COMMAND_COLOR, new RGB(0, 0, 0));

Lines 95-101 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java (-1 / +1 lines)
95	public final String PREF_AUTO_REFRESH_TAGS_IN_TAG_SELECTION_DIALOG = "pref_auto_refresh_tags_in_tag_selection_dialog"; //$NON-NLS-1$	95	public final String PREF_AUTO_REFRESH_TAGS_IN_TAG_SELECTION_DIALOG = "pref_auto_refresh_tags_in_tag_selection_dialog"; //$NON-NLS-1$
96	public final String PREF_COMMIT_FILES_DISPLAY_THRESHOLD = "pref_commit_files_display_threshold"; //$NON-NLS-1$	96	public final String PREF_COMMIT_FILES_DISPLAY_THRESHOLD = "pref_commit_files_display_threshold"; //$NON-NLS-1$
97	public final String PREF_AUTO_SHARE_ON_IMPORT = "pref_auto_share_on_import"; //$NON-NLS-1$	97	public final String PREF_AUTO_SHARE_ON_IMPORT = "pref_auto_share_on_import"; //$NON-NLS-1$
98		98	public final String PREF_ENABLE_WATCH_ON_EDIT = "pref_enable_watch_on_edit"; //$NON-NLS-1$
99	// console preferences	99	// console preferences
100	public final String PREF_CONSOLE_COMMAND_COLOR = "pref_console_command_color"; //$NON-NLS-1$	100	public final String PREF_CONSOLE_COMMAND_COLOR = "pref_console_command_color"; //$NON-NLS-1$
101	public final String PREF_CONSOLE_MESSAGE_COLOR = "pref_console_message_color"; //$NON-NLS-1$	101	public final String PREF_CONSOLE_MESSAGE_COLOR = "pref_console_message_color"; //$NON-NLS-1$

Lines 221-226 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/messages.properties (+2 lines)
221	CVSPreferencesPage_42=&Open perspective after a 'Show Annotations' operation	221	CVSPreferencesPage_42=&Open perspective after a 'Show Annotations' operation
222	CVSPreferencesPage_43=D&efault perspective for 'Show Annotations':	222	CVSPreferencesPage_43=D&efault perspective for 'Show Annotations':
223	CVSPreferencesPage_44=Aut&omatically share projects containing CVS meta information	223	CVSPreferencesPage_44=Aut&omatically share projects containing CVS meta information
		224	CVSPreferencesPage_45=Enable Temporary &Watches on Edit
		225
224	CVSPropertiesPage_virtualModule=<no corresponding remote folder>	226	CVSPropertiesPage_virtualModule=<no corresponding remote folder>
225		227
226		228




					return;
				}
				
				
				executeProviderAction(new IProviderAction() {
					public IStatus execute(CVSTeamProvider provider, IResource[] resources, IProgressMonitor monitor) throws CVSException {
						int notify;
						if (CVSProviderPlugin.getPlugin().isWatchOnEdit()) {
							notify = ICVSFile.NOTIFY_ON_ALL;
						}
						else {
							notify = ICVSFile.NO_NOTIFICATION;
						}
						provider.edit(resources, false /* recurse */, true /* notify server */, false /* notifyForWritable*/, notify, monitor);
						return Team.OK_STATUS;
					}
				}, Policy.subMonitorFor(monitor, 75));

Return to bug 35997

Lines 375-381 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java (-1 / +2 lines)
375	new Checkbox(composite, ICVSUIConstants.PREF_DEBUG_PROTOCOL, CVSUIMessages.CVSPreferencesPage_17, IHelpContextIds.PREF_DEBUG_PROTOCOL);	375	new Checkbox(composite, ICVSUIConstants.PREF_DEBUG_PROTOCOL, CVSUIMessages.CVSPreferencesPage_17, IHelpContextIds.PREF_DEBUG_PROTOCOL);
376	new Checkbox(composite, ICVSUIConstants.PREF_AUTO_REFRESH_TAGS_IN_TAG_SELECTION_DIALOG, CVSUIMessages.CVSPreferencesPage_18, IHelpContextIds.PREF_AUTOREFRESH_TAG);	376	new Checkbox(composite, ICVSUIConstants.PREF_AUTO_REFRESH_TAGS_IN_TAG_SELECTION_DIALOG, CVSUIMessages.CVSPreferencesPage_18, IHelpContextIds.PREF_AUTOREFRESH_TAG);
377	new Checkbox(composite, ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT, CVSUIMessages.CVSPreferencesPage_44, null);	377	new Checkbox(composite, ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT, CVSUIMessages.CVSPreferencesPage_44, null);
378		378	new Checkbox(composite, ICVSUIConstants.PREF_ENABLE_WATCH_ON_EDIT, CVSUIMessages.CVSPreferencesPage_45, null);
379	final Composite textComposite= SWTUtils.createHFillComposite(composite, SWTUtils.MARGINS_NONE, 2);	379	final Composite textComposite= SWTUtils.createHFillComposite(composite, SWTUtils.MARGINS_NONE, 2);
380	new TextField(	380	new TextField(
381	textComposite,	381	textComposite,
Lines 560-565 Link Here
560	CVSProviderPlugin.getPlugin().setUsePlatformLineend(store.getBoolean(ICVSUIConstants.PREF_USE_PLATFORM_LINEEND));	560	CVSProviderPlugin.getPlugin().setUsePlatformLineend(store.getBoolean(ICVSUIConstants.PREF_USE_PLATFORM_LINEEND));
561	CVSProviderPlugin.getPlugin().setDetermineVersionEnabled(store.getBoolean(ICVSUIConstants.PREF_DETERMINE_SERVER_VERSION));	561	CVSProviderPlugin.getPlugin().setDetermineVersionEnabled(store.getBoolean(ICVSUIConstants.PREF_DETERMINE_SERVER_VERSION));
562	CVSProviderPlugin.getPlugin().setAutoshareOnImport(store.getBoolean(ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT));	562	CVSProviderPlugin.getPlugin().setAutoshareOnImport(store.getBoolean(ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT));
		563	CVSProviderPlugin.getPlugin().setWatchOnEdit(store.getBoolean(ICVSUIConstants.PREF_ENABLE_WATCH_ON_EDIT));
563		564
564	// changing the default keyword substitution mode for text files may affect	565	// changing the default keyword substitution mode for text files may affect
565	// information displayed in the decorators	566	// information displayed in the decorators

Lines 39-47 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/actions/EditAction.java (-1 / +9 lines)
39	return;	39	return;
40	}	40	}
41		41
		42
42	executeProviderAction(new IProviderAction() {	43	executeProviderAction(new IProviderAction() {
43	public IStatus execute(CVSTeamProvider provider, IResource[] resources, IProgressMonitor monitor) throws CVSException {	44	public IStatus execute(CVSTeamProvider provider, IResource[] resources, IProgressMonitor monitor) throws CVSException {
44	provider.edit(resources, false /* recurse /, true / notify server /, false / notifyForWritable*/, ICVSFile.NO_NOTIFICATION, monitor);	45	int notify;
		46	if (CVSProviderPlugin.getPlugin().isWatchOnEdit()) {
		47	notify = ICVSFile.NOTIFY_ON_ALL;
		48	}
		49	else {
		50	notify = ICVSFile.NO_NOTIFICATION;
		51	}
		52	provider.edit(resources, false /* recurse /, true / notify server /, false / notifyForWritable*/, notify, monitor);
45	return Team.OK_STATUS;	53	return Team.OK_STATUS;
46	}	54	}
47	}, Policy.subMonitorFor(monitor, 75));	55	}, Policy.subMonitorFor(monitor, 75));