This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: java.net.*URLConnection


Am Mittwoch, 21. August 2002 08:08 schrieben Sie:
> Hello list,
>
>
> I have implemented the method getHeaderFields in URLConnection and derived
> classes. Please review.

Forgot the attachment.
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1408
diff -u -b -r1.1408 ChangeLog
--- ChangeLog	21 Aug 2002 05:34:44 -0000	1.1408
+++ ChangeLog	21 Aug 2002 06:06:39 -0000
@@ -1,5 +1,14 @@
 2003-08-21  Michael Koch  <konqueror@gmx.de>
 
+	* java/net/URLConnection.java,
+	java/netJarURLConnection.java,
+	gnu/gcj/protocol/core/Connection.java,
+	gnu/gcj/protocol/file/Connection.java,
+	gnu/gcj/protocol/http/Connection.java: Added implementation of
+	getHeaderFields().
+
+2003-08-21  Michael Koch  <konqueror@gmx.de>
+
 	* java/net/Authenticator.java: updated JDK 1.4
 	* java/net/ContentHandler.java: updated JDK 1.4
 
Index: java/net/URLConnection.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/URLConnection.java,v
retrieving revision 1.7
diff -u -b -r1.7 URLConnection.java
--- java/net/URLConnection.java	7 Jan 2001 20:01:46 -0000	1.7
+++ java/net/URLConnection.java	21 Aug 2002 06:06:39 -0000
@@ -17,6 +17,7 @@
 import java.util.Date;
 import java.util.Locale;
 import java.util.Hashtable;
+import java.util.Map;
 import java.util.StringTokenizer;
 import gnu.gcj.io.MimeTypes;
 
@@ -102,6 +103,15 @@
   }
 
   public String getHeaderField(String name)
+  {
+    // Subclasses for specific protocols override this.
+    return null;
+  }
+
+  /**
+   * @since 1.4
+   */
+  public Map getHeaderFields()
   {
     // Subclasses for specific protocols override this.
     return null;
Index: java/net/JarURLConnection.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/JarURLConnection.java,v
retrieving revision 1.4
diff -u -b -r1.4 JarURLConnection.java
--- java/net/JarURLConnection.java	20 Aug 2000 17:49:11 -0000	1.4
+++ java/net/JarURLConnection.java	21 Aug 2002 06:06:39 -0000
@@ -12,6 +12,7 @@
 import java.io.*;
 import java.util.jar.*;
 import java.util.zip.*;
+import java.util.Map;
 import java.util.Vector;
 import java.util.Hashtable;
 
@@ -212,6 +213,20 @@
 	return null;
       }
     return (String) hdrHash.get(name.toLowerCase());
+  }
+
+  // Override default method in URLConnection.
+  public Map getHeaderFields()
+  {
+    try
+      {
+        getHeaders();
+      }
+    catch (IOException x)
+      {
+        return null;
+      }
+    return hdrHash;
   }
 
   // Override default method in URLConnection.
Index: gnu/gcj/protocol/core/Connection.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/gcj/protocol/core/Connection.java,v
retrieving revision 1.1
diff -u -b -r1.1 Connection.java
--- gnu/gcj/protocol/core/Connection.java	6 Sep 2001 22:32:54 -0000	1.1
+++ gnu/gcj/protocol/core/Connection.java	21 Aug 2002 06:06:39 -0000
@@ -13,6 +13,7 @@
 import gnu.gcj.Core;
 import java.net.*;
 import java.io.*;
+import java.util.Map;
 import java.util.Vector;
 import java.util.Hashtable;
 import java.util.Enumeration;
@@ -69,6 +70,20 @@
 	return null;
       }
     return (String) hdrHash.get(name.toLowerCase());
+  }
+
+  // Override default method in URLConnection.
+  public Map getHeaderFields()
+  {
+    try
+      {
+	getHeaders();
+      }
+    catch (IOException x)
+      {
+	return null;
+      }
+    return hdrHash;
   }
 
   // Override default method in URLConnection.
Index: gnu/gcj/protocol/file/Connection.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/gcj/protocol/file/Connection.java,v
retrieving revision 1.5
diff -u -b -r1.5 Connection.java
--- gnu/gcj/protocol/file/Connection.java	22 Feb 2002 13:53:22 -0000	1.5
+++ gnu/gcj/protocol/file/Connection.java	21 Aug 2002 06:06:39 -0000
@@ -12,6 +12,7 @@
 
 import java.net.*;
 import java.io.*;
+import java.util.Map;
 import java.util.Vector;
 import java.util.Hashtable;
 import java.util.Enumeration;
@@ -93,6 +94,20 @@
 	return null;
       }
     return (String) hdrHash.get(name.toLowerCase());
+  }
+
+  // Override default method in URLConnection.
+  public Map getHeaderFields()
+  {
+    try
+      {
+	getHeaders();
+      }
+    catch (IOException x)
+      {
+	return null;
+      }
+    return hdrHash;
   }
 
   // Override default method in URLConnection.
Index: gnu/gcj/protocol/http/Connection.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/gcj/protocol/http/Connection.java,v
retrieving revision 1.6
diff -u -b -r1.6 Connection.java
--- gnu/gcj/protocol/http/Connection.java	15 Apr 2002 03:15:23 -0000	1.6
+++ gnu/gcj/protocol/http/Connection.java	21 Aug 2002 06:06:39 -0000
@@ -12,6 +12,7 @@
 
 import java.net.*;
 import java.io.*;
+import java.util.Map;
 import java.util.Vector;
 import java.util.Hashtable;
 import java.util.Enumeration;
@@ -165,6 +166,22 @@
 	}
 
     return (String) hdrHash.get(name.toLowerCase());
+  }
+
+  // Override default method in URLConnection.
+  public Map getHeaderFields()
+  {
+    if (!connected)
+      try
+        {
+	  connect();
+	}
+      catch (IOException x)
+        {
+	  return null;
+	}
+
+    return hdrHash;
   }
 
   // Override default method in URLConnection.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]