aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog12
-rw-r--r--libjava/gnu/java/net/protocol/file/Connection.java56
2 files changed, 46 insertions, 22 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5c815e9..1bd4ccc 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,15 @@
+2004-09-10 Dalibor Topic <robilad@kaffe.org>
+
+ * gnu/java/net/protocol/file/Connection.java (permission): New field.
+ (DEFAULT_PERMISSION): New constant.
+ (Connection): Create a FilePermission with permission to read file.
+
+2004-09-10 Michael Koch <konqueror@gmx.de>
+
+ * gnu/java/net/protocol/file/Connection.java
+ (getLastModified): Moved around.
+ (getPermission): Return stored permission.
+
2004-09-10 Michael Koch <konqueror@gmx.de>
* Makefile.in: Regenerate.
diff --git a/libjava/gnu/java/net/protocol/file/Connection.java b/libjava/gnu/java/net/protocol/file/Connection.java
index 3927130..2754717 100644
--- a/libjava/gnu/java/net/protocol/file/Connection.java
+++ b/libjava/gnu/java/net/protocol/file/Connection.java
@@ -69,6 +69,11 @@ import java.util.Locale;
public class Connection extends URLConnection
{
/**
+ * Default permission for a file
+ */
+ private static final String DEFAULT_PERMISSION = "read";
+
+ /**
* HTTP-style DateFormat, used to format the last-modified header.
*/
private static SimpleDateFormat dateFormat
@@ -93,11 +98,18 @@ 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);
}
/**
@@ -187,6 +199,26 @@ public class Connection extends URLConnection
}
/**
+ * Get the last modified time of the resource.
+ *
+ * @return the time since epoch that the resource was modified.
+ */
+ public long getLastModified()
+ {
+ try
+ {
+ if (!connected)
+ connect();
+
+ return file.lastModified();
+ }
+ catch (IOException e)
+ {
+ return -1;
+ }
+ }
+
+ /**
* Get an http-style header field. Just handle a few common ones.
*/
public String getHeaderField(String field)
@@ -224,30 +256,10 @@ public class Connection extends URLConnection
{
try
{
- if (!connected)
- connect();
-
- return (int) file.length();
- }
- catch (IOException e)
- {
- return -1;
- }
- }
-
- /**
- * Get the last modified time of the resource.
- *
- * @return the time since epoch that the resource was modified.
- */
- public long getLastModified()
- {
- try
- {
if (!connected)
connect();
- return file.lastModified();
+ return (int) file.length();
}
catch (IOException e)
{
@@ -265,6 +277,6 @@ public class Connection extends URLConnection
*/
public Permission getPermission() throws IOException
{
- return new FilePermission(getURL().getFile(), "read");
+ return permission;
}
}