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

Timestamp:

08/16/12 14:45:03 (12 years ago)

Author:

sherbold

Message:

• countless adaptations throughout nearly all components to remove errors introduced due to the refactoring of the event core

Location:

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

Files:

• AbstractInsertEventComposite.java (modified) (1 diff)
• EditSequenceDialog.java (modified) (5 diffs)
• InsertAssertionDialog.java (modified) (2 diffs)
• InsertFileEquals.java (modified) (2 diffs)
• InsertTextEquals.java (modified) (2 diffs)
• SequencesDialog.java (modified) (4 diffs)

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

@@ -16 +16 @@
         }
         
-        public abstract Event<?> getEvent(); 
+        public abstract Event getEvent(); 
 
 }

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

@@ -28 +28 @@
         private TableColumn tblclmnEventTarget;
 
-        private java.util.List<Event<?>> sequence;
+        private java.util.List<Event> sequence;
         private SortedSet<String> targets;
 
@@ -46 +46 @@
          * Open the dialog.
          */
-        public void open(java.util.List<Event<?>> sequence) {
+        public void open(java.util.List<Event> sequence) {
                 this.sequence = sequence;
                 createContents();
@@ -165 +165 @@
         private void updateTableContents() {
                 table.removeAll();
-                for (Event<?> event : sequence) {
+                for (Event event : sequence) {
                         TableItem tableItem = new TableItem(table, SWT.NONE);
                         String target = event.getTarget();
@@ -173 +173 @@
                                 target = target.replace("].", "].\n");
                         }
-                        tableItem.setText(new String[] { event.getType(), target });
+                        tableItem.setText(new String[] { event.getType().toString(), target });
                 }
                 for (int i = 0; i < table.getColumnCount(); i++) {
@@ -183 +183 @@
                 InsertAssertionDialog insertDialog = new InsertAssertionDialog(shell,
                                 SWT.NONE, targets);
-                Event<?> event = insertDialog.open();
+                Event event = insertDialog.open();
                 if (event != null) {
                         sequence.add(position, event);

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

@@ -21 +21 @@
 public class InsertAssertionDialog extends Dialog {
 
-        protected Event<?> result;
+        protected Event result;
         protected Shell shell;
         
@@ -44 +44 @@
          * @return the result
          */
-        public Event<?> open() {
+        public Event open() {
                 result = null;
                 insertEventComposites = new ArrayList<AbstractInsertEventComposite>();

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

@@ -12 +12 @@
 import org.eclipse.swt.widgets.Button;
 
-import de.ugoe.cs.quest.assertions.AssertEvent;
+import de.ugoe.cs.quest.assertions.FileEqualsAssertEvent;
 import de.ugoe.cs.quest.assertions.FileEqualsReplay;
 import de.ugoe.cs.quest.eventcore.Event;
@@ -74 +74 @@
 
         @Override
-        public Event<?> getEvent() {
+        public Event getEvent() {
                 FileEqualsReplay replay = new FileEqualsReplay(expectedText.getText(), actualText.getText());
-                AssertEvent<FileEqualsReplay> event = new AssertEvent<FileEqualsReplay>("FileEqualsAssertion");
-                event.addReplayEvent(replay);
+                Event event = new Event(new FileEqualsAssertEvent());
+                event.addReplayable(replay);
                 return event;
         }

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

@@ -14 +14 @@
 
 import de.ugoe.cs.quest.assertions.AssertEvent;
+import de.ugoe.cs.quest.assertions.TextEqualsAssertEventType;
 import de.ugoe.cs.quest.assertions.TextEqualsReplay;
 import de.ugoe.cs.quest.eventcore.Event;
+import de.ugoe.cs.quest.eventcore.IEventTarget;
 import de.ugoe.cs.util.ArrayTools;
 
@@ -98 +100 @@
 
         @Override
-        public Event<?> getEvent() {            
-                String target = targetText.getText();
+        public Event getEvent() {               
+                IEventTarget target = targetText.getText();
                 TextEqualsReplay replay = new TextEqualsReplay(expectedText.getText(), target);
-                AssertEvent<TextEqualsReplay> event = new AssertEvent<TextEqualsReplay>("TextEqualsAssertion");
+                Event event = new Event(new TextEqualsAssertEventType());
                 event.setTarget(target);
-                event.addReplayEvent(replay);
+                event.addReplayable(replay);
                 return event;
         }

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

@@ -27 +27 @@
         
         private List sequenceList;
-        private Collection<java.util.List<Event<?>>> sequences;
+        private Collection<java.util.List<Event>> sequences;
         private SortedSet<String> targets;
         
@@ -85 +85 @@
                                         EditSequenceDialog editSequenceDialog = new EditSequenceDialog(shell, SWT.NONE, targets);
                                         int counter = 0;
-                                        java.util.List<Event<?>> selectedSequence = null;
-                                        for( java.util.List<Event<?>> sequence : sequences ) {
+                                        java.util.List<Event> selectedSequence = null;
+                                        for( java.util.List<Event> sequence : sequences ) {
                                                 if( counter==index ) {
                                                         selectedSequence = sequence;
@@ -116 +116 @@
                 Object dataObject = GlobalDataContainer.getInstance().getData(sequencesName);
                 if( SequenceInstanceOf.isCollectionOfSequences(dataObject)) {
-                        sequences = (Collection<java.util.List<Event<?>>>) dataObject;
+                        sequences = (Collection<java.util.List<Event>>) dataObject;
                         int seqDigits = Integer.toString(sequences.size()).length();
                         int counter = 1;
-                        for( java.util.List<Event<?>> sequence : sequences ) {
+                        for( java.util.List<Event> sequence : sequences ) {
                                 String seqName = "#"+String.format("%0"+seqDigits+"d", counter)+": "+sequence.size();
                                 sequenceList.add(seqName);
@@ -135 +135 @@
                         if( targets==null ) {
                                 targets = new TreeSet<String>();
-                                for( java.util.List<Event<?>> sequence : sequences ) {
-                                        for( Event<?> event : sequence ) {
+                                for( java.util.List<Event> sequence : sequences ) {
+                                        for( Event event : sequence ) {
                                                 String target = event.getTarget();
                                                 if( target!=null ) {