Attachment 25737 Details for Bug 35997 – Patch to org.eclipse.team.cvs.core project to allow for (optional) Temporary Edit watches.

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.core project to allow for (optional) Temporary Edit watches.

cvsCorePatch.txt (text/plain), 3.96 KB, created by Andrew Craig

on 2005-08-05 05:25:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Craig

Created: 2005-08-05 05:25:27 EDT

Size: 3.96 KB

patch

obsolete

>Index: .project
>===================================================================
>RCS file: /home/eclipse/org.eclipse.team.cvs.core/.project,v
>retrieving revision 1.8
>diff -u -r1.8 .project
>--- .project	20 Aug 2004 15:00:38 -0000	1.8
>+++ .project	5 Aug 2005 09:19:34 -0000
>@@ -10,6 +10,11 @@
> 	</projects>
> 	<buildSpec>
> 		<buildCommand>
>+			<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
> 			<name>org.eclipse.jdt.core.javabuilder</name>
> 			<arguments>
> 			</arguments>
>@@ -28,5 +33,6 @@
> 	<natures>
> 		<nature>org.eclipse.jdt.core.javanature</nature>
> 		<nature>org.eclipse.pde.PluginNature</nature>
>+		<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
> 	</natures>
> </projectDescription>
>Index: src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java,v
>retrieving revision 1.6
>diff -u -r1.6 CVSCoreFileModificationValidator.java
>--- src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java	13 Jul 2005 15:34:55 -0000	1.6
>+++ src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java	5 Aug 2005 09:19:34 -0000
>@@ -123,7 +123,14 @@
> 	}
> 	
> 	protected void performEdit(IFile[] files, IProgressMonitor monitor) throws CVSException {
>-		getProvider(files).edit(files, false /* recurse */, true /* notify server */, true /* notify for writtable files */, ICVSFile.NO_NOTIFICATION, monitor);
>+		int notify;
>+		if (CVSProviderPlugin.getPlugin().isWatchOnEdit()) {
>+			notify = ICVSFile.NOTIFY_ON_ALL;
>+		}
>+		else {
>+			notify = ICVSFile.NO_NOTIFICATION;
>+		}
>+		getProvider(files).edit(files, false /* recurse */, true /* notify server */, true /* notify for writtable files */, notify, monitor);
> 	}
> 	
> 	private boolean needsCheckout(IFile file) {
>@@ -199,7 +206,7 @@
>     
>     public ISchedulingRule validateEditRule(CVSResourceRuleFactory factory, IResource[] resources) {
>         IFileModificationValidator override = getUIValidator();
>-        if (override instanceof CVSCoreFileModificationValidator) {
>+        if (override instanceof CVSCoreFileModificationValidator && override.getClass() != getClass()) {
>             CVSCoreFileModificationValidator ui = (CVSCoreFileModificationValidator) override;
>             return ui.validateEditRule(factory, resources);
>         }
>Index: src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java,v
>retrieving revision 1.100
>diff -u -r1.100 CVSProviderPlugin.java
>--- src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java	4 Aug 2005 20:24:44 -0000	1.100
>+++ src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java	5 Aug 2005 09:19:34 -0000
>@@ -104,7 +104,7 @@
> 	private boolean crash;
> 
>     private boolean autoShareOnImport;
>-
>+    private boolean watchOnEdit;
> 	public synchronized CVSWorkspaceSubscriber getCVSWorkspaceSubscriber() {
> 		if (cvsWorkspaceSubscriber == null) {
> 			cvsWorkspaceSubscriber = new CVSWorkspaceSubscriber(
>@@ -589,4 +589,20 @@
>     public boolean isAutoshareOnImport() {
>         return autoShareOnImport;
>     }
>+
>+	
>+	/**
>+	 * @return Returns the watchOnEdit.
>+	 */
>+	public boolean isWatchOnEdit() {
>+		return watchOnEdit;
>+	}
>+
>+	
>+	/**
>+	 * @param watchOnEdit The watchOnEdit to set.
>+	 */
>+	public void setWatchOnEdit(boolean watchOnEdit) {
>+		this.watchOnEdit = watchOnEdit;
>+	}
> }
>Index: .checkstyle
>===================================================================
>RCS file: .checkstyle
>diff -N .checkstyle
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ .checkstyle	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,2 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<fileset-config file-format-version="1.0.0"/>

Actions: View | Diff

Attachments on bug 35997: 25737 | 25738