2006-06-28 Casey Marshall <[EMAIL PROTECTED]>
* gnu/java/security/Requires.java: new annotation.
* gnu/java/security/action/GetSecurityPropertyAction.java:
implement PrivilegedAction<String>.
(run): return String.
Committed.
### Eclipse Workspace Patch 1.0
#P classpath-ssl-nio
Index: gnu/java/security/action/GetSecurityPropertyAction.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/security/action/GetSecurityPropertyAction.java,v
retrieving revision 1.2.2.3
diff -u -r1.2.2.3 GetSecurityPropertyAction.java
--- gnu/java/security/action/GetSecurityPropertyAction.java 2 Aug 2005
20:12:12 -0000 1.2.2.3
+++ gnu/java/security/action/GetSecurityPropertyAction.java 28 Jun 2006
23:10:07 -0000
@@ -50,7 +50,7 @@
* String passwd = AccessController.doPrivileged(action);
* </code>
*/
-public class GetSecurityPropertyAction implements PrivilegedAction
+public class GetSecurityPropertyAction implements PrivilegedAction<String>
{
private String name;
private String value;
@@ -83,7 +83,7 @@
return this;
}
- public Object run()
+ public String run()
{
String val = Security.getProperty(name);
if (val == null)
Index: gnu/java/security/Requires.java
===================================================================
RCS file: gnu/java/security/Requires.java
diff -N gnu/java/security/Requires.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnu/java/security/Requires.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,59 @@
+/* Requires.java -- mark methods as requiring permission.
+ Copyright (C) 2006 Free Software Foundation, Inc.
+
+This file is a part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at
+your option) any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+USA
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.java.security;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.CLASS;
+import java.security.Permission;
+
+/**
+ *
+ *
+ * @author Casey Marshall ([EMAIL PROTECTED])
+ */
[EMAIL PROTECTED] @Retention(CLASS) @Target(METHOD)
+public @interface Requires
+{
+ Class<? extends Permission> permissionClass();
+ String target();
+ String action();
+}
PGP.sig
Description: This is a digitally signed message part
