From 21230edbafdd30fcf0c43d1dc64ccbf4ca5e06a8 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Wed, 7 May 2014 17:33:57 +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. --- .../java/com/c2kernel/gui/tabs/ViewpointPane.java | 29 +++++++++++----------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java') diff --git a/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java b/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java index 4f7db24..234f1db 100644 --- a/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java @@ -25,9 +25,8 @@ import javax.swing.SwingConstants; import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.entity.C2KLocalObject; -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.gui.tabs.outcome.OutcomeException; @@ -40,7 +39,7 @@ import com.c2kernel.utils.Language; import com.c2kernel.utils.LocalObjectLoader; import com.c2kernel.utils.Logger; -public class ViewpointPane extends EntityTabPane implements ItemListener, ActionListener, EntityProxyObserver { +public class ViewpointPane extends ItemTabPane implements ItemListener, ActionListener, ProxyObserver { JComboBox schemas; JComboBox views; @@ -155,21 +154,21 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action clearView(); // reload - initForEntity(sourceEntity); + initForItem(sourceItem); } @Override public void run() { Thread.currentThread().setName("Viewpoint Pane Builder"); //Local object subscriptions - sourceEntity.getEntity().subscribe(new MemberSubscription(this, ClusterStorage.VIEWPOINT, false)); - sourceEntity.getEntity().subscribe(new MemberSubscription(this, ClusterStorage.OUTCOME, false)); + sourceItem.getItem().subscribe(new MemberSubscription(this, ClusterStorage.VIEWPOINT, false)); + sourceItem.getItem().subscribe(new MemberSubscription(this, ClusterStorage.OUTCOME, false)); clearView(); schemas.addItem("--"); currentSchema = null; schemaList = new ArrayList(); try { - String outcomeTypes = sourceEntity.getEntity().queryData(ClusterStorage.VIEWPOINT+"/all"); + String outcomeTypes = sourceItem.getItem().queryData(ClusterStorage.VIEWPOINT+"/all"); StringTokenizer tok = new StringTokenizer(outcomeTypes, ","); while (tok.hasMoreTokens()) { String thisType = tok.nextToken(); @@ -209,12 +208,12 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action try { // populate views - String viewNames = sourceEntity.getEntity().queryData(ClusterStorage.VIEWPOINT+"/"+schemaName+"/all"); + String viewNames = sourceItem.getItem().queryData(ClusterStorage.VIEWPOINT+"/"+schemaName+"/all"); StringTokenizer tok = new StringTokenizer(viewNames, ","); Viewpoint lastView = null; while(tok.hasMoreTokens()) { String viewName = tok.nextToken(); - Viewpoint thisView = (Viewpoint)sourceEntity.getEntity().getObject(ClusterStorage.VIEWPOINT+"/"+schemaName+"/"+viewName); + Viewpoint thisView = (Viewpoint)sourceItem.getItem().getObject(ClusterStorage.VIEWPOINT+"/"+schemaName+"/"+viewName); views.addItem(thisView); if (lastView == null) lastView = thisView; if (thisView.getName().equals("last")) //select @@ -222,11 +221,11 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action viewpointList.add(thisView); } - String ocVersions = sourceEntity.getEntity().queryData(ClusterStorage.OUTCOME+"/"+schemaName+"/all"); + String ocVersions = sourceItem.getItem().queryData(ClusterStorage.OUTCOME+"/"+schemaName+"/all"); tok = new StringTokenizer(ocVersions, ","); while(tok.hasMoreTokens()) { int schemaVersion = Integer.parseInt(tok.nextToken()); - String ocEvents = sourceEntity.getEntity().queryData(ClusterStorage.OUTCOME+"/"+schemaName+"/"+schemaVersion+"/all"); + String ocEvents = sourceItem.getItem().queryData(ClusterStorage.OUTCOME+"/"+schemaName+"/"+schemaVersion+"/all"); StringTokenizer tok2 = new StringTokenizer(ocEvents, ","); while(tok2.hasMoreTokens()) { int eventId = Integer.parseInt(tok2.nextToken()); @@ -277,7 +276,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action public void showEvent(EventItem thisEvent) { eventDetails.setText(thisEvent.getEventDesc()); try { - setView((Outcome)sourceEntity.getEntity().getObject( + setView((Outcome)sourceItem.getItem().getObject( ClusterStorage.OUTCOME+"/"+currentSchema+"/"+thisEvent.schemaVersion+"/"+thisEvent.eventId)); } catch (Exception ex) { Logger.error(ex); @@ -295,7 +294,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action String error = null; try { schema = LocalObjectLoader.getSchema(data.getSchemaType(), data.getSchemaVersion()).schema; - thisOutcome = EntityTabPane.getOutcomeHandler(data.getSchemaType(), data.getSchemaVersion()); + thisOutcome = ItemTabPane.getOutcomeHandler(data.getSchemaType(), data.getSchemaVersion()); thisOutcome.setDescription(schema); thisOutcome.setOutcome(data.getData()); thisOutcome.setReadOnly(true); @@ -373,7 +372,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action try { String[] predefParams = new String[1]; predefParams[0] = Gateway.getMarshaller().marshall(oldView); - MainFrame.userAgent.execute((ItemProxy)sourceEntity.getEntity(), "AddC2KObject", predefParams); + MainFrame.userAgent.execute(sourceItem.getItem(), "AddC2KObject", predefParams); } catch (Exception e) { Logger.error(e); MainFrame.exceptionDialog(e); @@ -504,7 +503,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action public String getEventDesc() { try { - Event myEvent = (Event)sourceEntity.getEntity().getObject(ClusterStorage.HISTORY+"/"+eventId); + Event myEvent = (Event)sourceItem.getItem().getObject(ClusterStorage.HISTORY+"/"+eventId); return (Language.translate("Recorded on")+" "+myEvent.getTimeString()+" "+ Language.translate("by")+" "+myEvent.getAgentName()+" "+ Language.translate("using schema v")+schemaVersion); -- cgit v1.2.3