Index: /trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/GlobalDataContainerTest.java
===================================================================
--- /trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/GlobalDataContainerTest.java	(revision 667)
+++ /trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/GlobalDataContainerTest.java	(revision 667)
@@ -0,0 +1,298 @@
+package de.ugoe.cs.util.console;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Modifier;
+import java.util.Collection;
+import java.util.LinkedList;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import de.ugoe.cs.util.console.GlobalDataContainer;
+
+/**
+ * The class <code>WindowsEventTest</code> contains tests for the class
+ * <code>{@link WindowsEvent}</code>.
+ * 
+ * @author Steffen Herbold
+ * @version 1.0
+ */
+public class GlobalDataContainerTest {
+
+    private static void assertCollectionContent(Collection<?> c1, Collection<?> c2) {
+        assertEquals(c1.size(), c2.size());
+        for (Object obj : c1) {
+            assertTrue(c2.contains(obj));
+        }
+    }
+
+    @Test
+    public void testGlobalDataContainer_1() throws Exception {
+        // assure that all constructors are private
+        Constructor<?>[] constructors = GlobalDataContainer.class.getDeclaredConstructors();
+        for (int i = 0; i < constructors.length; i++) {
+            int modifier = constructors[i].getModifiers();
+            if (modifier != Modifier.PRIVATE) {
+                fail(constructors[i].getName() + " - " + Modifier.toString(modifier));
+            }
+        }
+    }
+
+    @Test
+    public void testGetInstance_1() throws Exception {
+        GlobalDataContainer instance1 = GlobalDataContainer.getInstance();
+        GlobalDataContainer instance2 = GlobalDataContainer.getInstance();
+        assertNotNull(instance1);
+        assertSame(instance1, instance2);
+    }
+
+    @Test
+    public void testDatahandling_1() throws Exception {
+        // test is data can be added and retrieved as expected
+        GlobalDataContainer instance = GlobalDataContainer.getInstance();
+
+        String key1 = "key1";
+        String data1 = "data1";
+        String key2 = "key2";
+        String data2 = "data2";
+        String key3 = "key3";
+        Integer data3 = 1;
+        String key4 = "key4";
+        Integer data4 = 2;
+        String key5 = "key5";
+        Integer data5 = 3;
+
+        assertFalse(instance.addData(key1, data1));
+        assertFalse(instance.addData(key2, data2));
+        assertFalse(instance.addData(key3, data3));
+        assertFalse(instance.addData(key4, data4));
+        assertFalse(instance.addData(key5, data5));
+
+        assertEquals(data1, instance.getData(key1));
+        assertEquals(data2, instance.getData(key2));
+        assertEquals(data3, instance.getData(key3));
+        assertEquals(data4, instance.getData(key4));
+        assertEquals(data5, instance.getData(key5));
+    }
+
+    @Test
+    public void testDatahandling_2() throws Exception {
+        // test is data can be added, overwritten, and retrieved as expected
+        GlobalDataContainer instance = GlobalDataContainer.getInstance();
+
+        String key1 = "key1";
+        String data1 = "data1";
+        String data1changed = "data1changed";
+        String key2 = "key2";
+        String data2 = "data2";
+        String data2changed = "data2changed";
+        String key3 = "key3";
+        Integer data3 = 1;
+        Integer data3changed = 11;
+        String key4 = "key4";
+        Integer data4 = 2;
+        Integer data4changed = 22;
+        String key5 = "key5";
+        Integer data5 = 3;
+        Integer data5changed = 33;
+
+        assertFalse(instance.addData(key1, data1));
+        assertFalse(instance.addData(key2, data2));
+        assertFalse(instance.addData(key3, data3));
+        assertFalse(instance.addData(key4, data4));
+        assertFalse(instance.addData(key5, data5));
+
+        assertTrue(instance.addData(key1, data1changed));
+        assertTrue(instance.addData(key2, data2changed));
+        assertTrue(instance.addData(key3, data3changed));
+        assertTrue(instance.addData(key4, data4changed));
+        assertTrue(instance.addData(key5, data5changed));
+
+        assertEquals(data1changed, instance.getData(key1));
+        assertEquals(data2changed, instance.getData(key2));
+        assertEquals(data3changed, instance.getData(key3));
+        assertEquals(data4changed, instance.getData(key4));
+        assertEquals(data5changed, instance.getData(key5));
+    }
+
+    @Test
+    public void testDatahandling_3() throws Exception {
+        // test is data can be removed as expected
+        GlobalDataContainer instance = GlobalDataContainer.getInstance();
+
+        String key1 = "key1";
+        String data1 = "data1";
+        String key2 = "key2";
+        String data2 = "data2";
+        String key3 = "key3";
+        Integer data3 = 1;
+        String key4 = "key4";
+        Integer data4 = 2;
+        String key5 = "key5";
+        Integer data5 = 3;
+
+        assertFalse(instance.addData(key1, data1));
+        assertFalse(instance.addData(key2, data2));
+        assertFalse(instance.addData(key3, data3));
+        assertFalse(instance.addData(key4, data4));
+        assertFalse(instance.addData(key5, data5));
+
+        assertFalse(instance.removeData("keyNotFound"));
+        assertTrue(instance.removeData(key1));
+
+        assertNull(instance.getData(key1));
+    }
+
+    @Test
+    public void testDatahandling_4() throws Exception {
+        // test is data can be removed as expected
+        GlobalDataContainer instance = GlobalDataContainer.getInstance();
+
+        String key1 = "key1";
+        String data1 = "data1";
+        String key2 = "key2";
+        String data2 = "data2";
+        String key3 = "key3";
+        Integer data3 = 1;
+        String key4 = "key4";
+        Integer data4 = 2;
+        String key5 = "key5";
+        Integer data5 = 3;
+
+        assertFalse(instance.addData(key1, data1));
+        assertFalse(instance.addData(key2, data2));
+        assertFalse(instance.addData(key3, data3));
+        assertFalse(instance.addData(key4, data4));
+        assertFalse(instance.addData(key5, data5));
+
+        assertNull(instance.getData("keyNotFound"));
+    }
+
+    @Test
+    public void testReset_1() throws Exception {
+        // check if data container is empty after reset
+        GlobalDataContainer instance = GlobalDataContainer.getInstance();
+        String key1 = "key1";
+        String data1 = "data1";
+        String key2 = "key2";
+        String data2 = "data2";
+        String key3 = "key3";
+        Integer data3 = 1;
+        String key4 = "key4";
+        Integer data4 = 2;
+        String key5 = "key5";
+        Integer data5 = 3;
+
+        assertFalse(instance.addData(key1, data1));
+        assertFalse(instance.addData(key2, data2));
+        assertFalse(instance.addData(key3, data3));
+        assertFalse(instance.addData(key4, data4));
+        assertFalse(instance.addData(key5, data5));
+
+        instance.reset();
+
+        assertNull(instance.getData(key1));
+        assertNull(instance.getData(key2));
+        assertNull(instance.getData(key3));
+        assertNull(instance.getData(key4));
+        assertNull(instance.getData(key5));
+    }
+
+    @Test
+    public void testGetAllKeys_1() throws Exception {
+        // check if data container is empty after reset
+        GlobalDataContainer instance = GlobalDataContainer.getInstance();
+        String key1 = "key1";
+        String data1 = "data1";
+        String key2 = "key2";
+        String data2 = "data2";
+        String key3 = "key3";
+        Integer data3 = 1;
+        String key4 = "key4";
+        Integer data4 = 2;
+        String key5 = "key5";
+        Integer data5 = 3;
+
+        assertFalse(instance.addData(key1, data1));
+        assertFalse(instance.addData(key2, data2));
+        assertFalse(instance.addData(key3, data3));
+        assertFalse(instance.addData(key4, data4));
+        assertFalse(instance.addData(key5, data5));
+
+        Collection<String> expected = new LinkedList<String>();
+        expected.add(key1);
+        expected.add(key2);
+        expected.add(key3);
+        expected.add(key4);
+        expected.add(key5);
+
+        assertCollectionContent(expected, instance.getAllKeys());
+    }
+
+    @Test
+    public void testSerialization_1() throws Exception {
+        GlobalDataContainer instance = GlobalDataContainer.getInstance();
+        String key1 = "key1";
+        String data1 = "data1";
+        String key2 = "key2";
+        String data2 = "data2";
+        String key3 = "key3";
+        Integer data3 = 1;
+        String key4 = "key4";
+        Integer data4 = 2;
+        String key5 = "key5";
+        Integer data5 = 3;
+
+        String key6 = "key6";
+        Double data6 = 6.0d;
+
+        assertFalse(instance.addData(key1, data1));
+        assertFalse(instance.addData(key2, data2));
+        assertFalse(instance.addData(key3, data3));
+        assertFalse(instance.addData(key4, data4));
+        assertFalse(instance.addData(key5, data5));
+
+        // serialize
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        ObjectOutputStream oos = new ObjectOutputStream(out);
+        oos.writeObject(instance);
+        oos.close();
+
+        instance.reset();
+        assertFalse(instance.addData(key6, data6));
+
+        // deserialize
+        byte[] pickled = out.toByteArray();
+        InputStream in = new ByteArrayInputStream(pickled);
+        ObjectInputStream ois = new ObjectInputStream(in);
+        ois.readObject();
+        ois.close();
+
+        // test the result
+        assertEquals(data1, instance.getData(key1));
+        assertEquals(data2, instance.getData(key2));
+        assertEquals(data3, instance.getData(key3));
+        assertEquals(data4, instance.getData(key4));
+        assertEquals(data5, instance.getData(key5));
+        assertNull(instance.getData(key6));
+    }
+
+    @Before
+    public void setUp() {
+        GlobalDataContainer.getInstance().reset();
+    }
+
+}
Index: /trunk/java-utils/src/main/java/de/ugoe/cs/util/console/GlobalDataContainer.java
===================================================================
--- /trunk/java-utils/src/main/java/de/ugoe/cs/util/console/GlobalDataContainer.java	(revision 667)
+++ /trunk/java-utils/src/main/java/de/ugoe/cs/util/console/GlobalDataContainer.java	(revision 667)
@@ -0,0 +1,186 @@
+package de.ugoe.cs.util.console;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * This data structure can be used by the commands to store any {@link Object}.
+ * The data is stored in a key-value map, with strings as keys.
+ * </p>
+ * <p>
+ * This class is implemented as a singleton, as more than one data container
+ * does not serves no purpose.
+ * </p>
+ * 
+ * @author Steffen Herbold
+ * @version 1.0
+ */
+public class GlobalDataContainer implements Serializable {
+
+	/**
+	 * <p>
+	 * Id for object serialization.
+	 * </p>
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * <p>
+	 * Instance of the {@link GlobalDataContainer} (implemented as singleton).
+	 * </p>
+	 */
+	transient private static GlobalDataContainer theInstance = null;
+
+	/**
+	 * <p>
+	 * Internal storage of the data.
+	 * </p>
+	 */
+	private Map<String, Object> dataObjects;
+
+	/**
+	 * <p>
+	 * Returns the instance of the container. If it does not yet exist, the data
+	 * container is created.
+	 * </p>
+	 * 
+	 * @return instance of the container
+	 */
+	public static GlobalDataContainer getInstance() {
+		if (theInstance == null) {
+			theInstance = new GlobalDataContainer();
+		}
+		return theInstance;
+	}
+
+	/**
+	 * <p>
+	 * Manual serialization of the object. Necessary to guarantee the singleton
+	 * property.
+	 * </p>
+	 * 
+	 * @param s
+	 *            output stream for the serialization
+	 * @throws IOException
+	 *             thrown if there is problem writing to the output stream
+	 */
+	private void writeObject(ObjectOutputStream s) throws IOException {
+		s.defaultWriteObject();
+		s.writeObject(dataObjects);
+	}
+
+	/**
+	 * <p>
+	 * Manual de-serialization of the object. Necessary to guarantee the
+	 * singleton property.
+	 * 
+	 * @param s
+	 *            input stream for the de-serialization
+	 * @throws IOException
+	 *             thrown if there is problem reading from the input stream
+	 * @throws ClassNotFoundException
+	 *             thrown if there is a problem reading from the input stream
+	 */
+	@SuppressWarnings("unchecked")
+	private void readObject(ObjectInputStream s) throws IOException,
+			ClassNotFoundException {
+		s.defaultReadObject();
+		if (theInstance == null) {
+			theInstance = new GlobalDataContainer();
+		}
+		theInstance.dataObjects = (Map<String, Object>) s.readObject();
+	}
+
+	/**
+	 * <p>
+	 * Manual de-serialization to guarantee the singleton property.
+	 * </p>
+	 * 
+	 * @return instance of the container
+	 */
+	private Object readResolve() {
+		return theInstance;
+	}
+
+	/**
+	 * <p>
+	 * Constructor. Creates a new GlobalDataContainer. Private to guarantee the
+	 * singleton property.
+	 * </p>
+	 */
+	private GlobalDataContainer() {
+		dataObjects = new HashMap<String, Object>();
+	}
+
+	/**
+	 * <p>
+	 * Adds data to the container.
+	 * </p>
+	 * 
+	 * @param key
+	 *            key that identifies the data
+	 * @param data
+	 *            data that is stored
+	 * @return true, if an old entry was overwritten; false otherwise
+	 */
+	public boolean addData(String key, Object data) {
+		Object previousEntry = dataObjects.put(key, data);
+		return previousEntry != null;
+	}
+
+	/**
+	 * <p>
+	 * Removes data from the container.
+	 * </p>
+	 * 
+	 * @param key
+	 *            key of the data to be removed
+	 * @return true, if the object was removed; false if it was not present
+	 */
+	public boolean removeData(String key) {
+		Object previousEntry = dataObjects.remove(key);
+		return previousEntry != null;
+	}
+
+	/**
+	 * <p>
+	 * Returns the data associated with a key or {@code null} if no data is
+	 * stored for the key.
+	 * </p>
+	 * 
+	 * @param key
+	 *            key whose data is returned
+	 * @return data associated with the key; {@code null} if no data is
+	 *         available
+	 */
+	public Object getData(String key) {
+		return dataObjects.get(key);
+	}
+
+	/**
+	 * <p>
+	 * Resets the data container, i.e., deletes all its contents.
+	 * </p>
+	 */
+	public void reset() {
+		dataObjects = new HashMap<String, Object>();
+	}
+
+	/**
+	 * <p>
+	 * Returns the keys of all objects contained in the storage.
+	 * </p>
+	 * 
+	 * @return keys of all objects in the storage
+	 */
+	public Collection<String> getAllKeys() {
+		return dataObjects.keySet();
+	}
+
+}
Index: /trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgTestCasesToSequences.java
===================================================================
--- /trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgTestCasesToSequences.java	(revision 666)
+++ /trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgTestCasesToSequences.java	(revision 667)
@@ -12,7 +12,7 @@
 import de.ugoe.cs.quest.eventcore.Event;
 import de.ugoe.cs.quest.plugin.guitar.GUITARTestCaseParser;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgToDFA.java
