2003-05-02 Michael Koch <konqueror@gmx.de>

	* java/net/JarURLConnection.java
	(JarURLConnection): Class documentation merged with classpath.
	(getJarFileURL): Moved and documentation merged with classpath.
	(getEntryName): Likewise.
	(JarURLConnection): Documentation merged with classpath.
	(getJarEntry): Likewise.
	(getJarFile): Likewise.
	* java/net/PlainDatagramSocketImpl.java:
	Class documentation moved.
	* java/net/URLConnection.java
	(fileNameMap): Moved and documentation merged with classpath.
	(factory): Likewise.
	(defaultAllowUserInteraction): Likewis.
	(defaultUseCaches): Likewise.
	(allowUserInteraction): Likewise.
	(connected): Likewise.
	(url): Likewise.
	(connect): Documentation merged with classpath.
	(getURL): Likewise.
	(getContentLength): Likewise.
	(getContentType): Likewise.
	(getContentEncoding): Likewise.
	(getExpiration): Likewise.
	(getDate): Likewise.
	(getLastModified): Likewise.
	(getHeaderField): Likewise.
	(getContent): Likewise.
	(getPermission): Likewise.
	(getInputStream): Likewise.
	(getOutputStream): Likewise.
	(toString): Likewise.
	(getDoInput): Likewise.
	(getDoOutput): Likewise.
	(setAllowUserInteraction): Likewise.
	(getAllowUserInteraction): Likewise.
	(setDefaultAllowUserInteraction): Likewise.
	(getDefaultAllowUserInteraction): Likewise.
	(setUseCaches): Likewise.
	(getUseCaches): Likewise.
	(setIfModifiedSince): Likewise.
	(getIfModifiedSince): Likewise.
	(setDefaultRequestProperty): Likewise.
	(getDefaultRequestProperty): Likewise.
	(setContentHandlerFactory): Likewise.
	(setFileNameMap): Likewise.

From-SVN: r66379

libjava/ChangeLog

 2003-05-02  Michael Koch  <konqueror@gmx.de>
 
+	* java/net/JarURLConnection.java
+	(JarURLConnection): Class documentation merged with classpath.
+	(getJarFileURL): Moved and documentation merged with classpath.
+	(getEntryName): Likewise.
+	(JarURLConnection): Documentation merged with classpath.
+	(getJarEntry): Likewise.
+	(getJarFile): Likewise.
+	* java/net/PlainDatagramSocketImpl.java:
+	Class documentation moved.
+	* java/net/URLConnection.java
+	(fileNameMap): Moved and documentation merged with classpath.
+	(factory): Likewise.
+	(defaultAllowUserInteraction): Likewis.
+	(defaultUseCaches): Likewise.
+	(allowUserInteraction): Likewise.
+	(connected): Likewise.
+	(url): Likewise.
+	(connect): Documentation merged with classpath.
+	(getURL): Likewise.
+	(getContentLength): Likewise.
+	(getContentType): Likewise.
+	(getContentEncoding): Likewise.
+	(getExpiration): Likewise.
+	(getDate): Likewise.
+	(getLastModified): Likewise.
+	(getHeaderField): Likewise.
+	(getContent): Likewise.
+	(getPermission): Likewise.
+	(getInputStream): Likewise.
+	(getOutputStream): Likewise.
+	(toString): Likewise.
+	(getDoInput): Likewise.
+	(getDoOutput): Likewise.
+	(setAllowUserInteraction): Likewise.
+	(getAllowUserInteraction): Likewise.
+	(setDefaultAllowUserInteraction): Likewise.
+	(getDefaultAllowUserInteraction): Likewise.
+	(setUseCaches): Likewise.
+	(getUseCaches): Likewise.
+	(setIfModifiedSince): Likewise.
+	(getIfModifiedSince): Likewise.
+	(setDefaultRequestProperty): Likewise.
+	(getDefaultRequestProperty): Likewise.
+	(setContentHandlerFactory): Likewise.
+	(setFileNameMap): Likewise.
+
+2003-05-02  Michael Koch  <konqueror@gmx.de>
+
 	* java/net/InetAddress.java:
 	Merged class documentation with classpath.
 	* java/net/JarURLConnection.java:

