129 files changed, 879 insertions, 795 deletions

diff --git a/bin/eclipse/Cristal Kernel GUI.launch b/bin/eclipse/Cristal Kernel GUI.launch
index e63b995..123d430 100644
--- a/bin/eclipse/Cristal Kernel GUI.launch
+++ b/bin/eclipse/Cristal Kernel GUI.launch
@@ -8,7 +8,7 @@
 </listAttribute>

 <stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>

 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.c2kernel.gui.Main"/>

+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.cristalise.kernel.gui.Main"/>

 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-logLevel 0 -config bin/conf/client.conf -connect ${file_prompt}"/>

 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cristal-gui"/>

 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>

diff --git a/pom.xml b/pom.xml
index cde36ef..065f4f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,24 +1,24 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>cristal</groupId>
-	<artifactId>cristal-gui</artifactId>
+	<groupId>org.cristalise</groupId>
+	<artifactId>cristalise-gui</artifactId>
 	<version>3.0-SNAPSHOT</version>
-	<name>cristal-gui</name>
-	<description>CRISTAL Kernel GUI</description>
+	<name>cristalise-gui</name>
+	<description>Cristal-ise default GUI</description>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>	
 	<dependencies>
 		<dependency>
-			<groupId>cristal</groupId>
-			<artifactId>cristal-kernel</artifactId>
+			<groupId>org.cristalise</groupId>
+			<artifactId>cristalise-kernel</artifactId>
 		</dependency>
 	</dependencies>
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>cristal</groupId>
-				<artifactId>cristal-kernel</artifactId>
+				<groupId>org.cristalise</groupId>
+				<artifactId>cristalise-kernel</artifactId>
 				<version>3.0-SNAPSHOT</version>
 			</dependency>
 		</dependencies>
diff --git a/src/main/java/com/c2kernel/gui/graph/event/ElasticBandResizedEvent.java b/src/main/java/com/c2kernel/gui/graph/event/ElasticBandResizedEvent.java
deleted file mode 100644
index 2ddfd39..0000000
--- a/src/main/java/com/c2kernel/gui/graph/event/ElasticBandResizedEvent.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.c2kernel.gui.graph.event;

-

-import com.c2kernel.graph.event.GraphModelEvent;

-

-

-public class ElasticBandResizedEvent extends GraphModelEvent

-{

-}

diff --git a/src/main/java/com/c2kernel/gui/graph/event/ElasticBandSetEvent.java b/src/main/java/com/c2kernel/gui/graph/event/ElasticBandSetEvent.java
deleted file mode 100644
index 324ce80..0000000
--- a/src/main/java/com/c2kernel/gui/graph/event/ElasticBandSetEvent.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.c2kernel.gui.graph.event;

-

-import com.c2kernel.graph.event.GraphModelEvent;

-

-

-public class ElasticBandSetEvent extends GraphModelEvent

-{

-}

diff --git a/src/main/java/com/c2kernel/gui/graph/event/SelectionChangedEvent.java b/src/main/java/com/c2kernel/gui/graph/event/SelectionChangedEvent.java
deleted file mode 100644
index a6aecbb..0000000
--- a/src/main/java/com/c2kernel/gui/graph/event/SelectionChangedEvent.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.c2kernel.gui.graph.event;

-

-import com.c2kernel.graph.event.GraphModelEvent;

-import com.c2kernel.gui.graph.controller.Selection;

-

-

-public class SelectionChangedEvent extends GraphModelEvent

-{

-    public Selection mSelection = null;

-}

diff --git a/src/main/java/com/c2kernel/gui/graph/event/SelectionMovedEvent.java b/src/main/java/com/c2kernel/gui/graph/event/SelectionMovedEvent.java
deleted file mode 100644
index ae1f840..0000000
--- a/src/main/java/com/c2kernel/gui/graph/event/SelectionMovedEvent.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.c2kernel.gui.graph.event;

-

-import com.c2kernel.graph.event.GraphModelEvent;

-

-

-

-public class SelectionMovedEvent extends GraphModelEvent

-{

-}

diff --git a/src/main/java/com/c2kernel/gui/Console.java b/src/main/java/org/cristalise/gui/Console.java
index ae3a2cc..6d84e51 100644
--- a/src/main/java/com/c2kernel/gui/Console.java
+++ b/src/main/java/org/cristalise/gui/Console.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui;

+package org.cristalise.gui;

 

 import java.awt.GridBagConstraints;

 import java.awt.GridBagLayout;

@@ -23,9 +23,10 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextArea;

 import javax.swing.JTextField;

 

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.FileStringUtility;

-import com.c2kernel.utils.Logger;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.FileStringUtility;

+import org.cristalise.kernel.utils.Logger;