===================================================================
--- /trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgToDFA.java	(revision 666)
+++ /trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgToDFA.java	(revision 667)
@@ -5,7 +5,7 @@
 
 import de.ugoe.cs.quest.plugin.guitar.EFGModelGenerator;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.DeterministicFiniteAutomaton;
 import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgToMM.java
===================================================================
--- /trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgToMM.java	(revision 666)
+++ /trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgToMM.java	(revision 667)
@@ -5,7 +5,7 @@
 
 import de.ugoe.cs.quest.plugin.guitar.EFGModelGenerator;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.FirstOrderMarkovModel;
 import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDparseDirJFC.java
===================================================================
--- /trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDparseDirJFC.java	(revision 666)
+++ /trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDparseDirJFC.java	(revision 667)
@@ -10,7 +10,7 @@
 import de.ugoe.cs.quest.eventcore.Event;
 import de.ugoe.cs.quest.plugin.jfc.JFCLogParser;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDparseJFC.java
===================================================================
--- /trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDparseJFC.java	(revision 666)
+++ /trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDparseJFC.java	(revision 667)
@@ -8,6 +8,6 @@
 import de.ugoe.cs.quest.eventcore.Event;
 import de.ugoe.cs.quest.plugin.jfc.JFCLogParser;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDparseXML.java
