Skip to content

Commit 435fc5c

Browse files
committed
Mark removal for unused deprecated methods in o.e.compare
1 parent 75b8bca commit 435fc5c

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

team/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,7 @@ private static Object getElement(ISelection selection) {
859859
*
860860
* @deprecated Please use {@link #setFocus2()} instead.
861861
*/
862-
@Deprecated
862+
@Deprecated(forRemoval = true, since = "2025-12")
863863
public void setFocus() {
864864
setFocus2();
865865
}

team/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,7 @@ protected void setRightDirty(boolean dirty) {
12611261
* @throws CoreException not thrown anymore
12621262
* @deprecated use {@link IFlushable#flush(IProgressMonitor)}.
12631263
*/
1264-
@Deprecated
1264+
@Deprecated(forRemoval = true, since = "2025-12")
12651265
public void save(IProgressMonitor monitor) throws CoreException {
12661266
flush(monitor);
12671267
}

team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @deprecated Temporarily replaced by CompareWithOtherResourceHandler. See bug
2424
* 264498.
2525
*/
26-
@Deprecated
26+
@Deprecated(forRemoval = true, since = "2025-12")
2727
public class CompareWithOtherResourceAction extends CompareAction {
2828

2929
@Override

team/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -589,25 +589,26 @@ private void handleFailedRefresh(final String message) {
589589
* {@link #postDiffHook(Differencer, IDiffContainer, IProgressMonitor)}
590590
* instead
591591
*/
592-
@Deprecated
592+
@Deprecated(forRemoval = true, since = "2025-12")
593593
protected void postDiffHook(Differencer differencer, IDiffContainer root) {
594594
// we do nothing here
595595
}
596596

597597
/**
598-
* This method is called from within {@link #diff(IProgressMonitor)} after
599-
* the difference tree has been built. This method may be called from a
600-
* background (non-UI) thread).
598+
* This method is called from within {@link #diff(IProgressMonitor)} after the
599+
* difference tree has been built. This method may be called from a background
600+
* (non-UI) thread).
601601
* <p>
602602
* For backwards compatibility, this default implementation calls
603603
* {@link #postDiffHook(Differencer, IDiffContainer)} from the UI thread.
604604
* Clients should override this method even if they don't perform post
605-
* processing to avoid the call to the UI thread.
605+
* processing to avoid the call to the UI thread. This default implementation
606+
* does nothing.
606607
*
607608
* @param differencer the differencer used to perform the differencing
608-
* @param root the non-<code>null</code> root node of the difference tree
609-
* @param monitor a progress monitor or <code>null</code> if progress is
610-
* not required
609+
* @param root the non-<code>null</code> root node of the difference tree
610+
* @param monitor a progress monitor or <code>null</code> if progress is not
611+
* required
611612
* @since 3.3
612613
*/
613614
protected void postDiffHook(final Differencer differencer, final IDiffContainer root, IProgressMonitor monitor) {

0 commit comments

Comments
 (0)