From 07f77326eba982705c7b78749eecf10cdd41d209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Mon, 11 Dec 2023 14:48:06 +0200 Subject: [PATCH] Replace apitools javadoc tags with annotations Identified in https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1655 that so far annotations were missing in generated .api_description files. Local build shown that everything is still picked up with annotations only, even the one that wasn't before (LazyResourceManager) and caused this issue. --- .../jface/action/AbstractGroupMarker.java | 3 ++- .../jface/action/ActionContributionItem.java | 3 ++- .../org/eclipse/jface/action/GroupMarker.java | 4 +++- .../src/org/eclipse/jface/action/IAction.java | 3 ++- .../eclipse/jface/action/IContributionItem.java | 3 ++- .../action/IContributionManagerOverrides.java | 4 +++- .../org/eclipse/jface/action/IMenuManager.java | 5 +++-- .../src/org/eclipse/jface/action/Separator.java | 3 ++- .../jface/action/SubContributionItem.java | 3 ++- .../jface/action/ToolBarContributionItem.java | 3 ++- .../eclipse/jface/dialogs/DialogSettings.java | 4 ++-- .../eclipse/jface/dialogs/IDialogLabelKeys.java | 6 +++--- .../jface/fieldassist/ControlDecoration.java | 4 ++-- .../jface/internal/MenuManagerEventHelper.java | 6 ++++-- .../eclipse/jface/operation/ModalContext.java | 6 ++++-- .../jface/preference/PreferenceConverter.java | 4 ++-- .../jface/preference/PreferenceStore.java | 3 ++- .../eclipse/jface/resource/ColorRegistry.java | 3 ++- .../resource/CompositeImageDescriptor.java | 3 ++- .../eclipse/jface/resource/FontRegistry.java | 3 ++- .../eclipse/jface/resource/ImageRegistry.java | 3 ++- .../eclipse/jface/resource/JFaceResources.java | 7 ++++--- .../eclipse/jface/resource/ResourceLocator.java | 3 ++- .../eclipse/jface/resource/StringConverter.java | 6 ++++-- .../util/StructuredTextSegmentListener.java | 3 ++- .../jface/viewers/ArrayContentProvider.java | 4 +++- .../org/eclipse/jface/viewers/CellEditor.java | 4 ++-- .../jface/viewers/CheckboxCellEditor.java | 3 ++- .../jface/viewers/CheckboxTableViewer.java | 3 ++- .../eclipse/jface/viewers/ColorCellEditor.java | 3 ++- .../eclipse/jface/viewers/ColumnLayoutData.java | 4 +++- .../eclipse/jface/viewers/ColumnPixelData.java | 3 ++- .../ColumnViewerEditorDeactivationEvent.java | 4 +++- .../eclipse/jface/viewers/ColumnWeightData.java | 3 ++- .../jface/viewers/ComboBoxCellEditor.java | 3 ++- .../org/eclipse/jface/viewers/IDecoration.java | 3 ++- .../org/eclipse/jface/viewers/ListViewer.java | 3 ++- .../jface/viewers/StructuredSelection.java | 3 ++- .../viewers/StructuredViewerInternals.java | 17 ++++++++++------- .../org/eclipse/jface/viewers/TableViewer.java | 3 ++- .../org/eclipse/jface/viewers/TreeViewer.java | 3 ++- .../viewers/deferred/IConcurrentModel.java | 3 ++- .../jface/viewers/internal/ExpandableNode.java | 4 ++-- .../jface/widgets/AbstractCompositeFactory.java | 4 ++-- .../jface/widgets/AbstractControlFactory.java | 4 ++-- .../jface/widgets/AbstractItemFactory.java | 4 ++-- .../jface/widgets/AbstractWidgetFactory.java | 4 ++-- .../src/org/eclipse/jface/widgets/Property.java | 7 ++++--- .../eclipse/jface/widgets/WidgetSupplier.java | 7 ++++--- 49 files changed, 125 insertions(+), 76 deletions(-) diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/AbstractGroupMarker.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/AbstractGroupMarker.java index afb4304cd09..6df209bd996 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/AbstractGroupMarker.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/AbstractGroupMarker.java @@ -15,14 +15,15 @@ package org.eclipse.jface.action; import org.eclipse.core.runtime.Assert; +import org.eclipse.pde.api.tools.annotations.NoExtend; /** * Abstract superclass for group marker classes. *

