Changeset 422 for trunk

Timestamp:

07/16/12 15:12:28 (12 years ago)

Author:

pharms

Message:

Added support for external specification of event filters

File:

• trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/jfc/JFCLogParser.java (modified) (3 diffs)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/jfc/JFCLogParser.java

@@ -94 +94 @@
         /**
          * <p>
-         * Constructor. Creates a new JFCLogParser.
+         * Constructor. Creates a new JFCLogParser with a default event filter.
+         * This ignores focus events, mouse pressed, and mouse released events.
          * </p>
          */
@@ -100 +101 @@
                 sequences = new LinkedList<List<JFCEvent>>();
                 currentSequence = new LinkedList<JFCEvent>();
-                setupEventFilter();
-        }
-
-        private void setupEventFilter() {
+                setupDefaultEventFilter();
+        }
+
+        /**
+         * <p>
+         * Constructor. Creates a new JFCLogParser with a specific event filter.
+         * The events in the provided collection are ignored by the parser.
+         * As events, the constants of the different event classes must be used.
+         * E.g. creating a collection and putting
+         * <code>MouseEvent.MOUSE_PRESSED</code> will cause the parser to ignore
+         * all mouse pressed events. If the provided collection is null, no event
+         * is ignored.
+         * </p>
+         * 
+         * @param ignoredEvents the events to be ignored by the parser, can be null
+         */
+        public JFCLogParser(Collection<Integer> ignoredEvents) {
+                sequences = new LinkedList<List<JFCEvent>>();
+                currentSequence = new LinkedList<JFCEvent>();
+                eventFilter = ignoredEvents;
+        }
+
+        /**
+         * <p>
+         * creates a default event filter that ignores focus changes, mouse pressed
+         * and mouse released events.
+         * </p>
+         */
+        private void setupDefaultEventFilter() {
                 eventFilter = new HashSet<Integer>();
                 eventFilter.add(MouseEvent.MOUSE_PRESSED);
@@ -141 +167 @@
                 } else if (qName.equals("event")) {
                         int eventId = Integer.parseInt(atts.getValue("id"));
-                        if (!eventFilter.contains(eventId)) {
+                        if ((eventFilter == null) || (!eventFilter.contains(eventId))) {
                                 currentEvent = new JFCEvent(atts.getValue("id"));
                                 paramSource = ParamSource.EVENT;