From 1fa7e0fd52d115bbe68f138a06d12e7a8adc4be5 Mon Sep 17 00:00:00 2001
From: Michael Koch <konqueror@gmx.de>
Date: Mon, 1 Dec 2003 15:50:23 +0000
Subject: [PATCH] 2003-12-01 Michael Koch <konqueror@gmx.de>
* gnu/java/net/protocol/file/Connection.java
(fileIn): Documentation added.
(inputStream): Likewise.
(outputStream): Likewise.
(Connection): Likewise.
(connect): Simplified.
From-SVN: r74106
---
libjava/ChangeLog | 9 +++
.../java/net/protocol/file/Connection.java | 61 ++++++++++++++++---
2 files changed, 62 insertions(+), 8 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index bd51ea3b493c..61aa598bba16 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2003-12-01 Michael Koch <konqueror@gmx.de>
+
+ * gnu/java/net/protocol/file/Connection.java
+ (fileIn): Documentation added.
+ (inputStream): Likewise.
+ (outputStream): Likewise.
+ (Connection): Likewise.
+ (connect): Simplified.
+
2003-12-01 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkImage.java (setDimensions,
diff --git a/libjava/gnu/java/net/protocol/file/Connection.java b/libjava/gnu/java/net/protocol/file/Connection.java
index 1df5c487c88f..dddbd309482b 100644
--- a/libjava/gnu/java/net/protocol/file/Connection.java
+++ b/libjava/gnu/java/net/protocol/file/Connection.java
@@ -38,38 +38,71 @@
*/
package gnu.java.net.protocol.file;
-import java.net.URL;
-import java.net.URLConnection;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.FilePermission;
import java.io.InputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.net.ProtocolException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.security.Permission;
import java.util.Map;
import java.util.Vector;
import java.util.Hashtable;
import java.util.Enumeration;
/**
+ * This subclass of java.net.URLConnection models a URLConnection via
+ * the "file" protocol.
+ *
+ * @author Aaron M. Renn <arenn@urbanophile.com>
+ * @author Nic Ferrier <nferrier@tapsellferrier.co.uk>
* @author Warren Levy <warrenl@cygnus.com>
- * @date April 13, 1999.
*/
public class Connection extends URLConnection
{
- private Hashtable hdrHash = new Hashtable();
- private Vector hdrVec = new Vector();
- private boolean gotHeaders = false;
+ /**
+ * Default permission for a file
+ */
+ private static final String DEFAULT_PERMISSION = "read";
+
+ /**
+ * This is a File object for this connection
+ */
private File fileIn;
+
+ /**
+ * InputStream if we are reading from the file
+ */
private InputStream inputStream;
+
+ /**
+ * OutputStream if we are writing to the file
+ */
private OutputStream outputStream;
+
+ private Hashtable hdrHash = new Hashtable();
+ private Vector hdrVec = new Vector();
+ private boolean gotHeaders = false;
+ /**
+ * 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);
}
/**
@@ -82,8 +115,7 @@ public class Connection extends URLConnection
return;
// If not connected, then file needs to be openned.
- String fname = url.getFile();
- fileIn = new File(fname);
+ fileIn = new File(getURL().getFile());
if (doInput)
inputStream = new BufferedInputStream(new FileInputStream(fileIn));
if (doOutput)
@@ -238,4 +270,17 @@ public class Connection extends URLConnection
hdrHash.put(key.toLowerCase(), Long.toString(len));
}
+ /**
+ * This method returns a <code>Permission</code> object representing the
+ * permissions required to access this URL. This method returns a
+ * <code>java.io.FilePermission</code> for the file's path with a read
+ * permission.
+ *
+ * @return A Permission object
+ */
+ public Permission getPermission() throws IOException
+ {
+ return permission;
+ }
+
} // class FileURLConnection
--
GitLab