From 0477e6c39b7ce8b7f6560fbf222c19fe4f358dc8 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 6 Aug 2014 08:55:09 +0200 Subject: java: add @Override annotation to overriding methods Change-Id: I086964c6f6ce52c60c52b6dbc445d3c21d22c80a --- javaunohelper/com/sun/star/comp/helper/Bootstrap.java | 1 + .../star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java | 9 +++++++++ .../star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java | 5 +++++ javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java | 1 + .../com/sun/star/lib/uno/helper/InterfaceContainer.java | 1 + javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java | 1 + javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java | 1 + 7 files changed, 19 insertions(+) (limited to 'javaunohelper/com') diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java index c11a415b386b..7b466b011c52 100644 --- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java +++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java @@ -330,6 +330,7 @@ public class Bootstrap { final InputStream in, final PrintStream out, final String prefix ) { new Thread( "Pipe: " + prefix) { + @Override public void run() { BufferedReader r = new BufferedReader( new InputStreamReader( in ) ); diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java index 80af78871797..56c84dc3b36c 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java +++ b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java @@ -45,6 +45,7 @@ public class XInputStreamToInputStreamAdapter extends InputStream { xin = in; } + @Override public int available() throws IOException { int bytesAvail; @@ -58,6 +59,7 @@ public class XInputStreamToInputStreamAdapter extends InputStream { return(bytesAvail); } + @Override public void close() throws IOException { try { xin.closeInput(); @@ -66,6 +68,7 @@ public class XInputStreamToInputStreamAdapter extends InputStream { } } + @Override public int read () throws IOException { byte [][] tmp = new byte [1][1]; try { @@ -86,6 +89,7 @@ public class XInputStreamToInputStreamAdapter extends InputStream { } } + @Override public int read (byte[] b) throws IOException { byte [][] tmp = new byte [1][b.length]; @@ -107,6 +111,7 @@ public class XInputStreamToInputStreamAdapter extends InputStream { return (bytesRead); } + @Override public int read(byte[] b, int off, int len) throws IOException { byte [][] tmp = new byte [1][b.length]; try { @@ -138,6 +143,7 @@ public class XInputStreamToInputStreamAdapter extends InputStream { } } + @Override public long skip(long n) throws IOException { int avail; @@ -180,14 +186,17 @@ public class XInputStreamToInputStreamAdapter extends InputStream { * * @returns false */ + @Override public boolean markSupported() { return false; } + @Override public void mark(int readlimit) { // Not supported. } + @Override public void reset() throws IOException { // Not supported. } diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java index c9b9701e6ca8..ecfee86d6003 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java +++ b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java @@ -46,6 +46,7 @@ public class XOutputStreamToOutputStreamAdapter extends OutputStream { xout = out; } + @Override public void close() throws IOException { try { xout.closeOutput(); @@ -54,6 +55,7 @@ public class XOutputStreamToOutputStreamAdapter extends OutputStream { } } + @Override public void flush() throws IOException { try { xout.flush(); @@ -62,6 +64,7 @@ public class XOutputStreamToOutputStreamAdapter extends OutputStream { } } + @Override public void write(byte[] b) throws IOException { try { @@ -71,6 +74,7 @@ public class XOutputStreamToOutputStreamAdapter extends OutputStream { } } + @Override public void write(byte[] b, int off, int len) throws IOException { byte[] tmp = new byte[len]; @@ -86,6 +90,7 @@ public class XOutputStreamToOutputStreamAdapter extends OutputStream { } } + @Override public void write(int b) throws IOException { byte [] oneByte = new byte [1]; diff --git a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java b/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java index 9423e039f3d7..0f222d7d3506 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java @@ -123,6 +123,7 @@ public class ComponentBase extends WeakBase implements XComponent } } + @Override protected void finalize() throws Throwable { if ( ! bInDispose && ! bDisposed) diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java index 02b926539d6a..caf5cdc9b2f3 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java @@ -440,6 +440,7 @@ public class InterfaceContainer implements Cloneable * * @return a clone of this List instance. */ + @Override synchronized public Object clone() { Object ret= null; diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java index fb2c6e105e20..19d73e49e523 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java @@ -297,6 +297,7 @@ XMultiPropertySet /** Makes sure that listeners which are kept in aBoundLC (XPropertyChangeListener) and aVetoableLC * (XVetoableChangeListener) receive a disposing call. Also those listeners are relesased. */ + @Override protected void postDisposing() { // Create an event with this as sender diff --git a/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java b/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java index 3ed65cdf30e0..8b89b492b1d2 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java @@ -53,6 +53,7 @@ public class WeakBase implements XWeak, XTypeProvider * then the garbage collector calls this method. Thereby causing the adapter object * to be notified. The adapter, in turn, notifies all listeners (com.sun.star.uno.XReference) */ + @Override protected void finalize() throws java.lang.Throwable { if (m_adapter != null) -- cgit