harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r726511 [2/3] - in /harmony/enhanced/classlib/trunk/modules/x-net/src: main/java/javax/net/ main/java/javax/net/ssl/ main/java/org/apache/harmony/xnet/provider/jsse/ test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/ test/api/java/o...
Date Sun, 14 Dec 2008 18:30:19 GMT
Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java Sun Dec 14 10:30:16 2008
@@ -33,7 +33,7 @@
  * This class performs functionality dedicated to SSL record layer.
  * It unpacks and routes income data to the appropriate
  * client protocol (handshake, alert, application data protocols)
- * and paketizes outcome data into SSL/TLS records.
+ * and packages outcome data into SSL/TLS records.
  * Initially created object has null connection state and does not
  * perform any cryptography computations over the income/outcome data.
  * After handshake protocol agreed upon security parameters they are placed
@@ -179,9 +179,8 @@
         }
         if (activeReadState == null) {
             return record_size;
-        } else {
-            return activeReadState.getContentSize(record_size);
         }
+        return activeReadState.getContentSize(record_size);
     }
 
     /**
@@ -374,7 +373,7 @@
                             type));
             }
         } else {
-            in.skip((long) 2); // just skip the version number
+            in.skip(2); // just skip the version number
         }
         int length = in.readUint16();
         if (logger != null) {

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketFactoryImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketFactoryImpl.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketFactoryImpl.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketFactoryImpl.java Sun Dec 14 10:30:16 2008
@@ -65,6 +65,7 @@
     /**
      * @see javax.net.ssl.SSLServerSocketFactory#getDefaultCipherSuites()
      */
+    @Override
     public String[] getDefaultCipherSuites() {
         if (instantiationException != null) {
             return new String[0];
@@ -75,6 +76,7 @@
     /**
      * @see javax.net.ssl.SSLServerSocketFactory#getSupportedCipherSuites()
      */
+    @Override
     public String[] getSupportedCipherSuites() {
         if (instantiationException != null) {
             return new String[0];
@@ -85,6 +87,7 @@
     /**
      * @see javax.net.ServerSocketFactory#createServerSocket()
      */
+    @Override
     public ServerSocket createServerSocket() throws IOException {
         if (instantiationException != null) {
             throw instantiationException;
@@ -96,6 +99,7 @@
     /**
      * @see javax.net.ServerSocketFactory#createServerSocket(int)
      */
+    @Override
     public ServerSocket createServerSocket(int port) throws IOException {
         if (instantiationException != null) {
             throw instantiationException;
@@ -107,6 +111,7 @@
     /**
      * @see javax.net.ServerSocketFactory#createServerSocket(int,int)
      */
+    @Override
     public ServerSocket createServerSocket(int port, int backlog)
             throws IOException {
         if (instantiationException != null) {
@@ -119,6 +124,7 @@
     /**
      * @see javax.net.ServerSocketFactory#createServerSocket(int,int,InetAddress)
      */
+    @Override
     public ServerSocket createServerSocket(int port, int backlog,
             InetAddress iAddress) throws IOException {
         if (instantiationException != null) {

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImpl.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImpl.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImpl.java Sun Dec 14 10:30:16 2008
@@ -106,6 +106,7 @@
      * @see javax.net.ssl.SSLServerSocket#getSupportedCipherSuites()
      * method documentation for more information
      */
+    @Override
     public String[] getSupportedCipherSuites() {
         return CipherSuite.getSupportedCipherSuiteNames();
     }
@@ -115,6 +116,7 @@
      * @see javax.net.ssl.SSLServerSocket#getEnabledCipherSuites()
      * method documentation for more information
      */
+    @Override
     public String[] getEnabledCipherSuites() {
         return sslParameters.getEnabledCipherSuites();
     }
@@ -124,6 +126,7 @@
      * @see javax.net.ssl.SSLServerSocket#setEnabledCipherSuites(String[])
      * method documentation for more information
      */
+    @Override
     public void setEnabledCipherSuites(String[] suites) {
         sslParameters.setEnabledCipherSuites(suites);
     }
@@ -133,8 +136,9 @@
      * @see javax.net.ssl.SSLServerSocket#getSupportedProtocols()
      * method documentation for more information
      */
+    @Override
     public String[] getSupportedProtocols() {
-        return (String[]) ProtocolVersion.supportedProtocols.clone();
+        return ProtocolVersion.supportedProtocols.clone();
     }
 
     /**
@@ -142,6 +146,7 @@
      * @see javax.net.ssl.SSLServerSocket#getEnabledProtocols()
      * method documentation for more information
      */
+    @Override
     public String[] getEnabledProtocols() {
         return sslParameters.getEnabledProtocols();
     }
@@ -151,6 +156,7 @@
      * @see javax.net.ssl.SSLServerSocket#setEnabledProtocols(String[])
      * method documentation for more information
      */
+    @Override
     public void setEnabledProtocols(String[] protocols) {
         sslParameters.setEnabledProtocols(protocols);
     }
@@ -160,6 +166,7 @@
      * @see javax.net.ssl.SSLServerSocket#setUseClientMode(boolean)
      * method documentation for more information
      */
+    @Override
     public void setUseClientMode(boolean mode) {
         sslParameters.setUseClientMode(mode);
     }
@@ -169,6 +176,7 @@
      * @see javax.net.ssl.SSLServerSocket#getUseClientMode()
      * method documentation for more information
      */
+    @Override
     public boolean getUseClientMode() {
         return sslParameters.getUseClientMode();
     }
@@ -178,6 +186,7 @@
      * @see javax.net.ssl.SSLServerSocket#setNeedClientAuth(boolean)
      * method documentation for more information
      */
+    @Override
     public void setNeedClientAuth(boolean need) {
         sslParameters.setNeedClientAuth(need);
     }
@@ -187,6 +196,7 @@
      * @see javax.net.ssl.SSLServerSocket#getNeedClientAuth()
      * method documentation for more information
      */
+    @Override
     public boolean getNeedClientAuth() {
         return sslParameters.getNeedClientAuth();
     }
@@ -196,6 +206,7 @@
      * @see javax.net.ssl.SSLServerSocket#setWantClientAuth(boolean)
      * method documentation for more information
      */
+    @Override
     public void setWantClientAuth(boolean want) {
         sslParameters.setWantClientAuth(want);
     }
@@ -205,6 +216,7 @@
      * @see javax.net.ssl.SSLServerSocket#getWantClientAuth()
      * method documentation for more information
      */
+    @Override
     public boolean getWantClientAuth() {
         return sslParameters.getWantClientAuth();
     }
@@ -214,6 +226,7 @@
      * @see javax.net.ssl.SSLServerSocket#setEnableSessionCreation(boolean)
      * method documentation for more information
      */
+    @Override
     public void setEnableSessionCreation(boolean flag) {
         sslParameters.setEnableSessionCreation(flag);
     }
@@ -223,6 +236,7 @@
      * @see javax.net.ssl.SSLServerSocket#getEnableSessionCreation()
      * method documentation for more information
      */
+    @Override
     public boolean getEnableSessionCreation() {
         return sslParameters.getEnableSessionCreation();
     }
@@ -235,6 +249,7 @@
      * @see java.net.ServerSocket#accept()
      * method documentation for more information
      */
+    @Override
     public Socket accept() throws IOException {
         if (logger != null) {
             logger.println("SSLServerSocketImpl.accept ..");
@@ -263,6 +278,7 @@
     /**
      * Returns the string representation of the object.
      */
+    @Override
     public String toString() {
         return "[SSLServerSocketImpl]";
     }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionContextImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionContextImpl.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionContextImpl.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionContextImpl.java Sun Dec 14 10:30:16 2008
@@ -39,20 +39,17 @@
 
     private long timeout = 0;
 
-    private final Hashtable sessions = new Hashtable();
+    private final Hashtable<IdKey, SSLSessionImpl> sessions = new Hashtable<IdKey, SSLSessionImpl>();
 
-    /**
-     * 
-     * @see javax.net.ssl.SSLSessionContext.getIds()
-     */
+    @SuppressWarnings("unchecked")
     public Enumeration getIds() {
         return new Enumeration() {
-            Enumeration keys = sessions.keys();
+            Enumeration<IdKey> keys = sessions.keys();
             public boolean hasMoreElements() {
                 return keys.hasMoreElements();
             }
             public Object nextElement() {
-                return ((IdKey)keys.nextElement()).id;
+                return keys.nextElement().id;
             }
         };
     }
@@ -62,7 +59,7 @@
      * @see javax.net.ssl.SSLSessionContext.getSession(byte[] sessionId)
      */
     public SSLSession getSession(byte[] sessionId) {      
-        return (SSLSession) sessions.get(new IdKey(sessionId));
+        return sessions.get(new IdKey(sessionId));
     }
 
     /**
@@ -94,19 +91,16 @@
 
     }
 
-    /**
-     * @see javax.net.ssl.SSLSessionContext.setSessionTimeout(int seconds)
-     */
     public void setSessionTimeout(int seconds) throws IllegalArgumentException {
         if (seconds < 0) {
             throw new IllegalArgumentException("seconds < 0");
         }
         timeout = seconds * 1000;
 
-        // Check timeouts and remome expired sessions
+        // Check timeouts and remove expired sessions
         SSLSessionImpl ses;
-        for (Enumeration en = sessions.keys(); en.hasMoreElements();) {
-            ses = (SSLSessionImpl)(sessions.get(en.nextElement()));
+        for (Enumeration<IdKey> en = sessions.keys(); en.hasMoreElements();) {
+            ses = (sessions.get(en.nextElement()));
             if (!ses.isValid()) {
                 sessions.remove(ses.getId());
             }
@@ -114,7 +108,7 @@
     }
 
     /**
-     * Adds session to the session cach
+     * Adds session to the session cache
      * @param ses
      */
     void putSession(SSLSessionImpl ses) {
@@ -139,6 +133,7 @@
             this.id = id;
         }
         
+        @Override
         public boolean equals(Object o) {
             if (!(o instanceof IdKey)) {
                 return false;
@@ -146,14 +141,9 @@
             return Arrays.equals(id, ((IdKey)o).id);
         }
         
+        @Override
         public int hashCode() {
-            // TODO uncomment for 1.5
-            // return Arrays.hashCode(id);
-            int hash = 0;
-            for (int i = 0; i < id.length; i++) {
-                hash += id[i];
-            }
-            return hash;
+            return Arrays.hashCode(id);
         }
     }
 

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java Sun Dec 14 10:30:16 2008
@@ -212,9 +212,8 @@
     public Principal getLocalPrincipal() {
         if (localCertificates != null && localCertificates.length > 0) {
             return localCertificates[0].getSubjectX500Principal();
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
@@ -376,6 +375,7 @@
 
     }
 
+    @Override
     public Object clone() {
         SSLSessionImpl ses = new SSLSessionImpl();
         ses.id = this.id;

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoryImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoryImpl.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoryImpl.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoryImpl.java Sun Dec 14 10:30:16 2008
@@ -65,6 +65,7 @@
     /**
      * @see javax.net.ssl.SSLSocketFactory#getDefaultCipherSuites()
      */
+    @Override
     public String[] getDefaultCipherSuites() {
         if (instantiationException != null) {
             return new String[0];
@@ -75,6 +76,7 @@
     /**
      * @see javax.net.ssl.SSLSocketFactory#getSupportedCipherSuites()
      */
+    @Override
     public String[] getSupportedCipherSuites() {
         if (instantiationException != null) {
             return new String[0];
@@ -85,6 +87,7 @@
     /**
      * @see javax.net.ssl.SSLSocketFactory#createSocket(Socket,String,int,boolean)
      */
+    @Override
     public Socket createSocket(Socket s, String host, int port,
             boolean autoClose) throws IOException {
         if (instantiationException != null) {
@@ -99,6 +102,7 @@
     /**
      * @see javax.net.SocketFactory#createSocket()
      */
+    @Override
     public Socket createSocket() throws IOException {
         if (instantiationException != null) {
             throw instantiationException;
@@ -109,6 +113,7 @@
     /**
      * @see javax.net.SocketFactory#createSocket(String,int)
      */
+    @Override
     public Socket createSocket(String host, int port)
             throws IOException, UnknownHostException {
         if (instantiationException != null) {
@@ -121,6 +126,7 @@
     /**
      * @see javax.net.SocketFactory#createSocket(String,int,InetAddress,int)
      */
+    @Override
     public Socket createSocket(String host, int port,
             InetAddress localHost, int localPort) throws IOException,
             UnknownHostException {
@@ -134,6 +140,7 @@
     /**
      * @see javax.net.SocketFactory#createSocket(InetAddress,int)
      */
+    @Override
     public Socket createSocket(InetAddress host, int port)
             throws IOException {
         if (instantiationException != null) {
@@ -146,6 +153,7 @@
     /**
      * @see javax.net.SocketFactory#createSocket(InetAddress,int,InetAddress,int)
      */
+    @Override
     public Socket createSocket(InetAddress address, int port,
             InetAddress localAddress, int localPort) throws IOException {
         if (instantiationException != null) {

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java Sun Dec 14 10:30:16 2008
@@ -79,7 +79,7 @@
     protected InputStream input;
     protected OutputStream output;
     // handshake complete listeners
-    private ArrayList listeners;
+    private ArrayList<HandshakeCompletedListener> listeners;
     // logger
     private Logger.Stream logger = Logger.getStream("socket");
 
@@ -211,6 +211,7 @@
      * @see javax.net.ssl.SSLSocket#getSupportedCipherSuites()
      * method documentation for more information
      */
+    @Override
     public String[] getSupportedCipherSuites() {
         return CipherSuite.getSupportedCipherSuiteNames();
     }
@@ -220,6 +221,7 @@
      * @see javax.net.ssl.SSLSocket#getEnabledCipherSuites()
      * method documentation for more information
      */
+    @Override
     public String[] getEnabledCipherSuites() {
         return sslParameters.getEnabledCipherSuites();
     }
@@ -229,6 +231,7 @@
      * @see javax.net.ssl.SSLSocket#setEnabledCipherSuites(String[])
      * method documentation for more information
      */
+    @Override
     public void setEnabledCipherSuites(String[] suites) {
         sslParameters.setEnabledCipherSuites(suites);
     }
@@ -238,8 +241,9 @@
      * @see javax.net.ssl.SSLSocket#getSupportedProtocols()
      * method documentation for more information
      */
+    @Override
     public String[] getSupportedProtocols() {
-        return (String[]) ProtocolVersion.supportedProtocols.clone();
+        return ProtocolVersion.supportedProtocols.clone();
     }
 
     /**
@@ -247,6 +251,7 @@
      * @see javax.net.ssl.SSLSocket#getEnabledProtocols()
      * method documentation for more information
      */
+    @Override
     public String[] getEnabledProtocols() {
         return sslParameters.getEnabledProtocols();
     }
@@ -256,6 +261,7 @@
      * @see javax.net.ssl.SSLSocket#setEnabledProtocols(String[])
      * method documentation for more information
      */
+    @Override
     public void setEnabledProtocols(String[] protocols) {
         sslParameters.setEnabledProtocols(protocols);
     }
@@ -265,6 +271,7 @@
      * @see javax.net.ssl.SSLSocket#setUseClientMode(boolean)
      * method documentation for more information
      */
+    @Override
     public void setUseClientMode(boolean mode) {
         if (handshake_started) {
             throw new IllegalArgumentException(
@@ -278,6 +285,7 @@
      * @see javax.net.ssl.SSLSocket#getUseClientMode()
      * method documentation for more information
      */
+    @Override
     public boolean getUseClientMode() {
         return sslParameters.getUseClientMode();
     }
@@ -287,6 +295,7 @@
      * @see javax.net.ssl.SSLSocket#setNeedClientAuth(boolean)
      * method documentation for more information
      */
+    @Override
     public void setNeedClientAuth(boolean need) {
         sslParameters.setNeedClientAuth(need);
     }
@@ -296,6 +305,7 @@
      * @see javax.net.ssl.SSLSocket#getNeedClientAuth()
      * method documentation for more information
      */
+    @Override
     public boolean getNeedClientAuth() {
         return sslParameters.getNeedClientAuth();
     }
@@ -305,6 +315,7 @@
      * @see javax.net.ssl.SSLSocket#setWantClientAuth(boolean)
      * method documentation for more information
      */
+    @Override
     public void setWantClientAuth(boolean want) {
         sslParameters.setWantClientAuth(want);
     }
@@ -314,6 +325,7 @@
      * @see javax.net.ssl.SSLSocket#getWantClientAuth()
      * method documentation for more information
      */
+    @Override
     public boolean getWantClientAuth() {
         return sslParameters.getWantClientAuth();
     }
@@ -323,6 +335,7 @@
      * @see javax.net.ssl.SSLSocket#setEnableSessionCreation(boolean)
      * method documentation for more information
      */
+    @Override
     public void setEnableSessionCreation(boolean flag) {
         sslParameters.setEnableSessionCreation(flag);
     }
@@ -332,6 +345,7 @@
      * @see javax.net.ssl.SSLSocket#getEnableSessionCreation()
      * method documentation for more information
      */
+    @Override
     public boolean getEnableSessionCreation() {
         return sslParameters.getEnableSessionCreation();
     }
@@ -343,6 +357,7 @@
      * @see javax.net.ssl.SSLSocket#getSession()
      * method documentation for more information
      */
+    @Override
     public SSLSession getSession() {
         if (!handshake_started) {
             try {
@@ -361,13 +376,14 @@
      * @see javax.net.ssl.SSLSocket#addHandshakeCompletedListener(HandshakeCompletedListener)
      * method documentation for more information
      */
+    @Override
     public void addHandshakeCompletedListener(
             HandshakeCompletedListener listener) {
         if (listener == null) {
             throw new IllegalArgumentException("Provided listener is null");
         }
         if (listeners == null) {
-            listeners = new ArrayList();
+            listeners = new ArrayList<HandshakeCompletedListener>();
         }
         listeners.add(listener);
     }
@@ -377,6 +393,7 @@
      * @see javax.net.ssl.SSLSocket#removeHandshakeCompletedListener(HandshakeCompletedListener)
      * method documentation for more information
      */
+    @Override
     public void removeHandshakeCompletedListener(
             HandshakeCompletedListener listener) {
         if (listener == null) {
@@ -401,6 +418,7 @@
      * @see javax.net.ssl.SSLSocket#startHandshake()
      * method documentation for more information
      */
+    @Override
     public void startHandshake() throws IOException {
         if (appDataIS == null) {
             throw new IOException("Socket is not connected.");
@@ -450,6 +468,7 @@
      * @see javax.net.ssl.SSLSocket#getInputStream()
      * method documentation for more information
      */
+    @Override
     public InputStream getInputStream() throws IOException {
         if (socket_was_closed) {
             throw new IOException("Socket has already been closed.");
@@ -462,6 +481,7 @@
      * @see javax.net.ssl.SSLSocket#getOutputStream()
      * method documentation for more information
      */
+    @Override
     public OutputStream getOutputStream() throws IOException {
         if (socket_was_closed) {
             throw new IOException("Socket has already been closed.");
@@ -474,6 +494,7 @@
      * @see java.net.Socket#connect(SocketAddress)
      * method documentation for more information
      */
+    @Override
     public void connect(SocketAddress endpoint) throws IOException {
         super.connect(endpoint);
         init();
@@ -484,6 +505,7 @@
      * @see java.net.Socket#connect(SocketAddress,int)
      * method documentation for more information
      */
+    @Override
     public void connect(SocketAddress endpoint, int timeout) 
             throws IOException {
         super.connect(endpoint, timeout);
@@ -495,6 +517,7 @@
      * @see javax.net.ssl.SSLSocket#close()
      * method documentation for more information
      */
+    @Override
     public void close() throws IOException {
         if (logger != null) {
             logger.println("SSLSocket.close "+socket_was_closed);
@@ -517,6 +540,7 @@
     /**
      * This method is not supported for SSLSocket implementation.
      */
+    @Override
     public void sendUrgentData(int data) throws IOException {
         throw new SocketException(
                 "Method sendUrgentData() is not supported.");
@@ -525,6 +549,7 @@
     /**
      * This method is not supported for SSLSocket implementation.
      */
+    @Override
     public void setOOBInline(boolean on) throws SocketException {
         throw new SocketException(
                 "Methods sendUrgentData, setOOBInline are not supported.");
@@ -533,6 +558,7 @@
     /**
      * This method is not supported for SSLSocket implementation.
      */
+    @Override
     public void shutdownOutput() {
         throw new UnsupportedOperationException(
                 "Method shutdownOutput() is not supported.");
@@ -541,6 +567,7 @@
     /**
      * This method is not supported for SSLSocket implementation.
      */
+    @Override
     public void shutdownInput() {
         throw new UnsupportedOperationException(
                 "Method shutdownInput() is not supported.");
@@ -549,6 +576,7 @@
     /**
      * Returns the string representation of the object.
      */
+    @Override
     public String toString() {
         return "[SSLSocketImpl]";
     }
@@ -770,7 +798,7 @@
                 new HandshakeCompletedEvent(this, session);
             int size = listeners.size();
             for (int i=0; i<size; i++) {
-                ((HandshakeCompletedListener)listeners.get(i))
+                listeners.get(i)
                     .handshakeCompleted(event);
             }
         }
@@ -789,21 +817,21 @@
                 + alertProtocol.getAlertDescription();
             shutdown();
             throw new SSLException(description);
-        } else {
-            if (logger != null) {
-                logger.println("Warning alert received: "
-                    + alertProtocol.getAlertDescription());
-            }
-            switch(alertProtocol.getDescriptionCode()) {
-                case AlertProtocol.CLOSE_NOTIFY:
-                    alertProtocol.setProcessed();
-                    appDataIS.setEnd();
-                    close();
-                    return;
-                default:
-                    alertProtocol.setProcessed();
-                // TODO: process other warning messages
-            }
+        }
+        
+        if (logger != null) {
+            logger.println("Warning alert received: "
+                + alertProtocol.getAlertDescription());
+        }
+        switch(alertProtocol.getDescriptionCode()) {
+            case AlertProtocol.CLOSE_NOTIFY:
+                alertProtocol.setProcessed();
+                appDataIS.setEnd();
+                close();
+                return;
+            default:
+                alertProtocol.setProcessed();
+            // TODO: process other warning messages
         }
     }
     

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketInputStream.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketInputStream.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketInputStream.java Sun Dec 14 10:30:16 2008
@@ -85,6 +85,7 @@
      * @return the number of available bytes.
      * @throws  IOException
      */
+    @Override
     public int available() throws IOException {
         return end - pos;
     }
@@ -93,6 +94,7 @@
      * Closes the stream
      * @throws  IOException
      */
+    @Override
     public void close() throws IOException {
         buffer = null;
     }
@@ -104,6 +106,7 @@
      * @return read value.
      * @throws  IOException
      */
+    @Override
     public int read() throws IOException {
         if (buffer == null) {
             throw new IOException("Stream was closed.");
@@ -124,6 +127,7 @@
      * Method acts as described in spec for superclass.
      * @see java.io.InputStream#read(byte[])
      */
+    @Override
     public int read(byte[] b) throws IOException {
         return read(b, 0, b.length);
     }
@@ -132,6 +136,7 @@
      * Method acts as described in spec for superclass.
      * @see java.io.InputStream#read(byte[],int,int)
      */
+    @Override
     public int read(byte[] b, int off, int len) throws IOException {
         int read_b;
         int i = 0;
@@ -149,6 +154,7 @@
      * Method acts as described in spec for superclass.
      * @see java.io.InputStream#skip(long)
      */
+    @Override
     public long skip(long n) throws IOException {
         long i = 0;
         int av = available();

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketOutputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketOutputStream.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketOutputStream.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketOutputStream.java Sun Dec 14 10:30:16 2008
@@ -41,15 +41,18 @@
 
     private byte[] bytik = new byte[1];
 
+    @Override
     public void write(int b) throws IOException {
         bytik[0] = (byte) (b & 0xFF);
         owner.writeAppData(bytik, 0, 1);
     }
 
+    @Override
     public void write(byte[] b) throws IOException {
         owner.writeAppData(b, 0, b.length);
     }
 
+    @Override
     public void write(byte[] b, int off, int len) throws IOException {
         owner.writeAppData(b, off, len);
     }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketWrapper.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketWrapper.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketWrapper.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketWrapper.java Sun Dec 14 10:30:16 2008
@@ -46,11 +46,13 @@
         init();
     }
 
+    @Override
     protected void initTransportLayer() throws IOException {
         input = socket.getInputStream();
         output = socket.getOutputStream();
     }
 
+    @Override
     protected void closeTransportLayer() throws IOException {
         if (autoClose && (input != null)) {
             socket.close();
@@ -61,131 +63,163 @@
 
     // ------------------- Wrapping method implementations ---------------
 
+    @Override
     public void connect(SocketAddress sockaddr, int timeout)
         throws IOException {
         throw new IOException("Underlying socket is already connected.");
     }
 
+    @Override
     public void connect(SocketAddress sockaddr) throws IOException {
         throw new IOException("Underlying socket is already connected.");
     }
 
+    @Override
     public void bind(SocketAddress sockaddr) throws IOException {
         throw new IOException("Underlying socket is already connected.");
     }
 
+    @Override
     public SocketAddress getRemoteSocketAddress() {
         return socket.getRemoteSocketAddress();
     }
 
+    @Override
     public SocketAddress getLocalSocketAddress() {
         return socket.getLocalSocketAddress();
     }
 
+    @Override
     public InetAddress getLocalAddress() {
         return socket.getLocalAddress();
     }
 
+    @Override
     public InetAddress getInetAddress() {
         return socket.getInetAddress();
     }
 
+    @Override
     public String toString() {
         return "SSL socket over " + socket.toString();
     }
 
+    @Override
     public void setSoLinger(boolean on, int linger) throws SocketException {
         socket.setSoLinger(on, linger);
     }
 
+    @Override
     public void setTcpNoDelay(boolean on) throws SocketException {
         socket.setTcpNoDelay(on);
     }
 
+    @Override
     public void setReuseAddress(boolean on) throws SocketException {
         socket.setReuseAddress(on);
     }
 
+    @Override
     public void setKeepAlive(boolean on) throws SocketException {
         socket.setKeepAlive(on);
     }
 
+    @Override
     public void setTrafficClass(int tos) throws SocketException {
         socket.setTrafficClass(tos);
     }
 
+    @Override
     public void setSoTimeout(int to) throws SocketException {
         socket.setSoTimeout(to);
     }
 
+    @Override
     public void setSendBufferSize(int size) throws SocketException {
         socket.setSendBufferSize(size);
     }
 
+    @Override
     public void setReceiveBufferSize(int size) throws SocketException {
         socket.setReceiveBufferSize(size);
     }
 
+    @Override
     public boolean getTcpNoDelay() throws SocketException {
         return socket.getTcpNoDelay();
     }
 
+    @Override
     public boolean getReuseAddress() throws SocketException {
         return socket.getReuseAddress();
     }
 
+    @Override
     public boolean getOOBInline() throws SocketException {
         return socket.getOOBInline();
     }
 
+    @Override
     public boolean getKeepAlive() throws SocketException {
         return socket.getKeepAlive();
     }
 
+    @Override
     public int getTrafficClass() throws SocketException {
         return socket.getTrafficClass();
     }
 
+    @Override
     public int getSoTimeout() throws SocketException {
         return socket.getSoTimeout();
     }
 
+    @Override
     public int getSoLinger() throws SocketException {
         return socket.getSoLinger();
     }
 
+    @Override
     public int getSendBufferSize() throws SocketException {
         return socket.getSendBufferSize();
     }
 
+    @Override
     public int getReceiveBufferSize() throws SocketException {
         return socket.getReceiveBufferSize();
     }
 
+    @Override
     public boolean isConnected() {
         return socket.isConnected();
     }
 
+    @Override
     public boolean isClosed() {
         return socket.isClosed();
     }
 
+    @Override
     public boolean isBound() {
         return socket.isBound();
     }
 
+    @Override
     public boolean isOutputShutdown() {
         return socket.isOutputShutdown();
     }
 
+    @Override
     public boolean isInputShutdown() {
         return socket.isInputShutdown();
     }
 
+    @Override
     public int getPort() {
         return socket.getPort();
     }
 
+    @Override
     public int getLocalPort() {
         return socket.getLocalPort();
     }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLStreamedInput.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLStreamedInput.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLStreamedInput.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLStreamedInput.java Sun Dec 14 10:30:16 2008
@@ -37,6 +37,7 @@
         this.in = in;
     }
 
+    @Override
     public int available() throws IOException {
         return in.available();
     }
@@ -49,6 +50,7 @@
      * @throws org.apache.harmony.xnet.provider.jsse.EndOfSourceException if the end of the underlying
      * stream has been reached.
      */
+    @Override
     public int read() throws IOException {
         int res = in.read();
         if (res < 0) {

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java Sun Dec 14 10:30:16 2008
@@ -56,7 +56,7 @@
  * Handshake protocol operates on top of the Record Protocol.
  * It responsible for negotiating a session.
  * 
- * The implementation proceses inbound client handshake messages,
+ * The implementation processes inbound client handshake messages,
  * creates and sends respond messages. Outbound messages are supplied 
  * to Record Protocol. Detected errors are reported to the Alert protocol.
  * 
@@ -83,6 +83,7 @@
      * Start session negotiation
      * @param session
      */
+    @Override
     public void start() {
         if (session == null) { // initial handshake
             status = NEED_UNWRAP;
@@ -102,6 +103,7 @@
      * Proceses inbound handshake messages
      * @param bytes
      */
+    @Override
     public void unwrap(byte[] bytes) {
 
         io_stream.append(bytes);
@@ -129,15 +131,12 @@
                     needSendHelloRequest = false;
                     clientHello = new ClientHello(io_stream, length);
                     if (nonBlocking) {
-                        delegatedTasks.add(new DelegatedTask(
-                                new PrivilegedExceptionAction(){
-                            public Object run() throws Exception {
+                        delegatedTasks.add(new DelegatedTask(new PrivilegedExceptionAction<Void>() {
+                            public Void run() throws Exception {
                                 processClientHello();
                                 return null;
-                                }
-                            },
-                            this,
-                            AccessController.getContext()));
+                            }
+                        }, this, AccessController.getContext()));
                         return;
                     }
                     processClientHello();
@@ -322,6 +321,7 @@
      * @ see TLS 1.0 spec., E.1. Version 2 client hello
      * @param bytes
      */
+    @Override
     public void unwrapSSLv2(byte[] bytes) {
         io_stream.append(bytes);
         io_stream.mark();
@@ -333,8 +333,8 @@
         }
         if (nonBlocking) {
             delegatedTasks.add(new DelegatedTask(
-                    new PrivilegedExceptionAction() {
-                        public Object run() throws Exception {
+                    new PrivilegedExceptionAction<Void>() {
+                        public Void run() throws Exception {
                             processClientHello();
                             return null;
                         }
@@ -399,10 +399,9 @@
                         status = NOT_HANDSHAKING;
                         clearMessages();
                         return;
-                    } else {
-                        fatalAlert(AlertProtocol.HANDSHAKE_FAILURE,
-                                "SSL Session may not be created");
                     }
+                    // throw AlertException
+                    fatalAlert(AlertProtocol.HANDSHAKE_FAILURE, "SSL Session may not be created");
                 }
                 session = null;
             } else {
@@ -553,7 +552,7 @@
                     } catch (NoSuchAlgorithmException e) {
                             kf = KeyFactory.getInstance("DiffieHellman");
                     }
-                    dhkeySpec = (DHPublicKeySpec) kf.getKeySpec(dhkey,
+                    dhkeySpec = kf.getKeySpec(dhkey,
                             DHPublicKeySpec.class);
                 }
                 if (!cipher_suite.isAnonymous()) { // calculate signed_params
@@ -638,6 +637,7 @@
     /**
      * Creates and sends finished message
      */
+    @Override
     protected void makeFinished() {
         byte[] verify_data;
         boolean isTLS = (serverHello.server_version[1] == 1); // TLS 1.0 protocol
@@ -684,8 +684,9 @@
     }
 
     /**
-     * Proceses inbound ChangeCipherSpec message
+     * Processes inbound ChangeCipherSpec message
      */
+    @Override
     public void receiveChangeCipherSpec() {    
         if (isResuming) {
             if (serverFinished == null) {

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHello.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHello.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHello.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHello.java Sun Dec 14 10:30:16 2008
@@ -111,6 +111,7 @@
      * Sends message
      * @param out
      */
+    @Override
     public void send(HandshakeIODataStream out) {
         out.write(server_version);
         out.write(random);
@@ -133,6 +134,7 @@
      * Returns message type 
      * @return
      */
+    @Override
     public int getType() {
         return Handshake.SERVER_HELLO;
     }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHelloDone.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHelloDone.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHelloDone.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHelloDone.java Sun Dec 14 10:30:16 2008
@@ -59,6 +59,7 @@
      * Sends message
      * @param out
      */
+    @Override
     public void send(HandshakeIODataStream out) {
     }
     
@@ -66,6 +67,7 @@
      * Returns message length
      * @return
      */
+    @Override
     public int length() {
         return 0;
     }
@@ -74,6 +76,7 @@
      * Returns message type 
      * @return
      */
+    @Override
     public int getType() {
         return Handshake.SERVER_HELLO_DONE;
     }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerKeyExchange.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerKeyExchange.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerKeyExchange.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerKeyExchange.java Sun Dec 14 10:30:16 2008
@@ -150,6 +150,7 @@
      * Sends message
      * @param out
      */
+    @Override
     public void send(HandshakeIODataStream out) {
         out.writeUint16(bytes1.length);
         out.write(bytes1);
@@ -189,6 +190,7 @@
      * Returns message type 
      * @return
      */
+    @Override
     public int getType() {
         return Handshake.SERVER_KEY_EXCHANGE;
     }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java Sun Dec 14 10:30:16 2008
@@ -50,6 +50,7 @@
     /**
      * @see javax.net.ssl.TrustManagerFactorySpi#engineInit(KeyStore)
      */
+    @Override
     public void engineInit(KeyStore ks) throws KeyStoreException {
         if (ks != null) {
             keyStore = ks;
@@ -107,6 +108,7 @@
     /**
      * @see javax.net.ssl.engineInit(ManagerFactoryParameters)
      */
+    @Override
     public void engineInit(ManagerFactoryParameters spec)
             throws InvalidAlgorithmParameterException {
         throw new InvalidAlgorithmParameterException(
@@ -116,6 +118,7 @@
     /**
      * @see javax.net.ssl.engineGetTrustManagers()
      */
+    @Override
     public TrustManager[] engineGetTrustManagers() {
         if (keyStore == null) {
             throw new IllegalStateException(

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java Sun Dec 14 10:30:16 2008
@@ -66,13 +66,11 @@
         try {
             validator = CertPathValidator.getInstance("PKIX");
             factory = CertificateFactory.getInstance("X509");
-            String alias;
-            X509Certificate cert;
             byte[] nameConstrains = null;
-            Set trusted = new HashSet();
-            for (Enumeration en = ks.aliases(); en.hasMoreElements();) {
-                alias = (String) en.nextElement();
-                cert = (X509Certificate) ks.getCertificate(alias);
+            Set<TrustAnchor> trusted = new HashSet<TrustAnchor>();
+            for (Enumeration<String> en = ks.aliases(); en.hasMoreElements();) {
+                final String alias = en.nextElement();
+                final X509Certificate cert = (X509Certificate) ks.getCertificate(alias);
                 if (cert != null) {
                     trusted.add(new TrustAnchor(cert, nameConstrains));
                 }
@@ -137,11 +135,11 @@
         if (params == null) {
             return new X509Certificate[0];
         }
-        Set anchors = params.getTrustAnchors();
+        Set<TrustAnchor> anchors = params.getTrustAnchors();
         X509Certificate[] certs = new X509Certificate[anchors.size()];
         int i = 0;
-        for (Iterator it = anchors.iterator(); it.hasNext();) {
-            certs[i++] = ((TrustAnchor) it.next()).getTrustedCert();
+        for (Iterator<TrustAnchor> it = anchors.iterator(); it.hasNext();) {
+            certs[i++] = it.next().getTrustedCert();
         }
         return certs;
     }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/CertPathTrustManagerParametersTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/CertPathTrustManagerParametersTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/CertPathTrustManagerParametersTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/CertPathTrustManagerParametersTest.java Sun Dec 14 10:30:16 2008
@@ -40,6 +40,7 @@
 }
 
 class MyCertPathParameters implements CertPathParameters {
+    @Override
     public Object clone() {
         return new MyCertPathParameters();
     }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/HandshakeCompletedEventTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/HandshakeCompletedEventTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/HandshakeCompletedEventTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/HandshakeCompletedEventTest.java Sun Dec 14 10:30:16 2008
@@ -46,6 +46,7 @@
     /*
      * @see TestCase#setUp()
      */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         SSLSocketFactory sf = (SSLSocketFactory) SSLSocketFactory.getDefault();
@@ -68,6 +69,7 @@
     /*
      * @see TestCase#tearDown()
      */
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         if (ss != null) {

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/HttpsURLConnectionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/HttpsURLConnectionTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/HttpsURLConnectionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/HttpsURLConnectionTest.java Sun Dec 14 10:30:16 2008
@@ -112,6 +112,7 @@
     /*
      * @see javax.net.ssl.HttpsURLConnection#getCipherSuite()
      */
+    @Override
     public String getCipherSuite() {
         return null;
     }
@@ -119,6 +120,7 @@
     /*
      * @see javax.net.ssl.HttpsURLConnection#getLocalCertificates()
      */
+    @Override
     public Certificate[] getLocalCertificates() {
         return null;
     }
@@ -126,6 +128,7 @@
     /*
      * @see javax.net.ssl.HttpsURLConnection#getServerCertificates()
      */
+    @Override
     public Certificate[] getServerCertificates()
             throws SSLPeerUnverifiedException {
         return null;
@@ -134,12 +137,14 @@
     /*
      * @see java.net.HttpURLConnection#disconnect()
      */
+    @Override
     public void disconnect() {
     }
 
     /*
      * @see java.net.HttpURLConnection#usingProxy()
      */
+    @Override
     public boolean usingProxy() {
         return false;
     }
@@ -147,6 +152,7 @@
     /*
      * @see java.net.URLConnection#connect()
      */
+    @Override
     public void connect() throws IOException {
     }
 

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyManagerFactory2Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyManagerFactory2Test.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyManagerFactory2Test.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyManagerFactory2Test.java Sun Dec 14 10:30:16 2008
@@ -59,6 +59,7 @@
 
     Provider mProv;
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         mProv = (new SpiEngUtils()).new MyProvider("MyKMFProvider",
@@ -70,6 +71,7 @@
     /*
      * @see TestCase#tearDown()
      */
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         Security.removeProvider(mProv.getName());

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java Sun Dec 14 10:30:16 2008
@@ -34,10 +34,12 @@
 public class KeyStoreBuilderParametersTest extends TestCase {
     
     class EmptyBuilder extends KeyStore.Builder {
+        @Override
         public KeyStore getKeyStore() throws KeyStoreException {
             return null;
         }
 
+        @Override
         public KeyStore.ProtectionParameter getProtectionParameter(String alias)
                 throws KeyStoreException {
             return null;

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext2Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext2Test.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext2Test.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext2Test.java Sun Dec 14 10:30:16 2008
@@ -59,6 +59,7 @@
 
     Provider mProv;
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         mProv = (new SpiEngUtils()).new MyProvider("MySSLContextProvider", "Provider for testing",
@@ -70,6 +71,7 @@
     /*
      * @see TestCase#tearDown()
      */
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         Security.removeProvider(mProv.getName());

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLEngineTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLEngineTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLEngineTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLEngineTest.java Sun Dec 14 10:30:16 2008
@@ -372,6 +372,7 @@
         super(host, port);
     }
 
+    @Override
     public void beginHandshake() throws SSLException {
         String host = super.getPeerHost();
         if ((host == null) || (host.length() == 0)) {
@@ -379,94 +380,117 @@
         }
     }
 
+    @Override
     public void closeInbound() throws SSLException {
     }
 
+    @Override
     public void closeOutbound() {
     }
 
+    @Override
     public Runnable getDelegatedTask() {
         return null;
     }
 
+    @Override
     public String[] getEnabledCipherSuites() {
         return enabledCipherSuites;
     }
 
+    @Override
     public String[] getEnabledProtocols() {
         return enabledProtocols;
     }
 
+    @Override
     public boolean getEnableSessionCreation() {
         return enableSessionCreation;
     }
 
+    @Override
     public SSLEngineResult.HandshakeStatus getHandshakeStatus() {
         return SSLEngineResult.HandshakeStatus.FINISHED;
     }
 
+    @Override
     public boolean getNeedClientAuth() {
         return needClientAuth;
     }
 
+    @Override
     public SSLSession getSession() {
         return null;
     }
 
+    @Override
     public String[] getSupportedCipherSuites() {
         return new String[0];
     }
 
+    @Override
     public String[] getSupportedProtocols() {
         return new String[0];
     }
 
+    @Override
     public boolean getUseClientMode() {
         return useClientMode;
     }
 
+    @Override
     public boolean getWantClientAuth() {
         return wantClientAuth;
     }
 
+    @Override
     public boolean isInboundDone() {
         return false;
     }
 
+    @Override
     public boolean isOutboundDone() {
         return false;
     }
 
+    @Override
     public void setEnabledCipherSuites(String[] suites) {
         enabledCipherSuites = suites;
     }
 
+    @Override
     public void setEnabledProtocols(String[] protocols) {
         enabledProtocols = protocols;
     }
 
+    @Override
     public void setEnableSessionCreation(boolean flag) {
         enableSessionCreation = flag;
     }
 
+    @Override
     public void setNeedClientAuth(boolean need) {
         needClientAuth = need;
     }
 
+    @Override
     public void setUseClientMode(boolean mode) {
         useClientMode = mode;
     }
 
+    @Override
     public void setWantClientAuth(boolean want) {
         wantClientAuth = want;
     }
 
+    @Override
     public SSLEngineResult unwrap(ByteBuffer src, ByteBuffer[] dsts,
             int offset, int length) throws SSLException {
         return new SSLEngineResult(SSLEngineResult.Status.OK,
                 SSLEngineResult.HandshakeStatus.FINISHED, 1, 2);
     }
 
+    @Override
     public SSLEngineResult wrap(ByteBuffer[] srcs, int offset, int length,
             ByteBuffer dst) throws SSLException {
         return new SSLEngineResult(SSLEngineResult.Status.OK,
@@ -483,6 +507,7 @@
         super(host, port);
     }
 
+    @Override
     public SSLEngineResult unwrap(ByteBuffer src, ByteBuffer dst)
             throws SSLException {
         if (src.limit() > dst.limit()) {
@@ -491,6 +516,7 @@
         return super.unwrap(src, dst);
     }
 
+    @Override
     public SSLEngineResult unwrap(ByteBuffer src, ByteBuffer[] dsts)
             throws SSLException {
         if (src.limit() > dsts[0].limit()) {
@@ -499,6 +525,7 @@
         return super.unwrap(src, dsts);
     }
 
+    @Override
     public SSLEngineResult wrap(ByteBuffer[] srcs, ByteBuffer dst)
             throws SSLException {
         if (srcs[0].limit() > dst.limit()) {
@@ -507,6 +534,7 @@
         return super.wrap(srcs, dst);
     }
 
+    @Override
     public SSLEngineResult wrap(ByteBuffer src, ByteBuffer dst)
             throws SSLException {
         if (src.limit() > dst.limit()) {

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLPermissionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLPermissionTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLPermissionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLPermissionTest.java Sun Dec 14 10:30:16 2008
@@ -31,19 +31,13 @@
      * Class under test for void SSLPermission(String)
      */
     public void testSSLPermissionString() {
-        SSLPermission p = new SSLPermission("name");
-        if (p == null) {
-            fail("null permission");
-        }
+       new SSLPermission("name");
     }
 
     /*
      * Class under test for void SSLPermission(String, String)
      */
     public void testSSLPermissionStringString() {
-        SSLPermission p = new SSLPermission("name", "action");
-        if (p == null) {
-            fail("null permission");
-        }
+        new SSLPermission("name", "action");
     }
 }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLServerSocketTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLServerSocketTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLServerSocketTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLServerSocketTest.java Sun Dec 14 10:30:16 2008
@@ -96,52 +96,66 @@
         super(port, backlog, address);
     }
 
+    @Override
     public String[] getEnabledCipherSuites() {
         return null;
     }
 
+    @Override
     public void setEnabledCipherSuites(String[] suites) {
     }
 
+    @Override
     public String[] getSupportedCipherSuites() {
         return null;
     }
 
+    @Override
     public String[] getSupportedProtocols() {
         return null;
     }
 
+    @Override
     public String[] getEnabledProtocols() {
         return null;
     }
 
+    @Override
     public void setEnabledProtocols(String[] protocols) {
     }
 
+    @Override
     public void setNeedClientAuth(boolean need) {
     }
 
+    @Override
     public boolean getNeedClientAuth() {
         return false;
     }
 
+    @Override
     public void setWantClientAuth(boolean want) {
     }
 
+    @Override
     public boolean getWantClientAuth() {
         return false;
     }
 
+    @Override
     public void setUseClientMode(boolean mode) {
     }
 
+    @Override
     public boolean getUseClientMode() {
         return false;
     }
 
+    @Override
     public void setEnableSessionCreation(boolean flag) {
     }
 
+    @Override
     public boolean getEnableSessionCreation() {
         return false;
     }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLSocketTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLSocketTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLSocketTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLSocketTest.java Sun Dec 14 10:30:16 2008
@@ -126,67 +126,85 @@
         super(host, port, clientAddress, clientPort);
     }
 
+    @Override
     public String[] getSupportedCipherSuites() {
         return null;
     }
 
+    @Override
     public String[] getEnabledCipherSuites() {
         return null;
     }
 
+    @Override
     public void setEnabledCipherSuites(String[] suites) {
     }
 
+    @Override
     public String[] getSupportedProtocols() {
         return null;
     }
 
+    @Override
     public String[] getEnabledProtocols() {
         return null;
     }
 
+    @Override
     public void setEnabledProtocols(String[] protocols) {
     }
 
+    @Override
     public SSLSession getSession() {
         return null;
     }
 
+    @Override
     public void addHandshakeCompletedListener(
             HandshakeCompletedListener listener) {
     }
 
+    @Override
     public void removeHandshakeCompletedListener(
             HandshakeCompletedListener listener) {
     }
 
+    @Override
     public void startHandshake() throws IOException {
     }
 
+    @Override
     public void setUseClientMode(boolean mode) {
     }
 
+    @Override
     public boolean getUseClientMode() {
         return false;
     }
 
+    @Override
     public void setNeedClientAuth(boolean need) {
     }
 
+    @Override
     public boolean getNeedClientAuth() {
         return false;
     }
 
+    @Override
     public void setWantClientAuth(boolean want) {
     }
 
+    @Override
     public boolean getWantClientAuth() {
         return false;
     }
 
+    @Override
     public void setEnableSessionCreation(boolean flag) {
     }
 
+    @Override
     public boolean getEnableSessionCreation() {
         return false;
     }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory2Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory2Test.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory2Test.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory2Test.java Sun Dec 14 10:30:16 2008
@@ -56,6 +56,7 @@
 
     Provider mProv;
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         mProv = (new SpiEngUtils()).new MyProvider("MyTMFProvider",
@@ -67,6 +68,7 @@
     /*
      * @see TestCase#tearDown()
      */
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         Security.removeProvider(mProv.getName());

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/HandshakeCompletedEventTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/HandshakeCompletedEventTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/HandshakeCompletedEventTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/HandshakeCompletedEventTest.java Sun Dec 14 10:30:16 2008
@@ -33,6 +33,7 @@
 public class HandshakeCompletedEventTest extends SerializationTest implements
         SerializationTest.SerializableAssert {
 
+    @Override
     protected Object[] getData() {
         try {
             SSLContext cont = SSLContext.getInstance("TLS");

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLExceptionTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLExceptionTest.java Sun Dec 14 10:30:16 2008
@@ -38,6 +38,7 @@
             "New message",
             "Long message for Exception. Long message for Exception. Long message for Exception." };
 
+    @Override
     protected Object[] getData() {
         String msg = null;
         Exception cause = new Exception(msgs[1]);

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLHandshakeExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLHandshakeExceptionTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLHandshakeExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLHandshakeExceptionTest.java Sun Dec 14 10:30:16 2008
@@ -38,6 +38,7 @@
             "New message",
             "Long message for Exception. Long message for Exception. Long message for Exception." };
 
+    @Override
     protected Object[] getData() {
         return new Object[] { new SSLHandshakeException(null),
                 new SSLHandshakeException(msgs[0]), new SSLHandshakeException(msgs[1]) };

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLKeyExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLKeyExceptionTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLKeyExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLKeyExceptionTest.java Sun Dec 14 10:30:16 2008
@@ -38,6 +38,7 @@
             "New message",
             "Long message for Exception. Long message for Exception. Long message for Exception." };
 
+    @Override
     protected Object[] getData() {
         return new Object[] { new SSLKeyException(null),
                 new SSLKeyException(msgs[0]), new SSLKeyException(msgs[1]) };

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLPeerUnverifiedExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLPeerUnverifiedExceptionTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLPeerUnverifiedExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLPeerUnverifiedExceptionTest.java Sun Dec 14 10:30:16 2008
@@ -38,6 +38,7 @@
             "New message",
             "Long message for Exception. Long message for Exception. Long message for Exception." };
 
+    @Override
     protected Object[] getData() {
         return new Object[] { new SSLPeerUnverifiedException(null),
                 new SSLPeerUnverifiedException(msgs[0]), new SSLPeerUnverifiedException(msgs[1]) };

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLProtocolExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLProtocolExceptionTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLProtocolExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLProtocolExceptionTest.java Sun Dec 14 10:30:16 2008
@@ -38,6 +38,7 @@
             "New message",
             "Long message for Exception. Long message for Exception. Long message for Exception." };
 
+    @Override
     protected Object[] getData() {
         return new Object[] { new SSLProtocolException(null),
                 new SSLProtocolException(msgs[0]), new SSLProtocolException(msgs[1]) };

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLSessionBindingEventTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLSessionBindingEventTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLSessionBindingEventTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLSessionBindingEventTest.java Sun Dec 14 10:30:16 2008
@@ -33,6 +33,7 @@
 public class SSLSessionBindingEventTest extends SerializationTest implements
         SerializationTest.SerializableAssert {
 
+    @Override
     protected Object[] getData() {
         try {
             SSLContext cont = SSLContext.getInstance("TLS");

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/ServerSocketFactoryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/ServerSocketFactoryTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/ServerSocketFactoryTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/ServerSocketFactoryTest.java Sun Dec 14 10:30:16 2008
@@ -77,15 +77,18 @@
     }
 }
 class MyServerSocketFactory extends ServerSocketFactory {
+    @Override
     public ServerSocket createServerSocket(int port) throws IOException, UnknownHostException {
         throw new IOException();
     }
     
+    @Override
     public ServerSocket createServerSocket(int port, int backlog)
             throws IOException, UnknownHostException {
         throw new IOException();
     }
     
+    @Override
     public ServerSocket createServerSocket(int port, int backlog, InetAddress ifAddress) throws IOException {
         throw new IOException();
      }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/SocketFactoryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/SocketFactoryTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/SocketFactoryTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/SocketFactoryTest.java Sun Dec 14 10:30:16 2008
@@ -82,19 +82,23 @@
     }
 }
 class MySocketFactory extends SocketFactory {
+    @Override
     public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
         throw new IOException();
     }
     
+    @Override
     public Socket createSocket(String host, int port, InetAddress localHost, int localPort)
             throws IOException, UnknownHostException {
         throw new IOException();
     }
     
+    @Override
     public Socket createSocket(InetAddress host, int port) throws IOException {
         throw new IOException();
      }
     
+    @Override
     public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort)
             throws IOException {
         throw new IOException();

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/ssl/HttpsURLConnection_ImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/ssl/HttpsURLConnection_ImplTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/ssl/HttpsURLConnection_ImplTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/ssl/HttpsURLConnection_ImplTest.java Sun Dec 14 10:30:16 2008
@@ -62,6 +62,7 @@
     /*
      * @see javax.net.ssl.HttpsURLConnection#getCipherSuite()
      */
+    @Override
     public String getCipherSuite() {
         return null;
     }
@@ -69,6 +70,7 @@
     /*
      * @see javax.net.ssl.HttpsURLConnection#getLocalCertificates()
      */
+    @Override
     public Certificate[] getLocalCertificates() {
         return null;
     }
@@ -76,6 +78,7 @@
     /*
      * @see javax.net.ssl.HttpsURLConnection#getServerCertificates()
      */
+    @Override
     public Certificate[] getServerCertificates()
             throws SSLPeerUnverifiedException {
         return null;
@@ -84,12 +87,14 @@
     /*
      * @see java.net.HttpURLConnection#disconnect()
      */
+    @Override
     public void disconnect() {
     }
 
     /*
      * @see java.net.HttpURLConnection#usingProxy()
      */
+    @Override
     public boolean usingProxy() {
         return false;
     }
@@ -97,6 +102,7 @@
     /*
      * @see java.net.URLConnection#connect()
      */
+    @Override
     public void connect() throws IOException {
     }
 }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/ssl/SSLServerSocketFactoryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/ssl/SSLServerSocketFactoryTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/ssl/SSLServerSocketFactoryTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/ssl/SSLServerSocketFactoryTest.java Sun Dec 14 10:30:16 2008
@@ -40,6 +40,7 @@
     /*
      * @see TestCase#setUp()
      */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         String defaultName = Security.getProperty("ssl.ServerSocketFactory.provider");
@@ -62,6 +63,7 @@
     /*
      * @see TestCase#tearDown()
      */
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
     }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/ssl/SSLSocketFactoryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/ssl/SSLSocketFactoryTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/ssl/SSLSocketFactoryTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/javax/net/ssl/SSLSocketFactoryTest.java Sun Dec 14 10:30:16 2008
@@ -40,6 +40,7 @@
     /*
      * @see TestCase#setUp()
      */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         String defaultName = Security.getProperty("ssl.SocketFactory.provider");
@@ -62,6 +63,7 @@
     /*
      * @see TestCase#tearDown()
      */
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
     }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/DigitalSignatureTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/DigitalSignatureTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/DigitalSignatureTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/DigitalSignatureTest.java Sun Dec 14 10:30:16 2008
@@ -33,6 +33,7 @@
     private PrivateKey key;
     private Certificate cert;
     
+    @Override
     public void setUp() throws Exception {
 
         char[] pwd = JSSETestData.KS_PASSWORD;

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLEngineImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLEngineImplTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLEngineImplTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLEngineImplTest.java Sun Dec 14 10:30:16 2008
@@ -50,6 +50,7 @@
     /**
      * Sets up the test case.
      */
+    @Override
     public void setUp() throws Exception {
         if (doLog) {
             System.out.println("");

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImplTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImplTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImplTest.java Sun Dec 14 10:30:16 2008
@@ -36,6 +36,7 @@
     /**
      * Sets up the test case.
      */
+    @Override
     public void setUp() {
         if (doLog) {
             System.out.println("");
@@ -61,6 +62,7 @@
 
             final SSLServerSocket s = ssocket;
             Thread thread = new Thread() {
+                @Override
                 public void run() {
                     try {
                         s.accept().close();
@@ -118,6 +120,7 @@
 
             final SSLServerSocket s = ssocket;
             Thread thread = new Thread() {
+                @Override
                 public void run() {
                     try {
                         s.accept().close();
@@ -175,6 +178,7 @@
 
             final SSLServerSocket s = ssocket;
             Thread thread = new Thread() {
+                @Override
                 public void run() {
                     try {
                         s.accept().close();
@@ -232,6 +236,7 @@
 
             final SSLServerSocket s = ssocket;
             Thread thread = new Thread() {
+                @Override
                 public void run() {
                     try {
                         s.accept().close();
@@ -598,6 +603,7 @@
             return client.getLocalPort();
         }
 
+        @Override
         public void run() {
             while (!closed) {
                 try {

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoriesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoriesTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoriesTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoriesTest.java Sun Dec 14 10:30:16 2008
@@ -44,6 +44,7 @@
     /**
      * Sets up the test case.
      */
+    @Override
     public void setUp() throws Exception {
         super.setUp();
         if (doLog) {
@@ -53,6 +54,7 @@
         }
     }
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
     }
@@ -293,6 +295,7 @@
             final SSLServerSocket ss = ssocket;
             final SSLSocket s = csocket;
             server = new Thread() {
+                @Override
                 public void run() {
                     InputStream is = null;
                     OutputStream os = null;
@@ -362,6 +365,7 @@
             };
 
             client = new Thread() {
+                @Override
                 public void run() {
                     InputStream is = null;
                     OutputStream os = null;

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFunctionalTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFunctionalTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFunctionalTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFunctionalTest.java Sun Dec 14 10:30:16 2008
@@ -51,6 +51,7 @@
     /**
      * Sets up the test case.
      */
+    @Override
     public void setUp() throws Exception {
         if (doLog) {
             System.out.println("========================");
@@ -187,6 +188,7 @@
             final SSLServerSocket ss = ssocket;
             final SSLSocket s = csocket;
             server = new Thread() {
+                @Override
                 public void run() {
                     InputStream is = null;
                     OutputStream os = null;
@@ -256,6 +258,7 @@
             };
 
             client = new Thread() {
+                @Override
                 public void run() {
                     InputStream is = null;
                     OutputStream os = null;



Mime
View raw message