Changeset 658 for trunk

Timestamp:

08/28/12 09:58:46 (12 years ago)

Author:

sherbold

Message:

• extended SWT GUI such that GUI models can be displayed and browsed

Location:

trunk

Files:

• 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/DataTabComposite.java (modified) (1 diff)
• quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/GuiModelTabComposite.java (added)
• quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/MainWindow.java (modified) (3 diffs)
• quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/ShowGuiModelDialog.java (added)

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

@@ -12 +12 @@
 
 import de.ugoe.cs.quest.SequenceInstanceOf;
+import de.ugoe.cs.quest.eventcore.guimodel.GUIModel;
 import de.ugoe.cs.quest.usageprofiles.IStochasticProcess;
 
@@ -212 +213 @@
                 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;
+        }
 
         /**

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

@@ -110 +110 @@
     public void updateDataList() {
         dataList.removeAll();
-        for (String sequencesName : GlobalDataContainer.getInstance().getAllKeys()) {
-            dataList.add(sequencesName);
+        for (String key : GlobalDataContainer.getInstance().getAllKeys()) {
+            dataList.add(key + " (" + GlobalDataContainer.getInstance().getData(key).getClass().toString() + ")");
         }
     }

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

@@ -35 +35 @@
     protected TabItem sequencesTab;
     protected TabItem modelsTab;
+    protected TabItem guiModelsTab;
     protected TabItem dataTab;
     protected ConsoleTabComposite consoleTabComposite;
     protected SequencesTabComposite sequencesTabComposite;
     protected ModelsTabComposite modelsTabComposite;
+    protected GuiModelTabComposite guiModelTabComposite;
     protected DataTabComposite dataTabComposite;
 
@@ -198 +200 @@
                     modelsTabComposite.updateModelList();
                 }
+                else if (e.item == guiModelsTab) {
+                    guiModelTabComposite.updateModelList();
+                }
                 else if (e.item == dataTab) {
                     dataTabComposite.updateDataList();
@@ -222 +227 @@
         modelsTabComposite = new ModelsTabComposite(tabFolder, SWT.NO_BACKGROUND);
         modelsTab.setControl(modelsTabComposite);
+        
+        guiModelsTab = new TabItem(tabFolder, SWT.NONE);
+        guiModelsTab.setText("GUI Models");
+
+        guiModelTabComposite = new GuiModelTabComposite(tabFolder, SWT.NO_BACKGROUND);
+        guiModelsTab.setControl(guiModelTabComposite);
 
         dataTab = new TabItem(tabFolder, SWT.NONE);