From a1f0ecbb6a2bea6aa214322c412af2f3c5ce124b Mon Sep 17 00:00:00 2001 From: Andrew Branson 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 --- .../c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java') diff --git a/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java b/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java index 0258347..5b70dd0 100644 --- a/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java +++ b/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java @@ -2,7 +2,7 @@ package com.c2kernel.lifecycle.routingHelpers; import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.entity.proxy.ItemProxy; -import com.c2kernel.lookup.EntityPath; +import com.c2kernel.lookup.ItemPath; import com.c2kernel.persistency.ClusterStorage; import com.c2kernel.persistency.outcome.Outcome; import com.c2kernel.persistency.outcome.Viewpoint; @@ -51,12 +51,12 @@ public class ViewpointDataHelper else return errArr; // find entity - EntityPath sourcePath; + ItemPath sourcePath; try { - sourcePath = new EntityPath(Integer.parseInt(entityPath)); + sourcePath = new ItemPath(Integer.parseInt(entityPath)); } catch (Exception e) { - sourcePath = new EntityPath(entityPath); + sourcePath = new ItemPath(entityPath); } try { -- cgit v1.2.3 From bff4c943158c18cd70bc270bbb208ead63d020fd Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Wed, 14 May 2014 13:30:21 +0200 Subject: Removed unnecessary ItemProxy casts after removal of EntityProxy --- src/main/java/com/c2kernel/entity/agent/Job.java | 4 ++-- .../com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java | 2 +- src/main/java/com/c2kernel/process/module/ModuleManager.java | 2 +- src/main/java/com/c2kernel/utils/LocalObjectLoader.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java') diff --git a/src/main/java/com/c2kernel/entity/agent/Job.java b/src/main/java/com/c2kernel/entity/agent/Job.java index fa2bcd6..efbd5fb 100644 --- a/src/main/java/com/c2kernel/entity/agent/Job.java +++ b/src/main/java/com/c2kernel/entity/agent/Job.java @@ -9,8 +9,8 @@ import com.c2kernel.entity.proxy.ItemProxy; import com.c2kernel.lifecycle.instance.Activity; import com.c2kernel.lifecycle.instance.stateMachine.Transition; import com.c2kernel.lookup.AgentPath; -import com.c2kernel.lookup.ItemPath; import com.c2kernel.lookup.InvalidItemPathException; +import com.c2kernel.lookup.ItemPath; import com.c2kernel.persistency.ClusterStorage; import com.c2kernel.persistency.ClusterStorageException; import com.c2kernel.persistency.outcome.Outcome; @@ -254,7 +254,7 @@ public class Job implements C2KLocalObject public ItemProxy getItemProxy() throws ObjectNotFoundException, InvalidItemPathException { if (item == null) - item = (ItemProxy) Gateway.getProxyManager().getProxy(new ItemPath(itemSysKey)); + item = Gateway.getProxyManager().getProxy(new ItemPath(itemSysKey)); return item; } diff --git a/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java b/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java index 5b70dd0..61e3423 100644 --- a/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java +++ b/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java @@ -61,7 +61,7 @@ public class ViewpointDataHelper try { // load viewpoint - ItemProxy dataSource = (ItemProxy)Gateway.getProxyManager().getProxy(sourcePath); + ItemProxy dataSource = Gateway.getProxyManager().getProxy(sourcePath); Viewpoint view = (Viewpoint)dataSource.getObject(ClusterStorage.VIEWPOINT + "/" + viewpoint); Outcome outcome = view.getOutcome(); if (xpath == null) { diff --git a/src/main/java/com/c2kernel/process/module/ModuleManager.java b/src/main/java/com/c2kernel/process/module/ModuleManager.java index 9ff42e5..0afe3af 100644 --- a/src/main/java/com/c2kernel/process/module/ModuleManager.java +++ b/src/main/java/com/c2kernel/process/module/ModuleManager.java @@ -138,7 +138,7 @@ public class ModuleManager { public void registerModules() throws ModuleException { ItemProxy serverEntity; try { - serverEntity = (ItemProxy)Gateway.getProxyManager().getProxy(new DomainPath("/servers/"+Gateway.getProperties().getProperty("ItemServer.name"))); + serverEntity = Gateway.getProxyManager().getProxy(new DomainPath("/servers/"+Gateway.getProperties().getProperty("ItemServer.name"))); } catch (ObjectNotFoundException e) { throw new ModuleException("Cannot find local server name."); } diff --git a/src/main/java/com/c2kernel/utils/LocalObjectLoader.java b/src/main/java/com/c2kernel/utils/LocalObjectLoader.java index aef7b96..05f8aba 100644 --- a/src/main/java/com/c2kernel/utils/LocalObjectLoader.java +++ b/src/main/java/com/c2kernel/utils/LocalObjectLoader.java @@ -21,7 +21,7 @@ public class LocalObjectLoader { { DomainPath defRoot = new DomainPath(root); DomainPath defPath = (DomainPath)defRoot.find(name); - return (ItemProxy)Gateway.getProxyManager().getProxy(defPath); + return Gateway.getProxyManager().getProxy(defPath); } static public String getScript(String scriptName, int scriptVersion) throws ObjectNotFoundException { -- cgit v1.2.3