Changeset 725 for trunk/quest-core-tasktrees/src/main

Timestamp:

08/31/12 10:27:50 (12 years ago)

Author:

pharms

Message:

• use console for logging instead of logger

Location:

trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees

Files:

• manager/TaskTreeManager.java (modified) (8 diffs)
• nodeequality/NodeEqualityRuleManager.java (modified) (1 diff)
• temporalrelation/TemporalRelationshipRuleManager.java (modified) (7 diffs)

trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/manager/TaskTreeManager.java

@@ -1 +1 @@
 package de.ugoe.cs.quest.tasktrees.manager;
 
-import java.util.logging.Logger;
+import java.util.logging.Level;
 
 import de.ugoe.cs.quest.eventcore.Event;
@@ -11 +11 @@
 import de.ugoe.cs.quest.tasktrees.treeifc.ITaskTreeNode;
 import de.ugoe.cs.quest.tasktrees.treeifc.ITaskTreeNodeFactory;
+import de.ugoe.cs.util.console.Console;
 
 /**
@@ -22 +23 @@
     /** */
     private static final int MAX_EVENTS_TILL_RULE_APPLICATION = 100;
-
-    /** */
-    private static Logger LOG = Logger.getLogger(TaskTreeManager.class.getName());
 
     /** */
@@ -51 +49 @@
      */
     public void handleNewEvent(Event event) {
-        addEventTask(taskTreeNodeFactory.createNewEventTask(event.getType(), event.getTarget()));
+        handleEventTask(taskTreeNodeFactory.createNewEventTask(event.getType(), event.getTarget()));
     }
 
@@ -58 +56 @@
      */
     public synchronized ITaskTree getTaskTree() {
-        LOG.info("applying rules temporal relationship generation rules");
+        Console.traceln(Level.INFO, "applying temporal relationship generation rules");
 
         ISequence currentRootSequence = rootSequence.clone();
@@ -68 +66 @@
 
     /**
-     * @param task
-     */
-    private synchronized void addEventTask(IEventTask task) {
-        handleEventTask(task);
-    }
-
-    /**
      * adds the task to the current or the new sequence. The decision depends on the type of task.
      * If the task finishes the current sequence, the sequence is marked as finished If the task
@@ -80 +71 @@
      * finished. Otherwise it is added to a new sequence.
      */
-    private void handleEventTask(IEventTask eventTask) {
+    private synchronized void handleEventTask(IEventTask eventTask) {
         if (!(eventTask.getEventType() instanceof KeyboardFocusChange)) {
-            LOG.info("handling interaction event task \"" + eventTask + "\"");
+            Console.traceln(Level.INFO, "handling interaction event task \"" + eventTask + "\"");
             addTaskToSequence(eventTask);
         }
@@ -97 +88 @@
             eventsTillRuleApplication = MAX_EVENTS_TILL_RULE_APPLICATION;
 
-            LOG.info("applying rules temporal relationship generation rules");
+            Console.traceln(Level.INFO, "applying temporal relationship generation rules");
             ComponentManager.getTemporalRelationshipRuleManager().applyRules(rootSequence,
                                                                              taskTreeBuilder,

trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/nodeequality/NodeEqualityRuleManager.java

@@ -20 +20 @@
  */
 public class NodeEqualityRuleManager {
-
-    /** */
-    // private static Logger LOG = Logger.getLogger(NodeEqualityRuleManager.class.getName());
 
     /** */

trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/TemporalRelationshipRuleManager.java

@@ -3 +3 @@
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Logger;
+import java.util.logging.Level;
 
 import de.ugoe.cs.quest.tasktrees.nodeequality.NodeEqualityRuleManager;
@@ -9 +9 @@
 import de.ugoe.cs.quest.tasktrees.treeifc.ITaskTreeNode;
 import de.ugoe.cs.quest.tasktrees.treeifc.ITaskTreeNodeFactory;
+import de.ugoe.cs.util.console.Console;
 
 /**
@@ -18 +19 @@
 public class TemporalRelationshipRuleManager {
     
-    /** */
-    private static Logger LOG = Logger.getLogger(TemporalRelationshipRuleManager.class.getName());
-
     /** */
     private NodeEqualityRuleManager nodeEqualityRuleManager;
@@ -41 +39 @@
      */
     public void init() {
-        LOG.info("initializing");
-
         ruleIndex.add(new DefaultEventTargetSequenceDetectionRule());
         ruleIndex.add(new TrackBarSelectionDetectionRule(nodeEqualityRuleManager));
@@ -79 +75 @@
                            String               logIndent)
     {
-        LOG.info(logIndent + "applying rules for " + parent);
+        Console.traceln(Level.FINER, logIndent + "applying rules for " + parent);
 
         int noOfRuleApplications = 0;
@@ -93 +89 @@
                      RuleApplicationStatus.RULE_APPLICATION_FINISHED))
                 {
-                    LOG.info(logIndent + "applied rule " + rule + " on " + parent);
+                    Console.traceln
+                        (Level.FINE, logIndent + "applied rule " + rule + " on " + parent);
                     noOfRuleApplications++;
 
@@ -117 +114 @@
 
         if (noOfRuleApplications <= 0) {
-            LOG.warning(logIndent + "no rules applied --> no temporal relationship generated");
+            Console.traceln(Level.INFO, logIndent + "no rules applied --> no temporal " +
+                            "relationship generated");
         }