summaryrefslogtreecommitdiff
path: root/ridljar
diff options
context:
space:
mode:
authorTomoyuki Kubota <himajin100000@gmail.com>2019-05-24 19:24:10 +0900
committerMichael Stahl <Michael.Stahl@cib.de>2019-05-27 11:40:35 +0200
commit51f1e62e2dae37746d218a187d4b0158296ad155 (patch)
tree705fea877bb0dd7a9e3982370a7234a00e3ebe1f /ridljar
parent9d18bc40416b651340804f44ba5fae65f3bbbcfa (diff)
@deprecated should be with @Deprecated
Without this patch, warnings will be given when LibreOffice is built with JDK9 or later. Change-Id: I7aa6e99ace2377fbdb7dd732949ce10d9bd9df58 Reviewed-on: https://gerrit.libreoffice.org/72947 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'ridljar')
-rw-r--r--ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java1
-rw-r--r--ridljar/com/sun/star/uno/Any.java1
-rw-r--r--ridljar/com/sun/star/uno/IBridge.java1
-rw-r--r--ridljar/com/sun/star/uno/IEnvironment.java1
-rw-r--r--ridljar/com/sun/star/uno/IMapping.java1
-rw-r--r--ridljar/com/sun/star/uno/UnoRuntime.java9
6 files changed, 14 insertions, 0 deletions
diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java b/ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java
index f94008d50e1a..2676718cf9fb 100644
--- a/ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java
+++ b/ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java
@@ -20,6 +20,7 @@ package com.sun.star.lib.uno.typeinfo;
/**
@deprecated <code>UNOTYPEINFO</code> for constants is not needed
*/
+@Deprecated
public class ConstantTypeInfo extends TypeInfo
{
public ConstantTypeInfo(String name, int flags)
diff --git a/ridljar/com/sun/star/uno/Any.java b/ridljar/com/sun/star/uno/Any.java
index 8da2bfbcef00..2f4976436d45 100644
--- a/ridljar/com/sun/star/uno/Any.java
+++ b/ridljar/com/sun/star/uno/Any.java
@@ -57,6 +57,7 @@ public class Any {
* @param object the data of the any.
* @deprecated as of UDK 2.0
*/
+ @Deprecated
public Any(Class<?> zInterface, Object object) {
this(new Type(zInterface), object);
}
diff --git a/ridljar/com/sun/star/uno/IBridge.java b/ridljar/com/sun/star/uno/IBridge.java
index 26fe58015daa..51babcdfc101 100644
--- a/ridljar/com/sun/star/uno/IBridge.java
+++ b/ridljar/com/sun/star/uno/IBridge.java
@@ -33,6 +33,7 @@ import java.io.IOException;
* @deprecated As of UDK 3.2, this interface is deprecated, without offering a
* replacement.
*/
+@Deprecated
public interface IBridge {
/**
* Maps an object from the source environment to the destination
diff --git a/ridljar/com/sun/star/uno/IEnvironment.java b/ridljar/com/sun/star/uno/IEnvironment.java
index dc963414ef58..5d32893052ae 100644
--- a/ridljar/com/sun/star/uno/IEnvironment.java
+++ b/ridljar/com/sun/star/uno/IEnvironment.java
@@ -31,6 +31,7 @@ package com.sun.star.uno;
* @deprecated As of UDK 3.2, this interface is deprecated, without offering a
* replacement.
*/
+@Deprecated
public interface IEnvironment {
/**
* Gets the context of this environment.
diff --git a/ridljar/com/sun/star/uno/IMapping.java b/ridljar/com/sun/star/uno/IMapping.java
index 08c6288bcf3b..fdf6d8207f46 100644
--- a/ridljar/com/sun/star/uno/IMapping.java
+++ b/ridljar/com/sun/star/uno/IMapping.java
@@ -28,6 +28,7 @@ package com.sun.star.uno;
* @deprecated As of UDK 3.2, this interface is deprecated, without offering a
* replacement.
*/
+@Deprecated
public interface IMapping {
/**
* Maps an interface from one environment to another.
diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java b/ridljar/com/sun/star/uno/UnoRuntime.java
index 9707157e64fe..9bd3528a69b5 100644
--- a/ridljar/com/sun/star/uno/UnoRuntime.java
+++ b/ridljar/com/sun/star/uno/UnoRuntime.java
@@ -54,6 +54,7 @@ public class UnoRuntime {
* Also, this class might be changed to become <code>final</code> in a
* future version.
*/
+ @Deprecated
public UnoRuntime() {}
/**
@@ -422,6 +423,7 @@ public class UnoRuntime {
* @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without
* offering a replacement.
*/
+ @Deprecated
public static IEnvironment getEnvironment(String name, Object context)
throws java.lang.Exception
{
@@ -465,6 +467,7 @@ public class UnoRuntime {
* @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without
* offering a replacement.
*/
+ @Deprecated
public static IBridge getBridge(
IEnvironment from, IEnvironment to, Object[] args)
throws java.lang.Exception
@@ -523,6 +526,7 @@ public class UnoRuntime {
* @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without
* offering a replacement.
*/
+ @Deprecated
public static IBridge getBridgeByName(
String from, Object fromContext, String to, Object toContext,
Object[] args) throws java.lang.Exception
@@ -541,6 +545,7 @@ public class UnoRuntime {
* @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without
* offering a replacement.
*/
+ @Deprecated
public static IBridge[] getBridges() {
ArrayList<Object> l = new ArrayList<Object>();
synchronized (bridges) {
@@ -572,6 +577,7 @@ public class UnoRuntime {
* @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without
* offering a replacement.
*/
+ @Deprecated
public static IMapping getMapping(IEnvironment from, IEnvironment to)
throws java.lang.Exception
{
@@ -603,6 +609,7 @@ public class UnoRuntime {
* @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without
* offering a replacement.
*/
+ @Deprecated
public static IMapping getMappingByName(String from, String to)
throws java.lang.Exception
{
@@ -621,6 +628,7 @@ public class UnoRuntime {
* @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without
* offering a replacement.
*/
+ @Deprecated
public static boolean reset() {
synchronized (bridges) {
for (Iterator<java.lang.ref.WeakReference<IBridge>> i = bridges.values().iterator(); i.hasNext();) {
@@ -651,6 +659,7 @@ public class UnoRuntime {
/**
* @deprecated As of UDK&nbsp;3.2.0, do not use this internal field.
*/
+ @Deprecated
public static final boolean DEBUG = false;
private static final class BridgeTurner implements IBridge {