diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/AbstractControlContentAssistSubjectAdapter.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/AbstractControlContentAssistSubjectAdapter.java index 67f8135e783..59a2facd8c9 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/AbstractControlContentAssistSubjectAdapter.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/AbstractControlContentAssistSubjectAdapter.java @@ -53,6 +53,7 @@ @Deprecated public abstract class AbstractControlContentAssistSubjectAdapter implements IContentAssistSubjectControl { + @Deprecated protected static final boolean DEBUG= "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.jface.text/debug/ContentAssistSubjectAdapters")); //$NON-NLS-1$//$NON-NLS-2$ /** @@ -87,14 +88,17 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon /** * Creates a new {@link AbstractControlContentAssistSubjectAdapter}. */ + @Deprecated public AbstractControlContentAssistSubjectAdapter() { fVerifyKeyListeners= new ArrayList<>(1); fKeyListeners= new HashSet<>(1); } + @Deprecated @Override public abstract Control getControl(); + @Deprecated @Override public void addKeyListener(KeyListener keyListener) { fKeyListeners.add(keyListener); @@ -106,6 +110,7 @@ public void addKeyListener(KeyListener keyListener) { installControlListener(); } + @Deprecated @Override public void removeKeyListener(KeyListener keyListener) { boolean deleted= fKeyListeners.remove(keyListener); @@ -120,11 +125,13 @@ public void removeKeyListener(KeyListener keyListener) { uninstallControlListener(); } + @Deprecated @Override public boolean supportsVerifyKeyListener() { return true; } + @Deprecated @Override public boolean appendVerifyKeyListener(final VerifyKeyListener verifyKeyListener) { fVerifyKeyListeners.add(verifyKeyListener); @@ -137,6 +144,7 @@ public boolean appendVerifyKeyListener(final VerifyKeyListener verifyKeyListener return true; } + @Deprecated @Override public boolean prependVerifyKeyListener(final VerifyKeyListener verifyKeyListener) { fVerifyKeyListeners.add(0, verifyKeyListener); @@ -149,6 +157,7 @@ public boolean prependVerifyKeyListener(final VerifyKeyListener verifyKeyListene return true; } + @Deprecated @Override public void removeVerifyKeyListener(VerifyKeyListener verifyKeyListener) { fVerifyKeyListeners.remove(verifyKeyListener); @@ -160,6 +169,7 @@ public void removeVerifyKeyListener(VerifyKeyListener verifyKeyListener) { uninstallControlListener(); } + @Deprecated @Override public void setEventConsumer(IEventConsumer eventConsumer) { // this is not supported @@ -168,6 +178,7 @@ public void setEventConsumer(IEventConsumer eventConsumer) { } } + @Deprecated @Override public String getLineDelimiter() { return System.lineSeparator(); @@ -329,6 +340,7 @@ private void uninstallControlListener() { * @param labelProvider a {@link ILabelProvider}, or null * if no visual feedback should be shown */ + @Deprecated public void setContentAssistCueProvider(final ILabelProvider labelProvider) { if (fCueLabelProvider != null) { fCueLabelProvider.dispose(); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java index 58f76ef2720..e282e0f0d6f 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java @@ -88,27 +88,32 @@ public void replace(int pos, int length, String text) throws BadLocationExceptio * * @param combo the combo to adapt */ + @Deprecated public ComboContentAssistSubjectAdapter(Combo combo) { Assert.isNotNull(combo); fCombo= combo; fModifyListeners= new HashMap<>(); } + @Deprecated @Override public Control getControl() { return fCombo; } + @Deprecated @Override public int getLineHeight() { return fCombo.getTextHeight(); } + @Deprecated @Override public int getCaretOffset() { return fCombo.getCaretPosition(); } + @Deprecated @Override public Point getLocationAtOffset(int offset) { String comboString= fCombo.getText(); @@ -124,16 +129,19 @@ public Point getLocationAtOffset(int offset) { return new Point(x, fCombo.getClientArea().y); } + @Deprecated @Override public Point getWidgetSelectionRange() { return new Point(fCombo.getSelection().x, Math.abs(fCombo.getSelection().y - fCombo.getSelection().x)); } + @Deprecated @Override public Point getSelectedRange() { return new Point(fCombo.getSelection().x, Math.abs(fCombo.getSelection().y - fCombo.getSelection().x)); } + @Deprecated @Override public IDocument getDocument() { IDocument document= (IDocument)fCombo.getData("document"); //$NON-NLS-1$ @@ -144,17 +152,20 @@ public IDocument getDocument() { return document; } + @Deprecated @Override public void setSelectedRange(int i, int j) { fCombo.setSelection(new Point(i, i+j)); } + @Deprecated @Override public void revealRange(int i, int j) { // XXX: this should be improved fCombo.setSelection(new Point(i, i+j)); } + @Deprecated @Override public boolean addSelectionListener(final SelectionListener selectionListener) { fCombo.addSelectionListener(selectionListener); @@ -164,6 +175,7 @@ public boolean addSelectionListener(final SelectionListener selectionListener) { return true; } + @Deprecated @Override public void removeSelectionListener(SelectionListener selectionListener) { fCombo.removeSelectionListener(selectionListener); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistProcessor.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistProcessor.java index b87ffbe8f3f..0b342490070 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistProcessor.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistProcessor.java @@ -41,6 +41,7 @@ public interface ISubjectControlContentAssistProcessor extends IContentAssistPro * @return an array of completion proposals or null if no * proposals are possible */ + @Deprecated ICompletionProposal[] computeCompletionProposals(IContentAssistSubjectControl contentAssistSubjectControl, int documentOffset); /** @@ -55,5 +56,6 @@ public interface ISubjectControlContentAssistProcessor extends IContentAssistPro * @return an array of context information objects or null * if no context could be found */ + @Deprecated IContextInformation[] computeContextInformation(IContentAssistSubjectControl contentAssistSubjectControl, int documentOffset); } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistant.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistant.java index 7b17eb10a58..5cfc3c0992b 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistant.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistant.java @@ -32,5 +32,6 @@ public interface ISubjectControlContentAssistant extends IContentAssistant { * * @param contentAssistSubjectControl the one who requests content assist */ + @Deprecated void install(IContentAssistSubjectControl contentAssistSubjectControl); } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationPresenter.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationPresenter.java index bec4562f722..d652ec8681f 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationPresenter.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationPresenter.java @@ -35,5 +35,6 @@ public interface ISubjectControlContextInformationPresenter extends IContextInfo * @param contentAssistSubjectControl the content assist subject control * @param offset the document offset for which the information has been computed */ + @Deprecated void install(IContextInformation info, IContentAssistSubjectControl contentAssistSubjectControl, int offset); } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationValidator.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationValidator.java index 0d4a093ff62..4a30aa93f93 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationValidator.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationValidator.java @@ -36,5 +36,6 @@ public interface ISubjectControlContextInformationValidator extends IContextInfo * @param offset the document offset for which the information * has been computed */ + @Deprecated void install(IContextInformation info, IContentAssistSubjectControl contentAssistSubjectControl, int offset); } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContentAssistant.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContentAssistant.java index 5a0691f81c6..45fe0255d5a 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContentAssistant.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContentAssistant.java @@ -26,6 +26,7 @@ @Deprecated public class SubjectControlContentAssistant extends org.eclipse.jface.text.contentassist.ContentAssistant implements ISubjectControlContentAssistant { + @Deprecated @Override public void install(IContentAssistSubjectControl contentAssistSubjectControl) { Assert.isNotNull(contentAssistSubjectControl); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContextInformationValidator.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContextInformationValidator.java index bf0cfabd1c9..5dbddc4685d 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContextInformationValidator.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContextInformationValidator.java @@ -44,21 +44,25 @@ public final class SubjectControlContextInformationValidator implements ISubject * * @param processor the processor to be used for validation */ + @Deprecated public SubjectControlContextInformationValidator(IContentAssistProcessor processor) { fProcessor= processor; } + @Deprecated @Override public void install(IContextInformation contextInformation, ITextViewer viewer, int offset) { throw new UnsupportedOperationException(); } + @Deprecated @Override public void install(IContextInformation contextInformation, IContentAssistSubjectControl contentAssistSubjectControl, int offset) { fContextInformation= contextInformation; fContentAssistSubjectControl= contentAssistSubjectControl; } + @Deprecated @Override public boolean isContextInformationValid(int offset) { if (fContentAssistSubjectControl != null && fProcessor instanceof ISubjectControlContentAssistProcessor) { diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java index 0436cce136b..5530f36706d 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java @@ -77,26 +77,31 @@ public void replace(int pos, int length, String text) throws BadLocationExceptio * * @param text the text widget to adapt */ + @Deprecated public TextContentAssistSubjectAdapter(Text text) { Assert.isNotNull(text); fText= text; } + @Deprecated @Override public Control getControl() { return fText; } + @Deprecated @Override public int getLineHeight() { return fText.getLineHeight(); } + @Deprecated @Override public int getCaretOffset() { return fText.getCaretPosition(); } + @Deprecated @Override public Point getLocationAtOffset(int offset) { Point caretLocation= fText.getCaretLocation(); @@ -107,16 +112,19 @@ public Point getLocationAtOffset(int offset) { return caretLocation; } + @Deprecated @Override public Point getWidgetSelectionRange() { return new Point(fText.getSelection().x, Math.abs(fText.getSelection().y - fText.getSelection().x)); } + @Deprecated @Override public Point getSelectedRange() { return new Point(fText.getSelection().x, Math.abs(fText.getSelection().y - fText.getSelection().x)); } + @Deprecated @Override public IDocument getDocument() { IDocument document= (IDocument)fText.getData("document"); //$NON-NLS-1$ @@ -127,17 +135,20 @@ public IDocument getDocument() { return document; } + @Deprecated @Override public void setSelectedRange(int i, int j) { fText.setSelection(new Point(i, i+j)); } + @Deprecated @Override public void revealRange(int i, int j) { // XXX: this should be improved fText.setSelection(new Point(i, i+j)); } + @Deprecated @Override public boolean addSelectionListener(final SelectionListener selectionListener) { fText.addSelectionListener(selectionListener); @@ -147,6 +158,7 @@ public boolean addSelectionListener(final SelectionListener selectionListener) { return true; } + @Deprecated @Override public void removeSelectionListener(SelectionListener selectionListener) { fText.removeSelectionListener(selectionListener); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SubstitutionTextReader.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SubstitutionTextReader.java index eb48d938993..294c059f3d0 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SubstitutionTextReader.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SubstitutionTextReader.java @@ -28,9 +28,11 @@ @Deprecated public abstract class SubstitutionTextReader extends SingleCharReader { + @Deprecated protected static final String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$ private final Reader fReader; + @Deprecated protected boolean fWasWhiteSpace; private int fCharAfterWhiteSpace; @@ -44,6 +46,7 @@ public abstract class SubstitutionTextReader extends SingleCharReader { private int fIndex; + @Deprecated protected SubstitutionTextReader(Reader reader) { fReader= reader; fBuffer= new StringBuilder(); @@ -62,6 +65,7 @@ protected SubstitutionTextReader(Reader reader) { * @return the substitution for c * @throws IOException in case computing the substitution fails */ + @Deprecated protected abstract String computeSubstitution(int c) throws IOException; /** @@ -69,6 +73,7 @@ protected SubstitutionTextReader(Reader reader) { * * @return the internal reader */ + @Deprecated protected Reader getReader() { return fReader; } @@ -78,6 +83,7 @@ protected Reader getReader() { * @return the next character * @throws IOException in case reading the character fails */ + @Deprecated protected int nextChar() throws IOException { fReadFromBuffer= (fBuffer.length() > 0); if (fReadFromBuffer) { @@ -110,6 +116,7 @@ protected int nextChar() throws IOException { /** * @see Reader#read() */ + @Deprecated @Override public int read() throws IOException { int c; @@ -135,6 +142,7 @@ public int read() throws IOException { /** * @see Reader#ready() */ + @Deprecated @Override public boolean ready() throws IOException { return fReader.ready(); @@ -143,6 +151,7 @@ public boolean ready() throws IOException { /** * @see Reader#close() */ + @Deprecated @Override public void close() throws IOException { fReader.close(); @@ -151,6 +160,7 @@ public void close() throws IOException { /** * @see Reader#reset() */ + @Deprecated @Override public void reset() throws IOException { fReader.reset(); @@ -160,10 +170,12 @@ public void reset() throws IOException { fIndex= 0; } + @Deprecated protected final void setSkipWhitespace(boolean state) { fSkipWhiteSpace= state; } + @Deprecated protected final boolean isSkippingWhitespace() { return fSkipWhiteSpace; } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultAutoIndentStrategy.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultAutoIndentStrategy.java index 224423bee9f..650cb57f1e2 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultAutoIndentStrategy.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultAutoIndentStrategy.java @@ -29,6 +29,7 @@ public class DefaultAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy /** * Creates a new default auto indent strategy. */ + @Deprecated public DefaultAutoIndentStrategy() { } } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java index 5d019fda1c8..18708ce1fae 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java @@ -81,6 +81,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension { * Since 3.1 this implements the interface for IUndoableOperation. *

