Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/CommandHelpers.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/CommandHelpers.java (revision 240) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/CommandHelpers.java (revision 240) @@ -0,0 +1,54 @@ +package de.ugoe.cs.eventbench; + +import de.ugoe.cs.util.console.Console; + +/** + *

+ * Helper class that collects methods that are often used by the commands. + *

+ * + * @author Steffen Herbold + * @version 1.0 + */ +public class CommandHelpers { + + /** + *

+ * Prints a message to error stream of the {@link Console} that an object + * has not been found in the storage. + *

+ * + * @param objectName + * name of the object + */ + public static void objectNotFoundMessage(String objectName) { + Console.printerrln("Object " + objectName + " not found in storage."); + } + + /** + *

+ * Prints a message to the error stream of the {@link Console} that an + * object is not of an expected type. + *

+ * + * @param objectName + * name of the object + * @param type + * expected type + */ + public static void objectNotType(String objectName, String type) { + Console.printerrln("Object " + objectName + "not of type " + type + "."); + } + + /** + *

+ * Prints a message to the trace stream of the {@link Console} that an + * object in the storage has been overwritten. + *

+ * + * @param objectName + */ + public static void dataOverwritten(String objectName) { + Console.traceln("Existing object " + objectName + " overwritten."); + } +} Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/AbstractTrainCommand.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/AbstractTrainCommand.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/AbstractTrainCommand.java (revision 240) @@ -5,4 +5,5 @@ import java.util.List; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.SequenceInstanceOf; import de.ugoe.cs.eventbench.data.Event; @@ -73,11 +74,10 @@ sequencesName); if (dataObject == null) { - Console.println("Object " + sequencesName - + " not found in storage."); + CommandHelpers.objectNotFoundMessage(sequencesName); return; } if (!SequenceInstanceOf.isCollectionOfSequences(dataObject)) { - Console.println("Object " + sequencesName - + "not of type Collection>>."); + CommandHelpers.objectNotType(sequencesName, + "Collection>>"); return; } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDcalcCoverage.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDcalcCoverage.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDcalcCoverage.java (revision 240) @@ -5,4 +5,5 @@ import java.util.List; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.SequenceInstanceOf; import de.ugoe.cs.eventbench.coverage.CoverageCalculatorObserved; @@ -57,19 +58,18 @@ observedName); if (dataObjectProcess == null) { - Console.printerrln("Model " + modelname + " not found in storage."); + CommandHelpers.objectNotFoundMessage(modelname); return; } if (!(dataObjectProcess instanceof IStochasticProcess)) { - Console.printerrln("Object " + modelname - + " not of type IStochasticProcess!"); + CommandHelpers.objectNotType(modelname, "IStochasticProcess"); return; } if (dataObjectObserved == null) { - Console.printerrln("Observed sequences not found in storage."); + CommandHelpers.objectNotFoundMessage(observedName); return; } if (!SequenceInstanceOf.isCollectionOfSequences(dataObjectObserved)) { - Console.printerrln("Object " + observedName - + " of type Collection>>!"); + CommandHelpers.objectNotType(observedName, + "Collection>>"); return; } @@ -97,11 +97,10 @@ .getData(sequenceName); if (dataObjectSequences == null) { - Console.println("Sequences " + sequenceName - + " not found in storage."); + CommandHelpers.objectNotFoundMessage(sequenceName); return; } else if (!SequenceInstanceOf .isCollectionOfSequences(dataObjectSequences)) { - Console.printerrln("Object " + sequenceName - + "not of type Collection!"); + CommandHelpers.objectNotType(sequenceName, + "Collection>>"); return; } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDcalcEntropy.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDcalcEntropy.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDcalcEntropy.java (revision 240) @@ -4,4 +4,5 @@ import java.util.List; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.data.GlobalDataContainer; import de.ugoe.cs.eventbench.models.FirstOrderMarkovModel; @@ -47,10 +48,9 @@ .getData(modelname); if (dataObject == null) { - Console.println("Model " + modelname + "not found in storage."); + CommandHelpers.objectNotFoundMessage(modelname); return; } if (!(dataObject instanceof FirstOrderMarkovModel)) { - Console.println("Object " + modelname - + " is not a first-order Markov model!"); + CommandHelpers.objectNotType(modelname, "FirstOrderMarkovModel"); return; } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDdeleteObject.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDdeleteObject.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDdeleteObject.java (revision 240) @@ -4,4 +4,5 @@ import java.util.List; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.data.GlobalDataContainer; import de.ugoe.cs.util.console.Command; @@ -44,5 +45,5 @@ objectName); if (!deleted) { - Console.println("Object not found in storage!"); + CommandHelpers.objectNotFoundMessage(objectName); } } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateFixedLengthSequences.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateFixedLengthSequences.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateFixedLengthSequences.java (revision 240) @@ -11,4 +11,5 @@ import java.util.Set; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.data.Event; import de.ugoe.cs.eventbench.data.GlobalDataContainer; @@ -59,8 +60,8 @@ .getData(modelname); if (dataObject == null) { - Console.println("Model " + modelname + " not found in storage."); + CommandHelpers.objectNotFoundMessage(modelname); return; } else if (!(dataObject instanceof IStochasticProcess)) { - Console.println("Object " + modelname + " not of type MarkovModel!"); + CommandHelpers.objectNotType(modelname, "IStochasticProcess"); return; } @@ -107,5 +108,5 @@ } if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) { - Console.traceln("Old data \"" + sequencesName + "\" overwritten"); + CommandHelpers.dataOverwritten(sequencesName); } Console.println("" + sequences.size() + " sequences generated"); Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateRandomReplay.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateRandomReplay.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateRandomReplay.java (revision 240) @@ -6,4 +6,5 @@ import java.util.List; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.ReplayGenerator; import de.ugoe.cs.eventbench.data.GlobalDataContainer; @@ -58,9 +59,9 @@ .getData(modelname); if (dataObject == null) { - Console.println("Model " + modelname + " not found in storage."); + CommandHelpers.objectNotFoundMessage(modelname); return; } if (!(dataObject instanceof IStochasticProcess)) { - Console.println("Object " + modelname + " not of type MarkovModel!"); + CommandHelpers.objectNotType(modelname, "IStochasticProcess"); return; } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateRandomSequences.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateRandomSequences.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateRandomSequences.java (revision 240) @@ -6,4 +6,5 @@ import java.util.Set; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.data.GlobalDataContainer; import de.ugoe.cs.eventbench.data.Event; @@ -57,9 +58,9 @@ .getData(modelname); if (dataObject == null) { - Console.println("Model " + modelname + " not found in storage."); + CommandHelpers.objectNotFoundMessage(modelname); return; } if (!(dataObject instanceof IStochasticProcess)) { - Console.println("Object " + modelname + " not of type MarkovModel!"); + CommandHelpers.objectNotType(modelname, "IStochasticProcess"); return; } @@ -82,5 +83,5 @@ } if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) { - Console.traceln("Old data \"" + sequencesName + "\" overwritten"); + CommandHelpers.dataOverwritten(sequencesName); } } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateReplayfile.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateReplayfile.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateReplayfile.java (revision 240) @@ -5,4 +5,5 @@ import java.util.List; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.ReplayGenerator; import de.ugoe.cs.eventbench.SequenceInstanceOf; @@ -53,11 +54,10 @@ sequencesName); if (dataObject == null) { - Console.println("Object " + sequencesName - + " not found in storage."); + CommandHelpers.objectNotFoundMessage(sequencesName); return; } if (!SequenceInstanceOf.isCollectionOfSequences(dataObject)) { - Console.println("Object " + sequencesName - + "not of type Collection>>."); + CommandHelpers.objectNotType(sequencesName, + "Collection>>"); return; } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDlistSymbols.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDlistSymbols.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDlistSymbols.java (revision 240) @@ -5,4 +5,5 @@ import java.util.List; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.data.GlobalDataContainer; import de.ugoe.cs.eventbench.models.IStochasticProcess; @@ -43,10 +44,9 @@ .getData(modelname); if (dataObject == null) { - Console.println("Model " + modelname + "not found in storage."); + CommandHelpers.objectNotFoundMessage(modelname); return; } if (!(dataObject instanceof IStochasticProcess)) { - Console.println("Object " + modelname - + " is not a stochastic process!"); + CommandHelpers.objectNotType(modelname, "IStochasticProcess"); return; } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDloadObject.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDloadObject.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDloadObject.java (revision 240) @@ -7,4 +7,5 @@ import java.util.List; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.data.GlobalDataContainer; import de.ugoe.cs.util.console.Command; @@ -52,5 +53,5 @@ } if (GlobalDataContainer.getInstance().addData(objectName, data)) { - Console.traceln("Old data \"" + objectName + "\" overwritten"); + CommandHelpers.dataOverwritten(objectName); } } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDmodelSize.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDmodelSize.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDmodelSize.java (revision 240) @@ -4,4 +4,5 @@ import java.util.List; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.data.GlobalDataContainer; import de.ugoe.cs.eventbench.models.IStochasticProcess; @@ -36,10 +37,9 @@ .getData(modelname); if (dataObject == null) { - Console.printerrln("No model with name " + modelname + "found"); + CommandHelpers.objectNotFoundMessage(modelname); return; } if (!(dataObject instanceof IStochasticProcess)) { - Console.printerrln("Object " + modelname - + " not of type IStochasticProcess!"); + CommandHelpers.objectNotType(modelname, "IStochasticProcess"); return; } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDprintDot.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDprintDot.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDprintDot.java (revision 240) @@ -4,4 +4,5 @@ import java.util.List; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.data.GlobalDataContainer; import de.ugoe.cs.eventbench.models.IDotCompatible; @@ -48,10 +49,9 @@ .getData(modelname); if (dataObject == null) { - Console.println("Model " + modelname + "not found in storage."); + CommandHelpers.objectNotFoundMessage(modelname); return; } if (!(dataObject instanceof IDotCompatible)) { - Console.println("Object " + modelname - + " does not implement IDotCompatible!"); + CommandHelpers.objectNotType(modelname, "IDotCompatible"); return; } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDprintRandomSession.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDprintRandomSession.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDprintRandomSession.java (revision 240) @@ -4,4 +4,5 @@ import java.util.List; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.data.Event; import de.ugoe.cs.eventbench.data.GlobalDataContainer; @@ -48,9 +49,9 @@ .getData(modelname); if (dataObject == null) { - Console.println("Model " + modelname + " not found in storage."); + CommandHelpers.objectNotFoundMessage(modelname); return; } if (!(dataObject instanceof IStochasticProcess)) { - Console.println("Object " + modelname + " not of type MarkovModel!"); + CommandHelpers.objectNotType(modelname, "IStochasticProcess"); return; } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDprintTrieDot.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDprintTrieDot.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDprintTrieDot.java (revision 240) @@ -4,4 +4,5 @@ import java.util.List; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.data.GlobalDataContainer; import de.ugoe.cs.eventbench.models.Trie; @@ -49,9 +50,9 @@ .getData(modelname); if (dataObject == null) { - Console.println("Model " + modelname + "not found in storage."); + CommandHelpers.objectNotFoundMessage(modelname); return; } if (!(dataObject instanceof TrieBasedModel)) { - Console.println("Object " + modelname + " is not a TrieBasedModel!"); + CommandHelpers.objectNotType(modelname, "TrieBasedModel"); return; } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDsaveObject.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDsaveObject.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDsaveObject.java (revision 240) @@ -7,4 +7,5 @@ import java.util.List; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.data.GlobalDataContainer; import de.ugoe.cs.util.console.Command; @@ -41,5 +42,6 @@ objectName); if (dataObject == null) { - Console.println("Object " + objectName + " not found in storage."); + CommandHelpers.objectNotFoundMessage(objectName); + return; } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDsequenceStatistics.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDsequenceStatistics.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDsequenceStatistics.java (revision 240) @@ -7,4 +7,5 @@ import java.util.TreeMap; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.SequenceInstanceOf; import de.ugoe.cs.eventbench.data.Event; @@ -41,11 +42,10 @@ sequencesName); if (dataObject == null) { - Console.println("Object " + sequencesName - + " not found in storage."); + CommandHelpers.objectNotFoundMessage(sequencesName); return; } if (!SequenceInstanceOf.isCollectionOfSequences(dataObject)) { - Console.println("Object " + sequencesName - + "not of type Collection>>."); + CommandHelpers.objectNotType(sequencesName, + "Collection>>"); return; } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowMarkovModel.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowMarkovModel.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowMarkovModel.java (revision 240) @@ -11,4 +11,5 @@ import org.apache.commons.collections15.Transformer; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.data.GlobalDataContainer; import de.ugoe.cs.eventbench.models.FirstOrderMarkovModel; @@ -65,10 +66,9 @@ .getData(modelname); if (dataObject == null) { - Console.println("Object " + modelname + " not found in storage."); + CommandHelpers.objectNotFoundMessage(modelname); return; } if (!(dataObject instanceof FirstOrderMarkovModel)) { - Console.println("Object " + modelname - + "not of type FirstOrderMarkovModel."); + CommandHelpers.objectNotType(modelname, "FirstOrderMarkovModel"); return; } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowSequences.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowSequences.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowSequences.java (revision 240) @@ -7,4 +7,5 @@ import org.eclipse.swt.widgets.Shell; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.SequenceInstanceOf; import de.ugoe.cs.eventbench.data.GlobalDataContainer; @@ -49,11 +50,10 @@ sequencesName); if (dataObject == null) { - Console.println("Object " + sequencesName - + " not found in storage."); + CommandHelpers.objectNotFoundMessage(sequencesName); return; } if (!SequenceInstanceOf.isCollectionOfSequences(dataObject)) { - Console.println("Object " + sequencesName - + "not of type Collection>>."); + CommandHelpers.objectNotType(sequencesName, + "Collection>>"); return; } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowTimer.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowTimer.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowTimer.java (revision 240) @@ -4,4 +4,5 @@ import java.util.List; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.data.GlobalDataContainer; import de.ugoe.cs.util.console.Command; @@ -35,9 +36,9 @@ timerName); if (dataObject == null) { - Console.printerrln("No object with name " + timerName + " found"); + CommandHelpers.objectNotFoundMessage(timerName); return; } if (!(dataObject instanceof Long)) { - Console.printerrln("Object " + timerName + " not of type Long!"); + CommandHelpers.objectNotType(timerName, "Long"); return; } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowTrie.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowTrie.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowTrie.java (revision 240) @@ -11,4 +11,5 @@ import org.apache.commons.collections15.Transformer; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.data.GlobalDataContainer; import de.ugoe.cs.eventbench.models.Trie; @@ -62,10 +63,9 @@ .getData(modelname); if (dataObject == null) { - Console.printerrln("Object " + modelname + " not found in storage."); + CommandHelpers.objectNotFoundMessage(modelname); return; } if (!(dataObject instanceof TrieBasedModel)) { - Console.printerr("Object " + modelname - + " not of type TrieBasedModel."); + CommandHelpers.objectNotType(modelname, "TrieBasedModel"); } TrieBasedModel model = (TrieBasedModel) dataObject; Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDstartTimer.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDstartTimer.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDstartTimer.java (revision 240) @@ -4,4 +4,5 @@ import java.util.List; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.data.GlobalDataContainer; import de.ugoe.cs.util.console.Command; @@ -33,5 +34,5 @@ Long time = System.currentTimeMillis(); if (GlobalDataContainer.getInstance().addData(timerName, time)) { - Console.traceln("Old data \"" + timerName + "\" overwritten"); + CommandHelpers.dataOverwritten(timerName); } } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDupdateModel.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDupdateModel.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDupdateModel.java (revision 240) @@ -5,4 +5,5 @@ import java.util.List; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.SequenceInstanceOf; import de.ugoe.cs.eventbench.data.Event; @@ -43,11 +44,10 @@ sequencesName); if (dataObject == null) { - Console.println("Object " + sequencesName - + " not found in storage."); + CommandHelpers.objectNotFoundMessage(sequencesName); return; } if (!SequenceInstanceOf.isCollectionOfSequences(dataObject)) { - Console.println("Object " + sequencesName - + "not of type Collection>>."); + CommandHelpers.objectNotType(sequencesName, + "Collection>>"); return; } @@ -56,10 +56,9 @@ dataObject = GlobalDataContainer.getInstance().getData(modelname); if (dataObject == null) { - Console.println("Object " + modelname + " not found in storage."); + CommandHelpers.objectNotFoundMessage(modelname); return; } if (!(dataObject instanceof TrieBasedModel)) { - Console.println("Object " + modelname - + " not of type TrieBasedModel"); + CommandHelpers.objectNotType(modelname, "TrieBasedModel"); return; } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/commands/CMDloadSessionsFromClickstream.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/commands/CMDloadSessionsFromClickstream.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/commands/CMDloadSessionsFromClickstream.java (revision 240) @@ -8,4 +8,5 @@ import java.util.List; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.data.GlobalDataContainer; import de.ugoe.cs.eventbench.web.WeblogParser; @@ -88,5 +89,5 @@ if (GlobalDataContainer.getInstance().addData(sequencesName, parser.getSequences())) { - Console.traceln("Old data \"" + sequencesName + "\" overwritten"); + CommandHelpers.dataOverwritten(sequencesName); } if (generateFrequentUsers) { @@ -95,9 +96,8 @@ .getFrequentUserSequences(); for (int i = 0; i < frequentUserIDs.size(); i++) { - if (GlobalDataContainer.getInstance().addData( - sequencesName + "_" + frequentUserIDs.get(i), + String seqName = sequencesName + "_" + frequentUserIDs.get(i); + if (GlobalDataContainer.getInstance().addData(seqName, frequentUserSessions.get(i))) { - Console.traceln("Old data \"" + sequencesName - + "\" overwritten"); + CommandHelpers.dataOverwritten(seqName); } } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/commands/CMDparseXML.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/commands/CMDparseXML.java (revision 239) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/commands/CMDparseXML.java (revision 240) @@ -6,4 +6,5 @@ import java.util.SortedSet; +import de.ugoe.cs.eventbench.CommandHelpers; import de.ugoe.cs.eventbench.data.GlobalDataContainer; import de.ugoe.cs.eventbench.windows.LogParser; @@ -65,8 +66,9 @@ if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) { - Console.traceln("Old data \"" + sequencesName + "\" overwritten"); + CommandHelpers.dataOverwritten(sequencesName); } - if( GlobalDataContainer.getInstance().addData(sequencesName+"_targets", targets)) { - Console.traceln("Old data \"" + sequencesName+"_targets" + "\" overwritten"); + if (GlobalDataContainer.getInstance().addData( + sequencesName + "_targets", targets)) { + CommandHelpers.dataOverwritten(sequencesName + "_targets"); } }