PatchSet 4944
Date: 2004/07/12 04:11:27
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: FilePermission
2004-07-11 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/java/io/FilePermission.java:
Resynced with GNU Classpath.
2004-06-25 Mark Wielaard <[EMAIL PROTECTED]>
* java/io/FilePermission.java (usingPerms): Removed.
(actionsString): Made final.
(cachePerms): Renamed to checkPerms.
(checkPerms): Renamed from cachePerms. Call trim() and toLowerCase()
on action String.
(FilePermission): Check arguments, call checkPerms().
(equals): Remove cachePerms() call.
(implies): Likewise.
Members:
ChangeLog:1.2509->1.2510
libraries/javalib/java/io/FilePermission.java:1.8->1.9
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2509 kaffe/ChangeLog:1.2510
--- kaffe/ChangeLog:1.2509 Mon Jul 12 03:58:42 2004
+++ kaffe/ChangeLog Mon Jul 12 04:11:27 2004
@@ -14,6 +14,22 @@
2004-07-11 Dalibor Topic <[EMAIL PROTECTED]>
+ * libraries/javalib/java/io/FilePermission.java:
+ Resynced with GNU Classpath.
+
+ 2004-06-25 Mark Wielaard <[EMAIL PROTECTED]>
+
+ * java/io/FilePermission.java (usingPerms): Removed.
+ (actionsString): Made final.
+ (cachePerms): Renamed to checkPerms.
+ (checkPerms): Renamed from cachePerms. Call trim() and toLowerCase()
+ on action String.
+ (FilePermission): Check arguments, call checkPerms().
+ (equals): Remove cachePerms() call.
+ (implies): Likewise.
+
+2004-07-11 Dalibor Topic <[EMAIL PROTECTED]>
+
* libraries/javalib/java/io/File.java:
Resynced with GNU Classpath.
Index: kaffe/libraries/javalib/java/io/FilePermission.java
diff -u kaffe/libraries/javalib/java/io/FilePermission.java:1.8
kaffe/libraries/javalib/java/io/FilePermission.java:1.9
--- kaffe/libraries/javalib/java/io/FilePermission.java:1.8 Tue May 18 03:35:06
2004
+++ kaffe/libraries/javalib/java/io/FilePermission.java Mon Jul 12 04:11:29 2004
@@ -1,5 +1,5 @@
/* java.lang.FilePermission
- Copyright (C) 1998, 2000, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2000, 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -46,23 +46,21 @@
private static final String CURRENT_DIRECTORY =
System.getProperty("user.dir");
- private boolean usingPerms = false;
private boolean readPerm = false;
private boolean writePerm = false;
private boolean executePerm = false;
private boolean deletePerm = false;
- private String actionsString;
+ private final String actionsString;
- private void cachePerms()
+ // Checks and caches the actions
+ private void checkPerms() throws IllegalArgumentException
{
- // While race conditions could occur, they don't matter at all.
-
String action;
int i = actionsString.indexOf(',');
int startI = 0;
while(i != -1)
{
- action = actionsString.substring(startI,i);
+ action = actionsString.substring(startI,i).trim().toLowerCase();
if(action.equals("read"))
readPerm = true;
else if(action.equals("write"))
@@ -71,12 +69,14 @@
executePerm = true;
else if(action.equals("delete"))
deletePerm = true;
+ else
+ throw new IllegalArgumentException("Unknown action: " + action);
startI = i+1;
i = actionsString.indexOf(',',startI);
}
- action = actionsString.substring(startI);
+ action = actionsString.substring(startI).trim().toLowerCase();
if(action.equals("read"))
readPerm = true;
else if(action.equals("write"))
@@ -85,19 +85,30 @@
executePerm = true;
else if(action.equals("delete"))
deletePerm = true;
+ else
+ throw new IllegalArgumentException("Unknown action: " + action);
}
- /** Create a new FilePermission.
- ** @param pathExpression an expression specifying the paths this
- ** permission represents.
- ** @param actionsString a comma-separated list of the actions this
- ** permission represents.
- ** FIXME: what to do when the file string is malformed?
- **/
+ /*
+ * Create a new FilePermission.
+ *
+ * @param pathExpression an expression specifying the paths this
+ * permission represents.
+ * @param actionsString a comma-separated list of the actions this
+ * permission represents. The actions must be "read", "write",
+ * "execute" and/or "delete".
+ *
+ * FIXME: what to do when the file string is malformed?
+ */
public FilePermission(String pathExpression, String actionsString)
{
super(pathExpression);
+ if (pathExpression == null)
+ throw new NullPointerException("pathExpression");
+ if (actionsString == null)
+ throw new IllegalArgumentException("actionsString");
this.actionsString = actionsString;
+ checkPerms();
}
/** Get the actions this FilePermission supports.
@@ -132,10 +143,6 @@
if(!(o instanceof FilePermission))
return false;
FilePermission p = (FilePermission)o;
- if(!usingPerms)
- cachePerms();
- if(!p.usingPerms)
- p.cachePerms();
String f1 = getName();
String f2 = p.getName();
@@ -282,11 +289,6 @@
}
break;
}
-
- if(!usingPerms)
- cachePerms();
- if(!fp.usingPerms)
- fp.cachePerms();
if(readPerm && !fp.readPerm)
return false;
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
