Bug 176992 RepositoryProvider#getFileModificationValidator returns deprecated interface

2 files changed, 9 insertions, 3 deletions

diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProvider.java
index 3e47e5ab7..967b92e3c 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProvider.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProvider.java
@@ -176,13 +176,13 @@ public class FileSystemProvider extends RepositoryProvider {
 	 * @see org.eclipse.team.core.RepositoryProvider#getFileModificationValidator()
 	 */
 	public IFileModificationValidator getFileModificationValidator() {
-		return getNewFileModificationValidator();
+		return getFileModificationValidator2();
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.team.core.RepositoryProvider#getFileModificationValidator2()
 	 */
-	public FileModificationValidator getNewFileModificationValidator() {
+	public FileModificationValidator getFileModificationValidator2() {
 		return new org.eclipse.team.examples.filesystem.FileModificationValidator(this);
 	}
 	
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java
index 2bd86742a..d598bd42e 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java
@@ -12,7 +12,9 @@ package org.eclipse.team.examples.pessimistic;
  
 import java.io.*;
 import java.util.*;
+
 import org.eclipse.core.resources.*;
+import org.eclipse.core.resources.team.FileModificationValidator;
 import org.eclipse.core.runtime.*;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.team.core.RepositoryProvider;
@@ -38,7 +40,7 @@ public class PessimisticFilesystemProvider extends RepositoryProvider  {
 	/**
 	 * The file modification validator for this provider.
 	 */
-	private IFileModificationValidator validator;
+	private FileModificationValidator validator;
 	/**
 	 * The cache of resources that are currently controlled.
 	 * The cache is a map of parent resource -> set of controlled children.
@@ -327,6 +329,10 @@ public class PessimisticFilesystemProvider extends RepositoryProvider  {
 	 * @see IRepositoryProvider#getFileModificationValidator()
 	 */
 	public IFileModificationValidator getFileModificationValidator() {
+		return getFileModificationValidator();
+	}
+	
+	public FileModificationValidator getFileModificationValidator2() {
 		return validator;
 	}