API tidy-up

15 files changed, 25 insertions, 63 deletions

diff --git a/bundles/org.eclipse.team.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.core/META-INF/MANIFEST.MF
index 53fd974cb..9b27f8ff4 100644
--- a/bundles/org.eclipse.team.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.team.core/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.team.core,
  org.eclipse.team.core.diff,
+ org.eclipse.team.core.diff.provider,
  org.eclipse.team.core.history,
  org.eclipse.team.core.history.provider,
  org.eclipse.team.core.mapping,
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/DiffNodeFilter.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/DiffFilter.java
index 5a0e08624..120294f81 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/DiffNodeFilter.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/DiffFilter.java
@@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
  * 
  * @since 3.2
  */
-public abstract class DiffNodeFilter {
+public abstract class DiffFilter {
 
 	/**
 	 * Return <code>true</code> if the provided <code>IDiffNode</code> matches the filter.
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/FastDiffNodeFilter.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/FastDiffFilter.java
index 9a30f80ff..d583e1484 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/FastDiffNodeFilter.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/FastDiffFilter.java
@@ -19,10 +19,10 @@ import org.eclipse.core.runtime.IProgressMonitor;
  * 
  * @see IDiffNode
  * @see IDiffTree
- * @see DiffNodeFilter
+ * @see DiffFilter
  * @since 3.2
  */
-public abstract class FastDiffNodeFilter extends DiffNodeFilter {
+public abstract class FastDiffFilter extends DiffFilter {
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.team.core.diff.DiffNodeFilter#select(org.eclipse.team.core.diff.IDiffNode, org.eclipse.core.runtime.IProgressMonitor)
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IDiffNode.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IDiffNode.java
index 4aa621b94..378edce4b 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IDiffNode.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IDiffNode.java
@@ -10,11 +10,13 @@
  *******************************************************************************/
 package org.eclipse.team.core.diff;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.team.core.diff.provider.Diff;
 
 /**
- * A diff node describes differences between two or more model objects.
+ * A diff describes differences between two or more model objects.
  * <p>
  * This interface is not intended to be implemented by clients.
+ * Instead, clients can subclass {@link Diff}.
  * </p>
  * 
  * <p>
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IDiffTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IDiffTree.java
index 389fec62d..2766a90d4 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IDiffTree.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IDiffTree.java
@@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IPath;
  * contain child paths in the set.
  * <p>
  * This interface is not intended to be implemented by clients. Clients
- * should use {@link org.eclipse.team.core.mapping.provider.DiffTree} instead.
+ * should use {@link org.eclipse.team.core.diff.provider.DiffTree} instead.
  * <p>
  * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
  * part of a work in progress. There is a guarantee neither that this API will
@@ -28,7 +28,7 @@ import org.eclipse.core.runtime.IPath;
  * consulting with the Platform/Team team.
  * </p>
  * 
- * @see org.eclipse.team.core.mapping.provider.DiffTree
+ * @see org.eclipse.team.core.diff.provider.DiffTree
  * @since 3.2
  */
 public interface IDiffTree {
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IThreeWayDiff.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IThreeWayDiff.java
index 3105e0f0c..31fd014d3 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IThreeWayDiff.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IThreeWayDiff.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.team.core.diff;
 
-import org.eclipse.team.core.mapping.provider.ThreeWayDiff;
+import org.eclipse.team.core.diff.provider.ThreeWayDiff;
 
 /**
  * A three-way delta that describe the synchronization state between
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/ITwoWayDiff.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/ITwoWayDiff.java
index a2bccdcb9..31a1bb01b 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/ITwoWayDiff.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/ITwoWayDiff.java
@@ -12,7 +12,7 @@ package org.eclipse.team.core.diff;
 
 import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.team.core.mapping.provider.TwoWayDiff;
+import org.eclipse.team.core.diff.provider.TwoWayDiff;
 
 /**
  * A two-way diff represents the changes between two states of the same object,
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/DiffNode.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/Diff.java
index 53d1d981f..549491d03 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/DiffNode.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/Diff.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.team.core.mapping.provider;
+package org.eclipse.team.core.diff.provider;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.team.core.diff.*;
@@ -29,7 +29,7 @@ import org.eclipse.team.internal.core.Messages;
  * @see IThreeWayDiff
  * @since 3.2
  */
-public abstract class DiffNode implements IDiffNode {
+public abstract class Diff implements IDiffNode {
 
 	/**
 	 * Constant (bit mask) that defines the area of the status that is reserved
@@ -50,7 +50,7 @@ public abstract class DiffNode implements IDiffNode {
 	 * @param status the status of the diff. The kind should be encoded in the
 	 *            status along with any additional flags required by a subclass.
 	 */
-	protected DiffNode(IPath path, int status) {
+	protected Diff(IPath path, int status) {
 		this.path = path;
 		this.status = status;
 	}
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/DiffTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java
index 8162ec5a2..2b552d838 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/DiffTree.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.team.core.mapping.provider;
+package org.eclipse.team.core.diff.provider;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.*;
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/ThreeWayDiff.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/ThreeWayDiff.java
index c7bd8e603..45bf9b441 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/ThreeWayDiff.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/ThreeWayDiff.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.team.core.mapping.provider;
+package org.eclipse.team.core.diff.provider;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IPath;
@@ -32,7 +32,7 @@ import org.eclipse.team.internal.core.Messages;
  * 
  * @since 3.2
  */
-public class ThreeWayDiff extends DiffNode implements IThreeWayDiff {
+public class ThreeWayDiff extends Diff implements IThreeWayDiff {
 
 	private final ITwoWayDiff localChange;
 	private final ITwoWayDiff remoteChange;
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/TwoWayDiff.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/TwoWayDiff.java
index 85122cc85..29aa590a3 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/TwoWayDiff.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/TwoWayDiff.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.team.core.mapping.provider;
+package org.eclipse.team.core.diff.provider;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.team.core.diff.ITwoWayDiff;
@@ -30,7 +30,7 @@ import org.eclipse.team.core.diff.ITwoWayDiff;
  * 
  * @since 3.2
  */
-public class TwoWayDiff extends DiffNode implements ITwoWayDiff {
+public class TwoWayDiff extends Diff implements ITwoWayDiff {
 
 	/**
 	 * Constant (bit mask) that defines the area of the status that is reserved
@@ -38,7 +38,7 @@ public class TwoWayDiff extends DiffNode implements ITwoWayDiff {
 	 * However, subclasses may include their own bits in the flag
 	 * as long as they do not overlap with the bits in the <code>FLAG_MASK</code>
 	 * 
-	 * @see DiffNode#getStatus()
+	 * @see Diff#getStatus()
 	 */
 	protected static final int FLAG_MASK = 0xFF00;
 
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IModelStatus.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IModelStatus.java
deleted file mode 100644
index 0822290b6..000000000
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IModelStatus.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.team.core.mapping;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * A status returned by a model from the resource operation validator.
- * The severity indicates the severity of the possible side effects
- * of the operation. Any severity other than <code>OK</code> should be
- * shown to the user. The message should be a human readable message that
- * will allow the user to make a decision as to whether to continue with the 
- * operation. The model provider id should indicate which model is flagging the
- * the possible side effects.
- * 
- * <p>
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is a guarantee neither that this API will
- * work nor that it will remain the same. Please do not use this API without
- * consulting with the Platform/Team team.
- * </p>
- * 
- * @see IResourceOperationValidator
- * 
- * @since 3.2
- *
- */
-public interface IModelStatus extends IStatus {
-
-	/**
-	 * Return the id of the model provider from which this status 
-	 * originated.
-	 * @return the id of the model provider from which this status 
-	 * originated
-	 */
-	String getModelProviderId();
-}
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/ResourceDiff.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/ResourceDiff.java
index 4fcdee591..dcd62ff05 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/ResourceDiff.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/ResourceDiff.java
@@ -12,6 +12,7 @@ package org.eclipse.team.core.mapping.provider;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.Assert;
+import org.eclipse.team.core.diff.provider.TwoWayDiff;
 import org.eclipse.team.core.history.IFileRevision;
 import org.eclipse.team.core.mapping.IResourceDiff;
 
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/ResourceDiffTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/ResourceDiffTree.java
index de0cc2763..2bb79cfe7 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/ResourceDiffTree.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/ResourceDiffTree.java
@@ -17,6 +17,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.resources.mapping.ResourceTraversal;
 import org.eclipse.core.runtime.*;
 import org.eclipse.team.core.diff.*;
+import org.eclipse.team.core.diff.provider.DiffTree;
 import org.eclipse.team.core.mapping.IResourceDiff;
 import org.eclipse.team.core.mapping.IResourceDiffTree;
 import org.eclipse.team.internal.core.TeamPlugin;
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/SyncInfoToDiffConverter.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/SyncInfoToDiffConverter.java
index ae608a8e4..fc00ef584 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/SyncInfoToDiffConverter.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/SyncInfoToDiffConverter.java
@@ -17,11 +17,13 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.team.core.ITeamStatus;
 import org.eclipse.team.core.diff.*;
+import org.eclipse.team.core.diff.provider.*;
 import org.eclipse.team.core.history.IFileRevision;
 import org.eclipse.team.core.history.provider.FileRevision;
 import org.eclipse.team.core.mapping.IResourceDiff;
 import org.eclipse.team.core.mapping.IResourceDiffTree;
-import org.eclipse.team.core.mapping.provider.*;
+import org.eclipse.team.core.mapping.provider.ResourceDiff;
+import org.eclipse.team.core.mapping.provider.ResourceDiffTree;
 import org.eclipse.team.core.synchronize.*;
 import org.eclipse.team.core.variants.IResourceVariant;