### Eclipse Workspace Patch 1.0 #P org.eclipse.team.examples.filesystem Index: src/org/eclipse/team/examples/pessimistic/PessimisticModificationValidator.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticModificationValidator.java,v retrieving revision 1.4 diff -u -r1.4 PessimisticModificationValidator.java --- src/org/eclipse/team/examples/pessimistic/PessimisticModificationValidator.java 22 Feb 2005 19:47:24 -0000 1.4 +++ src/org/eclipse/team/examples/pessimistic/PessimisticModificationValidator.java 1 Mar 2007 14:10:00 -0000 @@ -11,7 +11,10 @@ package org.eclipse.team.examples.pessimistic; import java.util.*; + import org.eclipse.core.resources.*; +import org.eclipse.core.resources.team.FileModificationValidationContext; +import org.eclipse.core.resources.team.FileModificationValidator; import org.eclipse.core.runtime.*; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.viewers.ILabelProvider; @@ -31,7 +34,7 @@ * @see IFileModificationValidator */ public class PessimisticModificationValidator - implements IFileModificationValidator { + extends FileModificationValidator { /* * The provider for this validator */ @@ -44,7 +47,7 @@ /** * @see IFileModificationValidator#validateEdit(IFile[], Object) */ - public IStatus validateEdit(IFile[] files, Object context) { + public IStatus validateEdit(IFile[] files, FileModificationValidationContext context) { if (files.length == 0) { return new Status( IStatus.OK, getUid(), IStatus.OK, "OK", null); } @@ -79,7 +82,7 @@ return new Status( IStatus.ERROR, getUid(), IStatus.ERROR, "Fail Validate Edit Preference true", null); } if(statusCode == IStatus.CANCEL) { - return new Status( IStatus.CANCEL, getUid(), IStatus.ERROR, "Checkout cancelled by user", null); + return new Status( IStatus.CANCEL, getUid(), IStatus.ERROR, "Checkout canceled by user", null); } } else { if (isAutomaticCheckout()) { Index: src/org/eclipse/team/examples/filesystem/FileModificationValidator.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileModificationValidator.java,v retrieving revision 1.9 diff -u -r1.9 FileModificationValidator.java --- src/org/eclipse/team/examples/filesystem/FileModificationValidator.java 18 Mar 2005 20:25:42 -0000 1.9 +++ src/org/eclipse/team/examples/filesystem/FileModificationValidator.java 1 Mar 2007 14:10:00 -0000 @@ -14,8 +14,8 @@ import java.util.Collection; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFileModificationValidator; import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.team.FileModificationValidationContext; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.team.core.RepositoryProvider; @@ -23,11 +23,11 @@ /** * This class models a sentry that verifies whether resources are available for editing or overwriting. - * This has been made a separate clas for illustration purposes. It may have been more apporpriate + * This has been made a separate class for illustration purposes. It may have been more appropriate * to have FileSystemProvider implement IFileModificationValidator itself since the interface * only has two methods and their implementation is straight forward. */ -public final class FileModificationValidator implements IFileModificationValidator { +public final class FileModificationValidator extends org.eclipse.core.resources.team.FileModificationValidator { private FileSystemOperations operations; @@ -39,7 +39,7 @@ } /** - * This method will convert any exceptions thrown by the SimpleAccessOperations.chechout() to a Status. + * This method will convert any exceptions thrown by the SimpleAccessOperations.checkout() to a Status. * @param resources the resources that are to be checked out * @return IStatus a status indicator that reports whether the operation went smoothly or not. */ @@ -57,7 +57,7 @@ * The idea is to prevent anyone from accidentally working on a file that they won't be able to check in changes to. * @see org.eclipse.core.resources.IFileModificationValidator#validateEdit(IFile[], Object) */ - public IStatus validateEdit(IFile[] files, Object context) { + public IStatus validateEdit(IFile[] files, FileModificationValidationContext context) { Collection toBeCheckedOut = new ArrayList(); //Make a list of all the files that need to be checked out: @@ -72,15 +72,14 @@ /** * This method will be called by the workbench before it tries to save a file. - * It should not attempt to save any files that don't recieve an OK status here. + * It should not attempt to save any files that don't receive an OK status here. * @see org.eclipse.core.resources.IFileModificationValidator#validateSave(IFile) */ public IStatus validateSave(IFile file) { if (file.isReadOnly()) { return checkout(new IResource[] { file }); - } else { - return Status.OK_STATUS; } + return Status.OK_STATUS; } } #P org.eclipse.team.ui Index: plugin.xml =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.team.ui/plugin.xml,v retrieving revision 1.184 diff -u -r1.184 plugin.xml --- plugin.xml 6 Feb 2007 13:46:55 -0000 1.184 +++ plugin.xml 1 Mar 2007 14:10:02 -0000 @@ -269,7 +269,7 @@ + id="org.eclipse.ui.navigator.ProjectExplorer"> Index: src/org/eclipse/team/internal/ui/DefaultUIFileModificationValidator.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/DefaultUIFileModificationValidator.java,v retrieving revision 1.7 diff -u -r1.7 DefaultUIFileModificationValidator.java --- src/org/eclipse/team/internal/ui/DefaultUIFileModificationValidator.java 2 Oct 2006 20:19:01 -0000 1.7 +++ src/org/eclipse/team/internal/ui/DefaultUIFileModificationValidator.java 1 Mar 2007 14:10:02 -0000 @@ -15,6 +15,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourceAttributes; +import org.eclipse.core.resources.team.FileModificationValidationContext; import org.eclipse.core.runtime.*; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; @@ -118,12 +119,12 @@ } /* (non-Javadoc) - * @see org.eclipse.team.internal.core.DefaultFileModificationValidator#validateEdit(org.eclipse.core.resources.IFile[], java.lang.Object) + * @see org.eclipse.team.internal.core.DefaultFileModificationValidator#validateEdit(org.eclipse.core.resources.IFile[], org.eclipse.core.resources.team.FileModificationValidationContext) */ - public IStatus validateEdit(final IFile[] allFiles, Object context) { + public IStatus validateEdit(final IFile[] allFiles, FileModificationValidationContext context) { final IFile[] readOnlyFiles = getReadOnlyFiles(allFiles); - if (readOnlyFiles.length > 0 && context != null && context instanceof Shell) { - final Shell shell = (Shell)context; + if (readOnlyFiles.length > 0 && context != null) { + final Shell shell = getShell(context); final boolean[] ok = new boolean[] { false }; if (readOnlyFiles.length == 1) { shell.getDisplay().syncExec(new Runnable() { @@ -149,7 +150,13 @@ return getStatus(readOnlyFiles); } - public IStatus validateSave(IFile file) { + private Shell getShell(FileModificationValidationContext context) { + if (context.getShell() != null) + return (Shell)context.getShell(); + return Utils.getShell(null); + } + + public IStatus validateSave(IFile file) { if (file.isReadOnly() && isMakeWrittableWhenContextNotProvided()) { IFile[] readOnlyFiles = new IFile[] { file }; setWritable(readOnlyFiles); #P org.eclipse.team.core Index: schema/defaultFileModificationValidator.exsd =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.team.core/schema/defaultFileModificationValidator.exsd,v retrieving revision 1.4 diff -u -r1.4 defaultFileModificationValidator.exsd --- schema/defaultFileModificationValidator.exsd 13 Jun 2006 19:29:26 -0000 1.4 +++ schema/defaultFileModificationValidator.exsd 1 Mar 2007 14:10:03 -0000 @@ -40,7 +40,7 @@ - + @@ -88,7 +88,7 @@ - Copyright (c) 2004 IBM Corporation and others. + Copyright (c) 2004 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> Index: src/org/eclipse/team/internal/core/DefaultFileModificationValidator.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.team.core/src/org/eclipse/team/internal/core/DefaultFileModificationValidator.java,v retrieving revision 1.16 diff -u -r1.16 DefaultFileModificationValidator.java --- src/org/eclipse/team/internal/core/DefaultFileModificationValidator.java 2 Oct 2006 20:19:14 -0000 1.16 +++ src/org/eclipse/team/internal/core/DefaultFileModificationValidator.java 1 Mar 2007 14:10:03 -0000 @@ -13,20 +13,22 @@ import java.util.ArrayList; import java.util.List; -import org.eclipse.core.resources.*; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.team.FileModificationValidationContext; +import org.eclipse.core.resources.team.FileModificationValidator; import org.eclipse.core.runtime.*; import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.ITeamStatus; import org.eclipse.team.core.TeamStatus; -public class DefaultFileModificationValidator implements IFileModificationValidator { +public class DefaultFileModificationValidator extends FileModificationValidator { /* * A validator plugged in the the Team UI that will prompt * the user to make read-only files writable. In the absence of * this validator, edit/save fail on read-only files. */ - private IFileModificationValidator uiValidator; + private FileModificationValidator uiValidator; protected IStatus getDefaultStatus(IFile file) { return @@ -35,10 +37,7 @@ : Status.OK_STATUS; } - /** - * @see IFileModificationValidator#validateEdit(IFile[], Object) - */ - public IStatus validateEdit(IFile[] files, Object context) { + public IStatus validateEdit(IFile[] files, FileModificationValidationContext context) { IFile[] readOnlyFiles = getReadOnly(files); if (readOnlyFiles.length == 0) return Status.OK_STATUS; @@ -86,9 +85,6 @@ return (IFile[]) result.toArray(new IFile[result.size()]); } - /** - * @see IFileModificationValidator#validateSave(IFile) - */ public IStatus validateSave(IFile file) { if (!file.isReadOnly()) return Status.OK_STATUS; @@ -102,7 +98,7 @@ return getDefaultStatus(file); } - private IFileModificationValidator loadUIValidator() { + private FileModificationValidator loadUIValidator() { IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(TeamPlugin.ID, TeamPlugin.DEFAULT_FILE_MODIFICATION_VALIDATOR_EXTENSION); if (extension != null) { IExtension[] extensions = extension.getExtensions(); @@ -111,8 +107,8 @@ if (configElements.length > 0) { try { Object o = configElements[0].createExecutableExtension("class"); //$NON-NLS-1$ - if (o instanceof IFileModificationValidator) { - return (IFileModificationValidator)o; + if (o instanceof FileModificationValidator) { + return (FileModificationValidator)o; } } catch (CoreException e) { TeamPlugin.log(e); Index: src/org/eclipse/team/internal/core/FileModificationValidatorManager.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileModificationValidatorManager.java,v retrieving revision 1.10 diff -u -r1.10 FileModificationValidatorManager.java --- src/org/eclipse/team/internal/core/FileModificationValidatorManager.java 10 May 2006 17:47:43 -0000 1.10 +++ src/org/eclipse/team/internal/core/FileModificationValidatorManager.java 1 Mar 2007 14:10:03 -0000 @@ -15,12 +15,14 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFileModificationValidator; +import org.eclipse.core.resources.team.FileModificationValidationContext; +import org.eclipse.core.resources.team.FileModificationValidator; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; import org.eclipse.team.core.RepositoryProvider; -public class FileModificationValidatorManager implements IFileModificationValidator { - private IFileModificationValidator defaultValidator; +public class FileModificationValidatorManager extends FileModificationValidator { + private FileModificationValidator defaultValidator; /* * @see IFileModificationValidator#validateEdit(IFile[], Object) @@ -28,7 +30,7 @@ * Ask each provider once for its files. * Collect the resulting status' and return a MultiStatus. */ - public IStatus validateEdit(IFile[] files, Object context) { + public IStatus validateEdit(IFile[] files, FileModificationValidationContext context) { ArrayList returnStati = new ArrayList(); //map provider to the files under that provider's control @@ -63,6 +65,11 @@ if (v != null) validator = v; } + //must null any reference to FileModificationValidationContext for backwards compatibility + if (!(validator instanceof FileModificationValidator)) + if (context instanceof FileModificationValidationContext) + context = null; + IStatus status = validator.validateEdit(filesArray, context); if(!status.isOK()) allOK = false; @@ -99,7 +106,7 @@ return validator.validateSave(file); } - private synchronized IFileModificationValidator getDefaultValidator() { + private synchronized FileModificationValidator getDefaultValidator() { if (defaultValidator == null) { defaultValidator = new DefaultFileModificationValidator(); } #P org.eclipse.team.cvs.ui Index: src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java,v retrieving revision 1.29 diff -u -r1.29 FileModificationValidator.java --- src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java 10 May 2006 17:48:04 -0000 1.29 +++ src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java 1 Mar 2007 14:10:03 -0000 @@ -17,6 +17,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.team.FileModificationValidationContext; import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.core.runtime.jobs.Job; @@ -30,27 +31,30 @@ import org.eclipse.team.internal.ccvs.core.client.Command; import org.eclipse.team.internal.ccvs.ui.actions.EditorsAction; import org.eclipse.team.internal.ccvs.ui.operations.UpdateOperation; +import org.eclipse.team.internal.ui.Utils; import org.eclipse.ui.progress.IProgressConstants; /** - * IFileModificationValidator that is pluged into the CVS Repository Provider + * IFileModificationValidator that is plugged into the CVS Repository Provider */ public class FileModificationValidator extends CVSCoreFileModificationValidator { public FileModificationValidator() { } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.core.CVSCoreFileModificationValidator#edit(org.eclipse.core.resources.IFile[], java.lang.Object) + /* (non-Javadoc) + * @see org.eclipse.team.internal.ccvs.core.CVSCoreFileModificationValidator#edit(org.eclipse.core.resources.IFile[], org.eclipse.core.resources.team.FileModificationValidationContext) */ - protected IStatus edit(IFile[] readOnlyFiles, Object context) { + protected IStatus edit(IFile[] readOnlyFiles, FileModificationValidationContext context) { return edit(readOnlyFiles, getShell(context)); } - private Shell getShell(Object context) { - if (context instanceof Shell) - return (Shell)context; - return null; + private Shell getShell(FileModificationValidationContext context) { + if (context == null) + return null; + if (context.getShell() != null) + return (Shell)context.getShell(); + return Utils.getShell(null); } private IStatus getStatus(InvocationTargetException e) { @@ -142,7 +146,7 @@ } private URL getOperationIcon() { - return Platform.find(CVSUIPlugin.getPlugin().getBundle(), new Path(ICVSUIConstants.ICON_PATH + ICVSUIConstants.IMG_CVS_PERSPECTIVE)); + return FileLocator.find(CVSUIPlugin.getPlugin().getBundle(), new Path(ICVSUIConstants.ICON_PATH + ICVSUIConstants.IMG_CVS_PERSPECTIVE), null); } private boolean isRunningInUIThread() { @@ -185,7 +189,7 @@ } private boolean promptEdit(Shell shell) { - // Open the dialog using a sync exec (there are no guarentees that we + // Open the dialog using a sync exec (there are no guarantees that we // were called from the UI thread final boolean[] result = new boolean[] { false }; int flags = isRunningInUIThread() ? 0 : CVSUIPlugin.PERFORM_SYNC_EXEC; @@ -198,7 +202,7 @@ } private boolean promptUpdate(Shell shell) { - // Open the dialog using a sync exec (there are no guarentees that we + // Open the dialog using a sync exec (there are no guarantees that we // were called from the UI thread final boolean[] result = new boolean[] { false }; int flags = isRunningInUIThread() ? 0 : CVSUIPlugin.PERFORM_SYNC_EXEC; #P org.eclipse.team.cvs.core Index: src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java,v retrieving revision 1.10 diff -u -r1.10 CVSCoreFileModificationValidator.java --- src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java 10 May 2006 18:42:10 -0000 1.10 +++ src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java 1 Mar 2007 14:10:03 -0000 @@ -10,12 +10,11 @@ *******************************************************************************/ package org.eclipse.team.internal.ccvs.core; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.*; import org.eclipse.core.resources.*; +import org.eclipse.core.resources.team.FileModificationValidationContext; +import org.eclipse.core.resources.team.FileModificationValidator; import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.jobs.*; import org.eclipse.osgi.util.NLS; @@ -25,14 +24,14 @@ /** * Core validator that will load the UI validator only if a prompt is needed */ -public class CVSCoreFileModificationValidator implements ICVSFileModificationValidator { +public class CVSCoreFileModificationValidator extends FileModificationValidator implements ICVSFileModificationValidator { - IFileModificationValidator uiValidator; + FileModificationValidator uiValidator; /* (non-Javadoc) - * @see org.eclipse.core.resources.IFileModificationValidator#validateEdit(org.eclipse.core.resources.IFile[], java.lang.Object) + * @see org.eclipse.core.resources.team.FileModificationValidator#validateEdit(org.eclipse.core.resources.IFile[], org.eclipse.core.resources.team.FileModificationValidationContext) */ - public IStatus validateEdit(IFile[] files, Object context) { + public IStatus validateEdit(IFile[] files, FileModificationValidationContext context) { IFile[] unmanagedReadOnlyFiles = getUnmanagedReadOnlyFiles(files); if (unmanagedReadOnlyFiles.length > 0) { IStatus status = setWritable(unmanagedReadOnlyFiles); @@ -55,7 +54,7 @@ } return Status.OK_STATUS; } - return edit(new IFile[] {file}, (Object)null); + return edit(new IFile[] {file}, (FileModificationValidationContext)null); } /** @@ -67,8 +66,8 @@ * @param context * @return */ - protected IStatus edit(IFile[] readOnlyFiles, Object context) { - IFileModificationValidator override = getUIValidator(); + protected IStatus edit(IFile[] readOnlyFiles, FileModificationValidationContext context) { + FileModificationValidator override = getUIValidator(); if (override != null) { return override.validateEdit(readOnlyFiles, context); } else { @@ -77,7 +76,7 @@ } } - private IFileModificationValidator getUIValidator() { + private FileModificationValidator getUIValidator() { synchronized(this) { if (uiValidator == null) { uiValidator = getPluggedInValidator(); @@ -181,7 +180,7 @@ return (IFile[]) readOnlys.toArray(new IFile[readOnlys.size()]); } - private static IFileModificationValidator getPluggedInValidator() { + private static FileModificationValidator getPluggedInValidator() { IExtension[] extensions = Platform.getExtensionRegistry().getExtensionPoint(CVSProviderPlugin.ID, CVSProviderPlugin.PT_FILE_MODIFICATION_VALIDATOR).getExtensions(); if (extensions.length == 0) return null; @@ -193,7 +192,7 @@ } try { IConfigurationElement config = configs[0]; - return (IFileModificationValidator) config.createExecutableExtension("run");//$NON-NLS-1$ + return (FileModificationValidator) config.createExecutableExtension("run");//$NON-NLS-1$ } catch (CoreException ex) { CVSProviderPlugin.log(IStatus.ERROR, NLS.bind("The CVS file modification validator registered as ID {0} could not be instantiated", (new Object[] {extension.getUniqueIdentifier()})), ex);//$NON-NLS-1$ return null; @@ -201,7 +200,7 @@ } public ISchedulingRule validateEditRule(CVSResourceRuleFactory factory, IResource[] resources) { - IFileModificationValidator override = getUIValidator(); + FileModificationValidator override = getUIValidator(); if (override instanceof CVSCoreFileModificationValidator && override != this) { CVSCoreFileModificationValidator ui = (CVSCoreFileModificationValidator) override; return ui.validateEditRule(factory, resources); Index: src/org/eclipse/team/internal/ccvs/core/ICVSFileModificationValidator.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSFileModificationValidator.java,v retrieving revision 1.5 diff -u -r1.5 ICVSFileModificationValidator.java --- src/org/eclipse/team/internal/ccvs/core/ICVSFileModificationValidator.java 10 May 2006 18:42:10 -0000 1.5 +++ src/org/eclipse/team/internal/ccvs/core/ICVSFileModificationValidator.java 1 Mar 2007 14:10:03 -0000 @@ -11,7 +11,6 @@ package org.eclipse.team.internal.ccvs.core; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFileModificationValidator; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -23,7 +22,7 @@ * To enable and disable the creation of type comments go to * Window>Preferences>Java>Code Generation. */ -public interface ICVSFileModificationValidator extends IFileModificationValidator { +public interface ICVSFileModificationValidator { public IStatus validateMoveDelete(IFile[] files, IProgressMonitor monitor); #P org.eclipse.team.tests.core Index: src/org/eclipse/team/tests/core/RepositoryProviderTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderTests.java,v retrieving revision 1.17 diff -u -r1.17 RepositoryProviderTests.java --- src/org/eclipse/team/tests/core/RepositoryProviderTests.java 10 May 2006 17:49:31 -0000 1.17 +++ src/org/eclipse/team/tests/core/RepositoryProviderTests.java 1 Mar 2007 14:10:04 -0000 @@ -11,27 +11,15 @@ package org.eclipse.team.tests.core; import java.io.ByteArrayInputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.util.*; import junit.extensions.TestSetup; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFileModificationValidator; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IProjectDescription; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IResourceStatus; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.resources.team.IMoveDeleteHook; -import org.eclipse.core.resources.team.IResourceTree; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.resources.*; +import org.eclipse.core.resources.team.*; +import org.eclipse.core.runtime.*; import org.eclipse.team.core.RepositoryProvider; import org.eclipse.team.core.TeamException; @@ -132,9 +120,9 @@ // test that validator gets called by team core dispatching final boolean[] called = new boolean[] {false}; - bicProvider.setModificationValidator(new IFileModificationValidator() { + bicProvider.setModificationValidator(new FileModificationValidator() { // can't test validate edit here because it is only called from editors - public IStatus validateEdit(IFile[] files, Object context) { + public IStatus validateEdit(IFile[] files, FileModificationValidationContext context) { return null; } public IStatus validateSave(IFile file) { @@ -149,9 +137,9 @@ // test that validator can veto a setContents called[0] = false; - bicProvider.setModificationValidator(new IFileModificationValidator() { + bicProvider.setModificationValidator(new FileModificationValidator() { // can't test validate edit here because it is only called from editors - public IStatus validateEdit(IFile[] files, Object context) { + public IStatus validateEdit(IFile[] files, FileModificationValidationContext context) { return null; } public IStatus validateSave(IFile file) {