diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
index 563c0a92d412..0326ffa77464 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
@@ -29,7 +29,6 @@ import com.sun.star.lang.XEventListener;
 import com.sun.star.lang.EventObject;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
 
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
index 4999463247e4..b80252039e8a 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
@@ -27,7 +27,7 @@ import java.io.InputStream;
     This allows users to access an <code>InputStream</code>
     as if it were an <code>XInputStream</code>.
  */
-public class InputStreamToXInputStreamAdapter implements XInputStream {
+public final class InputStreamToXInputStreamAdapter implements XInputStream {
 
     /**
      *  Internal store to the InputStream
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
index 4991e863138b..954888cb5025 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
@@ -27,7 +27,7 @@ import java.io.OutputStream;
    object in a Java.  This allows users to access an <code>OutputStream</code>
    as if it were an <code>XOutputStream</code>.
  */
-public class OutputStreamToXOutputStreamAdapter implements XOutputStream {
+public final class OutputStreamToXOutputStreamAdapter implements XOutputStream {
 
     /**
      *  Internal handle to the OutputStream
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
index 1a9682877a51..2d9652e1ecba 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
@@ -28,7 +28,7 @@ import java.io.InputStream;
  * an <code>XInputStream</code> as if it were an
  * <code>InputStream</code>.
  */
-public class XInputStreamToInputStreamAdapter extends InputStream {
+public final class XInputStreamToInputStreamAdapter extends InputStream {
 
     /**
      *  Internal handle to the XInputStream
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
index ad6079346c77..9ebcb0684894 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
@@ -27,7 +27,7 @@ package com.sun.star.lib.uno.adapter;
 import com.sun.star.io.*;
 import  com.sun.star.lib.uno.helper.ComponentBase;
 
-public class XOutputStreamToByteArrayAdapter
+public final class XOutputStreamToByteArrayAdapter
     extends ComponentBase
     implements XOutputStream
 {
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
index ecfee86d6003..478dfc4956b7 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
@@ -29,7 +29,7 @@ import java.io.OutputStream;
  * an <code>XOutputStream</code> as if it were an
  * <code>OutputStream</code>.
  */
-public class XOutputStreamToOutputStreamAdapter extends OutputStream {
+public final class XOutputStreamToOutputStreamAdapter extends OutputStream {
 
     /**
      *  Internal handle to the XInputStream