* This class is not intended to be subclassed outside the framework. *

- * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public abstract class AbstractGroupMarker extends ContributionItem { /** * Constructor for use by subclasses. diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/ActionContributionItem.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/ActionContributionItem.java index 2cb6a77c857..86658a03a55 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/ActionContributionItem.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/ActionContributionItem.java @@ -31,6 +31,7 @@ import org.eclipse.jface.util.Policy; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.util.Util; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Point; @@ -51,8 +52,8 @@ *

* This class may be instantiated; it is not intended to be subclassed. *

- * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class ActionContributionItem extends ContributionItem { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/GroupMarker.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/GroupMarker.java index 54a6264e3c1..6e05da7473b 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/GroupMarker.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/GroupMarker.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.jface.action; +import org.eclipse.pde.api.tools.annotations.NoExtend; + /** * A group marker is a special kind of contribution item denoting * the beginning of a group. These groups are used to structure @@ -23,8 +25,8 @@ * This class may be instantiated; it is not intended to be * subclassed outside the framework. *

- * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class GroupMarker extends AbstractGroupMarker { /** * Create a new group marker with the given name. diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/IAction.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/IAction.java index 34da2a821e8..746e5001b63 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/IAction.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/IAction.java @@ -16,6 +16,7 @@ import org.eclipse.core.commands.IHandlerAttributes; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.util.IPropertyChangeListener; +import org.eclipse.pde.api.tools.annotations.NoImplement; import org.eclipse.swt.events.HelpListener; import org.eclipse.swt.widgets.Event; @@ -42,8 +43,8 @@ *

* * @see Action - * @noimplement This interface is not intended to be implemented by clients. */ +@NoImplement public interface IAction { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/IContributionItem.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/IContributionItem.java index 925a59b629c..b1c0a7fec9d 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/IContributionItem.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/IContributionItem.java @@ -14,6 +14,7 @@ package org.eclipse.jface.action; +import org.eclipse.pde.api.tools.annotations.NoImplement; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.CoolBar; import org.eclipse.swt.widgets.Menu; @@ -37,8 +38,8 @@ *

* * @see IContributionManager - * @noimplement This interface is not intended to be implemented by clients. */ +@NoImplement public interface IContributionItem { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/IContributionManagerOverrides.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/IContributionManagerOverrides.java index eb93322b75d..72fceb397e0 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/IContributionManagerOverrides.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/IContributionManagerOverrides.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.jface.action; +import org.eclipse.pde.api.tools.annotations.NoImplement; + /** * This interface is used by instances of IContributionItem * to determine if the values for certain properties have been overriden @@ -23,8 +25,8 @@ *

* * @since 2.0 - * @noimplement This interface is not intended to be implemented by clients. */ +@NoImplement public interface IContributionManagerOverrides { /** * Id for the enabled property. Value is "enabled". diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/IMenuManager.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/IMenuManager.java index 7d6cf1eb6dd..56dad1fa2b2 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/IMenuManager.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/IMenuManager.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.jface.action; +import org.eclipse.pde.api.tools.annotations.NoImplement; + /** * The IMenuManager interface provides protocol for managing * contributions to a menu bar and its sub menus. An IMenuManager @@ -26,9 +28,8 @@ * This package provides a concrete menu manager implementation, * {@link MenuManager MenuManager}. *

- * - * @noimplement This interface is not intended to be implemented by clients. */ +@NoImplement public interface IMenuManager extends IContributionManager, IContributionItem { /** * Adds a menu listener to this menu. diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/Separator.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/Separator.java index 2c43b512cc2..5a629b5cf0d 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/Separator.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/Separator.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.jface.action; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; @@ -28,8 +29,8 @@ * This class may be instantiated; it is not intended to be * subclassed outside the framework. *

- * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class Separator extends AbstractGroupMarker { /** * Creates a separator which does not start a new group. diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/SubContributionItem.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/SubContributionItem.java index c53564e5af5..426e93aae12 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/SubContributionItem.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/SubContributionItem.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.jface.action; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.CoolBar; import org.eclipse.swt.widgets.Menu; @@ -25,8 +26,8 @@ *

* This class is not intended to be subclassed. *

- * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class SubContributionItem implements IContributionItem { /** * The visibility of the item. diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/ToolBarContributionItem.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/ToolBarContributionItem.java index 9ef59f12897..d1037ac1696 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/ToolBarContributionItem.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/ToolBarContributionItem.java @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.jface.internal.provisional.action.IToolBarContributionItem; import org.eclipse.jface.util.Policy; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.SelectionEvent; @@ -46,8 +47,8 @@ *

* * @since 3.0 - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class ToolBarContributionItem extends ContributionItem implements IToolBarContributionItem { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/DialogSettings.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/DialogSettings.java index a54fb7461aa..0cb8279118e 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/DialogSettings.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/DialogSettings.java @@ -39,6 +39,7 @@ import javax.xml.parsers.ParserConfigurationException; import org.eclipse.jface.internal.XmlProcessorFactoryJFace; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -70,9 +71,8 @@ * settings.save("c:\\temp\\test\\dialog.xml"); * * - * @noextend This class is not intended to be subclassed by clients. */ - +@NoExtend public class DialogSettings implements IDialogSettings { // The name of the DialogSettings. private String name; diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/IDialogLabelKeys.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/IDialogLabelKeys.java index 443bf90d0bf..40374a1682b 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/IDialogLabelKeys.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/IDialogLabelKeys.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.jface.dialogs; +import org.eclipse.pde.api.tools.annotations.NoImplement; + /** * IDialogLabelKeys contains publicly accessible keys to the common dialog * labels used throughout JFace. IDialogConstants provides @@ -24,10 +26,8 @@ * * @see IDialogConstants * @since 3.7 - * - * @noimplement This interface is not intended to be implemented by clients. - */ +@NoImplement public interface IDialogLabelKeys { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ControlDecoration.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ControlDecoration.java index c6addbb3ffa..f70b8c0bbf8 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ControlDecoration.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ControlDecoration.java @@ -16,6 +16,7 @@ import org.eclipse.core.runtime.ListenerList; import org.eclipse.jface.util.Util; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.ScrolledComposite; import org.eclipse.swt.events.DisposeListener; @@ -75,9 +76,8 @@ * * @see FieldDecoration * @see FieldDecorationRegistry - * - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class ControlDecoration { /** * Debug flag for tracing diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/internal/MenuManagerEventHelper.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/internal/MenuManagerEventHelper.java index 947e6282b60..f7e7b07d46a 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/internal/MenuManagerEventHelper.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/internal/MenuManagerEventHelper.java @@ -16,12 +16,14 @@ import org.eclipse.jface.action.IMenuListener2; import org.eclipse.jface.action.MenuManager; +import org.eclipse.pde.api.tools.annotations.NoInstantiate; +import org.eclipse.pde.api.tools.annotations.NoReference; /** * @since 3.8.100 - * @noinstantiate This class is not intended to be instantiated by clients. - * @noreference This class is not intended to be referenced by clients. */ +@NoInstantiate +@NoReference public final class MenuManagerEventHelper { private IMenuListener2 showHelper; diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/operation/ModalContext.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/operation/ModalContext.java index a2b9190079e..3e662b38937 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/operation/ModalContext.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/operation/ModalContext.java @@ -23,6 +23,8 @@ import org.eclipse.core.runtime.ProgressMonitorWrapper; import org.eclipse.core.runtime.Status; import org.eclipse.jface.util.Policy; +import org.eclipse.pde.api.tools.annotations.NoExtend; +import org.eclipse.pde.api.tools.annotations.NoInstantiate; import org.eclipse.swt.widgets.Display; /** @@ -35,9 +37,9 @@ *

* This class is not intended to be subclassed. *

- * @noinstantiate This class is not intended to be instantiated by clients. - * @noextend This class is not intended to be subclassed by clients. */ +@NoInstantiate +@NoExtend public class ModalContext { /** * Indicates whether ModalContext is in debug mode; false by diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferenceConverter.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferenceConverter.java index 050143474c5..a047d10c12c 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferenceConverter.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferenceConverter.java @@ -18,6 +18,7 @@ import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.resource.StringConverter; +import org.eclipse.pde.api.tools.annotations.NoInstantiate; import org.eclipse.swt.SWTException; import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.graphics.Point; @@ -46,9 +47,8 @@ *

* Note: touching this class has the side effect of creating a display (static * initializer). - * - * @noinstantiate This class is not intended to be instantiated by clients. */ +@NoInstantiate public class PreferenceConverter { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferenceStore.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferenceStore.java index e637177d35c..1e0c6c4abfe 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferenceStore.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferenceStore.java @@ -30,6 +30,7 @@ import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.util.SafeRunnable; +import org.eclipse.pde.api.tools.annotations.NoExtend; /** * A concrete preference store implementation based on an internal @@ -40,8 +41,8 @@ *

* * @see IPreferenceStore - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class PreferenceStore extends EventManager implements IPersistentPreferenceStore { diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ColorRegistry.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ColorRegistry.java index cadf433bb4e..d341a717495 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ColorRegistry.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ColorRegistry.java @@ -21,6 +21,7 @@ import java.util.Set; import org.eclipse.core.runtime.Assert; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Display; @@ -44,8 +45,8 @@ *

* * @since 3.0 - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class ColorRegistry extends ResourceRegistry { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/CompositeImageDescriptor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/CompositeImageDescriptor.java index f37a2c82545..45f0676b3ee 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/CompositeImageDescriptor.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/CompositeImageDescriptor.java @@ -17,6 +17,7 @@ import java.util.Objects; import java.util.function.ToIntFunction; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.graphics.ImageDataProvider; @@ -48,8 +49,8 @@ public abstract class CompositeImageDescriptor extends ImageDescriptor { * @see #createCachedImageDataProvider(ImageDescriptor) * * @since 3.13 - * @noextend This class is not intended to be subclassed by clients. */ + @NoExtend protected abstract class CachedImageDataProvider implements ImageDataProvider { /** * Returns the {@link ImageData#width} in points. This method must only diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/FontRegistry.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/FontRegistry.java index fbf3fa8221d..ef4cfa0f0a1 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/FontRegistry.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/FontRegistry.java @@ -29,6 +29,7 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.jface.util.Policy; import org.eclipse.jface.util.Util; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.SWT; import org.eclipse.swt.SWTException; import org.eclipse.swt.graphics.Font; @@ -58,8 +59,8 @@ *

* * Since 3.0 this class extends ResourceRegistry. - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class FontRegistry extends ResourceRegistry { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageRegistry.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageRegistry.java index 6df15edbbd2..002c2ba9934 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageRegistry.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageRegistry.java @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Device; import org.eclipse.swt.graphics.Image; @@ -44,8 +45,8 @@ * Unlike the FontRegistry, it is an error to replace images. As a result * there are no events that fire when values are changed in the registry *

- * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class ImageRegistry { /** * display used when getting images diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/JFaceResources.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/JFaceResources.java index db706caac1a..14d70de6a02 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/JFaceResources.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/JFaceResources.java @@ -30,6 +30,8 @@ import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.jface.preference.PreferenceDialog; import org.eclipse.jface.wizard.Wizard; +import org.eclipse.pde.api.tools.annotations.NoExtend; +import org.eclipse.pde.api.tools.annotations.NoInstantiate; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Control; @@ -52,10 +54,9 @@ *
  • an image registry
    • *
  • a resource bundle
    • * - * - * @noinstantiate This class is not intended to be instantiated by clients. - * @noextend This class is not intended to be subclassed by clients. */ +@NoInstantiate +@NoExtend public class JFaceResources { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ResourceLocator.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ResourceLocator.java index 097ea48745a..af988816f22 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ResourceLocator.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ResourceLocator.java @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; +import org.eclipse.pde.api.tools.annotations.NoInstantiate; import org.osgi.framework.Bundle; import org.osgi.framework.FrameworkUtil; @@ -29,8 +30,8 @@ * resources in bundles. * * @since 3.17 - * @noinstantiate This class is not intended to be instantiated by clients. */ +@NoInstantiate public final class ResourceLocator { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/StringConverter.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/StringConverter.java index 0636c346602..cfce4128c71 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/StringConverter.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/StringConverter.java @@ -19,6 +19,8 @@ import java.util.StringTokenizer; import org.eclipse.core.runtime.Assert; +import org.eclipse.pde.api.tools.annotations.NoExtend; +import org.eclipse.pde.api.tools.annotations.NoInstantiate; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.graphics.Point; @@ -43,9 +45,9 @@ * All methods declared on this class are static. This * class cannot be instantiated. *

    - * @noinstantiate This class is not intended to be instantiated by clients. - * @noextend This class is not intended to be subclassed by clients. */ +@NoInstantiate +@NoExtend public class StringConverter { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/util/StructuredTextSegmentListener.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/util/StructuredTextSegmentListener.java index 5438a961772..abe436f754a 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/util/StructuredTextSegmentListener.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/util/StructuredTextSegmentListener.java @@ -21,6 +21,7 @@ import org.eclipse.equinox.bidi.advanced.StructuredTextEnvironment; import org.eclipse.equinox.bidi.advanced.StructuredTextExpertFactory; import org.eclipse.equinox.bidi.custom.StructuredTextTypeHandler; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.events.SegmentEvent; import org.eclipse.swt.events.SegmentListener; @@ -34,8 +35,8 @@ *

    * * @since 3.9 - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class StructuredTextSegmentListener implements SegmentListener { private final IStructuredTextExpert expert; diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ArrayContentProvider.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ArrayContentProvider.java index f9f257dba15..fc4401e54e4 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ArrayContentProvider.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ArrayContentProvider.java @@ -17,6 +17,8 @@ import java.util.Collection; +import org.eclipse.pde.api.tools.annotations.NoExtend; + /** * This implementation of IStructuredContentProvider handles * the case where the viewer input is an unchanging array or collection of elements. @@ -25,8 +27,8 @@ *

    * * @since 2.1 - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class ArrayContentProvider implements IStructuredContentProvider { private static ArrayContentProvider instance; diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CellEditor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CellEditor.java index 640d604be1a..ca0b70f67db 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CellEditor.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CellEditor.java @@ -20,6 +20,7 @@ import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.util.SafeRunnable; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.widgets.Composite; @@ -95,9 +96,8 @@ public abstract class CellEditor { /** * Struct-like layout data for cell editors, with reasonable defaults for * all fields. - * - * @noextend This class is not intended to be subclassed by clients. */ + @NoExtend public static class LayoutData { /** * Horizontal alignment; SWT.LEFT by default. diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxCellEditor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxCellEditor.java index 6cc2946cca7..da0b2f34be7 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxCellEditor.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxCellEditor.java @@ -14,6 +14,7 @@ package org.eclipse.jface.viewers; import org.eclipse.core.runtime.Assert; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -30,8 +31,8 @@ * of the check box is being toggled by the end users; the listener method * applyEditorValue is immediately called to signal the change. *

    - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class CheckboxCellEditor extends CellEditor { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxTableViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxTableViewer.java index eea10a64d88..823399f91aa 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxTableViewer.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxTableViewer.java @@ -20,6 +20,7 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.ListenerList; import org.eclipse.jface.util.SafeRunnable; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.widgets.Composite; @@ -40,8 +41,8 @@ * with a domain-specific content provider, label provider, element filter (optional), * and element sorter (optional). *

    - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class CheckboxTableViewer extends TableViewer implements ICheckable { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColorCellEditor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColorCellEditor.java index 9c239f7700f..724f9fd4cfe 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColorCellEditor.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColorCellEditor.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.jface.viewers; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.FontMetrics; @@ -37,8 +38,8 @@ *

    * This class may be instantiated; it is not intended to be subclassed. *

    - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class ColorCellEditor extends DialogCellEditor { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnLayoutData.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnLayoutData.java index 4695071eb30..cf6fd2f5575 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnLayoutData.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnLayoutData.java @@ -13,14 +13,16 @@ *******************************************************************************/ package org.eclipse.jface.viewers; +import org.eclipse.pde.api.tools.annotations.NoExtend; + /** * An abstract column layout data describing the information needed * (by TableLayout) to properly lay out a table. *

    * This class is not intended to be subclassed outside the framework. *

    - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public abstract class ColumnLayoutData { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnPixelData.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnPixelData.java index 2fa082ff457..a0570c5d6e7 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnPixelData.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnPixelData.java @@ -14,6 +14,7 @@ package org.eclipse.jface.viewers; import org.eclipse.core.runtime.Assert; +import org.eclipse.pde.api.tools.annotations.NoExtend; /** * Describes the width of a table column in pixels, and @@ -21,8 +22,8 @@ *

    * This class may be instantiated; it is not intended to be subclassed. *

    - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class ColumnPixelData extends ColumnLayoutData { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnViewerEditorDeactivationEvent.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnViewerEditorDeactivationEvent.java index 3dfeb608279..0a1f887bcf0 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnViewerEditorDeactivationEvent.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnViewerEditorDeactivationEvent.java @@ -18,12 +18,14 @@ import java.util.EventObject; +import org.eclipse.pde.api.tools.annotations.NoExtend; + /** * This event is fired when an editor deactivated * * @since 3.3 - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class ColumnViewerEditorDeactivationEvent extends EventObject { private static final long serialVersionUID = 1L; diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnWeightData.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnWeightData.java index a03c852ebb2..d9a16536edc 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnWeightData.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnWeightData.java @@ -14,6 +14,7 @@ package org.eclipse.jface.viewers; import org.eclipse.core.runtime.Assert; +import org.eclipse.pde.api.tools.annotations.NoExtend; /** * Describes the width of a table column in terms of a weight, @@ -21,8 +22,8 @@ *

    * This class may be instantiated; it is not intended to be subclassed. *

    - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class ColumnWeightData extends ColumnLayoutData { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxCellEditor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxCellEditor.java index dc334041c6e..9bd26174313 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxCellEditor.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxCellEditor.java @@ -19,6 +19,7 @@ // scenario import org.eclipse.core.runtime.Assert; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CCombo; import org.eclipse.swt.events.FocusAdapter; @@ -37,8 +38,8 @@ *

    * This class may be instantiated; it is not intended to be subclassed. *

    - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class ComboBoxCellEditor extends AbstractComboBoxCellEditor { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/IDecoration.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/IDecoration.java index 9251347d982..ca417bdfb03 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/IDecoration.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/IDecoration.java @@ -14,6 +14,7 @@ package org.eclipse.jface.viewers; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.pde.api.tools.annotations.NoImplement; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; @@ -22,8 +23,8 @@ * * This interface is not meant to be implemented and will be provided to * instances of ILightweightLabelDecorator. - * @noimplement This interface is not intended to be implemented by clients. */ +@NoImplement public interface IDecoration { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ListViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ListViewer.java index 0c26266b622..9e711a76a4f 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ListViewer.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ListViewer.java @@ -20,6 +20,7 @@ import java.util.List; import org.eclipse.core.runtime.Assert; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Composite; @@ -38,8 +39,8 @@ *

    * * @see TableViewer - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class ListViewer extends AbstractListViewer { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredSelection.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredSelection.java index eff3239d0bc..6396ccb9ac0 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredSelection.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredSelection.java @@ -22,6 +22,7 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.jface.resource.JFaceResources; +import org.eclipse.pde.api.tools.annotations.NoExtend; /** * A concrete implementation of the IStructuredSelection interface, @@ -29,8 +30,8 @@ *

    * This class is not intended to be subclassed. *

    - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class StructuredSelection implements IStructuredSelection { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredViewerInternals.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredViewerInternals.java index e0d3e6ed369..b99249fe3d6 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredViewerInternals.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredViewerInternals.java @@ -14,6 +14,10 @@ package org.eclipse.jface.viewers; +import org.eclipse.pde.api.tools.annotations.NoExtend; +import org.eclipse.pde.api.tools.annotations.NoImplement; +import org.eclipse.pde.api.tools.annotations.NoInstantiate; +import org.eclipse.pde.api.tools.annotations.NoReference; import org.eclipse.swt.widgets.Item; import org.eclipse.swt.widgets.Widget; @@ -21,18 +25,18 @@ * This class is not part of the public API of JFace. See bug 267722. * * @since 3.5 - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. */ +@NoInstantiate +@NoExtend public class StructuredViewerInternals { /** * Nothing to see here. * * @since 3.5 - * @noextend This interface is not intended to be extended by clients. - * @noimplement This interface is not intended to be implemented by clients. */ + @NoExtend + @NoImplement protected static interface AssociateListener { /** @@ -67,8 +71,8 @@ protected static interface AssociateListener { * the viewer * @param listener * the {@link AssociateListener} - * @noreference This method is not intended to be referenced by clients. */ + @NoReference protected static void setAssociateListener(StructuredViewer viewer, AssociateListener listener) { viewer.setAssociateListener(listener); @@ -82,9 +86,8 @@ protected static void setAssociateListener(StructuredViewer viewer, * @param element * the element * @return the Widgets corresponding to the element - * - * @noreference This method is not intended to be referenced by clients. */ + @NoReference protected static Widget[] getItems(StructuredViewer viewer, Object element) { return viewer.findItems(element); } diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewer.java index a117d7c4897..8966573b3f3 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewer.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewer.java @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.jface.viewers.internal.ExpandableNode; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Composite; @@ -65,8 +66,8 @@ * @see SWT#VIRTUAL * @see #doFindItem(Object) * @see #internalRefresh(Object, boolean) - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class TableViewer extends AbstractTableViewer { /** * This viewer's table control. diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewer.java index c64a055c260..f8b78762f88 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewer.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewer.java @@ -26,6 +26,7 @@ import org.eclipse.jface.util.Policy; import org.eclipse.jface.viewers.internal.ExpandableNode; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.SWT; import org.eclipse.swt.events.TreeEvent; import org.eclipse.swt.events.TreeListener; @@ -65,8 +66,8 @@ * Users setting up an editable tree with more than 1 column have to pass the * SWT.FULL_SELECTION style bit *

    - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class TreeViewer extends AbstractTreeViewer { private static final String VIRTUAL_DISPOSE_KEY = Policy.JFACE diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/deferred/IConcurrentModel.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/deferred/IConcurrentModel.java index 349524b43bc..c0056b5dcf9 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/deferred/IConcurrentModel.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/deferred/IConcurrentModel.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.jface.viewers.deferred; +import org.eclipse.pde.api.tools.annotations.NoImplement; /** * Interface for a set of unordered elements that can fire change notifications. @@ -32,8 +33,8 @@ *

    * * @since 3.1 - * @noimplement This interface is not intended to be implemented by clients. */ +@NoImplement public interface IConcurrentModel { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/internal/ExpandableNode.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/internal/ExpandableNode.java index e44cbd581cf..fa6e31a87d1 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/internal/ExpandableNode.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/internal/ExpandableNode.java @@ -21,6 +21,7 @@ import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.pde.api.tools.annotations.NoExtend; /** * The expandable placeholder element to be used for viewer items that represent @@ -34,9 +35,8 @@ * The node consists of a parent element, list of all children of this parent * and the offset to which child elements are supposed to be created and shown * in the viewer. - * - * @noextend This class is not intended to be subclassed by clients. */ +@NoExtend public class ExpandableNode { /** diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractCompositeFactory.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractCompositeFactory.java index c27afb29d36..faadf962b14 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractCompositeFactory.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractCompositeFactory.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.jface.widgets; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Layout; @@ -24,10 +25,9 @@ * @param factory * @param control * - * @noextend this class is not intended to be subclassed by clients. - * * @since 3.18 */ +@NoExtend public abstract class AbstractCompositeFactory, C extends Composite> extends AbstractControlFactory { diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractControlFactory.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractControlFactory.java index c945517e419..7e0f2412e86 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractControlFactory.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractControlFactory.java @@ -16,6 +16,7 @@ import java.util.function.Supplier; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.widgets.Composite; @@ -29,10 +30,9 @@ * @param factory * @param control * - * @noextend this class is not intended to be subclassed by clients. - * * @since 3.18 */ +@NoExtend public abstract class AbstractControlFactory, C extends Control> extends AbstractWidgetFactory { diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractItemFactory.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractItemFactory.java index b67d380a629..eaaccee56cc 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractItemFactory.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractItemFactory.java @@ -13,6 +13,7 @@ ******************************************************************************/ package org.eclipse.jface.widgets; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Item; import org.eclipse.swt.widgets.Widget; @@ -26,10 +27,9 @@ * @param item * @param

    parent * - * @noextend this class is not intended to be subclassed by clients. - * * @since 3.18 */ +@NoExtend public abstract class AbstractItemFactory, I extends Item, P extends Widget> extends AbstractWidgetFactory { diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractWidgetFactory.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractWidgetFactory.java index 93002845d5c..06949dde580 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractWidgetFactory.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractWidgetFactory.java @@ -16,6 +16,7 @@ import java.util.ArrayList; import java.util.List; +import org.eclipse.pde.api.tools.annotations.NoExtend; import org.eclipse.swt.widgets.Widget; /** @@ -27,10 +28,9 @@ * @param widget * @param

    parent * - * @noextend this class is not intended to be subclassed by clients. - * * @since 3.18 */ +@NoExtend public abstract class AbstractWidgetFactory, W extends Widget, P extends Widget> { private Class factoryClass; diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/Property.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/Property.java index 579919dbab0..9e63ec05f9f 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/Property.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/Property.java @@ -13,6 +13,8 @@ ******************************************************************************/ package org.eclipse.jface.widgets; +import org.eclipse.pde.api.tools.annotations.NoExtend; +import org.eclipse.pde.api.tools.annotations.NoImplement; import org.eclipse.swt.widgets.Widget; /** @@ -28,11 +30,10 @@ * * @param the type of the widget the property is used for * - * @noimplement this interface is not intended to be implemented by clients. - * @noextend this class is not intended to be subclassed by clients. - * * @since 3.18 */ +@NoImplement +@NoExtend @FunctionalInterface public interface Property { diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/WidgetSupplier.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/WidgetSupplier.java index da4e4ec1c66..5ec54d2deb3 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/WidgetSupplier.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/WidgetSupplier.java @@ -13,6 +13,8 @@ ******************************************************************************/ package org.eclipse.jface.widgets; +import org.eclipse.pde.api.tools.annotations.NoExtend; +import org.eclipse.pde.api.tools.annotations.NoImplement; import org.eclipse.swt.widgets.Widget; /** @@ -29,11 +31,10 @@ * @param the type of the widget to be created * @param

    the type of the parent the widget should be created in * - * @noimplement this interface is not intended to be implemented by clients. - * @noextend this class is not intended to be subclassed by clients. - * * @since 3.18 */ +@NoImplement +@NoExtend @FunctionalInterface public interface WidgetSupplier {