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

6 files changed, 81 insertions, 0 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e01ab1b..b4f319f 100644
--- 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 6513e33..5bcbb86 100644
--- 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;
@@ -72,6 +73,20 @@ class Connection extends URLConnection
   }
 
   // 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)
   {
     try
diff --git a/libjava/gnu/gcj/protocol/file/Connection.java b/libjava/gnu/gcj/protocol/file/Connection.java
index 5510c5d..4fcdb11 100644
--- 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;
@@ -96,6 +97,20 @@ class Connection extends URLConnection
   }
 
   // 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)
   {
     try
diff --git a/libjava/gnu/gcj/protocol/http/Connection.java b/libjava/gnu/gcj/protocol/http/Connection.java
index 10fbfd6..caababa 100644
--- 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;
@@ -168,6 +169,22 @@ class Connection extends HttpURLConnection
   }
 
   // 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)
   {
     if (!connected)
diff --git a/libjava/java/net/JarURLConnection.java b/libjava/java/net/JarURLConnection.java
index 60adfcd..a2b3434 100644
--- 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;
 
@@ -215,6 +216,20 @@ public abstract class JarURLConnection extends URLConnection
   }
 
   // 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)
   {
     try
diff --git a/libjava/java/net/URLConnection.java b/libjava/java/net/URLConnection.java
index 8f8cf5e..6ee41aa 100644
--- 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);