work on #87750

14 files changed, 140 insertions, 26 deletions

diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index fa0aa9e71..cefa81974 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -12,6 +12,14 @@
 Eclipse Platform Build Notes<br>
 Compare</h1>
 
+Eclipse Build Input March 29nd 2005
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=87750">87750</a>: Java Compare references internal API from platform/compare and JDT/Core<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
 Eclipse Build Input March 22nd 2005
 
 <h2>Problem reports fixed</h2>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java
index fe4e996b7..25c1517d3 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java
@@ -16,6 +16,7 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.viewers.Viewer;
 
 import org.eclipse.core.runtime.IAdaptable;
@@ -26,6 +27,7 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 import org.eclipse.compare.internal.CompareUIPlugin;
+import org.eclipse.compare.internal.DocumentManager;
 import org.eclipse.compare.structuremergeviewer.ICompareInput;
 
 
@@ -327,5 +329,31 @@ public final class CompareUI {
 	public static void removeAllStructureViewerAliases(String type) {
 		CompareUIPlugin.getDefault().removeAllStructureViewerAliases(type);
 	}
+	
+	/**
+	 * @param input
+	 * @return
+	 * @since 3.1
+	 */
+	public static IDocument getDocument(Object input) {
+		return DocumentManager.get(input);
+	}
+
+	/**
+	 * @param input
+	 * @param document
+	 * @since 3.1
+	 */
+	public static void registerDocument(Object input, IDocument document) {
+		DocumentManager.put(input, document);
+	}
+
+	/**
+	 * @param document
+	 * @since 3.1
+	 */
+	public static void unregisterDocument(IDocument document) {
+		DocumentManager.remove(document);
+	}
 }
 
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
index 643aca762..1a1d86fb5 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
@@ -15,7 +15,7 @@ import java.io.BufferedInputStream;
 
 import org.eclipse.swt.graphics.Image;
 
-import org.eclipse.compare.internal.IResourceProvider;
+import org.eclipse.compare.IResourceProvider;
 import org.eclipse.core.resources.IEncodedStorage;
 import org.eclipse.core.resources.IFileState;
 import org.eclipse.core.resources.IResource;
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/IResourceProvider.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/IResourceProvider.java
new file mode 100644
index 000000000..87f801db2
--- /dev/null
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/IResourceProvider.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 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.compare;
+
+import org.eclipse.core.resources.IResource;
+
+/**
+ * @since 3.1
+ */
+public interface IResourceProvider {
+
+	/**
+	 * Returns the corresponding resource for this object or <code>null</code>.
+	 *
+	 * @return the corresponding resource or <code>null</code>
+	 */
+	IResource getResource();
+}
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
index 80f4cc50f..ef934abd3 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
@@ -20,7 +20,7 @@ import org.eclipse.jface.util.Assert;
 import org.eclipse.core.resources.*;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.compare.internal.IResourceProvider;
