From 89b5e95b7f0b149334fcda60039d3a9eb071a827 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 26 Sep 2014 09:26:47 +0200 Subject: Parent2ChildCollection was just a default implementation of Collection, so merge the two for simplicity. --- .../java/com/c2kernel/collection/Aggregation.java | 2 +- .../java/com/c2kernel/collection/Collection.java | 134 +++++++++++++++++-- .../c2kernel/collection/CollectionDescription.java | 2 +- .../java/com/c2kernel/collection/Dependency.java | 2 +- .../collection/Parent2ChildCollection.java | 144 --------------------- 5 files changed, 125 insertions(+), 159 deletions(-) delete mode 100644 src/main/java/com/c2kernel/collection/Parent2ChildCollection.java (limited to 'src/main/java') diff --git a/src/main/java/com/c2kernel/collection/Aggregation.java b/src/main/java/com/c2kernel/collection/Aggregation.java index 2f01936..12b24be 100644 --- a/src/main/java/com/c2kernel/collection/Aggregation.java +++ b/src/main/java/com/c2kernel/collection/Aggregation.java @@ -18,7 +18,7 @@ import com.c2kernel.utils.Logger; * @author $Author: abranson $ */ -abstract public class Aggregation extends Parent2ChildCollection +abstract public class Aggregation extends Collection { protected GraphModel mLayout = new GraphModel(new AggregationVertexOutlineCreator()); diff --git a/src/main/java/com/c2kernel/collection/Collection.java b/src/main/java/com/c2kernel/collection/Collection.java index 0c28a3b..5cac17c 100644 --- a/src/main/java/com/c2kernel/collection/Collection.java +++ b/src/main/java/com/c2kernel/collection/Collection.java @@ -1,33 +1,143 @@ package com.c2kernel.collection; + +import java.util.Iterator; + import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.entity.C2KLocalObject; import com.c2kernel.lookup.ItemPath; +import com.c2kernel.persistency.ClusterStorage; import com.c2kernel.utils.CastorHashMap; /** - * @version $Revision: 1.13 $ $Date: 2004/05/14 15:39:39 $ + * @version $Revision: 1.23 $ $Date: 2004/05/14 15:39:39 $ * @author $Author: abranson $ */ -public interface Collection extends C2KLocalObject +abstract public class Collection implements C2KLocalObject { - public static final short EMPTY = -1; - public int getCounter(); + public static final short EMPTY = -1; + private int mCounter = -1; // Contains next available Member ID + protected CollectionMemberList mMembers = new CollectionMemberList(); + protected int mID = -1; + protected String mName = ""; // Not checked for uniqueness + protected String mURLInfo = ""; + + public int getCounter() + { + if (mCounter == -1) + for (Object name : mMembers.list) { + CollectionMember element = (CollectionMember)name; + if (mCounter < element.getID()) + mCounter = element.getID(); + } + return ++mCounter; + } + + public void setCounter(int count) + { + mCounter = count; + } + + + public int size() + { + return mMembers.list.size(); + } + + public void setID(int id) + { + mID = id; + } + + public int getID() + { + return mID; + } + + @Override + public void setName(String name) + { + mName = name; + } + + public void setURLInfo(String urlInfo) + { + mURLInfo = urlInfo; + } + + @Override + public String getName() + { + return mName; + } - public void setCounter(int count); + @Override + public String getClusterType() + { + return ClusterStorage.COLLECTION; + } - public int size(); + public String getURLInfo() + { + return mURLInfo; + } - public void setMembers(CollectionMemberList newMembers); + public void setMembers(CollectionMemberList newMembers) + { + mMembers = newMembers; + } - public CollectionMemberList getMembers(); + public boolean contains(ItemPath itemPath) { + for (Object name : mMembers.list) { + CollectionMember element = (CollectionMember)name; + if (element.getItemPath().equals(itemPath)) + return true; + } + return false; + } - public E addMember(ItemPath itemPath, CastorHashMap props, String classProps) throws MembershipException; + public boolean isFull() + { + for (int i=0; i getMembers() + { + return mMembers; + } - public E getMember(int memberId) throws ObjectNotFoundException; + public abstract E addMember(ItemPath itemPath, CastorHashMap props, String classProps) throws MembershipException; + public abstract E addMember(ItemPath itemPath) throws MembershipException; + + public abstract void removeMember(int memberId) throws MembershipException; + + public boolean equals(Collection other) { + boolean same = mName.equals(other.getName()) && mURLInfo.equals(other.getURLInfo()) && size() == other.size(); + if (!same) return false; + for (Iterator i = getMembers().list.iterator(); i.hasNext();) { + try { + CollectionMember thisMem = i.next(); + CollectionMember otherMem = other.getMember(thisMem.getID()); + if (!thisMem.equals(otherMem)) return false; + } catch (ObjectNotFoundException ex) { + return false; + } + } + return true; + } } diff --git a/src/main/java/com/c2kernel/collection/CollectionDescription.java b/src/main/java/com/c2kernel/collection/CollectionDescription.java index 15c6928..7f24f03 100644 --- a/src/main/java/com/c2kernel/collection/CollectionDescription.java +++ b/src/main/java/com/c2kernel/collection/CollectionDescription.java @@ -11,6 +11,6 @@ import com.c2kernel.common.ObjectNotFoundException; * All rights reserved. **************************************************************************/ -public interface CollectionDescription extends Collection { +public interface CollectionDescription { public Collection newInstance() throws ObjectNotFoundException; } diff --git a/src/main/java/com/c2kernel/collection/Dependency.java b/src/main/java/com/c2kernel/collection/Dependency.java index 11ef16e..7a286df 100644 --- a/src/main/java/com/c2kernel/collection/Dependency.java +++ b/src/main/java/com/c2kernel/collection/Dependency.java @@ -16,7 +16,7 @@ e.g.: Used for ProductDesc::Item-dependency-dependencymember-WfDesc::Item * @version $Revision: 1.15 $ $Date: 2005/04/07 08:03:21 $ * @author $Author: abranson $ */ -public class Dependency extends Parent2ChildCollection +public class Dependency extends Collection { protected CastorHashMap mProperties = new CastorHashMap(); diff --git a/src/main/java/com/c2kernel/collection/Parent2ChildCollection.java b/src/main/java/com/c2kernel/collection/Parent2ChildCollection.java deleted file mode 100644 index 26aa451..0000000 --- a/src/main/java/com/c2kernel/collection/Parent2ChildCollection.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.c2kernel.collection; - -import java.util.Iterator; - -import com.c2kernel.common.ObjectNotFoundException; -import com.c2kernel.lookup.ItemPath; -import com.c2kernel.persistency.ClusterStorage; -import com.c2kernel.utils.CastorHashMap; - -/** - * @version $Revision: 1.23 $ $Date: 2004/05/14 15:39:39 $ - * @author $Author: abranson $ - */ -abstract public class Parent2ChildCollection implements Collection -{ - - private int mCounter = -1; // Contains next available Member ID - protected CollectionMemberList mMembers = new CollectionMemberList(); - protected int mID = -1; - protected String mName = ""; // Not checked for uniqueness - protected String mURLInfo = ""; - - @Override - public int getCounter() - { - if (mCounter == -1) - for (Object name : mMembers.list) { - CollectionMember element = (CollectionMember)name; - if (mCounter < element.getID()) - mCounter = element.getID(); - } - return ++mCounter; - } - - @Override - public void setCounter(int count) - { - mCounter = count; - } - - - @Override - public int size() - { - return mMembers.list.size(); - } - - public void setID(int id) - { - mID = id; - } - - public int getID() - { - return mID; - } - - @Override - public void setName(String name) - { - mName = name; - } - - public void setURLInfo(String urlInfo) - { - mURLInfo = urlInfo; - } - - @Override - public String getName() - { - return mName; - } - - @Override - public String getClusterType() - { - return ClusterStorage.COLLECTION; - } - - public String getURLInfo() - { - return mURLInfo; - } - - @Override - public void setMembers(CollectionMemberList newMembers) - { - mMembers = newMembers; - } - - public boolean contains(ItemPath itemPath) { - for (Object name : mMembers.list) { - CollectionMember element = (CollectionMember)name; - if (element.getItemPath().equals(itemPath)) - return true; - } - return false; - } - - public boolean isFull() - { - for (int i=0; i getMembers() - { - return mMembers; - } - - @Override - public abstract E addMember(ItemPath itemPath, CastorHashMap props, String classProps) throws MembershipException; - - public boolean equals(Parent2ChildCollection other) { - boolean same = mName.equals(other.getName()) && mURLInfo.equals(other.getURLInfo()) && size() == other.size(); - if (!same) return false; - for (Iterator i = getMembers().list.iterator(); i.hasNext();) { - try { - CollectionMember thisMem = i.next(); - CollectionMember otherMem = other.getMember(thisMem.getID()); - if (!thisMem.equals(otherMem)) return false; - } catch (ObjectNotFoundException ex) { - return false; - } - } - return true; - } -} -- cgit v1.2.3