You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2019/07/23 18:54:24 UTC

[netbeans] branch master updated: @deprecation in the comment section , without an @Deprecation annotation, will throw a warning message. This change adds @Deprecation annotation.

This is an automated email from the ASF dual-hosted git repository.

matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new aece61f  @deprecation in the comment section , without an @Deprecation annotation, will throw a warning message. This change adds @Deprecation annotation.
     new 080d17d  Merge pull request #1364 from BradWalker/netbeans_2817_deprecations
aece61f is described below

commit aece61f199417794c3283ba57fa30a97e9056291
Author: Brad Walker <bw...@musings.com>
AuthorDate: Mon Jul 8 16:58:04 2019 -0600

    @deprecation in the comment section , without an @Deprecation annotation, will
    throw a warning message. This change adds @Deprecation annotation.
---
 .../netbeans/modules/web/api/webmodule/WebModule.java |  1 +
 .../modules/web/spi/webmodule/WebModuleFactory.java   |  1 +
 .../web/spi/webmodule/WebModuleImplementation.java    |  1 +
 .../modules/glassfish/common/ui/IpComboBox.java       | 15 +++++++++------
 .../glassfish/common/ui/JavaPlatformsComboBox.java    | 15 +++++++++------
 .../modules/glassfish/tooling/logging/Logger.java     |  5 +++++
 .../netbeans/modules/payara/common/ui/IpComboBox.java | 15 +++++++++------
 .../modules/payara/tooling/logging/Logger.java        |  5 +++++
 .../src/org/netbeans/jellytools/actions/Action.java   |  3 +++
 .../netbeans/jellytools/actions/ActionNoBlock.java    |  1 +
 .../org/netbeans/jellytools/actions/SaveAction.java   |  2 ++
 .../css/lib/api/properties/UnitGrammarElement.java    |  1 +
 .../org/netbeans/modules/css/live/LiveUpdater.java    |  3 ++-
 .../src/org/netbeans/editor/Formatter.java            |  5 ++++-
 .../src/org/netbeans/editor/ext/ExtFormatter.java     |  2 +-
 .../modules/editor/fold/ui/CodeFoldingSideBar.java    |  6 ++++++
 .../org/netbeans/modules/html/parser/Html5Model.java  |  1 +
 .../org/netbeans/modules/html/parser/Html5Parser.java |  2 ++
 .../org/netbeans/modules/image/ImageDataObject.java   |  1 +
 .../org/netbeans/jellytools/EditorWindowOperator.java |  1 +
 .../src/org/netbeans/lib/terminalemulator/Term.java   |  1 +
 .../src/org/openidex/search/SearchHistory.java        |  7 +++++--
 .../modules/xml/multiview/ui/SectionInnerPanel.java   |  1 +
 .../modules/xml/multiview/ui/SimpleDialogPanel.java   |  2 ++
 .../modules/xml/actions/CheckEntityAction.java        |  1 +
 .../modules/form/actions/InspectorAction.java         |  1 +
 .../completion/VariableCompletionProvider.java        |  1 +
 .../netbeans/api/progress/ProgressHandleFactory.java  |  2 ++
 .../src/org/netbeans/api/progress/ProgressUtils.java  |  8 ++++++++
 .../org/netbeans/api/autoupdate/InstallSupport.java   |  1 +
 .../masterfs/providers/AnnotationProvider.java        |  1 +
 platform/openide.awt/src/org/openide/awt/Actions.java |  1 +
 .../src/org/openide/explorer/ExplorerActions.java     |  2 ++
 .../src/org/openide/explorer/ExplorerPanel.java       |  1 +
 .../src/org/openide/util/HttpServer.java              |  9 +++++++++
 .../src/org/openide/util/WeakListener.java            | 19 +++++++++++++++++++
 .../src/org/openide/filesystems/XMLFileSystem.java    | 11 -----------
 .../explorer/propertysheet/PropertySheetSettings.java | 17 ++++++++++++++---
 .../src/org/openide/options/ContextSystemOption.java  |  1 +
 .../src/org/openide/options/SystemOption.java         |  1 +
 .../src/org/openide/text/PrintSettings.java           |  1 +
 .../src/org/openide/util/NetworkSettings.java         |  1 +
 42 files changed, 139 insertions(+), 37 deletions(-)

