Changeset 666 for trunk/quest-ui-swt

Timestamp:

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

Author:

sherbold

Message:

• removed dependencies on quest-core projects from GlobalDataContainer?

Location:

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

Files:

• GuiModelTabComposite.java (modified) (1 diff)
• ModelsTabComposite.java (modified) (1 diff)
• SequencesTabComposite.java (modified) (2 diffs)

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);
+            }
         }
     }