2004-01-24 Michael Koch <konqueror@gmx.de>

	* gnu/java/net/protocol/jar/Connection.java
	(hdrHash): Removed.
	(hdrVec): Removed.
	(gotHeaders): Removed.
	(getHeaderField): Removed.
	(getHeaderFields): Removed.
	(getHeaderFieldKey): Removed.
	(getKey): Removed.
	(getField): Removed.
	(getHeaders): Removed.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@76523 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c23266d..204df5a 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,18 @@
 2004-01-24  Michael Koch  <konqueror@gmx.de>
 
+       * gnu/java/net/protocol/jar/Connection.java
+       (hdrHash): Removed.
+       (hdrVec): Removed.
+       (gotHeaders): Removed.
+       (getHeaderField): Removed.
+       (getHeaderFields): Removed.
+       (getHeaderFieldKey): Removed.
+       (getKey): Removed.
+       (getField): Removed.
+       (getHeaders): Removed.
+
+2004-01-24  Michael Koch  <konqueror@gmx.de>
+
        * Makefile.am: Added library version to gtk peer lib.
        * Makefile.in: Regenerated.
 

diff --git a/libjava/gnu/java/net/protocol/jar/Connection.java b/libjava/gnu/java/net/protocol/jar/Connection.java
index af4903d..c14e3fd 100644 (file)
--- a/libjava/gnu/java/net/protocol/jar/Connection.java
+++ b/libjava/gnu/java/net/protocol/jar/Connection.java
@@ -49,15 +49,13 @@ import java.net.MalformedURLException;
 import java.net.ProtocolException;
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.Map;
-import java.util.Vector;
 import java.util.HashMap;
 import java.util.Hashtable;
-import java.util.jar.JarFile;
 import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
 import java.util.jar.JarInputStream;
-import java.util.zip.ZipFile;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 /**
  * This subclass of java.net.JarURLConnection models a URLConnection via
@@ -71,7 +69,7 @@ public final class Connection extends JarURLConnection
   private JarFile jar_file;
 
   /**
-   * Cached JarURLConnection objects .
+   * Cached JarURLConnection objects.
    */
   static HashMap connectionCache = new HashMap();
 
@@ -220,129 +218,4 @@ public final class Connection extends JarURLConnection
 
     return jar_file;
   }
-
-  // Steal and borrow from protocol/file/Connection.java
-
-  private Hashtable hdrHash = new Hashtable();
-  private Vector hdrVec = new Vector();
-  private boolean gotHeaders = false;
-
-  // Override default method in URLConnection.
-  public String getHeaderField(String name)
-  {
-    try
-      {
-       getHeaders();
-      }
-    catch (IOException x)
-      {
-       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.
-  public String getHeaderField(int n)
-  {
-    try
-      {
-       getHeaders();
-      }
-    catch (IOException x)
-      {
-       return null;
-      }
-    if (n < hdrVec.size())
-      return getField((String) hdrVec.elementAt(n));
-
-    return null;
-  }
-
-  // Override default method in URLConnection.
-  public String getHeaderFieldKey(int n)
-  {
-    try
-      {
-       getHeaders();
-      }
-    catch (IOException x)
-      {
-       return null;
-      }
-    if (n < hdrVec.size())
-      return getKey((String) hdrVec.elementAt(n));
-
-    return null;
-  }
-
-  private String getKey(String str)
-  {
-    if (str == null)
-      return null;
-    int index = str.indexOf(':');
-    if (index >= 0)
-      return str.substring(0, index);
-    else
-      return null;
-  }
-
-  private String getField(String str)
-  {
-    if (str == null)
-      return null;
-    int index = str.indexOf(':');
-    if (index >= 0)
-      return str.substring(index + 1).trim();
-    else
-      return str;
-  }
-
-  private void getHeaders() throws IOException
-  {
-    if (gotHeaders)
-      return;
-    gotHeaders = true;
-
-    connect();
-
-    // Yes, it is overkill to use the hash table and vector here since
-    // we're only putting one header in the file, but in case we need
-    // to add others later and for consistency, we'll implement it this way.
-
-    // Add the only header we know about right now:  Content-length.
-    long len = -1;
-
-    if (getEntryName() == null)
-      if (jarFileURLConnection != null)
-       len = jarFileURLConnection.getContentLength ();
-    else
-      {
-       JarEntry entry = getJarEntry();
-       if (entry != null)
-         len = entry.getSize ();
-      }
-
-    String line = "Content-length: " + len;
-    hdrVec.addElement(line);
-
-    // The key will never be null in this scenario since we build up the
-    // headers ourselves.  If we ever rely on getting a header from somewhere
-    // else, then we may have to check if the result of getKey() is null.
-    String key = getKey(line);
-    hdrHash.put(key.toLowerCase(), Long.toString(len));
-  }
 }