[multiple changes]

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.

From-SVN: r87291

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5c815e9bfa91200aa1d1c6b24da43bae86145139..1bd4ccc34c599ea8c00384326ed42761c3bb3391 100644 (file)
--- 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 3927130101b84752843c809537f12c12a0795ec4..2754717bb14ac53b69f278734494594b583ba658 100644 (file)
--- a/libjava/gnu/java/net/protocol/file/Connection.java
+++ b/libjava/gnu/java/net/protocol/file/Connection.java
@@ -68,6 +68,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.
    */
@@ -92,12 +97,19 @@ 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);
   }
   
   /**
@@ -186,6 +198,26 @@ public class Connection extends URLConnection
     return outputStream;
   }
 
+  /**
+   * 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. 
    */
@@ -221,33 +253,13 @@ public class Connection extends URLConnection
    * @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.
-   *
-   * @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;
   }
 }