===================================================================
--- /trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDparseXML.java	(revision 666)
+++ /trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDparseXML.java	(revision 667)
@@ -9,6 +9,6 @@
 import de.ugoe.cs.quest.eventcore.guimodel.GUIModel;
 import de.ugoe.cs.quest.plugin.mfc.MFCLogParser;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-plugin-php/src/main/java/de/ugoe/cs/quest/plugin/php/commands/CMDloadWebSequences.java
===================================================================
--- /trunk/quest-plugin-php/src/main/java/de/ugoe/cs/quest/plugin/php/commands/CMDloadWebSequences.java	(revision 666)
+++ /trunk/quest-plugin-php/src/main/java/de/ugoe/cs/quest/plugin/php/commands/CMDloadWebSequences.java	(revision 667)
@@ -11,7 +11,7 @@
 import de.ugoe.cs.quest.eventcore.Event;
 import de.ugoe.cs.quest.plugin.php.WeblogParser;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: unk/quest-ui-core-test/src/test/java/de/ugoe/cs/quest/ui/GlobalDataContainerTest.java
===================================================================
--- /trunk/quest-ui-core-test/src/test/java/de/ugoe/cs/quest/ui/GlobalDataContainerTest.java	(revision 666)
+++ 	(revision )
@@ -1,296 +1,0 @@
-package de.ugoe.cs.quest.ui;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Modifier;
-import java.util.Collection;
-import java.util.LinkedList;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * The class <code>WindowsEventTest</code> contains tests for the class
- * <code>{@link WindowsEvent}</code>.
- * 
- * @author Steffen Herbold
- * @version 1.0
- */
-public class GlobalDataContainerTest {
-
-    private static void assertCollectionContent(Collection<?> c1, Collection<?> c2) {
-        assertEquals(c1.size(), c2.size());
-        for (Object obj : c1) {
-            assertTrue(c2.contains(obj));
-        }
-    }
-
-    @Test
-    public void testGlobalDataContainer_1() throws Exception {
-        // assure that all constructors are private
-        Constructor<?>[] constructors = GlobalDataContainer.class.getDeclaredConstructors();
-        for (int i = 0; i < constructors.length; i++) {
-            int modifier = constructors[i].getModifiers();
-            if (modifier != Modifier.PRIVATE) {
-                fail(constructors[i].getName() + " - " + Modifier.toString(modifier));
-            }
-        }
-    }
-
-    @Test
-    public void testGetInstance_1() throws Exception {
-        GlobalDataContainer instance1 = GlobalDataContainer.getInstance();
-        GlobalDataContainer instance2 = GlobalDataContainer.getInstance();
-        assertNotNull(instance1);
-        assertSame(instance1, instance2);
-    }
-
-    @Test
-    public void testDatahandling_1() throws Exception {
-        // test is data can be added and retrieved as expected
-        GlobalDataContainer instance = GlobalDataContainer.getInstance();
-
-        String key1 = "key1";
-        String data1 = "data1";
-        String key2 = "key2";
-        String data2 = "data2";
-        String key3 = "key3";
-        Integer data3 = 1;
-        String key4 = "key4";
-        Integer data4 = 2;
-        String key5 = "key5";
-        Integer data5 = 3;
-
-        assertFalse(instance.addData(key1, data1));
-        assertFalse(instance.addData(key2, data2));
-        assertFalse(instance.addData(key3, data3));
-        assertFalse(instance.addData(key4, data4));
-        assertFalse(instance.addData(key5, data5));
-
-        assertEquals(data1, instance.getData(key1));
-        assertEquals(data2, instance.getData(key2));
-        assertEquals(data3, instance.getData(key3));
-        assertEquals(data4, instance.getData(key4));
-        assertEquals(data5, instance.getData(key5));
-    }
-
-    @Test
-    public void testDatahandling_2() throws Exception {
-        // test is data can be added, overwritten, and retrieved as expected
-        GlobalDataContainer instance = GlobalDataContainer.getInstance();
-
-        String key1 = "key1";
-        String data1 = "data1";
-        String data1changed = "data1changed";
-        String key2 = "key2";
-        String data2 = "data2";
-        String data2changed = "data2changed";
-        String key3 = "key3";
-        Integer data3 = 1;
-        Integer data3changed = 11;
-        String key4 = "key4";
-        Integer data4 = 2;
-        Integer data4changed = 22;
-        String key5 = "key5";
-        Integer data5 = 3;
-        Integer data5changed = 33;
-
-        assertFalse(instance.addData(key1, data1));
-        assertFalse(instance.addData(key2, data2));
-        assertFalse(instance.addData(key3, data3));
-        assertFalse(instance.addData(key4, data4));
-        assertFalse(instance.addData(key5, data5));
-
-        assertTrue(instance.addData(key1, data1changed));
-        assertTrue(instance.addData(key2, data2changed));
-        assertTrue(instance.addData(key3, data3changed));
-        assertTrue(instance.addData(key4, data4changed));
-        assertTrue(instance.addData(key5, data5changed));
-
-        assertEquals(data1changed, instance.getData(key1));
-        assertEquals(data2changed, instance.getData(key2));
-        assertEquals(data3changed, instance.getData(key3));
-        assertEquals(data4changed, instance.getData(key4));
-        assertEquals(data5changed, instance.getData(key5));
-    }
-
-    @Test
-    public void testDatahandling_3() throws Exception {
-        // test is data can be removed as expected
-        GlobalDataContainer instance = GlobalDataContainer.getInstance();
-
-        String key1 = "key1";
-        String data1 = "data1";
-        String key2 = "key2";
-        String data2 = "data2";
-        String key3 = "key3";
-        Integer data3 = 1;
-        String key4 = "key4";
-        Integer data4 = 2;
-        String key5 = "key5";
-        Integer data5 = 3;
-
-        assertFalse(instance.addData(key1, data1));
-        assertFalse(instance.addData(key2, data2));
-        assertFalse(instance.addData(key3, data3));
-        assertFalse(instance.addData(key4, data4));
-        assertFalse(instance.addData(key5, data5));
-
-        assertFalse(instance.removeData("keyNotFound"));
-        assertTrue(instance.removeData(key1));
-
-        assertNull(instance.getData(key1));
-    }
-
-    @Test
-    public void testDatahandling_4() throws Exception {
-        // test is data can be removed as expected
-        GlobalDataContainer instance = GlobalDataContainer.getInstance();
-
-        String key1 = "key1";
-        String data1 = "data1";
-        String key2 = "key2";
-        String data2 = "data2";
-        String key3 = "key3";
-        Integer data3 = 1;
-        String key4 = "key4";
-        Integer data4 = 2;
-        String key5 = "key5";
-        Integer data5 = 3;
-
-        assertFalse(instance.addData(key1, data1));
-        assertFalse(instance.addData(key2, data2));
-        assertFalse(instance.addData(key3, data3));
-        assertFalse(instance.addData(key4, data4));
-        assertFalse(instance.addData(key5, data5));
-
-        assertNull(instance.getData("keyNotFound"));
-    }
-
-    @Test
-    public void testReset_1() throws Exception {
-        // check if data container is empty after reset
-        GlobalDataContainer instance = GlobalDataContainer.getInstance();
-        String key1 = "key1";
-        String data1 = "data1";
-        String key2 = "key2";
-        String data2 = "data2";
-        String key3 = "key3";
-        Integer data3 = 1;
-        String key4 = "key4";
-        Integer data4 = 2;
-        String key5 = "key5";
-        Integer data5 = 3;
-
-        assertFalse(instance.addData(key1, data1));
-        assertFalse(instance.addData(key2, data2));
-        assertFalse(instance.addData(key3, data3));
-        assertFalse(instance.addData(key4, data4));
-        assertFalse(instance.addData(key5, data5));
-
-        instance.reset();
-
-        assertNull(instance.getData(key1));
-        assertNull(instance.getData(key2));
-        assertNull(instance.getData(key3));
-        assertNull(instance.getData(key4));
-        assertNull(instance.getData(key5));
-    }
-
-    @Test
-    public void testGetAllKeys_1() throws Exception {
-        // check if data container is empty after reset
-        GlobalDataContainer instance = GlobalDataContainer.getInstance();
-        String key1 = "key1";
-        String data1 = "data1";
-        String key2 = "key2";
-        String data2 = "data2";
-        String key3 = "key3";
-        Integer data3 = 1;
-        String key4 = "key4";
-        Integer data4 = 2;
-        String key5 = "key5";
-        Integer data5 = 3;
-
-        assertFalse(instance.addData(key1, data1));
-        assertFalse(instance.addData(key2, data2));
-        assertFalse(instance.addData(key3, data3));
-        assertFalse(instance.addData(key4, data4));
-        assertFalse(instance.addData(key5, data5));
-
-        Collection<String> expected = new LinkedList<String>();
-        expected.add(key1);
-        expected.add(key2);
-        expected.add(key3);
-        expected.add(key4);
-        expected.add(key5);
-
-        assertCollectionContent(expected, instance.getAllKeys());
-    }
-
-    @Test
-    public void testSerialization_1() throws Exception {
-        GlobalDataContainer instance = GlobalDataContainer.getInstance();
-        String key1 = "key1";
-        String data1 = "data1";
-        String key2 = "key2";
-        String data2 = "data2";
-        String key3 = "key3";
-        Integer data3 = 1;
-        String key4 = "key4";
-        Integer data4 = 2;
-        String key5 = "key5";
-        Integer data5 = 3;
-
-        String key6 = "key6";
-        Double data6 = 6.0d;
-
-        assertFalse(instance.addData(key1, data1));
-        assertFalse(instance.addData(key2, data2));
-        assertFalse(instance.addData(key3, data3));
-        assertFalse(instance.addData(key4, data4));
-        assertFalse(instance.addData(key5, data5));
-
-        // serialize
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ObjectOutputStream oos = new ObjectOutputStream(out);
-        oos.writeObject(instance);
-        oos.close();
-
-        instance.reset();
-        assertFalse(instance.addData(key6, data6));
-
-        // deserialize
-        byte[] pickled = out.toByteArray();
-        InputStream in = new ByteArrayInputStream(pickled);
-        ObjectInputStream ois = new ObjectInputStream(in);
-        ois.readObject();
-        ois.close();
-
-        // test the result
-        assertEquals(data1, instance.getData(key1));
-        assertEquals(data2, instance.getData(key2));
-        assertEquals(data3, instance.getData(key3));
-        assertEquals(data4, instance.getData(key4));
-        assertEquals(data5, instance.getData(key5));
-        assertNull(instance.getData(key6));
-    }
-
-    @Before
-    public void setUp() {
-        GlobalDataContainer.getInstance().reset();
-    }
-
-}
Index: unk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/GlobalDataContainer.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/GlobalDataContainer.java	(revision 666)
+++ 	(revision )
@@ -1,186 +1,0 @@
-package de.ugoe.cs.quest.ui;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * <p>
- * This data structure can be used by the commands to store any {@link Object}.
- * The data is stored in a key-value map, with strings as keys.
- * </p>
- * <p>
- * This class is implemented as a singleton, as more than one data container
- * does not serves no purpose.
- * </p>
- * 
- * @author Steffen Herbold
- * @version 1.0
- */
-public class GlobalDataContainer implements Serializable {
-
-	/**
-	 * <p>
-	 * Id for object serialization.
-	 * </p>
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <p>
-	 * Instance of the {@link GlobalDataContainer} (implemented as singleton).
-	 * </p>
-	 */
-	transient private static GlobalDataContainer theInstance = null;
-
-	/**
-	 * <p>
-	 * Internal storage of the data.
-	 * </p>
-	 */
-	private Map<String, Object> dataObjects;
-
-	/**
-	 * <p>
-	 * Returns the instance of the container. If it does not yet exist, the data
-	 * container is created.
-	 * </p>
-	 * 
-	 * @return instance of the container
-	 */
-	public static GlobalDataContainer getInstance() {
-		if (theInstance == null) {
-			theInstance = new GlobalDataContainer();
-		}
-		return theInstance;
-	}
-
-	/**
-	 * <p>
-	 * Manual serialization of the object. Necessary to guarantee the singleton
-	 * property.
-	 * </p>
-	 * 
-	 * @param s
-	 *            output stream for the serialization
-	 * @throws IOException
-	 *             thrown if there is problem writing to the output stream
-	 */
-	private void writeObject(ObjectOutputStream s) throws IOException {
-		s.defaultWriteObject();
-		s.writeObject(dataObjects);
-	}
-
-	/**
-	 * <p>
-	 * Manual de-serialization of the object. Necessary to guarantee the
-	 * singleton property.
-	 * 
-	 * @param s
-	 *            input stream for the de-serialization
-	 * @throws IOException
-	 *             thrown if there is problem reading from the input stream
-	 * @throws ClassNotFoundException
-	 *             thrown if there is a problem reading from the input stream
-	 */
-	@SuppressWarnings("unchecked")
-	private void readObject(ObjectInputStream s) throws IOException,
-			ClassNotFoundException {
-		s.defaultReadObject();
-		if (theInstance == null) {
-			theInstance = new GlobalDataContainer();
-		}
-		theInstance.dataObjects = (Map<String, Object>) s.readObject();
-	}
-
-	/**
-	 * <p>
-	 * Manual de-serialization to guarantee the singleton property.
-	 * </p>
-	 * 
-	 * @return instance of the container
-	 */
-	private Object readResolve() {
-		return theInstance;
-	}
-
-	/**
-	 * <p>
-	 * Constructor. Creates a new GlobalDataContainer. Private to guarantee the
-	 * singleton property.
-	 * </p>
-	 */
-	private GlobalDataContainer() {
-		dataObjects = new HashMap<String, Object>();
-	}
-
-	/**
-	 * <p>
-	 * Adds data to the container.
-	 * </p>
-	 * 
-	 * @param key
-	 *            key that identifies the data
-	 * @param data
-	 *            data that is stored
-	 * @return true, if an old entry was overwritten; false otherwise
-	 */
-	public boolean addData(String key, Object data) {
-		Object previousEntry = dataObjects.put(key, data);
-		return previousEntry != null;
-	}
-
-	/**
-	 * <p>
-	 * Removes data from the container.
-	 * </p>
-	 * 
-	 * @param key
-	 *            key of the data to be removed
-	 * @return true, if the object was removed; false if it was not present
-	 */
-	public boolean removeData(String key) {
-		Object previousEntry = dataObjects.remove(key);
-		return previousEntry != null;
-	}
-
-	/**
-	 * <p>
-	 * Returns the data associated with a key or {@code null} if no data is
-	 * stored for the key.
-	 * </p>
-	 * 
-	 * @param key
-	 *            key whose data is returned
-	 * @return data associated with the key; {@code null} if no data is
-	 *         available
-	 */
-	public Object getData(String key) {
-		return dataObjects.get(key);
-	}
-
-	/**
-	 * <p>
-	 * Resets the data container, i.e., deletes all its contents.
-	 * </p>
-	 */
-	public void reset() {
-		dataObjects = new HashMap<String, Object>();
-	}
-
-	/**
-	 * <p>
-	 * Returns the keys of all objects contained in the storage.
-	 * </p>
-	 * 
-	 * @return keys of all objects in the storage
-	 */
-	public Collection<String> getAllKeys() {
-		return dataObjects.keySet();
-	}
-
-}
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/AbstractTrainCommand.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/AbstractTrainCommand.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/AbstractTrainCommand.java	(revision 667)
@@ -8,7 +8,7 @@
 import de.ugoe.cs.quest.SequenceInstanceOf;
 import de.ugoe.cs.quest.eventcore.Event;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.TrieBasedModel;
 import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDcalcCoverage.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDcalcCoverage.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDcalcCoverage.java	(revision 667)
