FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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.

From-SVN: r76523
This commit is contained in:
Michael Koch 2004-01-24 20:56:47 +00:00 • committed by Michael Koch
parent 1f44254ccf
commit 8cd2bdca39
2 changed files with 16 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libjava/ChangeLog
View file

@ -1,3 +1,16 @@
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> 2004-01-24 Michael Koch <konqueror@gmx.de>
* Makefile.am: Added library version to gtk peer lib. * Makefile.am: Added library version to gtk peer lib.

133
libjava/gnu/java/net/protocol/jar/Connection.java
View file

@ -49,15 +49,13 @@ import java.net.MalformedURLException;
import java.net.ProtocolException; import java.net.ProtocolException;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.util.Map;
import java.util.Vector;
import java.util.HashMap; import java.util.HashMap;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.jar.JarFile;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.jar.JarInputStream; import java.util.jar.JarInputStream;
import java.util.zip.ZipFile;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
/** /**
* This subclass of java.net.JarURLConnection models a URLConnection via * This subclass of java.net.JarURLConnection models a URLConnection via
@ -71,7 +69,7 @@ public final class Connection extends JarURLConnection
private JarFile jar_file; private JarFile jar_file;
/** /**
* Cached JarURLConnection objects . * Cached JarURLConnection objects.
*/ */
static HashMap connectionCache = new HashMap(); static HashMap connectionCache = new HashMap();
@ -220,129 +218,4 @@ public final class Connection extends JarURLConnection
return jar_file; 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));
}
} }