diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java index 5f36bf554c7..53587ded2ec 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java @@ -859,7 +859,7 @@ private static Object getElement(ISelection selection) { * * @deprecated Please use {@link #setFocus2()} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-12") public void setFocus() { setFocus2(); } diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java index cd4144791f6..1b95ec1cdf7 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java @@ -1261,7 +1261,7 @@ protected void setRightDirty(boolean dirty) { * @throws CoreException not thrown anymore * @deprecated use {@link IFlushable#flush(IProgressMonitor)}. */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-12") public void save(IProgressMonitor monitor) throws CoreException { flush(monitor); } diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceAction.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceAction.java index a523d7d5611..3c26578635a 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceAction.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceAction.java @@ -23,7 +23,7 @@ * @deprecated Temporarily replaced by CompareWithOtherResourceHandler. See bug * 264498. */ -@Deprecated +@Deprecated(forRemoval = true, since = "2025-12") public class CompareWithOtherResourceAction extends CompareAction { @Override diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java index 98910b7b2b5..c300aa77aae 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java @@ -433,7 +433,7 @@ protected void contentChanged(final IContentChangeNotifier changed) { * @deprecated Clients should override * {@link #preDiffHook(IStructureComparator, IStructureComparator, IStructureComparator, IProgressMonitor)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-12") protected void preDiffHook(IStructureComparator ancestor, IStructureComparator left, IStructureComparator right) { // we do nothing here } @@ -589,25 +589,26 @@ private void handleFailedRefresh(final String message) { * {@link #postDiffHook(Differencer, IDiffContainer, IProgressMonitor)} * instead */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-12") protected void postDiffHook(Differencer differencer, IDiffContainer root) { // we do nothing here } /** - * This method is called from within {@link #diff(IProgressMonitor)} after - * the difference tree has been built. This method may be called from a - * background (non-UI) thread). + * This method is called from within {@link #diff(IProgressMonitor)} after the + * difference tree has been built. This method may be called from a background + * (non-UI) thread). *
* For backwards compatibility, this default implementation calls
* {@link #postDiffHook(Differencer, IDiffContainer)} from the UI thread.
* Clients should override this method even if they don't perform post
- * processing to avoid the call to the UI thread.
+ * processing to avoid the call to the UI thread. This default implementation
+ * does nothing.
*
* @param differencer the differencer used to perform the differencing
- * @param root the non-null root node of the difference tree
- * @param monitor a progress monitor or null if progress is
- * not required
+ * @param root the non-null root node of the difference tree
+ * @param monitor a progress monitor or null if progress is not
+ * required
* @since 3.3
*/
protected void postDiffHook(final Differencer differencer, final IDiffContainer root, IProgressMonitor monitor) {