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

---
 .../com/c2kernel/entity/proxy/MemberSubscription.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/main/java/com/c2kernel/entity/proxy/MemberSubscription.java')

diff --git a/src/main/java/com/c2kernel/entity/proxy/MemberSubscription.java b/src/main/java/com/c2kernel/entity/proxy/MemberSubscription.java
index 1de18f8..01994e4 100644
--- a/src/main/java/com/c2kernel/entity/proxy/MemberSubscription.java
+++ b/src/main/java/com/c2kernel/entity/proxy/MemberSubscription.java
@@ -12,14 +12,14 @@ public class MemberSubscription<C extends C2KLocalObject> implements Runnable {
 	public static final String ERROR = "Error";
 	public static final String END = "theEND";
 	
-    EntityProxy subject;
+    ItemProxy subject;
     String interest;
     // keep the subscriber by weak reference, so it is not kept from the garbage collector if no longer used
-    WeakReference<EntityProxyObserver<C>> observerReference;
+    WeakReference<ProxyObserver<C>> observerReference;
     ArrayList<String> contents = new ArrayList<String>();
     boolean preLoad;
 
-    public MemberSubscription(EntityProxyObserver<C> observer, String interest, boolean preLoad) {
+    public MemberSubscription(ProxyObserver<C> observer, String interest, boolean preLoad) {
         setObserver(observer);
         this.interest = interest;
         this.preLoad = preLoad;
@@ -33,7 +33,7 @@ public class MemberSubscription<C extends C2KLocalObject> implements Runnable {
 
     private void loadChildren() {
         C newMember;
-        EntityProxyObserver<C> observer = getObserver();
+        ProxyObserver<C> observer = getObserver();
         if (observer == null) return; //reaped
         try {
             // fetch contents of path
@@ -77,7 +77,7 @@ public class MemberSubscription<C extends C2KLocalObject> implements Runnable {
     }
 
     public void update(String path, boolean deleted) {
-        EntityProxyObserver<C> observer = getObserver();
+        ProxyObserver<C> observer = getObserver();
         if (observer == null) return; //reaped
         Logger.msg(7, "Processing proxy message path "+path +" for "+observer+". Interest: "+interest+" Was Deleted:"+deleted);
         if (!path.startsWith(interest)) // doesn't concern us
@@ -106,15 +106,15 @@ public class MemberSubscription<C extends C2KLocalObject> implements Runnable {
         }
     }
 
-    public void setObserver(EntityProxyObserver<C> observer) {
-        observerReference = new WeakReference<EntityProxyObserver<C>>(observer);
+    public void setObserver(ProxyObserver<C> observer) {
+        observerReference = new WeakReference<ProxyObserver<C>>(observer);
     }
     
-    public void setSubject(EntityProxy subject) {
+    public void setSubject(ItemProxy subject) {
     	this.subject = subject;
     }
 
-    public EntityProxyObserver<C> getObserver() {
+    public ProxyObserver<C> getObserver() {
         return observerReference.get();
     }
 }
-- 
cgit v1.2.3