+

 

 /**************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/DomainKeyConsumer.java b/src/main/java/org/cristalise/gui/DomainKeyConsumer.java
index 18847cc..7b03e70 100644
--- a/src/main/java/com/c2kernel/gui/DomainKeyConsumer.java
+++ b/src/main/java/org/cristalise/gui/DomainKeyConsumer.java
@@ -1,6 +1,6 @@
-package com.c2kernel.gui;

+package org.cristalise.gui;

 

-import com.c2kernel.lookup.DomainPath;

+import org.cristalise.kernel.lookup.DomainPath;

 

 /**

  * Things that can be told when a barcode etc is entered

diff --git a/src/main/java/com/c2kernel/gui/DomainKeyListener.java b/src/main/java/org/cristalise/gui/DomainKeyListener.java
index 95c7e3a..1e2370a 100644
--- a/src/main/java/com/c2kernel/gui/DomainKeyListener.java
+++ b/src/main/java/org/cristalise/gui/DomainKeyListener.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui;

+package org.cristalise.gui;

 

 import java.io.IOException;

 

diff --git a/src/main/java/com/c2kernel/gui/DynamicTreeBuilder.java b/src/main/java/org/cristalise/gui/DynamicTreeBuilder.java
index 3f6e933..8983d08 100644
--- a/src/main/java/com/c2kernel/gui/DynamicTreeBuilder.java
+++ b/src/main/java/org/cristalise/gui/DynamicTreeBuilder.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui;

+package org.cristalise.gui;

 

 import javax.swing.ImageIcon;

 import javax.swing.JTree;

@@ -6,12 +6,13 @@ import javax.swing.SwingUtilities;
 import javax.swing.tree.DefaultMutableTreeNode;

 import javax.swing.tree.DefaultTreeModel;

 

-import com.c2kernel.gui.tree.Node;

-import com.c2kernel.gui.tree.NodeItem;

-import com.c2kernel.gui.tree.NodeSubscriber;

-import com.c2kernel.lookup.Path;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.tree.Node;

+import org.cristalise.gui.tree.NodeItem;

+import org.cristalise.gui.tree.NodeSubscriber;

+import org.cristalise.kernel.lookup.Path;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.Logger;

+

 

 /**

  * Installed as the user object on a single child node of a new node known to be composite.

diff --git a/src/main/java/com/c2kernel/gui/ImageLoader.java b/src/main/java/org/cristalise/gui/ImageLoader.java
index 121bcca..9af6fed 100644
--- a/src/main/java/com/c2kernel/gui/ImageLoader.java
+++ b/src/main/java/org/cristalise/gui/ImageLoader.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui;

+package org.cristalise.gui;

 

 import java.net.MalformedURLException;

 import java.net.URL;

@@ -7,9 +7,10 @@ import java.util.Hashtable;
 

 import javax.swing.ImageIcon;

 

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.Logger;

+import org.cristalise.kernel.common.ObjectNotFoundException;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.Logger;

+

 

 public class ImageLoader {

 

diff --git a/src/main/java/com/c2kernel/gui/ItemDetails.java b/src/main/java/org/cristalise/gui/ItemDetails.java
index cc8b8d3..960b2d2 100644
--- a/src/main/java/com/c2kernel/gui/ItemDetails.java
+++ b/src/main/java/org/cristalise/gui/ItemDetails.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui;

+package org.cristalise.gui;

 

 import java.awt.BorderLayout;

 import java.awt.Font;

@@ -17,11 +17,12 @@ import javax.swing.JTabbedPane;
 import javax.swing.SwingConstants;

 import javax.swing.event.ChangeListener;

 

-import com.c2kernel.gui.tabs.ItemTabPane;

-import com.c2kernel.gui.tree.NodeItem;

-import com.c2kernel.lookup.ItemPath;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.tabs.ItemTabPane;

+import org.cristalise.gui.tree.NodeItem;

+import org.cristalise.kernel.lookup.ItemPath;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.Logger;

+

 

 /**

  * The tab pane for each viewed item

diff --git a/src/main/java/com/c2kernel/gui/ItemFinder.java b/src/main/java/org/cristalise/gui/ItemFinder.java
index 1b0a895..04f5bcf 100644
--- a/src/main/java/com/c2kernel/gui/ItemFinder.java
+++ b/src/main/java/org/cristalise/gui/ItemFinder.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui;

+package org.cristalise.gui;

 

 import java.awt.GridBagLayout;

 import java.awt.Insets;

@@ -19,12 +19,13 @@ import javax.swing.JOptionPane;
 import javax.swing.JTextField;

 import javax.swing.JToggleButton;

 

-import com.c2kernel.lookup.DomainPath;

-import com.c2kernel.lookup.Lookup;

-import com.c2kernel.lookup.Path;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.Logger;

+import org.cristalise.kernel.lookup.DomainPath;

+import org.cristalise.kernel.lookup.Lookup;

+import org.cristalise.kernel.lookup.Path;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.Logger;

+

 

 public class ItemFinder extends Box implements Runnable {

     JTextField inputField;

diff --git a/src/main/java/com/c2kernel/gui/ItemTabManager.java b/src/main/java/org/cristalise/gui/ItemTabManager.java
index bb0dfd9..4543817 100644
--- a/src/main/java/com/c2kernel/gui/ItemTabManager.java
+++ b/src/main/java/org/cristalise/gui/ItemTabManager.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui;

+package org.cristalise.gui;

 import java.awt.GridLayout;

 import java.util.ArrayList;

 import java.util.HashMap;

@@ -6,10 +6,11 @@ import java.util.HashMap;
 import javax.swing.BorderFactory;

 import javax.swing.JPanel;

 

-import com.c2kernel.gui.tabs.JTabbedPaneWithCloseIcons;

-import com.c2kernel.gui.tree.NodeItem;

-import com.c2kernel.lookup.ItemPath;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.tabs.JTabbedPaneWithCloseIcons;

+import org.cristalise.gui.tree.NodeItem;

+import org.cristalise.kernel.lookup.ItemPath;

+import org.cristalise.kernel.utils.Logger;

+

 

 /**

  * Keeps

diff --git a/src/main/java/com/c2kernel/gui/LoginBox.java b/src/main/java/org/cristalise/gui/LoginBox.java
index 14c63e9..dc38f8c 100644
--- a/src/main/java/com/c2kernel/gui/LoginBox.java
+++ b/src/main/java/org/cristalise/gui/LoginBox.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui;

+package org.cristalise.gui;

 

 /**

  * <p>Title: </p>

@@ -27,10 +27,11 @@ import javax.swing.JPasswordField;
 import javax.swing.JTextField;

 import javax.swing.border.EmptyBorder;

 

-import com.c2kernel.entity.proxy.AgentProxy;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.Logger;

+import org.cristalise.kernel.entity.proxy.AgentProxy;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.Logger;

+

 

 

 //import com.borland.jbcl.layout.*;

diff --git a/src/main/java/com/c2kernel/gui/Main.java b/src/main/java/org/cristalise/gui/Main.java
index 6e8f73d..230abf2 100644
--- a/src/main/java/com/c2kernel/gui/Main.java
+++ b/src/main/java/org/cristalise/gui/Main.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui;

+package org.cristalise.gui;

 

 

 import java.io.File;

@@ -6,9 +6,10 @@ import java.util.Arrays;
 

 import javax.swing.JFileChooser;

 

-import com.c2kernel.process.Gateway;

-import com.c2kernel.process.StandardClient;

-import com.c2kernel.utils.Logger;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.process.StandardClient;

+import org.cristalise.kernel.utils.Logger;

+

 

 

 /**

diff --git a/src/main/java/com/c2kernel/gui/MainFrame.java b/src/main/java/org/cristalise/gui/MainFrame.java
index ea80e3e..1352390 100644
--- a/src/main/java/com/c2kernel/gui/MainFrame.java
+++ b/src/main/java/org/cristalise/gui/MainFrame.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui;

+package org.cristalise.gui;

 import java.awt.Dimension;

 import java.awt.GridBagConstraints;

 import java.awt.GridBagLayout;

@@ -19,18 +19,18 @@ import javax.swing.JSplitPane;
 import javax.swing.SwingUtilities;

 import javax.swing.UIManager;

 

+import org.cristalise.gui.tabs.execution.DefaultExecutor;

+import org.cristalise.gui.tabs.execution.Executor;

+import org.cristalise.gui.tree.Node;

+import org.cristalise.gui.tree.NodeContext;

+import org.cristalise.kernel.entity.proxy.AgentProxy;

+import org.cristalise.kernel.lookup.DomainPath;

+import org.cristalise.kernel.process.AbstractMain;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.Logger;

 import org.omg.CORBA.UserException;

 

-import com.c2kernel.entity.proxy.AgentProxy;

-import com.c2kernel.gui.tabs.execution.DefaultExecutor;

-import com.c2kernel.gui.tabs.execution.Executor;

-import com.c2kernel.gui.tree.Node;

-import com.c2kernel.gui.tree.NodeContext;

-import com.c2kernel.lookup.DomainPath;

-import com.c2kernel.process.AbstractMain;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.Logger;

 /**

  * @version $Revision: 1.83 $ $Date: 2005/09/12 14:56:19 $

  * @author  $Author: abranson $

diff --git a/src/main/java/com/c2kernel/gui/MenuBuilder.java b/src/main/java/org/cristalise/gui/MenuBuilder.java
index 100d989..f543870 100644
--- a/src/main/java/com/c2kernel/gui/MenuBuilder.java
+++ b/src/main/java/org/cristalise/gui/MenuBuilder.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui;

+package org.cristalise.gui;

 import java.awt.Dimension;

 import java.awt.event.ActionListener;

 import java.awt.event.ItemListener;

@@ -25,16 +25,17 @@ import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;

 import javax.swing.text.html.HTMLEditorKit;

 

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.lookup.DomainPath;

-import com.c2kernel.lookup.ItemPath;

-import com.c2kernel.lookup.Path;

-import com.c2kernel.persistency.ClusterStorage;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.property.Property;

-import com.c2kernel.utils.FileStringUtility;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.Logger;

+import org.cristalise.kernel.common.ObjectNotFoundException;

+import org.cristalise.kernel.lookup.DomainPath;

+import org.cristalise.kernel.lookup.ItemPath;

+import org.cristalise.kernel.lookup.Path;

+import org.cristalise.kernel.persistency.ClusterStorage;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.property.Property;

+import org.cristalise.kernel.utils.FileStringUtility;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.Logger;

+

 /**

  * @version $Revision: 1.47 $ $Date: 2006/03/03 13:52:21 $

  * @author $Author: abranson $

diff --git a/src/main/java/com/c2kernel/gui/ProgressReporter.java b/src/main/java/org/cristalise/gui/ProgressReporter.java
index 8d7483e..963e1e6 100644
--- a/src/main/java/com/c2kernel/gui/ProgressReporter.java
+++ b/src/main/java/org/cristalise/gui/ProgressReporter.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui;

+package org.cristalise.gui;

 

 import java.awt.Color;

 import java.awt.Dimension;

diff --git a/src/main/java/com/c2kernel/gui/TreeBrowser.java b/src/main/java/org/cristalise/gui/TreeBrowser.java
index 288cb93..0d40b43 100644
--- a/src/main/java/com/c2kernel/gui/TreeBrowser.java
+++ b/src/main/java/org/cristalise/gui/TreeBrowser.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui;

+package org.cristalise.gui;

 

 import java.awt.Component;

 import java.awt.Dimension;

@@ -21,11 +21,12 @@ import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;

 import javax.swing.tree.TreeSelectionModel;

 

-import com.c2kernel.gui.tree.Node;

-import com.c2kernel.gui.tree.NodeItem;

-import com.c2kernel.gui.tree.NodeTransferHandler;

-import com.c2kernel.lookup.DomainPath;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.tree.Node;

+import org.cristalise.gui.tree.NodeItem;

+import org.cristalise.gui.tree.NodeTransferHandler;

+import org.cristalise.kernel.lookup.DomainPath;

+import org.cristalise.kernel.utils.Logger;

+

 

 /**

  * Container for the tree browser

diff --git a/src/main/java/com/c2kernel/gui/collection/AggregationMemberRenderer.java b/src/main/java/org/cristalise/gui/collection/AggregationMemberRenderer.java
index d84a88d..20af733 100644
--- a/src/main/java/com/c2kernel/gui/collection/AggregationMemberRenderer.java
+++ b/src/main/java/org/cristalise/gui/collection/AggregationMemberRenderer.java
@@ -1,16 +1,18 @@
-package com.c2kernel.gui.collection;

+package org.cristalise.gui.collection;

 

 import java.awt.FontMetrics;

 import java.awt.Graphics2D;

 import java.awt.Image;

-import com.c2kernel.gui.ImageLoader;

-

-import com.c2kernel.collection.Aggregation;

-import com.c2kernel.collection.AggregationMember;

-import com.c2kernel.graph.model.GraphPoint;

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.gui.graph.view.VertexRenderer;

-import com.c2kernel.utils.Logger;

+

+import org.cristalise.gui.ImageLoader;

+import org.cristalise.gui.graph.view.VertexRenderer;

+import org.cristalise.kernel.collection.Aggregation;

+import org.cristalise.kernel.collection.AggregationMember;

+import org.cristalise.kernel.graph.model.GraphPoint;

+import org.cristalise.kernel.graph.model.Vertex;

+import org.cristalise.kernel.utils.Logger;

+

+

 

 /**

  * @version $Revision: 1.24 $ $Date: 2005/12/01 14:23:15 $

diff --git a/src/main/java/com/c2kernel/gui/collection/CollectionFrame.java b/src/main/java/org/cristalise/gui/collection/CollectionFrame.java
index 76a964b..c30eec9 100644
--- a/src/main/java/com/c2kernel/gui/collection/CollectionFrame.java
+++ b/src/main/java/org/cristalise/gui/collection/CollectionFrame.java
@@ -1,11 +1,12 @@
-package com.c2kernel.gui.collection;

+package org.cristalise.gui.collection;

 

 import java.awt.GridLayout;

 

 import javax.swing.JFrame;

 

-import com.c2kernel.collection.Aggregation;

-import com.c2kernel.gui.tabs.CollectionPane;

+import org.cristalise.gui.tabs.CollectionPane;

+import org.cristalise.kernel.collection.Aggregation;

+

 

 

 /**

diff --git a/src/main/java/com/c2kernel/gui/collection/PropertyPanel.java b/src/main/java/org/cristalise/gui/collection/PropertyPanel.java
index 38e3fd3..08ce519 100644
--- a/src/main/java/com/c2kernel/gui/collection/PropertyPanel.java
+++ b/src/main/java/org/cristalise/gui/collection/PropertyPanel.java
@@ -1,11 +1,12 @@
-package com.c2kernel.gui.collection;

+package org.cristalise.gui.collection;

+

+import org.cristalise.gui.graph.view.VertexPropertyPanel;

+import org.cristalise.kernel.collection.Aggregation;

+import org.cristalise.kernel.collection.AggregationMember;

+import org.cristalise.kernel.collection.CollectionMember;

+import org.cristalise.kernel.common.ObjectNotFoundException;

+import org.cristalise.kernel.graph.model.Vertex;

 

-import com.c2kernel.collection.Aggregation;

-import com.c2kernel.collection.AggregationMember;

-import com.c2kernel.collection.CollectionMember;

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.gui.graph.view.VertexPropertyPanel;

 

 public class PropertyPanel extends VertexPropertyPanel {

 

diff --git a/src/main/java/com/c2kernel/gui/collection/SelectedMemberPanel.java b/src/main/java/org/cristalise/gui/collection/SelectedMemberPanel.java
index 20fdde5..0b2244e 100644
--- a/src/main/java/com/c2kernel/gui/collection/SelectedMemberPanel.java
+++ b/src/main/java/org/cristalise/gui/collection/SelectedMemberPanel.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.collection;

+package org.cristalise.gui.collection;

 

 import java.awt.GridLayout;

 import java.awt.event.ActionEvent;

@@ -13,18 +13,19 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;

 import javax.swing.JToggleButton;

 

-import com.c2kernel.collection.AggregationMember;

-import com.c2kernel.common.InvalidCollectionModification;

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.entity.proxy.ItemProxy;

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.gui.DomainKeyConsumer;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.graph.view.SelectedVertexPanel;

-import com.c2kernel.lookup.DomainPath;

-import com.c2kernel.lookup.ItemPath;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.Language;

+import org.cristalise.gui.DomainKeyConsumer;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.graph.view.SelectedVertexPanel;

+import org.cristalise.kernel.collection.AggregationMember;

+import org.cristalise.kernel.common.InvalidCollectionModification;

+import org.cristalise.kernel.common.ObjectNotFoundException;

+import org.cristalise.kernel.entity.proxy.ItemProxy;

+import org.cristalise.kernel.graph.model.Vertex;

+import org.cristalise.kernel.lookup.DomainPath;

+import org.cristalise.kernel.lookup.ItemPath;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.Language;

+

 

 /**************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/graph/controller/AutoScrollController.java b/src/main/java/org/cristalise/gui/graph/controller/AutoScrollController.java
index a09d6a2..39b3b09 100644
--- a/src/main/java/com/c2kernel/gui/graph/controller/AutoScrollController.java
+++ b/src/main/java/org/cristalise/gui/graph/controller/AutoScrollController.java
@@ -1,11 +1,12 @@
-package com.c2kernel.gui.graph.controller;

+package org.cristalise.gui.graph.controller;

 

 import java.awt.Point;

 import java.awt.Rectangle;

 import java.awt.event.MouseEvent;

 import java.awt.event.MouseMotionListener;

 

-import com.c2kernel.gui.graph.view.GraphPanel;

+import org.cristalise.gui.graph.view.GraphPanel;

+

 

 

 public class AutoScrollController implements MouseMotionListener

diff --git a/src/main/java/com/c2kernel/gui/graph/controller/DeletionController.java b/src/main/java/org/cristalise/gui/graph/controller/DeletionController.java
index d83a588..b97ec11 100644
--- a/src/main/java/com/c2kernel/gui/graph/controller/DeletionController.java
+++ b/src/main/java/org/cristalise/gui/graph/controller/DeletionController.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.graph.controller;

+package org.cristalise.gui.graph.controller;

 

 import java.awt.event.ActionEvent;

 import java.awt.event.ActionListener;

@@ -9,11 +9,12 @@ import java.util.Observer;
 

 import javax.swing.JButton;

 

-import com.c2kernel.graph.model.DirectedEdge;

-import com.c2kernel.graph.model.GraphModelManager;

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.gui.graph.event.SelectionChangedEvent;

-import com.c2kernel.gui.graph.view.GraphPanel;

+import org.cristalise.gui.graph.event.SelectionChangedEvent;

+import org.cristalise.gui.graph.view.GraphPanel;

+import org.cristalise.kernel.graph.model.DirectedEdge;

+import org.cristalise.kernel.graph.model.GraphModelManager;

+import org.cristalise.kernel.graph.model.Vertex;

+

 

 

 // The deletion controller is responsible for deleting the present

diff --git a/src/main/java/com/c2kernel/gui/graph/controller/EdgeConstructionController.java b/src/main/java/org/cristalise/gui/graph/controller/EdgeConstructionController.java
index 87742f8..63fc0dd 100644
--- a/src/main/java/com/c2kernel/gui/graph/controller/EdgeConstructionController.java
+++ b/src/main/java/org/cristalise/gui/graph/controller/EdgeConstructionController.java
@@ -1,15 +1,16 @@
-package com.c2kernel.gui.graph.controller;

+package org.cristalise.gui.graph.controller;

 

 import java.awt.Point;

 import java.awt.event.MouseAdapter;

 import java.awt.event.MouseEvent;

 

-import com.c2kernel.graph.model.GraphModelManager;

-import com.c2kernel.graph.model.GraphPoint;

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.gui.graph.view.EditorModeListener;

-import com.c2kernel.gui.graph.view.EditorToolBar;

-import com.c2kernel.gui.graph.view.GraphPanel;

+import org.cristalise.gui.graph.view.EditorModeListener;

+import org.cristalise.gui.graph.view.EditorToolBar;

+import org.cristalise.gui.graph.view.GraphPanel;

+import org.cristalise.kernel.graph.model.GraphModelManager;

+import org.cristalise.kernel.graph.model.GraphPoint;

+import org.cristalise.kernel.graph.model.Vertex;

+

 

 

 public class EdgeConstructionController extends MouseAdapter implements EditorModeListener

diff --git a/src/main/java/com/c2kernel/gui/graph/controller/ElasticBand.java b/src/main/java/org/cristalise/gui/graph/controller/ElasticBand.java
index b458ddf..37d1ad4 100644
--- a/src/main/java/com/c2kernel/gui/graph/controller/ElasticBand.java
+++ b/src/main/java/org/cristalise/gui/graph/controller/ElasticBand.java
@@ -1,6 +1,6 @@
-package com.c2kernel.gui.graph.controller;

+package org.cristalise.gui.graph.controller;

 

-import com.c2kernel.graph.model.GraphPoint;

+import org.cristalise.kernel.graph.model.GraphPoint;

 

 

 

diff --git a/src/main/java/com/c2kernel/gui/graph/controller/MultiSelectionDragController.java b/src/main/java/org/cristalise/gui/graph/controller/MultiSelectionDragController.java
index ed9d6a1..e677cce 100644
--- a/src/main/java/com/c2kernel/gui/graph/controller/MultiSelectionDragController.java
+++ b/src/main/java/org/cristalise/gui/graph/controller/MultiSelectionDragController.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.graph.controller;

+package org.cristalise.gui.graph.controller;

 

 import java.awt.Point;

 import java.awt.event.InputEvent;

@@ -7,13 +7,14 @@ import java.awt.event.KeyListener;
 import java.awt.event.MouseAdapter;

 import java.awt.event.MouseEvent;

 

-import com.c2kernel.graph.model.DirectedEdge;

-import com.c2kernel.graph.model.GraphModelManager;

-import com.c2kernel.graph.model.GraphPoint;

-import com.c2kernel.graph.model.GraphableVertex;

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.gui.graph.view.EditorModeListener;

-import com.c2kernel.gui.graph.view.GraphPanel;

+import org.cristalise.gui.graph.view.EditorModeListener;

+import org.cristalise.gui.graph.view.GraphPanel;

+import org.cristalise.kernel.graph.model.DirectedEdge;

+import org.cristalise.kernel.graph.model.GraphModelManager;

+import org.cristalise.kernel.graph.model.GraphPoint;

+import org.cristalise.kernel.graph.model.GraphableVertex;

+import org.cristalise.kernel.graph.model.Vertex;

+

 

 

 public class MultiSelectionDragController

diff --git a/src/main/java/com/c2kernel/gui/graph/controller/Selection.java b/src/main/java/org/cristalise/gui/graph/controller/Selection.java
index 3700e44..cf634a7 100644
--- a/src/main/java/com/c2kernel/gui/graph/controller/Selection.java
+++ b/src/main/java/org/cristalise/gui/graph/controller/Selection.java
@@ -1,7 +1,7 @@
-package com.c2kernel.gui.graph.controller;

+package org.cristalise.gui.graph.controller;

 

-import com.c2kernel.graph.model.DirectedEdge;

-import com.c2kernel.graph.model.Vertex;

+import org.cristalise.kernel.graph.model.DirectedEdge;

+import org.cristalise.kernel.graph.model.Vertex;

 

 

 

diff --git a/src/main/java/com/c2kernel/gui/graph/controller/StartVertexController.java b/src/main/java/org/cristalise/gui/graph/controller/StartVertexController.java
index 41a53b3..b98620b 100644
--- a/src/main/java/com/c2kernel/gui/graph/controller/StartVertexController.java
+++ b/src/main/java/org/cristalise/gui/graph/controller/StartVertexController.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.graph.controller;

+package org.cristalise.gui.graph.controller;

 

 import java.awt.event.ActionEvent;

 import java.awt.event.ActionListener;

@@ -7,9 +7,10 @@ import java.util.Observer;
 

 import javax.swing.JButton;

 

-import com.c2kernel.graph.model.GraphModelManager;

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.gui.graph.event.SelectionChangedEvent;

+import org.cristalise.gui.graph.event.SelectionChangedEvent;

+import org.cristalise.kernel.graph.model.GraphModelManager;

+import org.cristalise.kernel.graph.model.Vertex;

+

 

 

 // The start vertex controller is responsible for selecting

diff --git a/src/main/java/com/c2kernel/gui/graph/controller/VertexConstructionController.java b/src/main/java/org/cristalise/gui/graph/controller/VertexConstructionController.java
index 849675e..a2f5dc0 100644
--- a/src/main/java/com/c2kernel/gui/graph/controller/VertexConstructionController.java
+++ b/src/main/java/org/cristalise/gui/graph/controller/VertexConstructionController.java
@@ -1,13 +1,14 @@
-package com.c2kernel.gui.graph.controller;

+package org.cristalise.gui.graph.controller;

 

 import java.awt.event.MouseAdapter;

 import java.awt.event.MouseEvent;

 

-import com.c2kernel.graph.model.GraphModelManager;

-import com.c2kernel.graph.model.GraphPoint;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.graph.view.EditorModeListener;

-import com.c2kernel.gui.graph.view.EditorToolBar;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.graph.view.EditorModeListener;

+import org.cristalise.gui.graph.view.EditorToolBar;

+import org.cristalise.kernel.graph.model.GraphModelManager;

+import org.cristalise.kernel.graph.model.GraphPoint;

+

 

 

 public class VertexConstructionController extends MouseAdapter implements EditorModeListener

diff --git a/src/main/java/org/cristalise/gui/graph/event/ElasticBandResizedEvent.java b/src/main/java/org/cristalise/gui/graph/event/ElasticBandResizedEvent.java
new file mode 100644
index 0000000..87e77a5
--- /dev/null
+++ b/src/main/java/org/cristalise/gui/graph/event/ElasticBandResizedEvent.java
@@ -0,0 +1,8 @@
+package org.cristalise.gui.graph.event;

+

+import org.cristalise.kernel.graph.event.GraphModelEvent;

+

+

+public class ElasticBandResizedEvent extends GraphModelEvent

+{

+}

diff --git a/src/main/java/org/cristalise/gui/graph/event/ElasticBandSetEvent.java b/src/main/java/org/cristalise/gui/graph/event/ElasticBandSetEvent.java
new file mode 100644
index 0000000..9a8236b
--- /dev/null
+++ b/src/main/java/org/cristalise/gui/graph/event/ElasticBandSetEvent.java
@@ -0,0 +1,8 @@
+package org.cristalise.gui.graph.event;

+

+import org.cristalise.kernel.graph.event.GraphModelEvent;

+

+

+public class ElasticBandSetEvent extends GraphModelEvent

+{

+}

diff --git a/src/main/java/org/cristalise/gui/graph/event/SelectionChangedEvent.java b/src/main/java/org/cristalise/gui/graph/event/SelectionChangedEvent.java
new file mode 100644
index 0000000..cfcb85e
--- /dev/null
+++ b/src/main/java/org/cristalise/gui/graph/event/SelectionChangedEvent.java
@@ -0,0 +1,11 @@
+package org.cristalise.gui.graph.event;

+

+import org.cristalise.gui.graph.controller.Selection;

+import org.cristalise.kernel.graph.event.GraphModelEvent;

+

+

+

+public class SelectionChangedEvent extends GraphModelEvent

+{

+    public Selection mSelection = null;

+}

diff --git a/src/main/java/org/cristalise/gui/graph/event/SelectionMovedEvent.java b/src/main/java/org/cristalise/gui/graph/event/SelectionMovedEvent.java
new file mode 100644
index 0000000..4dea263
--- /dev/null
+++ b/src/main/java/org/cristalise/gui/graph/event/SelectionMovedEvent.java
@@ -0,0 +1,9 @@
+package org.cristalise.gui.graph.event;

+

+import org.cristalise.kernel.graph.event.GraphModelEvent;

+

+

+

+public class SelectionMovedEvent extends GraphModelEvent

+{

+}

diff --git a/src/main/java/com/c2kernel/gui/graph/view/DefaultDirectedEdgeRenderer.java b/src/main/java/org/cristalise/gui/graph/view/DefaultDirectedEdgeRenderer.java
index e0d02c0..7695885 100644
--- a/src/main/java/com/c2kernel/gui/graph/view/DefaultDirectedEdgeRenderer.java
+++ b/src/main/java/org/cristalise/gui/graph/view/DefaultDirectedEdgeRenderer.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.graph.view;

+package org.cristalise.gui.graph.view;

 

 import java.awt.Graphics2D;

 import java.awt.Paint;

@@ -6,8 +6,9 @@ import java.awt.Shape;
 import java.awt.geom.AffineTransform;

 import java.awt.geom.GeneralPath;

 

-import com.c2kernel.graph.model.DirectedEdge;

-import com.c2kernel.graph.model.GraphPoint;

+import org.cristalise.kernel.graph.model.DirectedEdge;

+import org.cristalise.kernel.graph.model.GraphPoint;

+

 

 

 public class DefaultDirectedEdgeRenderer implements DirectedEdgeRenderer

diff --git a/src/main/java/com/c2kernel/gui/graph/view/DefaultVertexRenderer.java b/src/main/java/org/cristalise/gui/graph/view/DefaultVertexRenderer.java
index c8804e2..fdb2079 100644
--- a/src/main/java/com/c2kernel/gui/graph/view/DefaultVertexRenderer.java
+++ b/src/main/java/org/cristalise/gui/graph/view/DefaultVertexRenderer.java
@@ -1,12 +1,13 @@
-package com.c2kernel.gui.graph.view;

+package org.cristalise.gui.graph.view;

 

 import java.awt.FontMetrics;

 import java.awt.Graphics2D;

 import java.awt.Paint;

 import java.awt.Polygon;

 

-import com.c2kernel.graph.model.GraphPoint;

-import com.c2kernel.graph.model.Vertex;

+import org.cristalise.kernel.graph.model.GraphPoint;

+import org.cristalise.kernel.graph.model.Vertex;

+

 

 

 public class DefaultVertexRenderer implements VertexRenderer

diff --git a/src/main/java/com/c2kernel/gui/graph/view/DirectedEdgeRenderer.java b/src/main/java/org/cristalise/gui/graph/view/DirectedEdgeRenderer.java
index 32d9d92..a0bb2cc 100644
--- a/src/main/java/com/c2kernel/gui/graph/view/DirectedEdgeRenderer.java
+++ b/src/main/java/org/cristalise/gui/graph/view/DirectedEdgeRenderer.java
@@ -1,8 +1,9 @@
-package com.c2kernel.gui.graph.view;

+package org.cristalise.gui.graph.view;

 

 import java.awt.Graphics2D;

 

-import com.c2kernel.graph.model.DirectedEdge;

+import org.cristalise.kernel.graph.model.DirectedEdge;

+

 

 

 public interface DirectedEdgeRenderer

diff --git a/src/main/java/com/c2kernel/gui/graph/view/EditorModeListener.java b/src/main/java/org/cristalise/gui/graph/view/EditorModeListener.java
index c23f37e..567b151 100644
--- a/src/main/java/com/c2kernel/gui/graph/view/EditorModeListener.java
+++ b/src/main/java/org/cristalise/gui/graph/view/EditorModeListener.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.graph.view;

+package org.cristalise.gui.graph.view;

 

 

 

diff --git a/src/main/java/com/c2kernel/gui/graph/view/EditorPanel.java b/src/main/java/org/cristalise/gui/graph/view/EditorPanel.java
index 67b7a68..3ccb0c1 100644
--- a/src/main/java/com/c2kernel/gui/graph/view/EditorPanel.java
+++ b/src/main/java/org/cristalise/gui/graph/view/EditorPanel.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.graph.view;

+package org.cristalise.gui.graph.view;

 import java.awt.BorderLayout;

 import java.awt.Dimension;

 

@@ -6,15 +6,16 @@ import javax.swing.JButton;
 import javax.swing.JPanel;

 import javax.swing.JScrollPane;

 

-import com.c2kernel.graph.model.EdgeFactory;

-import com.c2kernel.graph.model.GraphModelManager;

-import com.c2kernel.graph.model.TypeNameAndConstructionInfo;

-import com.c2kernel.graph.model.VertexFactory;

-import com.c2kernel.graph.model.VertexOutlineCreator;

-import com.c2kernel.gui.graph.controller.AutoScrollController;

-import com.c2kernel.gui.graph.controller.EdgeConstructionController;

-import com.c2kernel.gui.graph.controller.MultiSelectionDragController;

-import com.c2kernel.gui.graph.controller.VertexConstructionController;

+import org.cristalise.gui.graph.controller.AutoScrollController;

+import org.cristalise.gui.graph.controller.EdgeConstructionController;

+import org.cristalise.gui.graph.controller.MultiSelectionDragController;

+import org.cristalise.gui.graph.controller.VertexConstructionController;

+import org.cristalise.kernel.graph.model.EdgeFactory;

+import org.cristalise.kernel.graph.model.GraphModelManager;

+import org.cristalise.kernel.graph.model.TypeNameAndConstructionInfo;

+import org.cristalise.kernel.graph.model.VertexFactory;

+import org.cristalise.kernel.graph.model.VertexOutlineCreator;

+

 public class EditorPanel extends JPanel

 {

 	// Graph Model

diff --git a/src/main/java/com/c2kernel/gui/graph/view/EditorToolBar.java b/src/main/java/org/cristalise/gui/graph/view/EditorToolBar.java
index 8892fd7..e57000c 100644
--- a/src/main/java/com/c2kernel/gui/graph/view/EditorToolBar.java
+++ b/src/main/java/org/cristalise/gui/graph/view/EditorToolBar.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.graph.view;

+package org.cristalise.gui.graph.view;

 import java.awt.Dimension;

 import java.awt.Graphics;

 import java.awt.Graphics2D;

@@ -25,13 +25,14 @@ import javax.swing.JButton;
 import javax.swing.JComboBox;

 import javax.swing.JToggleButton;

 

-import com.c2kernel.graph.model.GraphModelManager;

-import com.c2kernel.graph.model.TypeNameAndConstructionInfo;

-import com.c2kernel.gui.ImageLoader;

-import com.c2kernel.gui.graph.controller.DeletionController;

-import com.c2kernel.gui.graph.controller.StartVertexController;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.ImageLoader;

+import org.cristalise.gui.graph.controller.DeletionController;

+import org.cristalise.gui.graph.controller.StartVertexController;

+import org.cristalise.kernel.graph.model.GraphModelManager;

+import org.cristalise.kernel.graph.model.TypeNameAndConstructionInfo;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.Logger;

+

 /**

  * Tool bar with mode toggle buttons, start and delete buttons, and the possibility to add other arbitrary buttons at constructions time.

  */

