[Libreoffice-commits] core.git: bean/com qadevOOo/runner qadevOOo/tests ridljar/com wizards/com

[Noel Grandin]

 bean/com/sun/star/comp/beans/ContainerFactory.java         |    5 +----
 bean/com/sun/star/comp/beans/InvalidArgumentException.java |    3 +--
 bean/com/sun/star/comp/beans/OOoBean.java                  |    8 +++-----
 bean/com/sun/star/comp/beans/OfficeConnection.java         |    3 +--
 bean/com/sun/star/comp/beans/OfficeWindow.java             |    3 +--
 qadevOOo/runner/complexlib/MethodThread.java               |    2 +-
 qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java         |    1 -
 ridljar/com/sun/star/uno/Union.java                        |    3 +--
 wizards/com/sun/star/wizards/common/UCB.java               |    4 +---
 9 files changed, 10 insertions(+), 22 deletions(-)

New commits:
commit 757748180971ee9ecb5feb1bb6364844da9992c0
Author: Noel Grandin <noel at peralex.com>
Date:   Wed Nov 12 15:53:15 2014 +0200

    java: rather use @Deprecated annotation
    
    than an empty @deprecated tag
    
    Change-Id: I1646ce1c0c8823ac5be0153aeb8eb2b830e7ebfa
    Reviewed-on: https://gerrit.libreoffice.org/12525
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/bean/com/sun/star/comp/beans/ContainerFactory.java b/bean/com/sun/star/comp/beans/ContainerFactory.java
index d06a082..d7ebfba 100644
--- a/bean/com/sun/star/comp/beans/ContainerFactory.java
+++ b/bean/com/sun/star/comp/beans/ContainerFactory.java
@@ -22,11 +22,8 @@ import java.awt.Container;
 
 /**
  * This interface represents an AWT container factory.
- *
- * @deprecated
- *
  */
-
+ at Deprecated
 public interface ContainerFactory
 {
     /**
diff --git a/bean/com/sun/star/comp/beans/InvalidArgumentException.java b/bean/com/sun/star/comp/beans/InvalidArgumentException.java
index cfb288f..2c15f2d 100644
--- a/bean/com/sun/star/comp/beans/InvalidArgumentException.java
+++ b/bean/com/sun/star/comp/beans/InvalidArgumentException.java
@@ -19,9 +19,8 @@
 package com.sun.star.comp.beans;
 
 /** indicates an invalid argument in a function call.
- *
- * @deprecated
  */
+ at Deprecated
 public class InvalidArgumentException extends Exception
 {
 }
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java
index 04abd76..ddf20b2 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -82,8 +82,8 @@ public class OOoBean
 
     // @requirement FUNC.PER/0.2
     /** @internal
-     *  @deprecated
      */
+    @Deprecated
     public void writeExternal( java.io.ObjectOutput aObjOut )
     {
         // TBD
@@ -91,8 +91,8 @@ public class OOoBean
 
     // @requirement FUNC.PER/0.2
     /** @internal
-     *  @deprecated
      */
+    @Deprecated
     public void readExternal( java.io.ObjectInput aObjIn )
     {
         // TBD
@@ -1312,9 +1312,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
         setLayout(new java.awt.BorderLayout());
     }
 
-    /**
-        @deprecated
-     */
+    @Deprecated
     @Override
     public void paint( java.awt.Graphics aGraphics )
     {
diff --git a/bean/com/sun/star/comp/beans/OfficeConnection.java b/bean/com/sun/star/comp/beans/OfficeConnection.java
index 2786810..a2960d9 100644
--- a/bean/com/sun/star/comp/beans/OfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/OfficeConnection.java
@@ -26,9 +26,8 @@ import com.sun.star.uno.XComponentContext;
 /**
  * This abstract class represents a connection to the office
  * application.
-
-    @deprecated
  */
+ at Deprecated
 public interface OfficeConnection
     extends XComponent
 {
diff --git a/bean/com/sun/star/comp/beans/OfficeWindow.java b/bean/com/sun/star/comp/beans/OfficeWindow.java
index 599bf02..a28489e 100644
--- a/bean/com/sun/star/comp/beans/OfficeWindow.java
+++ b/bean/com/sun/star/comp/beans/OfficeWindow.java
@@ -26,9 +26,8 @@ import com.sun.star.awt.XWindowPeer;
  * The concrete implementation of the OfficeWindow extends an
  * appropriate type of visual component (java.awt.Canvas for local
  * and java.awt.Container for remote).
-
-    @deprecated
  */
+ at Deprecated
 public interface OfficeWindow
 {
     /**
diff --git a/qadevOOo/runner/complexlib/MethodThread.java b/qadevOOo/runner/complexlib/MethodThread.java
index b6f1b81..11bdcb6 100644
--- a/qadevOOo/runner/complexlib/MethodThread.java
+++ b/qadevOOo/runner/complexlib/MethodThread.java
@@ -114,8 +114,8 @@ public class MethodThread extends Thread
 
     /**
      * Stop the running method.
-     * @deprecated
      */
+    @Deprecated
     @Override
     public void destroy()
     {
diff --git a/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java b/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java
index 4b52450..9409cf3 100644
--- a/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java
+++ b/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java
@@ -49,7 +49,6 @@ public class _XTasksSupplier extends MultiMethodTest {
     /**
     * DEPRECATED. <p>
     * Has <b> OK </b> status.
-    * @deprecated
     */
     @Deprecated
     public void _getTasks() {
diff --git a/ridljar/com/sun/star/uno/Union.java b/ridljar/com/sun/star/uno/Union.java
index 8808095..4c7da7b 100644
--- a/ridljar/com/sun/star/uno/Union.java
+++ b/ridljar/com/sun/star/uno/Union.java
@@ -20,9 +20,8 @@ package com.sun.star.uno;
 
 /**
  * Deprecated, UNOIDL does not have a union concept.
- *
- * @deprecated
  */
+ at Deprecated
 public class Union {
     /**
      * Get the value in the union.
diff --git a/wizards/com/sun/star/wizards/common/UCB.java b/wizards/com/sun/star/wizards/common/UCB.java
index 717ba77..7e61291 100644
--- a/wizards/com/sun/star/wizards/common/UCB.java
+++ b/wizards/com/sun/star/wizards/common/UCB.java
@@ -101,9 +101,7 @@ public class UCB
         executeCommand(ucb, "globalTransfer", copyArg(sourceDir,filename, targetDir,targetName));
     }
 
-    /**
-     * @deprecated
-     */
+    @Deprecated
     public void copy(String sourceDir, String filename, String targetDir) throws Exception
     {
         copy(sourceDir,filename, targetDir, PropertyNames.EMPTY_STRING);