Changeset 1179 for trunk/autoquest-plugin-jfc/src/main/java

Timestamp:

04/29/13 10:29:06 (12 years ago)

Author:

pharms

Message:

• corrected error handling during parsing

Location:

trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands

Files:

• CMDparseDirJFC.java (modified) (1 diff)
• CMDparseDirOldJFC.java (modified) (1 diff)
• CMDparseJFC.java (modified) (2 diffs)
• CMDparseOldJFC.java (modified) (2 diffs)

trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDparseDirJFC.java

@@ -73 +73 @@
             Console.traceln(Level.INFO, "Processing file: " + source);
 
-            parser.parseFile(source);
+            try {
+                parser.parseFile(source);
+            }
+            catch (Exception e) {
+                Console.printerrln("Could not parse " + source + ": " + e.getMessage());
+            }
         }
 

trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDparseDirOldJFC.java

@@ -73 +73 @@
             Console.traceln(Level.INFO, "Processing file: " + source);
 
-            parser.parseFile(source);
+            try {
+                parser.parseFile(source);
+            }
+            catch (Exception e) {
+                Console.printerrln("Could not parse " + source + ": " + e.getMessage());
+            }
         }
 

trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDparseJFC.java

@@ -23 +23 @@
 import de.ugoe.cs.autoquest.plugin.jfc.JFCSimplifiedLogParser;
 import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.Console;
 import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
  * <p>
- * Command to parse an XML file with sessions monitored by EventBench's
- * JFCMonitor.
+ * Command to parse an XML file with sessions monitored by EventBench's JFCMonitor.
  * </p>
  * 
@@ -36 +36 @@
 public class CMDparseJFC implements Command {
 
-        /*
-         * (non-Javadoc)
-         * 
-         * @see de.ugoe.cs.util.console.Command#run(java.util.List)
-         */
-        @Override
-        public void run(List<Object> parameters) {
-                String filename;
-                String sequencesName = "sequences";
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.util.console.Command#run(java.util.List)
+     */
+    @Override
+    public void run(List<Object> parameters) {
+        String filename;
+        String sequencesName = "sequences";
 
-                try {
-                        filename = (String) parameters.get(0);
-                        if (parameters.size() >= 2) {
-                                sequencesName = (String) parameters.get(1);
-                        }
-                } catch (Exception e) {
-                        throw new IllegalArgumentException();
-                }
-                
-                JFCSimplifiedLogParser parser = new JFCSimplifiedLogParser();
+        try {
+            filename = (String) parameters.get(0);
+            if (parameters.size() >= 2) {
+                sequencesName = (String) parameters.get(1);
+            }
+        }
+        catch (Exception e) {
+            throw new IllegalArgumentException();
+        }
 
-                parser.parseFile(filename);
-                Collection<List<Event>> sequences = parser.getSequences();
+        JFCSimplifiedLogParser parser = new JFCSimplifiedLogParser();
 
-                GUIModel targets = parser.getGuiModel();
+        try {
+            parser.parseFile(filename);
+        }
+        catch (Exception e) {
+            Console.printerrln("Could not parse " + filename + ": " + e.getMessage());
+            return;
+        }
 
-                if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) {
-                        CommandHelpers.dataOverwritten(sequencesName);
-                }
-                
-                if (GlobalDataContainer.getInstance().addData(sequencesName + "_targets", targets)) {
-                    CommandHelpers.dataOverwritten(sequencesName + "_targets");
-                }
-        }
+        Collection<List<Event>> sequences = parser.getSequences();
 
-        /*
-         * (non-Javadoc)
-         * 
-         * @see de.ugoe.cs.util.console.Command#help()
-         */
-        @Override
-        public String help() {
-                return "parseJFC <filename> {<sequencesName>}";
-        }
+        GUIModel targets = parser.getGuiModel();
+
+        if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) {
+            CommandHelpers.dataOverwritten(sequencesName);
+        }
+
+        if (GlobalDataContainer.getInstance().addData(sequencesName + "_targets", targets)) {
+            CommandHelpers.dataOverwritten(sequencesName + "_targets");
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.util.console.Command#help()
+     */
+    @Override
+    public String help() {
+        return "parseJFC <filename> {<sequencesName>}";
+    }
 
 }

trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDparseOldJFC.java

@@ -23 +23 @@
 import de.ugoe.cs.autoquest.plugin.jfc.JFCLogParser;
 import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.Console;
 import de.ugoe.cs.util.console.GlobalDataContainer;
 
 /**
  * <p>
- * Command to parse an old XML file with sessions monitored by EventBench's
- * JFCMonitor. For new log files parseJFC must be used instead.
+ * Command to parse an old XML file with sessions monitored by EventBench's JFCMonitor. For new log
+ * files parseJFC must be used instead.
  * </p>
  * 
@@ -36 +37 @@
 public class CMDparseOldJFC implements Command {
 
-        /*
-         * (non-Javadoc)
-         * 
-         * @see de.ugoe.cs.util.console.Command#run(java.util.List)
-         */
-        @Override
-        public void run(List<Object> parameters) {
-                String filename;
-                String sequencesName = "sequences";
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.util.console.Command#run(java.util.List)
+     */
+    @Override
+    public void run(List<Object> parameters) {
+        String filename;
+        String sequencesName = "sequences";
 
-                try {
-                        filename = (String) parameters.get(0);
-                        if (parameters.size() >= 2) {
-                                sequencesName = (String) parameters.get(1);
-                        }
-                } catch (Exception e) {
-                        throw new IllegalArgumentException();
-                }
-                
-                JFCLogParser parser = new JFCLogParser();
+        try {
+            filename = (String) parameters.get(0);
+            if (parameters.size() >= 2) {
+                sequencesName = (String) parameters.get(1);
+            }
+        }
+        catch (Exception e) {
+            throw new IllegalArgumentException();
+        }
 
-                parser.parseFile(filename);
-                Collection<List<Event>> sequences = parser.getSequences();
+        JFCLogParser parser = new JFCLogParser();
 
-                GUIModel targets = parser.getGuiModel();
+        try {
+            parser.parseFile(filename);
+        }
+        catch (Exception e) {
+            Console.printerrln("Could not parse " + filename + ": " + e.getMessage());
+            return;
+        }
 
-                if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) {
-                        CommandHelpers.dataOverwritten(sequencesName);
-                }
-                
-                if (GlobalDataContainer.getInstance().addData(sequencesName + "_targets", targets)) {
-                    CommandHelpers.dataOverwritten(sequencesName + "_targets");
-                }
-        }
+        Collection<List<Event>> sequences = parser.getSequences();
 
-        /*
-         * (non-Javadoc)
-         * 
-         * @see de.ugoe.cs.util.console.Command#help()
-         */
-        @Override
-        public String help() {
-                return "parseOldJFC <filename> {<sequencesName>}";
-        }
+        GUIModel targets = parser.getGuiModel();
+
+        if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) {
+            CommandHelpers.dataOverwritten(sequencesName);
+        }
+
+        if (GlobalDataContainer.getInstance().addData(sequencesName + "_targets", targets)) {
+            CommandHelpers.dataOverwritten(sequencesName + "_targets");
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.util.console.Command#help()
+     */
+    @Override
+    public String help() {
+        return "parseOldJFC <filename> {<sequencesName>}";
+    }
 
 }