@@ -10,8 +10,8 @@
 import de.ugoe.cs.quest.coverage.CoverageCalculatorProcess;
 import de.ugoe.cs.quest.eventcore.Event;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.IStochasticProcess;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDcalcEntropy.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDcalcEntropy.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDcalcEntropy.java	(revision 667)
@@ -5,8 +5,8 @@
 
 import de.ugoe.cs.quest.CommandHelpers;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.FirstOrderMarkovModel;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDdeleteObject.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDdeleteObject.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDdeleteObject.java	(revision 667)
@@ -5,6 +5,6 @@
 
 import de.ugoe.cs.quest.CommandHelpers;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDflattenModel.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDflattenModel.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDflattenModel.java	(revision 667)
@@ -5,9 +5,9 @@
 
 import de.ugoe.cs.quest.CommandHelpers;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.FirstOrderMarkovModel;
 import de.ugoe.cs.quest.usageprofiles.HighOrderMarkovModel;
 import de.ugoe.cs.quest.usageprofiles.ModelFlattener;
 import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateFixedLengthSequences.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateFixedLengthSequences.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateFixedLengthSequences.java	(revision 667)
@@ -8,8 +8,8 @@
 import de.ugoe.cs.quest.eventcore.Event;
 import de.ugoe.cs.quest.testgeneration.DrawFromAllSequencesGenerator;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.IStochasticProcess;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateGreedy.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateGreedy.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateGreedy.java	(revision 667)
