URLConnection.java, [...]: Added implementation of getHeaderFields().

2003-08-23  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().

From-SVN: r56532

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e01ab1ba9ae329593fbca8a8716a9fa0cb96e3b3..b4f319f5315f99e9cc86f17ef37a89d561796efa 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-23  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().
+
 2002-08-22  Tom Tromey  <tromey@redhat.com>
 
        * gij.cc (help): Document -cp and -classpath.

diff --git a/libjava/gnu/gcj/protocol/core/Connection.java b/libjava/gnu/gcj/protocol/core/Connection.java
index 6513e33621455235f0048165a0ee5b7731f8b73a..5bcbb8611c7002dd352b0988611ebc8560c4014e 100644 (file)
--- a/libjava/gnu/gcj/protocol/core/Connection.java
+++ b/libjava/gnu/gcj/protocol/core/Connection.java
@@ -13,6 +13,7 @@ package gnu.gcj.protocol.core;
 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;
@@ -71,6 +72,20 @@ class Connection extends URLConnection
     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.
   public String getHeaderField(int n)
   {

diff --git a/libjava/gnu/gcj/protocol/file/Connection.java b/libjava/gnu/gcj/protocol/file/Connection.java
index 5510c5d74ea22bc3b37747175c537ad9baa943ec..4fcdb11ed52cfffaa7816773fc199f1e2ff3a4bc 100644 (file)
--- a/libjava/gnu/gcj/protocol/file/Connection.java
+++ b/libjava/gnu/gcj/protocol/file/Connection.java
@@ -12,6 +12,7 @@ package gnu.gcj.protocol.file;
 
 import java.net.*;
 import java.io.*;
+import java.util.Map;
 import java.util.Vector;
 import java.util.Hashtable;
 import java.util.Enumeration;
@@ -95,6 +96,20 @@ class Connection extends URLConnection
     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.
   public String getHeaderField(int n)
   {

diff --git a/libjava/gnu/gcj/protocol/http/Connection.java b/libjava/gnu/gcj/protocol/http/Connection.java
index 10fbfd667230557554b14acbe16303b0eb9a693e..caababa68233e5183d562563114c18a5dd4e50fb 100644 (file)
--- a/libjava/gnu/gcj/protocol/http/Connection.java
+++ b/libjava/gnu/gcj/protocol/http/Connection.java
@@ -12,6 +12,7 @@ package gnu.gcj.protocol.http;
 
 import java.net.*;
 import java.io.*;
+import java.util.Map;
 import java.util.Vector;
 import java.util.Hashtable;
 import java.util.Enumeration;
@@ -167,6 +168,22 @@ class Connection extends HttpURLConnection
     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.
   public String getHeaderField(int n)
   {

diff --git a/libjava/java/net/JarURLConnection.java b/libjava/java/net/JarURLConnection.java
index 60adfcd9c61828698cc249d340cbb4a19f26299e..a2b3434352dfe07d1168d591cc260c9502437df9 100644 (file)
--- a/libjava/java/net/JarURLConnection.java
+++ b/libjava/java/net/JarURLConnection.java
@@ -12,6 +12,7 @@ import java.net.*;
 import java.io.*;
 import java.util.jar.*;
 import java.util.zip.*;
+import java.util.Map;
 import java.util.Vector;
 import java.util.Hashtable;
 
@@ -214,6 +215,20 @@ public abstract class JarURLConnection extends URLConnection
     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.
   public String getHeaderField(int n)
   {

diff --git a/libjava/java/net/URLConnection.java b/libjava/java/net/URLConnection.java
index 8f8cf5ed575673ba6b83e55a3e00d9ef06dc141f..6ee41aa57761bbca803161a39bce52adefb9f5ea 100644 (file)
--- a/libjava/java/net/URLConnection.java
+++ b/libjava/java/net/URLConnection.java
@@ -17,6 +17,7 @@ import java.text.SimpleDateFormat;
 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;
 
@@ -107,6 +108,15 @@ public abstract class URLConnection
     return null;
   }
 
+  /**
+   * @since 1.4
+   */
+  public Map getHeaderFields()
+  {
+    // Subclasses for specific protocols override this.
+    return null;
+  }
+
   public int getHeaderFieldInt(String name, int val)
   {
     String str = getHeaderField(name);