diff options
Diffstat (limited to 'src/main/java/com/c2kernel/collection/Collection.java')
| -rw-r--r-- | src/main/java/com/c2kernel/collection/Collection.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/main/java/com/c2kernel/collection/Collection.java b/src/main/java/com/c2kernel/collection/Collection.java index 13642c3..270d021 100644 --- a/src/main/java/com/c2kernel/collection/Collection.java +++ b/src/main/java/com/c2kernel/collection/Collection.java @@ -25,8 +25,7 @@ abstract public class Collection<E extends CollectionMember> implements C2KLocal public int getCounter()
{
if (mCounter == -1)
- for (Object name : mMembers.list) {
- CollectionMember element = (CollectionMember)name;
+ for (E element : mMembers.list) {
if (mCounter < element.getID())
mCounter = element.getID();
}
@@ -89,19 +88,23 @@ abstract public class Collection<E extends CollectionMember> implements C2KLocal }
public boolean contains(ItemPath itemPath) {
- for (Object name : mMembers.list) {
- CollectionMember element = (CollectionMember)name;
+ for (E element : mMembers.list) {
if (element.getItemPath().equals(itemPath))
return true;
}
return false;
}
+
+ public String getDescVer(E mem) {
+ String descVer = "last";
+ Object descVerObj = mem.getProperties().get("Version");
+ if (descVerObj != null) descVer = descVerObj.toString();
+ return descVer;
+ }
public boolean isFull()
{
- for (int i=0; i<size(); i++)
- {
- CollectionMember element = mMembers.list.get(i);
+ for (E element : mMembers.list) {
if (element.getItemPath() == null)
return false;
}
@@ -135,7 +138,7 @@ abstract public class Collection<E extends CollectionMember> implements C2KLocal if (!same) return false;
for (Iterator<E> i = getMembers().list.iterator(); i.hasNext();) {
try {
- CollectionMember thisMem = i.next();
+ E thisMem = i.next();
CollectionMember otherMem = otherColl.getMember(thisMem.getID());
if (!thisMem.equals(otherMem)) return false;
} catch (ObjectNotFoundException ex) {
|