Huge exception overhaul: Merged ClusterStorageException with

PersistencyException. Replaced MembershipException with
InvalidCollectionModification CORBA Exception. Made all predef steps
throw more accurate exceptions when they go wrong, and let more
exceptions bubble through from underneath.

1 files changed, 6 insertions, 4 deletions

diff --git a/src/main/java/com/c2kernel/collection/CollectionMember.java b/src/main/java/com/c2kernel/collection/CollectionMember.java
index 74d4671..b7b9f31 100644
--- a/src/main/java/com/c2kernel/collection/CollectionMember.java
+++ b/src/main/java/com/c2kernel/collection/CollectionMember.java
@@ -20,7 +20,8 @@
  */

 package com.c2kernel.collection;

 

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.InvalidCollectionModification;

+import com.c2kernel.common.ObjectNotFound;

 import com.c2kernel.entity.proxy.ItemProxy;

 import com.c2kernel.lookup.ItemPath;

 import com.c2kernel.utils.CastorHashMap;

@@ -57,8 +58,9 @@ public interface CollectionMember {
 	 * @param itemPath The item to assign

 	 * @throws MembershipException When the Item Properties don't match the

 	 * typing specification in ClassProps and Properties

+	 * @throws InvalidCollectionModification 

 	 */

-    public void assignItem(ItemPath itemPath) throws MembershipException;

+    public void assignItem(ItemPath itemPath) throws InvalidCollectionModification;

     

     /**

      * De-assign the slot, leaving it empty.

@@ -68,9 +70,9 @@ public interface CollectionMember {
     /**

      * Resolve the Item currently assigned

      * @return the ItemProxy of the assigned Item

-     * @throws ObjectNotFoundException When empty

+     * @throws ObjectNotFound When empty

      */

-    public ItemProxy resolveItem() throws ObjectNotFoundException;

+    public ItemProxy resolveItem() throws ObjectNotFound;

 

 	/**

 	 * Get the integer slot ID, as generated by the parent Collection