Changeset 766 for trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/EventGenerator.java

Timestamp:

09/04/12 17:15:28 (12 years ago)

Author:

sherbold

Message:

• replaced usage of InvalidParameterException? with IllegalArgumentException?

File:

• trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/EventGenerator.java (modified) (10 diffs)

trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/EventGenerator.java

@@ -2 +2 @@
 
 import java.io.IOException;
-import java.security.InvalidParameterException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -174 +173 @@
                             generateReplayMessage(replayMessageSpec);
                         }
-                        catch (InvalidParameterException e) {
+                        catch (IllegalArgumentException e) {
                             Console.printerrln(e.getMessage());
                             // TODO currentToken.invalidateReplay();
@@ -184 +183 @@
                             // TODO currentToken.invalidateReplay();
                         }
-                        catch (InvalidParameterException e) {
+                        catch (IllegalArgumentException e) {
                             Console.printerrln(e.getMessage());
                             // TODO currentToken.invalidateReplay();
@@ -242 +241 @@
                     isMatch = matchMultipleConditions(messageCondition, nextMessageCondition);
                 }
-                catch (InvalidParameterException e) {
+                catch (IllegalArgumentException e) {
                     Console.printerrln(e.getMessage());
                 }
@@ -250 +249 @@
                     isMatch = matchSingleMessage(messageCondition);
                 }
-                catch (InvalidParameterException e) {
+                catch (IllegalArgumentException e) {
                     Console.printerrln(e.getMessage());
                 }
@@ -606 +605 @@
 
             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 +655 @@
             
             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 +711 @@
             
             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 +782 @@
      *            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 +804 @@
             }
             else {
-                throw new InvalidParameterException("Failure obtaining term value for rule " +
+                throw new IllegalArgumentException("Failure obtaining term value for rule " +
                     currentRuleName + ": No message \"" + obj + "\" stored.");
             }