diff options
| author | Michael Koch <konqueror@gmx.de> | 2003-05-09 07:11:11 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-05-09 07:11:11 +0000 |
| commit | 44db872cf5e9f65d8968a5e3f4c88d7886c0ca42 (patch) | |
| tree | 3e6ff9b46a559cc65ae52d3233b9fcc3797ab47d /libjava | |
| parent | d8048dc2f71b8daa7ff9641134e489101cbc220c (diff) | |
| download | gcc-44db872cf5e9f65d8968a5e3f4c88d7886c0ca42.zip gcc-44db872cf5e9f65d8968a5e3f4c88d7886c0ca42.tar.gz gcc-44db872cf5e9f65d8968a5e3f4c88d7886c0ca42.tar.bz2 | |
2003-05-09 Michael Koch <konqueror@gmx.de>
* java/net/JarURLConnection.java
(getJarEntry): Merged documentation from classpath.
(getJarFile): Likewise.
(getMainAttributes): Likewise.
(getAttributes): Likewise.
(getManifest): Likewise.
(getCertificates): Reformatted.
* java/net/URLConnection.java:
Little classpath merge.
From-SVN: r66625
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 12 | ||||
| -rw-r--r-- | libjava/java/net/JarURLConnection.java | 25 | ||||
| -rw-r--r-- | libjava/java/net/URLConnection.java | 3 |
3 files changed, 31 insertions, 9 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 9f47624..52c0ce1 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,17 @@ 2003-05-09 Michael Koch <konqueror@gmx.de> + * java/net/JarURLConnection.java + (getJarEntry): Merged documentation from classpath. + (getJarFile): Likewise. + (getMainAttributes): Likewise. + (getAttributes): Likewise. + (getManifest): Likewise. + (getCertificates): Reformatted. + * java/net/URLConnection.java: + Little classpath merge. + +2003-05-09 Michael Koch <konqueror@gmx.de> + * java/io/DataOutputStream.java (writeShort): Made it synchronized. (writeChar): Likewise. diff --git a/libjava/java/net/JarURLConnection.java b/libjava/java/net/JarURLConnection.java index a1f1d0d..b8e9de0 100644 --- a/libjava/java/net/JarURLConnection.java +++ b/libjava/java/net/JarURLConnection.java @@ -234,8 +234,8 @@ public abstract class JarURLConnection extends URLConnection } /** - * Return the JAR entry object for this connection, if any - * + * Returns the entry in this jar file specified by the URL. + * * @return The jar entry * * @exception IOException If an error occurs @@ -285,7 +285,7 @@ public abstract class JarURLConnection extends URLConnection } /** - * Return the JAR file for this connection + * Returns a read-only JarFile object for the remote jar file * * @return The JarFile object * @@ -426,13 +426,16 @@ public abstract class JarURLConnection extends URLConnection * * @exception IOException If an error occurs */ - public Certificate[] getCertificates() throws IOException + public Certificate[] getCertificates () throws IOException { - return getJarEntry().getCertificates(); + return getJarEntry ().getCertificates (); } /** - * Returns the main Attributes for the JAR file for this connection + * Returns the main Attributes for the jar file specified in the URL or + * null if there are none + * + * @return The main Attributes for the JAR file for this connection * * @exception IOException If an error occurs */ @@ -442,7 +445,10 @@ public abstract class JarURLConnection extends URLConnection } /** - * Return the Attributes object for this connection if the URL for it points + * Returns the Attributes for the Jar entry specified by the URL or null + * if none + * + * @return The Attributes object for this connection if the URL for it points * to a JAR file entry, null otherwise * * @exception IOException If an error occurs @@ -454,7 +460,10 @@ public abstract class JarURLConnection extends URLConnection } /** - * Returns the Manifest for this connection, or null if none + * Returns a Manifest object for this jar file, or null if there is no + * manifest. + * + * @return The Manifest for this connection, or null if none * * @exception IOException If an error occurs */ diff --git a/libjava/java/net/URLConnection.java b/libjava/java/net/URLConnection.java index 2065cad..75adf52 100644 --- a/libjava/java/net/URLConnection.java +++ b/libjava/java/net/URLConnection.java @@ -1021,4 +1021,5 @@ public abstract class URLConnection dateFormat3 = new SimpleDateFormat("EEE MMM d hh:mm:ss yyyy", locale); dateformats_initialized = true; } -} +} // class URLConnection + |