Changeset 750 for trunk/quest-ui-swt

Timestamp:

09/03/12 10:57:43 (12 years ago)

Author:

sherbold

Message:

• added command cleanupKeyInteractions to handle invalid KeyPressed/KeyReleased? pairs
• fixed minor bug in command condenseMouseClicks
• fixed minor bug in command correctKeyInteractionTargets
• fixed minor bug in command detectTextInputEvents
• fixed minor bug in command sortKeyInteractions
• beautified showing of sequences in SWT GUI
• updated ArgoUML GUI Mappings

Location:

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

Files:

• EditSequenceDialog.java (modified) (5 diffs)
• SequencesDialog.java (modified) (1 diff)

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

@@ -24 +24 @@
     protected Shell shell;
     private Table table;
+    private TableColumn tblclmnEventIndex;
     private TableColumn tblclmnEventType;
     private TableColumn tblclmnEventTarget;
@@ -71 +72 @@
         table.setHeaderVisible(true);
         table.setLinesVisible(true);
+        
+        tblclmnEventIndex = new TableColumn(table, SWT.NONE);
+        tblclmnEventIndex.setAlignment(20);
+        
 
         tblclmnEventType = new TableColumn(table, SWT.NONE);
@@ -166 +171 @@
     private void updateTableContents() {
         table.removeAll();
+        int index = 1;
         for (Event event : sequence) {
             TableItem tableItem = new TableItem(table, SWT.NONE);
@@ -178 +184 @@
             }
             tableItem.setText(new String[]
-                { event.getType().toString(), target });
+                { ""+(index++), event.getType().toString(), target });
         }
         for (int i = 0; i < table.getColumnCount(); i++) {
@@ -186 +192 @@
 
     private void openInsertDialog(int position) {
-        InsertAssertionDialog insertDialog = new InsertAssertionDialog(shell, SWT.NONE, guiModel);
-        Event event = insertDialog.open();
-        if (event != null) {
-            sequence.add(position, event);
-            updateTableContents();
+        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();
+        } else {
+            InsertAssertionDialog insertDialog = new InsertAssertionDialog(shell, SWT.NONE, guiModel);
+            Event event = insertDialog.open();
+            if (event != null) {
+                sequence.add(position, event);
+                updateTableContents();
+            }
         }
     }

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

@@ -133 +133 @@
                 guiModel = (GUIModel) targetObject;
             }
-            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();
-            }
         }
         else {