Changeset 389 for trunk

Timestamp:

02/20/12 11:53:24 (13 years ago)

Author:

sherbold

Message:

• the commands parseDirJFC and parseJFC now pre-compute the equality of JFC target strings after loading data.
• focus events now filtered from models

Location:

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/jfc

Files:

• JFCLogParser.java (modified) (2 diffs)
• commands/CMDparseDirJFC.java (modified) (3 diffs)
• commands/CMDparseJFC.java (modified) (2 diffs)

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

@@ -1 +1 @@
 package de.ugoe.cs.eventbench.jfc;
 
+import java.awt.event.FocusEvent;
 import java.awt.event.MouseEvent;
 import java.io.File;
@@ -106 +107 @@
                 eventFilter.add(MouseEvent.MOUSE_PRESSED);
                 eventFilter.add(MouseEvent.MOUSE_RELEASED);
+                eventFilter.add(FocusEvent.FOCUS_GAINED);
         }
 

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/jfc/commands/CMDparseDirJFC.java

@@ -10 +10 @@
 import de.ugoe.cs.eventbench.jfc.JFCLogParser;
 import de.ugoe.cs.eventbench.jfc.data.JFCEvent;
+import de.ugoe.cs.eventbench.jfc.data.JFCTargetComparator;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
@@ -50 +51 @@
                 }
 
+                JFCTargetComparator.setMutable(true);
                 JFCLogParser parser = new JFCLogParser();
 
@@ -61 +63 @@
 
                 Collection<List<JFCEvent>> sequences = parser.getSequences();
+                Console.traceln("Pre-computing event target equalities.");
+                JFCTargetComparator.setMutable(false);
 
                 if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) {

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/jfc/commands/CMDparseJFC.java

@@ -9 +9 @@
 import de.ugoe.cs.eventbench.jfc.JFCLogParser;
 import de.ugoe.cs.eventbench.jfc.data.JFCEvent;
+import de.ugoe.cs.eventbench.jfc.data.JFCTargetComparator;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
@@ -41 +42 @@
                         throw new InvalidParameterException();
                 }
-
+                JFCTargetComparator.setMutable(true);
                 JFCLogParser parser = new JFCLogParser();
-
+                
                 parser.parseFile(filename);
+                
+                Console.traceln("Pre-computing event target equalities.");
+                JFCTargetComparator.setMutable(false);
 
                 Collection<List<JFCEvent>> sequences = parser.getSequences();