diff --git a/src/main/java/com/c2kernel/gui/graph/view/GraphPanel.java b/src/main/java/org/cristalise/gui/graph/view/GraphPanel.java
index ca309b1..1076d1b 100644
--- a/src/main/java/com/c2kernel/gui/graph/view/GraphPanel.java
+++ b/src/main/java/org/cristalise/gui/graph/view/GraphPanel.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.graph.view;

+package org.cristalise.gui.graph.view;

 import java.awt.BasicStroke;

 import java.awt.Color;

 import java.awt.Dimension;

@@ -15,19 +15,20 @@ import java.util.Vector;
 

 import javax.swing.JPanel;

 

-import com.c2kernel.graph.event.EntireModelChangedEvent;

-import com.c2kernel.graph.event.GraphModelResizedEvent;

-import com.c2kernel.graph.model.DirectedEdge;

-import com.c2kernel.graph.model.GraphModelManager;

-import com.c2kernel.graph.model.GraphPoint;

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.gui.ImageLoader;

-import com.c2kernel.gui.graph.controller.ElasticBand;

-import com.c2kernel.gui.graph.controller.Selection;

-import com.c2kernel.gui.graph.event.ElasticBandResizedEvent;

-import com.c2kernel.gui.graph.event.ElasticBandSetEvent;

-import com.c2kernel.gui.graph.event.SelectionChangedEvent;

-import com.c2kernel.gui.graph.event.SelectionMovedEvent;

+import org.cristalise.gui.ImageLoader;

+import org.cristalise.gui.graph.controller.ElasticBand;

+import org.cristalise.gui.graph.controller.Selection;

+import org.cristalise.gui.graph.event.ElasticBandResizedEvent;

+import org.cristalise.gui.graph.event.ElasticBandSetEvent;

+import org.cristalise.gui.graph.event.SelectionChangedEvent;

+import org.cristalise.gui.graph.event.SelectionMovedEvent;

+import org.cristalise.kernel.graph.event.EntireModelChangedEvent;

+import org.cristalise.kernel.graph.event.GraphModelResizedEvent;

+import org.cristalise.kernel.graph.model.DirectedEdge;

+import org.cristalise.kernel.graph.model.GraphModelManager;

+import org.cristalise.kernel.graph.model.GraphPoint;

+import org.cristalise.kernel.graph.model.Vertex;

