From 275d0bbf555c8917be82ce4cc21eb4cabb00f4c5 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 3 Oct 2014 17:30:41 +0200 Subject: 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. --- .../com/c2kernel/collection/AggregationDescription.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/main/java/com/c2kernel/collection/AggregationDescription.java') diff --git a/src/main/java/com/c2kernel/collection/AggregationDescription.java b/src/main/java/com/c2kernel/collection/AggregationDescription.java index ec58cc1..400a91d 100644 --- a/src/main/java/com/c2kernel/collection/AggregationDescription.java +++ b/src/main/java/com/c2kernel/collection/AggregationDescription.java @@ -21,11 +21,14 @@ package com.c2kernel.collection; /** - * @version $Revision: 1.34 $ $Date: 2004/03/23 09:29:41 $ - * @author $Author: abranson $ + * The description of a Collection with a graph layout. Each slot is + * instantiated empty in the resulting Aggregation, with ClassProps taken from + * the PropertyDescription outcome of the description slot's referenced Item. */ -import com.c2kernel.common.ObjectNotFoundException; +import com.c2kernel.common.InvalidCollectionModification; +import com.c2kernel.common.ObjectAlreadyExists; +import com.c2kernel.common.ObjectNotFound; import com.c2kernel.graph.model.Vertex; import com.c2kernel.property.PropertyDescriptionList; import com.c2kernel.property.PropertyUtility; @@ -45,7 +48,7 @@ public class AggregationDescription extends Aggregation implements CollectionDes } @Override - public Aggregation newInstance() throws ObjectNotFoundException + public Aggregation newInstance() throws ObjectNotFound { AggregationInstance newInstance = new AggregationInstance(getName()); //for each desc member @@ -61,9 +64,8 @@ public class AggregationDescription extends Aggregation implements CollectionDes try { Vertex v = getLayout().getVertexById(mem.getID()); newInstance.addMember(null, PropertyUtility.createProperty(pdList), pdList.getClassProps(),v.getCentrePoint(),v.getWidth(),v.getHeight()); - } catch (MembershipException e) { - // won't happen as we're not assigning an entity - } + } catch (InvalidCollectionModification e) { + } catch (ObjectAlreadyExists e) { } } else { -- cgit v1.2.3