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.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/main/java/com/c2kernel/gui/tabs/CollectionPane.java b/src/main/java/com/c2kernel/gui/tabs/CollectionPane.java
index bb07c19..ac69f68 100644
--- a/src/main/java/com/c2kernel/gui/tabs/CollectionPane.java
+++ b/src/main/java/com/c2kernel/gui/tabs/CollectionPane.java
@@ -8,7 +8,7 @@ import com.c2kernel.collection.Collection;
 import com.c2kernel.collection.CollectionDescription;

 import com.c2kernel.collection.CollectionMember;

 import com.c2kernel.collection.Dependency;

-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.gui.tabs.collection.AggregationView;

@@ -21,7 +21,7 @@ import com.c2kernel.utils.Logger;
  * @version $Revision: 1.36 $ $Date: 2005/10/06 06:51:15 $

  * @author $Author: abranson $

  */

-public class CollectionPane extends EntityTabPane implements EntityProxyObserver<Collection<? extends CollectionMember>>

+public class CollectionPane extends ItemTabPane implements ProxyObserver<Collection<? extends CollectionMember>>

 {

     JTabbedPane collTabs;

 

@@ -40,13 +40,13 @@ public class CollectionPane extends EntityTabPane implements EntityProxyObserver
         if (thisCollView == null){

             if (contents instanceof Aggregation) {

                 AggregationView thisAggView = new AggregationView();

-                thisAggView.setItem((ItemProxy)sourceEntity.getEntity());

+                thisAggView.setItem(sourceItem.getItem());

                 thisAggView.setCollection((Aggregation)contents);

                 thisCollView = thisAggView;

             }

             else if (contents instanceof Dependency) {

             	DependencyView thisDepView = new DependencyView();

-            	thisDepView.setItem((ItemProxy)sourceEntity.getEntity());

+            	thisDepView.setItem(sourceItem.getItem());

             	thisDepView.setCollection((Dependency)contents);

                 thisCollView = thisDepView;

             }

@@ -94,15 +94,15 @@ public class CollectionPane extends EntityTabPane implements EntityProxyObserver
 	public void run()

 	{

 		Thread.currentThread().setName("Collection Loader");

-		sourceEntity.getEntity().subscribe(new MemberSubscription<Collection<?>>(this, ClusterStorage.COLLECTION, true));

+		sourceItem.getItem().subscribe(new MemberSubscription<Collection<?>>(this, ClusterStorage.COLLECTION, true));

 	}

 

 	@Override

 	public void reload()

 	{

-		Gateway.getStorage().clearCache(sourceEntity.getSysKey(), ClusterStorage.COLLECTION);

+		Gateway.getStorage().clearCache(sourceItem.getSysKey(), ClusterStorage.COLLECTION);

         collTabs.removeAll();

-		initForEntity(sourceEntity);

+		initForItem(sourceItem);

 	}

 

 	@Override