Changeset 659 for trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesDialog.java

Timestamp:

08/28/12 10:42:56 (12 years ago)

Author:

sherbold

Message:

• modified adding of assertions to work with GUI models. As a side effect, it is currently impossible to add assertions to sequences whose event targets are not based on a GUI model

File:

• trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesDialog.java (modified) (5 diffs)

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

@@ -2 +2 @@
 
 import java.util.Collection;
-import java.util.SortedSet;
-import java.util.TreeSet;
 
 import org.eclipse.swt.widgets.Dialog;
@@ -17 +15 @@
 import de.ugoe.cs.quest.SequenceInstanceOf;
 import de.ugoe.cs.quest.eventcore.Event;
+import de.ugoe.cs.quest.eventcore.guimodel.GUIModel;
 import de.ugoe.cs.quest.ui.GlobalDataContainer;
 
@@ -28 +27 @@
     private List sequenceList;
     private Collection<java.util.List<Event>> sequences;
-    private SortedSet<String> targets;
+    private GUIModel guiModel;
 
     protected Shell shell;
@@ -86 +85 @@
                 else {
                     EditSequenceDialog editSequenceDialog =
-                        new EditSequenceDialog(shell, SWT.NONE, targets);
+                        new EditSequenceDialog(shell, SWT.NONE, guiModel);
                     int counter = 0;
                     java.util.List<Event> selectedSequence = null;
@@ -130 +129 @@
             Object targetObject =
                 GlobalDataContainer.getInstance().getData(sequencesName + "_targets");
-            targets = null;
-            if (targetObject instanceof SortedSet) {
-                if (!((SortedSet<?>) targetObject).isEmpty()) {
-                    if (((SortedSet<?>) targetObject).first() instanceof String) {
-                        targets = (SortedSet<String>) targetObject;
-                    }
-                }
+            guiModel = null;
+            if (targetObject instanceof GUIModel) {
+                guiModel = (GUIModel) targetObject;
             }
-            if (targets == null) {
-                targets = new TreeSet<String>();
-                for (java.util.List<Event> sequence : sequences) {
-                    for (Event event : sequence) {
-                        // TODO check if toString() is sufficient
-                        String target = event.getTarget().toString();
-                        if (target != null) {
-                            targets.add(target);
-                        }
-                    }
-                }
+            if (guiModel == null) {
+                MessageBox messageBox = new MessageBox(shell, SWT.ERROR);
+                messageBox.setMessage("Operation not supported!\nOnly works for GUI sequences.");
+                messageBox.setText("Error");
+                messageBox.open();
             }
         }