+import org.eclipse.compare.IResourceProvider;
 import org.eclipse.compare.internal.Utilities;
 import org.eclipse.compare.structuremergeviewer.IStructureComparator;
 
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ChangePropertyAction.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ChangePropertyAction.java
index fafdaf821..c8f23368d 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ChangePropertyAction.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ChangePropertyAction.java
@@ -16,7 +16,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.compare.CompareConfiguration;
 
 /**
- * Toggles a boolean property of an <code>ICompareConfiguration</code>.
+ * Toggles a boolean property of an <code>CompareConfiguration</code>.
  */
 public class ChangePropertyAction extends Action {
 
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IResourceProvider.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IResourceProvider.java
index bd785cc30..18e44aad8 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IResourceProvider.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IResourceProvider.java
@@ -10,14 +10,9 @@
  *******************************************************************************/
 package org.eclipse.compare.internal;
 
-import org.eclipse.core.resources.IResource;
-
-public interface IResourceProvider {
-
-	/**
-	 * Returns the corresponding resource for this object or <code>null</code>.
-	 *
-	 * @return the corresponding resource or <code>null</code>
-	 */
-	IResource getResource();
+/**
+ * @deprecated Use org.eclipse.compare.IResourceProvider instead
+ */
+public interface IResourceProvider extends org.eclipse.compare.IResourceProvider {
+	// will be removed after 3.1M6
 }
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
index fa0aa9e71..cefa81974 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
@@ -12,6 +12,14 @@
 Eclipse Platform Build Notes<br>
 Compare</h1>
 
+Eclipse Build Input March 29nd 2005
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=87750">87750</a>: Java Compare references internal API from platform/compare and JDT/Core<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
 Eclipse Build Input March 22nd 2005
 
 <h2>Problem reports fixed</h2>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java
index fe4e996b7..25c1517d3 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java
@@ -16,6 +16,7 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.viewers.Viewer;
 
 import org.eclipse.core.runtime.IAdaptable;
@@ -26,6 +27,7 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 import org.eclipse.compare.internal.CompareUIPlugin;
+import org.eclipse.compare.internal.DocumentManager;
 import org.eclipse.compare.structuremergeviewer.ICompareInput;
 
 
@@ -327,5 +329,31 @@ public final class CompareUI {
 	public static void removeAllStructureViewerAliases(String type) {
 		CompareUIPlugin.getDefault().removeAllStructureViewerAliases(type);
 	}
+	
+	/**
+	 * @param input
+	 * @return
+	 * @since 3.1
+	 */
+	public static IDocument getDocument(Object input) {
+		return DocumentManager.get(input);
+	}
+
+	/**
+	 * @param input
+	 * @param document
+	 * @since 3.1
+	 */
+	public static void registerDocument(Object input, IDocument document) {
+		DocumentManager.put(input, document);
+	}
+
+	/**
+	 * @param document
+	 * @since 3.1
+	 */
+	public static void unregisterDocument(IDocument document) {
+		DocumentManager.remove(document);
+	}
 }
 
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
index 643aca762..1a1d86fb5 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
@@ -15,7 +15,7 @@ import java.io.BufferedInputStream;
 
 import org.eclipse.swt.graphics.Image;
 
-import org.eclipse.compare.internal.IResourceProvider;
+import org.eclipse.compare.IResourceProvider;
 import org.eclipse.core.resources.IEncodedStorage;
 import org.eclipse.core.resources.IFileState;
 import org.eclipse.core.resources.IResource;
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IResourceProvider.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IResourceProvider.java
new file mode 100644
index 000000000..87f801db2
--- /dev/null
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IResourceProvider.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 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.compare;
+
+import org.eclipse.core.resources.IResource;
+
+/**
+ * @since 3.1
+ */
+public interface IResourceProvider {
+
+	/**
+	 * Returns the corresponding resource for this object or <code>null</code>.
+	 *
+	 * @return the corresponding resource or <code>null</code>
+	 */
+	IResource getResource();
+}
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
index 80f4cc50f..ef934abd3 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
@@ -20,7 +20,7 @@ import org.eclipse.jface.util.Assert;
 import org.eclipse.core.resources.*;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.compare.internal.IResourceProvider;
+import org.eclipse.compare.IResourceProvider;
 import org.eclipse.compare.internal.Utilities;
 import org.eclipse.compare.structuremergeviewer.IStructureComparator;
 
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ChangePropertyAction.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ChangePropertyAction.java
index fafdaf821..c8f23368d 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ChangePropertyAction.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ChangePropertyAction.java
@@ -16,7 +16,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.compare.CompareConfiguration;
 
 /**
- * Toggles a boolean property of an <code>ICompareConfiguration</code>.
+ * Toggles a boolean property of an <code>CompareConfiguration</code>.
  */
 public class ChangePropertyAction extends Action {
 
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/IResourceProvider.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/IResourceProvider.java
index bd785cc30..18e44aad8 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/IResourceProvider.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/IResourceProvider.java
@@ -10,14 +10,9 @@
  *******************************************************************************/
 package org.eclipse.compare.internal;
 
-import org.eclipse.core.resources.IResource;
-
-public interface IResourceProvider {
-
-	/**
-	 * Returns the corresponding resource for this object or <code>null</code>.
-	 *
-	 * @return the corresponding resource or <code>null</code>
-	 */
-	IResource getResource();
+/**
+ * @deprecated Use org.eclipse.compare.IResourceProvider instead
+ */
+public interface IResourceProvider extends org.eclipse.compare.IResourceProvider {
+	// will be removed after 3.1M6
 }