@@ -14,9 +14,9 @@
 import de.ugoe.cs.quest.coverage.SequenceTools;
 import de.ugoe.cs.quest.eventcore.Event;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.IStochasticProcess;
 import de.ugoe.cs.util.ArrayTools;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateHybrid.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateHybrid.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateHybrid.java	(revision 667)
@@ -9,8 +9,8 @@
 import de.ugoe.cs.quest.eventcore.Event;
 import de.ugoe.cs.quest.testgeneration.HybridGenerator;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.IStochasticProcess;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomReplay.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomReplay.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomReplay.java	(revision 667)
@@ -9,8 +9,8 @@
 import de.ugoe.cs.quest.ReplayGenerator;
 import de.ugoe.cs.quest.eventcore.Event;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.IStochasticProcess;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomSequences.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomSequences.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomSequences.java	(revision 667)
@@ -8,8 +8,8 @@
 import de.ugoe.cs.quest.eventcore.Event;
 import de.ugoe.cs.quest.testgeneration.RandomWalkGenerator;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.IStochasticProcess;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateReplayfile.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateReplayfile.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateReplayfile.java	(revision 667)
@@ -9,6 +9,6 @@
 import de.ugoe.cs.quest.SequenceInstanceOf;
 import de.ugoe.cs.quest.eventcore.Event;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDlistSymbols.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDlistSymbols.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDlistSymbols.java	(revision 667)
