From 8afca6b565edfa0e32aa8e12f30bfff5598abdd4 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Wed, 1 Oct 2014 21:06:55 +0200
Subject: Replace qualified class names with imports now the Import classes
 have been renamed and don't clash.

---
 src/main/java/com/c2kernel/collection/Aggregation.java     | 3 ++-
 src/main/java/com/c2kernel/entity/imports/ImportAgent.java | 4 ++--
 src/main/java/com/c2kernel/entity/imports/ImportItem.java  | 9 ++++++---
 src/main/java/com/c2kernel/process/module/Module.java      | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/c2kernel/collection/Aggregation.java b/src/main/java/com/c2kernel/collection/Aggregation.java
index 4b2b429..6791b77 100644
--- a/src/main/java/com/c2kernel/collection/Aggregation.java
+++ b/src/main/java/com/c2kernel/collection/Aggregation.java
@@ -4,6 +4,7 @@ import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.graph.model.GraphModel;
 import com.c2kernel.graph.model.GraphPoint;
 import com.c2kernel.graph.model.TypeNameAndConstructionInfo;
+import com.c2kernel.graph.model.Vertex;
 import com.c2kernel.lookup.ItemPath;
 import com.c2kernel.persistency.ClusterStorage;
 import com.c2kernel.process.Gateway;
@@ -82,7 +83,7 @@ abstract public class Aggregation extends Collection<AggregationMember>
         aggMem.setProperties(props);
         aggMem.setClassProps(classProps);
         // create vertex
-        com.c2kernel.graph.model.Vertex vertex = new com.c2kernel.graph.model.Vertex();
+        Vertex vertex = new Vertex();
         vertex.setHeight(h); vertex.setWidth(w);
         mLayout.addVertexAndCreateId(vertex,location);
         aggMem.setCollection(this);
diff --git a/src/main/java/com/c2kernel/entity/imports/ImportAgent.java b/src/main/java/com/c2kernel/entity/imports/ImportAgent.java
index eb5587c..2cb0162 100644
--- a/src/main/java/com/c2kernel/entity/imports/ImportAgent.java
+++ b/src/main/java/com/c2kernel/entity/imports/ImportAgent.java
@@ -37,8 +37,8 @@ public class ImportAgent extends ModuleImport {
         ActiveEntity newAgentEnt = Gateway.getCorbaServer().createAgent(newAgent);
         Gateway.getLookupManager().add(newAgent);
         // assemble properties
-        properties.add(new com.c2kernel.property.Property("Name", name, true));
-        properties.add(new com.c2kernel.property.Property("Type", "Agent", false));
+        properties.add(new Property("Name", name, true));
+        properties.add(new Property("Type", "Agent", false));
         try {
             newAgentEnt.initialise(agentPath.getSystemKey(), Gateway.getMarshaller().marshall(new PropertyArrayList(properties)), null, null);
         } catch (Exception ex) {
diff --git a/src/main/java/com/c2kernel/entity/imports/ImportItem.java b/src/main/java/com/c2kernel/entity/imports/ImportItem.java
index 9038cc5..45a2a4b 100644
--- a/src/main/java/com/c2kernel/entity/imports/ImportItem.java
+++ b/src/main/java/com/c2kernel/entity/imports/ImportItem.java
@@ -6,7 +6,9 @@ import java.util.ArrayList;
 import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLUnit;
 
+import com.c2kernel.collection.Aggregation;
 import com.c2kernel.collection.CollectionArrayList;
+import com.c2kernel.collection.Dependency;
 import com.c2kernel.collection.MembershipException;
 import com.c2kernel.common.CannotManageException;
 import com.c2kernel.common.InvalidDataException;
@@ -23,6 +25,7 @@ import com.c2kernel.lookup.DomainPath;
 import com.c2kernel.lookup.ItemPath;
 import com.c2kernel.persistency.ClusterStorage;
 import com.c2kernel.persistency.ClusterStorageException;
+import com.c2kernel.persistency.outcome.Outcome;
 import com.c2kernel.persistency.outcome.Viewpoint;
 import com.c2kernel.process.Gateway;
 import com.c2kernel.process.module.ModuleImport;
@@ -126,7 +129,7 @@ public class ImportItem extends ModuleImport {
         CollectionArrayList colls = new CollectionArrayList();
         for (ImportDependency element: dependencyList) {
             try {
-            	com.c2kernel.collection.Dependency newDep = element.create();
+            	Dependency newDep = element.create();
             	colls.put(newDep);
             } catch (MembershipException ex) {
                 Logger.error(ex);
@@ -136,7 +139,7 @@ public class ImportItem extends ModuleImport {
 
         for (ImportAggregation element : aggregationList) {
             try {
-            	com.c2kernel.collection.Aggregation newAgg = element.create();           	
+            	Aggregation newAgg = element.create();           	
             	colls.put(newAgg);
             } catch (MembershipException ex) {
 	            Logger.error(ex);
@@ -162,7 +165,7 @@ public class ImportItem extends ModuleImport {
         XMLUnit.setIgnoreComments(true);
         History hist = new History(getItemPath(), null);
         for (ImportOutcome thisOutcome : outcomes) {
-            com.c2kernel.persistency.outcome.Outcome newOutcome = new com.c2kernel.persistency.outcome.Outcome(-1, thisOutcome.getData(ns), thisOutcome.schema, thisOutcome.version);
+            Outcome newOutcome = new Outcome(-1, thisOutcome.getData(ns), thisOutcome.schema, thisOutcome.version);
         	Viewpoint impView;
         	try {
         		impView = (Viewpoint)Gateway.getStorage().get(getItemPath(), ClusterStorage.VIEWPOINT+"/"+thisOutcome.schema+"/"+thisOutcome.viewname, null);
diff --git a/src/main/java/com/c2kernel/process/module/Module.java b/src/main/java/com/c2kernel/process/module/Module.java
index 9a54944..39ca59e 100644
--- a/src/main/java/com/c2kernel/process/module/Module.java
+++ b/src/main/java/com/c2kernel/process/module/Module.java
@@ -31,7 +31,7 @@ public class Module extends ImportItem {
 	public Module() {
 		super();
 		// Module properties
-		properties.add(new com.c2kernel.property.Property("Type", "Module", false));
+		properties.add(new Property("Type", "Module", false));
 		setInitialPath("/desc/modules/");
 		setWorkflow("NoWorkflow");
 		setWorkflowVer(0);
-- 
cgit v1.2.3