You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@apache.org on 2001/05/29 04:42:45 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/structure Structure.java StructureImpl.java
remm 01/05/28 19:42:45
Modified: src/share/org/apache/slide/structure Structure.java
StructureImpl.java
Log:
- Remove now checks for locks.
Revision Changes Path
1.7 +5 -5 jakarta-slide/src/share/org/apache/slide/structure/Structure.java
Index: Structure.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/Structure.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Structure.java 2001/02/09 03:29:35 1.6
+++ Structure.java 2001/05/29 02:42:43 1.7
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/Structure.java,v 1.6 2001/02/09 03:29:35 remm Exp $
- * $Revision: 1.6 $
- * $Date: 2001/02/09 03:29:35 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/Structure.java,v 1.7 2001/05/29 02:42:43 remm Exp $
+ * $Revision: 1.7 $
+ * $Date: 2001/05/29 02:42:43 $
*
* ====================================================================
*
@@ -78,7 +78,7 @@
* Structure helper.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public interface Structure {
@@ -249,6 +249,6 @@
void remove(SlideToken token, ObjectNode object)
throws ServiceAccessException, ObjectNotFoundException,
ObjectHasChildrenException, AccessDeniedException,
- LinkedObjectNotFoundException;
+ LinkedObjectNotFoundException, ObjectLockedException;
}
1.19 +7 -5 jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java
Index: StructureImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- StructureImpl.java 2001/05/16 12:07:20 1.18
+++ StructureImpl.java 2001/05/29 02:42:43 1.19
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java,v 1.18 2001/05/16 12:07:20 juergen Exp $
- * $Revision: 1.18 $
- * $Date: 2001/05/16 12:07:20 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java,v 1.19 2001/05/29 02:42:43 remm Exp $
+ * $Revision: 1.19 $
+ * $Date: 2001/05/29 02:42:43 $
*
* ====================================================================
*
@@ -78,7 +78,7 @@
* Data helper class.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.18 $
+ * @version $Revision: 1.19 $
*/
public final class StructureImpl implements Structure {
@@ -630,7 +630,7 @@
public void remove(SlideToken token, ObjectNode object)
throws ServiceAccessException, ObjectNotFoundException,
ObjectHasChildrenException, AccessDeniedException,
- LinkedObjectNotFoundException {
+ LinkedObjectNotFoundException, ObjectLockedException {
ObjectNode realObject = retrieve(token, object.getUri(), false);
Enumeration enum = realObject.enumerateChildren();
@@ -645,6 +645,8 @@
ObjectNode obj = parentUri.getStore().retrieveObject(parentUri);
obj.removeChild(realObject.getUri());
securityHelper.checkCredentials
+ (token, realObject, namespaceConfig.getRemoveObjectAction());
+ lockHelper.checkLock
(token, realObject, namespaceConfig.getRemoveObjectAction());
store(token, obj);
uri.getStore().removeObject(uri, realObject);