@@ -6,8 +6,8 @@
 
 import de.ugoe.cs.quest.CommandHelpers;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.IStochasticProcess;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDload.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDload.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDload.java	(revision 667)
@@ -7,7 +7,7 @@
 import java.util.List;
 
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDloadObject.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDloadObject.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDloadObject.java	(revision 667)
@@ -8,7 +8,7 @@
 
 import de.ugoe.cs.quest.CommandHelpers;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDmodelSize.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDmodelSize.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDmodelSize.java	(revision 667)
@@ -5,8 +5,8 @@
 
 import de.ugoe.cs.quest.CommandHelpers;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.IStochasticProcess;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDprintDot.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDprintDot.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDprintDot.java	(revision 667)
@@ -5,8 +5,8 @@
 
 import de.ugoe.cs.quest.CommandHelpers;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.IDotCompatible;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDprintTrieDot.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDprintTrieDot.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDprintTrieDot.java	(revision 667)
@@ -5,9 +5,9 @@
 
 import de.ugoe.cs.quest.CommandHelpers;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.Trie;
 import de.ugoe.cs.quest.usageprofiles.TrieBasedModel;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDsave.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDsave.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDsave.java	(revision 667)
@@ -7,7 +7,7 @@
 import java.util.List;
 
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDsaveObject.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDsaveObject.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDsaveObject.java	(revision 667)
@@ -8,7 +8,7 @@
 
 import de.ugoe.cs.quest.CommandHelpers;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDsequenceStatistics.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDsequenceStatistics.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDsequenceStatistics.java	(revision 667)