+

 public class GraphPanel extends JPanel implements Observer

 {

     // There should always be a Selection object

diff --git a/src/main/java/com/c2kernel/gui/graph/view/PropertyTable.java b/src/main/java/org/cristalise/gui/graph/view/PropertyTable.java
index adf9fc9..d88e3a6 100644
--- a/src/main/java/com/c2kernel/gui/graph/view/PropertyTable.java
+++ b/src/main/java/org/cristalise/gui/graph/view/PropertyTable.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.graph.view;

+package org.cristalise.gui.graph.view;

 

 import javax.swing.JTable;

 import javax.swing.table.TableCellEditor;

diff --git a/src/main/java/com/c2kernel/gui/graph/view/PropertyTableModel.java b/src/main/java/org/cristalise/gui/graph/view/PropertyTableModel.java
index 616c302..173946a 100644
--- a/src/main/java/com/c2kernel/gui/graph/view/PropertyTableModel.java
+++ b/src/main/java/org/cristalise/gui/graph/view/PropertyTableModel.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.graph.view;

+package org.cristalise.gui.graph.view;

 

 import java.util.ArrayList;

 import java.util.Collections;

@@ -8,8 +8,9 @@ import javax.swing.JOptionPane;
 import javax.swing.event.TableModelEvent;

 import javax.swing.table.AbstractTableModel;

 

-import com.c2kernel.utils.CastorHashMap;

-import com.c2kernel.utils.Language;

+import org.cristalise.kernel.utils.CastorHashMap;

+import org.cristalise.kernel.utils.Language;

+

 

 /**************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/graph/view/SelectedVertexPanel.java b/src/main/java/org/cristalise/gui/graph/view/SelectedVertexPanel.java
index 282ce09..426a456 100644
--- a/src/main/java/com/c2kernel/gui/graph/view/SelectedVertexPanel.java
+++ b/src/main/java/org/cristalise/gui/graph/view/SelectedVertexPanel.java
@@ -1,8 +1,9 @@
-package com.c2kernel.gui.graph.view;

+package org.cristalise.gui.graph.view;

 

 import javax.swing.JPanel;

 

-import com.c2kernel.graph.model.Vertex;

+import org.cristalise.kernel.graph.model.Vertex;

+

 

 /**************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/graph/view/VertexPropertyPanel.java b/src/main/java/org/cristalise/gui/graph/view/VertexPropertyPanel.java
index d500201..006e3b0 100644
--- a/src/main/java/com/c2kernel/gui/graph/view/VertexPropertyPanel.java
+++ b/src/main/java/org/cristalise/gui/graph/view/VertexPropertyPanel.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.graph.view;

+package org.cristalise.gui.graph.view;

 

 import java.awt.GridBagConstraints;

 import java.awt.GridBagLayout;

@@ -21,17 +21,18 @@ import javax.swing.JTextField;
 import javax.swing.event.TableModelEvent;

 import javax.swing.event.TableModelListener;

 

-import com.c2kernel.graph.event.EntireModelChangedEvent;

-import com.c2kernel.graph.model.DirectedEdge;

-import com.c2kernel.graph.model.GraphModelManager;

-import com.c2kernel.graph.model.GraphableEdge;

-import com.c2kernel.graph.model.GraphableVertex;

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.graph.event.SelectionChangedEvent;

-import com.c2kernel.gui.tabs.ItemTabPane;

-import com.c2kernel.utils.CastorHashMap;

-import com.c2kernel.utils.Language;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.graph.event.SelectionChangedEvent;

+import org.cristalise.gui.tabs.ItemTabPane;

+import org.cristalise.kernel.graph.event.EntireModelChangedEvent;

+import org.cristalise.kernel.graph.model.DirectedEdge;

+import org.cristalise.kernel.graph.model.GraphModelManager;

+import org.cristalise.kernel.graph.model.GraphableEdge;

+import org.cristalise.kernel.graph.model.GraphableVertex;

+import org.cristalise.kernel.graph.model.Vertex;

+import org.cristalise.kernel.utils.CastorHashMap;

+import org.cristalise.kernel.utils.Language;

+

 

 /**************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/graph/view/VertexRenderer.java b/src/main/java/org/cristalise/gui/graph/view/VertexRenderer.java
index 9757b0f..2aa7e49 100644
--- a/src/main/java/com/c2kernel/gui/graph/view/VertexRenderer.java
+++ b/src/main/java/org/cristalise/gui/graph/view/VertexRenderer.java
@@ -1,8 +1,9 @@
-package com.c2kernel.gui.graph.view;

+package org.cristalise.gui.graph.view;

 

 import java.awt.Graphics2D;

 

-import com.c2kernel.graph.model.Vertex;

+import org.cristalise.kernel.graph.model.Vertex;

+

 

 

 public interface VertexRenderer

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/chooser/ActivityChooser.java b/src/main/java/org/cristalise/gui/lifecycle/chooser/ActivityChooser.java
index 32830f7..d63a2c5 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/chooser/ActivityChooser.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/chooser/ActivityChooser.java
@@ -3,7 +3,7 @@
  *

  * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments

  */

-package com.c2kernel.gui.lifecycle.chooser;

+package org.cristalise.gui.lifecycle.chooser;

 

 import java.awt.Container;

 import java.awt.Cursor;

@@ -22,9 +22,10 @@ import javax.swing.JFrame;
 import javax.swing.JLabel;

 import javax.swing.JPanel;

 

-import com.c2kernel.gui.ImageLoader;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.ImageLoader;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.Logger;

+

 

 /**

  * @author Developpement

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/chooser/LDAPEntryChooser.java b/src/main/java/org/cristalise/gui/lifecycle/chooser/LDAPEntryChooser.java
index 7245618..90c759f 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/chooser/LDAPEntryChooser.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/chooser/LDAPEntryChooser.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.lifecycle.chooser;

+package org.cristalise.gui.lifecycle.chooser;

 /**

  * @version $Revision: 1.2 $ $Date: 2005/12/01 14:23:15 $

  * @author  $Author: abranson $

@@ -11,9 +11,10 @@ import java.util.Iterator;
 

 import javax.swing.JComboBox;

 

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.lookup.DomainPath;

-import com.c2kernel.process.Gateway;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.kernel.lookup.DomainPath;

+import org.cristalise.kernel.process.Gateway;

+

 

 public class LDAPEntryChooser extends JComboBox

 {

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/chooser/LDAPFileChooser.java b/src/main/java/org/cristalise/gui/lifecycle/chooser/LDAPFileChooser.java
index 8901c17..ed594f4 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/chooser/LDAPFileChooser.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/chooser/LDAPFileChooser.java
@@ -1,13 +1,14 @@
-package com.c2kernel.gui.lifecycle.chooser;

+package org.cristalise.gui.lifecycle.chooser;

 import java.awt.Dimension;

 import java.awt.event.ItemListener;

 

 import javax.swing.BoxLayout;

 import javax.swing.JPanel;

 

-import com.c2kernel.lookup.DomainPath;

-import com.c2kernel.persistency.ClusterStorage;

-import com.c2kernel.utils.Logger;

+import org.cristalise.kernel.lookup.DomainPath;

+import org.cristalise.kernel.persistency.ClusterStorage;

+import org.cristalise.kernel.utils.Logger;

+

 

 //import fr.agilium.gui.tabs.wfPropertiesViewer.JPanelTabbedProperties;

 /**

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/chooser/WorkflowDialogue.java b/src/main/java/org/cristalise/gui/lifecycle/chooser/WorkflowDialogue.java
index 61b70b5..7ee6b5f 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/chooser/WorkflowDialogue.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/chooser/WorkflowDialogue.java
@@ -4,7 +4,7 @@
  * To change the template for this generated file go to

  * Window>Preferences>Java>Code Generation>Code and Comments

  */

-package com.c2kernel.gui.lifecycle.chooser;

+package org.cristalise.gui.lifecycle.chooser;

 

 import java.util.HashMap;

 

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/ActivitySlotDefRenderer.java b/src/main/java/org/cristalise/gui/lifecycle/desc/ActivitySlotDefRenderer.java
index 56cb44d..c15cf17 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/desc/ActivitySlotDefRenderer.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/desc/ActivitySlotDefRenderer.java
@@ -1,15 +1,16 @@
-package com.c2kernel.gui.lifecycle.desc;

+package org.cristalise.gui.lifecycle.desc;

 

 import java.awt.Color;

 import java.awt.FontMetrics;

 import java.awt.Graphics2D;

 import java.awt.Paint;

 

-import com.c2kernel.graph.model.GraphPoint;

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.gui.graph.view.VertexRenderer;

-import com.c2kernel.lifecycle.ActivitySlotDef;

-import com.c2kernel.utils.Language;

+import org.cristalise.gui.graph.view.VertexRenderer;

+import org.cristalise.kernel.graph.model.GraphPoint;

+import org.cristalise.kernel.graph.model.Vertex;

+import org.cristalise.kernel.lifecycle.ActivitySlotDef;

+import org.cristalise.kernel.utils.Language;

+

 

 public class ActivitySlotDefRenderer implements VertexRenderer

 {

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java b/src/main/java/org/cristalise/gui/lifecycle/desc/CompActDefOutcomeHandler.java
index 87f4a9b..eabc85b 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/desc/CompActDefOutcomeHandler.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.lifecycle.desc;

+package org.cristalise.gui.lifecycle.desc;

 

 import java.awt.GridBagConstraints;

 import java.awt.GridBagLayout;

@@ -13,22 +13,23 @@ import javax.swing.JFileChooser;
 import javax.swing.JPanel;

 import javax.swing.JSplitPane;

 

-import com.c2kernel.graph.layout.DefaultGraphLayoutGenerator;

-import com.c2kernel.gui.ImageLoader;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.graph.view.EditorPanel;

-import com.c2kernel.gui.graph.view.VertexPropertyPanel;

-import com.c2kernel.gui.lifecycle.instance.FindActDefPanel;

-import com.c2kernel.gui.tabs.outcome.InvalidOutcomeException;

-import com.c2kernel.gui.tabs.outcome.InvalidSchemaException;

-import com.c2kernel.gui.tabs.outcome.OutcomeException;

-import com.c2kernel.gui.tabs.outcome.OutcomeHandler;

-import com.c2kernel.gui.tabs.outcome.OutcomeNotInitialisedException;

-import com.c2kernel.lifecycle.CompositeActivityDef;

-import com.c2kernel.lifecycle.WfVertexDefOutlineCreator;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.FileStringUtility;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.ImageLoader;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.graph.view.EditorPanel;

+import org.cristalise.gui.graph.view.VertexPropertyPanel;

+import org.cristalise.gui.lifecycle.instance.FindActDefPanel;

+import org.cristalise.gui.tabs.outcome.InvalidOutcomeException;

+import org.cristalise.gui.tabs.outcome.InvalidSchemaException;

+import org.cristalise.gui.tabs.outcome.OutcomeException;

+import org.cristalise.gui.tabs.outcome.OutcomeHandler;

+import org.cristalise.gui.tabs.outcome.OutcomeNotInitialisedException;

+import org.cristalise.kernel.graph.layout.DefaultGraphLayoutGenerator;

+import org.cristalise.kernel.lifecycle.CompositeActivityDef;

+import org.cristalise.kernel.lifecycle.WfVertexDefOutlineCreator;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.FileStringUtility;

+import org.cristalise.kernel.utils.Logger;

+

 

 /**************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java b/src/main/java/org/cristalise/gui/lifecycle/desc/ElemActDefOutcomeHandler.java
index f02e2f7..985ce0a 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/desc/ElemActDefOutcomeHandler.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.lifecycle.desc;

+package org.cristalise.gui.lifecycle.desc;

 

 import java.io.BufferedWriter;

 import java.io.File;

@@ -6,26 +6,27 @@ import java.io.File;
 import javax.swing.JOptionPane;

 import javax.swing.JPanel;

 

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.entity.agent.Job;

-import com.c2kernel.entity.proxy.ItemProxy;

-import com.c2kernel.graph.model.GraphableVertex;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.graph.view.VertexPropertyPanel;

-import com.c2kernel.gui.tabs.outcome.InvalidOutcomeException;

-import com.c2kernel.gui.tabs.outcome.InvalidSchemaException;

-import com.c2kernel.gui.tabs.outcome.OutcomeException;

-import com.c2kernel.gui.tabs.outcome.OutcomeHandler;

-import com.c2kernel.gui.tabs.outcome.OutcomeNotInitialisedException;

-import com.c2kernel.lifecycle.ActivityDef;

-import com.c2kernel.lifecycle.ActivitySlotDef;

-import com.c2kernel.lifecycle.CompositeActivityDef;

-import com.c2kernel.persistency.ClusterStorage;

-import com.c2kernel.persistency.outcome.Viewpoint;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.FileStringUtility;

-import com.c2kernel.utils.LocalObjectLoader;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.graph.view.VertexPropertyPanel;

+import org.cristalise.gui.tabs.outcome.InvalidOutcomeException;

+import org.cristalise.gui.tabs.outcome.InvalidSchemaException;

+import org.cristalise.gui.tabs.outcome.OutcomeException;

+import org.cristalise.gui.tabs.outcome.OutcomeHandler;

+import org.cristalise.gui.tabs.outcome.OutcomeNotInitialisedException;

+import org.cristalise.kernel.common.ObjectNotFoundException;

+import org.cristalise.kernel.entity.agent.Job;

+import org.cristalise.kernel.entity.proxy.ItemProxy;

+import org.cristalise.kernel.graph.model.GraphableVertex;

+import org.cristalise.kernel.lifecycle.ActivityDef;

+import org.cristalise.kernel.lifecycle.ActivitySlotDef;

+import org.cristalise.kernel.lifecycle.CompositeActivityDef;

+import org.cristalise.kernel.persistency.ClusterStorage;

+import org.cristalise.kernel.persistency.outcome.Viewpoint;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.FileStringUtility;

+import org.cristalise.kernel.utils.LocalObjectLoader;

+import org.cristalise.kernel.utils.Logger;

+

 

 /**************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/SplitJoinDefRenderer.java b/src/main/java/org/cristalise/gui/lifecycle/desc/SplitJoinDefRenderer.java
index f756696..65d59b2 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/desc/SplitJoinDefRenderer.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/desc/SplitJoinDefRenderer.java
@@ -1,20 +1,21 @@
-package com.c2kernel.gui.lifecycle.desc;

+package org.cristalise.gui.lifecycle.desc;

 

 import java.awt.Color;

 import java.awt.FontMetrics;

 import java.awt.Graphics2D;

 import java.awt.Paint;

 

-import com.c2kernel.graph.model.GraphPoint;

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.gui.graph.view.VertexRenderer;

-import com.c2kernel.lifecycle.AndSplitDef;

-import com.c2kernel.lifecycle.JoinDef;

-import com.c2kernel.lifecycle.LoopDef;

-import com.c2kernel.lifecycle.OrSplitDef;

-import com.c2kernel.lifecycle.WfVertexDef;

-import com.c2kernel.lifecycle.XOrSplitDef;

-import com.c2kernel.utils.Language;

+import org.cristalise.gui.graph.view.VertexRenderer;

+import org.cristalise.kernel.graph.model.GraphPoint;

+import org.cristalise.kernel.graph.model.Vertex;

+import org.cristalise.kernel.lifecycle.AndSplitDef;

+import org.cristalise.kernel.lifecycle.JoinDef;

+import org.cristalise.kernel.lifecycle.LoopDef;

+import org.cristalise.kernel.lifecycle.OrSplitDef;

+import org.cristalise.kernel.lifecycle.WfVertexDef;

+import org.cristalise.kernel.lifecycle.XOrSplitDef;

+import org.cristalise.kernel.utils.Language;

+

 

 

 public class SplitJoinDefRenderer implements VertexRenderer

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/WfDefGraphPanel.java b/src/main/java/org/cristalise/gui/lifecycle/desc/WfDefGraphPanel.java
index 7177a4d..2ad87b2 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/desc/WfDefGraphPanel.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/desc/WfDefGraphPanel.java
@@ -1,14 +1,15 @@
 /*Created on 21 nov. 2003 */

-package com.c2kernel.gui.lifecycle.desc;

+package org.cristalise.gui.lifecycle.desc;

 

 import java.awt.Graphics2D;

 

-import com.c2kernel.graph.model.DirectedEdge;

-import com.c2kernel.graph.model.GraphPoint;

-import com.c2kernel.gui.graph.view.DirectedEdgeRenderer;

-import com.c2kernel.gui.graph.view.GraphPanel;

-import com.c2kernel.gui.graph.view.VertexRenderer;

-import com.c2kernel.lifecycle.NextDef;

+import org.cristalise.gui.graph.view.DirectedEdgeRenderer;

+import org.cristalise.gui.graph.view.GraphPanel;

+import org.cristalise.gui.graph.view.VertexRenderer;

+import org.cristalise.kernel.graph.model.DirectedEdge;

+import org.cristalise.kernel.graph.model.GraphPoint;

+import org.cristalise.kernel.lifecycle.NextDef;

+

 

 /** @author XSeb74*/

 public class WfDefGraphPanel extends GraphPanel

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/WfDirectedEdgeDefRenderer.java b/src/main/java/org/cristalise/gui/lifecycle/desc/WfDirectedEdgeDefRenderer.java
index 695934b..80a67a4 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/desc/WfDirectedEdgeDefRenderer.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/desc/WfDirectedEdgeDefRenderer.java
@@ -1,14 +1,15 @@
-package com.c2kernel.gui.lifecycle.desc;

+package org.cristalise.gui.lifecycle.desc;

 import java.awt.Color;

 import java.awt.Graphics2D;

 import java.awt.Shape;

 import java.awt.geom.AffineTransform;

 import java.awt.geom.GeneralPath;

 

-import com.c2kernel.graph.model.DirectedEdge;

-import com.c2kernel.graph.model.GraphPoint;

-import com.c2kernel.gui.graph.view.DirectedEdgeRenderer;

-import com.c2kernel.lifecycle.NextDef;

+import org.cristalise.gui.graph.view.DirectedEdgeRenderer;

+import org.cristalise.kernel.graph.model.DirectedEdge;

+import org.cristalise.kernel.graph.model.GraphPoint;

+import org.cristalise.kernel.lifecycle.NextDef;

+

 public class WfDirectedEdgeDefRenderer implements DirectedEdgeRenderer

 {

 	private GeneralPath mArrowTemplate = new GeneralPath();

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/WfEdgeDefFactory.java b/src/main/java/org/cristalise/gui/lifecycle/desc/WfEdgeDefFactory.java
index 082a4a2..e6c8fdd 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/desc/WfEdgeDefFactory.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/desc/WfEdgeDefFactory.java
@@ -1,11 +1,11 @@
-package com.c2kernel.gui.lifecycle.desc;

-import com.c2kernel.graph.model.DirectedEdge;

-import com.c2kernel.graph.model.EdgeFactory;

-import com.c2kernel.graph.model.GraphModelManager;

-import com.c2kernel.graph.model.TypeNameAndConstructionInfo;

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.lifecycle.NextDef;

-import com.c2kernel.lifecycle.WfVertexDef;

+package org.cristalise.gui.lifecycle.desc;

+import org.cristalise.kernel.graph.model.DirectedEdge;

+import org.cristalise.kernel.graph.model.EdgeFactory;

+import org.cristalise.kernel.graph.model.GraphModelManager;

+import org.cristalise.kernel.graph.model.TypeNameAndConstructionInfo;

+import org.cristalise.kernel.graph.model.Vertex;

+import org.cristalise.kernel.lifecycle.NextDef;

+import org.cristalise.kernel.lifecycle.WfVertexDef;

 public class WfEdgeDefFactory implements EdgeFactory

 {

 	@Override

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/WfVertexDefFactory.java b/src/main/java/org/cristalise/gui/lifecycle/desc/WfVertexDefFactory.java
index f08f916..0174096 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/desc/WfVertexDefFactory.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/desc/WfVertexDefFactory.java
@@ -1,21 +1,22 @@
-package com.c2kernel.gui.lifecycle.desc;

+package org.cristalise.gui.lifecycle.desc;

 import java.util.HashMap;

 

 import javax.swing.JOptionPane;

 

-import com.c2kernel.graph.model.GraphModelManager;

-import com.c2kernel.graph.model.GraphPoint;

-import com.c2kernel.graph.model.TypeNameAndConstructionInfo;

-import com.c2kernel.graph.model.VertexFactory;

-import com.c2kernel.gui.ImageLoader;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.lifecycle.chooser.ActivityChooser;

-import com.c2kernel.gui.lifecycle.chooser.WorkflowDialogue;

-import com.c2kernel.lifecycle.ActivityDef;

-import com.c2kernel.lifecycle.CompositeActivityDef;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.LocalObjectLoader;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.ImageLoader;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.lifecycle.chooser.ActivityChooser;

+import org.cristalise.gui.lifecycle.chooser.WorkflowDialogue;

+import org.cristalise.kernel.graph.model.GraphModelManager;

+import org.cristalise.kernel.graph.model.GraphPoint;

+import org.cristalise.kernel.graph.model.TypeNameAndConstructionInfo;

+import org.cristalise.kernel.graph.model.VertexFactory;

+import org.cristalise.kernel.lifecycle.ActivityDef;

+import org.cristalise.kernel.lifecycle.CompositeActivityDef;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.LocalObjectLoader;

+import org.cristalise.kernel.utils.Logger;

+

 public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue

 {

 	protected CompositeActivityDef mCompositeActivityDef = null;

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/WfVertexDefRenderer.java b/src/main/java/org/cristalise/gui/lifecycle/desc/WfVertexDefRenderer.java
index 6ba6c49..17e2622 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/desc/WfVertexDefRenderer.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/desc/WfVertexDefRenderer.java
@@ -1,12 +1,13 @@
-package com.c2kernel.gui.lifecycle.desc;

+package org.cristalise.gui.lifecycle.desc;

 

 import java.awt.Graphics2D;

 

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.gui.graph.view.VertexRenderer;

-import com.c2kernel.lifecycle.ActivitySlotDef;

-import com.c2kernel.lifecycle.AndSplitDef;

-import com.c2kernel.lifecycle.JoinDef;

+import org.cristalise.gui.graph.view.VertexRenderer;

+import org.cristalise.kernel.graph.model.Vertex;

+import org.cristalise.kernel.lifecycle.ActivitySlotDef;

+import org.cristalise.kernel.lifecycle.AndSplitDef;

+import org.cristalise.kernel.lifecycle.JoinDef;

+

 

 public class WfVertexDefRenderer implements VertexRenderer

 {

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/ActivityRenderer.java b/src/main/java/org/cristalise/gui/lifecycle/instance/ActivityRenderer.java
index a13d610..f4d44b9 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/instance/ActivityRenderer.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/instance/ActivityRenderer.java
@@ -1,18 +1,19 @@
-package com.c2kernel.gui.lifecycle.instance;

+package org.cristalise.gui.lifecycle.instance;

 import java.awt.Color;

 import java.awt.FontMetrics;

 import java.awt.Graphics2D;

 import java.awt.Paint;

 import java.awt.Polygon;

 

-import com.c2kernel.common.GTimeStamp;

-import com.c2kernel.common.InvalidDataException;

-import com.c2kernel.graph.model.GraphPoint;

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.gui.graph.view.VertexRenderer;

-import com.c2kernel.lifecycle.instance.Activity;

-import com.c2kernel.utils.DateUtility;

-import com.c2kernel.utils.Language;

+import org.cristalise.gui.graph.view.VertexRenderer;

+import org.cristalise.kernel.common.GTimeStamp;

+import org.cristalise.kernel.common.InvalidDataException;

+import org.cristalise.kernel.graph.model.GraphPoint;

+import org.cristalise.kernel.graph.model.Vertex;

+import org.cristalise.kernel.lifecycle.instance.Activity;

+import org.cristalise.kernel.utils.DateUtility;

+import org.cristalise.kernel.utils.Language;

+

 public class ActivityRenderer implements VertexRenderer

 {

 	private Paint mActivePaint = new Color(100, 255, 100);

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/FindActDefPanel.java b/src/main/java/org/cristalise/gui/lifecycle/instance/FindActDefPanel.java
index 233dbf2..4c3acbc 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/instance/FindActDefPanel.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/instance/FindActDefPanel.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.lifecycle.instance;

+package org.cristalise.gui.lifecycle.instance;

 

 import java.awt.event.ActionEvent;

 import java.awt.event.ActionListener;

@@ -6,13 +6,14 @@ import java.util.Iterator;
 

 import javax.swing.JButton;

 

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.graph.view.SelectedVertexPanel;

-import com.c2kernel.lifecycle.ActivitySlotDef;

-import com.c2kernel.lookup.DomainPath;

-import com.c2kernel.lookup.Path;

-import com.c2kernel.process.Gateway;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.graph.view.SelectedVertexPanel;

+import org.cristalise.kernel.graph.model.Vertex;

+import org.cristalise.kernel.lifecycle.ActivitySlotDef;

+import org.cristalise.kernel.lookup.DomainPath;

+import org.cristalise.kernel.lookup.Path;

+import org.cristalise.kernel.process.Gateway;

+

 

 /**************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/SplitJoinRenderer.java b/src/main/java/org/cristalise/gui/lifecycle/instance/SplitJoinRenderer.java
index 3152772..8667fed 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/instance/SplitJoinRenderer.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/instance/SplitJoinRenderer.java
@@ -1,20 +1,21 @@
-package com.c2kernel.gui.lifecycle.instance;

+package org.cristalise.gui.lifecycle.instance;

 

 import java.awt.Color;

 import java.awt.FontMetrics;

 import java.awt.Graphics2D;

 import java.awt.Paint;

 

-import com.c2kernel.graph.model.GraphPoint;

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.gui.graph.view.VertexRenderer;

-import com.c2kernel.lifecycle.instance.AndSplit;

-import com.c2kernel.lifecycle.instance.Join;

-import com.c2kernel.lifecycle.instance.Loop;

-import com.c2kernel.lifecycle.instance.OrSplit;

-import com.c2kernel.lifecycle.instance.WfVertex;

-import com.c2kernel.lifecycle.instance.XOrSplit;

-import com.c2kernel.utils.Language;

+import org.cristalise.gui.graph.view.VertexRenderer;

+import org.cristalise.kernel.graph.model.GraphPoint;

+import org.cristalise.kernel.graph.model.Vertex;

+import org.cristalise.kernel.lifecycle.instance.AndSplit;

+import org.cristalise.kernel.lifecycle.instance.Join;

+import org.cristalise.kernel.lifecycle.instance.Loop;

+import org.cristalise.kernel.lifecycle.instance.OrSplit;

+import org.cristalise.kernel.lifecycle.instance.WfVertex;

+import org.cristalise.kernel.lifecycle.instance.XOrSplit;

+import org.cristalise.kernel.utils.Language;

+

 

 public class SplitJoinRenderer implements VertexRenderer

 {

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java b/src/main/java/org/cristalise/gui/lifecycle/instance/TransitionPanel.java
index f9a1a81..d58422d 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/instance/TransitionPanel.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.lifecycle.instance;

+package org.cristalise.gui.lifecycle.instance;

 

 import java.awt.GridBagConstraints;

 import java.awt.GridBagLayout;

@@ -13,19 +13,20 @@ import javax.swing.JComboBox;
 import javax.swing.JLabel;

 import javax.swing.JOptionPane;

 

-import com.c2kernel.common.InvalidDataException;

-import com.c2kernel.entity.agent.Job;

-import com.c2kernel.entity.proxy.ItemProxy;

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.graph.view.SelectedVertexPanel;

-import com.c2kernel.gui.tabs.ItemTabPane;

-import com.c2kernel.gui.tabs.execution.Executor;

-import com.c2kernel.lifecycle.instance.Activity;

-import com.c2kernel.lifecycle.instance.stateMachine.State;

-import com.c2kernel.lifecycle.instance.stateMachine.StateMachine;

-import com.c2kernel.lifecycle.instance.stateMachine.Transition;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.graph.view.SelectedVertexPanel;

+import org.cristalise.gui.tabs.ItemTabPane;

+import org.cristalise.gui.tabs.execution.Executor;

+import org.cristalise.kernel.common.InvalidDataException;

+import org.cristalise.kernel.entity.agent.Job;

+import org.cristalise.kernel.entity.proxy.ItemProxy;

+import org.cristalise.kernel.graph.model.Vertex;

+import org.cristalise.kernel.lifecycle.instance.Activity;

+import org.cristalise.kernel.lifecycle.instance.stateMachine.State;

+import org.cristalise.kernel.lifecycle.instance.stateMachine.StateMachine;

+import org.cristalise.kernel.lifecycle.instance.stateMachine.Transition;

+import org.cristalise.kernel.utils.Logger;

+

 

 /**************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/WfDirectedEdgeRenderer.java b/src/main/java/org/cristalise/gui/lifecycle/instance/WfDirectedEdgeRenderer.java
index 484b2fc..1dce7e7 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/instance/WfDirectedEdgeRenderer.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/instance/WfDirectedEdgeRenderer.java
@@ -1,14 +1,15 @@
-package com.c2kernel.gui.lifecycle.instance;

+package org.cristalise.gui.lifecycle.instance;

 import java.awt.Color;

 import java.awt.Graphics2D;

 import java.awt.Shape;

 import java.awt.geom.AffineTransform;

 import java.awt.geom.GeneralPath;

 

-import com.c2kernel.graph.model.DirectedEdge;

-import com.c2kernel.graph.model.GraphPoint;

-import com.c2kernel.gui.graph.view.DirectedEdgeRenderer;

-import com.c2kernel.lifecycle.instance.Next;

+import org.cristalise.gui.graph.view.DirectedEdgeRenderer;

+import org.cristalise.kernel.graph.model.DirectedEdge;

+import org.cristalise.kernel.graph.model.GraphPoint;

+import org.cristalise.kernel.lifecycle.instance.Next;

+

 public class WfDirectedEdgeRenderer implements DirectedEdgeRenderer

 {

 	private GeneralPath mArrowTemplate = new GeneralPath();

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/WfEdgeFactory.java b/src/main/java/org/cristalise/gui/lifecycle/instance/WfEdgeFactory.java
index 06f7462..d6596b6 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/instance/WfEdgeFactory.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/instance/WfEdgeFactory.java
@@ -1,11 +1,11 @@
-package com.c2kernel.gui.lifecycle.instance;

+package org.cristalise.gui.lifecycle.instance;

 

-import com.c2kernel.graph.model.DirectedEdge;

-import com.c2kernel.graph.model.EdgeFactory;

-import com.c2kernel.graph.model.GraphModelManager;

-import com.c2kernel.graph.model.TypeNameAndConstructionInfo;

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.lifecycle.instance.WfVertex;

+import org.cristalise.kernel.graph.model.DirectedEdge;

+import org.cristalise.kernel.graph.model.EdgeFactory;

+import org.cristalise.kernel.graph.model.GraphModelManager;

+import org.cristalise.kernel.graph.model.TypeNameAndConstructionInfo;

+import org.cristalise.kernel.graph.model.Vertex;

+import org.cristalise.kernel.lifecycle.instance.WfVertex;

 

 public class WfEdgeFactory implements EdgeFactory

 {

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/WfGraphPanel.java b/src/main/java/org/cristalise/gui/lifecycle/instance/WfGraphPanel.java
index 91257cb..1d8a3e3 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/instance/WfGraphPanel.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/instance/WfGraphPanel.java
@@ -1,14 +1,15 @@
 /*Created on 21 nov. 2003 */

-package com.c2kernel.gui.lifecycle.instance;

+package org.cristalise.gui.lifecycle.instance;

 

 import java.awt.Graphics2D;

 

-import com.c2kernel.graph.model.DirectedEdge;

-import com.c2kernel.graph.model.GraphPoint;

-import com.c2kernel.gui.graph.view.DirectedEdgeRenderer;

-import com.c2kernel.gui.graph.view.GraphPanel;

-import com.c2kernel.gui.graph.view.VertexRenderer;

-import com.c2kernel.lifecycle.instance.Next;

+import org.cristalise.gui.graph.view.DirectedEdgeRenderer;

+import org.cristalise.gui.graph.view.GraphPanel;

+import org.cristalise.gui.graph.view.VertexRenderer;

+import org.cristalise.kernel.graph.model.DirectedEdge;

+import org.cristalise.kernel.graph.model.GraphPoint;

+import org.cristalise.kernel.lifecycle.instance.Next;

+

 

 /** @author XSeb74*/

 public class WfGraphPanel extends GraphPanel

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/WfVertexFactory.java b/src/main/java/org/cristalise/gui/lifecycle/instance/WfVertexFactory.java
index 91a0837..d80d18c 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/instance/WfVertexFactory.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/instance/WfVertexFactory.java
@@ -1,21 +1,22 @@
-package com.c2kernel.gui.lifecycle.instance;

+package org.cristalise.gui.lifecycle.instance;

 import java.io.Serializable;

 import java.util.HashMap;

 

 import javax.swing.JOptionPane;

 

-import com.c2kernel.graph.model.GraphModelManager;

-import com.c2kernel.graph.model.GraphPoint;

-import com.c2kernel.graph.model.TypeNameAndConstructionInfo;

-import com.c2kernel.graph.model.VertexFactory;

-import com.c2kernel.gui.ImageLoader;

-import com.c2kernel.gui.lifecycle.chooser.ActivityChooser;

-import com.c2kernel.gui.lifecycle.chooser.WorkflowDialogue;

-import com.c2kernel.lifecycle.ActivityDef;

-import com.c2kernel.lifecycle.instance.Activity;

-import com.c2kernel.lifecycle.instance.CompositeActivity;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.LocalObjectLoader;

+import org.cristalise.gui.ImageLoader;

+import org.cristalise.gui.lifecycle.chooser.ActivityChooser;

+import org.cristalise.gui.lifecycle.chooser.WorkflowDialogue;

+import org.cristalise.kernel.graph.model.GraphModelManager;

+import org.cristalise.kernel.graph.model.GraphPoint;

+import org.cristalise.kernel.graph.model.TypeNameAndConstructionInfo;

+import org.cristalise.kernel.graph.model.VertexFactory;

+import org.cristalise.kernel.lifecycle.ActivityDef;

+import org.cristalise.kernel.lifecycle.instance.Activity;

+import org.cristalise.kernel.lifecycle.instance.CompositeActivity;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.LocalObjectLoader;

+

 public class WfVertexFactory implements VertexFactory, WorkflowDialogue

 {

 	protected CompositeActivity mRootAct = null;

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/WfVertexRenderer.java b/src/main/java/org/cristalise/gui/lifecycle/instance/WfVertexRenderer.java
index 07a4e29..61944fc 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/instance/WfVertexRenderer.java
+++ b/src/main/java/org/cristalise/gui/lifecycle/instance/WfVertexRenderer.java
@@ -1,12 +1,13 @@
-package com.c2kernel.gui.lifecycle.instance;

+package org.cristalise.gui.lifecycle.instance;

 

 import java.awt.Graphics2D;

 

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.gui.graph.view.VertexRenderer;

-import com.c2kernel.lifecycle.instance.Activity;

-import com.c2kernel.lifecycle.instance.Join;

-import com.c2kernel.lifecycle.instance.Split;

+import org.cristalise.gui.graph.view.VertexRenderer;

+import org.cristalise.kernel.graph.model.Vertex;

+import org.cristalise.kernel.lifecycle.instance.Activity;

+import org.cristalise.kernel.lifecycle.instance.Join;

+import org.cristalise.kernel.lifecycle.instance.Split;

+

 

 public class WfVertexRenderer implements VertexRenderer

 {

diff --git a/src/main/java/com/c2kernel/gui/tabs/CloseTabIcon.java b/src/main/java/org/cristalise/gui/tabs/CloseTabIcon.java
index a117df4..dff6da0 100644
--- a/src/main/java/com/c2kernel/gui/tabs/CloseTabIcon.java
+++ b/src/main/java/org/cristalise/gui/tabs/CloseTabIcon.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs;

+package org.cristalise.gui.tabs;

 

 import java.awt.Color;

 import java.awt.Component;

diff --git a/src/main/java/com/c2kernel/gui/tabs/CollectionPane.java b/src/main/java/org/cristalise/gui/tabs/CollectionPane.java
index 9578497..c2dce76 100644
--- a/src/main/java/com/c2kernel/gui/tabs/CollectionPane.java
+++ b/src/main/java/org/cristalise/gui/tabs/CollectionPane.java
@@ -1,22 +1,23 @@
-package com.c2kernel.gui.tabs;

+package org.cristalise.gui.tabs;

 import java.awt.GridBagConstraints;

 import java.util.StringTokenizer;

 

 import javax.swing.JTabbedPane;

 

-import com.c2kernel.collection.Aggregation;

-import com.c2kernel.collection.Collection;

-import com.c2kernel.collection.CollectionDescription;

-import com.c2kernel.collection.CollectionMember;

-import com.c2kernel.collection.Dependency;

-import com.c2kernel.entity.proxy.MemberSubscription;

-import com.c2kernel.entity.proxy.ProxyObserver;

-import com.c2kernel.gui.tabs.collection.AggregationView;

-import com.c2kernel.gui.tabs.collection.CollectionView;

-import com.c2kernel.gui.tabs.collection.DependencyView;

-import com.c2kernel.persistency.ClusterStorage;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.tabs.collection.AggregationView;

+import org.cristalise.gui.tabs.collection.CollectionView;

+import org.cristalise.gui.tabs.collection.DependencyView;

+import org.cristalise.kernel.collection.Aggregation;

+import org.cristalise.kernel.collection.Collection;

+import org.cristalise.kernel.collection.CollectionDescription;

+import org.cristalise.kernel.collection.CollectionMember;

+import org.cristalise.kernel.collection.Dependency;

+import org.cristalise.kernel.entity.proxy.MemberSubscription;

+import org.cristalise.kernel.entity.proxy.ProxyObserver;

+import org.cristalise.kernel.persistency.ClusterStorage;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.Logger;

+

 /**

  * @version $Revision: 1.36 $ $Date: 2005/10/06 06:51:15 $

  * @author $Author: abranson $

diff --git a/src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java b/src/main/java/org/cristalise/gui/tabs/DomainPathAdmin.java
index 5745731..a9bccef 100644
--- a/src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java
+++ b/src/main/java/org/cristalise/gui/tabs/DomainPathAdmin.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs;

+package org.cristalise.gui.tabs;

 

 import java.awt.event.ActionEvent;

 import java.awt.event.ActionListener;

@@ -13,11 +13,12 @@ import javax.swing.JScrollPane;
 import javax.swing.JTable;

 import javax.swing.table.AbstractTableModel;

 

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.entity.proxy.ItemProxy;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.lookup.DomainPath;

-import com.c2kernel.process.Gateway;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.kernel.common.ObjectNotFoundException;

+import org.cristalise.kernel.entity.proxy.ItemProxy;

+import org.cristalise.kernel.lookup.DomainPath;

+import org.cristalise.kernel.process.Gateway;

+

 

 /**************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java b/src/main/java/org/cristalise/gui/tabs/ExecutionPane.java
index df51dba..e982d18 100644
--- a/src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java
+++ b/src/main/java/org/cristalise/gui/tabs/ExecutionPane.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs;

+package org.cristalise.gui.tabs;

 

 import java.awt.GridBagConstraints;

 import java.awt.GridLayout;

@@ -13,16 +13,17 @@ import javax.swing.JComboBox;
 import javax.swing.JLabel;

 import javax.swing.JPanel;

 

-import com.c2kernel.entity.agent.Job;

-import com.c2kernel.entity.proxy.MemberSubscription;

-import com.c2kernel.entity.proxy.ProxyObserver;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.tabs.execution.ActivityItem;

-import com.c2kernel.gui.tabs.execution.ActivityViewer;

-import com.c2kernel.lifecycle.instance.Workflow;

-import com.c2kernel.persistency.ClusterStorage;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.tabs.execution.ActivityItem;

+import org.cristalise.gui.tabs.execution.ActivityViewer;

+import org.cristalise.kernel.entity.agent.Job;

+import org.cristalise.kernel.entity.proxy.MemberSubscription;

+import org.cristalise.kernel.entity.proxy.ProxyObserver;

+import org.cristalise.kernel.lifecycle.instance.Workflow;

+import org.cristalise.kernel.persistency.ClusterStorage;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.Logger;

+

 

 public class ExecutionPane extends ItemTabPane implements ProxyObserver<Workflow> {

 

diff --git a/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java b/src/main/java/org/cristalise/gui/tabs/HistoryPane.java
index ad10ad3..60e97e9 100644
--- a/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java
+++ b/src/main/java/org/cristalise/gui/tabs/HistoryPane.java
@@ -4,7 +4,7 @@
  * Created on March 20, 2001, 3:30 PM

  */

 

-package com.c2kernel.gui.tabs;

+package org.cristalise.gui.tabs;

 

 /**

  * @author  abranson

@@ -22,17 +22,18 @@ import javax.swing.JScrollPane;
 import javax.swing.JTable;

 import javax.swing.table.AbstractTableModel;

 

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.entity.proxy.ProxyObserver;

-import com.c2kernel.entity.proxy.MemberSubscription;

-import com.c2kernel.events.Event;

-import com.c2kernel.events.History;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.lifecycle.instance.stateMachine.StateMachine;

-import com.c2kernel.persistency.ClusterStorage;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.LocalObjectLoader;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.kernel.common.ObjectNotFoundException;

+import org.cristalise.kernel.entity.proxy.MemberSubscription;

+import org.cristalise.kernel.entity.proxy.ProxyObserver;

+import org.cristalise.kernel.events.Event;

+import org.cristalise.kernel.events.History;

+import org.cristalise.kernel.lifecycle.instance.stateMachine.StateMachine;

+import org.cristalise.kernel.persistency.ClusterStorage;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.LocalObjectLoader;

+import org.cristalise.kernel.utils.Logger;

+

 

 /**

  * Pane to display all work orders that this agent can execute, and activate

diff --git a/src/main/java/com/c2kernel/gui/tabs/ItemTabPane.java b/src/main/java/org/cristalise/gui/tabs/ItemTabPane.java
index 7fa17a0..4d7f090 100644
--- a/src/main/java/com/c2kernel/gui/tabs/ItemTabPane.java
+++ b/src/main/java/org/cristalise/gui/tabs/ItemTabPane.java
@@ -3,7 +3,7 @@
  *

  * Created on March 22, 2001, 11:39 AM

  */

-package com.c2kernel.gui.tabs;

+package org.cristalise.gui.tabs;

 import java.awt.Color;

 import java.awt.Cursor;

 import java.awt.Font;

@@ -22,16 +22,17 @@ import javax.swing.JPanel;
 import javax.swing.JToggleButton;

 import javax.swing.SwingConstants;

 

-import com.c2kernel.entity.proxy.ProxyObserver;

-import com.c2kernel.gui.ItemDetails;

-import com.c2kernel.gui.ImageLoader;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.tabs.outcome.OutcomeHandler;

-import com.c2kernel.gui.tabs.outcome.form.OutcomePanel;

-import com.c2kernel.gui.tree.NodeItem;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.ImageLoader;

+import org.cristalise.gui.ItemDetails;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.tabs.outcome.OutcomeHandler;

+import org.cristalise.gui.tabs.outcome.form.OutcomePanel;

+import org.cristalise.gui.tree.NodeItem;

+import org.cristalise.kernel.entity.proxy.ProxyObserver;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.Logger;

+

 /**

  * Generic item details tabbed pane.

  *

diff --git a/src/main/java/com/c2kernel/gui/tabs/JTabbedPaneWithCloseIcons.java b/src/main/java/org/cristalise/gui/tabs/JTabbedPaneWithCloseIcons.java
index 638ed01..ec31e3d 100644
--- a/src/main/java/com/c2kernel/gui/tabs/JTabbedPaneWithCloseIcons.java
+++ b/src/main/java/org/cristalise/gui/tabs/JTabbedPaneWithCloseIcons.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs;

+package org.cristalise.gui.tabs;

 import java.awt.Component;

 import java.awt.Rectangle;

 import java.awt.event.InputEvent;

@@ -10,7 +10,8 @@ import javax.swing.JTabbedPane;
 import javax.swing.event.ChangeEvent;

 import javax.swing.event.ChangeListener;

 

-import com.c2kernel.gui.ItemDetails;

+import org.cristalise.gui.ItemDetails;

+

 

 /**

  * @author Developpement

diff --git a/src/main/java/com/c2kernel/gui/tabs/JobListPane.java b/src/main/java/org/cristalise/gui/tabs/JobListPane.java
index 4893ae5..06dd1ed 100644
--- a/src/main/java/com/c2kernel/gui/tabs/JobListPane.java
+++ b/src/main/java/org/cristalise/gui/tabs/JobListPane.java
@@ -4,7 +4,7 @@
  * Created on March 20, 2001, 3:30 PM

  */

 

-package com.c2kernel.gui.tabs;

+package org.cristalise.gui.tabs;

 

 /**

  * @author  abranson

@@ -24,17 +24,18 @@ import javax.swing.JScrollPane;
 import javax.swing.JTable;

 import javax.swing.table.AbstractTableModel;

 

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.entity.agent.Job;

-import com.c2kernel.entity.agent.JobList;

-import com.c2kernel.entity.proxy.ProxyObserver;

-import com.c2kernel.entity.proxy.MemberSubscription;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.persistency.ClusterStorage;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.property.Property;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.kernel.common.ObjectNotFoundException;

+import org.cristalise.kernel.entity.agent.Job;

+import org.cristalise.kernel.entity.agent.JobList;

+import org.cristalise.kernel.entity.proxy.MemberSubscription;

+import org.cristalise.kernel.entity.proxy.ProxyObserver;

+import org.cristalise.kernel.persistency.ClusterStorage;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.property.Property;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.Logger;

+

 

 /**

  * Pane to display all work orders that this agent can execute, and activate

diff --git a/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java b/src/main/java/org/cristalise/gui/tabs/PropertiesPane.java
index e9b882d..8ae18f8 100644
--- a/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java
+++ b/src/main/java/org/cristalise/gui/tabs/PropertiesPane.java
@@ -4,7 +4,7 @@
  * Created on March 20, 2001, 3:30 PM

  */

 

-package com.c2kernel.gui.tabs;

+package org.cristalise.gui.tabs;

 

 /**

  * @author  abranson

@@ -24,14 +24,15 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;

 import javax.swing.SwingConstants;

 

-import com.c2kernel.entity.proxy.MemberSubscription;

-import com.c2kernel.entity.proxy.ProxyObserver;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.tree.NodeAgent;

-import com.c2kernel.persistency.ClusterStorage;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.property.Property;

-import com.c2kernel.utils.Language;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.tree.NodeAgent;

+import org.cristalise.kernel.entity.proxy.MemberSubscription;

+import org.cristalise.kernel.entity.proxy.ProxyObserver;

+import org.cristalise.kernel.persistency.ClusterStorage;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.property.Property;

+import org.cristalise.kernel.utils.Language;

+

 

 /**

  * Pane to display all work orders that this agent can execute, and activate

diff --git a/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java b/src/main/java/org/cristalise/gui/tabs/ViewpointPane.java
index 7dea317..01429b5 100644
--- a/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java
+++ b/src/main/java/org/cristalise/gui/tabs/ViewpointPane.java
@@ -1,5 +1,5 @@
 

-package com.c2kernel.gui.tabs;

+package org.cristalise.gui.tabs;

 import java.awt.GridBagConstraints;

 import java.awt.GridLayout;

 import java.awt.Insets;

@@ -23,21 +23,22 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;

 import javax.swing.SwingConstants;

 

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.entity.C2KLocalObject;

-import com.c2kernel.entity.proxy.MemberSubscription;

-import com.c2kernel.entity.proxy.ProxyObserver;

-import com.c2kernel.events.Event;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.tabs.outcome.OutcomeException;

-import com.c2kernel.gui.tabs.outcome.OutcomeHandler;

-import com.c2kernel.persistency.ClusterStorage;

-import com.c2kernel.persistency.outcome.Outcome;

-import com.c2kernel.persistency.outcome.Viewpoint;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.LocalObjectLoader;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.tabs.outcome.OutcomeException;

+import org.cristalise.gui.tabs.outcome.OutcomeHandler;

+import org.cristalise.kernel.common.ObjectNotFoundException;

+import org.cristalise.kernel.entity.C2KLocalObject;

+import org.cristalise.kernel.entity.proxy.MemberSubscription;

+import org.cristalise.kernel.entity.proxy.ProxyObserver;

+import org.cristalise.kernel.events.Event;

+import org.cristalise.kernel.persistency.ClusterStorage;

+import org.cristalise.kernel.persistency.outcome.Outcome;

+import org.cristalise.kernel.persistency.outcome.Viewpoint;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.LocalObjectLoader;

+import org.cristalise.kernel.utils.Logger;

+

 

 public class ViewpointPane extends ItemTabPane implements ItemListener, ActionListener, ProxyObserver<C2KLocalObject> {

 

diff --git a/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java b/src/main/java/org/cristalise/gui/tabs/WorkflowPane.java
index 1a38470..f76f906 100644
--- a/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java
+++ b/src/main/java/org/cristalise/gui/tabs/WorkflowPane.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs;

+package org.cristalise.gui.tabs;

 import java.awt.Cursor;

 import java.awt.GridBagConstraints;

 import java.awt.event.ActionEvent;

@@ -9,30 +9,31 @@ import javax.swing.JButton;
 import javax.swing.JFileChooser;

 import javax.swing.JSplitPane;

 

-import com.c2kernel.entity.proxy.MemberSubscription;

-import com.c2kernel.entity.proxy.ProxyObserver;

-import com.c2kernel.graph.layout.DefaultGraphLayoutGenerator;

-import com.c2kernel.graph.model.EdgeFactory;

-import com.c2kernel.graph.model.VertexFactory;

-import com.c2kernel.gui.ImageLoader;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.graph.controller.Selection;

-import com.c2kernel.gui.graph.view.EditorPanel;

-import com.c2kernel.gui.graph.view.VertexPropertyPanel;

-import com.c2kernel.gui.lifecycle.instance.TransitionPanel;

-import com.c2kernel.gui.lifecycle.instance.WfDirectedEdgeRenderer;

-import com.c2kernel.gui.lifecycle.instance.WfEdgeFactory;

-import com.c2kernel.gui.lifecycle.instance.WfGraphPanel;

-import com.c2kernel.gui.lifecycle.instance.WfVertexFactory;

-import com.c2kernel.gui.lifecycle.instance.WfVertexRenderer;

-import com.c2kernel.lifecycle.instance.CompositeActivity;

-import com.c2kernel.lifecycle.instance.WfVertexOutlineCreator;

-import com.c2kernel.lifecycle.instance.Workflow;

-import com.c2kernel.persistency.ClusterStorage;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.FileStringUtility;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.ImageLoader;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.graph.controller.Selection;

+import org.cristalise.gui.graph.view.EditorPanel;

+import org.cristalise.gui.graph.view.VertexPropertyPanel;

+import org.cristalise.gui.lifecycle.instance.TransitionPanel;

+import org.cristalise.gui.lifecycle.instance.WfDirectedEdgeRenderer;

+import org.cristalise.gui.lifecycle.instance.WfEdgeFactory;

+import org.cristalise.gui.lifecycle.instance.WfGraphPanel;

+import org.cristalise.gui.lifecycle.instance.WfVertexFactory;

+import org.cristalise.gui.lifecycle.instance.WfVertexRenderer;

+import org.cristalise.kernel.entity.proxy.MemberSubscription;

+import org.cristalise.kernel.entity.proxy.ProxyObserver;

+import org.cristalise.kernel.graph.layout.DefaultGraphLayoutGenerator;

+import org.cristalise.kernel.graph.model.EdgeFactory;

+import org.cristalise.kernel.graph.model.VertexFactory;

+import org.cristalise.kernel.lifecycle.instance.CompositeActivity;

+import org.cristalise.kernel.lifecycle.instance.WfVertexOutlineCreator;

+import org.cristalise.kernel.lifecycle.instance.Workflow;

+import org.cristalise.kernel.persistency.ClusterStorage;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.FileStringUtility;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.Logger;

+

 public class WorkflowPane extends ItemTabPane implements ProxyObserver<Workflow>

 {

 	// Only for the purpose of loading and saving

diff --git a/src/main/java/com/c2kernel/gui/tabs/collection/AggregationView.java b/src/main/java/org/cristalise/gui/tabs/collection/AggregationView.java
index f18d986..141fcb1 100644
--- a/src/main/java/com/c2kernel/gui/tabs/collection/AggregationView.java
+++ b/src/main/java/org/cristalise/gui/tabs/collection/AggregationView.java
@@ -1,24 +1,25 @@
-package com.c2kernel.gui.tabs.collection;

+package org.cristalise.gui.tabs.collection;

 import java.awt.GridLayout;

 import java.awt.event.ActionEvent;

 import java.awt.event.ActionListener;

-import com.c2kernel.gui.ImageLoader;

 

 import javax.swing.JButton;

 import javax.swing.JSplitPane;

 

-import com.c2kernel.collection.Aggregation;

-import com.c2kernel.collection.AggregationMember;

-import com.c2kernel.collection.AggregationVertexFactory;

-import com.c2kernel.collection.AggregationVertexOutlineCreator;

-import com.c2kernel.collection.Collection;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.collection.AggregationMemberRenderer;

-import com.c2kernel.gui.collection.PropertyPanel;

-import com.c2kernel.gui.collection.SelectedMemberPanel;

-import com.c2kernel.gui.graph.view.EditorPanel;

-import com.c2kernel.gui.graph.view.GraphPanel;

-import com.c2kernel.utils.Language;

+import org.cristalise.gui.ImageLoader;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.collection.AggregationMemberRenderer;

+import org.cristalise.gui.collection.PropertyPanel;

+import org.cristalise.gui.collection.SelectedMemberPanel;

+import org.cristalise.gui.graph.view.EditorPanel;

+import org.cristalise.gui.graph.view.GraphPanel;

+import org.cristalise.kernel.collection.Aggregation;

+import org.cristalise.kernel.collection.AggregationMember;

+import org.cristalise.kernel.collection.AggregationVertexFactory;

+import org.cristalise.kernel.collection.AggregationVertexOutlineCreator;

+import org.cristalise.kernel.collection.Collection;

+import org.cristalise.kernel.utils.Language;

+

 /**

  * @version $Revision: 1.5 $ $Date: 2006/09/15 15:02:24 $

  * @author $Author: abranson $

diff --git a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java b/src/main/java/org/cristalise/gui/tabs/collection/CollectionHistoryWindow.java
index b97fa3c..d1ae054 100644
--- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java
+++ b/src/main/java/org/cristalise/gui/tabs/collection/CollectionHistoryWindow.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.collection;

+package org.cristalise.gui.tabs.collection;

 

 import java.awt.HeadlessException;

 import java.awt.event.MouseAdapter;

@@ -10,21 +10,22 @@ import javax.swing.JScrollPane;
 import javax.swing.JTable;

 import javax.swing.table.AbstractTableModel;

 

-import com.c2kernel.collection.Aggregation;

-import com.c2kernel.collection.Collection;

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.entity.proxy.ItemProxy;

-import com.c2kernel.entity.proxy.MemberSubscription;

-import com.c2kernel.entity.proxy.ProxyObserver;

-import com.c2kernel.events.Event;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

-import com.c2kernel.lookup.ItemPath;

-import com.c2kernel.persistency.ClusterStorage;

-import com.c2kernel.persistency.outcome.Outcome;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.kernel.collection.Aggregation;

+import org.cristalise.kernel.collection.Collection;

+import org.cristalise.kernel.common.ObjectNotFoundException;

+import org.cristalise.kernel.entity.proxy.ItemProxy;

+import org.cristalise.kernel.entity.proxy.MemberSubscription;

+import org.cristalise.kernel.entity.proxy.ProxyObserver;

+import org.cristalise.kernel.events.Event;

+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStep;

+import org.cristalise.kernel.lookup.ItemPath;

+import org.cristalise.kernel.persistency.ClusterStorage;

+import org.cristalise.kernel.persistency.outcome.Outcome;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.Logger;

+

 

 public class CollectionHistoryWindow extends JFrame  {

 

diff --git a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java b/src/main/java/org/cristalise/gui/tabs/collection/CollectionMemberPropertyPanel.java
index 478403c..d55a2c2 100644
--- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java
+++ b/src/main/java/org/cristalise/gui/tabs/collection/CollectionMemberPropertyPanel.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.collection;

+package org.cristalise.gui.tabs.collection;

 

 import java.awt.GridBagConstraints;

 import java.awt.GridBagLayout;

@@ -16,16 +16,17 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;

 import javax.swing.JTextField;

 

-import com.c2kernel.collection.CollectionMember;

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.graph.view.PropertyTable;

-import com.c2kernel.gui.graph.view.PropertyTableModel;

-import com.c2kernel.gui.tabs.ItemTabPane;

-import com.c2kernel.lookup.ItemPath;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.CastorHashMap;

-import com.c2kernel.utils.Language;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.graph.view.PropertyTable;

+import org.cristalise.gui.graph.view.PropertyTableModel;

+import org.cristalise.gui.tabs.ItemTabPane;

+import org.cristalise.kernel.collection.CollectionMember;

+import org.cristalise.kernel.common.ObjectNotFoundException;

+import org.cristalise.kernel.lookup.ItemPath;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.CastorHashMap;

+import org.cristalise.kernel.utils.Language;

+

 

 public class CollectionMemberPropertyPanel extends JPanel implements ActionListener {

 

diff --git a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionView.java b/src/main/java/org/cristalise/gui/tabs/collection/CollectionView.java
index f9f7d50..06b11ab 100644
--- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionView.java
+++ b/src/main/java/org/cristalise/gui/tabs/collection/CollectionView.java
@@ -1,13 +1,14 @@
-package com.c2kernel.gui.tabs.collection;

+package org.cristalise.gui.tabs.collection;

 

 import javax.swing.JPanel;

 

-import com.c2kernel.collection.Collection;

-import com.c2kernel.collection.CollectionMember;

-import com.c2kernel.entity.proxy.ItemProxy;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.kernel.collection.Collection;

+import org.cristalise.kernel.collection.CollectionMember;

+import org.cristalise.kernel.entity.proxy.ItemProxy;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.Logger;

+

 

 /**************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/tabs/collection/DependencyView.java b/src/main/java/org/cristalise/gui/tabs/collection/DependencyView.java
index a53f562..543d3aa 100644
--- a/src/main/java/com/c2kernel/gui/tabs/collection/DependencyView.java
+++ b/src/main/java/org/cristalise/gui/tabs/collection/DependencyView.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.collection;

+package org.cristalise.gui.tabs.collection;

 import java.awt.GridLayout;

 

 import javax.swing.JSplitPane;

@@ -6,14 +6,15 @@ import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;

 import javax.swing.tree.DefaultMutableTreeNode;

 

-import com.c2kernel.collection.Collection;

-import com.c2kernel.collection.DependencyMember;

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.TreeBrowser;

-import com.c2kernel.gui.tree.Node;

-import com.c2kernel.gui.tree.NodeCollection;

-import com.c2kernel.gui.tree.NodeItem;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.TreeBrowser;

+import org.cristalise.gui.tree.Node;

+import org.cristalise.gui.tree.NodeCollection;

+import org.cristalise.gui.tree.NodeItem;

+import org.cristalise.kernel.collection.Collection;

+import org.cristalise.kernel.collection.DependencyMember;

+import org.cristalise.kernel.common.ObjectNotFoundException;

+

 /**

  * @version $Revision: 1.2 $ $Date: 2005/06/02 12:17:22 $

  * @author $Author: abranson $

diff --git a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityItem.java b/src/main/java/org/cristalise/gui/tabs/execution/ActivityItem.java
index bacdd52..81ccb02 100644
--- a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityItem.java
+++ b/src/main/java/org/cristalise/gui/tabs/execution/ActivityItem.java
@@ -1,7 +1,8 @@
-package com.c2kernel.gui.tabs.execution;

+package org.cristalise.gui.tabs.execution;

 import java.util.ArrayList;

 

-import com.c2kernel.entity.agent.Job;

+import org.cristalise.kernel.entity.agent.Job;

+

 

 public class ActivityItem {

     public String stepPath;

diff --git a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java b/src/main/java/org/cristalise/gui/tabs/execution/ActivityViewer.java
index 9405937..2193916 100644
--- a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java
+++ b/src/main/java/org/cristalise/gui/tabs/execution/ActivityViewer.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.execution;

+package org.cristalise.gui.tabs.execution;

 import java.awt.Dimension;

 import java.awt.GridBagConstraints;

 import java.awt.GridBagLayout;

@@ -19,20 +19,21 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;

 import javax.swing.JTextArea;

 

-import com.c2kernel.common.InvalidDataException;

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.entity.agent.Job;

-import com.c2kernel.entity.proxy.ItemProxy;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.tabs.ItemTabPane;

-import com.c2kernel.gui.tabs.ExecutionPane;

-import com.c2kernel.gui.tabs.outcome.InvalidOutcomeException;

-import com.c2kernel.gui.tabs.outcome.InvalidSchemaException;

-import com.c2kernel.gui.tabs.outcome.OutcomeHandler;

-import com.c2kernel.utils.FileStringUtility;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.LocalObjectLoader;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.tabs.ExecutionPane;

+import org.cristalise.gui.tabs.ItemTabPane;

+import org.cristalise.gui.tabs.outcome.InvalidOutcomeException;

+import org.cristalise.gui.tabs.outcome.InvalidSchemaException;

+import org.cristalise.gui.tabs.outcome.OutcomeHandler;

+import org.cristalise.kernel.common.InvalidDataException;

+import org.cristalise.kernel.common.ObjectNotFoundException;

+import org.cristalise.kernel.entity.agent.Job;

+import org.cristalise.kernel.entity.proxy.ItemProxy;

+import org.cristalise.kernel.utils.FileStringUtility;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.LocalObjectLoader;

+import org.cristalise.kernel.utils.Logger;

+

 

 public class ActivityViewer extends JPanel implements Runnable {

 

diff --git a/src/main/java/com/c2kernel/gui/tabs/execution/DefaultExecutor.java b/src/main/java/org/cristalise/gui/tabs/execution/DefaultExecutor.java
index 848d1d3..8b15c95 100644
--- a/src/main/java/com/c2kernel/gui/tabs/execution/DefaultExecutor.java
+++ b/src/main/java/org/cristalise/gui/tabs/execution/DefaultExecutor.java
@@ -1,10 +1,11 @@
-package com.c2kernel.gui.tabs.execution;

+package org.cristalise.gui.tabs.execution;

 

 import javax.swing.JLabel;

 

-import com.c2kernel.entity.agent.Job;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.utils.Language;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.kernel.entity.agent.Job;

+import org.cristalise.kernel.utils.Language;

+

 

 /**************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/tabs/execution/Executor.java b/src/main/java/org/cristalise/gui/tabs/execution/Executor.java
index 6fbde17..8a08351 100644
--- a/src/main/java/com/c2kernel/gui/tabs/execution/Executor.java
+++ b/src/main/java/org/cristalise/gui/tabs/execution/Executor.java
@@ -1,8 +1,9 @@
-package com.c2kernel.gui.tabs.execution;

+package org.cristalise.gui.tabs.execution;

 

 import javax.swing.JLabel;

 

-import com.c2kernel.entity.agent.Job;

+import org.cristalise.kernel.entity.agent.Job;

+

 

 /**************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/tabs/execution/RequestButton.java b/src/main/java/org/cristalise/gui/tabs/execution/RequestButton.java
index 440bb58..bccf99f 100644
--- a/src/main/java/com/c2kernel/gui/tabs/execution/RequestButton.java
+++ b/src/main/java/org/cristalise/gui/tabs/execution/RequestButton.java
@@ -1,13 +1,14 @@
-package com.c2kernel.gui.tabs.execution;

+package org.cristalise.gui.tabs.execution;

 import java.awt.Color;

 import java.awt.event.ActionEvent;

 import java.awt.event.ActionListener;

 

 import javax.swing.JButton;

 

-import com.c2kernel.entity.agent.Job;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.kernel.entity.agent.Job;

+import org.cristalise.kernel.utils.Logger;

+

 /**

      * Each job gets a RequestButton

      */

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/BasicOutcomeEditor.java b/src/main/java/org/cristalise/gui/tabs/outcome/BasicOutcomeEditor.java
index 62312e9..d31230d 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/BasicOutcomeEditor.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/BasicOutcomeEditor.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome;

+package org.cristalise.gui.tabs.outcome;

 

 import java.awt.Font;

 import java.awt.GridLayout;

@@ -11,7 +11,8 @@ import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;

 import javax.swing.text.PlainDocument;

 

-import com.c2kernel.utils.FileStringUtility;

+import org.cristalise.kernel.utils.FileStringUtility;

+

 

 /**************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/InvalidOutcomeException.java b/src/main/java/org/cristalise/gui/tabs/outcome/InvalidOutcomeException.java
index bab9050..15fc6be 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/InvalidOutcomeException.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/InvalidOutcomeException.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome;

+package org.cristalise.gui.tabs.outcome;

 

 public class InvalidOutcomeException extends OutcomeException {

 

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/InvalidSchemaException.java b/src/main/java/org/cristalise/gui/tabs/outcome/InvalidSchemaException.java
index 5edbcbf..cf33e66 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/InvalidSchemaException.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/InvalidSchemaException.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome;

+package org.cristalise.gui.tabs.outcome;

 

 public class InvalidSchemaException extends OutcomeException {

 

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/OutcomeException.java b/src/main/java/org/cristalise/gui/tabs/outcome/OutcomeException.java
index fd608d0..eed7593 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/OutcomeException.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/OutcomeException.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome;

+package org.cristalise.gui.tabs.outcome;

 

 public class OutcomeException extends Exception {

 

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/OutcomeHandler.java b/src/main/java/org/cristalise/gui/tabs/outcome/OutcomeHandler.java
index 0d6dc74..4d7e66c 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/OutcomeHandler.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/OutcomeHandler.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome;

+package org.cristalise.gui.tabs.outcome;

 import java.io.File;

 

 import javax.swing.JPanel;

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/OutcomeNotInitialisedException.java b/src/main/java/org/cristalise/gui/tabs/outcome/OutcomeNotInitialisedException.java
index 7b54f33..22d43e8 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/OutcomeNotInitialisedException.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/OutcomeNotInitialisedException.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome;

+package org.cristalise.gui.tabs.outcome;

 

 public class OutcomeNotInitialisedException extends OutcomeException {

 

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/AttributeList.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/AttributeList.java
index 7d15452..58365ee 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/AttributeList.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/AttributeList.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome.form;

+package org.cristalise.gui.tabs.outcome.form;

 

 import java.awt.Font;

 import java.awt.GridBagConstraints;

@@ -11,14 +11,14 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;

 import javax.swing.SwingConstants;

 

+import org.cristalise.gui.tabs.outcome.form.field.StringEditField;

+import org.cristalise.kernel.utils.Logger;

 import org.exolab.castor.xml.schema.AttributeDecl;

 import org.exolab.castor.xml.schema.ComplexType;

 import org.exolab.castor.xml.schema.ElementDecl;

 import org.w3c.dom.Attr;

 import org.w3c.dom.Element;

 

-import com.c2kernel.gui.tabs.outcome.form.field.StringEditField;

-import com.c2kernel.utils.Logger;

 

 public class AttributeList extends JPanel {

 

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/CardinalException.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/CardinalException.java
index bb6d039..000d791 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/CardinalException.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/CardinalException.java
@@ -1,6 +1,6 @@
-package com.c2kernel.gui.tabs.outcome.form;

+package org.cristalise.gui.tabs.outcome.form;

 

-import com.c2kernel.gui.tabs.outcome.OutcomeException;

+import org.cristalise.gui.tabs.outcome.OutcomeException;

 

 public class CardinalException extends OutcomeException {

 

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/DataRecord.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/DataRecord.java
index 3bfe3fd..32070ca 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/DataRecord.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/DataRecord.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome.form;

+package org.cristalise.gui.tabs.outcome.form;

 import java.awt.FlowLayout;

 import java.awt.GridBagConstraints;

 import java.awt.GridBagLayout;

@@ -10,14 +10,14 @@ import javax.swing.SwingUtilities;
 import javax.swing.event.ChangeEvent;

 import javax.swing.event.ChangeListener;

 

+import org.cristalise.gui.tabs.outcome.OutcomeException;

+import org.cristalise.kernel.utils.Logger;

 import org.exolab.castor.xml.schema.ComplexType;

 import org.exolab.castor.xml.schema.ElementDecl;

 import org.w3c.dom.Document;

 import org.w3c.dom.Element;

 import org.w3c.dom.NodeList;

 

-import com.c2kernel.gui.tabs.outcome.OutcomeException;

-import com.c2kernel.utils.Logger;

 

 public class DataRecord extends OutcomeStructure implements ChangeListener {

 

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/Dimension.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/Dimension.java
index 9a3cb8d..27f863b 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/Dimension.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/Dimension.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome.form;

+package org.cristalise.gui.tabs.outcome.form;

 import java.awt.FlowLayout;

 import java.awt.Font;

 import java.awt.GridBagConstraints;

@@ -23,16 +23,16 @@ import javax.swing.ListSelectionModel;
 import javax.swing.border.EtchedBorder;

 import javax.swing.table.JTableHeader;

 

+import org.cristalise.gui.DomainKeyConsumer;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.tabs.outcome.OutcomeException;

+import org.cristalise.kernel.lookup.DomainPath;

+import org.cristalise.kernel.utils.Logger;

 import org.exolab.castor.xml.schema.ElementDecl;

 import org.exolab.castor.xml.schema.Particle;

 import org.w3c.dom.Document;

 import org.w3c.dom.Element;

 

-import com.c2kernel.gui.DomainKeyConsumer;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.tabs.outcome.OutcomeException;

-import com.c2kernel.lookup.DomainPath;

-import com.c2kernel.utils.Logger;

 

 public class Dimension extends OutcomeStructure implements ActionListener {

 

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/DimensionInstance.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/DimensionInstance.java
index 649886b..da817c2 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/DimensionInstance.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/DimensionInstance.java
@@ -1,7 +1,7 @@
-package com.c2kernel.gui.tabs.outcome.form;

+package org.cristalise.gui.tabs.outcome.form;

+import org.cristalise.gui.tabs.outcome.OutcomeException;

 import org.exolab.castor.xml.schema.ElementDecl;

 

-import com.c2kernel.gui.tabs.outcome.OutcomeException;

 

 public class DimensionInstance extends DataRecord {

 

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/DimensionTableModel.java
index ac6a9f2..e0d4ff5 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/DimensionTableModel.java
@@ -1,9 +1,12 @@
-package com.c2kernel.gui.tabs.outcome.form;

+package org.cristalise.gui.tabs.outcome.form;

 import java.util.ArrayList;

 import java.util.Enumeration;

 

 import javax.swing.table.AbstractTableModel;

 

+import org.cristalise.gui.tabs.outcome.OutcomeException;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.Logger;

 import org.exolab.castor.xml.schema.Annotated;

 import org.exolab.castor.xml.schema.AttributeDecl;

 import org.exolab.castor.xml.schema.ComplexType;

@@ -21,9 +24,6 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;

 import org.w3c.dom.Text;

 

-import com.c2kernel.gui.tabs.outcome.OutcomeException;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.Logger;

 

 public class DimensionTableModel extends AbstractTableModel {

 

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/Field.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/Field.java
index 9d21c97..9a043d1 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/Field.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/Field.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome.form;

+package org.cristalise.gui.tabs.outcome.form;

 import java.awt.Component;

 

 import javax.swing.JComponent;

@@ -6,14 +6,14 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;

 import javax.swing.SwingConstants;

 

+import org.cristalise.gui.tabs.outcome.OutcomeException;

+import org.cristalise.gui.tabs.outcome.form.field.StringEditField;

+import org.cristalise.kernel.utils.Logger;

 import org.exolab.castor.xml.schema.ElementDecl;

 import org.w3c.dom.Document;

 import org.w3c.dom.Element;

 import org.w3c.dom.Text;

 

-import com.c2kernel.gui.tabs.outcome.OutcomeException;

-import com.c2kernel.gui.tabs.outcome.form.field.StringEditField;

-import com.c2kernel.utils.Logger;

 

 

 public class Field extends OutcomeStructure {

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/HelpPane.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/HelpPane.java
index aa8e13e..ae5994c 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/HelpPane.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/HelpPane.java
@@ -1,9 +1,10 @@
-package com.c2kernel.gui.tabs.outcome.form;

+package org.cristalise.gui.tabs.outcome.form;

 

 import javax.swing.JEditorPane;

 import javax.swing.text.html.HTMLEditorKit;

 

-import com.c2kernel.utils.Language;

+import org.cristalise.kernel.utils.Language;

+

 

 /**************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/MultiLinePasteAdapter.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/MultiLinePasteAdapter.java
index 13112ac..efb0ba9 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/MultiLinePasteAdapter.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/MultiLinePasteAdapter.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome.form;

+package org.cristalise.gui.tabs.outcome.form;

 import java.awt.Toolkit;

 import java.awt.datatransfer.Clipboard;

 import java.awt.datatransfer.DataFlavor;

@@ -6,7 +6,6 @@ import java.awt.datatransfer.StringSelection;
 import java.awt.event.ActionEvent;

 import java.awt.event.ActionListener;

 import java.awt.event.KeyEvent;

-import com.c2kernel.gui.MainFrame;

 import java.util.StringTokenizer;

 

 import javax.swing.JComponent;

@@ -14,7 +13,9 @@ import javax.swing.JOptionPane;
 import javax.swing.JTable;

 import javax.swing.KeyStroke;

 

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.kernel.utils.Logger;

+

 /**

 * ExcelAdapter enables Copy-Paste Clipboard functionality on JTables.

 * The clipboard data format used by the adapter is compatible with

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/OutcomeEditor.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/OutcomeEditor.java
index 55b7f81..f0ef2b2 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/OutcomeEditor.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/OutcomeEditor.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome.form;

+package org.cristalise.gui.tabs.outcome.form;

 import java.awt.GridBagConstraints;

 import java.awt.GridBagLayout;

 import java.awt.event.ActionEvent;

@@ -13,10 +13,11 @@ import javax.swing.JFileChooser;
 import javax.swing.JFrame;

 import javax.swing.JOptionPane;

 

-import com.c2kernel.persistency.outcome.OutcomeValidator;

-import com.c2kernel.persistency.outcome.Schema;

-import com.c2kernel.utils.FileStringUtility;

-import com.c2kernel.utils.Logger;

+import org.cristalise.kernel.persistency.outcome.OutcomeValidator;

+import org.cristalise.kernel.persistency.outcome.Schema;

+import org.cristalise.kernel.utils.FileStringUtility;

+import org.cristalise.kernel.utils.Logger;

+

 

 

 class OutcomeEditor extends JFrame implements ActionListener {

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/OutcomePanel.java
index 506e17c..e3f4622 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/OutcomePanel.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome.form;

+package org.cristalise.gui.tabs.outcome.form;

 import java.awt.GridBagConstraints;

 import java.awt.GridBagLayout;

 import java.io.File;

@@ -19,6 +19,15 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;

 import javax.xml.parsers.ParserConfigurationException;

 

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.tabs.outcome.InvalidOutcomeException;

+import org.cristalise.gui.tabs.outcome.InvalidSchemaException;

+import org.cristalise.gui.tabs.outcome.OutcomeException;

+import org.cristalise.gui.tabs.outcome.OutcomeHandler;

+import org.cristalise.gui.tabs.outcome.OutcomeNotInitialisedException;

+import org.cristalise.kernel.persistency.outcome.Outcome;

+import org.cristalise.kernel.utils.FileStringUtility;

+import org.cristalise.kernel.utils.Logger;

 import org.exolab.castor.xml.schema.ElementDecl;

 import org.exolab.castor.xml.schema.Schema;

 import org.exolab.castor.xml.schema.reader.SchemaReader;

@@ -27,15 +36,6 @@ import org.w3c.dom.Element;
 import org.xml.sax.InputSource;

 import org.xml.sax.SAXException;

 

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.tabs.outcome.InvalidOutcomeException;

-import com.c2kernel.gui.tabs.outcome.InvalidSchemaException;

-import com.c2kernel.gui.tabs.outcome.OutcomeException;

-import com.c2kernel.gui.tabs.outcome.OutcomeHandler;

-import com.c2kernel.gui.tabs.outcome.OutcomeNotInitialisedException;

-import com.c2kernel.persistency.outcome.Outcome;

-import com.c2kernel.utils.FileStringUtility;

-import com.c2kernel.utils.Logger;

 

 // will load the outcome as instructed by other bits of the gui

 // provides the 'save' button and creates the trees of objects to feed to the outcome form

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/OutcomeStructure.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/OutcomeStructure.java
index aee09df..d6047c7 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/OutcomeStructure.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/OutcomeStructure.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome.form;

+package org.cristalise.gui.tabs.outcome.form;

 import java.math.BigDecimal;

 import java.math.BigInteger;

 import java.util.ArrayList;

@@ -8,6 +8,9 @@ import java.util.HashMap;
 import javax.swing.ImageIcon;

 import javax.swing.JPanel;

 

+import org.cristalise.gui.tabs.outcome.OutcomeException;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.Logger;

 import org.exolab.castor.types.AnyNode;

 import org.exolab.castor.xml.schema.Annotated;

 import org.exolab.castor.xml.schema.Annotation;

@@ -25,9 +28,6 @@ import org.exolab.castor.xml.schema.XMLType;
 import org.w3c.dom.Document;

 import org.w3c.dom.Element;

 

-import com.c2kernel.gui.tabs.outcome.OutcomeException;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.Logger;

 

 // contains child outcome elements - creates new ones

 public abstract class OutcomeStructure extends JPanel {

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/StructuralException.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/StructuralException.java
index 5aff436..5b1558a 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/StructuralException.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/StructuralException.java
@@ -1,5 +1,5 @@
-package com.c2kernel.gui.tabs.outcome.form;

-import com.c2kernel.gui.tabs.outcome.OutcomeException;

+package org.cristalise.gui.tabs.outcome.form;

+import org.cristalise.gui.tabs.outcome.OutcomeException;

 

 public class StructuralException extends OutcomeException {

 

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ArrayEditField.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/ArrayEditField.java
index 742d1b4..4c1d031 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ArrayEditField.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/ArrayEditField.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome.form.field;

+package org.cristalise.gui.tabs.outcome.form.field;

 

 import java.awt.Component;

 import java.awt.event.ActionEvent;

@@ -11,9 +11,9 @@ import javax.swing.JScrollPane;
 import javax.swing.JTable;

 import javax.swing.text.JTextComponent;

 

+import org.cristalise.kernel.utils.Language;

 import org.exolab.castor.xml.schema.SimpleType;

 

-import com.c2kernel.utils.Language;

 

 /**************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ArrayTableModel.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/ArrayTableModel.java
index 341c33a..f54e85a 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ArrayTableModel.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/ArrayTableModel.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome.form.field;

+package org.cristalise.gui.tabs.outcome.form.field;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -6,10 +6,10 @@ import java.util.StringTokenizer;
 

 import javax.swing.table.AbstractTableModel;

 

+import org.cristalise.gui.tabs.outcome.form.OutcomeStructure;

+import org.cristalise.kernel.utils.Language;

 import org.exolab.castor.xml.schema.SimpleType;

 

-import com.c2kernel.gui.tabs.outcome.form.OutcomeStructure;

-import com.c2kernel.utils.Language;

 

 /**************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/BooleanEditField.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/BooleanEditField.java
index c831eb4..f9b078e 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/BooleanEditField.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/BooleanEditField.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome.form.field;

+package org.cristalise.gui.tabs.outcome.form.field;

 

 import java.awt.Component;

 import java.awt.event.FocusEvent;

@@ -6,7 +6,8 @@ import java.awt.event.FocusEvent;
 import javax.swing.JCheckBox;

 import javax.swing.text.JTextComponent;

 

-import com.c2kernel.utils.Logger;

+import org.cristalise.kernel.utils.Logger;

+

 

 /**************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/ComboField.java
index 3be29f5..cb9b0ca 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/ComboField.java
@@ -1,7 +1,6 @@
-package com.c2kernel.gui.tabs.outcome.form.field;

+package org.cristalise.gui.tabs.outcome.form.field;

 

 import java.awt.Component;

-import com.c2kernel.gui.MainFrame;

 import java.util.Enumeration;

 import java.util.StringTokenizer;

 

@@ -9,14 +8,15 @@ import javax.swing.DefaultComboBoxModel;
 import javax.swing.JComboBox;

 import javax.swing.text.JTextComponent;

 

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.tabs.outcome.form.StructuralException;

+import org.cristalise.kernel.scripting.Script;

 import org.exolab.castor.types.AnyNode;

 import org.exolab.castor.xml.schema.AttributeDecl;

 import org.exolab.castor.xml.schema.ElementDecl;

 import org.exolab.castor.xml.schema.Facet;

 import org.exolab.castor.xml.schema.SimpleType;

 

-import com.c2kernel.gui.tabs.outcome.form.StructuralException;

-import com.c2kernel.scripting.Script;

 

 /*******************************************************************************

  *

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/DecimalEditField.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/DecimalEditField.java
index 654dc35..a829f85 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/DecimalEditField.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/DecimalEditField.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome.form.field;

+package org.cristalise.gui.tabs.outcome.form.field;

 

 import java.awt.Toolkit;

 import java.math.BigDecimal;

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ImageEditField.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/ImageEditField.java
index 8eb9368..3744782 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ImageEditField.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/ImageEditField.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome.form.field;

+package org.cristalise.gui.tabs.outcome.form.field;

 

 import java.awt.Component;

 import java.awt.Toolkit;

@@ -15,8 +15,8 @@ import javax.swing.JFileChooser;
 import javax.swing.JLabel;

 

 import org.apache.xerces.impl.dv.util.Base64;

+import org.cristalise.gui.MainFrame;

 

-import com.c2kernel.gui.MainFrame;

 

 public class ImageEditField extends StringEditField {

 

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/IntegerEditField.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/IntegerEditField.java
index fef8cf0..ebff113 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/IntegerEditField.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/IntegerEditField.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome.form.field;

+package org.cristalise.gui.tabs.outcome.form.field;

 

 import java.awt.Toolkit;

 import java.math.BigInteger;

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ListOfValues.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/ListOfValues.java
index f95c5c9..b56e6b8 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ListOfValues.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/ListOfValues.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome.form.field;

+package org.cristalise.gui.tabs.outcome.form.field;

 

 import java.util.HashMap;

 

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/LongStringEditField.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/LongStringEditField.java
index 140d7f2..87ea82d 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/LongStringEditField.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/LongStringEditField.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome.form.field;

+package org.cristalise.gui.tabs.outcome.form.field;

 

 import java.awt.Component;

 

@@ -6,7 +6,8 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextArea;

 import javax.swing.text.JTextComponent;

 

-import com.c2kernel.utils.Language;

+import org.cristalise.kernel.utils.Language;

+

 

 

 /**************************************************************************

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/StringEditField.java b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/StringEditField.java
index 0e5fee9..e8f0341 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/StringEditField.java
+++ b/src/main/java/org/cristalise/gui/tabs/outcome/form/field/StringEditField.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tabs.outcome.form.field;

+package org.cristalise.gui.tabs.outcome.form.field;

 import java.awt.Component;

 import java.awt.event.FocusEvent;

 import java.awt.event.FocusListener;

@@ -10,6 +10,13 @@ import javax.swing.ImageIcon;
 import javax.swing.JTextField;

 import javax.swing.text.JTextComponent;

 

+import org.cristalise.gui.DomainKeyConsumer;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.tabs.outcome.OutcomeException;

+import org.cristalise.gui.tabs.outcome.form.HelpPane;

+import org.cristalise.gui.tabs.outcome.form.OutcomeStructure;

+import org.cristalise.gui.tabs.outcome.form.StructuralException;

+import org.cristalise.kernel.lookup.DomainPath;

 import org.exolab.castor.types.AnyNode;

 import org.exolab.castor.xml.schema.Annotation;

 import org.exolab.castor.xml.schema.AppInfo;

@@ -24,13 +31,6 @@ import org.w3c.dom.Attr;
 import org.w3c.dom.Node;

 import org.w3c.dom.Text;

 

-import com.c2kernel.gui.DomainKeyConsumer;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.tabs.outcome.OutcomeException;

-import com.c2kernel.gui.tabs.outcome.form.HelpPane;

-import com.c2kernel.gui.tabs.outcome.form.OutcomeStructure;

-import com.c2kernel.gui.tabs.outcome.form.StructuralException;

-import com.c2kernel.lookup.DomainPath;

 

 /** Superclass for the entry field for Field and AttributeList.

   */

diff --git a/src/main/java/com/c2kernel/gui/tree/Node.java b/src/main/java/org/cristalise/gui/tree/Node.java
index d81061f..4ef3942 100644
--- a/src/main/java/com/c2kernel/gui/tree/Node.java
+++ b/src/main/java/org/cristalise/gui/tree/Node.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tree;

+package org.cristalise.gui.tree;

 import java.awt.event.ActionEvent;

 import java.awt.event.ActionListener;

 import java.util.ArrayList;

@@ -11,17 +11,18 @@ import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;

 import javax.swing.tree.DefaultMutableTreeNode;

 

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.gui.DynamicTreeBuilder;

-import com.c2kernel.gui.ImageLoader;

-import com.c2kernel.gui.ItemTabManager;

-import com.c2kernel.lookup.AgentPath;

-import com.c2kernel.lookup.ItemPath;

-import com.c2kernel.lookup.Path;

-import com.c2kernel.lookup.RolePath;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.DynamicTreeBuilder;

+import org.cristalise.gui.ImageLoader;

+import org.cristalise.gui.ItemTabManager;

+import org.cristalise.kernel.common.ObjectNotFoundException;

+import org.cristalise.kernel.lookup.AgentPath;

+import org.cristalise.kernel.lookup.ItemPath;

+import org.cristalise.kernel.lookup.Path;

+import org.cristalise.kernel.lookup.RolePath;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.Logger;

+

 

 public abstract class Node implements Runnable {

 

diff --git a/src/main/java/com/c2kernel/gui/tree/NodeAgent.java b/src/main/java/org/cristalise/gui/tree/NodeAgent.java
index 3ce667d..b070c5d 100644
--- a/src/main/java/com/c2kernel/gui/tree/NodeAgent.java
+++ b/src/main/java/org/cristalise/gui/tree/NodeAgent.java
@@ -1,11 +1,12 @@
 

-package com.c2kernel.gui.tree;

+package org.cristalise.gui.tree;

 

 

 import java.util.ArrayList;

 

-import com.c2kernel.gui.ItemTabManager;

-import com.c2kernel.lookup.Path;

+import org.cristalise.gui.ItemTabManager;

+import org.cristalise.kernel.lookup.Path;

+

 

 /**

  * Structure for Item presence on the tree and ItemDetails boxes. Created by NodeFactory.

diff --git a/src/main/java/com/c2kernel/gui/tree/NodeCollection.java b/src/main/java/org/cristalise/gui/tree/NodeCollection.java
index 36d32e3..3a8643a 100644
--- a/src/main/java/com/c2kernel/gui/tree/NodeCollection.java
+++ b/src/main/java/org/cristalise/gui/tree/NodeCollection.java
@@ -1,24 +1,25 @@
-package com.c2kernel.gui.tree;

+package org.cristalise.gui.tree;

 

 import java.util.ArrayList;

 

 import javax.swing.tree.DefaultMutableTreeNode;

 

-import com.c2kernel.collection.Collection;

-import com.c2kernel.collection.CollectionMember;

-import com.c2kernel.collection.Dependency;

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.entity.proxy.ItemProxy;

-import com.c2kernel.entity.proxy.MemberSubscription;

-import com.c2kernel.entity.proxy.ProxyObserver;

-import com.c2kernel.gui.ItemTabManager;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.lookup.ItemPath;

-import com.c2kernel.lookup.Path;

-import com.c2kernel.persistency.ClusterStorage;

-import com.c2kernel.utils.CastorHashMap;

-import com.c2kernel.utils.KeyValuePair;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.ItemTabManager;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.kernel.collection.Collection;

+import org.cristalise.kernel.collection.CollectionMember;

+import org.cristalise.kernel.collection.Dependency;

+import org.cristalise.kernel.common.ObjectNotFoundException;

+import org.cristalise.kernel.entity.proxy.ItemProxy;

+import org.cristalise.kernel.entity.proxy.MemberSubscription;

+import org.cristalise.kernel.entity.proxy.ProxyObserver;

+import org.cristalise.kernel.lookup.ItemPath;

+import org.cristalise.kernel.lookup.Path;

+import org.cristalise.kernel.persistency.ClusterStorage;

+import org.cristalise.kernel.utils.CastorHashMap;

+import org.cristalise.kernel.utils.KeyValuePair;

+import org.cristalise.kernel.utils.Logger;

+

 

 public class NodeCollection extends Node implements ProxyObserver<Collection<? extends CollectionMember>> {

 

diff --git a/src/main/java/com/c2kernel/gui/tree/NodeContext.java b/src/main/java/org/cristalise/gui/tree/NodeContext.java
index 6d7c7bd..97252c7 100644
--- a/src/main/java/com/c2kernel/gui/tree/NodeContext.java
+++ b/src/main/java/org/cristalise/gui/tree/NodeContext.java
@@ -1,13 +1,14 @@
-package com.c2kernel.gui.tree;

+package org.cristalise.gui.tree;

 

 import java.util.Iterator;

 

-import com.c2kernel.entity.proxy.DomainPathSubscriber;

-import com.c2kernel.gui.ItemTabManager;

-import com.c2kernel.lookup.DomainPath;

-import com.c2kernel.lookup.Path;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.ItemTabManager;

+import org.cristalise.kernel.entity.proxy.DomainPathSubscriber;

+import org.cristalise.kernel.lookup.DomainPath;

+import org.cristalise.kernel.lookup.Path;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.Logger;

+

 

 

 public class NodeContext extends Node implements DomainPathSubscriber {

diff --git a/src/main/java/com/c2kernel/gui/tree/NodeItem.java b/src/main/java/org/cristalise/gui/tree/NodeItem.java
index 3194bcd..667b701 100644
--- a/src/main/java/com/c2kernel/gui/tree/NodeItem.java
+++ b/src/main/java/org/cristalise/gui/tree/NodeItem.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tree;

+package org.cristalise.gui.tree;

 

 import java.awt.datatransfer.DataFlavor;

 import java.awt.datatransfer.Transferable;

@@ -12,20 +12,21 @@ import java.util.StringTokenizer;
 import javax.swing.JMenuItem;

 import javax.swing.JPopupMenu;

 

-import com.c2kernel.collection.Aggregation;

-import com.c2kernel.collection.Collection;

-import com.c2kernel.collection.CollectionMember;

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.entity.agent.Job;

-import com.c2kernel.entity.proxy.ItemProxy;

-import com.c2kernel.gui.ItemDetails;

-import com.c2kernel.gui.ItemTabManager;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.lookup.Path;

-import com.c2kernel.persistency.ClusterStorage;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.ItemDetails;

+import org.cristalise.gui.ItemTabManager;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.kernel.collection.Aggregation;

+import org.cristalise.kernel.collection.Collection;

+import org.cristalise.kernel.collection.CollectionMember;

+import org.cristalise.kernel.common.ObjectNotFoundException;

+import org.cristalise.kernel.entity.agent.Job;

+import org.cristalise.kernel.entity.proxy.ItemProxy;

+import org.cristalise.kernel.lookup.Path;

+import org.cristalise.kernel.persistency.ClusterStorage;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.Language;

+import org.cristalise.kernel.utils.Logger;

+

 

 /**

  * Structure for Item presence on the tree and ItemDetails boxes. Created by NodeFactory.

diff --git a/src/main/java/com/c2kernel/gui/tree/NodeRole.java b/src/main/java/org/cristalise/gui/tree/NodeRole.java
index df04e3a..288d3b6 100644
--- a/src/main/java/com/c2kernel/gui/tree/NodeRole.java
+++ b/src/main/java/org/cristalise/gui/tree/NodeRole.java
@@ -1,12 +1,13 @@
-package com.c2kernel.gui.tree;

+package org.cristalise.gui.tree;

+

+import org.cristalise.gui.ItemTabManager;

+import org.cristalise.kernel.common.ObjectNotFoundException;

+import org.cristalise.kernel.lookup.AgentPath;

+import org.cristalise.kernel.lookup.Path;

+import org.cristalise.kernel.lookup.RolePath;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.utils.Logger;

 

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.gui.ItemTabManager;

-import com.c2kernel.lookup.AgentPath;

-import com.c2kernel.lookup.Path;

-import com.c2kernel.lookup.RolePath;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.Logger;

 

 public class NodeRole extends NodeContext {

 

diff --git a/src/main/java/com/c2kernel/gui/tree/NodeSubscriber.java b/src/main/java/org/cristalise/gui/tree/NodeSubscriber.java
index 55f8aa9..b06f497 100644
--- a/src/main/java/com/c2kernel/gui/tree/NodeSubscriber.java
+++ b/src/main/java/org/cristalise/gui/tree/NodeSubscriber.java
@@ -1,6 +1,6 @@
-package com.c2kernel.gui.tree;

+package org.cristalise.gui.tree;

 

-import com.c2kernel.lookup.Path;

+import org.cristalise.kernel.lookup.Path;

 

 

 public interface NodeSubscriber {

diff --git a/src/main/java/com/c2kernel/gui/tree/NodeTransferHandler.java b/src/main/java/org/cristalise/gui/tree/NodeTransferHandler.java
index 56e61bd..89f503c 100644
--- a/src/main/java/com/c2kernel/gui/tree/NodeTransferHandler.java
+++ b/src/main/java/org/cristalise/gui/tree/NodeTransferHandler.java
@@ -1,4 +1,4 @@
-package com.c2kernel.gui.tree;

+package org.cristalise.gui.tree;

 

 import java.awt.datatransfer.Transferable;

 

@@ -6,10 +6,11 @@ import javax.swing.Icon;
 import javax.swing.JComponent;

 import javax.swing.TransferHandler;

 

-import com.c2kernel.gui.ImageLoader;

-import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.TreeBrowser;

-import com.c2kernel.utils.Logger;

+import org.cristalise.gui.ImageLoader;

+import org.cristalise.gui.MainFrame;

+import org.cristalise.gui.TreeBrowser;

+import org.cristalise.kernel.utils.Logger;

+

 

 public class NodeTransferHandler extends TransferHandler {

 

diff --git a/src/main/resources/module.xml b/src/main/resources/module.xml
index ca61f86..078d6a4 100644
--- a/src/main/resources/module.xml
+++ b/src/main/resources/module.xml
@@ -4,10 +4,10 @@
 		<Version>${version}</Version>

 	</Info>

 	<ResourceURL>com/c2kernel/gui/resources/</ResourceURL>

-	<Config name="OutcomeHandler.CompositeActivityDef.0" target="client">com.c2kernel.gui.lifecycle.desc.CompActDefOutcomeHandler</Config>

-	<Config name="OutcomeHandler.ElementaryActivityDef.0" target="client">com.c2kernel.gui.lifecycle.desc.ElemActDefOutcomeHandler</Config>

-	<Config name="OutcomeHandler.Schema.0" target="client">com.c2kernel.gui.tabs.outcome.BasicOutcomeEditor</Config>

-	<Config name="OutcomeHandler.Script.0" target="client">com.c2kernel.gui.tabs.outcome.BasicOutcomeEditor</Config>

+	<Config name="OutcomeHandler.CompositeActivityDef.0" target="client">org.cristalise.kernel.gui.lifecycle.desc.CompActDefOutcomeHandler</Config>

+	<Config name="OutcomeHandler.ElementaryActivityDef.0" target="client">org.cristalise.kernel.gui.lifecycle.desc.ElemActDefOutcomeHandler</Config>

+	<Config name="OutcomeHandler.Schema.0" target="client">org.cristalise.kernel.gui.tabs.outcome.BasicOutcomeEditor</Config>

+	<Config name="OutcomeHandler.Script.0" target="client">org.cristalise.kernel.gui.tabs.outcome.BasicOutcomeEditor</Config>

 	<Config name="banner" target="client">about.png</Config>

 	<Imports/>

 </CristalModule>
\ No newline at end of file