*/ + @Deprecated class TextCommand extends AbstractOperation { /** The start index of the replaced text. */ @@ -426,6 +427,7 @@ protected long getRedoModificationStamp() { * Represents an undo-able edit command consisting of several * individual edit commands. */ + @Deprecated class CompoundTextCommand extends TextCommand { /** The list of individual commands */ @@ -591,6 +593,7 @@ protected long getRedoModificationStamp() { /** * Internal listener to mouse and key events. */ + @Deprecated class KeyAndMouseListener implements MouseListener, KeyListener { /* @@ -645,6 +648,7 @@ public void keyPressed(KeyEvent e) { /** * Internal listener to document changes. */ + @Deprecated class DocumentListener implements IDocumentListener { private String fReplacedText; @@ -696,6 +700,7 @@ public void documentChanged(DocumentEvent event) { /** * Internal text input listener. */ + @Deprecated class TextInputListener implements ITextInputListener { @Override @@ -722,6 +727,7 @@ public void inputDocumentChanged(IDocument oldInput, IDocument newInput) { * @see IOperationHistoryListener * @since 3.1 */ + @Deprecated class HistoryListener implements IOperationHistoryListener { private IUndoableOperation fOperation; @@ -782,8 +788,10 @@ public void historyNotification(final OperationHistoryEvent event) { /** Text buffer to collect viewer content which has been replaced */ private StringBuilder fPreservedTextBuffer; /** The document modification stamp for undo. */ + @Deprecated protected long fPreservedUndoModificationStamp= IDocumentExtension4.UNKNOWN_MODIFICATION_STAMP; /** The document modification stamp for redo. */ + @Deprecated protected long fPreservedRedoModificationStamp= IDocumentExtension4.UNKNOWN_MODIFICATION_STAMP; /** The internal key and mouse event listener */ private KeyAndMouseListener fKeyAndMouseListener; @@ -839,6 +847,7 @@ public void historyNotification(final OperationHistoryEvent event) { * * @param undoLevel the length of this manager's history */ + @Deprecated public DefaultUndoManager(int undoLevel) { fHistory= OperationHistoryFactory.getOperationHistory(); setMaximalUndoLevel(undoLevel); @@ -857,6 +866,7 @@ private boolean isConnected() { /* * @see IUndoManager#beginCompoundChange */ + @Deprecated @Override public void beginCompoundChange() { if (isConnected()) { @@ -869,6 +879,7 @@ public void beginCompoundChange() { /* * @see IUndoManager#endCompoundChange */ + @Deprecated @Override public void endCompoundChange() { if (isConnected()) { @@ -1211,6 +1222,7 @@ private void openErrorDialog(final String title, final Exception ex) { } } + @Deprecated @Override public void setMaximalUndoLevel(int undoLevel) { fUndoLevel= Math.max(0, undoLevel); @@ -1219,6 +1231,7 @@ public void setMaximalUndoLevel(int undoLevel) { } } + @Deprecated @Override public void connect(ITextViewer textViewer) { if (!isConnected() && textViewer != null) { @@ -1241,6 +1254,7 @@ public void connect(ITextViewer textViewer) { } } + @Deprecated @Override public void disconnect() { if (isConnected()) { @@ -1256,6 +1270,7 @@ public void disconnect() { } } + @Deprecated @Override public void reset() { if (isConnected()) { @@ -1271,16 +1286,19 @@ public void reset() { } } + @Deprecated @Override public boolean redoable() { return fHistory.canRedo(fUndoContext); } + @Deprecated @Override public boolean undoable() { return fHistory.canUndo(fUndoContext); } + @Deprecated @Override public void redo() { if (isConnected() && redoable()) { @@ -1292,6 +1310,7 @@ public void redo() { } } + @Deprecated @Override public void undo() { if (isConnected() && undoable()) { @@ -1310,6 +1329,7 @@ public void undo() { * @param length the length of the range * @since 3.0 */ + @Deprecated protected void selectAndReveal(int offset, int length) { if (fTextViewer instanceof ITextViewerExtension5 extension) { extension.exposeModelRange(new Region(offset, length)); @@ -1321,6 +1341,7 @@ protected void selectAndReveal(int offset, int length) { fTextViewer.revealRange(offset, length); } + @Deprecated @Override public IUndoContext getUndoContext() { return fUndoContext; diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension3.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension3.java index ef4b823b453..96bbe5bda0c 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension3.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension3.java @@ -32,6 +32,7 @@ public interface ITextViewerExtension3 { * * @return the minimal region of the viewer's document comprising the contents of the viewer's widget or null */ + @Deprecated IRegion getModelCoverage(); @@ -41,6 +42,7 @@ public interface ITextViewerExtension3 { * @param modelLine the line of the viewer's document * @return the corresponding widget line or -1 */ + @Deprecated int modelLine2WidgetLine(int modelLine); /** @@ -50,6 +52,7 @@ public interface ITextViewerExtension3 { * @param modelOffset the offset in the viewer's document * @return the corresponding widget offset or -1 */ + @Deprecated int modelOffset2WidgetOffset(int modelOffset); /** @@ -59,6 +62,7 @@ public interface ITextViewerExtension3 { * @param modelRange the region of the viewer's document * @return the minimal region of the widget comprising modelRange or null */ + @Deprecated IRegion modelRange2WidgetRange(IRegion modelRange); @@ -69,6 +73,7 @@ public interface ITextViewerExtension3 { * @param widgetOffset the widget offset * @return the corresponding offset in the viewer's document or -1 */ + @Deprecated int widgetOffset2ModelOffset(int widgetOffset); /** @@ -78,6 +83,7 @@ public interface ITextViewerExtension3 { * @param widgetRange the widget region * @return the minimal region of the viewer's document comprising widgetRange or null */ + @Deprecated IRegion widgetRange2ModelRange(IRegion widgetRange); /** @@ -86,6 +92,7 @@ public interface ITextViewerExtension3 { * @param widgetLine the widget line * @return the corresponding line of the viewer's document or -1 */ + @Deprecated int widgetlLine2ModelLine(int widgetLine); /** @@ -94,5 +101,6 @@ public interface ITextViewerExtension3 { * @param widgetOffset the widget offset * @return the widget line of the widget offset */ + @Deprecated int widgetLineOfWidgetOffset(int widgetOffset); } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/PropagatingFontFieldEditor.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/PropagatingFontFieldEditor.java index 65e9ae19623..9c1e976d0f9 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/PropagatingFontFieldEditor.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/PropagatingFontFieldEditor.java @@ -53,12 +53,14 @@ public class PropagatingFontFieldEditor extends FontFieldEditor { * @param parent the editor's parent widget * @param defaultFontLabel the label shown in the editor value field when the default value should be taken */ + @Deprecated public PropagatingFontFieldEditor(String name, String labelText, Composite parent, String defaultFontLabel) { super(name, labelText, parent); fParent= parent; fDefaultFontLabel= defaultFontLabel == null ? "" : defaultFontLabel; //$NON-NLS-1$ } + @Deprecated @Override protected void doLoad() { if (getPreferenceStore().isDefault(getPreferenceName())) { @@ -68,6 +70,7 @@ protected void doLoad() { checkForDefault(); } + @Deprecated @Override protected void doLoadDefault() { super.doLoadDefault(); @@ -116,6 +119,7 @@ private static void propagateFont(IPreferenceStore source, String sourceKey, IPr * @param target the target preference store * @param targetKey the key to be used in the target preference store */ + @Deprecated public static void startPropagate(final IPreferenceStore source, final String sourceKey, final IPreferenceStore target, final String targetKey) { source.addPropertyChangeListener(event -> { if (sourceKey.equals(event.getProperty())) { diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedDamagerRepairer.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedDamagerRepairer.java index 00f9ea43bfc..9397fd07611 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedDamagerRepairer.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedDamagerRepairer.java @@ -46,6 +46,7 @@ public RuleBasedDamagerRepairer(RuleBasedScanner scanner, TextAttribute defaultT * @param scanner the rule based scanner to be used, may not be null * @since 2.0 */ + @Deprecated public RuleBasedDamagerRepairer(RuleBasedScanner scanner) { super(scanner); } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationBarHoverManager.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationBarHoverManager.java index bb7476f7dfb..38a23782d87 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationBarHoverManager.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationBarHoverManager.java @@ -95,9 +95,11 @@ protected class Closer extends MouseTrackAdapter implements IInformationControlC /** * Creates a new information control closer. */ + @Deprecated public Closer() { } + @Deprecated @Override public void setSubjectControl(Control control) { fSubjectControl= control; @@ -106,11 +108,13 @@ public void setSubjectControl(Control control) { /* * @see IInformationControlCloser#setHoverControl(IHoverControl) */ + @Deprecated @Override public void setInformationControl(IInformationControl control) { fInformationControlToClose= control; } + @Deprecated @Override public void start(Rectangle subjectArea) { @@ -139,6 +143,7 @@ public void start(Rectangle subjectArea) { } } + @Deprecated @Override public void stop() { @@ -177,6 +182,7 @@ protected void stop(boolean delayRestart) { stop(); } + @Deprecated @Override public void mouseMove(MouseEvent event) { if (!fSubjectArea.contains(event.x, event.y)) { @@ -184,20 +190,24 @@ public void mouseMove(MouseEvent event) { } } + @Deprecated @Override public void mouseUp(MouseEvent event) { } + @Deprecated @Override public void mouseDown(MouseEvent event) { hideInformationControl(); } + @Deprecated @Override public void mouseDoubleClick(MouseEvent event) { hideInformationControl(); } + @Deprecated @Override public void handleEvent(Event event) { if (event.type == SWT.MouseHorizontalWheel || event.type == SWT.MouseVerticalWheel) { @@ -205,6 +215,7 @@ public void handleEvent(Event event) { } } + @Deprecated @Override public void mouseExit(MouseEvent event) { if (!fAllowMouseExit) { @@ -212,46 +223,56 @@ public void mouseExit(MouseEvent event) { } } + @Deprecated @Override public void controlResized(ControlEvent event) { hideInformationControl(); } + @Deprecated @Override public void controlMoved(ControlEvent event) { hideInformationControl(); } + @Deprecated @Override public void keyReleased(KeyEvent event) { } + @Deprecated @Override public void keyPressed(KeyEvent event) { hideInformationControl(); } + @Deprecated @Override public void shellActivated(ShellEvent e) { } + @Deprecated @Override public void shellClosed(ShellEvent e) { } + @Deprecated @Override public void shellDeactivated(ShellEvent e) { hideInformationControl(); } + @Deprecated @Override public void shellDeiconified(ShellEvent e) { } + @Deprecated @Override public void shellIconified(ShellEvent e) { } + @Deprecated @Override public void widgetDisposed(DisposeEvent e) { hideInformationControl(); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationPainter.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationPainter.java index 4b9d1c1b6b8..7e65b8f841b 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationPainter.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationPainter.java @@ -113,6 +113,7 @@ public interface IDrawingStrategy { @Deprecated public static class SquigglesStrategy implements IDrawingStrategy { + @Deprecated @Override public void draw(Annotation annotation, GC gc, StyledText textWidget, int offset, int length, Color color) { if (gc != null) { diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/ContextTypeRegistry.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/ContextTypeRegistry.java index f46bb0923d3..bc600c9321e 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/ContextTypeRegistry.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/ContextTypeRegistry.java @@ -29,16 +29,19 @@ @Deprecated public class ContextTypeRegistry extends org.eclipse.text.templates.ContextTypeRegistry { + @Deprecated @Override public void addContextType(TemplateContextType contextType) { super.addContextType(contextType); } + @Deprecated @Override public TemplateContextType getContextType(String id) { return super.getContextType(id); } + @Deprecated @Override public Iterator contextTypes() { return super.contextTypes(); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplatePersistenceData.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplatePersistenceData.java index 5f29629fe42..74b5e0d0246 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplatePersistenceData.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplatePersistenceData.java @@ -45,84 +45,101 @@ public class TemplatePersistenceData extends org.eclipse.text.templates.Template * underlie this object. * @since 3.14 */ + @Deprecated public TemplatePersistenceData(org.eclipse.text.templates.TemplatePersistenceData data) { super(data.getTemplate(), data.isEnabled(), data.getId()); // these are ignored this.ref= data instanceof TemplatePersistenceData t ? t.ref : data; // no double wrapping } + @Deprecated public TemplatePersistenceData(Template template, boolean enabled) { this(new org.eclipse.text.templates.TemplatePersistenceData(template, enabled)); } + @Deprecated public TemplatePersistenceData(Template template, boolean enabled, String id) { this(new org.eclipse.text.templates.TemplatePersistenceData(template, enabled, id)); } + @Deprecated @Override public String getId() { return ref.getId(); } + @Deprecated @Override public boolean isDeleted() { return ref.isDeleted(); } + @Deprecated @Override public void setDeleted(boolean isDeleted) { ref.setDeleted(isDeleted); } + @Deprecated @Override public Template getTemplate() { return ref.getTemplate(); } + @Deprecated @Override public void setTemplate(Template template) { ref.setTemplate(template); } + @Deprecated @Override public boolean isCustom() { return ref.isCustom(); } + @Deprecated @Override public boolean isModified() { return ref.isModified(); } + @Deprecated @Override public boolean isUserAdded() { return ref.isUserAdded(); } + @Deprecated @Override public void revert() { ref.revert(); } + @Deprecated @Override public boolean isEnabled() { return ref.isEnabled(); } + @Deprecated @Override public void setEnabled(boolean isEnabled) { ref.setEnabled(isEnabled); } + @Deprecated @Override public boolean equals(Object other) { return ref.equals(other); } + @Deprecated @Override public int hashCode() { return ref.hashCode(); } + @Deprecated @Override protected UUID getUniqueIdForEquals() { return getUniqueIdForEquals(ref); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplateReaderWriter.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplateReaderWriter.java index 7ea962aa2c3..b7b91b87c34 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplateReaderWriter.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplateReaderWriter.java @@ -35,9 +35,11 @@ @Deprecated public class TemplateReaderWriter extends org.eclipse.text.templates.TemplateReaderWriter { + @Deprecated public TemplateReaderWriter() { } + @Deprecated @Override public TemplatePersistenceData[] read(Reader reader) throws IOException { org.eclipse.text.templates.TemplatePersistenceData[] list= super.read(reader); @@ -48,11 +50,13 @@ public TemplatePersistenceData[] read(Reader reader) throws IOException { return result; } + @Deprecated @Override public TemplatePersistenceData readSingle(Reader reader, String id) throws IOException { return new org.eclipse.jface.text.templates.persistence.TemplatePersistenceData(super.readSingle(reader, id)); } + @Deprecated @Override public TemplatePersistenceData[] read(Reader reader, ResourceBundle bundle) throws IOException { org.eclipse.text.templates.TemplatePersistenceData[] list= super.read(reader, bundle); @@ -63,6 +67,7 @@ public TemplatePersistenceData[] read(Reader reader, ResourceBundle bundle) thro return result; } + @Deprecated @Override public TemplatePersistenceData[] read(InputStream stream, ResourceBundle bundle) throws IOException { org.eclipse.text.templates.TemplatePersistenceData[] list= super.read(stream, bundle); @@ -73,10 +78,12 @@ public TemplatePersistenceData[] read(InputStream stream, ResourceBundle bundle) return result; } + @Deprecated public void save(TemplatePersistenceData[] templates, OutputStream stream) throws IOException { super.save(templates, stream); } + @Deprecated public void save(TemplatePersistenceData[] templates, Writer writer) throws IOException { super.save(templates, writer); }