libjava/java/net/JarURLConnection.java

@@ -54,9 +54,29 @@ import java.util.Hashtable;
 import java.security.cert.Certificate;
 
 /**
+ * This abstract class represents a common superclass for implementations
+ * of jar URL's.  A jar URL is a special type of URL that allows JAR
+ * files on remote systems to be accessed.  It has the form:
+ * <p>
+ * jar:<standard URL pointing to jar file>!/file/within/jarfile
+ * <p> for example:
+ * <p>
+ * jar:http://www.urbanophile.com/java/foo.jar!/com/urbanophile/bar.class
+ * <p>
+ * That example URL points to the file /com/urbanophile/bar.class in the
+ * remote JAR file http://www.urbanophile.com/java/foo.jar.  The HTTP
+ * protocol is used only as an example.  Any supported remote protocol
+ * can be used.
+ * <p>
+ * This class currently works by retrieving the entire jar file into a
+ * local cache file, then performing standard jar operations on it.
+ * (At least this is true for the default protocol implementation).
+ *
+ * @author Aaron M. Renn <arenn@urbanophile.com>
  * @author Kresten Krab Thorup <krab@gnu.org>
- * @since 1.2
  * @date Aug 10, 1999.
+ *
+ * @since 1.2
  */
 public abstract class JarURLConnection extends URLConnection
 {
@@ -74,18 +94,10 @@ public abstract class JarURLConnection extends URLConnection
   // Cached JarURLConnection's 
   static Hashtable conn_cache = new Hashtable();
 
-  public URL getJarFileURL ()
-  {
-    return jarFileURL;
-  }
-
-  public String getEntryName ()
-  {
-    return element;
-  }
-
   /**
-   * Creates a new JarURLConnection
+   * Creates a JarURLConnection from an URL object
+   *
+   * @param URL url The URL object for this connection.
    *
    * @exception MalformedURLException If url is invalid
    *
@@ -108,6 +120,29 @@ public abstract class JarURLConnection extends URLConnection
     element = (bang+2==spec.length() ? null : spec.substring (bang+2));
   }
 
+  /**
+   * This method returns the "real" URL where the JarFile is located.
+   * //****Is this right?*****
+   *
+   * @return The remote URL
+   */
+  public URL getJarFileURL ()
+  {
+    return jarFileURL;
+  }
+
+  /**
+   * Returns the "entry name" portion of the jar URL.  This is the portion
+   * after the "!/" in the jar URL that represents the pathname inside the
+   * actual jar file.
+   *
+   * @return The entry name.
+   */
+  public String getEntryName ()
+  {
+    return element;
+  }
+
   public synchronized void connect() throws IOException
   {
     // Call is ignored if already connected.
@@ -201,6 +236,8 @@ public abstract class JarURLConnection extends URLConnection
   /**
    * Return the JAR entry object for this connection, if any
    *
+   * @return The jar entry
+   *
    * @exception IOException If an error occurs
    */
   public JarEntry getJarEntry () throws IOException
@@ -250,10 +287,11 @@ public abstract class JarURLConnection extends URLConnection
   /**
    * Return the JAR file for this connection
    *
+   * @return The JarFile object
+   *
    * @exception IOException If an error occurs
    */
-  public abstract JarFile getJarFile() throws IOException;
-
+  public abstract JarFile getJarFile () throws IOException;
 
   // Steal and borrow from protocol/file/Connection.java
 

libjava/java/net/PlainDatagramSocketImpl.java

@@ -37,12 +37,8 @@ exception statement from your version. */
 
 
 package java.net;
-import java.io.IOException;
 
-/**
- * @author Warren Levy <warrenl@cygnus.com>
- * @date May 3, 1999.
- */
+import java.io.IOException;
 
 /**
  * Written using on-line Java Platform 1.2 API Specification, as well
@@ -50,6 +46,10 @@ import java.io.IOException;
  * Status:  Believed complete and correct.
  */
 
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date May 3, 1999.
+ */
 class PlainDatagramSocketImpl extends DatagramSocketImpl
 {
   // These fields are mirrored for use in native code to avoid cpp conflicts