Changeset 766
- Timestamp:
- 09/04/12 17:15:28 (12 years ago)
- Location:
- trunk
- Files:
-
- 86 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/CommandExecuterTest.java
r668 r766 15 15 public class CommandExecuterTest { 16 16 17 @Test(expected=java. security.InvalidParameterException.class)17 @Test(expected=java.lang.IllegalArgumentException.class) 18 18 public void testAddCommandPackage_1() 19 19 throws Exception { … … 23 23 } 24 24 25 @Test(expected=java. security.InvalidParameterException.class)25 @Test(expected=java.lang.IllegalArgumentException.class) 26 26 public void testAddCommandPackage_2() 27 27 throws Exception { -
trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/defaultcommands/CMDexecTest.java
r668 r766 70 70 } 71 71 72 @Test(expected = java. security.InvalidParameterException.class)72 @Test(expected = java.lang.IllegalArgumentException.class) 73 73 public void testRun_3() throws Exception { 74 74 CMDexec fixture = new CMDexec(); … … 102 102 } 103 103 104 @Test(expected = java. security.InvalidParameterException.class)104 @Test(expected = java.lang.IllegalArgumentException.class) 105 105 public void testRun_5() throws Exception { 106 106 CMDexec fixture = new CMDexec(); -
trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/mock/commands/CMDmockCommand.java
r664 r766 1 1 package de.ugoe.cs.util.console.mock.commands; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.List; 5 4 … … 16 15 break; 17 16 case 1: 18 throw new I nvalidParameterException();17 throw new IllegalArgumentException(); 19 18 default: 20 19 throw new RuntimeException(); -
trunk/java-utils/src/main/java/de/ugoe/cs/util/console/CommandExecuter.java
r749 r766 7 7 import java.io.IOException; 8 8 import java.net.URL; 9 import java.security.InvalidParameterException;10 9 import java.util.ArrayList; 11 10 import java.util.Comparator; … … 93 92 * @param pkg 94 93 * package where commands are located 95 * @throws I nvalidParameterException94 * @throws IllegalArgumentException 96 95 * thrown if the package name is null or empty string 97 96 */ 98 97 public void addCommandPackage(String pkg) { 99 98 if ("".equals(pkg) || pkg == null) { 100 throw new I nvalidParameterException("package name must not be null or empty string");99 throw new IllegalArgumentException("package name must not be null or empty string"); 101 100 } 102 101 commandPackageList.add(pkg); … … 139 138 cmd.run(parser.getParameters()); 140 139 } 141 catch (I nvalidParameterException e) {140 catch (IllegalArgumentException e) { 142 141 Console.println("Usage: " + cmd.help()); 143 142 } -
trunk/java-utils/src/main/java/de/ugoe/cs/util/console/defaultcommands/CMDexec.java
r664 r766 6 6 import java.io.IOException; 7 7 import java.io.InputStreamReader; 8 import java.security.InvalidParameterException;9 8 import java.util.List; 10 9 import java.util.logging.Level; … … 35 34 script = (String) parameters.get(0); 36 35 } catch (Exception e) { 37 throw new I nvalidParameterException();36 throw new IllegalArgumentException(); 38 37 } 39 38 try { -
trunk/java-utils/src/main/java/de/ugoe/cs/util/console/defaultcommands/CMDman.java
r718 r766 4 4 import java.io.IOException; 5 5 import java.io.InputStream; 6 import java.security.InvalidParameterException;7 6 import java.util.List; 8 7 … … 36 35 } 37 36 else { 38 throw new I nvalidParameterException();37 throw new IllegalArgumentException(); 39 38 } 40 39 -
trunk/quest-core-assertions-test/src/test/java/de/ugoe/cs/quest/assertions/FileEqualsReplayTest.java
r548 r766 29 29 } 30 30 31 @Test(expected = java. security.InvalidParameterException.class)31 @Test(expected = java.lang.IllegalArgumentException.class) 32 32 public void testFileEqualsReplay_2() throws Exception { 33 33 String actualFile = "actualFileString"; … … 36 36 } 37 37 38 @Test(expected = java. security.InvalidParameterException.class)38 @Test(expected = java.lang.IllegalArgumentException.class) 39 39 public void testFileEqualsReplay_3() throws Exception { 40 40 String expectedFile = "expectedFileString"; -
trunk/quest-core-assertions-test/src/test/java/de/ugoe/cs/quest/assertions/TextEqualsReplayTest.java
r518 r766 40 40 } 41 41 42 @Test(expected = java. security.InvalidParameterException.class)42 @Test(expected = java.lang.IllegalArgumentException.class) 43 43 public void testTextEqualsReplay_3() throws Exception { 44 44 String expectedValue = "expectedValueString"; -
trunk/quest-core-assertions/src/main/java/de/ugoe/cs/quest/assertions/FileEqualsReplay.java
r655 r766 1 1 package de.ugoe.cs.quest.assertions; 2 3 import java.security.InvalidParameterException;4 2 5 3 import de.ugoe.cs.quest.IReplayDecorator; … … 47 45 * @param actualFile 48 46 * name and path of the actual file 49 * @throws I nvalidParameterException47 * @throws IllegalArgumentException 50 48 * thrown if expectedFile or actualFile are null 51 49 */ 52 50 public FileEqualsReplay(String expectedFile, String actualFile) { 53 51 if (expectedFile == null) { 54 throw new I nvalidParameterException("expected file must not be null");52 throw new IllegalArgumentException("expected file must not be null"); 55 53 } 56 54 if (actualFile == null) { 57 throw new I nvalidParameterException("actual file must not be null");55 throw new IllegalArgumentException("actual file must not be null"); 58 56 } 59 57 this.expectedFile = expectedFile; -
trunk/quest-core-assertions/src/main/java/de/ugoe/cs/quest/assertions/TextEqualsReplay.java
r655 r766 1 1 package de.ugoe.cs.quest.assertions; 2 3 import java.security.InvalidParameterException;4 2 5 3 import de.ugoe.cs.quest.IReplayDecorator; … … 47 45 * string description of the target whose string value is compared to the expected 48 46 * value 49 * @throws I nvalidParameterException47 * @throws IllegalArgumentException 50 48 * thrown if target is null 51 49 */ 52 50 public TextEqualsReplay(String expectedValue, String target) { 53 51 if (target == null) { 54 throw new I nvalidParameterException("target must not be null");52 throw new IllegalArgumentException("target must not be null"); 55 53 } 56 54 this.expectedValue = expectedValue; -
trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/CoverageCalculatorObservedTest.java
r553 r766 44 44 } 45 45 46 @Test(expected = java. security.InvalidParameterException.class)46 @Test(expected = java.lang.IllegalArgumentException.class) 47 47 public void testCoverageCalculatorObserved_2() throws Exception { 48 48 int length = 2; … … 51 51 } 52 52 53 @Test(expected = java. security.InvalidParameterException.class)53 @Test(expected = java.lang.IllegalArgumentException.class) 54 54 public void testCoverageCalculatorObserved_3() throws Exception { 55 55 int length = 2; … … 58 58 } 59 59 60 @Test(expected = java. security.InvalidParameterException.class)60 @Test(expected = java.lang.IllegalArgumentException.class) 61 61 public void testCoverageCalculatorObserved_4() throws Exception { 62 62 int length = 0; … … 65 65 } 66 66 67 @Test(expected = java. security.InvalidParameterException.class)67 @Test(expected = java.lang.IllegalArgumentException.class) 68 68 public void testCoverageCalculatorObserved_5() throws Exception { 69 69 int length = -1; … … 160 160 } 161 161 162 @Test(expected = java. security.InvalidParameterException.class )162 @Test(expected = java.lang.IllegalArgumentException.class ) 163 163 public void testCoveragePossibleNew_3() throws Exception { 164 164 int length = 3; … … 191 191 } 192 192 193 @Test(expected = java. security.InvalidParameterException.class )193 @Test(expected = java.lang.IllegalArgumentException.class ) 194 194 public void testCoveragePossibleNewWeight_3() throws Exception { 195 195 int length = 3; -
trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/CoverageCalculatorProcessTest.java
r553 r766 40 40 } 41 41 42 @Test(expected = java. security.InvalidParameterException.class)42 @Test(expected = java.lang.IllegalArgumentException.class) 43 43 public void testCoverageCalculatorProcess_2() throws Exception { 44 44 int length = 2; … … 47 47 } 48 48 49 @Test(expected = java. security.InvalidParameterException.class)49 @Test(expected = java.lang.IllegalArgumentException.class) 50 50 public void testCoverageCalculatorProcess_3() throws Exception { 51 51 int length = 2; … … 54 54 } 55 55 56 @Test(expected = java. security.InvalidParameterException.class)56 @Test(expected = java.lang.IllegalArgumentException.class) 57 57 public void testCoverageCalculatorProcess_4() throws Exception { 58 58 int length = 0; … … 61 61 } 62 62 63 @Test(expected = java. security.InvalidParameterException.class)63 @Test(expected = java.lang.IllegalArgumentException.class) 64 64 public void testCoverageCalculatorProcess_5() throws Exception { 65 65 int length = -1; … … 179 179 } 180 180 181 @Test(expected = java. security.InvalidParameterException.class)181 @Test(expected = java.lang.IllegalArgumentException.class) 182 182 public void testSetSequences_2() throws Exception { 183 183 int length = 2; -
trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/SequenceToolsTest.java
r553 r766 55 55 } 56 56 57 @Test(expected=java. security.InvalidParameterException.class)57 @Test(expected=java.lang.IllegalArgumentException.class) 58 58 public void testContainedSubSequences_3() 59 59 throws Exception { … … 63 63 } 64 64 65 @Test(expected=java. security.InvalidParameterException.class)65 @Test(expected=java.lang.IllegalArgumentException.class) 66 66 public void testContainedSubSequences_4() 67 67 throws Exception { … … 129 129 } 130 130 131 @Test(expected = java. security.InvalidParameterException.class )131 @Test(expected = java.lang.IllegalArgumentException.class ) 132 132 public void testNumSequences_3() 133 133 throws Exception { … … 137 137 } 138 138 139 @Test(expected = java. security.InvalidParameterException.class )139 @Test(expected = java.lang.IllegalArgumentException.class ) 140 140 public void testNumSequences_4() 141 141 throws Exception { -
trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorObserved.java
r655 r766 1 1 package de.ugoe.cs.quest.coverage; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.Collection; 5 4 import java.util.LinkedHashSet; … … 69 68 * @param length 70 69 * length of the subsequences for which the coverage is analyzed; must be >0 71 * @throws I nvalidParameterException70 * @throws IllegalArgumentException 72 71 * thrown if observedSequences or sequences is null or length less than or equal to 73 72 * 0 … … 78 77 { 79 78 if (observedSequences == null) { 80 throw new I nvalidParameterException("observed sequences must not be null");79 throw new IllegalArgumentException("observed sequences must not be null"); 81 80 } 82 81 if (sequences == null) { 83 throw new I nvalidParameterException("sequences must not be null");82 throw new IllegalArgumentException("sequences must not be null"); 84 83 } 85 84 if (length <= 0) { 86 throw new I nvalidParameterException("length must be >0; actual value: " + length);85 throw new IllegalArgumentException("length must be >0; actual value: " + length); 87 86 } 88 87 this.observedSequences = observedSequences; … … 158 157 * stochastic process which is used to determine which subsequences are possible 159 158 * @return coverage percentage 160 * @throws I nvalidParameterException159 * @throws IllegalArgumentException 161 160 * thrown if process is null 162 161 */ 163 162 public double getCoveragePossibleNew(IStochasticProcess process) { 164 163 if (process == null) { 165 throw new I nvalidParameterException("process must not be null");164 throw new IllegalArgumentException("process must not be null"); 166 165 } 167 166 createSubSeqs(); … … 186 185 * are possible 187 186 * @return coverage percentage 188 * @throws I nvalidParameterException187 * @throws IllegalArgumentException 189 188 * thrown if process is null 190 189 */ 191 190 public double getCoveragePossibleNewWeight(IStochasticProcess process) { 192 191 if (process == null) { 193 throw new I nvalidParameterException("process must not be null");192 throw new IllegalArgumentException("process must not be null"); 194 193 } 195 194 createSubSeqs(); -
trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorProcess.java
r655 r766 1 1 package de.ugoe.cs.quest.coverage; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.Collection; 5 4 import java.util.List; … … 74 73 * @param length 75 74 * length of the subsequences for which the coverage is analyzed; must be >0 76 * @throws I nvalidParameterException75 * @throws IllegalArgumentException 77 76 * thrown if process or sequences is null or length less than or equal to 0 78 77 */ … … 82 81 { 83 82 if (process == null) { 84 throw new I nvalidParameterException("process must not be null");83 throw new IllegalArgumentException("process must not be null"); 85 84 } 86 85 if (sequences == null) { 87 throw new I nvalidParameterException("sequences must not be null");86 throw new IllegalArgumentException("sequences must not be null"); 88 87 } 89 88 if (length <= 0) { 90 throw new I nvalidParameterException("length must be >0; actual value: " + length);89 throw new IllegalArgumentException("length must be >0; actual value: " + length); 91 90 } 92 91 this.process = process; … … 191 190 * @param newSequences 192 191 * new collection of sequences 193 * @throws I nvalidParameterException192 * @throws IllegalArgumentException 194 193 * thrown is newSequences is null 195 194 */ 196 195 public void setSequences(Collection<List<Event>> newSequences) { 197 196 if (newSequences == null) { 198 throw new I nvalidParameterException("sequences must not be null");197 throw new IllegalArgumentException("sequences must not be null"); 199 198 } 200 199 this.sequences = newSequences; -
trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/SequenceTools.java
r655 r766 1 1 package de.ugoe.cs.quest.coverage; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.Collection; 5 4 import java.util.LinkedHashMap; … … 83 82 * lenght of the sequences 84 83 * @return numStates^length 85 * @throws I nvalidParameterException84 * @throws IllegalArgumentException 86 85 * thrown if length less or equal to 0 87 86 */ 88 87 public static long numSequences(IStochasticProcess process, int length) { 89 88 if (length <= 0) { 90 throw new I nvalidParameterException("length must be a positive integer");89 throw new IllegalArgumentException("length must be a positive integer"); 91 90 } 92 91 long result = 0; … … 108 107 * length of the subsequences 109 108 * @return {@link Set} of all subsequences 110 * @throws I nvalidParameterException109 * @throws IllegalArgumentException 111 110 * thrown if length less or equal to 0 112 111 */ … … 115 114 { 116 115 if (length <= 0) { 117 throw new I nvalidParameterException("length must be a positive integer");116 throw new IllegalArgumentException("length must be a positive integer"); 118 117 } 119 118 Set<List<Event>> containedSubSeqs = new LinkedHashSet<List<Event>>(); -
trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/eventcore/EventTest.java
r655 r766 27 27 } 28 28 29 @Test(expected = java. security.InvalidParameterException.class)29 @Test(expected = java.lang.IllegalArgumentException.class) 30 30 public void testEvent_2() throws Exception { 31 31 new Event(null); … … 265 265 } 266 266 267 @Test(expected = java. security.InvalidParameterException.class)267 @Test(expected = java.lang.IllegalArgumentException.class) 268 268 public void testAddReplayEvent_fixture_3() throws Exception { 269 269 Event fixture = new Event(mock(IEventType.class)); … … 289 289 } 290 290 291 @Test(expected = java. security.InvalidParameterException.class)291 @Test(expected = java.lang.IllegalArgumentException.class) 292 292 public void testAddReplaySequence_2() throws Exception { 293 293 Event fixture = new Event(mock(IEventType.class)); -
trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/Event.java
r681 r766 2 2 3 3 import java.io.Serializable; 4 import java.security.InvalidParameterException;5 4 import java.util.LinkedList; 6 5 import java.util.List; … … 68 67 public Event(IEventType type) { 69 68 if (type == null) { 70 throw new I nvalidParameterException("Event type must not be null");69 throw new IllegalArgumentException("Event type must not be null"); 71 70 } 72 71 this.type = type; … … 208 207 * @param replayable 209 208 * element that is added to the sequence 210 * @throws I nvalidParameterException209 * @throws IllegalArgumentException 211 210 * thrown is replayable is null 212 211 */ 213 212 public void addReplayable(IReplayable replayable) { 214 213 if (replayable == null) { 215 throw new I nvalidParameterException("replayble must not be null");214 throw new IllegalArgumentException("replayble must not be null"); 216 215 } 217 216 replay.add(replayable); … … 225 224 * @param generatedReplaySeq 226 225 * {@link List} that is added to the sequence 227 * @throws I nvalidParameterException226 * @throws IllegalArgumentException 228 227 * thrown if generatedReplaySeq is null 229 228 */ 230 229 public void addReplayableSequence(List<? extends IReplayable> generatedReplaySeq) { 231 230 if (generatedReplaySeq == null) { 232 throw new I nvalidParameterException("generatedReplaySeq must not be null");231 throw new IllegalArgumentException("generatedReplaySeq must not be null"); 233 232 } 234 233 replay.addAll(generatedReplaySeq); -
trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/StringEventType.java
r655 r766 1 1 package de.ugoe.cs.quest.eventcore; 2 3 import java.security.InvalidParameterException;4 2 5 3 /** … … 34 32 * @param str 35 33 * string that identifies the event type 36 * @throws I nvalidParameterException34 * @throws IllegalArgumentException 37 35 * thrown if str is null 38 36 */ 39 public StringEventType(String str) throws I nvalidParameterException {37 public StringEventType(String str) throws IllegalArgumentException { 40 38 if (str == null) { 41 throw new I nvalidParameterException("str must not be null");39 throw new IllegalArgumentException("str must not be null"); 42 40 } 43 41 this.str = str; -
trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/DrawFromAllSequencesGenerator.java
r655 r766 1 1 package de.ugoe.cs.quest.testgeneration; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.ArrayList; 5 4 import java.util.Collection; … … 73 72 * <li>minLength must be less than or equal to maxLength 74 73 * </ul> 75 * If one of these conditions is violated an {@link I nvalidParameterException} is thrown.74 * If one of these conditions is violated an {@link IllegalArgumentException} is thrown. 76 75 * </p> 77 76 * … … 97 96 // check validity of the parameters 98 97 if (numSequences < 1) { 99 throw new I nvalidParameterException("number of sequences must be at least 1 but is " +98 throw new IllegalArgumentException("number of sequences must be at least 1 but is " + 100 99 numSequences); 101 100 } 102 101 if (maxLength < 1) { 103 throw new I nvalidParameterException(102 throw new IllegalArgumentException( 104 103 "maximal allowed length of test cases must be at least 1 but is " + 105 104 maxLength); 106 105 } 107 106 if (minLength > maxLength) { 108 throw new I nvalidParameterException(107 throw new IllegalArgumentException( 109 108 "minimal allowed length of test cases must be less than or equal to the maximal allowed length (min length: " + 110 109 minLength + " ; max length: " + maxLength + ")"); … … 128 127 public Collection<List<Event>> generateTestSuite(IStochasticProcess model) { 129 128 if (model == null) { 130 throw new I nvalidParameterException("model must not be null!");129 throw new IllegalArgumentException("model must not be null!"); 131 130 } 132 131 -
trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/HybridGenerator.java
r655 r766 1 1 package de.ugoe.cs.quest.testgeneration; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.ArrayList; 5 4 import java.util.Collection; … … 61 60 * <li>length must be at least 1 62 61 * </ul> 63 * If one of these conditions is violated an {@link I nvalidParameterException} is thrown.62 * If one of these conditions is violated an {@link IllegalArgumentException} is thrown. 64 63 * </p> 65 64 * … … 77 76 // check validity of the parameters 78 77 if (numSequences < 1) { 79 throw new I nvalidParameterException("number of sequences must be at least 1 but is " +78 throw new IllegalArgumentException("number of sequences must be at least 1 but is " + 80 79 numSequences); 81 80 } 82 81 if (length < 1) { 83 throw new I nvalidParameterException("length of test cases must be at least 1 but is " +82 throw new IllegalArgumentException("length of test cases must be at least 1 but is " + 84 83 length); 85 84 } … … 102 101 public Collection<List<Event>> generateTestSuite(IStochasticProcess model) { 103 102 if (model == null) { 104 throw new I nvalidParameterException("model must not be null!");103 throw new IllegalArgumentException("model must not be null!"); 105 104 } 106 105 -
trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/RandomWalkGenerator.java
r655 r766 1 1 package de.ugoe.cs.quest.testgeneration; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.Collection; 5 4 import java.util.HashSet; … … 75 74 * <li>maxIter must be greater than or equal to numSequences 76 75 * </ul> 77 * If one of these conditions is violated an {@link I nvalidParameterException} is thrown.76 * If one of these conditions is violated an {@link IllegalArgumentException} is thrown. 78 77 * </p> 79 78 * … … 99 98 // check validity of the parameters 100 99 if (numSequences < 1) { 101 throw new I nvalidParameterException("number of sequences must be at least 1 but is " +100 throw new IllegalArgumentException("number of sequences must be at least 1 but is " + 102 101 numSequences); 103 102 } 104 103 if (maxLength < 1) { 105 throw new I nvalidParameterException(104 throw new IllegalArgumentException( 106 105 "maximal allowed length of test cases must be at least 1 but is " + 107 106 maxLength); 108 107 } 109 108 if (minLength > maxLength) { 110 throw new I nvalidParameterException(109 throw new IllegalArgumentException( 111 110 "minimal allowed length of test cases must be less than or equal to the maximal allowed length (min length: " + 112 111 minLength + " ; max length: " + maxLength + ")"); 113 112 } 114 113 if (maxIter < numSequences) { 115 throw new I nvalidParameterException(114 throw new IllegalArgumentException( 116 115 "maximal number of iterations must greater than or equal to the number of sequences (number of sequences: " + 117 116 numSequences + … … 138 137 public Collection<List<Event>> generateTestSuite(IStochasticProcess model) { 139 138 if (model == null) { 140 throw new I nvalidParameterException("model must not be null!");139 throw new IllegalArgumentException("model must not be null!"); 141 140 } 142 141 -
trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/DeterministicFiniteAutomatonTest.java
r553 r766 36 36 } 37 37 38 @Test(expected = java. security.InvalidParameterException.class)38 @Test(expected = java.lang.IllegalArgumentException.class) 39 39 public void testDeterministicFiniteAutomaton_2() throws Exception { 40 40 new DeterministicFiniteAutomaton(null); … … 106 106 } 107 107 108 @Test(expected = java. security.InvalidParameterException.class)108 @Test(expected = java.lang.IllegalArgumentException.class) 109 109 public void testGetProbability_5() throws Exception { 110 110 DeterministicFiniteAutomaton fixture = new DeterministicFiniteAutomaton( … … 120 120 } 121 121 122 @Test(expected = java. security.InvalidParameterException.class)122 @Test(expected = java.lang.IllegalArgumentException.class) 123 123 public void testGetProbability_6() throws Exception { 124 124 DeterministicFiniteAutomaton fixture = new DeterministicFiniteAutomaton( -
trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/FirstOrderMarkovModelTest.java
r553 r766 35 35 } 36 36 37 @Test(expected = java. security.InvalidParameterException.class)37 @Test(expected = java.lang.IllegalArgumentException.class) 38 38 public void testFirstOrderMarkovModel_2() throws Exception { 39 39 new FirstOrderMarkovModel(null); -
trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/HighOrderMarkovModelTest.java
r553 r766 49 49 } 50 50 51 @Test(expected = java. security.InvalidParameterException.class)51 @Test(expected = java.lang.IllegalArgumentException.class) 52 52 public void testHighOrderMarkovModel_3() throws Exception { 53 53 int maxOrder = 1; … … 57 57 } 58 58 59 @Test(expected = java. security.InvalidParameterException.class)59 @Test(expected = java.lang.IllegalArgumentException.class) 60 60 public void testHighOrderMarkovModel_4() throws Exception { 61 61 int maxOrder = -1; … … 188 188 } 189 189 190 @Test(expected = java. security.InvalidParameterException.class)190 @Test(expected = java.lang.IllegalArgumentException.class) 191 191 public void testGetProbability_8() throws Exception { 192 192 int markovOrder = 0; … … 204 204 } 205 205 206 @Test(expected = java. security.InvalidParameterException.class)206 @Test(expected = java.lang.IllegalArgumentException.class) 207 207 public void testGetProbability_9() throws Exception { 208 208 int markovOrder = 0; -
trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/IncompleteMemoryTest.java
r518 r766 27 27 } 28 28 29 @Test(expected = java. security.InvalidParameterException.class)29 @Test(expected = java.lang.IllegalArgumentException.class) 30 30 public void testIncompleteMemory_2() 31 31 throws Exception { -
trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/PredictionByPartialMatchTest.java
r553 r766 40 40 } 41 41 42 @Test(expected = java. security.InvalidParameterException.class)42 @Test(expected = java.lang.IllegalArgumentException.class) 43 43 public void testPredictionByPartialMatch_2() throws Exception { 44 44 int markovOrder = -1; … … 48 48 } 49 49 50 @Test(expected = java. security.InvalidParameterException.class)50 @Test(expected = java.lang.IllegalArgumentException.class) 51 51 public void testPredictionByPartialMatch_3() throws Exception { 52 52 int markovOrder = 2; … … 72 72 } 73 73 74 @Test(expected = java. security.InvalidParameterException.class)74 @Test(expected = java.lang.IllegalArgumentException.class) 75 75 public void testPredictionByPartialMatch_5() throws Exception { 76 76 int markovOrder = -1; … … 81 81 } 82 82 83 @Test(expected = java. security.InvalidParameterException.class)83 @Test(expected = java.lang.IllegalArgumentException.class) 84 84 public void testPredictionByPartialMatch_6() throws Exception { 85 85 int markovOrder = 2; … … 90 90 } 91 91 92 @Test(expected = java. security.InvalidParameterException.class)92 @Test(expected = java.lang.IllegalArgumentException.class) 93 93 public void testPredictionByPartialMatch_7() throws Exception { 94 94 int markovOrder = 2; … … 99 99 } 100 100 101 @Test(expected = java. security.InvalidParameterException.class)101 @Test(expected = java.lang.IllegalArgumentException.class) 102 102 public void testPredictionByPartialMatch_8() throws Exception { 103 103 int markovOrder = 2; … … 125 125 } 126 126 127 @Test(expected = java. security.InvalidParameterException.class)127 @Test(expected = java.lang.IllegalArgumentException.class) 128 128 public void testPredictionByPartialMatch_10() throws Exception { 129 129 int markovOrder = -1; … … 135 135 } 136 136 137 @Test(expected = java. security.InvalidParameterException.class)137 @Test(expected = java.lang.IllegalArgumentException.class) 138 138 public void testPredictionByPartialMatch_11() throws Exception { 139 139 int markovOrder = 2; … … 145 145 } 146 146 147 @Test(expected = java. security.InvalidParameterException.class)147 @Test(expected = java.lang.IllegalArgumentException.class) 148 148 public void testPredictionByPartialMatch_12() throws Exception { 149 149 int markovOrder = 2; … … 155 155 } 156 156 157 @Test(expected = java. security.InvalidParameterException.class)157 @Test(expected = java.lang.IllegalArgumentException.class) 158 158 public void testPredictionByPartialMatch_13() throws Exception { 159 159 int markovOrder = 2; … … 165 165 } 166 166 167 @Test(expected = java. security.InvalidParameterException.class)167 @Test(expected = java.lang.IllegalArgumentException.class) 168 168 public void testPredictionByPartialMatch_14() throws Exception { 169 169 int markovOrder = 2; … … 175 175 } 176 176 177 @Test(expected = java. security.InvalidParameterException.class)177 @Test(expected = java.lang.IllegalArgumentException.class) 178 178 public void testPredictionByPartialMatch_15() throws Exception { 179 179 int markovOrder = 2; -
trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/TrieBasedModelTest.java
r553 r766 267 267 } 268 268 269 @Test(expected = java. security.InvalidParameterException.class)269 @Test(expected = java.lang.IllegalArgumentException.class) 270 270 public void testTrieBasedModel_2() throws Exception { 271 271 int markovOrder = -1; … … 275 275 } 276 276 277 @Test(expected = java. security.InvalidParameterException.class)277 @Test(expected = java.lang.IllegalArgumentException.class) 278 278 public void testTrieBasedModel_3() throws Exception { 279 279 int markovOrder = 2; … … 377 377 } 378 378 379 @Test(expected = java. security.InvalidParameterException.class)379 @Test(expected = java.lang.IllegalArgumentException.class) 380 380 public void testGenerateSequences_3() throws Exception { 381 381 int markovOrder = 2; … … 423 423 } 424 424 425 @Test(expected = java. security.InvalidParameterException.class)425 @Test(expected = java.lang.IllegalArgumentException.class) 426 426 public void testGenerateValidSequences_2() throws Exception { 427 427 int markovOrder = 2; … … 570 570 } 571 571 572 @Test(expected = java. security.InvalidParameterException.class)572 @Test(expected = java.lang.IllegalArgumentException.class) 573 573 public void testTrain_3() throws Exception { 574 574 int markovOrder = 2; … … 595 595 } 596 596 597 @Test(expected = java. security.InvalidParameterException.class)597 @Test(expected = java.lang.IllegalArgumentException.class) 598 598 public void testUpdate_2() throws Exception { 599 599 int markovOrder = 2; -
trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/TrieTest.java
r518 r766 59 59 } 60 60 61 @Test(expected = java. security.InvalidParameterException.class)61 @Test(expected = java.lang.IllegalArgumentException.class) 62 62 public void testTrie_3() throws Exception { 63 63 new Trie<String>(null); … … 159 159 } 160 160 161 @Test(expected = java. security.InvalidParameterException.class)161 @Test(expected = java.lang.IllegalArgumentException.class) 162 162 public void testGetChildCreate_2() throws Exception { 163 163 Trie<String> fixture = new Trie<String>(); -
trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/DeterministicFiniteAutomaton.java
r655 r766 1 1 package de.ugoe.cs.quest.usageprofiles; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.Collection; 5 4 import java.util.LinkedList; … … 52 51 public double getProbability(List<Event> context, Event symbol) { 53 52 if (context == null) { 54 throw new I nvalidParameterException("context must not be null");53 throw new IllegalArgumentException("context must not be null"); 55 54 } 56 55 if (symbol == null) { 57 throw new I nvalidParameterException("symbol must not be null");56 throw new IllegalArgumentException("symbol must not be null"); 58 57 } 59 58 double result = 0.0d; -
trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/HighOrderMarkovModel.java
r655 r766 1 1 package de.ugoe.cs.quest.usageprofiles; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.Collection; 5 4 import java.util.LinkedList; … … 52 51 public double getProbability(List<Event> context, Event symbol) { 53 52 if (context == null) { 54 throw new I nvalidParameterException("context must not be null");53 throw new IllegalArgumentException("context must not be null"); 55 54 } 56 55 if (symbol == null) { 57 throw new I nvalidParameterException("symbol must not be null");56 throw new IllegalArgumentException("symbol must not be null"); 58 57 } 59 58 double result = 0.0d; -
trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/IStochasticProcess.java
r655 r766 2 2 3 3 import java.io.Serializable; 4 import java.security.InvalidParameterException;5 4 import java.util.Collection; 6 5 import java.util.List; … … 31 30 * @return probabilty the {@code symbol} is the next event, given the last events 32 31 * {@code context} 33 * @throws I nvalidParameterException32 * @throws IllegalArgumentException 34 33 * thrown if context or symbol is null 35 34 */ … … 44 43 * sequences of which the probability is calculated 45 44 * @return probability of the sequences; 1.0 if sequence is empty or null 46 * @throws I nvalidParameterException45 * @throws IllegalArgumentException 47 46 * thrown if sequence is null 48 47 */ … … 90 89 * @return generated sequences 91 90 * @see #generateSequences(int, boolean) 92 * @throws I nvalidParameterException91 * @throws IllegalArgumentException 93 92 * thrown if length is less than or equal to 0 94 93 */ … … 108 107 * if true, all generated sequences start with {@link Event#STARTEVENT} 109 108 * @return generated sequences 110 * @throws I nvalidParameterException109 * @throws IllegalArgumentException 111 110 * thrown if length is less than or equal to 0 112 111 */ … … 123 122 * @param length 124 123 * @return generated sequences 125 * @throws I nvalidParameterException124 * @throws IllegalArgumentException 126 125 * thrown if length is less than or equal to 0 127 126 */ -
trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/IncompleteMemory.java
r655 r766 1 1 package de.ugoe.cs.quest.usageprofiles; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.LinkedList; 5 4 import java.util.List; … … 41 40 * @param length 42 41 * number of recent events that are remembered 43 * @throws I nvalidParameterException42 * @throws IllegalArgumentException 44 43 * This exception is thrown if the length is smaller than 1 45 44 */ 46 45 public IncompleteMemory(int length) { 47 46 if (length < 1) { 48 throw new I nvalidParameterException("Length of IncompleteMemory must be at least 1.");47 throw new IllegalArgumentException("Length of IncompleteMemory must be at least 1."); 49 48 } 50 49 this.length = length; -
trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/PredictionByPartialMatch.java
r655 r766 1 1 package de.ugoe.cs.quest.usageprofiles; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.Collection; 5 4 import java.util.LinkedList; … … 90 89 * @param probEscape 91 90 * escape probability used by the model 92 * @throws I nvalidParameterException91 * @throws IllegalArgumentException 93 92 * thrown if minOrder is less than 0 or greater than markovOrder or probEscape is 94 93 * not in the interval (0,1) … … 97 96 super(markovOrder, r); 98 97 if (minOrder < 0) { 99 throw new I nvalidParameterException("minOrder must be greather than or equal to 0");98 throw new IllegalArgumentException("minOrder must be greather than or equal to 0"); 100 99 } 101 100 if (minOrder > markovOrder) { 102 throw new I nvalidParameterException(101 throw new IllegalArgumentException( 103 102 "minOrder must be less than or equal to markovOrder"); 104 103 } 105 104 if (probEscape <= 0.0 || probEscape >= 1.0) { 106 throw new I nvalidParameterException("probEscape must be in the interval (0,1)");105 throw new IllegalArgumentException("probEscape must be in the interval (0,1)"); 107 106 } 108 107 this.probEscape = probEscape; … … 147 146 public double getProbability(List<Event> context, Event symbol) { 148 147 if (context == null) { 149 throw new I nvalidParameterException("context must not be null");148 throw new IllegalArgumentException("context must not be null"); 150 149 } 151 150 if (symbol == null) { 152 throw new I nvalidParameterException("symbol must not be null");151 throw new IllegalArgumentException("symbol must not be null"); 153 152 } 154 153 double result = 0.0d; -
trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/Trie.java
r655 r766 2 2 3 3 import java.io.Serializable; 4 import java.security.InvalidParameterException;5 4 import java.util.Collection; 6 5 import java.util.HashSet; … … 71 70 public Trie(Trie<T> other) { 72 71 if (other == null) { 73 throw new I nvalidParameterException("other trie must not be null");72 throw new IllegalArgumentException("other trie must not be null"); 74 73 } 75 74 rootNode = new TrieNode<T>(other.rootNode); -
trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/TrieBasedModel.java
r655 r766 1 1 package de.ugoe.cs.quest.usageprofiles; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.ArrayList; 5 4 import java.util.Collection; … … 66 65 * @param r 67 66 * random number generator used by probabilistic methods of the class 68 * @throws I nvalidParameterException67 * @throws IllegalArgumentException 69 68 * thrown if markovOrder is less than 0 or the random number generator r is null 70 69 */ … … 72 71 super(); 73 72 if (markovOrder < 0) { 74 throw new I nvalidParameterException("markov order must not be less than 0");73 throw new IllegalArgumentException("markov order must not be less than 0"); 75 74 } 76 75 if (r == null) { 77 throw new I nvalidParameterException("random number generator r must not be null");76 throw new IllegalArgumentException("random number generator r must not be null"); 78 77 } 79 78 this.trieOrder = markovOrder + 1; … … 90 89 * @param sequences 91 90 * training data 92 * @throws I nvalidParameterException91 * @throws IllegalArgumentException 93 92 * thrown is sequences is null 94 93 */ … … 107 106 * @param sequences 108 107 * training data 109 * @throws I nvalidParameterException108 * @throws IllegalArgumentException 110 109 * thrown is sequences is null 111 110 */ 112 111 public void update(Collection<List<Event>> sequences) { 113 112 if (sequences == null) { 114 throw new I nvalidParameterException("sequences must not be null");113 throw new IllegalArgumentException("sequences must not be null"); 115 114 } 116 115 if (trie == null) { … … 300 299 Set<List<Event>> sequenceSet = new LinkedHashSet<List<Event>>(); 301 300 if (length < 1) { 302 throw new I nvalidParameterException(301 throw new IllegalArgumentException( 303 302 "Length of generated subsequences must be at least 1."); 304 303 } … … 361 360 public double getProbability(List<Event> sequence) { 362 361 if (sequence == null) { 363 throw new I nvalidParameterException("sequence must not be null");362 throw new IllegalArgumentException("sequence must not be null"); 364 363 } 365 364 double prob = 1.0; -
trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/TrieNode.java
r655 r766 2 2 3 3 import java.io.Serializable; 4 import java.security.InvalidParameterException;5 4 import java.util.Collection; 6 5 import java.util.LinkedList; … … 78 77 TrieNode(T symbol) { 79 78 if (symbol == null) { 80 throw new I nvalidParameterException(79 throw new IllegalArgumentException( 81 80 "symbol must not be null. null is reserved for root node!"); 82 81 } … … 95 94 TrieNode(TrieNode<T> other) { 96 95 if (other == null) { 97 throw new I nvalidParameterException("other must not be null");96 throw new IllegalArgumentException("other must not be null"); 98 97 } 99 98 symbol = other.symbol; -
trunk/quest-plugin-core-test/src/test/java/de/ugoe/cs/quest/plugin/PluginLoaderTest.java
r531 r766 24 24 } 25 25 26 @Test(expected = java. security.InvalidParameterException.class)26 @Test(expected = java.lang.IllegalArgumentException.class) 27 27 public void testPluginLoader_2() throws Exception { 28 28 new PluginLoader(null); 29 29 } 30 30 31 @Test(expected = java. security.InvalidParameterException.class)31 @Test(expected = java.lang.IllegalArgumentException.class) 32 32 public void testPluginLoader_3() throws Exception { 33 33 new PluginLoader(new File("testdata/de.ugoe.cs.quest.plugin.PluginLoaderTest/jfcmonitor.jar")); -
trunk/quest-plugin-core/src/main/java/de/ugoe/cs/quest/plugin/PluginLoader.java
r582 r766 11 11 import java.net.URL; 12 12 import java.net.URLClassLoader; 13 import java.security.InvalidParameterException;14 13 import java.util.Collection; 15 14 import java.util.Collections; … … 52 51 * handle of the directory; in case the handle is 53 52 * <code>null</code> or does not describe a directory, an 54 * {@link I nvalidParameterException} is thrown53 * {@link IllegalArgumentException} is thrown 55 54 */ 56 55 public PluginLoader(File pluginDir) { 57 56 if (pluginDir == null) { 58 throw new I nvalidParameterException(57 throw new IllegalArgumentException( 59 58 "Parameter pluginDir must not be null!"); 60 59 } 61 60 if (!pluginDir.isDirectory()) { 62 throw new I nvalidParameterException("File " + pluginDir.getPath()61 throw new IllegalArgumentException("File " + pluginDir.getPath() 63 62 + " is not a directory"); 64 63 } -
trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgTestCasesToSequences.java
r728 r766 3 3 import java.io.File; 4 4 import java.io.FilenameFilter; 5 import java.security.InvalidParameterException;6 5 import java.util.Collection; 7 6 import java.util.LinkedList; … … 43 42 } 44 43 } catch (Exception e) { 45 throw new I nvalidParameterException();44 throw new IllegalArgumentException(); 46 45 } 47 46 -
trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgToDFA.java
r667 r766 1 1 package de.ugoe.cs.quest.plugin.guitar.commands; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.List; 5 4 … … 33 32 modelname = (String) parameters.get(1); 34 33 } catch (Exception e) { 35 throw new I nvalidParameterException();34 throw new IllegalArgumentException(); 36 35 } 37 36 -
trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgToMM.java
r667 r766 1 1 package de.ugoe.cs.quest.plugin.guitar.commands; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.List; 5 4 … … 33 32 modelname = (String) parameters.get(1); 34 33 } catch (Exception e) { 35 throw new I nvalidParameterException();34 throw new IllegalArgumentException(); 36 35 } 37 36 -
trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/JFCLogParser.java
r743 r766 8 8 import java.io.InputStreamReader; 9 9 import java.io.UnsupportedEncodingException; 10 import java.security.InvalidParameterException;11 10 import java.util.ArrayList; 12 11 import java.util.Collection; … … 197 196 public void parseFile(String filename) { 198 197 if (filename == null) { 199 throw new I nvalidParameterException("filename must not be null");198 throw new IllegalArgumentException("filename must not be null"); 200 199 } 201 200 … … 213 212 public void parseFile(File file) { 214 213 if (file == null) { 215 throw new I nvalidParameterException("file must not be null");214 throw new IllegalArgumentException("file must not be null"); 216 215 } 217 216 -
trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDparseDirJFC.java
r752 r766 2 2 3 3 import java.io.File; 4 import java.security.InvalidParameterException;5 4 import java.util.Collection; 6 5 import java.util.List; … … 44 43 } 45 44 catch (Exception e) { 46 throw new I nvalidParameterException();45 throw new IllegalArgumentException(); 47 46 } 48 47 -
trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDparseJFC.java
r680 r766 1 1 package de.ugoe.cs.quest.plugin.jfc.commands; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.Collection; 5 4 import java.util.List; … … 39 38 } 40 39 } catch (Exception e) { 41 throw new I nvalidParameterException();40 throw new IllegalArgumentException(); 42 41 } 43 42 -
trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDpreprocessDirJFC.java
r728 r766 9 9 import java.io.OutputStreamWriter; 10 10 import java.io.UnsupportedEncodingException; 11 import java.security.InvalidParameterException;12 11 import java.util.List; 13 12 import java.util.logging.Level; … … 42 41 targetPath = (String) parameters.get(1); 43 42 } catch (Exception e) { 44 throw new I nvalidParameterException();43 throw new IllegalArgumentException(); 45 44 } 46 45 -
trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/commands/CMDpreprocessJFC.java
r664 r766 9 9 import java.io.OutputStreamWriter; 10 10 import java.io.UnsupportedEncodingException; 11 import java.security.InvalidParameterException;12 11 import java.util.List; 13 12 … … 41 40 target = (String) parameters.get(1); 42 41 } catch (Exception e) { 43 throw new I nvalidParameterException();42 throw new IllegalArgumentException(); 44 43 } 45 44 -
trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/EventGenerator.java
r655 r766 2 2 3 3 import java.io.IOException; 4 import java.security.InvalidParameterException;5 4 import java.util.ArrayList; 6 5 import java.util.HashMap; … … 174 173 generateReplayMessage(replayMessageSpec); 175 174 } 176 catch (I nvalidParameterException e) {175 catch (IllegalArgumentException e) { 177 176 Console.printerrln(e.getMessage()); 178 177 // TODO currentToken.invalidateReplay(); … … 184 183 // TODO currentToken.invalidateReplay(); 185 184 } 186 catch (I nvalidParameterException e) {185 catch (IllegalArgumentException e) { 187 186 Console.printerrln(e.getMessage()); 188 187 // TODO currentToken.invalidateReplay(); … … 242 241 isMatch = matchMultipleConditions(messageCondition, nextMessageCondition); 243 242 } 244 catch (I nvalidParameterException e) {243 catch (IllegalArgumentException e) { 245 244 Console.printerrln(e.getMessage()); 246 245 } … … 250 249 isMatch = matchSingleMessage(messageCondition); 251 250 } 252 catch (I nvalidParameterException e) {251 catch (IllegalArgumentException e) { 253 252 Console.printerrln(e.getMessage()); 254 253 } … … 606 605 607 606 if (seqVar.size() != generatedMessageSeq.size()) { 608 throw new I nvalidParameterException607 throw new IllegalArgumentException 609 608 ("Failure generating replay sequence for rule " + currentRuleName + 610 609 ": One or more of the sequence variables used to generate a sequence have " + … … 656 655 657 656 if (seqVar.size() != generatedMessageSeq.size()) { 658 throw new I nvalidParameterException657 throw new IllegalArgumentException 659 658 ("Failure generating replay sequence for rule " + currentRuleName + 660 659 ": One or more of the sequence variables used to generate a sequence have " + … … 712 711 713 712 if (seqVar.size() != generatedMessageSeq.size()) { 714 throw new I nvalidParameterException713 throw new IllegalArgumentException 715 714 ("Failure generating replay sequence for rule " + currentRuleName + 716 715 ": One or more of the sequence variables used to generate a sequence have " + … … 783 782 * object identifier in the storage 784 783 * @return message retrieved from the storage 785 * @throws I nvalidParameterException784 * @throws IllegalArgumentException 786 785 * thrown in case of invalid uses of "this" or if no message with the identifier obj 787 786 * is found in the storage 788 787 */ 789 788 private ReplayWindowsMessage getStoredMessageVariable(WindowsMessage currentMessage, String obj) 790 throws I nvalidParameterException789 throws IllegalArgumentException 791 790 { 792 791 ReplayWindowsMessage varMessage = null; 793 792 if (obj.equals("this")) { 794 793 if (currentMessage == null) { 795 throw new I nvalidParameterException("Failure obtaining term value for rule " +794 throw new IllegalArgumentException("Failure obtaining term value for rule " + 796 795 currentRuleName + 797 796 ": \"this\" is not a valid name for generating runtime messages."); … … 805 804 } 806 805 else { 807 throw new I nvalidParameterException("Failure obtaining term value for rule " +806 throw new IllegalArgumentException("Failure obtaining term value for rule " + 808 807 currentRuleName + ": No message \"" + obj + "\" stored."); 809 808 } -
trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/MFCLogParser.java
r655 r766 6 6 import java.io.IOException; 7 7 import java.io.InputStreamReader; 8 import java.security.InvalidParameterException;9 8 import java.util.Collection; 10 9 import java.util.HashMap; … … 143 142 public void parseFile(String filename) { 144 143 if (filename == null) { 145 throw new I nvalidParameterException("filename must not be null");144 throw new IllegalArgumentException("filename must not be null"); 146 145 } 147 146 … … 159 158 public void parseFile(File file) { 160 159 if (file == null) { 161 throw new I nvalidParameterException("file must not be null");160 throw new IllegalArgumentException("file must not be null"); 162 161 } 163 162 … … 331 330 sequenceSplitter.addMessage(message); 332 331 } 333 catch (I nvalidParameterException e) {332 catch (IllegalArgumentException e) { 334 333 Console.traceln(Level.WARNING, e.getMessage() + " WindowsMessage " + currentMessageType + 335 334 " ignored."); -
trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDconvertDirToXml.java
r728 r766 3 3 import java.io.FileNotFoundException; 4 4 import java.io.IOException; 5 import java.security.InvalidParameterException;6 5 import java.util.List; 7 6 … … 38 37 public void run(List<Object> parameters) { 39 38 if (parameters.size() < 2) { 40 throw new I nvalidParameterException();39 throw new IllegalArgumentException(); 41 40 } 42 41 String path = (String) parameters.get(0); -
trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDconvertToXml.java
r664 r766 3 3 import java.io.FileNotFoundException; 4 4 import java.io.IOException; 5 import java.security.InvalidParameterException;6 5 import java.util.List; 7 6 … … 38 37 public void run(List<Object> parameters) { 39 38 if (parameters.size() < 2) { 40 throw new I nvalidParameterException();39 throw new IllegalArgumentException(); 41 40 } 42 41 String source = (String) parameters.get(0); -
trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDparseXML.java
r667 r766 1 1 package de.ugoe.cs.quest.plugin.mfc.commands; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.Collection; 5 4 import java.util.List; … … 53 52 } 54 53 catch (Exception e) { 55 throw new I nvalidParameterException();54 throw new IllegalArgumentException(); 56 55 } 57 56 -
trunk/quest-plugin-php/src/main/java/de/ugoe/cs/quest/plugin/php/commands/CMDloadWebSequences.java
r667 r766 3 3 import java.io.FileNotFoundException; 4 4 import java.io.IOException; 5 import java.security.InvalidParameterException;6 5 import java.text.ParseException; 7 6 import java.util.Collection; … … 33 32 public void run(List<Object> parameters) { 34 33 if (parameters.size() < 1) { 35 throw new I nvalidParameterException();34 throw new IllegalArgumentException(); 36 35 } 37 36 String source; … … 61 60 } 62 61 } catch (Exception e) { 63 throw new I nvalidParameterException();62 throw new IllegalArgumentException(); 64 63 } 65 64 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDdeleteObject.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.misc; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.List; 5 4 … … 39 38 objectName = (String) parameters.get(0); 40 39 } catch (Exception e) { 41 throw new I nvalidParameterException();40 throw new IllegalArgumentException(); 42 41 } 43 42 boolean deleted = GlobalDataContainer.getInstance().removeData( -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDload.java
r733 r766 4 4 import java.io.IOException; 5 5 import java.io.ObjectInputStream; 6 import java.security.InvalidParameterException;7 6 import java.util.List; 8 7 … … 32 31 filename = (String) parameters.get(0); 33 32 } catch (Exception e) { 34 throw new I nvalidParameterException();33 throw new IllegalArgumentException(); 35 34 } 36 35 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDloadObject.java
r733 r766 4 4 import java.io.IOException; 5 5 import java.io.ObjectInputStream; 6 import java.security.InvalidParameterException;7 6 import java.util.List; 8 7 … … 36 35 objectName = (String) parameters.get(1); 37 36 } catch (Exception e) { 38 throw new I nvalidParameterException();37 throw new IllegalArgumentException(); 39 38 } 40 39 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDsave.java
r733 r766 4 4 import java.io.IOException; 5 5 import java.io.ObjectOutputStream; 6 import java.security.InvalidParameterException;7 6 import java.util.List; 8 7 … … 32 31 filename = (String) parameters.get(0); 33 32 } catch (Exception e) { 34 throw new I nvalidParameterException();33 throw new IllegalArgumentException(); 35 34 } 36 35 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDsaveObject.java
r733 r766 4 4 import java.io.IOException; 5 5 import java.io.ObjectOutputStream; 6 import java.security.InvalidParameterException;7 6 import java.util.List; 8 7 … … 36 35 objectName = (String) parameters.get(1); 37 36 } catch (Exception e) { 38 throw new I nvalidParameterException();37 throw new IllegalArgumentException(); 39 38 } 40 39 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDshowTimer.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.misc; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.List; 5 4 import java.util.logging.Level; … … 31 30 timerName = (String) parameters.get(0); 32 31 } catch (Exception e) { 33 throw new I nvalidParameterException();32 throw new IllegalArgumentException(); 34 33 } 35 34 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDstartFileListener.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.misc; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.List; 5 4 … … 30 29 filename = (String) parameters.get(0); 31 30 } catch (Exception e) { 32 throw new I nvalidParameterException();31 throw new IllegalArgumentException(); 33 32 } 34 33 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDstartTimer.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.misc; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.List; 5 4 … … 29 28 timerName = (String) parameters.get(0); 30 29 } catch (Exception e) { 31 throw new I nvalidParameterException();30 throw new IllegalArgumentException(); 32 31 } 33 32 Long time = System.currentTimeMillis(); -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/misc/CMDstopFileListener.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.misc; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.List; 5 4 … … 24 23 filename = (String) parameters.get(0); 25 24 } catch (Exception e) { 26 throw new I nvalidParameterException();25 throw new IllegalArgumentException(); 27 26 } 28 27 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDcondenseMouseClicks.java
r750 r766 2 2 package de.ugoe.cs.quest.commands.sequences; 3 3 4 import java.security.InvalidParameterException;5 4 import java.util.Collection; 6 5 import java.util.LinkedList; … … 57 56 } 58 57 catch (Exception e) { 59 throw new I nvalidParameterException("must provide a sequences name");58 throw new IllegalArgumentException("must provide a sequences name"); 60 59 } 61 60 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDcorrectKeyInteractionTargets.java
r750 r766 2 2 package de.ugoe.cs.quest.commands.sequences; 3 3 4 import java.security.InvalidParameterException;5 4 import java.util.Collection; 6 5 import java.util.LinkedList; … … 57 56 } 58 57 catch (Exception e) { 59 throw new I nvalidParameterException("must provide a sequences name");58 throw new IllegalArgumentException("must provide a sequences name"); 60 59 } 61 60 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDdetectTextInputEvents.java
r751 r766 2 2 package de.ugoe.cs.quest.commands.sequences; 3 3 4 import java.security.InvalidParameterException;5 4 import java.util.Collection; 6 5 import java.util.LinkedList; … … 60 59 } 61 60 catch (Exception e) { 62 throw new I nvalidParameterException("must provide a sequences name");61 throw new IllegalArgumentException("must provide a sequences name"); 63 62 } 64 63 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDgenerateReplayfile.java
r733 r766 5 5 import java.io.IOException; 6 6 import java.io.OutputStreamWriter; 7 import java.security.InvalidParameterException;8 7 import java.util.Collection; 9 8 import java.util.List; … … 56 55 sequencesName = (String) parameters.get(1); 57 56 } catch (Exception e) { 58 throw new I nvalidParameterException();57 throw new IllegalArgumentException(); 59 58 } 60 59 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDsequenceStatistics.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.sequences; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.Collection; 5 4 import java.util.List; … … 38 37 sequencesName = (String) parameters.get(0); 39 38 } catch (Exception e) { 40 throw new I nvalidParameterException();39 throw new IllegalArgumentException(); 41 40 } 42 41 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDsortKeyInteractions.java
r765 r766 2 2 package de.ugoe.cs.quest.commands.sequences; 3 3 4 import java.security.InvalidParameterException;5 4 import java.util.Collection; 6 5 import java.util.LinkedList; … … 81 80 } 82 81 catch (Exception e) { 83 throw new I nvalidParameterException("must provide a sequences name");82 throw new IllegalArgumentException("must provide a sequences name"); 84 83 } 85 84 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usability/CMDevaluateUsability.java
r733 r766 2 2 package de.ugoe.cs.quest.commands.usability; 3 3 4 import java.security.InvalidParameterException;5 4 import java.util.List; 6 5 … … 53 52 } 54 53 catch (Exception e) { 55 throw new I nvalidParameterException("must provide a task tree name");54 throw new IllegalArgumentException("must provide a task tree name"); 56 55 } 57 56 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usability/CMDgenerateTaskTree.java
r733 r766 2 2 package de.ugoe.cs.quest.commands.usability; 3 3 4 import java.security.InvalidParameterException;5 4 import java.util.Collection; 6 5 import java.util.List; … … 56 55 } 57 56 catch (Exception e) { 58 throw new I nvalidParameterException("must provide a sequences name");57 throw new IllegalArgumentException("must provide a sequences name"); 59 58 } 60 59 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/AbstractTrainCommand.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.usage; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.Collection; 5 4 import java.util.List; … … 67 66 handleAdditionalParameters(parameters); 68 67 } catch (Exception e) { 69 throw new I nvalidParameterException();68 throw new IllegalArgumentException(); 70 69 } 71 70 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDcalcCoverage.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.usage; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.Collection; 5 4 import java.util.List; … … 45 44 maxLength = Integer.parseInt((String) parameters.get(4)); 46 45 } catch (Exception e) { 47 throw new I nvalidParameterException();46 throw new IllegalArgumentException(); 48 47 } 49 48 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDcalcEntropy.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.usage; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.List; 5 4 … … 41 40 modelname = (String) parameters.get(0); 42 41 } catch (Exception e) { 43 throw new I nvalidParameterException();42 throw new IllegalArgumentException(); 44 43 } 45 44 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDflattenModel.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.usage; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.List; 5 4 … … 36 35 modelnameFOM = (String) parameters.get(1); 37 36 } catch (Exception e) { 38 throw new I nvalidParameterException();37 throw new IllegalArgumentException(); 39 38 } 40 39 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDgenerateFixedLengthSequences.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.usage; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.Collection; 5 4 import java.util.List; … … 52 51 } 53 52 } catch (Exception e) { 54 throw new I nvalidParameterException();53 throw new IllegalArgumentException(); 55 54 } 56 55 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDgenerateGreedy.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.usage; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.Collection; 5 4 import java.util.Iterator; … … 63 62 } 64 63 } catch (Exception e) { 65 throw new I nvalidParameterException();64 throw new IllegalArgumentException(); 66 65 } 67 66 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDgenerateHybrid.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.usage; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.Collection; 5 4 import java.util.LinkedList; … … 47 46 } 48 47 } catch (Exception e) { 49 throw new I nvalidParameterException();48 throw new IllegalArgumentException(); 50 49 } 51 50 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDgenerateRandomSequences.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.usage; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.Collection; 5 4 import java.util.List; … … 51 50 } 52 51 } catch (Exception e) { 53 throw new I nvalidParameterException();52 throw new IllegalArgumentException(); 54 53 } 55 54 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDlistSymbols.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.usage; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.Arrays; 5 4 import java.util.List; … … 37 36 } 38 37 } catch (Exception e) { 39 throw new I nvalidParameterException();38 throw new IllegalArgumentException(); 40 39 } 41 40 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDmodelSize.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.usage; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.List; 5 4 … … 31 30 modelname = (String) parameters.get(0); 32 31 } catch (Exception e) { 33 throw new I nvalidParameterException();32 throw new IllegalArgumentException(); 34 33 } 35 34 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDprintDot.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.usage; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.List; 5 4 … … 42 41 modelname = (String) parameters.get(0); 43 42 } catch (Exception e) { 44 throw new I nvalidParameterException();43 throw new IllegalArgumentException(); 45 44 } 46 45 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDprintTrieDot.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.usage; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.List; 5 4 … … 43 42 modelname = (String) parameters.get(0); 44 43 } catch (Exception e) { 45 throw new I nvalidParameterException();44 throw new IllegalArgumentException(); 46 45 } 47 46 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDshowMarkovModel.java
r733 r766 4 4 import java.awt.Rectangle; 5 5 import java.awt.Shape; 6 import java.security.InvalidParameterException;7 6 import java.util.List; 8 7 … … 59 58 } 60 59 } catch (Exception e) { 61 throw new I nvalidParameterException();60 throw new IllegalArgumentException(); 62 61 } 63 62 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDshowTrie.java
r733 r766 4 4 import java.awt.Rectangle; 5 5 import java.awt.Shape; 6 import java.security.InvalidParameterException;7 6 import java.util.List; 8 7 … … 56 55 modelname = (String) parameters.get(0); 57 56 } catch (Exception e) { 58 throw new I nvalidParameterException();57 throw new IllegalArgumentException(); 59 58 } 60 59 -
trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/usage/CMDupdateModel.java
r733 r766 1 1 package de.ugoe.cs.quest.commands.usage; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.Collection; 5 4 import java.util.List; … … 37 36 sequencesName = (String) parameters.get(1); 38 37 } catch (Exception e) { 39 throw new I nvalidParameterException();38 throw new IllegalArgumentException(); 40 39 } 41 40 -
trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/commands/CMDshowSequences.java
r667 r766 1 1 package de.ugoe.cs.quest.ui.swt.commands; 2 2 3 import java.security.InvalidParameterException;4 3 import java.util.List; 5 4 … … 44 43 } 45 44 catch (Exception e) { 46 throw new I nvalidParameterException();45 throw new IllegalArgumentException(); 47 46 } 48 47
Note: See TracChangeset
for help on using the changeset viewer.