Changeset 765 for trunk/quest-ui-core

Timestamp:

09/04/12 16:12:06 (12 years ago)

Author:

sherbold

Message:

• complete rewrite of keyboard interaction sorting. As a result, the command cleanupKeyInteractions is deprecated.

Location:

trunk/quest-ui-core/src/main

Files:

• java/de/ugoe/cs/quest/commands/sequences/CMDcleanupKeyInteractions.java (deleted)
• java/de/ugoe/cs/quest/commands/sequences/CMDsortKeyInteractions.java (modified) (6 diffs)
• resources/manuals/cleanupKeyInteractions (deleted)

trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDsortKeyInteractions.java

@@ -6 +6 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.logging.Level;
 
 import de.ugoe.cs.quest.CommandHelpers;
 import de.ugoe.cs.quest.SequenceInstanceOf;
 import de.ugoe.cs.quest.eventcore.Event;
-import de.ugoe.cs.quest.eventcore.gui.SortedInteractionEventList;
+import de.ugoe.cs.quest.eventcore.gui.KeyInteractionSorter;
+import de.ugoe.cs.quest.eventcore.gui.KeyInteractionSorter.CleanupMode;
 import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.Console;
 import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
  * <p>
- * Command to sort the key interactions in a sequence of events. An example, the sequence
- * to write the upper case D
+ * Command to sort the key interactions in a sequence of events. An example, the sequence to write
+ * the upper case D
  * <ul>
- *   <li>press shift key</li>
- *   <li>press D key</li>
- *   <li>release shift key</li>
- *   <li>release D key</li>
+ * <li>press shift key</li>
+ * <li>press D key</li>
+ * <li>release shift key</li>
+ * <li>release D key</li>
  * </ul>
  * 
@@ -28 +31 @@
  * 
  * <ul>
- *   <li>press shift key</li>
- *   <li>press D key</li>
- *   <li>release D key</li>
- *   <li>release shift key</li>
+ * <li>press shift key</li>
+ * <li>press D key</li>
+ * <li>release D key</li>
+ * <li>release shift key</li>
  * </ul>
  * 
- * in which the first pressed key (shift in this case) is always released last. The same is done
- * for the alt and the ctrl keys.
+ * in which the first pressed key (shift in this case) is always released last. The same is done for
+ * the alt and the ctrl keys.
  * 
  * </p>
@@ -64 +67 @@
         String sequencesName;
         String newSequencesName;
+        String modeString = "ADDITION";
         try {
             sequencesName = (String) parameters.get(0);
@@ -71 +75 @@
             else {
                 newSequencesName = sequencesName;
+            }
+            if (parameters.size() > 2) {
+                modeString = (String) parameters.get(2);
             }
         }
@@ -88 +95 @@
         }
 
+        CleanupMode mode = null;
+        try {
+            mode = CleanupMode.valueOf(modeString);
+        }
+        catch (IllegalArgumentException e) {
+            Console.printerrln("Invalid mode. Only REMOVAL and ADDITION are allowed values!");
+            return;
+        }
+
         sequences = (Collection<List<Event>>) dataObject;
-        SortedInteractionEventList sortedEventList;
 
         Collection<List<Event>> newSequences = new LinkedList<List<Event>>();
-        
+
+        int i = 1;
         for (List<Event> sequence : sequences) {
-            sortedEventList = new SortedInteractionEventList();
-            
-            for (Event event : sequence) {
-                sortedEventList.add(event);
-            }
-            
-            newSequences.add(sortedEventList);
+            Console.traceln(Level.INFO, "Processing sequence " + i++);
+            newSequences.add(new KeyInteractionSorter(mode).sortKeyInteractions(sequence));
         }
 
@@ -106 +117 @@
             CommandHelpers.dataOverwritten(newSequencesName);
         }
-        
+
     }