Makefile.am (ordinary_java_source_files): Add DefaultContentHandlerFactory.java.
2004-07-22 Bryce McKinlay <mckinlay@redhat.com> * Makefile.am (ordinary_java_source_files): Add DefaultContentHandlerFactory.java. * Makefile.in: Rebuilt. * java/net/URLConnection.java (defaultFactory): New field. (getContent): (getContentHandler): Renamed from 'setContentHandler'. Try defaultFactory after user-set factory, if any. Search for content handler implementations in gnu.java.net.content, not gnu.gcj.content. * gnu/java/net/protocol/file/Connection.java (getHeaderField): Implemented. (getLastModified): Implemented. (getPermission): Create file permission here, instead of in constructor. * gnu/java/net/protocol/gcjlib/Connection.java (getHeaderField): Implemented. * gnu/java/net/protocol/jar/Connection.java (getHeaderField): Implemented. (getLastModified): Implemented. * gnu/java/awt/ClasspathToolkit.java (createImageProducer): New. Default implementation. * gnu/java/awt/peer/gtk/GtkToolkit.java (createImageProducer): New. Implement using GdkPixbufDecoder. From-SVN: r85069
This commit is contained in:
parent
ef453534c4
commit
f1f90ae0de
9 changed files with 197 additions and 40 deletions
|
@ -49,8 +49,11 @@ import java.net.MalformedURLException;
|
|||
import java.net.ProtocolException;
|
||||
import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.Hashtable;
|
||||
import java.util.Locale;
|
||||
import java.util.jar.JarEntry;
|
||||
import java.util.jar.JarFile;
|
||||
import java.util.jar.JarInputStream;
|
||||
|
@ -66,6 +69,14 @@ import java.util.zip.ZipFile;
|
|||
public final class Connection extends JarURLConnection
|
||||
{
|
||||
private static Hashtable file_cache = new Hashtable();
|
||||
|
||||
/**
|
||||
* HTTP-style DateFormat, used to format the last-modified header.
|
||||
*/
|
||||
private static SimpleDateFormat dateFormat
|
||||
= new SimpleDateFormat("EEE, dd MMM yyyy hh:mm:ss 'GMT'",
|
||||
new Locale ("En", "Us", "Unix"));
|
||||
|
||||
private JarFile jar_file;
|
||||
|
||||
/**
|
||||
|
@ -219,6 +230,32 @@ public final class Connection extends JarURLConnection
|
|||
return jar_file;
|
||||
}
|
||||
|
||||
public String getHeaderField(String field)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!connected)
|
||||
connect();
|
||||
|
||||
if (field.equals("content-type"))
|
||||
return guessContentTypeFromName(getJarEntry().getName());
|
||||
else if (field.equals("content-length"))
|
||||
return Long.toString(getJarEntry().getSize());
|
||||
else if (field.equals("last-modified"))
|
||||
{
|
||||
synchronized (dateFormat)
|
||||
{
|
||||
return dateFormat.format(new Date(getJarEntry().getTime()));
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
// Fall through.
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public int getContentLength()
|
||||
{
|
||||
if (!connected)
|
||||
|
@ -233,4 +270,19 @@ public final class Connection extends JarURLConnection
|
|||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
public long getLastModified()
|
||||
{
|
||||
if (!connected)
|
||||
return -1;
|
||||
|
||||
try
|
||||
{
|
||||
return getJarEntry().getTime();
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue