From 2e6e8c73eee2885b32c6d9713339472ed945c6a2 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Tue, 30 Sep 2014 23:51:32 +0200
Subject: Remove Collection.URLInfo. Add Collection.Version, and add it to the
 Collection ClusterStorage path.

---
 .../java/com/c2kernel/collection/Collection.java   | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'src/main/java/com/c2kernel/collection/Collection.java')

diff --git a/src/main/java/com/c2kernel/collection/Collection.java b/src/main/java/com/c2kernel/collection/Collection.java
index 710420f..13642c3 100644
--- a/src/main/java/com/c2kernel/collection/Collection.java
+++ b/src/main/java/com/c2kernel/collection/Collection.java
@@ -20,7 +20,7 @@ abstract public class Collection<E extends CollectionMember> implements C2KLocal
     protected CollectionMemberList<E> mMembers = new CollectionMemberList<E>();
     protected int mID = -1;
     protected String mName = "";     // Not checked for uniqueness
-    protected String mURLInfo = "";
+    protected Integer mVersion = null;
 
 	public int getCounter()
     {
@@ -60,28 +60,29 @@ abstract public class Collection<E extends CollectionMember> implements C2KLocal
         mName = name;
     }
 
-    public void setURLInfo(String urlInfo)
-    {
-        mURLInfo = urlInfo;
-    }
-
 	@Override
 	public String getName()
     {
         return mName;
     }
+	
+	public Integer getVersion() {
+		return mVersion;
+	}
 
+	public void setVersion(Integer mVersion) {
+		this.mVersion = mVersion;
+	}
+
+	public String getVersionName() {
+		return mVersion==null?"last":String.valueOf(mVersion);
+	}
 	@Override
 	public String getClusterType()
     {
         return ClusterStorage.COLLECTION;
     }
 
-    public String getURLInfo()
-    {
-        return mURLInfo;
-    }
-
 	public void setMembers(CollectionMemberList<E> newMembers)
     {
     	mMembers = newMembers;
@@ -130,7 +131,7 @@ abstract public class Collection<E extends CollectionMember> implements C2KLocal
     public boolean equals(Object other) {
 		if (!(other instanceof Collection<?>)) return false;
 		Collection<?> otherColl = (Collection<?>)other;
-    	boolean same = mName.equals(otherColl.getName()) && mURLInfo.equals(otherColl.getURLInfo()) && size() == otherColl.size();
+    	boolean same = mName.equals(otherColl.getName()) && size() == otherColl.size();
     	if (!same) return false;
 		for (Iterator<E> i = getMembers().list.iterator(); i.hasNext();) {
 			try {
-- 
cgit v1.2.3