Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/ReplayGenerator.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/ReplayGenerator.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/ReplayGenerator.java (revision 433) @@ -9,6 +9,6 @@ import de.ugoe.cs.quest.IReplayDecorator; -import de.ugoe.cs.quest.data.IReplayable; -import de.ugoe.cs.quest.data.ReplayableEvent; +import de.ugoe.cs.quest.eventcore.IReplayable; +import de.ugoe.cs.quest.eventcore.ReplayableEvent; import de.ugoe.cs.util.StringTools; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/AbstractTrainCommand.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/AbstractTrainCommand.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/AbstractTrainCommand.java (revision 433) @@ -7,7 +7,7 @@ import de.ugoe.cs.quest.CommandHelpers; import de.ugoe.cs.quest.SequenceInstanceOf; -import de.ugoe.cs.quest.data.Event; import de.ugoe.cs.quest.data.GlobalDataContainer; -import de.ugoe.cs.quest.models.TrieBasedModel; +import de.ugoe.cs.quest.eventcore.Event; +import de.ugoe.cs.quest.usageprofiles.TrieBasedModel; import de.ugoe.cs.util.console.Command; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDcalcCoverage.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDcalcCoverage.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDcalcCoverage.java (revision 433) @@ -9,7 +9,7 @@ import de.ugoe.cs.quest.coverage.CoverageCalculatorObserved; import de.ugoe.cs.quest.coverage.CoverageCalculatorProcess; -import de.ugoe.cs.quest.data.Event; import de.ugoe.cs.quest.data.GlobalDataContainer; -import de.ugoe.cs.quest.models.IStochasticProcess; +import de.ugoe.cs.quest.eventcore.Event; +import de.ugoe.cs.quest.usageprofiles.IStochasticProcess; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDcalcEntropy.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDcalcEntropy.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDcalcEntropy.java (revision 433) @@ -6,5 +6,5 @@ import de.ugoe.cs.quest.CommandHelpers; import de.ugoe.cs.quest.data.GlobalDataContainer; -import de.ugoe.cs.quest.models.FirstOrderMarkovModel; +import de.ugoe.cs.quest.usageprofiles.FirstOrderMarkovModel; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDflattenModel.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDflattenModel.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDflattenModel.java (revision 433) @@ -6,7 +6,7 @@ import de.ugoe.cs.quest.CommandHelpers; import de.ugoe.cs.quest.data.GlobalDataContainer; -import de.ugoe.cs.quest.models.FirstOrderMarkovModel; -import de.ugoe.cs.quest.models.HighOrderMarkovModel; -import de.ugoe.cs.quest.models.ModelFlattener; +import de.ugoe.cs.quest.usageprofiles.FirstOrderMarkovModel; +import de.ugoe.cs.quest.usageprofiles.HighOrderMarkovModel; +import de.ugoe.cs.quest.usageprofiles.ModelFlattener; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDgenerateFixedLengthSequences.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDgenerateFixedLengthSequences.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDgenerateFixedLengthSequences.java (revision 433) @@ -12,7 +12,7 @@ import de.ugoe.cs.quest.CommandHelpers; -import de.ugoe.cs.quest.data.Event; import de.ugoe.cs.quest.data.GlobalDataContainer; -import de.ugoe.cs.quest.models.IStochasticProcess; +import de.ugoe.cs.quest.eventcore.Event; +import de.ugoe.cs.quest.usageprofiles.IStochasticProcess; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDgenerateGreedy.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDgenerateGreedy.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDgenerateGreedy.java (revision 433) @@ -12,7 +12,7 @@ import de.ugoe.cs.quest.CommandHelpers; import de.ugoe.cs.quest.coverage.SequenceTools; -import de.ugoe.cs.quest.data.Event; import de.ugoe.cs.quest.data.GlobalDataContainer; -import de.ugoe.cs.quest.models.IStochasticProcess; +import de.ugoe.cs.quest.eventcore.Event; +import de.ugoe.cs.quest.usageprofiles.IStochasticProcess; import de.ugoe.cs.util.ArrayTools; import de.ugoe.cs.util.console.Command; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDgenerateHybrid.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDgenerateHybrid.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDgenerateHybrid.java (revision 433) @@ -10,7 +10,7 @@ import de.ugoe.cs.quest.CommandHelpers; -import de.ugoe.cs.quest.data.Event; import de.ugoe.cs.quest.data.GlobalDataContainer; -import de.ugoe.cs.quest.models.IStochasticProcess; +import de.ugoe.cs.quest.eventcore.Event; +import de.ugoe.cs.quest.usageprofiles.IStochasticProcess; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDgenerateRandomReplay.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDgenerateRandomReplay.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDgenerateRandomReplay.java (revision 433) @@ -9,6 +9,6 @@ import de.ugoe.cs.quest.ReplayGenerator; import de.ugoe.cs.quest.data.GlobalDataContainer; -import de.ugoe.cs.quest.data.ReplayableEvent; -import de.ugoe.cs.quest.models.IStochasticProcess; +import de.ugoe.cs.quest.eventcore.ReplayableEvent; +import de.ugoe.cs.quest.usageprofiles.IStochasticProcess; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDgenerateRandomSequences.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDgenerateRandomSequences.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDgenerateRandomSequences.java (revision 433) @@ -7,7 +7,7 @@ import de.ugoe.cs.quest.CommandHelpers; -import de.ugoe.cs.quest.data.Event; import de.ugoe.cs.quest.data.GlobalDataContainer; -import de.ugoe.cs.quest.models.IStochasticProcess; +import de.ugoe.cs.quest.eventcore.Event; +import de.ugoe.cs.quest.usageprofiles.IStochasticProcess; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDgenerateReplayfile.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDgenerateReplayfile.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDgenerateReplayfile.java (revision 433) @@ -9,5 +9,5 @@ import de.ugoe.cs.quest.SequenceInstanceOf; import de.ugoe.cs.quest.data.GlobalDataContainer; -import de.ugoe.cs.quest.data.ReplayableEvent; +import de.ugoe.cs.quest.eventcore.ReplayableEvent; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDlistSymbols.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDlistSymbols.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDlistSymbols.java (revision 433) @@ -7,5 +7,5 @@ import de.ugoe.cs.quest.CommandHelpers; import de.ugoe.cs.quest.data.GlobalDataContainer; -import de.ugoe.cs.quest.models.IStochasticProcess; +import de.ugoe.cs.quest.usageprofiles.IStochasticProcess; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDmodelSize.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDmodelSize.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDmodelSize.java (revision 433) @@ -6,5 +6,5 @@ import de.ugoe.cs.quest.CommandHelpers; import de.ugoe.cs.quest.data.GlobalDataContainer; -import de.ugoe.cs.quest.models.IStochasticProcess; +import de.ugoe.cs.quest.usageprofiles.IStochasticProcess; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDprintDot.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDprintDot.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDprintDot.java (revision 433) @@ -6,5 +6,5 @@ import de.ugoe.cs.quest.CommandHelpers; import de.ugoe.cs.quest.data.GlobalDataContainer; -import de.ugoe.cs.quest.models.IDotCompatible; +import de.ugoe.cs.quest.usageprofiles.IDotCompatible; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDprintTrieDot.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDprintTrieDot.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDprintTrieDot.java (revision 433) @@ -6,6 +6,6 @@ import de.ugoe.cs.quest.CommandHelpers; import de.ugoe.cs.quest.data.GlobalDataContainer; -import de.ugoe.cs.quest.models.Trie; -import de.ugoe.cs.quest.models.TrieBasedModel; +import de.ugoe.cs.quest.usageprofiles.Trie; +import de.ugoe.cs.quest.usageprofiles.TrieBasedModel; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDsequenceStatistics.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDsequenceStatistics.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDsequenceStatistics.java (revision 433) @@ -10,6 +10,6 @@ import de.ugoe.cs.quest.CommandHelpers; import de.ugoe.cs.quest.SequenceInstanceOf; -import de.ugoe.cs.quest.data.Event; import de.ugoe.cs.quest.data.GlobalDataContainer; +import de.ugoe.cs.quest.eventcore.Event; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDshowMarkovModel.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDshowMarkovModel.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDshowMarkovModel.java (revision 433) @@ -13,6 +13,6 @@ import de.ugoe.cs.quest.CommandHelpers; import de.ugoe.cs.quest.data.GlobalDataContainer; -import de.ugoe.cs.quest.models.FirstOrderMarkovModel; -import de.ugoe.cs.quest.models.FirstOrderMarkovModel.MarkovEdge; +import de.ugoe.cs.quest.usageprofiles.FirstOrderMarkovModel; +import de.ugoe.cs.quest.usageprofiles.FirstOrderMarkovModel.MarkovEdge; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDshowTrie.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDshowTrie.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDshowTrie.java (revision 433) @@ -13,8 +13,8 @@ import de.ugoe.cs.quest.CommandHelpers; import de.ugoe.cs.quest.data.GlobalDataContainer; -import de.ugoe.cs.quest.models.Trie; -import de.ugoe.cs.quest.models.TrieBasedModel; -import de.ugoe.cs.quest.models.Trie.Edge; -import de.ugoe.cs.quest.models.Trie.TrieVertex; +import de.ugoe.cs.quest.usageprofiles.Trie; +import de.ugoe.cs.quest.usageprofiles.TrieBasedModel; +import de.ugoe.cs.quest.usageprofiles.Trie.Edge; +import de.ugoe.cs.quest.usageprofiles.Trie.TrieVertex; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDtrainDFA.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDtrainDFA.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDtrainDFA.java (revision 433) @@ -4,6 +4,6 @@ import java.util.Random; -import de.ugoe.cs.quest.models.DeterministicFiniteAutomaton; -import de.ugoe.cs.quest.models.TrieBasedModel; +import de.ugoe.cs.quest.usageprofiles.DeterministicFiniteAutomaton; +import de.ugoe.cs.quest.usageprofiles.TrieBasedModel; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDtrainMarkovModel.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDtrainMarkovModel.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDtrainMarkovModel.java (revision 433) @@ -4,7 +4,7 @@ import java.util.Random; -import de.ugoe.cs.quest.models.FirstOrderMarkovModel; -import de.ugoe.cs.quest.models.HighOrderMarkovModel; -import de.ugoe.cs.quest.models.TrieBasedModel; +import de.ugoe.cs.quest.usageprofiles.FirstOrderMarkovModel; +import de.ugoe.cs.quest.usageprofiles.HighOrderMarkovModel; +import de.ugoe.cs.quest.usageprofiles.TrieBasedModel; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDtrainPPM.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDtrainPPM.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDtrainPPM.java (revision 433) @@ -4,6 +4,6 @@ import java.util.Random; -import de.ugoe.cs.quest.models.PredictionByPartialMatch; -import de.ugoe.cs.quest.models.TrieBasedModel; +import de.ugoe.cs.quest.usageprofiles.PredictionByPartialMatch; +import de.ugoe.cs.quest.usageprofiles.TrieBasedModel; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDupdateModel.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDupdateModel.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/commands/CMDupdateModel.java (revision 433) @@ -7,7 +7,7 @@ import de.ugoe.cs.quest.CommandHelpers; import de.ugoe.cs.quest.SequenceInstanceOf; -import de.ugoe.cs.quest.data.Event; import de.ugoe.cs.quest.data.GlobalDataContainer; -import de.ugoe.cs.quest.models.TrieBasedModel; +import de.ugoe.cs.quest.eventcore.Event; +import de.ugoe.cs.quest.usageprofiles.TrieBasedModel; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/data/GlobalDataContainer.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/data/GlobalDataContainer.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/data/GlobalDataContainer.java (revision 433) @@ -12,5 +12,5 @@ import de.ugoe.cs.quest.SequenceInstanceOf; -import de.ugoe.cs.quest.models.IStochasticProcess; +import de.ugoe.cs.quest.usageprofiles.IStochasticProcess; /** Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/EFGModelGenerator.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/EFGModelGenerator.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/EFGModelGenerator.java (revision 433) @@ -8,8 +8,8 @@ import de.ugoe.cs.quest.commands.CMDupdateModel; -import de.ugoe.cs.quest.data.Event; import de.ugoe.cs.quest.efg.data.EFGEvent; -import de.ugoe.cs.quest.models.DeterministicFiniteAutomaton; -import de.ugoe.cs.quest.models.FirstOrderMarkovModel; +import de.ugoe.cs.quest.eventcore.Event; +import de.ugoe.cs.quest.usageprofiles.DeterministicFiniteAutomaton; +import de.ugoe.cs.quest.usageprofiles.FirstOrderMarkovModel; import edu.umd.cs.guitar.model.GUITARConstants; import edu.umd.cs.guitar.model.IO; @@ -21,5 +21,5 @@ *

* Provides functionality to generates models defined in the package - * de.ugoe.cs.quest.models from EFGs. + * de.ugoe.cs.quest.usageprofiles from EFGs. *

* Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/GUITARTestCaseParser.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/GUITARTestCaseParser.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/GUITARTestCaseParser.java (revision 433) @@ -5,6 +5,6 @@ import java.util.List; -import de.ugoe.cs.quest.data.Event; import de.ugoe.cs.quest.efg.data.EFGEvent; +import de.ugoe.cs.quest.eventcore.Event; import edu.umd.cs.guitar.model.IO; import edu.umd.cs.guitar.model.data.EFG; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/commands/CMDefgTestCasesToSequences.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/commands/CMDefgTestCasesToSequences.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/commands/CMDefgTestCasesToSequences.java (revision 433) @@ -9,7 +9,7 @@ import de.ugoe.cs.quest.CommandHelpers; -import de.ugoe.cs.quest.data.Event; import de.ugoe.cs.quest.data.GlobalDataContainer; import de.ugoe.cs.quest.efg.GUITARTestCaseParser; +import de.ugoe.cs.quest.eventcore.Event; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/commands/CMDefgToDFA.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/commands/CMDefgToDFA.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/commands/CMDefgToDFA.java (revision 433) @@ -6,5 +6,5 @@ import de.ugoe.cs.quest.data.GlobalDataContainer; import de.ugoe.cs.quest.efg.EFGModelGenerator; -import de.ugoe.cs.quest.models.DeterministicFiniteAutomaton; +import de.ugoe.cs.quest.usageprofiles.DeterministicFiniteAutomaton; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/commands/CMDefgToMM.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/commands/CMDefgToMM.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/commands/CMDefgToMM.java (revision 433) @@ -6,5 +6,5 @@ import de.ugoe.cs.quest.data.GlobalDataContainer; import de.ugoe.cs.quest.efg.EFGModelGenerator; -import de.ugoe.cs.quest.models.FirstOrderMarkovModel; +import de.ugoe.cs.quest.usageprofiles.FirstOrderMarkovModel; import de.ugoe.cs.util.console.Command; import de.ugoe.cs.util.console.Console; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/data/EFGEvent.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/data/EFGEvent.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/data/EFGEvent.java (revision 433) @@ -1,5 +1,5 @@ package de.ugoe.cs.quest.efg.data; -import de.ugoe.cs.quest.data.ReplayableEvent; +import de.ugoe.cs.quest.eventcore.ReplayableEvent; /** Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/data/EFGReplayable.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/data/EFGReplayable.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/efg/data/EFGReplayable.java (revision 433) @@ -1,5 +1,5 @@ package de.ugoe.cs.quest.efg.data; -import de.ugoe.cs.quest.data.IReplayable; +import de.ugoe.cs.quest.eventcore.IReplayable; import de.ugoe.cs.util.StringTools; @@ -42,5 +42,5 @@ * (non-Javadoc) * - * @see de.ugoe.cs.quest.data.IReplayable#getReplay() + * @see de.ugoe.cs.quest.eventcore.IReplayable#getReplay() */ @Override @@ -57,5 +57,5 @@ * (non-Javadoc) * - * @see de.ugoe.cs.quest.data.IReplayable#getTarget() + * @see de.ugoe.cs.quest.eventcore.IReplayable#getTarget() */ @Override Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/jfc/data/JFCEvent.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/jfc/data/JFCEvent.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/jfc/data/JFCEvent.java (revision 433) @@ -4,6 +4,6 @@ import java.util.Map; -import de.ugoe.cs.quest.data.IReplayable; -import de.ugoe.cs.quest.data.ReplayableEvent; +import de.ugoe.cs.quest.eventcore.IReplayable; +import de.ugoe.cs.quest.eventcore.ReplayableEvent; import de.ugoe.cs.quest.jfc.JFCLogParser; @@ -174,5 +174,5 @@ *

