Index: /trunk/quest-core-tasktrees-test/src/test/java/de/ugoe/cs/quest/tasktrees/manager/TaskTreeManagerTest.java =================================================================== --- /trunk/quest-core-tasktrees-test/src/test/java/de/ugoe/cs/quest/tasktrees/manager/TaskTreeManagerTest.java (revision 724) +++ /trunk/quest-core-tasktrees-test/src/test/java/de/ugoe/cs/quest/tasktrees/manager/TaskTreeManagerTest.java (revision 725) @@ -1,5 +1,5 @@ package de.ugoe.cs.quest.tasktrees.manager; -import java.util.logging.Logger; +import java.util.logging.Level; import org.junit.After; @@ -10,8 +10,8 @@ import de.ugoe.cs.quest.eventcore.IEventTarget; import de.ugoe.cs.quest.eventcore.IEventType; -import de.ugoe.cs.quest.tasktrees.testutils.SimpleLogFormatter; import de.ugoe.cs.quest.tasktrees.testutils.TaskTreeChecker; import de.ugoe.cs.quest.test.DummyGUIElement; import de.ugoe.cs.quest.test.DummyInteraction; +import de.ugoe.cs.util.console.TextConsole; /** @@ -31,6 +31,5 @@ @Before public void setUp() { - Logger.getLogger("").getHandlers()[0].setFormatter(new SimpleLogFormatter()); - + new TextConsole(Level.FINEST); manager = new TaskTreeManager(); } Index: /trunk/quest-core-tasktrees-test/src/test/java/de/ugoe/cs/quest/tasktrees/temporalrelation/AbstractTemporalRelationshipTC.java =================================================================== --- /trunk/quest-core-tasktrees-test/src/test/java/de/ugoe/cs/quest/tasktrees/temporalrelation/AbstractTemporalRelationshipTC.java (revision 724) +++ /trunk/quest-core-tasktrees-test/src/test/java/de/ugoe/cs/quest/tasktrees/temporalrelation/AbstractTemporalRelationshipTC.java (revision 725) @@ -3,5 +3,5 @@ import java.util.ArrayList; import java.util.List; -import java.util.logging.Logger; +import java.util.logging.Level; import org.junit.Before; @@ -10,5 +10,4 @@ import de.ugoe.cs.quest.eventcore.IEventType; import de.ugoe.cs.quest.tasktrees.nodeequality.NodeEqualityRuleManager; -import de.ugoe.cs.quest.tasktrees.testutils.SimpleLogFormatter; import de.ugoe.cs.quest.tasktrees.testutils.Utilities; import de.ugoe.cs.quest.tasktrees.treeifc.IEventTask; @@ -19,4 +18,5 @@ import de.ugoe.cs.quest.tasktrees.treeimpl.TaskTreeBuilder; import de.ugoe.cs.quest.tasktrees.treeimpl.TaskTreeNodeFactory; +import de.ugoe.cs.util.console.TextConsole; /** @@ -46,5 +46,5 @@ @Before public void setUp() { - Logger.getLogger("").getHandlers()[0].setFormatter(new SimpleLogFormatter()); + new TextConsole(Level.FINEST); events = new ArrayList(); } Index: unk/quest-core-tasktrees-test/src/test/java/de/ugoe/cs/quest/tasktrees/testutils/SimpleLogFormatter.java =================================================================== --- /trunk/quest-core-tasktrees-test/src/test/java/de/ugoe/cs/quest/tasktrees/testutils/SimpleLogFormatter.java (revision 724) +++ (revision ) @@ -1,65 +1,0 @@ -package de.ugoe.cs.quest.tasktrees.testutils; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintStream; -import java.text.SimpleDateFormat; -import java.util.logging.Formatter; -import java.util.logging.LogRecord; - -/** - * TODO comment - * - * @version $Revision: $ $Date: $ - * @author 2011, last modified by $Author: $ - */ -public class SimpleLogFormatter extends Formatter { - - /** - * - */ - @Override - public String format(LogRecord record) { - StringBuffer result = new StringBuffer(); - result.append(record.getLevel().getName().charAt(0)); - result.append(" | "); - result.append(new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss,SSS").format(record.getMillis())); - result.append(" | "); - tailValue("" + record.getThreadID(), 6, result); - result.append(" | "); - tailValue(record.getLoggerName(), 30, result); - result.append(" | "); - result.append(record.getMessage()); - - if (record.getThrown() != null) { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - record.getThrown().printStackTrace(new PrintStream(out)); - result.append("\n"); - result.append(out.toString()); - try { - out.close(); - } - catch (IOException e) { - // ignore - } - } - - result.append("\n"); - - return result.toString(); - } - - /** - * - */ - private void tailValue(String value, int length, StringBuffer output) { - for (int i = value.length() - length - 1; i < value.length(); i++) { - if (i < 0) { - output.append(" "); - } - else { - output.append(value.charAt(i)); - } - } - } -} Index: /trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/manager/TaskTreeManager.java =================================================================== --- /trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/manager/TaskTreeManager.java (revision 724) +++ /trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/manager/TaskTreeManager.java (revision 725) @@ -1,5 +1,5 @@ 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,4 +11,5 @@ import de.ugoe.cs.quest.tasktrees.treeifc.ITaskTreeNode; import de.ugoe.cs.quest.tasktrees.treeifc.ITaskTreeNodeFactory; +import de.ugoe.cs.util.console.Console; /** @@ -22,7 +23,4 @@ /** */ private static final int MAX_EVENTS_TILL_RULE_APPLICATION = 100; - - /** */ - private static Logger LOG = Logger.getLogger(TaskTreeManager.class.getName()); /** */ @@ -51,5 +49,5 @@ */ public void handleNewEvent(Event event) { - addEventTask(taskTreeNodeFactory.createNewEventTask(event.getType(), event.getTarget())); + handleEventTask(taskTreeNodeFactory.createNewEventTask(event.getType(), event.getTarget())); } @@ -58,5 +56,5 @@ */ 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,11 +66,4 @@ /** - * @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,7 +71,7 @@ * 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,5 +88,5 @@ 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, Index: /trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/nodeequality/NodeEqualityRuleManager.java =================================================================== --- /trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/nodeequality/NodeEqualityRuleManager.java (revision 724) +++ /trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/nodeequality/NodeEqualityRuleManager.java (revision 725) @@ -20,7 +20,4 @@ */ public class NodeEqualityRuleManager { - - /** */ - // private static Logger LOG = Logger.getLogger(NodeEqualityRuleManager.class.getName()); /** */ Index: /trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/TemporalRelationshipRuleManager.java =================================================================== --- /trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/TemporalRelationshipRuleManager.java (revision 724) +++ /trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/TemporalRelationshipRuleManager.java (revision 725) @@ -3,5 +3,5 @@ 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,4 +9,5 @@ import de.ugoe.cs.quest.tasktrees.treeifc.ITaskTreeNode; import de.ugoe.cs.quest.tasktrees.treeifc.ITaskTreeNodeFactory; +import de.ugoe.cs.util.console.Console; /** @@ -18,7 +19,4 @@ public class TemporalRelationshipRuleManager { - /** */ - private static Logger LOG = Logger.getLogger(TemporalRelationshipRuleManager.class.getName()); - /** */ private NodeEqualityRuleManager nodeEqualityRuleManager; @@ -41,6 +39,4 @@ */ public void init() { - LOG.info("initializing"); - ruleIndex.add(new DefaultEventTargetSequenceDetectionRule()); ruleIndex.add(new TrackBarSelectionDetectionRule(nodeEqualityRuleManager)); @@ -79,5 +75,5 @@ String logIndent) { - LOG.info(logIndent + "applying rules for " + parent); + Console.traceln(Level.FINER, logIndent + "applying rules for " + parent); int noOfRuleApplications = 0; @@ -93,5 +89,6 @@ RuleApplicationStatus.RULE_APPLICATION_FINISHED)) { - LOG.info(logIndent + "applied rule " + rule + " on " + parent); + Console.traceln + (Level.FINE, logIndent + "applied rule " + rule + " on " + parent); noOfRuleApplications++; @@ -117,5 +114,6 @@ 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"); } Index: /trunk/quest-core-usability-test/src/test/java/de/ugoe/cs/quest/usability/AbstractUsabilityEvaluationTC.java =================================================================== --- /trunk/quest-core-usability-test/src/test/java/de/ugoe/cs/quest/usability/AbstractUsabilityEvaluationTC.java (revision 724) +++ /trunk/quest-core-usability-test/src/test/java/de/ugoe/cs/quest/usability/AbstractUsabilityEvaluationTC.java (revision 725) @@ -5,5 +5,5 @@ import java.util.ArrayList; -import java.util.logging.Logger; +import java.util.logging.Level; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -13,5 +13,4 @@ import de.ugoe.cs.quest.eventcore.Event; import de.ugoe.cs.quest.eventcore.gui.TextInput; -import de.ugoe.cs.quest.tasktrees.testutils.SimpleLogFormatter; import de.ugoe.cs.quest.tasktrees.treeifc.IEventTask; import de.ugoe.cs.quest.tasktrees.treeifc.IIteration; @@ -27,4 +26,5 @@ import de.ugoe.cs.quest.test.DummyInteraction; import de.ugoe.cs.quest.test.DummyTextField; +import de.ugoe.cs.util.console.TextConsole; /** @@ -47,5 +47,5 @@ @Before public void setUp() { - Logger.getLogger("").getHandlers()[0].setFormatter(new SimpleLogFormatter()); + new TextConsole(Level.FINEST); } Index: /trunk/quest-core-usability/src/main/java/de/ugoe/cs/quest/usability/UsabilityEvaluationManager.java =================================================================== --- /trunk/quest-core-usability/src/main/java/de/ugoe/cs/quest/usability/UsabilityEvaluationManager.java (revision 724) +++ /trunk/quest-core-usability/src/main/java/de/ugoe/cs/quest/usability/UsabilityEvaluationManager.java (revision 725) @@ -3,7 +3,8 @@ import java.util.ArrayList; import java.util.List; -import java.util.logging.Logger; +import java.util.logging.Level; import de.ugoe.cs.quest.tasktrees.treeifc.ITaskTree; +import de.ugoe.cs.util.console.Console; /** @@ -15,7 +16,4 @@ public class UsabilityEvaluationManager { - /** */ - private static Logger LOG = Logger.getLogger(UsabilityEvaluationManager.class.getName()); - /** */ private List rules = new ArrayList(); @@ -44,19 +42,20 @@ */ public UsabilityEvaluationResult evaluateUsability(ITaskTree taskTree) { - LOG.info("evaluating usability of task tree " + taskTree); + Console.traceln(Level.INFO, "evaluating usability of task tree " + taskTree); List results = new ArrayList(); for (UsabilityEvaluationRule rule : rules) { - LOG.info("applying rule " + rule.getClass().getSimpleName()); + Console.traceln(Level.INFO, "applying rule " + rule.getClass().getSimpleName()); UsabilityEvaluationResult result = rule.evaluate(taskTree); results.add(result); - LOG.info("the rule found " + result.getAllDefects().size() + " usability defects, of " + - "which " + result.getSevereDefects().size() + " are severe."); + Console.traceln(Level.INFO, "the rule found " + result.getAllDefects().size() + + " usability defects, of which " + result.getSevereDefects().size() + + " are severe."); } UsabilityEvaluationResult result = mergeResults(results); - LOG.info("the evaluation result contains " + result.getAllDefects().size() + - " defects, of which " + result.getSevereDefects().size() + " are severe."); + Console.println("the evaluation result contains " + result.getAllDefects().size() + + " defects, of which " + result.getSevereDefects().size() + " are severe."); return result; } Index: /trunk/quest-misc-test/src/test/java/de/ugoe/cs/tasktree/keyboardmaps/KeyboardMapTest.java =================================================================== --- /trunk/quest-misc-test/src/test/java/de/ugoe/cs/tasktree/keyboardmaps/KeyboardMapTest.java (revision 724) +++ /trunk/quest-misc-test/src/test/java/de/ugoe/cs/tasktree/keyboardmaps/KeyboardMapTest.java (revision 725) @@ -4,7 +4,10 @@ import java.util.Locale; +import java.util.logging.Level; import org.junit.Before; import org.junit.Test; + +import de.ugoe.cs.util.console.TextConsole; /** @@ -21,5 +24,5 @@ @Before public void setUp() { - // Logger.getLogger("").getHandlers()[0].setFormatter(new SimpleLogFormatter()); + new TextConsole(Level.FINEST); } Index: /trunk/quest-misc/src/main/java/de/ugoe/cs/tasktree/keyboardmaps/KeyboardMap.java =================================================================== --- /trunk/quest-misc/src/main/java/de/ugoe/cs/tasktree/keyboardmaps/KeyboardMap.java (revision 724) +++ /trunk/quest-misc/src/main/java/de/ugoe/cs/tasktree/keyboardmaps/KeyboardMap.java (revision 725) @@ -12,5 +12,6 @@ import java.util.Map; import java.util.logging.Level; -import java.util.logging.Logger; + +import de.ugoe.cs.util.console.Console; /** @@ -21,7 +22,4 @@ */ public class KeyboardMap { - - /** */ - private static Logger LOG = Logger.getLogger(KeyboardMap.class.getName()); /** */ @@ -110,5 +108,5 @@ */ void init() throws IllegalArgumentException { - LOG.info("initializing keymap for locale " + locale); + Console.traceln(Level.FINE, "initializing keymap for locale " + locale); List deadKeySequences = new ArrayList(); @@ -116,6 +114,6 @@ readStream(getStream(fileName), deadKeySequences, keyStrokes); - LOG.info("read " + keyStrokes.size() + " key strokes and " + deadKeySequences.size() + - " dead key sequences"); + Console.traceln(Level.FINER, "read " + keyStrokes.size() + " key strokes and " + + deadKeySequences.size() + " dead key sequences"); VirtualKeySynonyms virtualKeySynonyms = determineVirtualKeySynonyms(keyStrokes); @@ -135,5 +133,6 @@ */ private InputStream getStream(String name) { - LOG.info("reading keymap for locale " + locale + " from resource keymaps/" + name); + Console.traceln + (Level.FINER, "reading keymap for locale " + locale + " from resource keymaps/" + name); InputStream stream = @@ -164,5 +163,5 @@ } catch (UnsupportedEncodingException e) { - LOG.log(Level.WARNING, "no keyboard map available for locale " + locale, e); + Console.traceln(Level.WARNING, "no keyboard map available for locale " + locale); throw new IllegalArgumentException ("provided stream can not be read due to invalid encoding", e); @@ -178,5 +177,5 @@ } catch (IOException e) { - LOG.log(Level.WARNING, "no keyboard map available for locale " + locale, e); + Console.traceln(Level.WARNING, "no keyboard map available for locale " + locale); throw new IllegalArgumentException("no keyboard map available for locale " + locale, e); } @@ -186,5 +185,6 @@ } catch (IOException e) { - LOG.warning("could not close input stream for reading keyboard map"); + Console.traceln + (Level.WARNING, "could not close input stream for reading keyboard map"); } } @@ -235,6 +235,7 @@ for (int i = 0; i < keyStrokes.size(); i++) { if (keyStrokes.get(i)[0].equals(values[0])) { - LOG.finest("replacing key stroke " + values[0] + " with former keyid " + - keyStrokes.get(i)[1] + " with new key id " + values[1]); + Console.traceln(Level.FINEST, "replacing key stroke " + values[0] + + " with former keyid " + keyStrokes.get(i)[1] + + " with new key id " + values[1]); keyStrokes.set(i, values); alreadyAdded = true; @@ -256,5 +257,5 @@ */ private VirtualKeySynonyms determineVirtualKeySynonyms(List keyStrokes) { - LOG.info("determining virtual keys and synonyms for the keymap"); + Console.traceln(Level.FINER, "determining virtual keys and synonyms for the keymap"); VirtualKeySynonyms virtualKeySynonyms = new VirtualKeySynonyms(); @@ -280,6 +281,7 @@ for (String[] unmatchedKeyStroke : unmatchedKeyStrokes) { if (!virtualKeySynonyms.containsKey(getKeyId(unmatchedKeyStroke[1]))) { - LOG.finest("no virtual key mapped to key stroke " + unmatchedKeyStroke[0] + "(" + - unmatchedKeyStroke[1] + ") of keyboard map for locale " + locale); + Console.traceln(Level.FINEST, "no virtual key mapped to key stroke " + + unmatchedKeyStroke[0] + "(" + unmatchedKeyStroke[1] + + ") of keyboard map for locale " + locale); } } @@ -360,6 +362,7 @@ } else { - LOG.severe("unknown condition " + values[i] + " specified for key stroke " + - keyStrokeName + " through keyboard map for locale " + locale); + Console.traceln(Level.SEVERE, "unknown condition " + values[i] + + " specified for key stroke " + keyStrokeName + + " through keyboard map for locale " + locale); throw new IllegalArgumentException ("no keyboard map available for locale " + locale); @@ -400,6 +403,6 @@ if (virtualKeys == null) { - LOG.severe("no virtual key mapped to key stroke " + keyStrokeName + - " of keyboard map for locale " + locale); + Console.traceln(Level.SEVERE, "no virtual key mapped to key stroke " + keyStrokeName + + " of keyboard map for locale " + locale); // throw new IllegalArgumentException("no keyboard map available for locale " + // mLocale); @@ -1017,6 +1020,6 @@ } else { - LOG.finest("unknown virtual key for key stroke " + keyStrokeName + - " specified through " + "keyboard map for locale " + locale); + Console.traceln(Level.FINEST, "unknown virtual key for key stroke " + keyStrokeName + + " specified through " + "keyboard map for locale " + locale); return null; @@ -2015,6 +2018,6 @@ } else { - LOG.severe("unknown key stroke name " + keyStrokeName + - " specified through keyboard map " + "for locale " + locale); + Console.traceln(Level.SEVERE, "unknown key stroke name " + keyStrokeName + + " specified through keyboard map " + "for locale " + locale); // if (shift) Index: /trunk/quest-misc/src/main/java/de/ugoe/cs/tasktree/keyboardmaps/VirtualKeySynonyms.java =================================================================== --- /trunk/quest-misc/src/main/java/de/ugoe/cs/tasktree/keyboardmaps/VirtualKeySynonyms.java (revision 724) +++ /trunk/quest-misc/src/main/java/de/ugoe/cs/tasktree/keyboardmaps/VirtualKeySynonyms.java (revision 725) @@ -5,5 +5,7 @@ import java.util.List; import java.util.Map; -import java.util.logging.Logger; +import java.util.logging.Level; + +import de.ugoe.cs.util.console.Console; /** @@ -15,7 +17,4 @@ class VirtualKeySynonyms { - /** */ - private static Logger LOG = Logger.getLogger(KeyboardMap.class.getName()); - /** */ private Map> synonyms = new HashMap>(); @@ -46,7 +45,7 @@ if ((existingKeyId != null) && (existingKeyId != keyId)) { - LOG.finest("virtual key " + virtualKey + - " is mapped to more than one key id (current is " + existingKeyId + - ", new is " + keyId + "). New key id will be used (" + keyId + ")."); + Console.traceln(Level.FINEST, "virtual key " + virtualKey + " is mapped to more " + + "than one key id (current is " + existingKeyId + ", new is " + keyId + + "). New key id will be used (" + keyId + ")."); } @@ -73,5 +72,5 @@ } else { - LOG.warning("no virtual key define for key id " + keyId); + Console.traceln(Level.WARNING, "no virtual key define for key id " + keyId); return null; } Index: /trunk/quest-plugin-jfc-test/src/test/java/de/ugoe/cs/quest/plugin/jfc/JFCLogParserTest.java =================================================================== --- /trunk/quest-plugin-jfc-test/src/test/java/de/ugoe/cs/quest/plugin/jfc/JFCLogParserTest.java (revision 724) +++ /trunk/quest-plugin-jfc-test/src/test/java/de/ugoe/cs/quest/plugin/jfc/JFCLogParserTest.java (revision 725) @@ -7,4 +7,5 @@ import java.util.Collection; import java.util.List; +import java.util.logging.Level; import org.junit.Before; @@ -15,4 +16,5 @@ import de.ugoe.cs.quest.eventcore.guimodel.IGUIElement; import de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement; +import de.ugoe.cs.util.console.TextConsole; /** @@ -29,5 +31,5 @@ @Before public void setUp() { - // Logger.getLogger("").getHandlers()[0].setFormatter(new SimpleLogFormatter()); + new TextConsole(Level.FINEST); }