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

Makefile.am (ordinary_java_source_files): Add DefaultContentHandlerFactory.java.

Browse source 
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:
Bryce McKinlay 2004-07-23 01:21:40 +00:00 • committed by Bryce McKinlay
parent ef453534c4
commit f1f90ae0de
9 changed files with 197 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

86
libjava/gnu/java/net/protocol/file/Connection.java
View file

@ -50,6 +50,9 @@ import java.net.ProtocolException;
import java.net.URL;
import java.net.URLConnection;
import java.security.Permission;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
/**
* This subclass of java.net.URLConnection models a URLConnection via
@ -62,9 +65,11 @@ import java.security.Permission;
public class Connection extends URLConnection
{
/**
* Default permission for a file
* HTTP-style DateFormat, used to format the last-modified header.
*/
private static final String DEFAULT_PERMISSION = "read";
private static SimpleDateFormat dateFormat
= new SimpleDateFormat("EEE, dd MMM yyyy hh:mm:ss 'GMT'",
new Locale ("En", "Us", "Unix"));
/**
* This is a File object for this connection
@ -81,19 +86,12 @@ public class Connection extends URLConnection
*/
private OutputStream outputStream;
/**
* FilePermission to read the file
*/
private FilePermission permission;
/**
* Calls superclass constructor to initialize.
*/
public Connection(URL url)
{
super (url);
permission = new FilePermission(getURL().getFile(), DEFAULT_PERMISSION);
}
/**
@ -155,6 +153,54 @@ public class Connection extends URLConnection
return outputStream;
}
/**
* Get an http-style header field. Just handle a few common ones.
*/
public String getHeaderField(String field)
{
try
{
if (!connected)
connect();
if (field.equals("content-type"))
return guessContentTypeFromName(file.getName());
else if (field.equals("content-length"))
return Long.toString(file.length());
else if (field.equals("last-modified"))
{
synchronized (dateFormat)
{
return dateFormat.format(new Date(file.lastModified()));
}
}
}
catch (IOException e)
{
// Fall through.
}
return null;
}
/**
* Get the length of content.
* @return the length of the content.
*/
public int getContentLength()
{
try
{
if (!connected)
connect();
return (int) file.length();
}
catch (IOException e)
{
return -1;
}
}
/**
* Get the last modified time of the resource.
*
@ -175,26 +221,6 @@ public class Connection extends URLConnection
}
}
/**
* Get the length of content.
*
* @return the length of the content.
*/
public int getContentLength()
{
try
{
if (!connected)
connect();
return (int) file.length();
}
catch (IOException e)
{
return -1;
}
}
/**
* This method returns a <code>Permission</code> object representing the
* permissions required to access this URL. This method returns a
@ -205,6 +231,6 @@ public class Connection extends URLConnection
*/
public Permission getPermission() throws IOException
{
return permission;
return new FilePermission(getURL().getFile(), "read");
}
}

19
libjava/gnu/java/net/protocol/gcjlib/Connection.java
View file

@ -61,4 +61,23 @@ class Connection extends URLConnection
connect();
return new CoreInputStream(core);
}
public String getHeaderField(String field)
{
try
{
if (!connected)
connect();
if (field.equals("content-type"))
return guessContentTypeFromName(name);
else if (field.equals("content-length"))
return Long.toString(core.length);
}
catch (IOException e)
{
// Fall through.
}
return null;
}
}

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

@ -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;
}
}
}