diff options
| author | Elliott Hughes <enh@google.com> | 2010-04-05 16:39:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-05 16:39:58 -0700 |
| commit | edd9393f000325c256ffa979c16c4b973f5e763b (patch) | |
| tree | 44ee526b20322d0a54ec8ee28e33a3788e1b3cec /security | |
| parent | 259d8cd068147f2dbf6005e119c7950fac1dbed6 (diff) | |
| parent | fdadb8ac223b2c09610f9b939225d4b9b524e451 (diff) | |
| download | libcore-edd9393f000325c256ffa979c16c4b973f5e763b.zip libcore-edd9393f000325c256ffa979c16c4b973f5e763b.tar.gz libcore-edd9393f000325c256ffa979c16c4b973f5e763b.tar.bz2 | |
am f3c7fd52: Merge "Froyo InputStream.available documentation improvement." into froyo
Diffstat (limited to 'security')
| -rw-r--r-- | security/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java | 43 |
1 files changed, 8 insertions, 35 deletions
diff --git a/security/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java b/security/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java index f0e47d9..cc175df 100644 --- a/security/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java +++ b/security/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java @@ -800,26 +800,17 @@ public class X509CertFactoryImpl extends CertificateFactorySpi { this.inStream = inStream; } - /** - * @see java.io.InputStream#available() - * method documentation for more info - */ + @Override public int available() throws IOException { return (bar - pos) + inStream.available(); } - /** - * @see java.io.InputStream#close() - * method documentation for more info - */ + @Override public void close() throws IOException { inStream.close(); } - /** - * @see java.io.InputStream#mark(int readlimit) - * method documentation for more info - */ + @Override public void mark(int readlimit) { if (pos < 0) { pos = 0; @@ -830,10 +821,7 @@ public class X509CertFactoryImpl extends CertificateFactorySpi { } } - /** - * @see java.io.InputStream#markSupported() - * method documentation for more info - */ + @Override public boolean markSupported() { return true; } @@ -881,18 +869,12 @@ public class X509CertFactoryImpl extends CertificateFactorySpi { return inStream.read(); } - /** - * @see java.io.InputStream#read(byte[] b) - * method documentation for more info - */ + @Override public int read(byte[] b) throws IOException { return read(b, 0, b.length); } - /** - * @see java.io.InputStream#read(byte[] b, int off, int len) - * method documentation for more info - */ + @Override public int read(byte[] b, int off, int len) throws IOException { int read_b; int i; @@ -905,10 +887,7 @@ public class X509CertFactoryImpl extends CertificateFactorySpi { return i; } - /** - * @see java.io.InputStream#reset() - * method documentation for more info - */ + @Override public void reset() throws IOException { if (pos >= 0) { pos = (end + 1) % BUFF_SIZE; @@ -918,10 +897,7 @@ public class X509CertFactoryImpl extends CertificateFactorySpi { } } - /** - * @see java.io.InputStream#skip(long n) - * method documentation for more info - */ + @Override public long skip(long n) throws IOException { if (pos >= 0) { long i = 0; @@ -939,6 +915,3 @@ public class X509CertFactoryImpl extends CertificateFactorySpi { } } } - - - |