summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2010-04-05 11:33:58 -0700
committerElliott Hughes <enh@google.com>2010-04-05 15:55:36 -0700
commit582d926fbf5f5fd4800def67f86ecfedee44681e (patch)
tree4d5c2aceb19e55dbc3559fa41372243772631413 /security
parentc985b01362bb964972c426317ab1e9852ab44753 (diff)
downloadlibcore-582d926fbf5f5fd4800def67f86ecfedee44681e.zip
libcore-582d926fbf5f5fd4800def67f86ecfedee44681e.tar.gz
libcore-582d926fbf5f5fd4800def67f86ecfedee44681e.tar.bz2
Froyo InputStream.available documentation improvement.
This method causes a lot of confusion, and we can do a lot better. (Ideally, the API would either not exist or be something like "public boolean ready()".) I've removed poor-quality documentation overrides too, so the full documentation is visible in most places. (InflaterInputStream is an obvious exception.) Also, to a lesser extent, improve the InputStream.skip documentation. Change-Id: I6d6cd788e6a32ad4a2613d1e381610f1ad8575fe
Diffstat (limited to 'security')
-rw-r--r--security/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java43
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 {
}
}
}
-
-
-