* - * @see de.ugoe.cs.quest.data.Event#targetEquals(java.lang.String) + * @see de.ugoe.cs.quest.eventcore.Event#targetEquals(java.lang.String) */ @Override @@ -188,5 +188,5 @@ *

* - * @see de.ugoe.cs.quest.data.Event#targetHashCode() + * @see de.ugoe.cs.quest.eventcore.Event#targetHashCode() */ @Override Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/AbstractInsertEventComposite.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/AbstractInsertEventComposite.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/AbstractInsertEventComposite.java (revision 433) @@ -5,5 +5,5 @@ import org.eclipse.swt.widgets.Composite; -import de.ugoe.cs.quest.data.Event; +import de.ugoe.cs.quest.eventcore.Event; abstract public class AbstractInsertEventComposite extends Composite { Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/EditSequenceDialog.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/EditSequenceDialog.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/EditSequenceDialog.java (revision 433) @@ -19,5 +19,5 @@ import org.eclipse.swt.graphics.Point; -import de.ugoe.cs.quest.data.Event; +import de.ugoe.cs.quest.eventcore.Event; public class EditSequenceDialog extends Dialog { Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/InsertAssertionDialog.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/InsertAssertionDialog.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/InsertAssertionDialog.java (revision 433) @@ -17,5 +17,5 @@ import org.eclipse.swt.widgets.Button; -import de.ugoe.cs.quest.data.Event; +import de.ugoe.cs.quest.eventcore.Event; public class InsertAssertionDialog extends Dialog { Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/InsertFileEquals.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/InsertFileEquals.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/InsertFileEquals.java (revision 433) @@ -14,5 +14,5 @@ import de.ugoe.cs.quest.assertions.AssertEvent; import de.ugoe.cs.quest.assertions.FileEqualsReplay; -import de.ugoe.cs.quest.data.Event; +import de.ugoe.cs.quest.eventcore.Event; import org.eclipse.swt.events.SelectionAdapter; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/InsertTextEquals.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/InsertTextEquals.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/InsertTextEquals.java (revision 433) @@ -15,5 +15,5 @@ import de.ugoe.cs.quest.assertions.AssertEvent; import de.ugoe.cs.quest.assertions.TextEqualsReplay; -import de.ugoe.cs.quest.data.Event; +import de.ugoe.cs.quest.eventcore.Event; import de.ugoe.cs.util.ArrayTools; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/ModelPropertiesDialog.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/ModelPropertiesDialog.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/ModelPropertiesDialog.java (revision 433) @@ -14,6 +14,6 @@ import org.eclipse.swt.layout.FillLayout; -import de.ugoe.cs.quest.models.FirstOrderMarkovModel; -import de.ugoe.cs.quest.models.IStochasticProcess; +import de.ugoe.cs.quest.usageprofiles.FirstOrderMarkovModel; +import de.ugoe.cs.quest.usageprofiles.IStochasticProcess; import org.eclipse.swt.events.SelectionAdapter; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/ModelsTabComposite.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/ModelsTabComposite.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/ModelsTabComposite.java (revision 433) @@ -10,7 +10,7 @@ import de.ugoe.cs.quest.data.GlobalDataContainer; -import de.ugoe.cs.quest.models.FirstOrderMarkovModel; -import de.ugoe.cs.quest.models.IDotCompatible; -import de.ugoe.cs.quest.models.IStochasticProcess; +import de.ugoe.cs.quest.usageprofiles.FirstOrderMarkovModel; +import de.ugoe.cs.quest.usageprofiles.IDotCompatible; +import de.ugoe.cs.quest.usageprofiles.IStochasticProcess; import de.ugoe.cs.util.console.CommandExecuter; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/SequencesDialog.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/SequencesDialog.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/swt/SequencesDialog.java (revision 433) @@ -16,6 +16,6 @@ import de.ugoe.cs.quest.SequenceInstanceOf; -import de.ugoe.cs.quest.data.Event; import de.ugoe.cs.quest.data.GlobalDataContainer; +import de.ugoe.cs.quest.eventcore.Event; import org.eclipse.swt.events.SelectionAdapter; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/web/data/WebEvent.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/web/data/WebEvent.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/web/data/WebEvent.java (revision 433) @@ -3,5 +3,5 @@ import java.util.List; -import de.ugoe.cs.quest.data.ReplayableEvent; +import de.ugoe.cs.quest.eventcore.ReplayableEvent; /** @@ -89,5 +89,5 @@ * (non-Javadoc) * - * @see de.ugoe.cs.quest.data.ReplayableEvent#equals(java.lang.Object) + * @see de.ugoe.cs.quest.eventcore.ReplayableEvent#equals(java.lang.Object) */ @Override @@ -99,5 +99,5 @@ * (non-Javadoc) * - * @see de.ugoe.cs.quest.data.ReplayableEvent#hashCode() + * @see de.ugoe.cs.quest.eventcore.ReplayableEvent#hashCode() */ @Override Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/web/data/WebRequest.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/web/data/WebRequest.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/web/data/WebRequest.java (revision 433) @@ -4,5 +4,5 @@ import java.util.List; -import de.ugoe.cs.quest.data.IReplayable; +import de.ugoe.cs.quest.eventcore.IReplayable; /** @@ -81,5 +81,5 @@ * (non-Javadoc) * - * @see de.ugoe.cs.quest.data.IReplayable#getReplay() + * @see de.ugoe.cs.quest.eventcore.IReplayable#getReplay() */ @Override @@ -125,5 +125,5 @@ * (non-Javadoc) * - * @see de.ugoe.cs.quest.data.IReplayable#getTarget() + * @see de.ugoe.cs.quest.eventcore.IReplayable#getTarget() */ @Override Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/windows/EventGenerator.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/windows/EventGenerator.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/windows/EventGenerator.java (revision 433) @@ -17,5 +17,5 @@ import org.jdom.input.SAXBuilder; -import de.ugoe.cs.quest.data.Event; +import de.ugoe.cs.quest.eventcore.Event; import de.ugoe.cs.quest.windows.data.WindowTree; import de.ugoe.cs.quest.windows.data.WindowTreeNode; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/windows/SequenceSplitter.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/windows/SequenceSplitter.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/windows/SequenceSplitter.java (revision 433) @@ -4,5 +4,5 @@ import java.util.List; -import de.ugoe.cs.quest.data.Event; +import de.ugoe.cs.quest.eventcore.Event; import de.ugoe.cs.quest.windows.data.WindowsEvent; import de.ugoe.cs.quest.windows.data.WindowsMessage; Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/windows/data/WindowsEvent.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/windows/data/WindowsEvent.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/windows/data/WindowsEvent.java (revision 433) @@ -10,5 +10,5 @@ import org.w3c.dom.NodeList; -import de.ugoe.cs.quest.data.ReplayableEvent; +import de.ugoe.cs.quest.eventcore.ReplayableEvent; /** @@ -34,5 +34,5 @@ *

* - * @see de.ugoe.cs.quest.data.Event#Event(String) + * @see de.ugoe.cs.quest.eventcore.Event#Event(String) * @param type * type of the event. Index: trunk/quest-ui-core/src/de/ugoe/cs/quest/windows/data/WindowsMessage.java =================================================================== --- trunk/quest-ui-core/src/de/ugoe/cs/quest/windows/data/WindowsMessage.java (revision 432) +++ trunk/quest-ui-core/src/de/ugoe/cs/quest/windows/data/WindowsMessage.java (revision 433) @@ -5,5 +5,5 @@ import java.util.Map; -import de.ugoe.cs.quest.data.IReplayable; +import de.ugoe.cs.quest.eventcore.IReplayable; import de.ugoe.cs.util.StringTools; @@ -476,5 +476,5 @@ * (non-Javadoc) * - * @see de.ugoe.cs.quest.data.IReplayable#getReplay() + * @see de.ugoe.cs.quest.eventcore.IReplayable#getReplay() */ @Override @@ -512,5 +512,5 @@ * (non-Javadoc) * - * @see de.ugoe.cs.quest.data.IReplayable#getTarget() + * @see de.ugoe.cs.quest.eventcore.IReplayable#getTarget() */ @Override