Changeset 666 for trunk

Timestamp:

08/28/12 13:46:52 (12 years ago)

Author:

sherbold

Message:

• removed dependencies on quest-core projects from GlobalDataContainer?

Location:

trunk

Files:

• quest-ui-core-test/src/test/java/de/ugoe/cs/quest/ui/GlobalDataContainerTest.java (modified) (3 diffs)
• quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/GlobalDataContainer.java (modified) (2 diffs)
• quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/GuiModelTabComposite.java (modified) (1 diff)
• quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/ModelsTabComposite.java (modified) (1 diff)
• quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesTabComposite.java (modified) (2 diffs)

trunk/quest-ui-core-test/src/test/java/de/ugoe/cs/quest/ui/GlobalDataContainerTest.java

@@ -1 +1 @@
 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;
@@ -10 +18 @@
 import java.util.Collection;
 import java.util.LinkedList;
-import java.util.List;
-
-import org.junit.*;
-
-import de.ugoe.cs.quest.eventcore.Event;
-import de.ugoe.cs.quest.usageprofiles.IStochasticProcess;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+
+import org.junit.Before;
+import org.junit.Test;
 
 /**
@@ -240 +242 @@
 
     @Test
-    public void testGetAllSequencesNames_1() {
-        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));
-
-        String keySeq1 = "seq1";
-        Collection<List<Event>> seq1 = new LinkedList<List<Event>>();
-        List<Event> subseq1 = new LinkedList<Event>();
-        subseq1.add(Event.STARTEVENT);
-        seq1.add(subseq1);
-
-        String keySeq2 = "seq2";
-        Collection<List<Event>> seq2 = new LinkedList<List<Event>>();
-        List<Event> subseq2 = new LinkedList<Event>();
-        subseq2.add(Event.STARTEVENT);
-        seq2.add(subseq2);
-
-        assertFalse(instance.addData(keySeq1, seq1));
-        assertFalse(instance.addData(keySeq2, seq2));
-
-        Collection<String> expected = new LinkedList<String>();
-        expected.add(keySeq1);
-        expected.add(keySeq2);
-
-        assertCollectionContent(expected, instance.getAllSequencesNames());
-    }
-
-    @Test
-    public void testGetAllSequencesNames_2() {
-        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));
-
-        String keySeq1 = "seq1";
-        Collection<List<Event>> seq1 = new LinkedList<List<Event>>();
-        List<Event> subseq1 = new LinkedList<Event>();
-        subseq1.add(Event.STARTEVENT);
-        seq1.add(subseq1);
-
-        String keySeq2 = "seq2";
-        Collection<List<Event>> seq2 = new LinkedList<List<Event>>();
-
-        assertFalse(instance.addData(keySeq1, seq1));
-        assertFalse(instance.addData(keySeq2, seq2));
-
-        Collection<String> expected = new LinkedList<String>();
-        expected.add(keySeq1);
-
-        assertCollectionContent(expected, instance.getAllSequencesNames());
-    }
-
-    @Test
-    public void testGetAllSequencesNames_3() {
-        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>();
-
-        assertCollectionContent(expected, instance.getAllSequencesNames());
-    }
-
-    @Test
-    public void testGetAllModelNames_1() {
-        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));
-
-        String modelKey1 = "model1";
-        IStochasticProcess model1 = mock(IStochasticProcess.class);
-        String modelKey2 = "model2";
-        IStochasticProcess model2 = mock(IStochasticProcess.class);
-
-        assertFalse(instance.addData(modelKey1, model1));
-        assertFalse(instance.addData(modelKey2, model2));
-
-        Collection<String> expected = new LinkedList<String>();
-        expected.add(modelKey1);
-        expected.add(modelKey2);
-
-        assertCollectionContent(expected, instance.getAllModelNames());
-    }
-
-    @Test
-    public void testGetAllModelNames_2() {
-        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>();
-
-        assertCollectionContent(expected, instance.getAllModelNames());
-    }
-
-    @Test
     public void testSerialization_1() throws Exception {
         GlobalDataContainer instance = GlobalDataContainer.getInstance();

trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/GlobalDataContainer.java

@@ -7 +7 @@
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.Map;
-import java.util.Map.Entry;
-
-import de.ugoe.cs.quest.SequenceInstanceOf;
-import de.ugoe.cs.quest.eventcore.guimodel.GUIModel;
-import de.ugoe.cs.quest.usageprofiles.IStochasticProcess;
 
 /**
@@ -181 +175 @@
         /**
          * <p>
-         * Returns all keys of collections of sequences contained in the storage.
-         * </p>
-         * 
-         * @return keys of all collections of sequences contained in the storage
-         */
-        public Collection<String> getAllSequencesNames() {
-                Collection<String> allSequencesNames = new LinkedList<String>();
-                for (Entry<String, Object> entry : dataObjects.entrySet()) {
-                        if( SequenceInstanceOf.isCollectionOfSequences(entry.getValue())) {
-                                allSequencesNames.add(entry.getKey());
-                        }
-                }
-                return allSequencesNames;
-        }
-
-        /**
-         * <p>
-         * Returns the keys of all {@link IStochasticProcess}s contained in the
-         * storage.
-         * </p>
-         * 
-         * @return keys of all {@link IStochasticProcess}s contained in the storage
-         */
-        public Collection<String> getAllModelNames() {
-                Collection<String> modelNames = new LinkedList<String>();
-                for (Entry<String, Object> entry : dataObjects.entrySet()) {
-                        if (entry.getValue() instanceof IStochasticProcess) {
-                                modelNames.add(entry.getKey());
-                        }
-                }
-                return modelNames;
-        }
-        
-        /**
-         * <p>
-         * Returns the keys of all {@link GUIModel}s contained in the storage.
-         * </p>
-         *
-         * @return keys of all {@link GUIModel}s contained in the storage
-         */
-        public Collection<String> getAllGUIModelNames() {
-            Collection<String> modelNames = new LinkedList<String>();
-            for(Entry<String, Object> entry : dataObjects.entrySet()) {
-                if( entry.getValue() instanceof GUIModel ) {
-                    modelNames.add(entry.getKey());
-                }
-            }
-            return modelNames;
-        }
-
-        /**
-         * <p>
          * Returns the keys of all objects contained in the storage.
          * </p>

trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/GuiModelTabComposite.java

@@ -85 +85 @@
     public void updateModelList() {
         guiModelList.removeAll();
-        for (String modelName : GlobalDataContainer.getInstance().getAllGUIModelNames()) {
-            guiModelList.add(modelName);
+        for(String key : GlobalDataContainer.getInstance().getAllKeys()) {
+            if( GlobalDataContainer.getInstance().getData(key) instanceof GUIModel ) {
+                guiModelList.add(key);
+            }
         }
     }

trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/ModelsTabComposite.java

@@ -150 +150 @@
     public void updateModelList() {
         modelList.removeAll();
-        for (String sequencesName : GlobalDataContainer.getInstance().getAllModelNames()) {
-            modelList.add(sequencesName);
+        for(String key : GlobalDataContainer.getInstance().getAllKeys()) {
+            if( GlobalDataContainer.getInstance().getData(key) instanceof IStochasticProcess ) {
+                modelList.add(key);
+            }
         }
     }

trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesTabComposite.java

@@ -13 +13 @@
 import org.eclipse.swt.events.SelectionEvent;
 
+import de.ugoe.cs.quest.SequenceInstanceOf;
 import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.CommandExecuter;
@@ -129 +130 @@
     public void updateSequenceList() {
         sequenceList.removeAll();
-        for (String sequencesName : GlobalDataContainer.getInstance().getAllSequencesNames()) {
-            sequenceList.add(sequencesName);
+        for(String key : GlobalDataContainer.getInstance().getAllKeys()) {
+            if( SequenceInstanceOf.isCollectionOfSequences(GlobalDataContainer.getInstance().getData(key)) ) {
+                sequenceList.add(key);
+            }
         }
     }