diff --git a/enterprise/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/WebModule.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/WebModule.java
index b8555a8..caf76fa 100644
--- a/enterprise/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/WebModule.java
+++ b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/WebModule.java
@@ -181,6 +181,7 @@ public final class WebModule {
      * @return J2EE platform version; never null.
      * @deprecated use {@link #getJ2eeProfile()}
      */
+    @Deprecated
     public String getJ2eePlatformVersion () {
         if (impl2 != null) {
             return impl2.getJ2eeProfile().toPropertiesString();
diff --git a/enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleFactory.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleFactory.java
index 9d7eda5..cb1a358 100644
--- a/enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleFactory.java
+++ b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleFactory.java
@@ -40,6 +40,7 @@ public final class WebModuleFactory {
      * @return an instance of a API web module.
      * @deprecated use {@link #createWebModule(org.netbeans.modules.web.spi.webmodule.WebModuleImplementation2)}
      */
+    @Deprecated
     public static WebModule createWebModule(WebModuleImplementation spiWebmodule) {
         return WebModuleAccessor.getDefault().createWebModule (spiWebmodule);
     }
diff --git a/enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleImplementation.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleImplementation.java
index d0ec99d..8c021ba 100644
--- a/enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleImplementation.java
+++ b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleImplementation.java
@@ -28,6 +28,7 @@ import org.openide.filesystems.FileObject;
  * @see WebModuleFactory
  * @deprecated implement {@link WebModuleImplementation2}
  */
+@Deprecated
 public interface WebModuleImplementation {
 
     /**
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/IpComboBox.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/IpComboBox.java
index b78c7b7..cf029ad 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/IpComboBox.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/IpComboBox.java
@@ -156,12 +156,13 @@ public class IpComboBox extends JComboBox<IpComboBox.InetAddr> {
      * Default {@see JComboBox} constructor is disabled because it's content
      * is retrieved from an array of {@see InetAddr}.
      * <p/>
-     * @deprecated Use {@see #JavaPlatformsComboBox()}
-     *             or {@see #JavaPlatformsComboBox(InetAddr[])} instead.
      * @param comboBoxModel Data model for this combo box.
      * @throws UnsupportedOperationException is thrown any time
      *         this constructor is called.
+     * @deprecated Use {@see #JavaPlatformsComboBox()}
+     *             or {@see #JavaPlatformsComboBox(InetAddr[])} instead.
      */
+    @Deprecated
     public IpComboBox(final ComboBoxModel comboBoxModel)
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException(CONSTRUCTOR_EXCEPTION_MSG);
@@ -171,12 +172,13 @@ public class IpComboBox extends JComboBox<IpComboBox.InetAddr> {
      * Default {@see JComboBox} constructor is disabled because it's content
      * is retrieved from an array of {@see InetAddr}.
      * <p/>
-     * @deprecated Use {@see #JavaPlatformsComboBox()}
-     *             or {@see #JavaPlatformsComboBox(InetAddr[])} instead.
      * @param items An array of objects to insert into the combo box.
      * @throws UnsupportedOperationException is thrown any time
      *         this constructor is called.
+     * @deprecated Use {@see #JavaPlatformsComboBox()}
+     *             or {@see #JavaPlatformsComboBox(InetAddr[])} instead.
      */
+    @Deprecated
     public IpComboBox(final Object items[])
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException(CONSTRUCTOR_EXCEPTION_MSG);
@@ -186,12 +188,13 @@ public class IpComboBox extends JComboBox<IpComboBox.InetAddr> {
      * Default {@see JComboBox} constructor is disabled because it's content
      * is retrieved from an array of {@see InetAddr}.
      * <p/>
-     * @deprecated Use {@see #JavaPlatformsComboBox()}
-     *             or {@see #JavaPlatformsComboBox(InetAddr[])} instead.
      * @param items {@see Vector} of objects to insert into the combo box.
      * @throws UnsupportedOperationException is thrown any time
      *         this constructor is called.
+     * @deprecated Use {@see #JavaPlatformsComboBox()}
+     *             or {@see #JavaPlatformsComboBox(InetAddr[])} instead.
      */
+    @Deprecated
     public IpComboBox(final Vector<?> items)
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException(CONSTRUCTOR_EXCEPTION_MSG);
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaPlatformsComboBox.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaPlatformsComboBox.java
index 26698c7..b045352 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaPlatformsComboBox.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaPlatformsComboBox.java
@@ -167,12 +167,13 @@ public class JavaPlatformsComboBox
      * Default {@see JComboBox} constructor is disabled because it's content
      * is retrieved from an array of {@see JavaPlatform}.
      * <p/>
-     * @deprecated Use {@see #JavaPlatformsComboBox()}
-     *             or {@see #JavaPlatformsComboBox(JavaPlatform[])} instead.
      * @param comboBoxModel Data model for this combo box.
      * @throws UnsupportedOperationException is thrown any time
      *         this constructor is called.
+     * @deprecated Use {@see #JavaPlatformsComboBox()}
+     *             or {@see #JavaPlatformsComboBox(JavaPlatform[])} instead.
      */
+    @Deprecated
     public JavaPlatformsComboBox(final ComboBoxModel comboBoxModel)
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException(CONSTRUCTOR_EXCEPTION_MSG);
@@ -182,12 +183,13 @@ public class JavaPlatformsComboBox
      * Default {@see JComboBox} constructor is disabled because it's content
      * is retrieved from an array of {@see JavaPlatform}.
      * <p/>
-     * @deprecated Use {@see #JavaPlatformsComboBox()}
-     *             or {@see #JavaPlatformsComboBox(JavaPlatform[])} instead.
      * @param items An array of objects to insert into the combo box.
      * @throws UnsupportedOperationException is thrown any time
      *         this constructor is called.
+     * @deprecated Use {@see #JavaPlatformsComboBox()}
+     *             or {@see #JavaPlatformsComboBox(JavaPlatform[])} instead.
      */
+    @Deprecated
     public JavaPlatformsComboBox(final Object items[])
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException(CONSTRUCTOR_EXCEPTION_MSG);
@@ -197,12 +199,13 @@ public class JavaPlatformsComboBox
      * Default {@see JComboBox} constructor is disabled because it's content
      * is retrieved from an array of {@see JavaPlatform}.
      * <p/>
-     * @deprecated Use {@see #JavaPlatformsComboBox()}
-     *             or {@see #JavaPlatformsComboBox(JavaPlatform[])} instead.
      * @param items {@see Vector} of objects to insert into the combo box.
      * @throws UnsupportedOperationException is thrown any time
      *         this constructor is called.
+     * @deprecated Use {@see #JavaPlatformsComboBox()}
+     *             or {@see #JavaPlatformsComboBox(JavaPlatform[])} instead.
      */
+    @Deprecated
     public JavaPlatformsComboBox(final Vector<?> items)
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException(CONSTRUCTOR_EXCEPTION_MSG);
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/logging/Logger.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/logging/Logger.java
index 81532e7..9a1370e 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/logging/Logger.java
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/logging/Logger.java
@@ -60,6 +60,7 @@ public class Logger {
      * @return GlassFish IDE SDK Logger
      * @deprecated  Instantiate Logger class!
      */
+    @Deprecated
     public static java.util.logging.Logger getLogger() {
         return java.util.logging.Logger.getLogger(LOGGER_NAME);
     }
@@ -74,6 +75,7 @@ public class Logger {
      *         logged or <code>false</code> otherwise.
      * @deprecated  Instantiate Logger class!
      */
+    @Deprecated
     public static boolean loggable(Level level) {
         return getLogger().isLoggable(level);
     }
@@ -95,6 +97,7 @@ public class Logger {
      * @param thrown <code>Throwable</code> associated with log message.
      * @deprecated  Instantiate Logger class!
      */
+    @Deprecated
     public static void log(Level level, String msg, Throwable thrown) {
         getLogger().log(level, msg, thrown);
     }
@@ -111,6 +114,7 @@ public class Logger {
      * @param   param	Parameter to the message.
      * @deprecated  Instantiate Logger class!
      */
+    @Deprecated
     public static void log(Level level, String msg, Object param) {
         getLogger().log(level, msg, param);
     }
@@ -127,6 +131,7 @@ public class Logger {
      * @param   params	Array of parameters to the message.
      * @deprecated  Instantiate Logger class!
      */
+    @Deprecated
     public static void log(Level level, String msg, Object params[]) {
         getLogger().log(level, msg, params);
     }
diff --git a/enterprise/payara.common/src/org/netbeans/modules/payara/common/ui/IpComboBox.java b/enterprise/payara.common/src/org/netbeans/modules/payara/common/ui/IpComboBox.java
index 5cb5d84..d413150 100644
--- a/enterprise/payara.common/src/org/netbeans/modules/payara/common/ui/IpComboBox.java
+++ b/enterprise/payara.common/src/org/netbeans/modules/payara/common/ui/IpComboBox.java
@@ -156,12 +156,13 @@ public class IpComboBox extends JComboBox<IpComboBox.InetAddr> {
      * Default {@see JComboBox} constructor is disabled because it's content
      * is retrieved from an array of {@see InetAddr}.
      * <p/>
-     * @deprecated Use {@see #JavaPlatformsComboBox()}
-     *             or {@see #JavaPlatformsComboBox(InetAddr[])} instead.
      * @param comboBoxModel Data model for this combo box.
      * @throws UnsupportedOperationException is thrown any time
      *         this constructor is called.
+     * @deprecated Use {@see #JavaPlatformsComboBox()}
+     *             or {@see #JavaPlatformsComboBox(InetAddr[])} instead.
      */
+    @Deprecated
     public IpComboBox(final ComboBoxModel comboBoxModel)
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException(CONSTRUCTOR_EXCEPTION_MSG);
@@ -171,12 +172,13 @@ public class IpComboBox extends JComboBox<IpComboBox.InetAddr> {
      * Default {@see JComboBox} constructor is disabled because it's content
      * is retrieved from an array of {@see InetAddr}.
      * <p/>
-     * @deprecated Use {@see #JavaPlatformsComboBox()}
-     *             or {@see #JavaPlatformsComboBox(InetAddr[])} instead.
      * @param items An array of objects to insert into the combo box.
      * @throws UnsupportedOperationException is thrown any time
      *         this constructor is called.
+     * @deprecated Use {@see #JavaPlatformsComboBox()}
+     *             or {@see #JavaPlatformsComboBox(InetAddr[])} instead.
      */
+    @Deprecated
     public IpComboBox(final Object items[])
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException(CONSTRUCTOR_EXCEPTION_MSG);
@@ -186,12 +188,13 @@ public class IpComboBox extends JComboBox<IpComboBox.InetAddr> {
      * Default {@see JComboBox} constructor is disabled because it's content
      * is retrieved from an array of {@see InetAddr}.
      * <p/>
-     * @deprecated Use {@see #JavaPlatformsComboBox()}
-     *             or {@see #JavaPlatformsComboBox(InetAddr[])} instead.
      * @param items {@see Vector} of objects to insert into the combo box.
      * @throws UnsupportedOperationException is thrown any time
      *         this constructor is called.
+     * @deprecated Use {@see #JavaPlatformsComboBox()}
+     *             or {@see #JavaPlatformsComboBox(InetAddr[])} instead.
      */
+    @Deprecated
     public IpComboBox(final Vector<?> items)
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException(CONSTRUCTOR_EXCEPTION_MSG);
diff --git a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/logging/Logger.java b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/logging/Logger.java
index 7c75f25..75c6789 100644
--- a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/logging/Logger.java
+++ b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/logging/Logger.java
@@ -60,6 +60,7 @@ public class Logger {
      * @return Payara IDE SDK Logger
      * @deprecated  Instantiate Logger class!
      */
+    @Deprecated
     public static java.util.logging.Logger getLogger() {
         return java.util.logging.Logger.getLogger(LOGGER_NAME);
     }
@@ -74,6 +75,7 @@ public class Logger {
      *         logged or <code>false</code> otherwise.
      * @deprecated  Instantiate Logger class!
      */
+    @Deprecated
     public static boolean loggable(Level level) {
         return getLogger().isLoggable(level);
     }
@@ -95,6 +97,7 @@ public class Logger {
      * @param thrown <code>Throwable</code> associated with log message.
      * @deprecated  Instantiate Logger class!
      */
+    @Deprecated
     public static void log(Level level, String msg, Throwable thrown) {
         getLogger().log(level, msg, thrown);
     }
@@ -111,6 +114,7 @@ public class Logger {
      * @param   param	Parameter to the message.
      * @deprecated  Instantiate Logger class!
      */
+    @Deprecated
     public static void log(Level level, String msg, Object param) {
         getLogger().log(level, msg, param);
     }
@@ -127,6 +131,7 @@ public class Logger {
      * @param   params	Array of parameters to the message.
      * @deprecated  Instantiate Logger class!
      */
+    @Deprecated
     public static void log(Level level, String msg, Object params[]) {
         getLogger().log(level, msg, params);
     }
diff --git a/harness/jellytools.platform/src/org/netbeans/jellytools/actions/Action.java b/harness/jellytools.platform/src/org/netbeans/jellytools/actions/Action.java
index 6f84c13..d766d1f 100644
--- a/harness/jellytools.platform/src/org/netbeans/jellytools/actions/Action.java
+++ b/harness/jellytools.platform/src/org/netbeans/jellytools/actions/Action.java
@@ -227,6 +227,7 @@ public class Action {
      * {@link Action#Action(String menuPath, String popupPath, String systemActionClass, KeyStroke[] keystrokes)}
      * instead.
      */
+    @Deprecated
     public Action(String menuPath, String popupPath, String systemActionClass, Shortcut[] shortcuts) {
         this(menuPath, popupPath, systemActionClass, convertShortcuts(shortcuts));
     }
@@ -257,6 +258,7 @@ public class Action {
      * {@link Action#Action(String menuPath, String popupPath, String systemActionClass, KeyStroke keystroke)}
      * instead.
      */
+    @Deprecated
     public Action(String menuPath, String popupPath, String systemActionClass, Shortcut shortcut) {
         this(menuPath, popupPath, systemActionClass, new Shortcut[]{shortcut});
     }
@@ -1224,6 +1226,7 @@ public class Action {
      *
      * @deprecated Use {@link javax.swing.KeyStroke} instead.
      */
+    @Deprecated
     public static class Shortcut extends Object {
 
         /**
diff --git a/harness/jellytools.platform/src/org/netbeans/jellytools/actions/ActionNoBlock.java b/harness/jellytools.platform/src/org/netbeans/jellytools/actions/ActionNoBlock.java
index 934a124..b4720f7 100644
--- a/harness/jellytools.platform/src/org/netbeans/jellytools/actions/ActionNoBlock.java
+++ b/harness/jellytools.platform/src/org/netbeans/jellytools/actions/ActionNoBlock.java
@@ -81,6 +81,7 @@ public class ActionNoBlock extends Action {
      * {@link ActionNoBlock#ActionNoBlock(String menuPath, String popupPath, KeyStroke[] keystrokes)}
      * instead.
      */
+    @Deprecated
     public ActionNoBlock(String menuPath, String popupPath, Shortcut[] shortcuts) {
         super(menuPath, popupPath, shortcuts);
     }
diff --git a/harness/jellytools.platform/src/org/netbeans/jellytools/actions/SaveAction.java b/harness/jellytools.platform/src/org/netbeans/jellytools/actions/SaveAction.java
index 0e1ef4f..5d4cb67 100644
--- a/harness/jellytools.platform/src/org/netbeans/jellytools/actions/SaveAction.java
+++ b/harness/jellytools.platform/src/org/netbeans/jellytools/actions/SaveAction.java
@@ -55,6 +55,7 @@ public class SaveAction extends Action {
      * @deprecated Save menu item removed from popup on tab. Use TopComponentOperator.save() instead.
      */
     @Override
+    @Deprecated
     public void performPopup(ComponentOperator compOperator) {
         throw new UnsupportedOperationException("Save menu item removed from popup on tab. Use TopComponentOperator.save() instead.");
     }
@@ -65,6 +66,7 @@ public class SaveAction extends Action {
      * @param tco top component operator which should be activated and saved
      * @deprecated Save menu item removed from popup on tab. Use TopComponentOperator.save() instead.
      */
+    @Deprecated
     public void performPopup(TopComponentOperator tco) {
         throw new UnsupportedOperationException("Save menu item removed from popup on tab. Use TopComponentOperator.save() instead.");
     }
diff --git a/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/UnitGrammarElement.java b/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/UnitGrammarElement.java
index 1b9dc3d..e0771d4 100644
--- a/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/UnitGrammarElement.java
+++ b/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/UnitGrammarElement.java
@@ -61,6 +61,7 @@ public class UnitGrammarElement extends ValueGrammarElement {
      * @deprecated
      * @return null if there are no fixed value tokens, or list of the fixed token values
      */
+    @Deprecated
     public Collection<String> getFixedValues() {
         return tokenAcceptor.getFixedImageTokens();
     }
diff --git a/ide/css.model/src/org/netbeans/modules/css/live/LiveUpdater.java b/ide/css.model/src/org/netbeans/modules/css/live/LiveUpdater.java
index af5d7c5..b24ecb1 100644
--- a/ide/css.model/src/org/netbeans/modules/css/live/LiveUpdater.java
+++ b/ide/css.model/src/org/netbeans/modules/css/live/LiveUpdater.java
@@ -26,9 +26,10 @@ import javax.swing.text.Document;
  * Updates given css Document in live webkit browser.
  * Instance to be registered in Lookup.
  * 
- * @deprecated 
  * @author Jan Becicka
+ * @deprecated 
  */
+@Deprecated
 public interface LiveUpdater {
     
     public boolean update(Document file);
diff --git a/ide/editor.deprecated.pre65formatting/src/org/netbeans/editor/Formatter.java b/ide/editor.deprecated.pre65formatting/src/org/netbeans/editor/Formatter.java
index 7422dc6..80bc9c2 100644
--- a/ide/editor.deprecated.pre65formatting/src/org/netbeans/editor/Formatter.java
+++ b/ide/editor.deprecated.pre65formatting/src/org/netbeans/editor/Formatter.java
@@ -56,7 +56,7 @@ import org.openide.util.WeakListeners;
  * @deprecated Please use Editor Indentation API instead, for details see
  *   <a href="@org-netbeans-modules-editor-indent@/overview-summary.html">Editor Indentation</a>.
  */
-
+@Deprecated
 public class Formatter {
 
     private static final Map<Class, Formatter> kitClass2Formatter = new WeakHashMap<Class, Formatter>();
@@ -73,6 +73,7 @@ public class Formatter {
      * @deprecated Use of editor kit's implementation classes is deprecated
      *   in favor of mime types.
      */
+    @Deprecated
     public static synchronized Formatter getFormatter(Class kitClass) {
         String mimeType = KitsTracker.getInstance().findMimeType(kitClass);
         if (mimeType != null) {
@@ -98,6 +99,7 @@ public class Formatter {
      * @deprecated Use Editor Indentation API.
      * @since 1.18
      */
+    @Deprecated
     public static synchronized Formatter getFormatter(String mimeType) {
         MimePath mimePath = MimePath.parse(mimeType);
         Formatter formatter = mimePath2Formatter.get(mimePath);
@@ -128,6 +130,7 @@ public class Formatter {
      * 
      * @deprecated Use Editor Indentation API.
      */
+    @Deprecated
     public static synchronized void setFormatter(Class kitClass, Formatter formatter) {
         String mimeType = KitsTracker.getInstance().findMimeType(kitClass);
         if (mimeType != null) {
diff --git a/ide/editor.deprecated.pre65formatting/src/org/netbeans/editor/ext/ExtFormatter.java b/ide/editor.deprecated.pre65formatting/src/org/netbeans/editor/ext/ExtFormatter.java
index e5acc5d..01ca107 100644
--- a/ide/editor.deprecated.pre65formatting/src/org/netbeans/editor/ext/ExtFormatter.java
+++ b/ide/editor.deprecated.pre65formatting/src/org/netbeans/editor/ext/ExtFormatter.java
@@ -75,7 +75,7 @@ import org.openide.util.WeakListeners;
  * @deprecated Please use Editor Indentation API instead, for details see
  *   <a href="@org-netbeans-modules-editor-indent@/overview-summary.html">Editor Indentation</a>.
  */
-
+@Deprecated
 public class ExtFormatter extends Formatter implements FormatLayer {
 
     /** List holding the format layers */
diff --git a/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/CodeFoldingSideBar.java b/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/CodeFoldingSideBar.java
index 97e9dac..f76f151 100644
--- a/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/CodeFoldingSideBar.java
+++ b/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/CodeFoldingSideBar.java
@@ -107,14 +107,17 @@ public final class CodeFoldingSideBar extends JComponent implements Accessible {
     /** This field should be treated as final. Subclasses are forbidden to change it. 
      * @deprecated Without any replacement.
      */
+    @Deprecated
     protected Color backColor;
     /** This field should be treated as final. Subclasses are forbidden to change it. 
      * @deprecated Without any replacement.
      */
+    @Deprecated
     protected Color foreColor;
     /** This field should be treated as final. Subclasses are forbidden to change it. 
      * @deprecated Without any replacement.
      */
+    @Deprecated
     protected Font font;
     
     /** This field should be treated as final. Subclasses are forbidden to change it. */
@@ -372,6 +375,7 @@ public final class CodeFoldingSideBar extends JComponent implements Accessible {
      * @return The background color used for painting this component.
      * @deprecated Without any replacement.
      */
+    @Deprecated
     protected Color getBackColor() {
         if (backColor == null) {
             updateColors();
@@ -388,6 +392,7 @@ public final class CodeFoldingSideBar extends JComponent implements Accessible {
      * @return The foreground color used for painting this component.
      * @deprecated Without any replacement.
      */
+    @Deprecated
     protected Color getForeColor() {
         if (foreColor == null) {
             updateColors();
@@ -400,6 +405,7 @@ public final class CodeFoldingSideBar extends JComponent implements Accessible {
      * @return The font used for painting this component.
      * @deprecated Without any replacement.
      */
+    @Deprecated
     protected Font getColoringFont() {
         if (font == null) {
             updateColors();
diff --git a/ide/html.parser/src/org/netbeans/modules/html/parser/Html5Model.java b/ide/html.parser/src/org/netbeans/modules/html/parser/Html5Model.java
index a0e57a6..f4bca34 100644
--- a/ide/html.parser/src/org/netbeans/modules/html/parser/Html5Model.java
+++ b/ide/html.parser/src/org/netbeans/modules/html/parser/Html5Model.java
@@ -79,6 +79,7 @@ public final class Html5Model implements HtmlModel, HtmlModelProvider {
      * @deprecated 
      */
     @Override
+    @Deprecated
     public String getModelId() {
         return null;
     }
diff --git a/ide/html.parser/src/org/netbeans/modules/html/parser/Html5Parser.java b/ide/html.parser/src/org/netbeans/modules/html/parser/Html5Parser.java
index f5c7331..24907a4 100644
--- a/ide/html.parser/src/org/netbeans/modules/html/parser/Html5Parser.java
+++ b/ide/html.parser/src/org/netbeans/modules/html/parser/Html5Parser.java
@@ -148,6 +148,7 @@ public class Html5Parser implements HtmlParser {
      * @deprecated 
      */
     @Override
+    @Deprecated
     public HtmlModel getModel(HtmlVersion version) {
         return null;
     }
@@ -156,6 +157,7 @@ public class Html5Parser implements HtmlParser {
      * @deprecated 
      */
     @Override
+    @Deprecated
     public String getName() {
         return null;
     }
diff --git a/ide/image/src/org/netbeans/modules/image/ImageDataObject.java b/ide/image/src/org/netbeans/modules/image/ImageDataObject.java
index 5f8f999..043647e 100644
--- a/ide/image/src/org/netbeans/modules/image/ImageDataObject.java
+++ b/ide/image/src/org/netbeans/modules/image/ImageDataObject.java
@@ -162,6 +162,7 @@ public class ImageDataObject extends MultiDataObject implements CookieSet.Factor
      * @return the image data
      * @deprecated use getImage() instead
      */
+    @Deprecated
     private byte[] getImageData() {
         try {
             FileObject fo = getPrimaryFile();
diff --git a/ide/jellytools.ide/src/org/netbeans/jellytools/EditorWindowOperator.java b/ide/jellytools.ide/src/org/netbeans/jellytools/EditorWindowOperator.java
index 61a11e1..ca3dfa6 100644
--- a/ide/jellytools.ide/src/org/netbeans/jellytools/EditorWindowOperator.java
+++ b/ide/jellytools.ide/src/org/netbeans/jellytools/EditorWindowOperator.java
@@ -66,6 +66,7 @@ public class EditorWindowOperator {
     /** Creates new instance of EditorWindowOperator.
      * @deprecated Use static methods instead.
      */
+    @Deprecated
     public EditorWindowOperator() {
         // useless now because all methods are static
     }
diff --git a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/Term.java b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/Term.java
index 05beb07..a0aac2d 100644
--- a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/Term.java
+++ b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/Term.java
@@ -5220,6 +5220,7 @@ public class Term extends JComponent implements Accessible {
      * @param c
      * @deprecated
      */
+    @Deprecated
     public void setCustomColor(int number, Color c) {
 	if (c == null)
 	    throw new IllegalArgumentException();
diff --git a/ide/o.openidex.util/src/org/openidex/search/SearchHistory.java b/ide/o.openidex.util/src/org/openidex/search/SearchHistory.java
index f757671..4258c51 100644
--- a/ide/o.openidex.util/src/org/openidex/search/SearchHistory.java
+++ b/ide/o.openidex.util/src/org/openidex/search/SearchHistory.java
@@ -66,6 +66,7 @@ public final class SearchHistory {
      *  newValue - new selected pattern
      *  @deprecated just changes in history
      */
+    @Deprecated
     public final static String LAST_SELECTED = "last-selected"; //NOI18N
     
     /** Property name for adding pattern that was not in history
@@ -107,17 +108,19 @@ public final class SearchHistory {
     }
 
     /** 
-     *  @deprecated Use <code>getSearchPatterns().get(0)</code>
      *  @return last selected SearchPattern 
+     *  @deprecated Use <code>getSearchPatterns().get(0)</code>
      */
+    @Deprecated
     public SearchPattern getLastSelected(){
         return searchPatternsList.get(0);
     }
     
     /** Sets last selected SearchPattern 
-     *  @deprecated Use only <code>add(SearchPattern pattern)</code>
      *  @param pattern last selected pattern
+     *  @deprecated Use only <code>add(SearchPattern pattern)</code>
      */
+    @Deprecated
     public void setLastSelected(SearchPattern pattern){
         SearchPattern oldPattern = searchPatternsList.get(0);
         add(pattern);
diff --git a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionInnerPanel.java b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionInnerPanel.java
index 5f40b30..90017cc 100644
--- a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionInnerPanel.java
+++ b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionInnerPanel.java
@@ -669,6 +669,7 @@ public abstract class SectionInnerPanel extends javax.swing.JPanel implements Li
     /** This will be called after model is changed from this panel
      * @deprecated use {@link SectionInnerPanel#endUIChange} instead
      */
+    @Deprecated
     protected void signalUIChange() {
     }
     
diff --git a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SimpleDialogPanel.java b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SimpleDialogPanel.java
index 601466a..e52ec89 100644
--- a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SimpleDialogPanel.java
+++ b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SimpleDialogPanel.java
@@ -268,6 +268,7 @@ public class SimpleDialogPanel extends JPanel {
          * @deprecated Please use DialogDescriptor(String[] labels, boolean includesMnemonics)
          * instead and provide mnemonics directly in labels (via &amp; escape chars)
          */
+        @Deprecated
         public void setMnemonics(char[] mnem) {
             this.mnem=mnem;
         }
@@ -276,6 +277,7 @@ public class SimpleDialogPanel extends JPanel {
          * @deprecated Please use DialogDescriptor(String[] labels, boolean includesMnemonics)
          * instead and provide mnemonics directly in labels (via &amp; escape chars)
          */
+        @Deprecated
         public char[] getMnemonics() {
             return mnem;
         }
diff --git a/ide/xml/src/org/netbeans/modules/xml/actions/CheckEntityAction.java b/ide/xml/src/org/netbeans/modules/xml/actions/CheckEntityAction.java
index 0e6a034..4034df7 100644
--- a/ide/xml/src/org/netbeans/modules/xml/actions/CheckEntityAction.java
+++ b/ide/xml/src/org/netbeans/modules/xml/actions/CheckEntityAction.java
@@ -34,6 +34,7 @@ import org.netbeans.modules.xml.util.Util;
  * @version 1.0
  * @deprecated To be eliminated once a API CheckXMLAction will be introduced
  */
+@Deprecated
 public class CheckEntityAction extends CookieAction implements CollectXMLAction.XMLAction {
 
     /** Serial Version UID */
diff --git a/java/jellytools.java/src/org/netbeans/jellytools/modules/form/actions/InspectorAction.java b/java/jellytools.java/src/org/netbeans/jellytools/modules/form/actions/InspectorAction.java
index 9f3332e..fd8d740 100644
--- a/java/jellytools.java/src/org/netbeans/jellytools/modules/form/actions/InspectorAction.java
+++ b/java/jellytools.java/src/org/netbeans/jellytools/modules/form/actions/InspectorAction.java
@@ -29,6 +29,7 @@ import org.netbeans.jellytools.actions.Action;
  * @author Jiri Skrivanek
  * @deprecated Navigator is used instead of Inspector. Use NavigatorOperator.
  */
+@Deprecated
 public class InspectorAction extends Action {
 
     // Window|Navigator
diff --git a/php/php.api.templates/src/org/netbeans/modules/php/spi/templates/completion/VariableCompletionProvider.java b/php/php.api.templates/src/org/netbeans/modules/php/spi/templates/completion/VariableCompletionProvider.java
index 8058791..5e0bc29 100644
--- a/php/php.api.templates/src/org/netbeans/modules/php/spi/templates/completion/VariableCompletionProvider.java
+++ b/php/php.api.templates/src/org/netbeans/modules/php/spi/templates/completion/VariableCompletionProvider.java
@@ -32,6 +32,7 @@ import org.openide.filesystems.FileObject;
  * @author Ondrej Brejla <ob...@netbeans.org>
  * @deprecated Use {@link CompletionProvider} instead.
  */
+@Deprecated
 public interface VariableCompletionProvider {
 
     /**
diff --git a/platform/api.progress.nb/src/org/netbeans/api/progress/ProgressHandleFactory.java b/platform/api.progress.nb/src/org/netbeans/api/progress/ProgressHandleFactory.java
index 9ba96f8..b8d4a2f 100644
--- a/platform/api.progress.nb/src/org/netbeans/api/progress/ProgressHandleFactory.java
+++ b/platform/api.progress.nb/src/org/netbeans/api/progress/ProgressHandleFactory.java
@@ -45,6 +45,7 @@ public final class ProgressHandleFactory {
      * @return an instance of {@link org.netbeans.api.progress.ProgressHandle}, initialized but not started.
      * @deprecated Use {@link ProgressHandle#createHandle(java.lang.String)}
      */
+    @Deprecated
     public static ProgressHandle createHandle(String displayName) {
         return createHandle(displayName, (Action)null);
     }
@@ -58,6 +59,7 @@ public final class ProgressHandleFactory {
      * @return an instance of {@link org.netbeans.api.progress.ProgressHandle}, initialized but not started.
      * @deprecated Use {@link ProgressHandle#createHandle(java.lang.String, org.openide.util.Cancellable)}.
      */
+    @Deprecated
     public static ProgressHandle createHandle(String displayName, Cancellable allowToCancel) {
         return createHandle(displayName, allowToCancel, null);
     }
diff --git a/platform/api.progress.nb/src/org/netbeans/api/progress/ProgressUtils.java b/platform/api.progress.nb/src/org/netbeans/api/progress/ProgressUtils.java
index c38bfd3..4d7767b 100644
--- a/platform/api.progress.nb/src/org/netbeans/api/progress/ProgressUtils.java
+++ b/platform/api.progress.nb/src/org/netbeans/api/progress/ProgressUtils.java
@@ -63,6 +63,7 @@ public final class ProgressUtils {
      * @param waitForCanceled true if method should wait until canceled task is finished (if it is not finished in 1s ISE is thrown)
      * @deprecated Use {@link BaseProgressUtils}
      */
+    @Deprecated
     public static void runOffEventDispatchThread(Runnable operation, String operationDescr, AtomicBoolean cancelOperation, boolean waitForCanceled) {
         BaseProgressUtils.runOffEventDispatchThread(operation, operationDescr, cancelOperation, waitForCanceled, DISPLAY_WAIT_CURSOR_MS, DISPLAY_DIALOG_MS);
     }
@@ -84,6 +85,7 @@ public final class ProgressUtils {
      * @since 1.19
      * @deprecated Use {@link BaseProgressUtils}
      */
+    @Deprecated
     public static void runOffEventDispatchThread(Runnable operation, String operationDescr, AtomicBoolean cancelOperation, boolean waitForCanceled, int waitCursorAfter, int dialogAfter) {
         BaseProgressUtils.runOffEventDispatchThread(operation, operationDescr, cancelOperation, waitForCanceled, waitCursorAfter, dialogAfter);
     }
@@ -111,6 +113,7 @@ public final class ProgressUtils {
      * @since 1.19
      * @deprecated Use {@link BaseProgressUtils}
      */
+    @Deprecated
     public static void showProgressDialogAndRun(Runnable operation, ProgressHandle progress, boolean includeDetailLabel) {
         BaseProgressUtils.showProgressDialogAndRun(operation, progress, includeDetailLabel);
     }
@@ -138,6 +141,7 @@ public final class ProgressUtils {
      * @since 1.30
      * @deprecated Use {@link BaseProgressUtils}
      */
+    @Deprecated
     public static void runOffEventThreadWithProgressDialog(
             final Runnable operation,
             final String dialogTitle, 
@@ -169,6 +173,7 @@ public final class ProgressUtils {
      * @since 1.30
      * @deprecated Use {@link BaseProgressUtils}
      */
+    @Deprecated
     public static void runOffEventThreadWithCustomDialogContent(
             final Runnable operation,
             final String dialogTitle,
@@ -210,6 +215,7 @@ public final class ProgressUtils {
      * @since 1.19
      * @deprecated use {@link BaseProgressUtils}
      */
+    @Deprecated
     public static <T> T showProgressDialogAndRun(final ProgressRunnable<T> operation, final String displayName, boolean includeDetailLabel) {
         return BaseProgressUtils.showProgressDialogAndRun(operation, displayName, includeDetailLabel);
     }
@@ -231,6 +237,7 @@ public final class ProgressUtils {
      * @since 1.19
      * @deprecated use {@link BaseProgressUtils}
      */
+    @Deprecated
     public static void showProgressDialogAndRun(Runnable operation, String displayName) {
         BaseProgressUtils.showProgressDialogAndRun(operation, displayName);
     }
@@ -252,6 +259,7 @@ public final class ProgressUtils {
      * @return
      * @deprecated use {@link BaseProgressUtils}
      */
+    @Deprecated
     public static <T> Future<T> showProgressDialogAndRunLater (final ProgressRunnable<T> operation, final ProgressHandle handle, boolean includeDetailLabel) {
         return BaseProgressUtils.showProgressDialogAndRunLater(operation, handle, includeDetailLabel);
     }
diff --git a/platform/autoupdate.services/src/org/netbeans/api/autoupdate/InstallSupport.java b/platform/autoupdate.services/src/org/netbeans/api/autoupdate/InstallSupport.java
index 1e63f27..a622975 100644
--- a/platform/autoupdate.services/src/org/netbeans/api/autoupdate/InstallSupport.java
+++ b/platform/autoupdate.services/src/org/netbeans/api/autoupdate/InstallSupport.java
@@ -69,6 +69,7 @@ public final class InstallSupport {
      * @throws org.netbeans.api.autoupdate.OperationException
      * @deprecated Use {@link #doDownload(ProgressHandle, Boolean, boolean)} instead.
      */
+    @Deprecated
     public Validator doDownload(ProgressHandle progress/*or null*/, boolean isGlobal) throws OperationException {
         if (impl.doDownload (progress, isGlobal ? Boolean.TRUE : null, false)) {
             return new Validator ();
diff --git a/platform/masterfs.ui/src/org/netbeans/modules/masterfs/providers/AnnotationProvider.java b/platform/masterfs.ui/src/org/netbeans/modules/masterfs/providers/AnnotationProvider.java
index 4a3cd27..127b453 100644
--- a/platform/masterfs.ui/src/org/netbeans/modules/masterfs/providers/AnnotationProvider.java
+++ b/platform/masterfs.ui/src/org/netbeans/modules/masterfs/providers/AnnotationProvider.java
@@ -45,6 +45,7 @@ public abstract class AnnotationProvider extends BaseAnnotationProvider {
      * @return null or array of actions for these files.
      * @deprecated Will be deleted in the future. Overwrite {@link #findExtrasFor(java.util.Set)}.
      */
+    @Deprecated
     public javax.swing.Action[] actions(Set<? extends FileObject> files) {
         return findExtrasFor(files).lookupAll(javax.swing.Action.class).toArray(new javax.swing.Action[0]);
     }
diff --git a/platform/openide.awt/src/org/openide/awt/Actions.java b/platform/openide.awt/src/org/openide/awt/Actions.java
index cf9c91d..5592ef3 100644
--- a/platform/openide.awt/src/org/openide/awt/Actions.java
+++ b/platform/openide.awt/src/org/openide/awt/Actions.java
@@ -1693,6 +1693,7 @@ public class Actions {
         * @deprecated use {@link #CheckboxMenuItem(javax.swing.Action, boolean)}. 
         * Have your action to implement properly {@link Action#getValue} for {@link Action#SELECTED_KEY}
         */
+        @Deprecated
         public CheckboxMenuItem(BooleanStateAction aAction, boolean useMnemonic) {
             Actions.connect(this, aAction, !useMnemonic);
         }
diff --git a/platform/openide.compat/src/org/openide/explorer/ExplorerActions.java b/platform/openide.compat/src/org/openide/explorer/ExplorerActions.java
index 7bf44f9..1b8b1f7 100644
--- a/platform/openide.compat/src/org/openide/explorer/ExplorerActions.java
+++ b/platform/openide.compat/src/org/openide/explorer/ExplorerActions.java
@@ -61,6 +61,7 @@ import org.openide.util.Exceptions;
  *   for details
  * @author Jan Jancura, Petr Hamernik, Ian Formanek, Jaroslav Tulach
  */
+@Deprecated
 public class ExplorerActions {
     /** actions to work with */
     private static CopyAction copy = null;
@@ -178,6 +179,7 @@ public class ExplorerActions {
      * via reflection (!) from RegistryImpl in core.
      * @deprecated Kill me later; see #18137 for explanation.
      */
+    @Deprecated
     ExplorerManager getAttachedManager() {
         return manager;
     }
diff --git a/platform/openide.compat/src/org/openide/explorer/ExplorerPanel.java b/platform/openide.compat/src/org/openide/explorer/ExplorerPanel.java
index 53e61e5..97e94d1 100644
--- a/platform/openide.compat/src/org/openide/explorer/ExplorerPanel.java
+++ b/platform/openide.compat/src/org/openide/explorer/ExplorerPanel.java
@@ -53,6 +53,7 @@ import javax.swing.Timer;
 *   for details
 * @author Jaroslav Tulach
 */
+@Deprecated
 public class ExplorerPanel extends TopComponent implements ExplorerManager.Provider {
     /** serial version UID */
     static final long serialVersionUID = 5522528786650751459L;
diff --git a/platform/openide.compat/src/org/openide/util/HttpServer.java b/platform/openide.compat/src/org/openide/util/HttpServer.java
index fc9a059..66c72fa 100644
--- a/platform/openide.compat/src/org/openide/util/HttpServer.java
+++ b/platform/openide.compat/src/org/openide/util/HttpServer.java
@@ -34,6 +34,7 @@ import java.net.UnknownHostException;
 * @author Petr Jiricka
 * @deprecated The <code>httpserver</code> module should provide a replacement for this API if necessary.
 */
+@Deprecated
 public abstract class HttpServer {
     /** regular server to be used */
     private static HttpServer.Impl registeredServer = null;
@@ -67,6 +68,7 @@ public abstract class HttpServer {
     * @throws SecurityException if there was already one registered
     * @deprecated As of 2.11 use Lookup instead of registering HTTP server
     */
+    @Deprecated
     public static void registerServer(HttpServer.Impl server)
     throws SecurityException {
         if (registeredServer != null) {
@@ -82,6 +84,7 @@ public abstract class HttpServer {
     * @throws SecurityException if the specified server was not the installed one
     * @deprecated As of 2.11 use Lookup instead of registering and derigistering HTTP server
     */
+    @Deprecated
     public static void deregisterServer(HttpServer.Impl server)
     throws SecurityException {
         if (registeredServer == null) {
@@ -103,6 +106,7 @@ public abstract class HttpServer {
     * @throws UnknownHostException for the usual reasons, or if there is no registered server
     * @deprecated Use {@link org.openide.filesystems.URLMapper} instead.
     */
+    @Deprecated
     public static URL getRepositoryURL(FileObject fo) throws MalformedURLException, UnknownHostException {
         return getServer().getRepositoryURL(fo);
     }
@@ -116,6 +120,7 @@ public abstract class HttpServer {
     * @throws UnknownHostException for the usual reasons, or if there is no registered server
     * @deprecated Assumes repository equals classpath.
     */
+    @Deprecated
     public static URL getRepositoryRoot() throws MalformedURLException, UnknownHostException {
         return getServer().getRepositoryRoot();
     }
@@ -129,6 +134,7 @@ public abstract class HttpServer {
     * @throws UnknownHostException for the usual reasons, or if there is no registered server
     * @deprecated Use {@link org.openide.filesystems.URLMapper} with a URL protocol <code>nbres</code>.
     */
+    @Deprecated
     public static URL getResourceURL(String resourcePath)
     throws MalformedURLException, UnknownHostException {
         return getServer().getResourceURL(resourcePath);
@@ -141,6 +147,7 @@ public abstract class HttpServer {
     * @see HttpServer#getResourceURL
     * @deprecated Use {@link org.openide.filesystems.URLMapper} with a URL protocol <code>nbres</code>.
     */
+    @Deprecated
     public static URL getResourceRoot() throws MalformedURLException, UnknownHostException {
         return getServer().getResourceRoot();
     }
@@ -154,6 +161,7 @@ public abstract class HttpServer {
     *  @return <code>true</code> if access has been granted
     * @deprecated Should be replaced by an API in the <code>httpserver</code> module if still required.
     */
+    @Deprecated
     public static boolean allowAccess(InetAddress addr)
     throws UnknownHostException {
         return getServer().allowAccess(addr);
@@ -173,6 +181,7 @@ public abstract class HttpServer {
     * handler.
     * @deprecated Useful only for {@link HttpServer} which is itself deprecated.
     */
+    @Deprecated
     public interface Impl {
         /** Get the URL for a file object.
         * @param fo the file object
diff --git a/platform/openide.compat/src/org/openide/util/WeakListener.java b/platform/openide.compat/src/org/openide/util/WeakListener.java
index e30a234..12ef4d6 100644
--- a/platform/openide.compat/src/org/openide/util/WeakListener.java
+++ b/platform/openide.compat/src/org/openide/util/WeakListener.java
@@ -41,6 +41,7 @@ import javax.swing.event.*;
  * @deprecated Use {@link org.openide.util.WeakListeners} class.
  * @author Jaroslav Tulach
  */
+@Deprecated
 public abstract class WeakListener implements java.util.EventListener {
     /** weak reference to listener */
     private Reference ref;
@@ -204,6 +205,7 @@ public abstract class WeakListener implements java.util.EventListener {
      * @return a NodeListener delegating to <CODE>l</CODE>.
      * @deprecated Use {@link org.openide.nodes.NodeOp#weakNodeListener} or {@link org.openide.util.WeakListeners#create}
      */
+    @Deprecated
     public static NodeListener node(NodeListener l, Object source) {
         WeakListener.Node wl = new WeakListener.Node(l);
         wl.setSource(source);
@@ -219,6 +221,7 @@ public abstract class WeakListener implements java.util.EventListener {
      * @return a PropertyChangeListener delegating to <CODE>l</CODE>.
      * @deprecated Use {@link org.openide.util.WeakListeners#propertyChange}
      */
+    @Deprecated
     public static PropertyChangeListener propertyChange(PropertyChangeListener l, Object source) {
         WeakListener.PropertyChange wl = new WeakListener.PropertyChange(l);
         wl.setSource(source);
@@ -234,6 +237,7 @@ public abstract class WeakListener implements java.util.EventListener {
      * @return a VetoableChangeListener delegating to <CODE>l</CODE>.
      * @deprecated Use {@link org.openide.util.WeakListeners#vetoableChange}
      */
+    @Deprecated
     public static VetoableChangeListener vetoableChange(VetoableChangeListener l, Object source) {
         WeakListener.VetoableChange wl = new WeakListener.VetoableChange(l);
         wl.setSource(source);
@@ -249,6 +253,7 @@ public abstract class WeakListener implements java.util.EventListener {
      * @return a FileChangeListener delegating to <CODE>l</CODE>.
      * @deprecated Use {@link FileUtil#weakFileChangeListener} or {@link org.openide.util.WeakListeners#create}
      */
+    @Deprecated
     public static FileChangeListener fileChange(FileChangeListener l, Object source) {
         WeakListener.FileChange wl = new WeakListener.FileChange(l);
         wl.setSource(source);
@@ -264,6 +269,7 @@ public abstract class WeakListener implements java.util.EventListener {
      * @return a FileStatusListener delegating to <CODE>l</CODE>.
      * @deprecated Use {@link FileUtil#weakFileStatusListener} or {@link org.openide.util.WeakListeners#create}
      */
+    @Deprecated
     public static FileStatusListener fileStatus(FileStatusListener l, Object source) {
         WeakListener.FileStatus wl = new WeakListener.FileStatus(l);
         wl.setSource(source);
@@ -293,6 +299,7 @@ public abstract class WeakListener implements java.util.EventListener {
      * @return a DocumentListener delegating to <CODE>l</CODE>.
      * @deprecated Use {@link org.openide.util.WeakListeners#document}
      */
+    @Deprecated
     public static DocumentListener document(DocumentListener l, Object source) {
         WeakListener.Document wl = new WeakListener.Document(l);
         wl.setSource(source);
@@ -308,6 +315,7 @@ public abstract class WeakListener implements java.util.EventListener {
      * @return a ChangeListener delegating to <CODE>l</CODE>.
      * @deprecated Use {@link org.openide.util.WeakListeners#change}
      */
+    @Deprecated
     public static ChangeListener change(ChangeListener l, Object source) {
         WeakListener.Change wl = new WeakListener.Change(l);
         wl.setSource(source);
@@ -323,6 +331,7 @@ public abstract class WeakListener implements java.util.EventListener {
      * @return a FocusListener delegating to <CODE>l</CODE>.
      * @deprecated Use {@link org.openide.util.WeakListeners#create}
      */
+    @Deprecated
     public static FocusListener focus(FocusListener l, Object source) {
         WeakListener.Focus wl = new WeakListener.Focus(l);
         wl.setSource(source);
@@ -343,6 +352,7 @@ public abstract class WeakListener implements java.util.EventListener {
      * calls to <CODE>l</CODE>.
      * @deprecated Use {@link org.openide.util.WeakListeners#create}
      */
+    @Deprecated
     public static EventListener create(Class lType, EventListener l, Object source) {
         ProxyListener pl = new ProxyListener(lType, l);
         pl.setSource(source);
@@ -353,6 +363,7 @@ public abstract class WeakListener implements java.util.EventListener {
     /** Weak property change listener
     * @deprecated use appropriate method instead
     */
+    @Deprecated
     public static class PropertyChange extends WeakListener implements PropertyChangeListener {
         /** Constructor.
         * @param l listener to delegate to
@@ -393,6 +404,7 @@ public abstract class WeakListener implements java.util.EventListener {
     /** Weak vetoable change listener
     * @deprecated use appropriate method instead
     */
+    @Deprecated
     public static class VetoableChange extends WeakListener implements VetoableChangeListener {
         /** Constructor.
         * @param l listener to delegate to
@@ -426,6 +438,7 @@ public abstract class WeakListener implements java.util.EventListener {
     /** Weak file change listener.
     * @deprecated use appropriate method instead
     */
+    @Deprecated
     public static class FileChange extends WeakListener implements FileChangeListener {
         /** Constructor.
         * @param l listener to delegate to
@@ -520,6 +533,7 @@ public abstract class WeakListener implements java.util.EventListener {
     /** Weak file status listener.
     * @deprecated use appropriate method instead
     */
+    @Deprecated
     public static class FileStatus extends WeakListener implements FileStatusListener {
         /** Constructor.
         */
@@ -550,6 +564,7 @@ public abstract class WeakListener implements java.util.EventListener {
     /** Weak file system pool listener.
     * @deprecated use appropriate method instead
     */
+    @Deprecated
     public static class Repository extends WeakListener implements RepositoryListener {
         /** Constructor.
         * @param l listener to delegate to
@@ -603,6 +618,7 @@ public abstract class WeakListener implements java.util.EventListener {
     * can be happily unfinaled if desired.
     * @deprecated use appropriate method instead
     */
+    @Deprecated
     public static final class Document extends WeakListener implements DocumentListener {
         /** Constructor.
         * @param l listener to delegate to
@@ -673,6 +689,7 @@ public abstract class WeakListener implements java.util.EventListener {
     * can be happily unfinaled if desired.
     * @deprecated use appropriate method instead
     */
+    @Deprecated
     public static final class Change extends WeakListener implements ChangeListener {
         /** Constructor.
         * @param l listener to delegate to
@@ -706,6 +723,7 @@ public abstract class WeakListener implements java.util.EventListener {
     * can be happily unfinaled if desired.
     * @deprecated use appropriate method instead
     */
+    @Deprecated
     public static final class Node extends WeakListener.PropertyChange implements NodeListener {
         /** Constructor.
         * @param l listener to delegate to
@@ -768,6 +786,7 @@ public abstract class WeakListener implements java.util.EventListener {
     * can be happily unfinaled if desired.
     * @deprecated use appropriate method instead
     */
+    @Deprecated
     public static final class Focus extends WeakListener implements FocusListener {
         /** Constructor.
         * @param l listener to delegate to
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/XMLFileSystem.java b/platform/openide.filesystems/src/org/openide/filesystems/XMLFileSystem.java
index 26b8386..8fb3951 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/XMLFileSystem.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/XMLFileSystem.java
@@ -211,17 +211,6 @@ public final class XMLFileSystem extends AbstractFileSystem {
         }
     }
 
-    /** Constructor. Allows user to provide own capabilities
-    * for this filesystem.
-    * @param cap capabilities for this filesystem
-     * @deprecated Useless.
-    @Deprecated
-    public XMLFileSystem(FileSystemCapability cap) {
-        this();
-        setCapability(cap);
-    }
-    */
-
     /** Getter of url field.
      * @return URL associated with XMLFileSystem or null if no URL was set.
      * In case that definition of XMLFileSystem
diff --git a/platform/openide.options/src/org/openide/explorer/propertysheet/PropertySheetSettings.java b/platform/openide.options/src/org/openide/explorer/propertysheet/PropertySheetSettings.java
index eaf3de6..8ae855f 100644
--- a/platform/openide.options/src/org/openide/explorer/propertysheet/PropertySheetSettings.java
+++ b/platform/openide.options/src/org/openide/explorer/propertysheet/PropertySheetSettings.java
@@ -37,6 +37,7 @@ import javax.swing.UIManager;
 * @author Jan Jancura, Ian Formanek
 * @version 0.11, May 16, 1998
 */
+@Deprecated
 public class PropertySheetSettings extends SystemOption {
     /** generated Serialized Version UID */
     static final long serialVersionUID = -3820718202747868830L;
@@ -69,17 +70,20 @@ public class PropertySheetSettings extends SystemOption {
     * @deprecated Relic of the original property sheet implementation.  Display of properties
     * is handled by the look and feel.
     */
+    @Deprecated
     public void setPropertyPaintingStyle(int style) {
     }
 
     /*
     * Returns mode of showing properties.
-    * @deprecated Relic of the original property sheet implementation.  Display of properties
-    * is handled by the look and feel.
     *
     * @return <CODE>int</CODE> mode of showing properties.
     * @see #setExpert
+    *
+    * @deprecated Relic of the original property sheet implementation.  Display of properties
+    * is handled by the look and feel.
     */
+    @Deprecated
     public int getPropertyPaintingStyle() {
         return -1;
     }
@@ -106,6 +110,7 @@ public class PropertySheetSettings extends SystemOption {
     * @deprecated Relic of the original property sheet implementation.  Display of properties
     * is handled by the look and feel.
     */
+    @Deprecated
     public void setPlastic(boolean plastic) {
     }
 
@@ -114,6 +119,7 @@ public class PropertySheetSettings extends SystemOption {
     * @deprecated Relic of the original property sheet implementation.  Display of properties
     * is handled by the look and feel.
     */
+    @Deprecated
     public boolean getPlastic() {
         return false;
     }
@@ -123,6 +129,7 @@ public class PropertySheetSettings extends SystemOption {
     * @deprecated Relic of the original property sheet implementation.  Display of properties
     * is handled by the look and feel.
     */
+    @Deprecated
     public void setValueColor(Color color) {
     }
 
@@ -138,6 +145,7 @@ public class PropertySheetSettings extends SystemOption {
     * @deprecated Relic of the original property sheet implementation.  Display of properties
     * is handled by the look and feel.
     */
+    @Deprecated
     public void setDisabledPropertyColor(Color color) {
     }
 
@@ -146,6 +154,7 @@ public class PropertySheetSettings extends SystemOption {
     * @deprecated Relic of the original property sheet implementation.  Display of properties
     * is handled by the look and feel.
     */
+    @Deprecated
     public Color getDisabledPropertyColor() {
         return null;
     }
@@ -161,7 +170,9 @@ public class PropertySheetSettings extends SystemOption {
     * Getter method for visibleWritableOnly property. If is true only writable
     * properties are showen in propertysheet.
     * @deprecated Relic of the original property sheet implementation.  The new propertysheet
-     * implementation does not support this kind of filtering of properties.    */
+    * implementation does not support this kind of filtering of properties.
+    */
+    @Deprecated
     public boolean getDisplayWritableOnly() {
         return false;
     }
diff --git a/platform/openide.options/src/org/openide/options/ContextSystemOption.java b/platform/openide.options/src/org/openide/options/ContextSystemOption.java
index 2fa4e15..1085561 100644
--- a/platform/openide.options/src/org/openide/options/ContextSystemOption.java
+++ b/platform/openide.options/src/org/openide/options/ContextSystemOption.java
@@ -50,6 +50,7 @@ public abstract class ContextSystemOption extends SystemOption implements BeanCo
     /** Reference to the bean context describing the structure of this option tree.
      * @deprecated To obtain bean context use {@link #getBeanContextProxy}.
      */
+    @Deprecated
     protected BeanContext beanContext;
 
     /** Default constructor. */
diff --git a/platform/openide.options/src/org/openide/options/SystemOption.java b/platform/openide.options/src/org/openide/options/SystemOption.java
index 53d65a6..546641a 100644
--- a/platform/openide.options/src/org/openide/options/SystemOption.java
+++ b/platform/openide.options/src/org/openide/options/SystemOption.java
@@ -57,6 +57,7 @@ import org.openide.util.Exceptions;
 * @author Jaroslav Tulach
  * @deprecated Use {@link org.openide.util.NbPreferences} instead.
 */
+@Deprecated
 public abstract class SystemOption extends SharedClassObject implements HelpCtx.Provider {
     /** generated Serialized Version UID */
     static final long serialVersionUID = 558589201969066966L;
diff --git a/platform/openide.options/src/org/openide/text/PrintSettings.java b/platform/openide.options/src/org/openide/text/PrintSettings.java
index 6422d6c..460ce7f 100644
--- a/platform/openide.options/src/org/openide/text/PrintSettings.java
+++ b/platform/openide.options/src/org/openide/text/PrintSettings.java
@@ -94,6 +94,7 @@ public final class PrintSettings extends ContextSystemOption {
     }
 
     /** @deprecated Use {@link #getPageFormat(PrinterJob)} instead. */
+    @Deprecated
     public PageFormat getPageFormat() {
         return getPageFormat(PrinterJob.getPrinterJob());
     }
diff --git a/platform/openide.util.ui/src/org/openide/util/NetworkSettings.java b/platform/openide.util.ui/src/org/openide/util/NetworkSettings.java
index cf4370c..6a7a076 100644
--- a/platform/openide.util.ui/src/org/openide/util/NetworkSettings.java
+++ b/platform/openide.util.ui/src/org/openide/util/NetworkSettings.java
@@ -109,6 +109,7 @@ public final class NetworkSettings {
      * @return the key for reading password for Proxy Authentication from the ring or <code>null</code>
      * @deprecated use {@link #getAuthenticationPassword(java.net.URI)} instead
      */
+    @Deprecated
     public static String getKeyForAuthenticationPassword(URI u) {
         ProxyCredentialsProvider provider = Lookup.getDefault().lookup(ProxyCredentialsProvider.class);
         if (provider == null) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists