From 51f1e62e2dae37746d218a187d4b0158296ad155 Mon Sep 17 00:00:00 2001 From: Tomoyuki Kubota Date: Fri, 24 May 2019 19:24:10 +0900 Subject: @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 --- bean/com/sun/star/comp/beans/NativeConnection.java | 1 + bean/com/sun/star/comp/beans/NativeService.java | 1 + bean/com/sun/star/comp/beans/OOoBean.java | 15 +++++++++++++++ .../com/sun/star/comp/helper/SharedLibraryLoader.java | 1 + jurt/com/sun/star/comp/loader/FactoryHelper.java | 1 + .../lib/uno/bridges/java_remote/java_remote_bridge.java | 1 + jurt/com/sun/star/uno/Ascii.java | 2 ++ jurt/com/sun/star/uno/AsciiString.java | 2 ++ jurt/com/sun/star/uno/MappingException.java | 1 + qadevOOo/runner/lib/DynamicClassLoader.java | 1 + .../com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java | 1 + ridljar/com/sun/star/uno/Any.java | 1 + ridljar/com/sun/star/uno/IBridge.java | 1 + ridljar/com/sun/star/uno/IEnvironment.java | 1 + ridljar/com/sun/star/uno/IMapping.java | 1 + ridljar/com/sun/star/uno/UnoRuntime.java | 9 +++++++++ svl/qa/complex/ConfigItems/CheckConfigItems.java | 1 + 17 files changed, 41 insertions(+) diff --git a/bean/com/sun/star/comp/beans/NativeConnection.java b/bean/com/sun/star/comp/beans/NativeConnection.java index eebae5d40609..dd253134efb8 100644 --- a/bean/com/sun/star/comp/beans/NativeConnection.java +++ b/bean/com/sun/star/comp/beans/NativeConnection.java @@ -24,6 +24,7 @@ import com.sun.star.connection.XConnection; * * @deprecated. */ +@Deprecated class NativeConnection implements XConnection { diff --git a/bean/com/sun/star/comp/beans/NativeService.java b/bean/com/sun/star/comp/beans/NativeService.java index 9df62f072976..c1e8282964a7 100644 --- a/bean/com/sun/star/comp/beans/NativeService.java +++ b/bean/com/sun/star/comp/beans/NativeService.java @@ -21,6 +21,7 @@ package com.sun.star.comp.beans; /* * @deprecated */ + @Deprecated interface NativeService { String getIdentifier(); void startupService() throws java.io.IOException; diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java index 606b627abf77..345d5614c266 100644 --- a/bean/com/sun/star/comp/beans/OOoBean.java +++ b/bean/com/sun/star/comp/beans/OOoBean.java @@ -119,6 +119,7 @@ public class OOoBean the dispose method of the OfficeConnection or the OOoBean's stopOOoConnection method would make all instances of OOoBean stop working. */ + @Deprecated public OOoBean( OfficeConnection iConnection ) throws NoConnectionException { @@ -212,6 +213,7 @@ public class OOoBean make is method work. It is better to call OOoBean's methods and be prepared to catch a NoConnectionException. */ + @Deprecated public boolean isOOoConnected() { return iConnection != null; @@ -353,6 +355,7 @@ public class OOoBean should call the clearDocument of the deriving class or {@link #clear} which discards the currently displayed document. */ + @Deprecated public synchronized void clearDocument( boolean bClearStateToo ) { // TBD @@ -488,6 +491,7 @@ public class OOoBean office window is called, then the actions are performed for which this method needed to be called previously. */ + @Deprecated public synchronized void releaseSystemWindow() throws SystemWindowException, @@ -1024,6 +1028,7 @@ com.sun.star.frame.XLayoutManager xLayoutManager = xLayoutManager.showElement("private:resource/menubar/menubar"); */ + @Deprecated public void setAllBarsVisible( boolean bVisible ) { bIgnoreVisibility = true; @@ -1041,6 +1046,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); which can be obtained from a frame, to control toolbars. See also {@link #setAllBarsVisible setAllBarsVisible}. */ + @Deprecated protected void applyToolVisibilities() { bIgnoreVisibility = true; @@ -1061,6 +1067,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); which can be obtained from a frame, to control toolbars. See also {@link #setAllBarsVisible}. */ + @Deprecated protected boolean setToolVisible( String aProperty, String aResourceURL, boolean bOldValue, boolean bNewValue ) @@ -1127,6 +1134,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); which can be obtained from a frame, to control toolbars. See also {@link #setAllBarsVisible}. */ + @Deprecated public void setMenuBarVisible(boolean bVisible) { try @@ -1154,6 +1162,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); which can be obtained from a frame, to control toolbars. See also {@link #setAllBarsVisible}. */ + @Deprecated public boolean isMenuBarVisible() { return bMenuBarVisible; @@ -1175,6 +1184,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); which can be obtained from a frame, to control toolbars. See also {@link #setAllBarsVisible}. */ + @Deprecated public void setStandardBarVisible(boolean bVisible) { try @@ -1202,6 +1212,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); which can be obtained from a frame, to control toolbars. See also {@link #setAllBarsVisible}. */ + @Deprecated public boolean isStandardBarVisible() { return bStandardBarVisible; @@ -1223,6 +1234,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); which can be obtained from a frame, to control toolbars. See also {@link #setAllBarsVisible}. */ + @Deprecated public void setToolBarVisible(boolean bVisible) { try @@ -1250,6 +1262,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); which can be obtained from a frame, to control toolbars. See also {@link #setAllBarsVisible}. */ + @Deprecated public boolean isToolBarVisible() { return bToolBarVisible; @@ -1271,6 +1284,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); which can be obtained from a frame, to control toolbars. See also {@link #setAllBarsVisible}. */ + @Deprecated public void setStatusBarVisible(boolean bVisible) { try @@ -1298,6 +1312,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); which can be obtained from a frame, to control toolbars. See also {@link #setAllBarsVisible}. */ + @Deprecated public boolean isStatusBarVisible() { return bStatusBarVisible; diff --git a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java index 3c5bff7c4e7b..035644efa0b8 100644 --- a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java +++ b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java @@ -34,6 +34,7 @@ import com.sun.star.registry.XRegistryKey; * * @see com.sun.star.loader.SharedLibrary */ +@Deprecated public class SharedLibraryLoader { /** * The default library which contains the SharedLibraryLoader component diff --git a/jurt/com/sun/star/comp/loader/FactoryHelper.java b/jurt/com/sun/star/comp/loader/FactoryHelper.java index d6e28435d9b5..fe56f594f2bd 100644 --- a/jurt/com/sun/star/comp/loader/FactoryHelper.java +++ b/jurt/com/sun/star/comp/loader/FactoryHelper.java @@ -385,6 +385,7 @@ public class FactoryHelper { * @see com.sun.star.lang.XServiceInfo * @deprecated as of UDK 1.0 */ + @Deprecated public static XSingleServiceFactory getServiceFactory(Class implClass, XMultiServiceFactory multiFactory, XRegistryKey regKey) diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java index 56fc0b4c905e..392e031e3063 100644 --- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java +++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java @@ -360,6 +360,7 @@ public class java_remote_bridge * * @deprecated as of UDK 1.0 */ + @Deprecated public java_remote_bridge(Object args[]) throws Exception { this(UnoRuntime.getEnvironment("java", null), UnoRuntime.getEnvironment("remote", null), args); } diff --git a/jurt/com/sun/star/uno/Ascii.java b/jurt/com/sun/star/uno/Ascii.java index 65a930a36347..ce510889351a 100644 --- a/jurt/com/sun/star/uno/Ascii.java +++ b/jurt/com/sun/star/uno/Ascii.java @@ -24,6 +24,7 @@ package com.sun.star.uno; * * @deprecated do not use. */ +@Deprecated public final class Ascii { public final char ascii; @@ -33,6 +34,7 @@ public final class Ascii { * @deprecated do not use. * @param c the char value. */ + @Deprecated public Ascii(char c) { ascii = c; } diff --git a/jurt/com/sun/star/uno/AsciiString.java b/jurt/com/sun/star/uno/AsciiString.java index eb06c7fe53fd..8b744c5a2213 100644 --- a/jurt/com/sun/star/uno/AsciiString.java +++ b/jurt/com/sun/star/uno/AsciiString.java @@ -24,6 +24,7 @@ package com.sun.star.uno; * * @deprecated do not use. */ +@Deprecated public final class AsciiString { public final String asciistring; @@ -33,6 +34,7 @@ public final class AsciiString { * @deprecated do not use. * @param s the String value. */ + @Deprecated public AsciiString(String s) { asciistring = s; } diff --git a/jurt/com/sun/star/uno/MappingException.java b/jurt/com/sun/star/uno/MappingException.java index b386e4512c70..7670a790ad93 100644 --- a/jurt/com/sun/star/uno/MappingException.java +++ b/jurt/com/sun/star/uno/MappingException.java @@ -31,6 +31,7 @@ package com.sun.star.uno; * * @deprecated since UDK 3.0.2 */ +@Deprecated public class MappingException extends com.sun.star.uno.RuntimeException { /** * Constructs an empty MappingException. diff --git a/qadevOOo/runner/lib/DynamicClassLoader.java b/qadevOOo/runner/lib/DynamicClassLoader.java index 19c536a4ff9c..5622221fb574 100644 --- a/qadevOOo/runner/lib/DynamicClassLoader.java +++ b/qadevOOo/runner/lib/DynamicClassLoader.java @@ -23,6 +23,7 @@ import java.lang.reflect.Constructor; /** * @deprecated: moved to util package. */ +@Deprecated public class DynamicClassLoader { /** 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 UNOTYPEINFO 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 final in a * future version. */ + @Deprecated public UnoRuntime() {} /** @@ -422,6 +423,7 @@ public class UnoRuntime { * @deprecated As of UDK 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 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 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 3.2.0, this method is deprecated, without * offering a replacement. */ + @Deprecated public static IBridge[] getBridges() { ArrayList l = new ArrayList(); synchronized (bridges) { @@ -572,6 +577,7 @@ public class UnoRuntime { * @deprecated As of UDK 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 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 3.2.0, this method is deprecated, without * offering a replacement. */ + @Deprecated public static boolean reset() { synchronized (bridges) { for (Iterator> i = bridges.values().iterator(); i.hasNext();) { @@ -651,6 +659,7 @@ public class UnoRuntime { /** * @deprecated As of UDK 3.2.0, do not use this internal field. */ + @Deprecated public static final boolean DEBUG = false; private static final class BridgeTurner implements IBridge { diff --git a/svl/qa/complex/ConfigItems/CheckConfigItems.java b/svl/qa/complex/ConfigItems/CheckConfigItems.java index c7fb641a83b1..6503505f3a88 100644 --- a/svl/qa/complex/ConfigItems/CheckConfigItems.java +++ b/svl/qa/complex/ConfigItems/CheckConfigItems.java @@ -35,6 +35,7 @@ import org.openoffice.test.OfficeConnection; /** @short todo document me * @deprecated this tests seems no longer work as expected. */ +@Deprecated public class CheckConfigItems { -- cgit v1.2.3