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, 9 insertions, 10 deletions

diff --git a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java
index 79c11cb..a2e43f0 100644
--- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java
+++ b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java
@@ -13,15 +13,14 @@ import javax.swing.table.AbstractTableModel;
 import com.c2kernel.collection.Aggregation;

 import com.c2kernel.collection.Collection;

 import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.entity.proxy.EntityProxy;

-import com.c2kernel.entity.proxy.EntityProxyObserver;

 import com.c2kernel.entity.proxy.ItemProxy;

 import com.c2kernel.entity.proxy.MemberSubscription;

+import com.c2kernel.entity.proxy.ProxyObserver;

 import com.c2kernel.events.Event;

 import com.c2kernel.gui.MainFrame;

 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

-import com.c2kernel.lookup.EntityPath;

-import com.c2kernel.lookup.InvalidEntityPathException;

+import com.c2kernel.lookup.InvalidItemPathException;

+import com.c2kernel.lookup.ItemPath;

 import com.c2kernel.persistency.ClusterStorage;

 import com.c2kernel.persistency.outcome.Outcome;

 import com.c2kernel.process.Gateway;

@@ -45,7 +44,7 @@ public class CollectionHistoryWindow extends JFrame  {
         this.setVisible(true);

 	}

 

-	private class HistoryTableModel extends AbstractTableModel implements EntityProxyObserver<Event> {

+	private class HistoryTableModel extends AbstractTableModel implements ProxyObserver<Event> {

 

 		ItemProxy item;

 		ArrayList<Event> collEvents;

@@ -97,14 +96,14 @@ public class CollectionHistoryWindow extends JFrame  {
 					return "Click to view";

 				String name;

 					try {

-						EntityProxy childItem = Gateway.getProxyManager().getProxy(new EntityPath(Integer.parseInt(((String[])collEventData.get(rowIndex))[2])));

+						ItemProxy childItem = Gateway.getProxyManager().getProxy(new ItemPath(Integer.parseInt(((String[])collEventData.get(rowIndex))[2])));

 						name = childItem.getName();

 					} catch (NumberFormatException e) {

-						name = "Invalid entity key: "+((String[])collEventData.get(rowIndex))[2];

+						name = "Invalid Item key: "+((String[])collEventData.get(rowIndex))[2];

 					} catch (ObjectNotFoundException e) {

 						name = "Item deleted: "+((String[])collEventData.get(rowIndex))[2];

-					} catch (InvalidEntityPathException e) {

-						name = "Invalid entity key: "+((String[])collEventData.get(rowIndex))[2];

+					} catch (InvalidItemPathException e) {

+						name = "Invalid Item key: "+((String[])collEventData.get(rowIndex))[2];

 					}

 				return name;

 			default:

@@ -170,7 +169,7 @@ public class CollectionHistoryWindow extends JFrame  {
 				else {

 					String[] params = (String[])data;

 					try {

-					EntityProxy childItem = Gateway.getProxyManager().getProxy(new EntityPath(Integer.parseInt(params[2])));

+					ItemProxy childItem = Gateway.getProxyManager().getProxy(new ItemPath(Integer.parseInt(params[2])));

 					MainFrame.itemFinder.pushNewKey(childItem.getName());

 					} catch (Exception ex) { }

 				}