diff options
Diffstat (limited to 'src/main/java')
5 files changed, 10 insertions, 18 deletions
diff --git a/src/main/java/com/c2kernel/entity/imports/ImportItem.java b/src/main/java/com/c2kernel/entity/imports/ImportItem.java index c1562b2..2db0e91 100644 --- a/src/main/java/com/c2kernel/entity/imports/ImportItem.java +++ b/src/main/java/com/c2kernel/entity/imports/ImportItem.java @@ -197,7 +197,7 @@ public class ImportItem extends ModuleImport { // register domain path (before collections in case of recursive collections)
if (!domPath.exists()) {
- domPath.setEntity(getItemPath());
+ domPath.setItemPath(getItemPath());
Gateway.getLookupManager().add(domPath);
}
}
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/item/CreateItemFromDescription.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/item/CreateItemFromDescription.java index 60218e8..eea3976 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/item/CreateItemFromDescription.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/item/CreateItemFromDescription.java @@ -101,7 +101,7 @@ public class CreateItemFromDescription extends PredefinedStep // add its domain path
Logger.msg(3, "CreateItemFromDescription - Creating "+context);
- context.setEntity(newItemPath);
+ context.setItemPath(newItemPath);
Gateway.getLookupManager().add(context);
return requestData;
} catch (Exception e) {
diff --git a/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java b/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java index 958d9a7..2250a82 100644 --- a/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java +++ b/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java @@ -11,14 +11,6 @@ import com.c2kernel.persistency.outcome.Viewpoint; import com.c2kernel.process.Gateway;
import com.c2kernel.utils.XmlElementParser;
-/**
- * @author XSeb74
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
public class ViewpointDataHelper
{
static Object[] errArr = { "" };
@@ -28,7 +20,7 @@ public class ViewpointDataHelper * @return String[]
* @throws Exception
*/
- /**@param value : EntityPath:ActivityPath:XPathInOutcome*/
+ /**@param value : /UUID (or . if current) /SchemaName/Viewname/Path:XPathInOutcome */
public static Object [] get(String value) throws Exception
{
//Syntax of search : <EntityPath>/<ViewpointPath>:<XPathinOutcome>
diff --git a/src/main/java/com/c2kernel/lookup/DomainPath.java b/src/main/java/com/c2kernel/lookup/DomainPath.java index c8ae751..f6abfaf 100644 --- a/src/main/java/com/c2kernel/lookup/DomainPath.java +++ b/src/main/java/com/c2kernel/lookup/DomainPath.java @@ -49,7 +49,7 @@ public class DomainPath extends Path public DomainPath(String path, ItemPath entity)
{
super(path, Path.UNKNOWN);
- setEntity(entity);
+ setItemPath(entity);
}
public DomainPath(DomainPath parent, String child) {
@@ -73,7 +73,7 @@ public class DomainPath extends Path return new DomainPath(parentPath);
}
- public void setEntity(ItemPath newTarget) {
+ public void setItemPath(ItemPath newTarget) {
if (newTarget == null) { // clear
target = null;
mType = Path.CONTEXT;
@@ -103,9 +103,9 @@ public class DomainPath extends Path return mType;
}
- public void checkType() {
+ protected void checkType() {
try {
- setEntity(Gateway.getLookup().resolvePath(this));
+ setItemPath(Gateway.getLookup().resolvePath(this));
} catch (InvalidItemPathException ex) {
mType = CONTEXT;
} catch (ObjectNotFoundException ex) {
diff --git a/src/main/java/com/c2kernel/process/Bootstrap.java b/src/main/java/com/c2kernel/process/Bootstrap.java index 23582bb..3b61ad3 100644 --- a/src/main/java/com/c2kernel/process/Bootstrap.java +++ b/src/main/java/com/c2kernel/process/Bootstrap.java @@ -162,7 +162,7 @@ public class Bootstrap if (!modDomPath.equals(path)) { // move item to module subtree
Logger.msg("Module item "+itemName+" found with path "+path.toString()+". Moving to "+modDomPath.toString());
- modDomPath.setEntity(itemPath);
+ modDomPath.setItemPath(itemPath);
if (!modDomPath.exists())
lookupManager.add(modDomPath);
lookupManager.delete(path);
@@ -275,7 +275,7 @@ public class Bootstrap Gateway.getCorbaServer().createItem(itemPath);
lookupManager.add(itemPath);
DomainPath newDomPath = impHandler.getPath(itemName, ns);
- newDomPath.setEntity(itemPath);
+ newDomPath.setItemPath(itemPath);
lookupManager.add(newDomPath);
ItemProxy newItemProxy = Gateway.getProxyManager().getProxy(itemPath);
newItemProxy.initialise( systemAgents.get("system").getPath(), props, ca, null);
@@ -350,7 +350,7 @@ public class Bootstrap serverEntity = new ItemPath();
Gateway.getCorbaServer().createItem(serverEntity);
lookupManager.add(serverEntity);
- thisServerPath.setEntity(serverEntity);
+ thisServerPath.setItemPath(serverEntity);
lookupManager.add(thisServerPath);
}
Gateway.getStorage().put(serverEntity, new Property("Name", serverName, false), null);
|