Merge branch 'master' of ssh://dev.cccs.uwe.ac.uk:22/var/git/cristal-kernel

1 files changed, 6 insertions, 6 deletions

diff --git a/src/main/java/com/c2kernel/utils/DescriptionObjectCache.java b/src/main/java/com/c2kernel/utils/DescriptionObjectCache.java
index d5382da..d7c5ec1 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;

@@ -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");

@@ -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;

@@ -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