Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms
In directory
james.mmbase.org:/tmp/cvs-serv1100/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms
Modified Files:
Tag: b1_4
RestoreAction.java DeleteAction.java
Log Message:
Merge van 1.5
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms
Index: RestoreAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAction.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- RestoreAction.java 3 Mar 2008 10:22:17 -0000 1.4.2.1
+++ RestoreAction.java 14 Mar 2008 12:50:37 -0000 1.4.2.2
@@ -56,11 +56,4 @@
}
return mapping.findForward(SUCCESS);
}
-
-
- @Override
- public String getRequiredRankStr() {
- return ADMINISTRATOR;
- }
-
}
Index: DeleteAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/DeleteAction.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -b -r1.7.2.1 -r1.7.2.2
--- DeleteAction.java 3 Mar 2008 10:22:17 -0000 1.7.2.1
+++ DeleteAction.java 14 Mar 2008 12:50:37 -0000 1.7.2.2
@@ -66,11 +66,4 @@
}
return mapping.findForward(SUCCESS);
}
-
-
- @Override
- public String getRequiredRankStr() {
- return ADMINISTRATOR;
- }
-
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
