Kaydet (Commit) 51f1e62e authored tarafından Tomoyuki Kubota's avatar Tomoyuki Kubota Kaydeden (comit) Michael Stahl

@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: 's avatarMichael Stahl <Michael.Stahl@cib.de>
üst 9d18bc40
...@@ -24,6 +24,7 @@ import com.sun.star.connection.XConnection; ...@@ -24,6 +24,7 @@ import com.sun.star.connection.XConnection;
* *
* @deprecated. * @deprecated.
*/ */
@Deprecated
class NativeConnection class NativeConnection
implements XConnection implements XConnection
{ {
......
...@@ -21,6 +21,7 @@ package com.sun.star.comp.beans; ...@@ -21,6 +21,7 @@ package com.sun.star.comp.beans;
/* /*
* @deprecated * @deprecated
*/ */
@Deprecated
interface NativeService { interface NativeService {
String getIdentifier(); String getIdentifier();
void startupService() throws java.io.IOException; void startupService() throws java.io.IOException;
......
...@@ -119,6 +119,7 @@ public class OOoBean ...@@ -119,6 +119,7 @@ public class OOoBean
the dispose method of the OfficeConnection or the OOoBean's stopOOoConnection the dispose method of the OfficeConnection or the OOoBean's stopOOoConnection
method would make all instances of OOoBean stop working. method would make all instances of OOoBean stop working.
*/ */
@Deprecated
public OOoBean( OfficeConnection iConnection ) public OOoBean( OfficeConnection iConnection )
throws NoConnectionException throws NoConnectionException
{ {
...@@ -212,6 +213,7 @@ public class OOoBean ...@@ -212,6 +213,7 @@ public class OOoBean
make is method work. It is better to call OOoBean's methods and be prepared make is method work. It is better to call OOoBean's methods and be prepared
to catch a NoConnectionException. to catch a NoConnectionException.
*/ */
@Deprecated
public boolean isOOoConnected() public boolean isOOoConnected()
{ {
return iConnection != null; return iConnection != null;
...@@ -353,6 +355,7 @@ public class OOoBean ...@@ -353,6 +355,7 @@ public class OOoBean
should call the clearDocument of the deriving class or {@link #clear} which discards should call the clearDocument of the deriving class or {@link #clear} which discards
the currently displayed document. the currently displayed document.
*/ */
@Deprecated
public synchronized void clearDocument( boolean bClearStateToo ) public synchronized void clearDocument( boolean bClearStateToo )
{ {
// TBD // TBD
...@@ -488,6 +491,7 @@ public class OOoBean ...@@ -488,6 +491,7 @@ public class OOoBean
office window is called, then the actions are performed for which this method office window is called, then the actions are performed for which this method
needed to be called previously. needed to be called previously.
*/ */
@Deprecated
public synchronized void releaseSystemWindow() public synchronized void releaseSystemWindow()
throws throws
SystemWindowException, SystemWindowException,
...@@ -1024,6 +1028,7 @@ com.sun.star.frame.XLayoutManager xLayoutManager = ...@@ -1024,6 +1028,7 @@ com.sun.star.frame.XLayoutManager xLayoutManager =
xLayoutManager.showElement("private:resource/menubar/menubar"); xLayoutManager.showElement("private:resource/menubar/menubar");
</pre> </pre>
*/ */
@Deprecated
public void setAllBarsVisible( boolean bVisible ) public void setAllBarsVisible( boolean bVisible )
{ {
bIgnoreVisibility = true; bIgnoreVisibility = true;
...@@ -1041,6 +1046,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); ...@@ -1041,6 +1046,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
which can be obtained from a frame, to control toolbars. See also which can be obtained from a frame, to control toolbars. See also
{@link #setAllBarsVisible setAllBarsVisible}. {@link #setAllBarsVisible setAllBarsVisible}.
*/ */
@Deprecated
protected void applyToolVisibilities() protected void applyToolVisibilities()
{ {
bIgnoreVisibility = true; bIgnoreVisibility = true;
...@@ -1061,6 +1067,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); ...@@ -1061,6 +1067,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
which can be obtained from a frame, to control toolbars. See also which can be obtained from a frame, to control toolbars. See also
{@link #setAllBarsVisible}. {@link #setAllBarsVisible}.
*/ */
@Deprecated
protected boolean setToolVisible( String aProperty, String aResourceURL, protected boolean setToolVisible( String aProperty, String aResourceURL,
boolean bOldValue, boolean bNewValue ) boolean bOldValue, boolean bNewValue )
...@@ -1127,6 +1134,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); ...@@ -1127,6 +1134,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
which can be obtained from a frame, to control toolbars. See also which can be obtained from a frame, to control toolbars. See also
{@link #setAllBarsVisible}. {@link #setAllBarsVisible}.
*/ */
@Deprecated
public void setMenuBarVisible(boolean bVisible) public void setMenuBarVisible(boolean bVisible)
{ {
try try
...@@ -1154,6 +1162,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); ...@@ -1154,6 +1162,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
which can be obtained from a frame, to control toolbars. See also which can be obtained from a frame, to control toolbars. See also
{@link #setAllBarsVisible}. {@link #setAllBarsVisible}.
*/ */
@Deprecated
public boolean isMenuBarVisible() public boolean isMenuBarVisible()
{ {
return bMenuBarVisible; return bMenuBarVisible;
...@@ -1175,6 +1184,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); ...@@ -1175,6 +1184,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
which can be obtained from a frame, to control toolbars. See also which can be obtained from a frame, to control toolbars. See also
{@link #setAllBarsVisible}. {@link #setAllBarsVisible}.
*/ */
@Deprecated
public void setStandardBarVisible(boolean bVisible) public void setStandardBarVisible(boolean bVisible)
{ {
try try
...@@ -1202,6 +1212,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); ...@@ -1202,6 +1212,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
which can be obtained from a frame, to control toolbars. See also which can be obtained from a frame, to control toolbars. See also
{@link #setAllBarsVisible}. {@link #setAllBarsVisible}.
*/ */
@Deprecated
public boolean isStandardBarVisible() public boolean isStandardBarVisible()
{ {
return bStandardBarVisible; return bStandardBarVisible;
...@@ -1223,6 +1234,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); ...@@ -1223,6 +1234,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
which can be obtained from a frame, to control toolbars. See also which can be obtained from a frame, to control toolbars. See also
{@link #setAllBarsVisible}. {@link #setAllBarsVisible}.
*/ */
@Deprecated
public void setToolBarVisible(boolean bVisible) public void setToolBarVisible(boolean bVisible)
{ {
try try
...@@ -1250,6 +1262,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); ...@@ -1250,6 +1262,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
which can be obtained from a frame, to control toolbars. See also which can be obtained from a frame, to control toolbars. See also
{@link #setAllBarsVisible}. {@link #setAllBarsVisible}.
*/ */
@Deprecated
public boolean isToolBarVisible() public boolean isToolBarVisible()
{ {
return bToolBarVisible; return bToolBarVisible;
...@@ -1271,6 +1284,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); ...@@ -1271,6 +1284,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
which can be obtained from a frame, to control toolbars. See also which can be obtained from a frame, to control toolbars. See also
{@link #setAllBarsVisible}. {@link #setAllBarsVisible}.
*/ */
@Deprecated
public void setStatusBarVisible(boolean bVisible) public void setStatusBarVisible(boolean bVisible)
{ {
try try
...@@ -1298,6 +1312,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); ...@@ -1298,6 +1312,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
which can be obtained from a frame, to control toolbars. See also which can be obtained from a frame, to control toolbars. See also
{@link #setAllBarsVisible}. {@link #setAllBarsVisible}.
*/ */
@Deprecated
public boolean isStatusBarVisible() public boolean isStatusBarVisible()
{ {
return bStatusBarVisible; return bStatusBarVisible;
......
...@@ -34,6 +34,7 @@ import com.sun.star.registry.XRegistryKey; ...@@ -34,6 +34,7 @@ import com.sun.star.registry.XRegistryKey;
* *
* @see com.sun.star.loader.SharedLibrary * @see com.sun.star.loader.SharedLibrary
*/ */
@Deprecated
public class SharedLibraryLoader { public class SharedLibraryLoader {
/** /**
* The default library which contains the SharedLibraryLoader component * The default library which contains the SharedLibraryLoader component
......
...@@ -385,6 +385,7 @@ public class FactoryHelper { ...@@ -385,6 +385,7 @@ public class FactoryHelper {
* @see com.sun.star.lang.XServiceInfo * @see com.sun.star.lang.XServiceInfo
* @deprecated as of UDK 1.0 * @deprecated as of UDK 1.0
*/ */
@Deprecated
public static XSingleServiceFactory getServiceFactory(Class<?> implClass, public static XSingleServiceFactory getServiceFactory(Class<?> implClass,
XMultiServiceFactory multiFactory, XMultiServiceFactory multiFactory,
XRegistryKey regKey) XRegistryKey regKey)
......
...@@ -360,6 +360,7 @@ public class java_remote_bridge ...@@ -360,6 +360,7 @@ public class java_remote_bridge
* *
* @deprecated as of UDK 1.0 * @deprecated as of UDK 1.0
*/ */
@Deprecated
public java_remote_bridge(Object args[]) throws Exception { public java_remote_bridge(Object args[]) throws Exception {
this(UnoRuntime.getEnvironment("java", null), UnoRuntime.getEnvironment("remote", null), args); this(UnoRuntime.getEnvironment("java", null), UnoRuntime.getEnvironment("remote", null), args);
} }
......
...@@ -24,6 +24,7 @@ package com.sun.star.uno; ...@@ -24,6 +24,7 @@ package com.sun.star.uno;
* *
* @deprecated do not use. * @deprecated do not use.
*/ */
@Deprecated
public final class Ascii { public final class Ascii {
public final char ascii; public final char ascii;
...@@ -33,6 +34,7 @@ public final class Ascii { ...@@ -33,6 +34,7 @@ public final class Ascii {
* @deprecated do not use. * @deprecated do not use.
* @param c the char value. * @param c the char value.
*/ */
@Deprecated
public Ascii(char c) { public Ascii(char c) {
ascii = c; ascii = c;
} }
......
...@@ -24,6 +24,7 @@ package com.sun.star.uno; ...@@ -24,6 +24,7 @@ package com.sun.star.uno;
* *
* @deprecated do not use. * @deprecated do not use.
*/ */
@Deprecated
public final class AsciiString { public final class AsciiString {
public final String asciistring; public final String asciistring;
...@@ -33,6 +34,7 @@ public final class AsciiString { ...@@ -33,6 +34,7 @@ public final class AsciiString {
* @deprecated do not use. * @deprecated do not use.
* @param s the String value. * @param s the String value.
*/ */
@Deprecated
public AsciiString(String s) { public AsciiString(String s) {
asciistring = s; asciistring = s;
} }
......
...@@ -31,6 +31,7 @@ package com.sun.star.uno; ...@@ -31,6 +31,7 @@ package com.sun.star.uno;
* *
* @deprecated since UDK 3.0.2 * @deprecated since UDK 3.0.2
*/ */
@Deprecated
public class MappingException extends com.sun.star.uno.RuntimeException { public class MappingException extends com.sun.star.uno.RuntimeException {
/** /**
* Constructs an empty <code>MappingException</code>. * Constructs an empty <code>MappingException</code>.
......
...@@ -23,6 +23,7 @@ import java.lang.reflect.Constructor; ...@@ -23,6 +23,7 @@ import java.lang.reflect.Constructor;
/** /**
* @deprecated: moved to util package. * @deprecated: moved to util package.
*/ */
@Deprecated
public class DynamicClassLoader { public class DynamicClassLoader {
/** /**
......
...@@ -20,6 +20,7 @@ package com.sun.star.lib.uno.typeinfo; ...@@ -20,6 +20,7 @@ package com.sun.star.lib.uno.typeinfo;
/** /**
@deprecated <code>UNOTYPEINFO</code> for constants is not needed @deprecated <code>UNOTYPEINFO</code> for constants is not needed
*/ */
@Deprecated
public class ConstantTypeInfo extends TypeInfo public class ConstantTypeInfo extends TypeInfo
{ {
public ConstantTypeInfo(String name, int flags) public ConstantTypeInfo(String name, int flags)
......
...@@ -57,6 +57,7 @@ public class Any { ...@@ -57,6 +57,7 @@ public class Any {
* @param object the data of the any. * @param object the data of the any.
* @deprecated as of UDK 2.0 * @deprecated as of UDK 2.0
*/ */
@Deprecated
public Any(Class<?> zInterface, Object object) { public Any(Class<?> zInterface, Object object) {
this(new Type(zInterface), object); this(new Type(zInterface), object);
} }
......
...@@ -33,6 +33,7 @@ import java.io.IOException; ...@@ -33,6 +33,7 @@ import java.io.IOException;
* @deprecated As of UDK 3.2, this interface is deprecated, without offering a * @deprecated As of UDK 3.2, this interface is deprecated, without offering a
* replacement. * replacement.
*/ */
@Deprecated
public interface IBridge { public interface IBridge {
/** /**
* Maps an object from the source environment to the destination * Maps an object from the source environment to the destination
......
...@@ -31,6 +31,7 @@ package com.sun.star.uno; ...@@ -31,6 +31,7 @@ package com.sun.star.uno;
* @deprecated As of UDK 3.2, this interface is deprecated, without offering a * @deprecated As of UDK 3.2, this interface is deprecated, without offering a
* replacement. * replacement.
*/ */
@Deprecated
public interface IEnvironment { public interface IEnvironment {
/** /**
* Gets the context of this environment. * Gets the context of this environment.
......
...@@ -28,6 +28,7 @@ package com.sun.star.uno; ...@@ -28,6 +28,7 @@ package com.sun.star.uno;
* @deprecated As of UDK 3.2, this interface is deprecated, without offering a * @deprecated As of UDK 3.2, this interface is deprecated, without offering a
* replacement. * replacement.
*/ */
@Deprecated
public interface IMapping { public interface IMapping {
/** /**
* Maps an interface from one environment to another. * Maps an interface from one environment to another.
......
...@@ -54,6 +54,7 @@ public class UnoRuntime { ...@@ -54,6 +54,7 @@ public class UnoRuntime {
* Also, this class might be changed to become <code>final</code> in a * Also, this class might be changed to become <code>final</code> in a
* future version. * future version.
*/ */
@Deprecated
public UnoRuntime() {} public UnoRuntime() {}
/** /**
...@@ -422,6 +423,7 @@ public class UnoRuntime { ...@@ -422,6 +423,7 @@ public class UnoRuntime {
* @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without * @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without
* offering a replacement. * offering a replacement.
*/ */
@Deprecated
public static IEnvironment getEnvironment(String name, Object context) public static IEnvironment getEnvironment(String name, Object context)
throws java.lang.Exception throws java.lang.Exception
{ {
...@@ -465,6 +467,7 @@ public class UnoRuntime { ...@@ -465,6 +467,7 @@ public class UnoRuntime {
* @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without * @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without
* offering a replacement. * offering a replacement.
*/ */
@Deprecated
public static IBridge getBridge( public static IBridge getBridge(
IEnvironment from, IEnvironment to, Object[] args) IEnvironment from, IEnvironment to, Object[] args)
throws java.lang.Exception throws java.lang.Exception
...@@ -523,6 +526,7 @@ public class UnoRuntime { ...@@ -523,6 +526,7 @@ public class UnoRuntime {
* @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without * @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without
* offering a replacement. * offering a replacement.
*/ */
@Deprecated
public static IBridge getBridgeByName( public static IBridge getBridgeByName(
String from, Object fromContext, String to, Object toContext, String from, Object fromContext, String to, Object toContext,
Object[] args) throws java.lang.Exception Object[] args) throws java.lang.Exception
...@@ -541,6 +545,7 @@ public class UnoRuntime { ...@@ -541,6 +545,7 @@ public class UnoRuntime {
* @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without * @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without
* offering a replacement. * offering a replacement.
*/ */
@Deprecated
public static IBridge[] getBridges() { public static IBridge[] getBridges() {
ArrayList<Object> l = new ArrayList<Object>(); ArrayList<Object> l = new ArrayList<Object>();
synchronized (bridges) { synchronized (bridges) {
...@@ -572,6 +577,7 @@ public class UnoRuntime { ...@@ -572,6 +577,7 @@ public class UnoRuntime {
* @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without * @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without
* offering a replacement. * offering a replacement.
*/ */
@Deprecated
public static IMapping getMapping(IEnvironment from, IEnvironment to) public static IMapping getMapping(IEnvironment from, IEnvironment to)
throws java.lang.Exception throws java.lang.Exception
{ {
...@@ -603,6 +609,7 @@ public class UnoRuntime { ...@@ -603,6 +609,7 @@ public class UnoRuntime {
* @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without * @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without
* offering a replacement. * offering a replacement.
*/ */
@Deprecated
public static IMapping getMappingByName(String from, String to) public static IMapping getMappingByName(String from, String to)
throws java.lang.Exception throws java.lang.Exception
{ {
...@@ -621,6 +628,7 @@ public class UnoRuntime { ...@@ -621,6 +628,7 @@ public class UnoRuntime {
* @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without * @deprecated As of UDK&nbsp;3.2.0, this method is deprecated, without
* offering a replacement. * offering a replacement.
*/ */
@Deprecated
public static boolean reset() { public static boolean reset() {
synchronized (bridges) { synchronized (bridges) {
for (Iterator<java.lang.ref.WeakReference<IBridge>> i = bridges.values().iterator(); i.hasNext();) { for (Iterator<java.lang.ref.WeakReference<IBridge>> i = bridges.values().iterator(); i.hasNext();) {
...@@ -651,6 +659,7 @@ public class UnoRuntime { ...@@ -651,6 +659,7 @@ public class UnoRuntime {
/** /**
* @deprecated As of UDK&nbsp;3.2.0, do not use this internal field. * @deprecated As of UDK&nbsp;3.2.0, do not use this internal field.
*/ */
@Deprecated
public static final boolean DEBUG = false; public static final boolean DEBUG = false;
private static final class BridgeTurner implements IBridge { private static final class BridgeTurner implements IBridge {
......
...@@ -35,6 +35,7 @@ import org.openoffice.test.OfficeConnection; ...@@ -35,6 +35,7 @@ import org.openoffice.test.OfficeConnection;
/** @short todo document me /** @short todo document me
* @deprecated this tests seems no longer work as expected. * @deprecated this tests seems no longer work as expected.
*/ */
@Deprecated
public class CheckConfigItems public class CheckConfigItems
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment