OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[multiple changes]

Browse Source 
2005-04-28  Jeroen Frijters  <jeroen@frijters.net>

	* gnu/java/net/protocol/file/Connection.java
	(StaticData): New inner class to contain statics.
	(connect, getHeaderField): Modified to use StaticData.

2005-04-28  Michael Koch  <konqueror@gmx.de>

	* gnu/java/net/protocol/file/Connection.java
	(lineSeparator): Initialize with SystemProperties.getProperty().

From-SVN: r98929
This commit is contained in:
Michael Koch 2005-04-28 17:25:02 +00:00
parent 15d6512462
commit a9eed58b76
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libjava/ChangeLog
View File

@ -1,3 +1,14 @@
2005-04-28 Jeroen Frijters <jeroen@frijters.net>
* gnu/java/net/protocol/file/Connection.java
(StaticData): New inner class to contain statics.
(connect, getHeaderField): Modified to use StaticData.
2005-04-28 Michael Koch <konqueror@gmx.de>
* gnu/java/net/protocol/file/Connection.java
(lineSeparator): Initialize with SystemProperties.getProperty().
2005-04-27 Chris Burdess <dog@gnu.org>
* gnu/java/net/protocol/file/Connection.java: Return correct content

36
libjava/gnu/java/net/protocol/file/Connection.java
View File

@ -37,7 +37,7 @@ exception statement from your version. */
package gnu.java.net.protocol.file;
import gnu.java.security.action.GetPropertyAction;
import gnu.classpath.SystemProperties;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@ -56,7 +56,6 @@ import java.net.ProtocolException;
import java.net.URL;
import java.net.URLConnection;
import java.security.Permission;
import java.security.AccessController;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
@ -76,23 +75,19 @@ public class Connection extends URLConnection
*/
private static final String DEFAULT_PERMISSION = "read";
/**
* 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 static String lineSeparator;
static
private static class StaticData
{
if (lineSeparator == null)
{
GetPropertyAction getProperty = new GetPropertyAction("line.separator");
lineSeparator = (String) AccessController.doPrivileged(getProperty);
}
/**
* HTTP-style DateFormat, used to format the last-modified header.
*/
static SimpleDateFormat dateFormat
= new SimpleDateFormat("EEE, dd MMM yyyy hh:mm:ss 'GMT'",
new Locale ("En", "Us", "Unix"));
static String lineSeparator =
SystemProperties.getProperty("line.separator");
}
/**
* This is a File object for this connection
@ -182,7 +177,7 @@ public class Connection extends URLConnection
for (int i = 0; i < files.length; i++)
{
writer.write(files[i]);
writer.write(lineSeparator);
writer.write(StaticData.lineSeparator);
}
directoryListing = sink.toByteArray();
@ -271,9 +266,10 @@ public class Connection extends URLConnection
}
else if (field.equals("last-modified"))
{
synchronized (dateFormat)
synchronized (StaticData.dateFormat)
{
return dateFormat.format(new Date(file.lastModified()));
return StaticData.dateFormat.format(
new Date(file.lastModified()));
}
}
}