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

Timestamp:

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

Author:

sherbold

Message:

• replaced usage of InvalidParameterException? with IllegalArgumentException?

Location:

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

Files:

• EventGenerator.java (modified) (10 diffs)
• MFCLogParser.java (modified) (4 diffs)
• commands/CMDconvertDirToXml.java (modified) (2 diffs)
• commands/CMDconvertToXml.java (modified) (2 diffs)
• commands/CMDparseXML.java (modified) (2 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.");
             }

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

@@ -6 +6 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.security.InvalidParameterException;
 import java.util.Collection;
 import java.util.HashMap;
@@ -143 +142 @@
     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 +158 @@
     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 +330 @@
                     sequenceSplitter.addMessage(message);
                 }
-                catch (InvalidParameterException e) {
+                catch (IllegalArgumentException e) {
                     Console.traceln(Level.WARNING, e.getMessage() + " WindowsMessage " + currentMessageType +
                                     " ignored.");

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

@@ -3 +3 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.security.InvalidParameterException;
 import java.util.List;
 
@@ -38 +37 @@
         public void run(List<Object> parameters) {
                 if (parameters.size() < 2) {
-                        throw new InvalidParameterException();
+                        throw new IllegalArgumentException();
                 }
                 String path = (String) parameters.get(0);

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

@@ -3 +3 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.security.InvalidParameterException;
 import java.util.List;
 
@@ -38 +37 @@
         public void run(List<Object> parameters) {
                 if (parameters.size() < 2) {
-                        throw new InvalidParameterException();
+                        throw new IllegalArgumentException();
                 }
                 String source = (String) parameters.get(0);

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

@@ -1 +1 @@
 package de.ugoe.cs.quest.plugin.mfc.commands;
 
-import java.security.InvalidParameterException;
 import java.util.Collection;
 import java.util.List;
@@ -53 +52 @@
         }
         catch (Exception e) {
-            throw new InvalidParameterException();
+            throw new IllegalArgumentException();
         }