diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/contentassist/ContentAssistHandler.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/contentassist/ContentAssistHandler.java index faf9990b959..ae6692d460e 100644 --- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/contentassist/ContentAssistHandler.java +++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/contentassist/ContentAssistHandler.java @@ -82,6 +82,7 @@ public class ContentAssistHandler { * @param contentAssistant a configured content assistant * @return a new {@link ContentAssistHandler} */ + @Deprecated public static ContentAssistHandler createHandlerForCombo(Combo combo, SubjectControlContentAssistant contentAssistant) { return new ContentAssistHandler(combo, new ComboContentAssistSubjectAdapter(combo), contentAssistant); } @@ -95,6 +96,7 @@ public static ContentAssistHandler createHandlerForCombo(Combo combo, SubjectCon * @param contentAssistant a configured content assistant * @return a new {@link ContentAssistHandler} */ + @Deprecated public static ContentAssistHandler createHandlerForText(Text text, SubjectControlContentAssistant contentAssistant) { return new ContentAssistHandler(text, new TextContentAssistSubjectAdapter(text), contentAssistant); } @@ -120,6 +122,7 @@ private ContentAssistHandler( /** * @return true iff content assist is enabled */ + @Deprecated public boolean isEnabled() { return fFocusListener != null; } @@ -131,6 +134,7 @@ public boolean isEnabled() { * * @param enable enable content assist iff true */ + @Deprecated public void setEnabled(boolean enable) { if (enable == isEnabled()) { return; diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ConvertLineDelimitersAction.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ConvertLineDelimitersAction.java index bea90b4c86b..bdc3cafb444 100644 --- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ConvertLineDelimitersAction.java +++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ConvertLineDelimitersAction.java @@ -57,6 +57,7 @@ public class ConvertLineDelimitersAction extends TextEditorAction { * @param editor the editor * @param lineDelimiter the target line delimiter to convert the editor's document to */ + @Deprecated public ConvertLineDelimitersAction(ITextEditor editor, String lineDelimiter) { this(EditorMessages.getBundleForConstructedKeys(), "dummy", editor, lineDelimiter); //$NON-NLS-1$ } @@ -69,6 +70,7 @@ public ConvertLineDelimitersAction(ITextEditor editor, String lineDelimiter) { * @param editor the editor * @param lineDelimiter the target line delimiter to convert the editor's document to */ + @Deprecated public ConvertLineDelimitersAction(ResourceBundle bundle, String prefix, ITextEditor editor, String lineDelimiter) { super(bundle, prefix, editor); fLineDelimiter= lineDelimiter; @@ -79,6 +81,7 @@ public ConvertLineDelimitersAction(ResourceBundle bundle, String prefix, ITextEd update(); } + @Deprecated @Override public void run() { @@ -276,6 +279,7 @@ private static String getString(String key) { } } + @Deprecated @Override public void update() { super.update(); diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/InfoForm.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/InfoForm.java index b761ecae402..ebf7ccdea02 100644 --- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/InfoForm.java +++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/InfoForm.java @@ -63,6 +63,7 @@ public class InfoForm { * Creates a new info form. * @param parent the parent composite */ + @Deprecated public InfoForm(Composite parent) { Display display= parent.getDisplay(); @@ -113,6 +114,7 @@ public InfoForm(Composite parent) { * Hook method for creating an appropriate action control. * @param parent the action control's parent control */ + @Deprecated protected void createActionControls(Composite parent) { } @@ -120,6 +122,7 @@ protected void createActionControls(Composite parent) { * Returns the control of this form. * @return the root control of this form */ + @Deprecated public Control getControl() { return fScrolledComposite; } @@ -128,6 +131,7 @@ public Control getControl() { * Sets the header text of this info form. * @param header the header text */ + @Deprecated public void setHeaderText(String header) { fHeader.setText(header); } @@ -136,6 +140,7 @@ public void setHeaderText(String header) { * Sets the banner text of this info form. * @param banner the banner text */ + @Deprecated public void setBannerText(String banner) { fBanner.setText(banner); } @@ -144,6 +149,7 @@ public void setBannerText(String banner) { * Sets the info of this info form * @param info the info text */ + @Deprecated public void setInfo(String info) { fText.setText(info); } @@ -153,6 +159,7 @@ public void setInfo(String info) { * * @param event the property change event object describing which property changed and how */ + @Deprecated protected void handlePropertyChange(PropertyChangeEvent event) { if (fHeader != null) { diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SaveAction.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SaveAction.java index 33ceb932bbe..319f4cb9a3d 100644 --- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SaveAction.java +++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SaveAction.java @@ -41,15 +41,18 @@ public class SaveAction extends TextEditorAction { * @param editor the text editor * @see TextEditorAction#TextEditorAction(ResourceBundle, String, ITextEditor) */ + @Deprecated public SaveAction(ResourceBundle bundle, String prefix, ITextEditor editor) { super(bundle, prefix, editor); } + @Deprecated @Override public void run() { getTextEditor().getSite().getPage().saveEditor(getTextEditor(), false); } + @Deprecated @Override public void update() { setEnabled(getTextEditor().isDirty()); diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ValidateStateException.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ValidateStateException.java index e0d1aca3b4e..7f193cfc3fb 100644 --- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ValidateStateException.java +++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/ValidateStateException.java @@ -42,7 +42,8 @@ public class ValidateStateException extends CoreException { /* * @see CoreException#CoreException(org.eclipse.core.runtime.IStatus) */ - public ValidateStateException(IStatus status) { + @Deprecated + public ValidateStateException(IStatus status) { super(status); } diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/WorkbenchChainedTextFontFieldEditor.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/WorkbenchChainedTextFontFieldEditor.java index a77e3247e9f..7d038f359ea 100644 --- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/WorkbenchChainedTextFontFieldEditor.java +++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/WorkbenchChainedTextFontFieldEditor.java @@ -52,6 +52,7 @@ public class WorkbenchChainedTextFontFieldEditor extends PropagatingFontFieldEdi * @param labelText the text shown as editor description * @param parent the editor's parent widget */ + @Deprecated public WorkbenchChainedTextFontFieldEditor(String name, String labelText, Composite parent) { super(name, labelText, parent, EditorMessages.WorkbenchChainedTextFontFieldEditor_defaultWorkbenchTextFont); } @@ -63,6 +64,7 @@ public WorkbenchChainedTextFontFieldEditor(String name, String labelText, Compos * @param target the target preference store * @param targetKey the key to be used in the target preference store */ + @Deprecated public static void startPropagate(IPreferenceStore target, String targetKey) { IPreferenceStore store= new ScopedPreferenceStore(InstanceScope.INSTANCE, "org.eclipse.ui.workbench"); //$NON-NLS-1$ PropagatingFontFieldEditor.startPropagate(store, JFaceResources.TEXT_FONT, target, targetKey); diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java index f9984a6e28d..587a53a8319 100644 --- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java +++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java @@ -998,8 +998,9 @@ public void setSearchText(String s) { } @Override public boolean select(Viewer viewer, Object parentElement, Object element) { - if (searchString.isEmpty()) + if (searchString.isEmpty()) { return true; + } Template template = ((TemplatePersistenceData) element).getTemplate(); return template.getName().toLowerCase().contains(searchString) || template.getContextTypeId().toLowerCase().contains(searchString)