Index: trunk/java-utils/src/main/java/de/ugoe/cs/util/console/CommandExecuter.java =================================================================== --- trunk/java-utils/src/main/java/de/ugoe/cs/util/console/CommandExecuter.java (revision 638) +++ trunk/java-utils/src/main/java/de/ugoe/cs/util/console/CommandExecuter.java (revision 639) @@ -4,4 +4,5 @@ import java.util.ArrayList; import java.util.List; +import java.util.logging.Level; /** @@ -161,5 +162,5 @@ } catch (InstantiationException e) { } catch (ClassCastException e) { - Console.traceln(className + "found, but does not implement Command"); + Console.traceln(Level.WARNING, className + "found, but does not implement Command"); } return cmd; Index: trunk/java-utils/src/main/java/de/ugoe/cs/util/console/defaultcommands/CMDexec.java =================================================================== --- trunk/java-utils/src/main/java/de/ugoe/cs/util/console/defaultcommands/CMDexec.java (revision 638) +++ trunk/java-utils/src/main/java/de/ugoe/cs/util/console/defaultcommands/CMDexec.java (revision 639) @@ -8,4 +8,5 @@ import java.security.InvalidParameterException; import java.util.List; +import java.util.logging.Level; import de.ugoe.cs.util.console.Command; @@ -45,5 +46,5 @@ commands = (new String(buffer)).split("\n"); for (String command : commands) { - Console.traceln(command.trim()); + Console.traceln(Level.INFO, "Executing \"" + command.trim() + "\""); CommandExecuter.getInstance().exec(command); } Index: trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/DrawFromAllSequencesGenerator.java =================================================================== --- trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/DrawFromAllSequencesGenerator.java (revision 638) +++ trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/DrawFromAllSequencesGenerator.java (revision 639) @@ -11,4 +11,5 @@ import java.util.Random; import java.util.Set; +import java.util.logging.Level; import de.ugoe.cs.quest.eventcore.Event; @@ -140,5 +141,5 @@ } } - Console.traceln("" + sequences.size() + " possible"); + Console.traceln(Level.INFO, "" + sequences.size() + " possible"); if (!generateAll && numSequences < sequences.size()) { List probabilities = new ArrayList(sequences.size()); Index: trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/HybridGenerator.java =================================================================== --- trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/HybridGenerator.java (revision 638) +++ trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/HybridGenerator.java (revision 639) @@ -9,4 +9,5 @@ import java.util.List; import java.util.Random; +import java.util.logging.Level; import de.ugoe.cs.quest.eventcore.Event; @@ -110,5 +111,5 @@ new ArrayList>(model.generateSequences(maxLengthAll + 1, true)); - Console.traceln("" + seqsTmp.size() + " of length " + maxLengthAll + " possible"); + Console.traceln(Level.INFO, "" + seqsTmp.size() + " of length " + maxLengthAll + " possible"); List probabilities = new ArrayList(seqsTmp.size()); double probSum = 0.0; Index: trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/FirstOrderMarkovModel.java =================================================================== --- trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/FirstOrderMarkovModel.java (revision 638) +++ trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/FirstOrderMarkovModel.java (revision 639) @@ -7,4 +7,5 @@ import java.util.List; import java.util.Random; +import java.util.logging.Level; import de.ugoe.cs.quest.eventcore.Event; @@ -138,5 +139,5 @@ if (rank != 1) { - Console.traceln("rank: " + rank); + Console.traceln(Level.FINE, "rank: " + rank); Console.printerrln("Unable to calculate stationary distribution."); return Double.NaN; Index: trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgTestCasesToSequences.java =================================================================== --- trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgTestCasesToSequences.java (revision 638) +++ trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgTestCasesToSequences.java (revision 639) @@ -7,4 +7,5 @@ import java.util.LinkedList; import java.util.List; +import java.util.logging.Level; import de.ugoe.cs.quest.CommandHelpers; @@ -61,5 +62,5 @@ } for (File testcaseFile : testcaseFiles) { - Console.traceln("Loading from file " + Console.traceln(Level.INFO, "Loading from file " + testcaseFile.getAbsolutePath()); sequences.add(parser.parseTestCaseFile(testcaseFile)); Index: trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/JFCLogParser.java =================================================================== --- trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/JFCLogParser.java (revision 638) +++ trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/JFCLogParser.java (revision 639) @@ -17,4 +17,5 @@ import java.util.List; import java.util.Map; +import java.util.logging.Level; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -311,5 +312,5 @@ } if (qName.equals("newsession")) { - Console.traceln("start of session"); + Console.traceln(Level.FINE, "start of session"); if (currentSequence != null && !currentSequence.isEmpty()) { // create a copy of the list just to have a correctly typed one. Index: trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDparseDirJFC.java =================================================================== --- trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDparseDirJFC.java (revision 638) +++ trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDparseDirJFC.java (revision 639) @@ -6,4 +6,5 @@ import java.util.Collection; import java.util.List; +import java.util.logging.Level; import de.ugoe.cs.quest.CommandHelpers; @@ -57,5 +58,5 @@ for (String filename : folder.list()) { String source = absolutPath + "/" + filename; - Console.traceln("Processing file: " + source); + Console.traceln(Level.INFO, "Processing file: " + source); parser.parseFile(source); Index: trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDpreprocessDirJFC.java =================================================================== --- trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDpreprocessDirJFC.java (revision 638) +++ trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDpreprocessDirJFC.java (revision 639) @@ -11,4 +11,5 @@ import java.security.InvalidParameterException; import java.util.List; +import java.util.logging.Level; import de.ugoe.cs.util.console.Command; @@ -57,5 +58,5 @@ for (String filename : sourceFolder.list()) { String source = absolutPathSource + "/" + filename; - Console.traceln("Preprocessing file: " + source); + Console.traceln(Level.INFO, "Preprocessing file: " + source); File file = new File(source); InputStreamReader reader; @@ -85,5 +86,5 @@ + filename.substring(0, index) + ".xml"; - Console.traceln(" Saving as: " + target); + Console.traceln(Level.INFO, " Saving as: " + target); OutputStreamWriter writer; Index: trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/EventGenerator.java =================================================================== --- trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/EventGenerator.java (revision 638) +++ trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/EventGenerator.java (revision 639) @@ -12,4 +12,5 @@ import java.util.Map; import java.util.NoSuchElementException; +import java.util.logging.Level; import org.jdom.Document; @@ -192,5 +193,5 @@ } - Console.traceln(currentEvent.getType().toString() + " matched"); + Console.traceln(Level.FINE, currentEvent.getType().toString() + " matched"); } else { @@ -199,5 +200,5 @@ } if (!isMatch) { - Console.traceln("no match found for sequence: " + sequence.toString()); + Console.traceln(Level.WARNING, "no match found for sequence: " + sequence.toString()); } @@ -905,5 +906,5 @@ int index = target.lastIndexOf("<"); if (index == 0) { - Console.traceln("Trying to adress parent of top-level window! Replay " + + Console.traceln(Level.WARNING, "Trying to adress parent of top-level window! Replay " + "probably invalid!"); } Index: trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/LogPreprocessor.java =================================================================== --- trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/LogPreprocessor.java (revision 638) +++ trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/LogPreprocessor.java (revision 639) @@ -6,4 +6,5 @@ import java.io.IOException; import java.io.OutputStreamWriter; +import java.util.logging.Level; import org.apache.commons.codec.binary.Base64; @@ -130,5 +131,5 @@ for (String filename : folder.list()) { String source = absolutPath + "/" + filename; - Console.traceln("Processing file: " + source); + Console.traceln(Level.INFO, "Processing file: " + source); processFile(source, targetFile); } Index: trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/MFCLogParser.java =================================================================== --- trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/MFCLogParser.java (revision 638) +++ trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/MFCLogParser.java (revision 639) @@ -15,4 +15,5 @@ import java.util.SortedMap; import java.util.TreeMap; +import java.util.logging.Level; import javax.xml.parsers.ParserConfigurationException; @@ -250,5 +251,5 @@ { if (qName.equals("session")) { - Console.traceln("start of session"); + Console.traceln(Level.FINE, "start of session"); // in some logs, the session end may be marked in between the log. This is because // of thread problems. So instead of creating a new GUI model, preserve it. @@ -332,5 +333,5 @@ } catch (InvalidParameterException e) { - Console.traceln(e.getMessage() + " WindowsMessage " + currentMessageType + + Console.traceln(Level.WARNING, e.getMessage() + " WindowsMessage " + currentMessageType + " ignored."); } @@ -343,5 +344,5 @@ sequences.add(seq); } - Console.traceln("end of session"); + Console.traceln(Level.FINE, "end of session"); } } Index: trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/SequenceSplitter.java =================================================================== --- trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/SequenceSplitter.java (revision 638) +++ trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/SequenceSplitter.java (revision 639) @@ -4,4 +4,5 @@ import java.util.LinkedList; import java.util.List; +import java.util.logging.Level; import de.ugoe.cs.quest.eventcore.Event; @@ -97,5 +98,5 @@ if (msg.getType().isKeyMessage() && openDowns > 0) { Console - .traceln("Key message found with open down mouse messages - will probabably result in a faulty sequence."); + .traceln(Level.SEVERE, "Key message found with open down mouse messages - will probabably result in a faulty sequence."); } } Index: trunk/quest-plugin-php/src/main/java/de/ugoe/cs/quest/plugin/php/WeblogParser.java =================================================================== --- trunk/quest-plugin-php/src/main/java/de/ugoe/cs/quest/plugin/php/WeblogParser.java (revision 638) +++ trunk/quest-plugin-php/src/main/java/de/ugoe/cs/quest/plugin/php/WeblogParser.java (revision 639) @@ -15,4 +15,5 @@ import java.util.Map; import java.util.Set; +import java.util.logging.Level; import de.ugoe.cs.quest.eventcore.Event; @@ -339,16 +340,16 @@ cookieTimestampMap.put(cookie, timestamp); } catch (URISyntaxException e) { - Console.traceln("Ignored line " + lineCounter + ": " + Console.traceln(Level.FINE, "Ignored line " + lineCounter + ": " + e.getMessage()); } } } - Console.traceln("" + sequences.size() + " user sequences found"); + Console.traceln(Level.INFO, "" + sequences.size() + " user sequences found"); pruneSequences(); - Console.traceln("" + sequences.size() + Console.traceln(Level.INFO, "" + sequences.size() + " remaining after pruning of sequences shorter than " + minLength); Set uniqueUsers = new HashSet(users); - Console.traceln("" + uniqueUsers.size() + " unique users"); + Console.traceln(Level.INFO, "" + uniqueUsers.size() + " unique users"); if (frequentUsersThreshold > 0) { generateFrequentUserSequences(uniqueUsers); @@ -386,5 +387,5 @@ } } - Console.traceln("" + frequentUsers.size() + " users with more than " + Console.traceln(Level.INFO, "" + frequentUsers.size() + " users with more than " + frequentUsersThreshold + " sequences"); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/CommandHelpers.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/CommandHelpers.java (revision 638) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/CommandHelpers.java (revision 639) @@ -1,3 +1,5 @@ package de.ugoe.cs.quest; + +import java.util.logging.Level; import de.ugoe.cs.util.console.Console; @@ -50,5 +52,5 @@ */ public static void dataOverwritten(String objectName) { - Console.traceln("Existing object " + objectName + " overwritten."); + Console.traceln(Level.INFO, "Existing object " + objectName + " overwritten."); } } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ReplayGenerator.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ReplayGenerator.java (revision 638) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ReplayGenerator.java (revision 639) @@ -8,4 +8,5 @@ import java.util.Collection; import java.util.List; +import java.util.logging.Level; import de.ugoe.cs.quest.IReplayDecorator; @@ -137,8 +138,8 @@ fileCreated = file.createNewFile(); if (!fileCreated) { - Console.traceln("Created logfile " + filename); + Console.traceln(Level.INFO, "Created logfile " + filename); } else { - Console.traceln("Overwrote existing logfile " + filename); + Console.traceln(Level.INFO, "Overwrote existing logfile " + filename); } } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateGreedy.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateGreedy.java (revision 638) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateGreedy.java (revision 639) @@ -9,4 +9,5 @@ import java.util.Map; import java.util.Set; +import java.util.logging.Level; import de.ugoe.cs.quest.CommandHelpers; @@ -86,5 +87,5 @@ } } - Console.traceln("" + allSequences.size() + " possible"); + Console.traceln(Level.INFO, "" + allSequences.size() + " possible"); Collection> allSubSeqs = model @@ -139,5 +140,5 @@ } if (maxIndex < 0 || sequenceGain[maxIndex] <= 0.0 + eps) { - Console.traceln("No gain anymore! Desired coverage cannot be satisfied!"); + Console.traceln(Level.WARNING, "No gain anymore! Desired coverage cannot be satisfied!"); break; } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDshowTimer.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDshowTimer.java (revision 638) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDshowTimer.java (revision 639) @@ -3,4 +3,5 @@ import java.security.InvalidParameterException; import java.util.List; +import java.util.logging.Level; import de.ugoe.cs.quest.CommandHelpers; @@ -45,5 +46,5 @@ long startTime = (Long) dataObject; long currentTime = System.currentTimeMillis(); - Console.traceln("" + (currentTime - startTime) + " milliseconds"); + Console.traceln(Level.INFO, "" + (currentTime - startTime) + " milliseconds"); } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/CommandHistoryDialog.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/CommandHistoryDialog.java (revision 638) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/CommandHistoryDialog.java (revision 639) @@ -10,4 +10,5 @@ import java.io.OutputStreamWriter; import java.util.LinkedList; +import java.util.logging.Level; import org.eclipse.swt.widgets.Dialog; @@ -129,8 +130,8 @@ fileCreated = file.createNewFile(); if (!fileCreated) { - Console.traceln("Created batchfile " + filename); + Console.traceln(Level.INFO, "Created batchfile " + filename); } else { - Console.traceln("Overwrote file " + filename); + Console.traceln(Level.INFO, "Overwrote file " + filename); } }