From a1f0ecbb6a2bea6aa214322c412af2f3c5ce124b Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Wed, 7 May 2014 17:33:13 +0200
Subject: Agent now extends Item, so they can have workflows. All traces of the
 old 'Entity' superclasses should be removed, including proxies and paths.
 Very large change, breaks API compatibility with CRISTAL 2.x. Fixes #135

---
 src/main/java/com/c2kernel/utils/DescriptionObjectCache.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/c2kernel/utils/DescriptionObjectCache.java')

diff --git a/src/main/java/com/c2kernel/utils/DescriptionObjectCache.java b/src/main/java/com/c2kernel/utils/DescriptionObjectCache.java
index d5382da..4322ef4 100644
--- a/src/main/java/com/c2kernel/utils/DescriptionObjectCache.java
+++ b/src/main/java/com/c2kernel/utils/DescriptionObjectCache.java
@@ -5,7 +5,7 @@ package com.c2kernel.utils;
 
 import com.c2kernel.common.InvalidDataException;
 import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.proxy.EntityProxyObserver;
+import com.c2kernel.entity.proxy.ProxyObserver;
 import com.c2kernel.entity.proxy.ItemProxy;
 import com.c2kernel.entity.proxy.MemberSubscription;
 import com.c2kernel.persistency.ClusterStorage;
@@ -46,7 +46,7 @@ public abstract class DescriptionObjectCache<D extends DescriptionObject> {
 		}
 	}
 
-	public class CacheEntry<E extends DescriptionObject> implements EntityProxyObserver<Viewpoint> {
+	public class CacheEntry<E extends DescriptionObject> implements ProxyObserver<Viewpoint> {
 		public String id;
 		public ItemProxy proxy;
 		public E def;
-- 
cgit v1.2.3


From 42adf60503b73c5106b30ba57fdeba13b3091169 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 22 May 2014 10:14:42 +0200
Subject: Renamed method in DescriptionObjectCache which still refered to
 activities.

---
 src/main/java/com/c2kernel/utils/DescriptionObjectCache.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java/com/c2kernel/utils/DescriptionObjectCache.java')

diff --git a/src/main/java/com/c2kernel/utils/DescriptionObjectCache.java b/src/main/java/com/c2kernel/utils/DescriptionObjectCache.java
index 4322ef4..d7c5ec1 100644
--- a/src/main/java/com/c2kernel/utils/DescriptionObjectCache.java
+++ b/src/main/java/com/c2kernel/utils/DescriptionObjectCache.java
@@ -37,7 +37,7 @@ public abstract class DescriptionObjectCache<D extends DescriptionObject> {
 	
 	public abstract D loadObject(String name, int version, ItemProxy proxy) throws ObjectNotFoundException, InvalidDataException;
 
-	public void removeAct(String id) {
+	public void removeObject(String id) {
 		synchronized(cache) {
 		if (cache.keySet().contains(id)) {
 			Logger.msg(7, "ActDefCache: Removing activity def "+id+" from cache");
@@ -60,17 +60,17 @@ public abstract class DescriptionObjectCache<D extends DescriptionObject> {
 		}
 		@Override
 		public void finalize() {
-			parent.removeAct(id);
+			parent.removeObject(id);
 			proxy.unsubscribe(this);
 		}
 		@Override
 		public void add(Viewpoint contents) {
-			parent.removeAct(id);
+			parent.removeObject(id);
 		}
 
 		@Override
 		public void remove(String oldId) {
-			parent.removeAct(oldId);
+			parent.removeObject(oldId);
 		}
 
 		@Override
-- 
cgit v1.2.3