diff options
author | Noel Grandin <noel@peralex.com> | 2015-06-09 10:51:42 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-06-09 13:10:43 +0200 |
commit | 441407571e2a45b08bcafc507524135e48e3a2d1 (patch) | |
tree | c17dfb392adff7ca639d2e8c015465102540a626 | |
parent | 0f2007b11b4a0b39bc4e67ade30961f0d533474a (diff) |
java:Non-synchronized method should not override a synchronized method
Change-Id: I46307828757ee1142747c14d2942515340083605
4 files changed, 5 insertions, 16 deletions
diff --git a/bean/test/applet/oooapplet/OOoViewer.java b/bean/test/applet/oooapplet/OOoViewer.java index 933df3c15ebe..a58e72874f3a 100644 --- a/bean/test/applet/oooapplet/OOoViewer.java +++ b/bean/test/applet/oooapplet/OOoViewer.java @@ -142,7 +142,7 @@ final class CustomURLClassLoader extends URLClassLoader { @Override - protected Class<?> loadClass( String name, boolean resolve ) + protected synchronized Class<?> loadClass( String name, boolean resolve ) throws ClassNotFoundException { Class c = findLoadedClass( name ); diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java index 978d10f6a5a6..e3280c1bb91b 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java +++ b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java @@ -206,12 +206,12 @@ public final class XInputStreamToInputStreamAdapter extends InputStream { } @Override - public void mark(int readlimit) { + public synchronized void mark(int readlimit) { // Not supported. } @Override - public void reset() throws IOException { + public synchronized void reset() throws IOException { // Not supported. } } diff --git a/odk/source/com/sun/star/lib/loader/Loader.java b/odk/source/com/sun/star/lib/loader/Loader.java index 4982bf3a2e79..787ccbb48b33 100644 --- a/odk/source/com/sun/star/lib/loader/Loader.java +++ b/odk/source/com/sun/star/lib/loader/Loader.java @@ -307,7 +307,7 @@ public final class Loader { } @Override - protected Class<?> loadClass( String name, boolean resolve ) + protected synchronized Class<?> loadClass( String name, boolean resolve ) throws ClassNotFoundException { Class c = findLoadedClass( name ); diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java b/toolkit/test/accessibility/AccessibilityTreeModel.java index bc6abf8457eb..49f3b4ea3c78 100644 --- a/toolkit/test/accessibility/AccessibilityTreeModel.java +++ b/toolkit/test/accessibility/AccessibilityTreeModel.java @@ -106,7 +106,7 @@ public class AccessibilityTreeModel the child and add the child to the canvas. */ @Override - public Object getChild (Object aParent, int nIndex) + public synchronized Object getChild (Object aParent, int nIndex) { AccessibleTreeNode aChild = (AccessibleTreeNode)super.getChild (aParent, nIndex); @@ -119,17 +119,6 @@ public class AccessibilityTreeModel return aChild; } - @Override - public Object getChildNoCreate (Object aParent, int nIndex) - { - AccessibleTreeNode aChild = (AccessibleTreeNode)super.getChildNoCreate (aParent, nIndex); - - return aChild; - } - - - - /** Remove a node (and all children) from the tree model. */ private boolean removeChild (AccessibleTreeNode aNode) |