Changeset 852

Timestamp:

10/01/12 13:08:31 (12 years ago)

Author:

sherbold

Message:

• renamed KeyInteractionSorter? to KeyInteractionCorrector?

Location:

trunk

Files:

• quest-core-events-test/src/test/java/de/ugoe/cs/quest/eventcore/gui/KeyInteractionCorrectorTest.java (moved) (moved from trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/eventcore/gui/KeyInteractionSorterTest.java) (16 diffs)
• quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/gui/KeyInteractionCorrector.java (moved) (moved from trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/gui/KeyInteractionSorter.java) (5 diffs)
• quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDsortKeyInteractions.java (modified) (2 diffs)

trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/eventcore/gui/KeyInteractionCorrectorTest.java

@@ -13 +13 @@
 
 import de.ugoe.cs.quest.eventcore.Event;
-import de.ugoe.cs.quest.eventcore.gui.KeyInteractionSorter.CleanupMode;
+import de.ugoe.cs.quest.eventcore.gui.KeyInteractionCorrector.CleanupMode;
 import de.ugoe.cs.quest.eventcore.gui.MouseButtonInteraction.Button;
 import de.ugoe.cs.quest.eventcore.guimodel.IGUIElement;
@@ -23 +23 @@
  * @author Patrick Harms, Steffen Herbold
  */
