Index: trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/DeterministicFiniteAutomaton.java
===================================================================
--- trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/DeterministicFiniteAutomaton.java	(revision 655)
+++ trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/DeterministicFiniteAutomaton.java	(revision 766)
@@ -1,5 +1,4 @@
 package de.ugoe.cs.quest.usageprofiles;
 
-import java.security.InvalidParameterException;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -52,8 +51,8 @@
     public double getProbability(List<Event> context, Event symbol) {
         if (context == null) {
-            throw new InvalidParameterException("context must not be null");
+            throw new IllegalArgumentException("context must not be null");
         }
         if (symbol == null) {
-            throw new InvalidParameterException("symbol must not be null");
+            throw new IllegalArgumentException("symbol must not be null");
         }
         double result = 0.0d;
Index: trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/HighOrderMarkovModel.java
===================================================================
--- trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/HighOrderMarkovModel.java	(revision 655)
+++ trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/HighOrderMarkovModel.java	(revision 766)
@@ -1,5 +1,4 @@
 package de.ugoe.cs.quest.usageprofiles;
 
-import java.security.InvalidParameterException;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -52,8 +51,8 @@
     public double getProbability(List<Event> context, Event symbol) {
         if (context == null) {
-            throw new InvalidParameterException("context must not be null");
+            throw new IllegalArgumentException("context must not be null");
         }
         if (symbol == null) {
-            throw new InvalidParameterException("symbol must not be null");
+            throw new IllegalArgumentException("symbol must not be null");
         }
         double result = 0.0d;
Index: trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/IStochasticProcess.java
===================================================================
--- trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/IStochasticProcess.java	(revision 655)
+++ trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/IStochasticProcess.java	(revision 766)
@@ -2,5 +2,4 @@
 
 import java.io.Serializable;
-import java.security.InvalidParameterException;
 import java.util.Collection;
 import java.util.List;
@@ -31,5 +30,5 @@
      * @return probabilty the {@code symbol} is the next event, given the last events
      *         {@code context}
-     * @throws InvalidParameterException
+     * @throws IllegalArgumentException
      *             thrown if context or symbol is null
      */
@@ -44,5 +43,5 @@
      *            sequences of which the probability is calculated
      * @return probability of the sequences; 1.0 if sequence is empty or null
-     * @throws InvalidParameterException
+     * @throws IllegalArgumentException
      *             thrown if sequence is null
      */
@@ -90,5 +89,5 @@
      * @return generated sequences
      * @see #generateSequences(int, boolean)
-     * @throws InvalidParameterException
+     * @throws IllegalArgumentException
      *             thrown if length is less than or equal to 0
      */
@@ -108,5 +107,5 @@
      *            if true, all generated sequences start with {@link Event#STARTEVENT}
      * @return generated sequences
-     * @throws InvalidParameterException
+     * @throws IllegalArgumentException
      *             thrown if length is less than or equal to 0
      */
@@ -123,5 +122,5 @@
      * @param length
      * @return generated sequences
-     * @throws InvalidParameterException
+     * @throws IllegalArgumentException
      *             thrown if length is less than or equal to 0
      */
Index: trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/IncompleteMemory.java
===================================================================
--- trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/IncompleteMemory.java	(revision 655)
+++ trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/IncompleteMemory.java	(revision 766)
@@ -1,5 +1,4 @@
 package de.ugoe.cs.quest.usageprofiles;
 
-import java.security.InvalidParameterException;
 import java.util.LinkedList;
 import java.util.List;
@@ -41,10 +40,10 @@
      * @param length
      *            number of recent events that are remembered
-     * @throws InvalidParameterException
+     * @throws IllegalArgumentException
      *             This exception is thrown if the length is smaller than 1
      */
     public IncompleteMemory(int length) {
         if (length < 1) {
-            throw new InvalidParameterException("Length of IncompleteMemory must be at least 1.");
+            throw new IllegalArgumentException("Length of IncompleteMemory must be at least 1.");
         }
         this.length = length;
Index: trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/PredictionByPartialMatch.java
===================================================================
--- trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/PredictionByPartialMatch.java	(revision 655)
+++ trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/PredictionByPartialMatch.java	(revision 766)
@@ -1,5 +1,4 @@
 package de.ugoe.cs.quest.usageprofiles;
 
-import java.security.InvalidParameterException;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -90,5 +89,5 @@
      * @param probEscape
      *            escape probability used by the model
-     * @throws InvalidParameterException
+     * @throws IllegalArgumentException
      *             thrown if minOrder is less than 0 or greater than markovOrder or probEscape is
      *             not in the interval (0,1)
@@ -97,12 +96,12 @@
         super(markovOrder, r);
         if (minOrder < 0) {
-            throw new InvalidParameterException("minOrder must be greather than or equal to 0");
+            throw new IllegalArgumentException("minOrder must be greather than or equal to 0");
         }
         if (minOrder > markovOrder) {
-            throw new InvalidParameterException(
+            throw new IllegalArgumentException(
                                                 "minOrder must be less than or equal to markovOrder");
         }
         if (probEscape <= 0.0 || probEscape >= 1.0) {
-            throw new InvalidParameterException("probEscape must be in the interval (0,1)");
+            throw new IllegalArgumentException("probEscape must be in the interval (0,1)");
         }
         this.probEscape = probEscape;
@@ -147,8 +146,8 @@
     public double getProbability(List<Event> context, Event symbol) {
         if (context == null) {
-            throw new InvalidParameterException("context must not be null");
+            throw new IllegalArgumentException("context must not be null");
         }
         if (symbol == null) {
-            throw new InvalidParameterException("symbol must not be null");
+            throw new IllegalArgumentException("symbol must not be null");
         }
         double result = 0.0d;
Index: trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/Trie.java
===================================================================
--- trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/Trie.java	(revision 655)
+++ trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/Trie.java	(revision 766)
@@ -2,5 +2,4 @@
 
 import java.io.Serializable;
-import java.security.InvalidParameterException;
 import java.util.Collection;
 import java.util.HashSet;
@@ -71,5 +70,5 @@
     public Trie(Trie<T> other) {
         if (other == null) {
-            throw new InvalidParameterException("other trie must not be null");
+            throw new IllegalArgumentException("other trie must not be null");
         }
         rootNode = new TrieNode<T>(other.rootNode);
Index: trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/TrieBasedModel.java
===================================================================
--- trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/TrieBasedModel.java	(revision 655)
+++ trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/TrieBasedModel.java	(revision 766)
@@ -1,5 +1,4 @@
 package de.ugoe.cs.quest.usageprofiles;
 
-import java.security.InvalidParameterException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -66,5 +65,5 @@
      * @param r
      *            random number generator used by probabilistic methods of the class
-     * @throws InvalidParameterException
+     * @throws IllegalArgumentException
      *             thrown if markovOrder is less than 0 or the random number generator r is null
      */
@@ -72,8 +71,8 @@
         super();
         if (markovOrder < 0) {
-            throw new InvalidParameterException("markov order must not be less than 0");
+            throw new IllegalArgumentException("markov order must not be less than 0");
         }
         if (r == null) {
-            throw new InvalidParameterException("random number generator r must not be null");
+            throw new IllegalArgumentException("random number generator r must not be null");
         }
         this.trieOrder = markovOrder + 1;
@@ -90,5 +89,5 @@
      * @param sequences
      *            training data
-     * @throws InvalidParameterException
+     * @throws IllegalArgumentException
      *             thrown is sequences is null
      */
@@ -107,10 +106,10 @@
      * @param sequences
      *            training data
-     * @throws InvalidParameterException
+     * @throws IllegalArgumentException
      *             thrown is sequences is null
      */
     public void update(Collection<List<Event>> sequences) {
         if (sequences == null) {
-            throw new InvalidParameterException("sequences must not be null");
+            throw new IllegalArgumentException("sequences must not be null");
         }
         if (trie == null) {
@@ -300,5 +299,5 @@
         Set<List<Event>> sequenceSet = new LinkedHashSet<List<Event>>();
         if (length < 1) {
-            throw new InvalidParameterException(
+            throw new IllegalArgumentException(
                                                 "Length of generated subsequences must be at least 1.");
         }
@@ -361,5 +360,5 @@
     public double getProbability(List<Event> sequence) {
         if (sequence == null) {
-            throw new InvalidParameterException("sequence must not be null");
+            throw new IllegalArgumentException("sequence must not be null");
         }
         double prob = 1.0;
Index: trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/TrieNode.java
===================================================================
--- trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/TrieNode.java	(revision 655)
+++ trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/TrieNode.java	(revision 766)
@@ -2,5 +2,4 @@
 
 import java.io.Serializable;
-import java.security.InvalidParameterException;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -78,5 +77,5 @@
     TrieNode(T symbol) {
         if (symbol == null) {
-            throw new InvalidParameterException(
+            throw new IllegalArgumentException(
                                                 "symbol must not be null. null is reserved for root node!");
         }
@@ -95,5 +94,5 @@
     TrieNode(TrieNode<T> other) {
         if (other == null) {
-            throw new InvalidParameterException("other must not be null");
+            throw new IllegalArgumentException("other must not be null");
         }
         symbol = other.symbol;