@@ -11,7 +11,7 @@
 import de.ugoe.cs.quest.SequenceInstanceOf;
 import de.ugoe.cs.quest.eventcore.Event;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDshowMarkovModel.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDshowMarkovModel.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDshowMarkovModel.java	(revision 667)
@@ -12,8 +12,8 @@
 
 import de.ugoe.cs.quest.CommandHelpers;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.FirstOrderMarkovModel;
 import de.ugoe.cs.quest.usageprofiles.FirstOrderMarkovModel.MarkovEdge;
 import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 import edu.uci.ics.jung.algorithms.layout.ISOMLayout;
 import edu.uci.ics.jung.algorithms.layout.Layout;
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDshowTimer.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDshowTimer.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDshowTimer.java	(revision 667)
@@ -6,7 +6,7 @@
 
 import de.ugoe.cs.quest.CommandHelpers;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDshowTrie.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDshowTrie.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDshowTrie.java	(revision 667)
@@ -12,5 +12,4 @@
 
 import de.ugoe.cs.quest.CommandHelpers;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.Trie;
 import de.ugoe.cs.quest.usageprofiles.Trie.Edge;
@@ -18,4 +17,5 @@
 import de.ugoe.cs.quest.usageprofiles.TrieBasedModel;
 import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 import edu.uci.ics.jung.algorithms.layout.Layout;
 import edu.uci.ics.jung.algorithms.layout.TreeLayout;
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDstartFileListener.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDstartFileListener.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDstartFileListener.java	(revision 667)
@@ -5,7 +5,7 @@
 
 import de.ugoe.cs.quest.CommandHelpers;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.FileOutputListener;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDstartTimer.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDstartTimer.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDstartTimer.java	(revision 667)
