Refactored API a bit

13 files changed, 21 insertions, 18 deletions

diff --git a/bundles/org.eclipse.team.ui/plugin.xml b/bundles/org.eclipse.team.ui/plugin.xml
index 3f7f9a5d8..93fa5cbec 100644
--- a/bundles/org.eclipse.team.ui/plugin.xml
+++ b/bundles/org.eclipse.team.ui/plugin.xml
@@ -119,11 +119,11 @@
             id="org.eclipse.team.ui.FileRevisionsContribution"
             objectClass="org.eclipse.team.core.filehistory.IFileRevision">
          <action
-               class="org.eclipse.team.internal.ui.filehistory.actions.OpenRevisionAction"
+               class="org.eclipse.team.internal.ui.history.actions.OpenRevisionAction"
                id="org.eclipse.team.ui.OpenRevisionAction"
                label="%FileRevision.OpenAction.name"/>
          <action
-               class="org.eclipse.team.internal.ui.filehistory.actions.CompareRevisionAction"
+               class="org.eclipse.team.internal.ui.history.actions.CompareRevisionAction"
                enablesFor="2"
                id="org.eclipse.team.ui.CompareRevisionAction"
                label="%FileRevision.Compare.name"/>
@@ -147,10 +147,10 @@
       </view>
       <view
             category="org.eclipse.team.ui"
-            class="org.eclipse.team.internal.ui.filehistory.GenericHistoryView"
+            class="org.eclipse.team.internal.ui.history.GenericHistoryView"
             icon="icons/full/obj/changeset_obj.gif"
             id="org.eclipse.team.ui.GenericHistoryView"
-            name="File History View (Experimental)"/>
+            name="History"/>
     <!--  <view
             name="%CompareView.name"
             icon="$nl$/icons/full/eview16/compare_view.gif"
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/filehistory/CompareFileRevisionEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/CompareFileRevisionEditorInput.java
index 080eac0be..90a89aff2 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/filehistory/CompareFileRevisionEditorInput.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/CompareFileRevisionEditorInput.java
@@ -1,4 +1,4 @@
-package org.eclipse.team.internal.ui.filehistory;
+package org.eclipse.team.internal.ui.history;
 
 import java.lang.reflect.InvocationTargetException;
 
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/filehistory/FileRevisionEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionEditorInput.java
index dc9279a41..96f5b65a7 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/filehistory/FileRevisionEditorInput.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionEditorInput.java
@@ -1,4 +1,4 @@
-package org.eclipse.team.internal.ui.filehistory;
+package org.eclipse.team.internal.ui.history;
 
 import org.eclipse.core.resources.IStorage;
 import org.eclipse.core.runtime.CoreException;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/filehistory/GenericHistoryDropAdapter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryDropAdapter.java
index 84c7ef4f8..0b9584a88 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/filehistory/GenericHistoryDropAdapter.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryDropAdapter.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.team.internal.ui.filehistory;
+package org.eclipse.team.internal.ui.history;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/filehistory/GenericHistoryTableProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryTableProvider.java
index 662d4a75c..641602ee4 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/filehistory/GenericHistoryTableProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryTableProvider.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.team.internal.ui.filehistory;
+package org.eclipse.team.internal.ui.history;
 
 import java.text.DateFormat;
 import java.util.Date;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/filehistory/GenericHistoryView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java
index b40fcf1de..967cb9abe 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/filehistory/GenericHistoryView.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.team.internal.ui.filehistory;
+package org.eclipse.team.internal.ui.history;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
@@ -60,7 +60,7 @@ import org.eclipse.team.internal.ui.ITeamUIImages;
 import org.eclipse.team.internal.ui.TeamUIMessages;
 import org.eclipse.team.internal.ui.TeamUIPlugin;
 import org.eclipse.team.internal.ui.Utils;