-public class KeyInteractionSorterTest {
+public class KeyInteractionCorrectorTest {
 
     @Test
@@ -30 +30 @@
         List<Event> expected = new LinkedList<Event>();
 
-        KeyInteractionSorter sorter = new KeyInteractionSorter();
+        KeyInteractionCorrector sorter = new KeyInteractionCorrector();
 
         IGUIElement guiElement = mock(IGUIElement.class);
@@ -53 +53 @@
         List<Event> expected = new LinkedList<Event>();
 
-        KeyInteractionSorter sorter = new KeyInteractionSorter();
+        KeyInteractionCorrector sorter = new KeyInteractionCorrector();
 
         IGUIElement guiElement = mock(IGUIElement.class);
@@ -76 +76 @@
         List<Event> expected = new LinkedList<Event>();
 
-        KeyInteractionSorter sorter = new KeyInteractionSorter();
+        KeyInteractionCorrector sorter = new KeyInteractionCorrector();
 
         IGUIElement guiElement = mock(IGUIElement.class);
@@ -103 +103 @@
         List<Event> expected = new LinkedList<Event>();
 
-        KeyInteractionSorter sorter = new KeyInteractionSorter();
+        KeyInteractionCorrector sorter = new KeyInteractionCorrector();
 
         IGUIElement guiElement = mock(IGUIElement.class);
@@ -130 +130 @@
         List<Event> expected = new LinkedList<Event>();
 
-        KeyInteractionSorter sorter = new KeyInteractionSorter();
+        KeyInteractionCorrector sorter = new KeyInteractionCorrector();
 
         IGUIElement guiElement = mock(IGUIElement.class);
@@ -160 +160 @@
         List<Event> expected = new LinkedList<Event>();
 
-        KeyInteractionSorter sorter = new KeyInteractionSorter();
+        KeyInteractionCorrector sorter = new KeyInteractionCorrector();
 
         IGUIElement guiElement = mock(IGUIElement.class);
@@ -195 +195 @@
         List<Event> expected = new LinkedList<Event>();
 
-        KeyInteractionSorter sorter = new KeyInteractionSorter();
+        KeyInteractionCorrector sorter = new KeyInteractionCorrector();
 
         IGUIElement guiElement = mock(IGUIElement.class);
@@ -230 +230 @@
         List<Event> expected = new LinkedList<Event>();
 
-        KeyInteractionSorter sorter = new KeyInteractionSorter();
+        KeyInteractionCorrector sorter = new KeyInteractionCorrector();
 
         IGUIElement guiElement = mock(IGUIElement.class);
@@ -269 +269 @@
         List<Event> expected = new LinkedList<Event>();
 
-        KeyInteractionSorter sorter = new KeyInteractionSorter();
+        KeyInteractionCorrector sorter = new KeyInteractionCorrector();
 
         IGUIElement guiElement = mock(IGUIElement.class);
@@ -305 +305 @@
         List<Event> expected = new LinkedList<Event>();
 
-        KeyInteractionSorter sorter = new KeyInteractionSorter();
+        KeyInteractionCorrector sorter = new KeyInteractionCorrector();
 
         IGUIElement guiElement = mock(IGUIElement.class);
@@ -337 +337 @@
         List<Event> expected = new LinkedList<Event>();
 
-        KeyInteractionSorter sorter = new KeyInteractionSorter();
+        KeyInteractionCorrector sorter = new KeyInteractionCorrector();
 
         IGUIElement guiElement = mock(IGUIElement.class);
@@ -361 +361 @@
         List<Event> expected = new LinkedList<Event>();
 
-        KeyInteractionSorter sorter = new KeyInteractionSorter();
+        KeyInteractionCorrector sorter = new KeyInteractionCorrector();
 
         IGUIElement guiElement = mock(IGUIElement.class);
@@ -387 +387 @@
         List<Event> expected = new LinkedList<Event>();
 
-        KeyInteractionSorter sorter = new KeyInteractionSorter(CleanupMode.REMOVAL);
+        KeyInteractionCorrector sorter = new KeyInteractionCorrector(CleanupMode.REMOVAL);
 
         IGUIElement guiElement = mock(IGUIElement.class);
@@ -408 +408 @@
         List<Event> expected = new LinkedList<Event>();
 
-        KeyInteractionSorter sorter = new KeyInteractionSorter(CleanupMode.ADDITION);
+        KeyInteractionCorrector sorter = new KeyInteractionCorrector(CleanupMode.ADDITION);
 
         IGUIElement guiElement = mock(IGUIElement.class);

trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/gui/KeyInteractionCorrector.java

@@ -40 +40 @@
  * @author Steffen Herbold
  */
-public class KeyInteractionSorter {
+public class KeyInteractionCorrector {
 
     /**
@@ -75 +75 @@
     /**
      * <p>
-     * Constructor. Creates a new {@link KeyInteractionSorter} with {@link #mode}=
+     * Constructor. Creates a new {@link KeyInteractionCorrector} with {@link #mode}=
      * {@link CleanupMode#ADDITION}.
      * </p>
      */
-    public KeyInteractionSorter() {
+    public KeyInteractionCorrector() {
         this(CleanupMode.ADDITION);
     }
@@ -85 +85 @@
     /**
      * <p>
-     * Constructor. Creates a new {@link KeyInteractionSorter}.
+     * Constructor. Creates a new {@link KeyInteractionCorrector}.
      * </p>
      * 
@@ -91 +91 @@
      *            {@link #mode} of the instance
      */
-    public KeyInteractionSorter(CleanupMode mode) {
+    public KeyInteractionCorrector(CleanupMode mode) {
         this.mode = mode;
     }
@@ -98 +98 @@
      * <p>
      * Sorts and cleans up key interactions according to the class specification (@see
-     * {@link KeyInteractionSorter} class comment).
+     * {@link KeyInteractionCorrector} class comment).
      * </p>
      * <p>

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

@@ -10 +10 @@
 import de.ugoe.cs.quest.SequenceInstanceOf;
 import de.ugoe.cs.quest.eventcore.Event;
-import de.ugoe.cs.quest.eventcore.gui.KeyInteractionSorter;
-import de.ugoe.cs.quest.eventcore.gui.KeyInteractionSorter.CleanupMode;
+import de.ugoe.cs.quest.eventcore.gui.KeyInteractionCorrector;
+import de.ugoe.cs.quest.eventcore.gui.KeyInteractionCorrector.CleanupMode;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
@@ -110 +110 @@
         for (List<Event> sequence : sequences) {
             Console.traceln(Level.INFO, "Processing sequence " + i++);
-            newSequences.add(new KeyInteractionSorter(mode).sortKeyInteractions(sequence));
+            newSequences.add(new KeyInteractionCorrector(mode).sortKeyInteractions(sequence));
         }