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. --- src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java') diff --git a/src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java b/src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java index 1f5d3b8..e16c9e3 100644 --- a/src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java @@ -14,7 +14,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; import com.c2kernel.entity.agent.Job; -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.MainFrame; @@ -25,7 +25,7 @@ import com.c2kernel.persistency.ClusterStorage; import com.c2kernel.utils.Language; import com.c2kernel.utils.Logger; -public class ExecutionPane extends EntityTabPane implements EntityProxyObserver { +public class ExecutionPane extends ItemTabPane implements ProxyObserver { ArrayList jobList = null; Object jobLock = new Object(); @@ -69,7 +69,7 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver< @Override public void run() { Thread.currentThread().setName("Execution Pane Builder"); - sourceEntity.getEntity().subscribe(new MemberSubscription(this, ClusterStorage.LIFECYCLE, false)); + sourceItem.getItem().subscribe(new MemberSubscription(this, ClusterStorage.LIFECYCLE, false)); loadJobList(); init = true; if (autoRun != null) { @@ -83,7 +83,7 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver< view.removeAll(); activities = new ArrayList(); try { - jobList = ((ItemProxy)sourceEntity.getEntity()).getJobList(MainFrame.userAgent); + jobList = (sourceItem.getItem()).getJobList(MainFrame.userAgent); activitySelector.addItem(emptyAct); for (Job thisJob : jobList) { //Logger.msg(7, "ExecutionPane - loadJobList " + thisJob.hasOutcome() + "|" + thisJob.getSchemaName() + "|" + thisJob.getSchemaVersion() + "|"); @@ -106,7 +106,7 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver< view.add(noActs); break; case 1 : - currentActView = new ActivityViewer(activities.get(0), (ItemProxy)sourceEntity.getEntity(), this); + currentActView = new ActivityViewer(activities.get(0), sourceItem.getItem(), this); c.fill = GridBagConstraints.BOTH; gridbag.setConstraints(view, c); view.add(currentActView); @@ -144,7 +144,7 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver< view.removeAll(); c.fill = GridBagConstraints.BOTH; gridbag.setConstraints(view, c); - currentActView = new ActivityViewer((ActivityItem)selObj, (ItemProxy)sourceEntity.getEntity(), this); + currentActView = new ActivityViewer((ActivityItem)selObj, sourceItem.getItem(), this); view.add(currentActView); revalidate(); updateUI(); @@ -171,7 +171,7 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver< else { // look to see if this form is now invalid // get the new joblist try { - jobList = ((ItemProxy)sourceEntity.getEntity()).getJobList(MainFrame.userAgent); + jobList = (sourceItem.getItem()).getJobList(MainFrame.userAgent); } catch (Exception ex) { return; } -- cgit v1.2.3