This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: java.net - more merging
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Fri, 9 May 2003 09:12:56 +0200
- Subject: FYI: Patch: java.net - more merging
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I commited the attached patch to trunk to merge java.net more with
classpath.
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE+u1T4WSOgCCdjSDsRAgNCAJ4hRTUUcISrgc8s07mtJCfd+zCRnACgmBO+
5N8Jgi7h/1iLkOb1TB3UISs=
=F+da
-----END PGP SIGNATURE-----
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1876
diff -u -b -B -r1.1876 ChangeLog
--- ChangeLog 6 May 2003 10:07:28 -0000 1.1876
+++ ChangeLog 9 May 2003 07:08:21 -0000
@@ -1,3 +1,15 @@
+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-06 Michael Koch <konqueror@gmx.de>
* java/io/DataOutputStream.java
Index: java/net/JarURLConnection.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/JarURLConnection.java,v
retrieving revision 1.14
diff -u -b -B -r1.14 JarURLConnection.java
--- java/net/JarURLConnection.java 2 May 2003 12:32:38 -0000 1.14
+++ java/net/JarURLConnection.java 9 May 2003 07:08:21 -0000
@@ -234,7 +234,7 @@
}
/**
- * 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
*
@@ -285,7 +285,7 @@
}
/**
- * 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 @@
*
* @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 @@
}
/**
- * 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 @@
}
/**
- * 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
*/
Index: java/net/URLConnection.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/URLConnection.java,v
retrieving revision 1.18
diff -u -b -B -r1.18 URLConnection.java
--- java/net/URLConnection.java 2 May 2003 14:23:21 -0000 1.18
+++ java/net/URLConnection.java 9 May 2003 07:08:21 -0000
@@ -1021,4 +1021,5 @@
dateFormat3 = new SimpleDateFormat("EEE MMM d hh:mm:ss yyyy", locale);
dateformats_initialized = true;
}
-}
+} // class URLConnection
+