Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2007-06-22 13:51:07 +0000
committerMichael Valenta2007-06-22 13:51:07 +0000
commitb35a67da65dd1be3be904314f67dbfea7aae34c2 (patch)
treeac9a694c01c600a03d114dc65ff79b4b7a7438c0 /bundles/org.eclipse.compare
parent603a280a15141ac4d7719a1a0687a9c87883116e (diff)
downloadeclipse.platform.team-b35a67da65dd1be3be904314f67dbfea7aae34c2.tar.gz
eclipse.platform.team-b35a67da65dd1be3be904314f67dbfea7aae34c2.tar.xz
eclipse.platform.team-b35a67da65dd1be3be904314f67dbfea7aae34c2.zip
Bug 190199 Deprecate EditionSelectionDialog
Diffstat (limited to 'bundles/org.eclipse.compare')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java4
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java2
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java1
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java4
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java2
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java1
6 files changed, 8 insertions, 6 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
index cf8348c62..85a5cfb2c 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
@@ -62,6 +62,10 @@ import com.ibm.icu.util.Calendar;
*
* @see IModificationDate
* @see ITypedElement
+ *
+ * @deprecated Use an <code>org.eclipse.team.ui.history.IHistoryPageSource</code> in conjuntion with
+ * the <code>org.eclipse.team.ui.history.IHistoryView</code> or a <code>HistoryPageCompareEditorInput</code>.
+ * For sub-file elements, a <code>org.eclipse.team.ui.history.ElementLocalHistoryPageSource</code> can be used.
*/
public class EditionSelectionDialog extends ResizableDialog {
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 c68e41d73..a46789bde 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
@@ -27,8 +27,6 @@ import org.eclipse.swt.widgets.Shell;
* <p>
* Clients may instantiate this class; it is not intended to be subclassed.
* </p>
- *
- * @see EditionSelectionDialog
*/
public class ResourceNode extends BufferedContent
implements IEncodedStreamContentAccessor, IStructureComparator, ITypedElement,
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java
index 0c065768c..d6b1157d2 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java
@@ -83,7 +83,6 @@ public interface IStructureCreator {
* @param input the object from which to create the <code>IStructureComparator</code>
* @return the single node specified by <code>path</code> or <code>null</code>
*
- * @see org.eclipse.compare.EditionSelectionDialog#selectEdition
*/
IStructureComparator locate(Object path, Object input);
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
index cf8348c62..85a5cfb2c 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
@@ -62,6 +62,10 @@ import com.ibm.icu.util.Calendar;
*
* @see IModificationDate
* @see ITypedElement
+ *
+ * @deprecated Use an <code>org.eclipse.team.ui.history.IHistoryPageSource</code> in conjuntion with
+ * the <code>org.eclipse.team.ui.history.IHistoryView</code> or a <code>HistoryPageCompareEditorInput</code>.
+ * For sub-file elements, a <code>org.eclipse.team.ui.history.ElementLocalHistoryPageSource</code> can be used.
*/
public class EditionSelectionDialog extends ResizableDialog {
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 c68e41d73..a46789bde 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
@@ -27,8 +27,6 @@ import org.eclipse.swt.widgets.Shell;
* <p>
* Clients may instantiate this class; it is not intended to be subclassed.
* </p>
- *
- * @see EditionSelectionDialog
*/
public class ResourceNode extends BufferedContent
implements IEncodedStreamContentAccessor, IStructureComparator, ITypedElement,
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java
index 0c065768c..d6b1157d2 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java
@@ -83,7 +83,6 @@ public interface IStructureCreator {
* @param input the object from which to create the <code>IStructureComparator</code>
* @return the single node specified by <code>path</code> or <code>null</code>
*
- * @see org.eclipse.compare.EditionSelectionDialog#selectEdition
*/
IStructureComparator locate(Object path, Object input);

Back to the top