Index: trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/CommandExecuterTest.java =================================================================== --- trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/CommandExecuterTest.java (revision 765) +++ trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/CommandExecuterTest.java (revision 766) @@ -15,5 +15,5 @@ public class CommandExecuterTest { - @Test(expected=java.security.InvalidParameterException.class) + @Test(expected=java.lang.IllegalArgumentException.class) public void testAddCommandPackage_1() throws Exception { @@ -23,5 +23,5 @@ } - @Test(expected=java.security.InvalidParameterException.class) + @Test(expected=java.lang.IllegalArgumentException.class) public void testAddCommandPackage_2() throws Exception { Index: trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/defaultcommands/CMDexecTest.java =================================================================== --- trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/defaultcommands/CMDexecTest.java (revision 765) +++ trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/defaultcommands/CMDexecTest.java (revision 766) @@ -70,5 +70,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testRun_3() throws Exception { CMDexec fixture = new CMDexec(); @@ -102,5 +102,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testRun_5() throws Exception { CMDexec fixture = new CMDexec(); Index: trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/mock/commands/CMDmockCommand.java =================================================================== --- trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/mock/commands/CMDmockCommand.java (revision 765) +++ trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/mock/commands/CMDmockCommand.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.util.console.mock.commands; -import java.security.InvalidParameterException; import java.util.List; @@ -16,5 +15,5 @@ break; case 1: - throw new InvalidParameterException(); + throw new IllegalArgumentException(); default: throw new RuntimeException(); 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 765) +++ trunk/java-utils/src/main/java/de/ugoe/cs/util/console/CommandExecuter.java (revision 766) @@ -7,5 +7,4 @@ import java.io.IOException; import java.net.URL; -import java.security.InvalidParameterException; import java.util.ArrayList; import java.util.Comparator; @@ -93,10 +92,10 @@ * @param pkg * package where commands are located - * @throws InvalidParameterException + * @throws IllegalArgumentException * thrown if the package name is null or empty string */ public void addCommandPackage(String pkg) { if ("".equals(pkg) || pkg == null) { - throw new InvalidParameterException("package name must not be null or empty string"); + throw new IllegalArgumentException("package name must not be null or empty string"); } commandPackageList.add(pkg); @@ -139,5 +138,5 @@ cmd.run(parser.getParameters()); } - catch (InvalidParameterException e) { + catch (IllegalArgumentException e) { Console.println("Usage: " + cmd.help()); } 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 765) +++ trunk/java-utils/src/main/java/de/ugoe/cs/util/console/defaultcommands/CMDexec.java (revision 766) @@ -6,5 +6,4 @@ import java.io.IOException; import java.io.InputStreamReader; -import java.security.InvalidParameterException; import java.util.List; import java.util.logging.Level; @@ -35,5 +34,5 @@ script = (String) parameters.get(0); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } try { Index: trunk/java-utils/src/main/java/de/ugoe/cs/util/console/defaultcommands/CMDman.java =================================================================== --- trunk/java-utils/src/main/java/de/ugoe/cs/util/console/defaultcommands/CMDman.java (revision 765) +++ trunk/java-utils/src/main/java/de/ugoe/cs/util/console/defaultcommands/CMDman.java (revision 766) @@ -4,5 +4,4 @@ import java.io.IOException; import java.io.InputStream; -import java.security.InvalidParameterException; import java.util.List; @@ -36,5 +35,5 @@ } else { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-core-assertions-test/src/test/java/de/ugoe/cs/quest/assertions/FileEqualsReplayTest.java =================================================================== --- trunk/quest-core-assertions-test/src/test/java/de/ugoe/cs/quest/assertions/FileEqualsReplayTest.java (revision 765) +++ trunk/quest-core-assertions-test/src/test/java/de/ugoe/cs/quest/assertions/FileEqualsReplayTest.java (revision 766) @@ -29,5 +29,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testFileEqualsReplay_2() throws Exception { String actualFile = "actualFileString"; @@ -36,5 +36,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testFileEqualsReplay_3() throws Exception { String expectedFile = "expectedFileString"; Index: trunk/quest-core-assertions-test/src/test/java/de/ugoe/cs/quest/assertions/TextEqualsReplayTest.java =================================================================== --- trunk/quest-core-assertions-test/src/test/java/de/ugoe/cs/quest/assertions/TextEqualsReplayTest.java (revision 765) +++ trunk/quest-core-assertions-test/src/test/java/de/ugoe/cs/quest/assertions/TextEqualsReplayTest.java (revision 766) @@ -40,5 +40,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testTextEqualsReplay_3() throws Exception { String expectedValue = "expectedValueString"; Index: trunk/quest-core-assertions/src/main/java/de/ugoe/cs/quest/assertions/FileEqualsReplay.java =================================================================== --- trunk/quest-core-assertions/src/main/java/de/ugoe/cs/quest/assertions/FileEqualsReplay.java (revision 765) +++ trunk/quest-core-assertions/src/main/java/de/ugoe/cs/quest/assertions/FileEqualsReplay.java (revision 766) @@ -1,5 +1,3 @@ package de.ugoe.cs.quest.assertions; - -import java.security.InvalidParameterException; import de.ugoe.cs.quest.IReplayDecorator; @@ -47,13 +45,13 @@ * @param actualFile * name and path of the actual file - * @throws InvalidParameterException + * @throws IllegalArgumentException * thrown if expectedFile or actualFile are null */ public FileEqualsReplay(String expectedFile, String actualFile) { if (expectedFile == null) { - throw new InvalidParameterException("expected file must not be null"); + throw new IllegalArgumentException("expected file must not be null"); } if (actualFile == null) { - throw new InvalidParameterException("actual file must not be null"); + throw new IllegalArgumentException("actual file must not be null"); } this.expectedFile = expectedFile; Index: trunk/quest-core-assertions/src/main/java/de/ugoe/cs/quest/assertions/TextEqualsReplay.java =================================================================== --- trunk/quest-core-assertions/src/main/java/de/ugoe/cs/quest/assertions/TextEqualsReplay.java (revision 765) +++ trunk/quest-core-assertions/src/main/java/de/ugoe/cs/quest/assertions/TextEqualsReplay.java (revision 766) @@ -1,5 +1,3 @@ package de.ugoe.cs.quest.assertions; - -import java.security.InvalidParameterException; import de.ugoe.cs.quest.IReplayDecorator; @@ -47,10 +45,10 @@ * string description of the target whose string value is compared to the expected * value - * @throws InvalidParameterException + * @throws IllegalArgumentException * thrown if target is null */ public TextEqualsReplay(String expectedValue, String target) { if (target == null) { - throw new InvalidParameterException("target must not be null"); + throw new IllegalArgumentException("target must not be null"); } this.expectedValue = expectedValue; Index: trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/CoverageCalculatorObservedTest.java =================================================================== --- trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/CoverageCalculatorObservedTest.java (revision 765) +++ trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/CoverageCalculatorObservedTest.java (revision 766) @@ -44,5 +44,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testCoverageCalculatorObserved_2() throws Exception { int length = 2; @@ -51,5 +51,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testCoverageCalculatorObserved_3() throws Exception { int length = 2; @@ -58,5 +58,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testCoverageCalculatorObserved_4() throws Exception { int length = 0; @@ -65,5 +65,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testCoverageCalculatorObserved_5() throws Exception { int length = -1; @@ -160,5 +160,5 @@ } - @Test(expected = java.security.InvalidParameterException.class ) + @Test(expected = java.lang.IllegalArgumentException.class ) public void testCoveragePossibleNew_3() throws Exception { int length = 3; @@ -191,5 +191,5 @@ } - @Test(expected = java.security.InvalidParameterException.class ) + @Test(expected = java.lang.IllegalArgumentException.class ) public void testCoveragePossibleNewWeight_3() throws Exception { int length = 3; Index: trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/CoverageCalculatorProcessTest.java =================================================================== --- trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/CoverageCalculatorProcessTest.java (revision 765) +++ trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/CoverageCalculatorProcessTest.java (revision 766) @@ -40,5 +40,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testCoverageCalculatorProcess_2() throws Exception { int length = 2; @@ -47,5 +47,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testCoverageCalculatorProcess_3() throws Exception { int length = 2; @@ -54,5 +54,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testCoverageCalculatorProcess_4() throws Exception { int length = 0; @@ -61,5 +61,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testCoverageCalculatorProcess_5() throws Exception { int length = -1; @@ -179,5 +179,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testSetSequences_2() throws Exception { int length = 2; Index: trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/SequenceToolsTest.java =================================================================== --- trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/SequenceToolsTest.java (revision 765) +++ trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/SequenceToolsTest.java (revision 766) @@ -55,5 +55,5 @@ } - @Test(expected=java.security.InvalidParameterException.class) + @Test(expected=java.lang.IllegalArgumentException.class) public void testContainedSubSequences_3() throws Exception { @@ -63,5 +63,5 @@ } - @Test(expected=java.security.InvalidParameterException.class) + @Test(expected=java.lang.IllegalArgumentException.class) public void testContainedSubSequences_4() throws Exception { @@ -129,5 +129,5 @@ } - @Test(expected = java.security.InvalidParameterException.class ) + @Test(expected = java.lang.IllegalArgumentException.class ) public void testNumSequences_3() throws Exception { @@ -137,5 +137,5 @@ } - @Test(expected = java.security.InvalidParameterException.class ) + @Test(expected = java.lang.IllegalArgumentException.class ) public void testNumSequences_4() throws Exception { Index: trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorObserved.java =================================================================== --- trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorObserved.java (revision 765) +++ trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorObserved.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.coverage; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.LinkedHashSet; @@ -69,5 +68,5 @@ * @param length * length of the subsequences for which the coverage is analyzed; must be >0 - * @throws InvalidParameterException + * @throws IllegalArgumentException * thrown if observedSequences or sequences is null or length less than or equal to * 0 @@ -78,11 +77,11 @@ { if (observedSequences == null) { - throw new InvalidParameterException("observed sequences must not be null"); + throw new IllegalArgumentException("observed sequences must not be null"); } if (sequences == null) { - throw new InvalidParameterException("sequences must not be null"); + throw new IllegalArgumentException("sequences must not be null"); } if (length <= 0) { - throw new InvalidParameterException("length must be >0; actual value: " + length); + throw new IllegalArgumentException("length must be >0; actual value: " + length); } this.observedSequences = observedSequences; @@ -158,10 +157,10 @@ * stochastic process which is used to determine which subsequences are possible * @return coverage percentage - * @throws InvalidParameterException + * @throws IllegalArgumentException * thrown if process is null */ public double getCoveragePossibleNew(IStochasticProcess process) { if (process == null) { - throw new InvalidParameterException("process must not be null"); + throw new IllegalArgumentException("process must not be null"); } createSubSeqs(); @@ -186,10 +185,10 @@ * are possible * @return coverage percentage - * @throws InvalidParameterException + * @throws IllegalArgumentException * thrown if process is null */ public double getCoveragePossibleNewWeight(IStochasticProcess process) { if (process == null) { - throw new InvalidParameterException("process must not be null"); + throw new IllegalArgumentException("process must not be null"); } createSubSeqs(); Index: trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorProcess.java =================================================================== --- trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorProcess.java (revision 765) +++ trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorProcess.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.coverage; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.List; @@ -74,5 +73,5 @@ * @param length * length of the subsequences for which the coverage is analyzed; must be >0 - * @throws InvalidParameterException + * @throws IllegalArgumentException * thrown if process or sequences is null or length less than or equal to 0 */ @@ -82,11 +81,11 @@ { if (process == null) { - throw new InvalidParameterException("process must not be null"); + throw new IllegalArgumentException("process must not be null"); } if (sequences == null) { - throw new InvalidParameterException("sequences must not be null"); + throw new IllegalArgumentException("sequences must not be null"); } if (length <= 0) { - throw new InvalidParameterException("length must be >0; actual value: " + length); + throw new IllegalArgumentException("length must be >0; actual value: " + length); } this.process = process; @@ -191,10 +190,10 @@ * @param newSequences * new collection of sequences - * @throws InvalidParameterException + * @throws IllegalArgumentException * thrown is newSequences is null */ public void setSequences(Collection> newSequences) { if (newSequences == null) { - throw new InvalidParameterException("sequences must not be null"); + throw new IllegalArgumentException("sequences must not be null"); } this.sequences = newSequences; Index: trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/SequenceTools.java =================================================================== --- trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/SequenceTools.java (revision 765) +++ trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/SequenceTools.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.coverage; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.LinkedHashMap; @@ -83,10 +82,10 @@ * lenght of the sequences * @return numStates^length - * @throws InvalidParameterException + * @throws IllegalArgumentException * thrown if length less or equal to 0 */ public static long numSequences(IStochasticProcess process, int length) { if (length <= 0) { - throw new InvalidParameterException("length must be a positive integer"); + throw new IllegalArgumentException("length must be a positive integer"); } long result = 0; @@ -108,5 +107,5 @@ * length of the subsequences * @return {@link Set} of all subsequences - * @throws InvalidParameterException + * @throws IllegalArgumentException * thrown if length less or equal to 0 */ @@ -115,5 +114,5 @@ { if (length <= 0) { - throw new InvalidParameterException("length must be a positive integer"); + throw new IllegalArgumentException("length must be a positive integer"); } Set> containedSubSeqs = new LinkedHashSet>(); Index: trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/eventcore/EventTest.java =================================================================== --- trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/eventcore/EventTest.java (revision 765) +++ trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/eventcore/EventTest.java (revision 766) @@ -27,5 +27,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testEvent_2() throws Exception { new Event(null); @@ -265,5 +265,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testAddReplayEvent_fixture_3() throws Exception { Event fixture = new Event(mock(IEventType.class)); @@ -289,5 +289,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testAddReplaySequence_2() throws Exception { Event fixture = new Event(mock(IEventType.class)); Index: trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/Event.java =================================================================== --- trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/Event.java (revision 765) +++ trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/Event.java (revision 766) @@ -2,5 +2,4 @@ import java.io.Serializable; -import java.security.InvalidParameterException; import java.util.LinkedList; import java.util.List; @@ -68,5 +67,5 @@ public Event(IEventType type) { if (type == null) { - throw new InvalidParameterException("Event type must not be null"); + throw new IllegalArgumentException("Event type must not be null"); } this.type = type; @@ -208,10 +207,10 @@ * @param replayable * element that is added to the sequence - * @throws InvalidParameterException + * @throws IllegalArgumentException * thrown is replayable is null */ public void addReplayable(IReplayable replayable) { if (replayable == null) { - throw new InvalidParameterException("replayble must not be null"); + throw new IllegalArgumentException("replayble must not be null"); } replay.add(replayable); @@ -225,10 +224,10 @@ * @param generatedReplaySeq * {@link List} that is added to the sequence - * @throws InvalidParameterException + * @throws IllegalArgumentException * thrown if generatedReplaySeq is null */ public void addReplayableSequence(List generatedReplaySeq) { if (generatedReplaySeq == null) { - throw new InvalidParameterException("generatedReplaySeq must not be null"); + throw new IllegalArgumentException("generatedReplaySeq must not be null"); } replay.addAll(generatedReplaySeq); Index: trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/StringEventType.java =================================================================== --- trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/StringEventType.java (revision 765) +++ trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/StringEventType.java (revision 766) @@ -1,5 +1,3 @@ package de.ugoe.cs.quest.eventcore; - -import java.security.InvalidParameterException; /** @@ -34,10 +32,10 @@ * @param str * string that identifies the event type - * @throws InvalidParameterException + * @throws IllegalArgumentException * thrown if str is null */ - public StringEventType(String str) throws InvalidParameterException { + public StringEventType(String str) throws IllegalArgumentException { if (str == null) { - throw new InvalidParameterException("str must not be null"); + throw new IllegalArgumentException("str must not be null"); } this.str = str; 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 765) +++ trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/DrawFromAllSequencesGenerator.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.testgeneration; -import java.security.InvalidParameterException; import java.util.ArrayList; import java.util.Collection; @@ -73,5 +72,5 @@ *
  • minLength must be less than or equal to maxLength * - * If one of these conditions is violated an {@link InvalidParameterException} is thrown. + * If one of these conditions is violated an {@link IllegalArgumentException} is thrown. *

    * @@ -97,14 +96,14 @@ // check validity of the parameters if (numSequences < 1) { - throw new InvalidParameterException("number of sequences must be at least 1 but is " + + throw new IllegalArgumentException("number of sequences must be at least 1 but is " + numSequences); } if (maxLength < 1) { - throw new InvalidParameterException( + throw new IllegalArgumentException( "maximal allowed length of test cases must be at least 1 but is " + maxLength); } if (minLength > maxLength) { - throw new InvalidParameterException( + throw new IllegalArgumentException( "minimal allowed length of test cases must be less than or equal to the maximal allowed length (min length: " + minLength + " ; max length: " + maxLength + ")"); @@ -128,5 +127,5 @@ public Collection> generateTestSuite(IStochasticProcess model) { if (model == null) { - throw new InvalidParameterException("model must not be null!"); + throw new IllegalArgumentException("model must not be null!"); } 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 765) +++ trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/HybridGenerator.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.testgeneration; -import java.security.InvalidParameterException; import java.util.ArrayList; import java.util.Collection; @@ -61,5 +60,5 @@ *
  • length must be at least 1 * - * If one of these conditions is violated an {@link InvalidParameterException} is thrown. + * If one of these conditions is violated an {@link IllegalArgumentException} is thrown. *

    * @@ -77,9 +76,9 @@ // check validity of the parameters if (numSequences < 1) { - throw new InvalidParameterException("number of sequences must be at least 1 but is " + + throw new IllegalArgumentException("number of sequences must be at least 1 but is " + numSequences); } if (length < 1) { - throw new InvalidParameterException("length of test cases must be at least 1 but is " + + throw new IllegalArgumentException("length of test cases must be at least 1 but is " + length); } @@ -102,5 +101,5 @@ public Collection> generateTestSuite(IStochasticProcess model) { if (model == null) { - throw new InvalidParameterException("model must not be null!"); + throw new IllegalArgumentException("model must not be null!"); } Index: trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/RandomWalkGenerator.java =================================================================== --- trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/RandomWalkGenerator.java (revision 765) +++ trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/RandomWalkGenerator.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.testgeneration; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.HashSet; @@ -75,5 +74,5 @@ *
  • maxIter must be greater than or equal to numSequences * - * If one of these conditions is violated an {@link InvalidParameterException} is thrown. + * If one of these conditions is violated an {@link IllegalArgumentException} is thrown. *

    * @@ -99,19 +98,19 @@ // check validity of the parameters if (numSequences < 1) { - throw new InvalidParameterException("number of sequences must be at least 1 but is " + + throw new IllegalArgumentException("number of sequences must be at least 1 but is " + numSequences); } if (maxLength < 1) { - throw new InvalidParameterException( + throw new IllegalArgumentException( "maximal allowed length of test cases must be at least 1 but is " + maxLength); } if (minLength > maxLength) { - throw new InvalidParameterException( + throw new IllegalArgumentException( "minimal allowed length of test cases must be less than or equal to the maximal allowed length (min length: " + minLength + " ; max length: " + maxLength + ")"); } if (maxIter < numSequences) { - throw new InvalidParameterException( + throw new IllegalArgumentException( "maximal number of iterations must greater than or equal to the number of sequences (number of sequences: " + numSequences + @@ -138,5 +137,5 @@ public Collection> generateTestSuite(IStochasticProcess model) { if (model == null) { - throw new InvalidParameterException("model must not be null!"); + throw new IllegalArgumentException("model must not be null!"); } Index: trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/DeterministicFiniteAutomatonTest.java =================================================================== --- trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/DeterministicFiniteAutomatonTest.java (revision 765) +++ trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/DeterministicFiniteAutomatonTest.java (revision 766) @@ -36,5 +36,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testDeterministicFiniteAutomaton_2() throws Exception { new DeterministicFiniteAutomaton(null); @@ -106,5 +106,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testGetProbability_5() throws Exception { DeterministicFiniteAutomaton fixture = new DeterministicFiniteAutomaton( @@ -120,5 +120,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testGetProbability_6() throws Exception { DeterministicFiniteAutomaton fixture = new DeterministicFiniteAutomaton( Index: trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/FirstOrderMarkovModelTest.java =================================================================== --- trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/FirstOrderMarkovModelTest.java (revision 765) +++ trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/FirstOrderMarkovModelTest.java (revision 766) @@ -35,5 +35,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testFirstOrderMarkovModel_2() throws Exception { new FirstOrderMarkovModel(null); Index: trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/HighOrderMarkovModelTest.java =================================================================== --- trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/HighOrderMarkovModelTest.java (revision 765) +++ trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/HighOrderMarkovModelTest.java (revision 766) @@ -49,5 +49,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testHighOrderMarkovModel_3() throws Exception { int maxOrder = 1; @@ -57,5 +57,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testHighOrderMarkovModel_4() throws Exception { int maxOrder = -1; @@ -188,5 +188,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testGetProbability_8() throws Exception { int markovOrder = 0; @@ -204,5 +204,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testGetProbability_9() throws Exception { int markovOrder = 0; Index: trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/IncompleteMemoryTest.java =================================================================== --- trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/IncompleteMemoryTest.java (revision 765) +++ trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/IncompleteMemoryTest.java (revision 766) @@ -27,5 +27,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testIncompleteMemory_2() throws Exception { Index: trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/PredictionByPartialMatchTest.java =================================================================== --- trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/PredictionByPartialMatchTest.java (revision 765) +++ trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/PredictionByPartialMatchTest.java (revision 766) @@ -40,5 +40,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testPredictionByPartialMatch_2() throws Exception { int markovOrder = -1; @@ -48,5 +48,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testPredictionByPartialMatch_3() throws Exception { int markovOrder = 2; @@ -72,5 +72,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testPredictionByPartialMatch_5() throws Exception { int markovOrder = -1; @@ -81,5 +81,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testPredictionByPartialMatch_6() throws Exception { int markovOrder = 2; @@ -90,5 +90,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testPredictionByPartialMatch_7() throws Exception { int markovOrder = 2; @@ -99,5 +99,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testPredictionByPartialMatch_8() throws Exception { int markovOrder = 2; @@ -125,5 +125,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testPredictionByPartialMatch_10() throws Exception { int markovOrder = -1; @@ -135,5 +135,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testPredictionByPartialMatch_11() throws Exception { int markovOrder = 2; @@ -145,5 +145,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testPredictionByPartialMatch_12() throws Exception { int markovOrder = 2; @@ -155,5 +155,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testPredictionByPartialMatch_13() throws Exception { int markovOrder = 2; @@ -165,5 +165,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testPredictionByPartialMatch_14() throws Exception { int markovOrder = 2; @@ -175,5 +175,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testPredictionByPartialMatch_15() throws Exception { int markovOrder = 2; Index: trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/TrieBasedModelTest.java =================================================================== --- trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/TrieBasedModelTest.java (revision 765) +++ trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/TrieBasedModelTest.java (revision 766) @@ -267,5 +267,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testTrieBasedModel_2() throws Exception { int markovOrder = -1; @@ -275,5 +275,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testTrieBasedModel_3() throws Exception { int markovOrder = 2; @@ -377,5 +377,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testGenerateSequences_3() throws Exception { int markovOrder = 2; @@ -423,5 +423,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testGenerateValidSequences_2() throws Exception { int markovOrder = 2; @@ -570,5 +570,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testTrain_3() throws Exception { int markovOrder = 2; @@ -595,5 +595,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testUpdate_2() throws Exception { int markovOrder = 2; Index: trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/TrieTest.java =================================================================== --- trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/TrieTest.java (revision 765) +++ trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/TrieTest.java (revision 766) @@ -59,5 +59,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testTrie_3() throws Exception { new Trie(null); @@ -159,5 +159,5 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testGetChildCreate_2() throws Exception { Trie fixture = new Trie(); 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 765) +++ 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 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 765) +++ 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 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 765) +++ 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 765) +++ 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 765) +++ 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 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 765) +++ 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 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(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 765) +++ 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> 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> sequenceSet = new LinkedHashSet>(); 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 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 765) +++ 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 other) { if (other == null) { - throw new InvalidParameterException("other must not be null"); + throw new IllegalArgumentException("other must not be null"); } symbol = other.symbol; Index: trunk/quest-plugin-core-test/src/test/java/de/ugoe/cs/quest/plugin/PluginLoaderTest.java =================================================================== --- trunk/quest-plugin-core-test/src/test/java/de/ugoe/cs/quest/plugin/PluginLoaderTest.java (revision 765) +++ trunk/quest-plugin-core-test/src/test/java/de/ugoe/cs/quest/plugin/PluginLoaderTest.java (revision 766) @@ -24,10 +24,10 @@ } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testPluginLoader_2() throws Exception { new PluginLoader(null); } - @Test(expected = java.security.InvalidParameterException.class) + @Test(expected = java.lang.IllegalArgumentException.class) public void testPluginLoader_3() throws Exception { new PluginLoader(new File("testdata/de.ugoe.cs.quest.plugin.PluginLoaderTest/jfcmonitor.jar")); Index: trunk/quest-plugin-core/src/main/java/de/ugoe/cs/quest/plugin/PluginLoader.java =================================================================== --- trunk/quest-plugin-core/src/main/java/de/ugoe/cs/quest/plugin/PluginLoader.java (revision 765) +++ trunk/quest-plugin-core/src/main/java/de/ugoe/cs/quest/plugin/PluginLoader.java (revision 766) @@ -11,5 +11,4 @@ import java.net.URL; import java.net.URLClassLoader; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.Collections; @@ -52,13 +51,13 @@ * handle of the directory; in case the handle is * null or does not describe a directory, an - * {@link InvalidParameterException} is thrown + * {@link IllegalArgumentException} is thrown */ public PluginLoader(File pluginDir) { if (pluginDir == null) { - throw new InvalidParameterException( + throw new IllegalArgumentException( "Parameter pluginDir must not be null!"); } if (!pluginDir.isDirectory()) { - throw new InvalidParameterException("File " + pluginDir.getPath() + throw new IllegalArgumentException("File " + pluginDir.getPath() + " is not a directory"); } 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 765) +++ trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgTestCasesToSequences.java (revision 766) @@ -3,5 +3,4 @@ import java.io.File; import java.io.FilenameFilter; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.LinkedList; @@ -43,5 +42,5 @@ } } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgToDFA.java =================================================================== --- trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgToDFA.java (revision 765) +++ trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgToDFA.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.plugin.guitar.commands; -import java.security.InvalidParameterException; import java.util.List; @@ -33,5 +32,5 @@ modelname = (String) parameters.get(1); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgToMM.java =================================================================== --- trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgToMM.java (revision 765) +++ trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgToMM.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.plugin.guitar.commands; -import java.security.InvalidParameterException; import java.util.List; @@ -33,5 +32,5 @@ modelname = (String) parameters.get(1); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } 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 765) +++ trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/JFCLogParser.java (revision 766) @@ -8,5 +8,4 @@ import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; -import java.security.InvalidParameterException; import java.util.ArrayList; import java.util.Collection; @@ -197,5 +196,5 @@ public void parseFile(String filename) { if (filename == null) { - throw new InvalidParameterException("filename must not be null"); + throw new IllegalArgumentException("filename must not be null"); } @@ -213,5 +212,5 @@ public void parseFile(File file) { if (file == null) { - throw new InvalidParameterException("file must not be null"); + throw new IllegalArgumentException("file must not be null"); } 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 765) +++ trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDparseDirJFC.java (revision 766) @@ -2,5 +2,4 @@ import java.io.File; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.List; @@ -44,5 +43,5 @@ } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDparseJFC.java =================================================================== --- trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDparseJFC.java (revision 765) +++ trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDparseJFC.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.plugin.jfc.commands; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.List; @@ -39,5 +38,5 @@ } } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } 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 765) +++ trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDpreprocessDirJFC.java (revision 766) @@ -9,5 +9,4 @@ import java.io.OutputStreamWriter; import java.io.UnsupportedEncodingException; -import java.security.InvalidParameterException; import java.util.List; import java.util.logging.Level; @@ -42,5 +41,5 @@ targetPath = (String) parameters.get(1); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDpreprocessJFC.java =================================================================== --- trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDpreprocessJFC.java (revision 765) +++ trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDpreprocessJFC.java (revision 766) @@ -9,5 +9,4 @@ import java.io.OutputStreamWriter; import java.io.UnsupportedEncodingException; -import java.security.InvalidParameterException; import java.util.List; @@ -41,5 +40,5 @@ target = (String) parameters.get(1); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } 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 765) +++ trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/EventGenerator.java (revision 766) @@ -2,5 +2,4 @@ import java.io.IOException; -import java.security.InvalidParameterException; import java.util.ArrayList; import java.util.HashMap; @@ -174,5 +173,5 @@ generateReplayMessage(replayMessageSpec); } - catch (InvalidParameterException e) { + catch (IllegalArgumentException e) { Console.printerrln(e.getMessage()); // TODO currentToken.invalidateReplay(); @@ -184,5 +183,5 @@ // TODO currentToken.invalidateReplay(); } - catch (InvalidParameterException e) { + catch (IllegalArgumentException e) { Console.printerrln(e.getMessage()); // TODO currentToken.invalidateReplay(); @@ -242,5 +241,5 @@ isMatch = matchMultipleConditions(messageCondition, nextMessageCondition); } - catch (InvalidParameterException e) { + catch (IllegalArgumentException e) { Console.printerrln(e.getMessage()); } @@ -250,5 +249,5 @@ isMatch = matchSingleMessage(messageCondition); } - catch (InvalidParameterException e) { + catch (IllegalArgumentException e) { Console.printerrln(e.getMessage()); } @@ -606,5 +605,5 @@ if (seqVar.size() != generatedMessageSeq.size()) { - throw new InvalidParameterException + throw new IllegalArgumentException ("Failure generating replay sequence for rule " + currentRuleName + ": One or more of the sequence variables used to generate a sequence have " + @@ -656,5 +655,5 @@ if (seqVar.size() != generatedMessageSeq.size()) { - throw new InvalidParameterException + throw new IllegalArgumentException ("Failure generating replay sequence for rule " + currentRuleName + ": One or more of the sequence variables used to generate a sequence have " + @@ -712,5 +711,5 @@ if (seqVar.size() != generatedMessageSeq.size()) { - throw new InvalidParameterException + throw new IllegalArgumentException ("Failure generating replay sequence for rule " + currentRuleName + ": One or more of the sequence variables used to generate a sequence have " + @@ -783,15 +782,15 @@ * object identifier in the storage * @return message retrieved from the storage - * @throws InvalidParameterException + * @throws IllegalArgumentException * thrown in case of invalid uses of "this" or if no message with the identifier obj * is found in the storage */ private ReplayWindowsMessage getStoredMessageVariable(WindowsMessage currentMessage, String obj) - throws InvalidParameterException + throws IllegalArgumentException { ReplayWindowsMessage varMessage = null; if (obj.equals("this")) { if (currentMessage == null) { - throw new InvalidParameterException("Failure obtaining term value for rule " + + throw new IllegalArgumentException("Failure obtaining term value for rule " + currentRuleName + ": \"this\" is not a valid name for generating runtime messages."); @@ -805,5 +804,5 @@ } else { - throw new InvalidParameterException("Failure obtaining term value for rule " + + throw new IllegalArgumentException("Failure obtaining term value for rule " + currentRuleName + ": No message \"" + obj + "\" stored."); } 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 765) +++ trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/MFCLogParser.java (revision 766) @@ -6,5 +6,4 @@ import java.io.IOException; import java.io.InputStreamReader; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.HashMap; @@ -143,5 +142,5 @@ public void parseFile(String filename) { if (filename == null) { - throw new InvalidParameterException("filename must not be null"); + throw new IllegalArgumentException("filename must not be null"); } @@ -159,5 +158,5 @@ public void parseFile(File file) { if (file == null) { - throw new InvalidParameterException("file must not be null"); + throw new IllegalArgumentException("file must not be null"); } @@ -331,5 +330,5 @@ sequenceSplitter.addMessage(message); } - catch (InvalidParameterException e) { + catch (IllegalArgumentException e) { Console.traceln(Level.WARNING, e.getMessage() + " WindowsMessage " + currentMessageType + " ignored."); Index: trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDconvertDirToXml.java =================================================================== --- trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDconvertDirToXml.java (revision 765) +++ trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDconvertDirToXml.java (revision 766) @@ -3,5 +3,4 @@ import java.io.FileNotFoundException; import java.io.IOException; -import java.security.InvalidParameterException; import java.util.List; @@ -38,5 +37,5 @@ public void run(List parameters) { if (parameters.size() < 2) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } String path = (String) parameters.get(0); Index: trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDconvertToXml.java =================================================================== --- trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDconvertToXml.java (revision 765) +++ trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDconvertToXml.java (revision 766) @@ -3,5 +3,4 @@ import java.io.FileNotFoundException; import java.io.IOException; -import java.security.InvalidParameterException; import java.util.List; @@ -38,5 +37,5 @@ public void run(List parameters) { if (parameters.size() < 2) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } String source = (String) parameters.get(0); Index: trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDparseXML.java =================================================================== --- trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDparseXML.java (revision 765) +++ trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDparseXML.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.plugin.mfc.commands; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.List; @@ -53,5 +52,5 @@ } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-plugin-php/src/main/java/de/ugoe/cs/quest/plugin/php/commands/CMDloadWebSequences.java =================================================================== --- trunk/quest-plugin-php/src/main/java/de/ugoe/cs/quest/plugin/php/commands/CMDloadWebSequences.java (revision 765) +++ trunk/quest-plugin-php/src/main/java/de/ugoe/cs/quest/plugin/php/commands/CMDloadWebSequences.java (revision 766) @@ -3,5 +3,4 @@ import java.io.FileNotFoundException; import java.io.IOException; -import java.security.InvalidParameterException; import java.text.ParseException; import java.util.Collection; @@ -33,5 +32,5 @@ public void run(List parameters) { if (parameters.size() < 1) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } String source; @@ -61,5 +60,5 @@ } } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDdeleteObject.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDdeleteObject.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDdeleteObject.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.misc; -import java.security.InvalidParameterException; import java.util.List; @@ -39,5 +38,5 @@ objectName = (String) parameters.get(0); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } boolean deleted = GlobalDataContainer.getInstance().removeData( Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDload.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDload.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDload.java (revision 766) @@ -4,5 +4,4 @@ import java.io.IOException; import java.io.ObjectInputStream; -import java.security.InvalidParameterException; import java.util.List; @@ -32,5 +31,5 @@ filename = (String) parameters.get(0); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDloadObject.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDloadObject.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDloadObject.java (revision 766) @@ -4,5 +4,4 @@ import java.io.IOException; import java.io.ObjectInputStream; -import java.security.InvalidParameterException; import java.util.List; @@ -36,5 +35,5 @@ objectName = (String) parameters.get(1); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDsave.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDsave.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDsave.java (revision 766) @@ -4,5 +4,4 @@ import java.io.IOException; import java.io.ObjectOutputStream; -import java.security.InvalidParameterException; import java.util.List; @@ -32,5 +31,5 @@ filename = (String) parameters.get(0); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDsaveObject.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDsaveObject.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDsaveObject.java (revision 766) @@ -4,5 +4,4 @@ import java.io.IOException; import java.io.ObjectOutputStream; -import java.security.InvalidParameterException; import java.util.List; @@ -36,5 +35,5 @@ objectName = (String) parameters.get(1); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDshowTimer.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDshowTimer.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDshowTimer.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.misc; -import java.security.InvalidParameterException; import java.util.List; import java.util.logging.Level; @@ -31,5 +30,5 @@ timerName = (String) parameters.get(0); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDstartFileListener.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDstartFileListener.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDstartFileListener.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.misc; -import java.security.InvalidParameterException; import java.util.List; @@ -30,5 +29,5 @@ filename = (String) parameters.get(0); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDstartTimer.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDstartTimer.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDstartTimer.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.misc; -import java.security.InvalidParameterException; import java.util.List; @@ -29,5 +28,5 @@ timerName = (String) parameters.get(0); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Long time = System.currentTimeMillis(); Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDstopFileListener.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDstopFileListener.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDstopFileListener.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.misc; -import java.security.InvalidParameterException; import java.util.List; @@ -24,5 +23,5 @@ filename = (String) parameters.get(0); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDcondenseMouseClicks.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDcondenseMouseClicks.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDcondenseMouseClicks.java (revision 766) @@ -2,5 +2,4 @@ package de.ugoe.cs.quest.commands.sequences; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.LinkedList; @@ -57,5 +56,5 @@ } catch (Exception e) { - throw new InvalidParameterException("must provide a sequences name"); + throw new IllegalArgumentException("must provide a sequences name"); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDcorrectKeyInteractionTargets.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDcorrectKeyInteractionTargets.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDcorrectKeyInteractionTargets.java (revision 766) @@ -2,5 +2,4 @@ package de.ugoe.cs.quest.commands.sequences; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.LinkedList; @@ -57,5 +56,5 @@ } catch (Exception e) { - throw new InvalidParameterException("must provide a sequences name"); + throw new IllegalArgumentException("must provide a sequences name"); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDdetectTextInputEvents.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDdetectTextInputEvents.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDdetectTextInputEvents.java (revision 766) @@ -2,5 +2,4 @@ package de.ugoe.cs.quest.commands.sequences; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.LinkedList; @@ -60,5 +59,5 @@ } catch (Exception e) { - throw new InvalidParameterException("must provide a sequences name"); + throw new IllegalArgumentException("must provide a sequences name"); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDgenerateReplayfile.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDgenerateReplayfile.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDgenerateReplayfile.java (revision 766) @@ -5,5 +5,4 @@ import java.io.IOException; import java.io.OutputStreamWriter; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.List; @@ -56,5 +55,5 @@ sequencesName = (String) parameters.get(1); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDsequenceStatistics.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDsequenceStatistics.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDsequenceStatistics.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.sequences; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.List; @@ -38,5 +37,5 @@ sequencesName = (String) parameters.get(0); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDsortKeyInteractions.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDsortKeyInteractions.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDsortKeyInteractions.java (revision 766) @@ -2,5 +2,4 @@ package de.ugoe.cs.quest.commands.sequences; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.LinkedList; @@ -81,5 +80,5 @@ } catch (Exception e) { - throw new InvalidParameterException("must provide a sequences name"); + throw new IllegalArgumentException("must provide a sequences name"); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usability/CMDevaluateUsability.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usability/CMDevaluateUsability.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usability/CMDevaluateUsability.java (revision 766) @@ -2,5 +2,4 @@ package de.ugoe.cs.quest.commands.usability; -import java.security.InvalidParameterException; import java.util.List; @@ -53,5 +52,5 @@ } catch (Exception e) { - throw new InvalidParameterException("must provide a task tree name"); + throw new IllegalArgumentException("must provide a task tree name"); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usability/CMDgenerateTaskTree.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usability/CMDgenerateTaskTree.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usability/CMDgenerateTaskTree.java (revision 766) @@ -2,5 +2,4 @@ package de.ugoe.cs.quest.commands.usability; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.List; @@ -56,5 +55,5 @@ } catch (Exception e) { - throw new InvalidParameterException("must provide a sequences name"); + throw new IllegalArgumentException("must provide a sequences name"); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/AbstractTrainCommand.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/AbstractTrainCommand.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/AbstractTrainCommand.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.usage; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.List; @@ -67,5 +66,5 @@ handleAdditionalParameters(parameters); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDcalcCoverage.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDcalcCoverage.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDcalcCoverage.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.usage; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.List; @@ -45,5 +44,5 @@ maxLength = Integer.parseInt((String) parameters.get(4)); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDcalcEntropy.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDcalcEntropy.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDcalcEntropy.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.usage; -import java.security.InvalidParameterException; import java.util.List; @@ -41,5 +40,5 @@ modelname = (String) parameters.get(0); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDflattenModel.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDflattenModel.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDflattenModel.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.usage; -import java.security.InvalidParameterException; import java.util.List; @@ -36,5 +35,5 @@ modelnameFOM = (String) parameters.get(1); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDgenerateFixedLengthSequences.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDgenerateFixedLengthSequences.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDgenerateFixedLengthSequences.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.usage; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.List; @@ -52,5 +51,5 @@ } } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDgenerateGreedy.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDgenerateGreedy.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDgenerateGreedy.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.usage; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.Iterator; @@ -63,5 +62,5 @@ } } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDgenerateHybrid.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDgenerateHybrid.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDgenerateHybrid.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.usage; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.LinkedList; @@ -47,5 +46,5 @@ } } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDgenerateRandomSequences.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDgenerateRandomSequences.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDgenerateRandomSequences.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.usage; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.List; @@ -51,5 +50,5 @@ } } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDlistSymbols.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDlistSymbols.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDlistSymbols.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.usage; -import java.security.InvalidParameterException; import java.util.Arrays; import java.util.List; @@ -37,5 +36,5 @@ } } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDmodelSize.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDmodelSize.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDmodelSize.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.usage; -import java.security.InvalidParameterException; import java.util.List; @@ -31,5 +30,5 @@ modelname = (String) parameters.get(0); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDprintDot.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDprintDot.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDprintDot.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.usage; -import java.security.InvalidParameterException; import java.util.List; @@ -42,5 +41,5 @@ modelname = (String) parameters.get(0); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDprintTrieDot.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDprintTrieDot.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDprintTrieDot.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.usage; -import java.security.InvalidParameterException; import java.util.List; @@ -43,5 +42,5 @@ modelname = (String) parameters.get(0); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDshowMarkovModel.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDshowMarkovModel.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDshowMarkovModel.java (revision 766) @@ -4,5 +4,4 @@ import java.awt.Rectangle; import java.awt.Shape; -import java.security.InvalidParameterException; import java.util.List; @@ -59,5 +58,5 @@ } } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDshowTrie.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDshowTrie.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDshowTrie.java (revision 766) @@ -4,5 +4,4 @@ import java.awt.Rectangle; import java.awt.Shape; -import java.security.InvalidParameterException; import java.util.List; @@ -56,5 +55,5 @@ modelname = (String) parameters.get(0); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDupdateModel.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDupdateModel.java (revision 765) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDupdateModel.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.commands.usage; -import java.security.InvalidParameterException; import java.util.Collection; import java.util.List; @@ -37,5 +36,5 @@ sequencesName = (String) parameters.get(1); } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/commands/CMDshowSequences.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/commands/CMDshowSequences.java (revision 765) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/commands/CMDshowSequences.java (revision 766) @@ -1,5 +1,4 @@ package de.ugoe.cs.quest.ui.swt.commands; -import java.security.InvalidParameterException; import java.util.List; @@ -44,5 +43,5 @@ } catch (Exception e) { - throw new InvalidParameterException(); + throw new IllegalArgumentException(); }