Attachment 25738 Details for Bug 35997 – Patch to org.eclipse.team.cvs.ui project to allow for temporary edits at commit time.

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

[patch] Patch to org.eclipse.team.cvs.ui project to allow for temporary edits at commit time.

cvsUIPatch.txt (text/plain), 6.76 KB, created by Andrew Craig

on 2005-08-05 05:26:20 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Craig

Created: 2005-08-05 05:26:20 EDT

Size: 6.76 KB

patch

obsolete

>Index: src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java,v
>retrieving revision 1.61
>diff -u -r1.61 CVSPreferencesPage.java
>--- src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java	4 Aug 2005 20:24:50 -0000	1.61
>+++ src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java	5 Aug 2005 09:19:46 -0000
>@@ -375,7 +375,7 @@
> 		new Checkbox(composite, ICVSUIConstants.PREF_DEBUG_PROTOCOL, CVSUIMessages.CVSPreferencesPage_17, IHelpContextIds.PREF_DEBUG_PROTOCOL);
> 		new Checkbox(composite, ICVSUIConstants.PREF_AUTO_REFRESH_TAGS_IN_TAG_SELECTION_DIALOG, CVSUIMessages.CVSPreferencesPage_18, IHelpContextIds.PREF_AUTOREFRESH_TAG);
>         new Checkbox(composite, ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT, CVSUIMessages.CVSPreferencesPage_44, null);
>-        
>+        new Checkbox(composite, ICVSUIConstants.PREF_ENABLE_WATCH_ON_EDIT, CVSUIMessages.CVSPreferencesPage_45, null);
>         final Composite textComposite= SWTUtils.createHFillComposite(composite, SWTUtils.MARGINS_NONE, 2);
>         new TextField(
>                 textComposite, 
>@@ -560,6 +560,7 @@
> 		CVSProviderPlugin.getPlugin().setUsePlatformLineend(store.getBoolean(ICVSUIConstants.PREF_USE_PLATFORM_LINEEND));
> 		CVSProviderPlugin.getPlugin().setDetermineVersionEnabled(store.getBoolean(ICVSUIConstants.PREF_DETERMINE_SERVER_VERSION));
>         CVSProviderPlugin.getPlugin().setAutoshareOnImport(store.getBoolean(ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT));
>+        CVSProviderPlugin.getPlugin().setWatchOnEdit(store.getBoolean(ICVSUIConstants.PREF_ENABLE_WATCH_ON_EDIT));
> 		
> 		// changing the default keyword substitution mode for text files may affect
> 		// information displayed in the decorators
>Index: src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java,v
>retrieving revision 1.13
>diff -u -r1.13 CVSUIMessages.java
>--- src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java	4 Aug 2005 15:35:05 -0000	1.13
>+++ src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java	5 Aug 2005 09:19:47 -0000
>@@ -225,6 +225,7 @@
> 	public static String CVSPreferencesPage_42;
> 	public static String CVSPreferencesPage_43;
>     public static String CVSPreferencesPage_44;
>+    public static String CVSPreferencesPage_45;
> 	public static String CVSPropertiesPage_virtualModule;
> 
> 
>Index: src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java,v
>retrieving revision 1.171
>diff -u -r1.171 CVSUIPlugin.java
>--- src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java	4 Aug 2005 20:24:50 -0000	1.171
>+++ src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java	5 Aug 2005 09:19:47 -0000
>@@ -531,6 +531,7 @@
> 		store.setDefault(ICVSUIConstants.PREF_COMMIT_SET_DEFAULT_ENABLEMENT, false);
> 		store.setDefault(ICVSUIConstants.PREF_AUTO_REFRESH_TAGS_IN_TAG_SELECTION_DIALOG, false);
>         store.setDefault(ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT, true);
>+        store.setDefault(ICVSUIConstants.PREF_ENABLE_WATCH_ON_EDIT, false);
>         store.setDefault(ICVSUIConstants.PREF_COMMIT_FILES_DISPLAY_THRESHOLD, 1000);
> 		
> 		PreferenceConverter.setDefault(store, ICVSUIConstants.PREF_CONSOLE_COMMAND_COLOR, new RGB(0, 0, 0));
>Index: src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java,v
>retrieving revision 1.91
>diff -u -r1.91 ICVSUIConstants.java
>--- src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java	4 Aug 2005 15:00:36 -0000	1.91
>+++ src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java	5 Aug 2005 09:19:47 -0000
>@@ -95,7 +95,7 @@
> 	public final String PREF_AUTO_REFRESH_TAGS_IN_TAG_SELECTION_DIALOG = "pref_auto_refresh_tags_in_tag_selection_dialog"; //$NON-NLS-1$
>     public final String PREF_COMMIT_FILES_DISPLAY_THRESHOLD = "pref_commit_files_display_threshold"; //$NON-NLS-1$
>     public final String PREF_AUTO_SHARE_ON_IMPORT = "pref_auto_share_on_import"; //$NON-NLS-1$
>-	
>+	public final String PREF_ENABLE_WATCH_ON_EDIT = "pref_enable_watch_on_edit"; //$NON-NLS-1$ 
> 	// console preferences
> 	public final String PREF_CONSOLE_COMMAND_COLOR = "pref_console_command_color"; //$NON-NLS-1$
> 	public final String PREF_CONSOLE_MESSAGE_COLOR = "pref_console_message_color"; //$NON-NLS-1$
>Index: src/org/eclipse/team/internal/ccvs/ui/messages.properties
>===================================================================
>RCS file: /home/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties,v
>retrieving revision 1.439
>diff -u -r1.439 messages.properties
>--- src/org/eclipse/team/internal/ccvs/ui/messages.properties	4 Aug 2005 15:35:05 -0000	1.439
>+++ src/org/eclipse/team/internal/ccvs/ui/messages.properties	5 Aug 2005 09:19:47 -0000
>@@ -221,6 +221,8 @@
> CVSPreferencesPage_42=&Open perspective after a 'Show Annotations' operation
> CVSPreferencesPage_43=D&efault perspective for 'Show Annotations':
> CVSPreferencesPage_44=Aut&omatically share projects containing CVS meta information
>+CVSPreferencesPage_45=Enable Temporary &Watches on Edit
>+
> CVSPropertiesPage_virtualModule=<no corresponding remote folder>
> 
> 
>Index: src/org/eclipse/team/internal/ccvs/ui/actions/EditAction.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditAction.java,v
>retrieving revision 1.8
>diff -u -r1.8 EditAction.java
>--- src/org/eclipse/team/internal/ccvs/ui/actions/EditAction.java	7 Apr 2005 15:37:13 -0000	1.8
>+++ src/org/eclipse/team/internal/ccvs/ui/actions/EditAction.java	5 Aug 2005 09:19:47 -0000
>@@ -39,9 +39,17 @@
> 					return;
> 				}
> 				
>+				
> 				executeProviderAction(new IProviderAction() {
> 					public IStatus execute(CVSTeamProvider provider, IResource[] resources, IProgressMonitor monitor) throws CVSException {
>-						provider.edit(resources, false /* recurse */, true /* notify server */, false /* notifyForWritable*/, ICVSFile.NO_NOTIFICATION, monitor);
>+						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));

Actions: View | Diff

Attachments on bug 35997: 25737 | 25738