Attachment #25737 for bug #35997

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

Lines 10-15 Link Here

(-).project (+6 lines)
10	</projects>	10	</projects>
11	<buildSpec>	11	<buildSpec>
12	<buildCommand>	12	<buildCommand>
		13	<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
		14	<arguments>
		15	</arguments>
		16	</buildCommand>
		17	<buildCommand>
13	<name>org.eclipse.jdt.core.javabuilder</name>	18	<name>org.eclipse.jdt.core.javabuilder</name>
14	<arguments>	19	<arguments>
15	</arguments>	20	</arguments>
Lines 28-32 Link Here
28	<natures>	33	<natures>
29	<nature>org.eclipse.jdt.core.javanature</nature>	34	<nature>org.eclipse.jdt.core.javanature</nature>
30	<nature>org.eclipse.pde.PluginNature</nature>	35	<nature>org.eclipse.pde.PluginNature</nature>
		36	<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
31	</natures>	37	</natures>
32	</projectDescription>	38	</projectDescription>




	}
	
	protected void performEdit(IFile[] files, IProgressMonitor monitor) throws CVSException {
		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) {

    
    public ISchedulingRule validateEditRule(CVSResourceRuleFactory factory, IResource[] resources) {
        IFileModificationValidator override = getUIValidator();
        if (override instanceof CVSCoreFileModificationValidator && override.getClass() != getClass()) {
            CVSCoreFileModificationValidator ui = (CVSCoreFileModificationValidator) override;
            return ui.validateEditRule(factory, resources);
        }




	private boolean crash;

    private boolean autoShareOnImport;
    private boolean watchOnEdit;
	public synchronized CVSWorkspaceSubscriber getCVSWorkspaceSubscriber() {
		if (cvsWorkspaceSubscriber == null) {
			cvsWorkspaceSubscriber = new CVSWorkspaceSubscriber(

    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;
	}
}

Added Link Here

(-).checkstyle (+2 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<fileset-config file-format-version="1.0.0"/>

Return to bug 35997

Lines 123-129 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java (-2 / +9 lines)
123	}	123	}
124		124
125	protected void performEdit(IFile[] files, IProgressMonitor monitor) throws CVSException {	125	protected void performEdit(IFile[] files, IProgressMonitor monitor) throws CVSException {
126	getProvider(files).edit(files, false /* recurse /, true / notify server /, true / notify for writtable files */, ICVSFile.NO_NOTIFICATION, monitor);	126	int notify;
		127	if (CVSProviderPlugin.getPlugin().isWatchOnEdit()) {
		128	notify = ICVSFile.NOTIFY_ON_ALL;
		129	}
		130	else {
		131	notify = ICVSFile.NO_NOTIFICATION;
		132	}
		133	getProvider(files).edit(files, false /* recurse /, true / notify server /, true / notify for writtable files */, notify, monitor);
127	}	134	}
128		135
129	private boolean needsCheckout(IFile file) {	136	private boolean needsCheckout(IFile file) {
Lines 199-205 Link Here
199		206
200	public ISchedulingRule validateEditRule(CVSResourceRuleFactory factory, IResource[] resources) {	207	public ISchedulingRule validateEditRule(CVSResourceRuleFactory factory, IResource[] resources) {
201	IFileModificationValidator override = getUIValidator();	208	IFileModificationValidator override = getUIValidator();
202	if (override instanceof CVSCoreFileModificationValidator) {	209	if (override instanceof CVSCoreFileModificationValidator && override.getClass() != getClass()) {
203	CVSCoreFileModificationValidator ui = (CVSCoreFileModificationValidator) override;	210	CVSCoreFileModificationValidator ui = (CVSCoreFileModificationValidator) override;
204	return ui.validateEditRule(factory, resources);	211	return ui.validateEditRule(factory, resources);
205	}	212	}

Lines 104-110 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java (-1 / +17 lines)
104	private boolean crash;	104	private boolean crash;
105		105
106	private boolean autoShareOnImport;	106	private boolean autoShareOnImport;
107		107	private boolean watchOnEdit;
108	public synchronized CVSWorkspaceSubscriber getCVSWorkspaceSubscriber() {	108	public synchronized CVSWorkspaceSubscriber getCVSWorkspaceSubscriber() {
109	if (cvsWorkspaceSubscriber == null) {	109	if (cvsWorkspaceSubscriber == null) {
110	cvsWorkspaceSubscriber = new CVSWorkspaceSubscriber(	110	cvsWorkspaceSubscriber = new CVSWorkspaceSubscriber(
Lines 589-592 Link Here
589	public boolean isAutoshareOnImport() {	589	public boolean isAutoshareOnImport() {
590	return autoShareOnImport;	590	return autoShareOnImport;
591	}	591	}
		592
		593
		594	/**
		595	* @return Returns the watchOnEdit.
		596	*/
		597	public boolean isWatchOnEdit() {
		598	return watchOnEdit;
		599	}
		600
		601
		602	/**
		603	* @param watchOnEdit The watchOnEdit to set.
		604	*/
		605	public void setWatchOnEdit(boolean watchOnEdit) {
		606	this.watchOnEdit = watchOnEdit;
		607	}
592	}	608	}