-import org.eclipse.team.internal.ui.filehistory.actions.OpenRevisionAction;
+import org.eclipse.team.internal.ui.history.actions.OpenRevisionAction;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/filehistory/IFileHistoryConstants.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/IFileHistoryConstants.java
index 01401aad8..a81746ab0 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/filehistory/IFileHistoryConstants.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/IFileHistoryConstants.java
@@ -1,4 +1,4 @@
-package org.eclipse.team.internal.ui.filehistory;
+package org.eclipse.team.internal.ui.history;
 
 public interface IFileHistoryConstants {
 
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/filehistory/RevisionEditionNode.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/RevisionEditionNode.java
index dd4f1ba01..0a3075eb2 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/filehistory/RevisionEditionNode.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/RevisionEditionNode.java
@@ -1,4 +1,4 @@
-package org.eclipse.team.internal.ui.filehistory;
+package org.eclipse.team.internal.ui.history;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/filehistory/actions/CompareRevisionAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/actions/CompareRevisionAction.java
index 01ebf9e96..8e27059c5 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/filehistory/actions/CompareRevisionAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/actions/CompareRevisionAction.java
@@ -1,4 +1,4 @@
-package org.eclipse.team.internal.ui.filehistory.actions;
+package org.eclipse.team.internal.ui.history.actions;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -12,8 +12,8 @@ import org.eclipse.team.core.TeamException;
 import org.eclipse.team.core.history.IFileRevision;
 import org.eclipse.team.internal.ui.TeamUIMessages;
 import org.eclipse.team.internal.ui.actions.TeamAction;
-import org.eclipse.team.internal.ui.filehistory.CompareFileRevisionEditorInput;
-import org.eclipse.team.internal.ui.filehistory.RevisionEditionNode;
+import org.eclipse.team.internal.ui.history.CompareFileRevisionEditorInput;
+import org.eclipse.team.internal.ui.history.RevisionEditionNode;
 
 public class CompareRevisionAction extends TeamAction {
 
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/filehistory/actions/OpenRevisionAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/actions/OpenRevisionAction.java
index 8beb2bade..e5d56ed31 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/filehistory/actions/OpenRevisionAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/actions/OpenRevisionAction.java
@@ -1,4 +1,4 @@
-package org.eclipse.team.internal.ui.filehistory.actions;
+package org.eclipse.team.internal.ui.history.actions;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -17,7 +17,7 @@ import org.eclipse.team.core.history.IFileRevision;
 import org.eclipse.team.internal.ui.TeamUIMessages;
 import org.eclipse.team.internal.ui.TeamUIPlugin;
 import org.eclipse.team.internal.ui.actions.TeamAction;
-import org.eclipse.team.internal.ui.filehistory.FileRevisionEditorInput;
+import org.eclipse.team.internal.ui.history.FileRevisionEditorInput;
 import org.eclipse.ui.IEditorDescriptor;
 import org.eclipse.ui.IEditorRegistry;
 import org.eclipse.ui.IWorkbench;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java
index d6f1fb1fc..f2554859d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java
@@ -17,6 +17,7 @@ import org.eclipse.core.resources.mapping.*;
 import org.eclipse.core.runtime.*;
 import org.eclipse.team.core.diff.IDiffNode;
 import org.eclipse.team.core.mapping.*;
+import org.eclipse.team.core.mapping.provider.MergeStatus;
 import org.eclipse.team.internal.ui.Policy;
 
 /**
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/MergeContext.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/MergeContext.java
index 204c3ce99..918bc586f 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/MergeContext.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/MergeContext.java
@@ -20,6 +20,7 @@ import org.eclipse.core.runtime.content.IContentDescription;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.team.core.diff.*;
 import org.eclipse.team.core.mapping.*;
+import org.eclipse.team.core.mapping.provider.MergeStatus;
 import org.eclipse.team.core.synchronize.SyncInfoTree;
 import org.eclipse.team.core.variants.IResourceVariant;
 import org.eclipse.team.internal.core.TeamPlugin;
@@ -38,7 +39,7 @@ import org.eclipse.team.internal.ui.TeamUIMessages;
  * </p>
  * @since 3.2
  */
-public abstract class MergeContext extends org.eclipse.team.core.mapping.MergeContext {
+public abstract class MergeContext extends org.eclipse.team.core.mapping.provider.MergeContext {
 
 	/**
 	 * Create a merge context
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ResourceMappingOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ResourceMappingOperation.java
index 8e51fa895..65ae114e5 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ResourceMappingOperation.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ResourceMappingOperation.java
@@ -16,6 +16,7 @@ import org.eclipse.core.resources.mapping.*;
 import org.eclipse.core.runtime.*;
 import org.eclipse.jface.window.Window;
 import org.eclipse.team.core.mapping.*;
+import org.eclipse.team.core.mapping.provider.ScopeGenerator;
 import org.eclipse.team.internal.ui.TeamUIMessages;
 import org.eclipse.team.internal.ui.dialogs.AdditionalMappingsDialog;
 import org.eclipse.ui.IWorkbenchPart;