mpoeschl 2002/12/13 03:30:36
Modified: src/java/org/apache/turbine/om/security TurbineGroup.java
TurbinePermission.java
Log:
remove deprecated methods
Revision Changes Path
1.3 +13 -46
jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineGroup.java
Index: TurbineGroup.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineGroup.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineGroup.java 11 Jul 2002 07:34:30 -0000 1.2
+++ TurbineGroup.java 13 Dec 2002 11:30:36 -0000 1.3
@@ -91,47 +91,19 @@
*
* @param name The name of the new object.
*/
- public TurbineGroup( String name )
+ public TurbineGroup(String name)
{
super(name);
}
- /**
- * Provides a reference to the Group object that represents the
- * <a href="#global">global group</a>.
- *
- * @return a Group object that represents the global group.
- * @deprecated Please use the method in TurbineSecurity now.
- */
- public static Group getGlobalGroup()
- {
- return TurbineSecurity.getGlobalGroup();
- }
-
- /**
- * Creates a new Group in the system.
- *
- * @param name The name of the new Group.
- * @return An object representing the new Group.
- * @throws TurbineSecurityException if the Group could not be created.
- * @deprecated Please use the createGroup method in TurbineSecurity now.
- */
- public static Group create( String name )
- throws TurbineSecurityException
- {
- return TurbineSecurity.createGroup(name);
- }
-
// These following methods are wrappers around TurbineSecurity
/**
* Makes changes made to the Group attributes permanent.
*
- * @throws TurbineSecurityException if there is a problem while
- * saving data.
+ * @throws TurbineSecurityException if there is a problem while saving data.
*/
- public void save()
- throws TurbineSecurityException
+ public void save() throws TurbineSecurityException
{
TurbineSecurity.saveGroup(this);
}
@@ -163,8 +135,7 @@
*
* @throws TurbineSecurityException if the Group could not be removed.
*/
- public void remove()
- throws TurbineSecurityException
+ public void remove() throws TurbineSecurityException
{
TurbineSecurity.removeGroup(this);
}
@@ -175,8 +146,7 @@
* @param name The new Group name.
* @throws TurbineSecurityException if the Group could not be renamed.
*/
- public void rename(String name)
- throws TurbineSecurityException
+ public void rename(String name) throws TurbineSecurityException
{
TurbineSecurity.renameGroup(this, name);
}
@@ -189,8 +159,7 @@
* @throws TurbineSecurityException if there is a problem while assigning
* the Role.
*/
- public void grant(User user, Role role)
- throws TurbineSecurityException
+ public void grant(User user, Role role) throws TurbineSecurityException
{
TurbineSecurity.grant(user, this, role);
}
@@ -204,12 +173,12 @@
* the Roles.
*/
public void grant(User user, RoleSet roleSet)
- throws TurbineSecurityException
+ throws TurbineSecurityException
{
Iterator roles = roleSet.elements();
while(roles.hasNext())
{
- TurbineSecurity.grant(user, this, (Role)roles.next());
+ TurbineSecurity.grant(user, this, (Role) roles.next());
}
}
@@ -221,8 +190,7 @@
* @throws TurbineSecurityException if there is a problem while unassigning
* the Role.
*/
- public void revoke(User user, Role role)
- throws TurbineSecurityException
+ public void revoke(User user, Role role) throws TurbineSecurityException
{
TurbineSecurity.revoke(user, this, role);
}
@@ -236,13 +204,12 @@
* the Roles.
*/
public void revoke(User user, RoleSet roleSet)
- throws TurbineSecurityException
+ throws TurbineSecurityException
{
Iterator roles = roleSet.elements();
- while(roles.hasNext())
+ while (roles.hasNext())
{
- TurbineSecurity.revoke(user, this, (Role)roles.next());
+ TurbineSecurity.revoke(user, this, (Role) roles.next());
}
}
}
-
1.3 +6 -24
jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbinePermission.java
Index: TurbinePermission.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbinePermission.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbinePermission.java 11 Jul 2002 07:34:30 -0000 1.2
+++ TurbinePermission.java 13 Dec 2002 11:30:36 -0000 1.3
@@ -84,33 +84,17 @@
*
* @param name The name of the new object.
*/
- public TurbinePermission( String name )
+ public TurbinePermission(String name)
{
super(name);
}
/**
- * Creates a new Permission in the system.
- *
- * @param name The name of the new Permission.
- * @return An object representing the new Permission.
- * @throws TurbineSecurityException if the Permission could not be created.
- * @deprecated Please use the createPermission method in TurbineSecurity.
- */
- public static Permission create( String name )
- throws TurbineSecurityException
- {
- return TurbineSecurity.createPermission(name);
- }
-
- /**
* Makes changes made to the Permission attributes permanent.
*
- * @throws TurbineSecurityException if there is a problem while
- * saving data.
+ * @throws TurbineSecurityException if there is a problem while saving data.
*/
- public void save()
- throws TurbineSecurityException
+ public void save() throws TurbineSecurityException
{
TurbineSecurity.savePermission(this);
}
@@ -142,8 +126,7 @@
*
* @throws TurbineSecurityException if the Permission could not be removed.
*/
- public void remove()
- throws TurbineSecurityException
+ public void remove() throws TurbineSecurityException
{
TurbineSecurity.removePermission(this);
}
@@ -154,8 +137,7 @@
* @param name The new Permission name.
* @throws TurbineSecurityException if the Permission could not be renamed.
*/
- public void rename(String name)
- throws TurbineSecurityException
+ public void rename(String name) throws TurbineSecurityException
{
TurbineSecurity.renamePermission(this, name);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