@@ -5,6 +5,6 @@
 
 import de.ugoe.cs.quest.CommandHelpers;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDstopFileListener.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDstopFileListener.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDstopFileListener.java	(revision 667)
@@ -5,7 +5,7 @@
 
 import de.ugoe.cs.quest.CommandHelpers;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.FileOutputListener;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDupdateModel.java
===================================================================
--- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDupdateModel.java	(revision 666)
+++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDupdateModel.java	(revision 667)
@@ -8,7 +8,7 @@
 import de.ugoe.cs.quest.SequenceInstanceOf;
 import de.ugoe.cs.quest.eventcore.Event;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.TrieBasedModel;
 import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/DataTabComposite.java
===================================================================
--- /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/DataTabComposite.java	(revision 666)
+++ /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/DataTabComposite.java	(revision 667)
@@ -10,7 +10,7 @@
 import org.eclipse.swt.layout.GridData;
 
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.StringTools;
 import de.ugoe.cs.util.console.CommandExecuter;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 import org.eclipse.swt.events.SelectionAdapter;
Index: /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/GuiModelTabComposite.java
===================================================================
--- /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/GuiModelTabComposite.java	(revision 666)
+++ /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/GuiModelTabComposite.java	(revision 667)
@@ -12,5 +12,5 @@
 
 import de.ugoe.cs.quest.eventcore.guimodel.GUIModel;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
Index: /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/ModelsTabComposite.java
===================================================================
--- /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/ModelsTabComposite.java	(revision 666)
+++ /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/ModelsTabComposite.java	(revision 667)
@@ -9,9 +9,9 @@
 import org.eclipse.swt.layout.GridData;
 
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.FirstOrderMarkovModel;
 import de.ugoe.cs.quest.usageprofiles.IDotCompatible;
 import de.ugoe.cs.quest.usageprofiles.IStochasticProcess;
 import de.ugoe.cs.util.console.CommandExecuter;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 import org.eclipse.swt.events.SelectionAdapter;
Index: /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesDialog.java
===================================================================
--- /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesDialog.java	(revision 666)
+++ /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesDialog.java	(revision 667)
@@ -16,5 +16,5 @@
 import de.ugoe.cs.quest.eventcore.Event;
 import de.ugoe.cs.quest.eventcore.guimodel.GUIModel;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 import org.eclipse.swt.events.SelectionAdapter;
Index: /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesTabComposite.java
===================================================================
--- /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesTabComposite.java	(revision 666)
+++ /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesTabComposite.java	(revision 667)
@@ -14,6 +14,6 @@
 
 import de.ugoe.cs.quest.SequenceInstanceOf;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.CommandExecuter;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 public class SequencesTabComposite extends Composite {
Index: /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/commands/CMDshowSequences.java
===================================================================
--- /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/commands/CMDshowSequences.java	(revision 666)
+++ /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/commands/CMDshowSequences.java	(revision 667)
@@ -9,7 +9,7 @@
 import de.ugoe.cs.quest.CommandHelpers;
 import de.ugoe.cs.quest.SequenceInstanceOf;
-import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.ui.swt.SequencesDialog;
 import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**