Merge branch 'master' of ssh://dev.cccs.uwe.ac.uk:22/var/git/cristal-kernel

1 files changed, 5 insertions, 5 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java b/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java
index 0258347..61e3423 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,17 +51,17 @@ 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 {

             // 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) {