[GNUnet-SVN] r22695 - in monkey/branches/MonkeyBacktracking/monkey/MonkeyBugComparator: . src/org/monkey/comparator src/org/monkey/comparator/bo

[gnunet]

Author: safey
Date: 2012-07-15 20:56:20 +0200 (Sun, 15 Jul 2012)
New Revision: 22695

Added:
   monkey/branches/MonkeyBacktracking/monkey/MonkeyBugComparator/entomologist
Modified:
   
monkey/branches/MonkeyBacktracking/monkey/MonkeyBugComparator/src/org/monkey/comparator/Constants.java
   
monkey/branches/MonkeyBacktracking/monkey/MonkeyBugComparator/src/org/monkey/comparator/MonkeyComparator.java
   
monkey/branches/MonkeyBacktracking/monkey/MonkeyBugComparator/src/org/monkey/comparator/bo/XMLParser.java
Log:
Wrapper for entomologist, and exception handling

Added: 
monkey/branches/MonkeyBacktracking/monkey/MonkeyBugComparator/entomologist
===================================================================
--- monkey/branches/MonkeyBacktracking/monkey/MonkeyBugComparator/entomologist  
                        (rev 0)
+++ monkey/branches/MonkeyBacktracking/monkey/MonkeyBugComparator/entomologist  
2012-07-15 18:56:20 UTC (rev 22695)
@@ -0,0 +1,10 @@
+#! /bin/bash
+
+echo "Wrapper for the Monkey bug comparator (entomologist)"
+if ls mcomparator.jar &> /dev/null; then
+    java -jar mcomparator.jar $1 $2 $3 $4
+else
+    echo "Run: entomologist file1.xml file2.xml -p comparator.properties"
+    echo "mcomparator.jar must be in the same directory of this script."
+fi
+

Modified: 
monkey/branches/MonkeyBacktracking/monkey/MonkeyBugComparator/src/org/monkey/comparator/Constants.java
===================================================================
--- 
monkey/branches/MonkeyBacktracking/monkey/MonkeyBugComparator/src/org/monkey/comparator/Constants.java
      2012-07-15 16:01:07 UTC (rev 22694)
+++ 
monkey/branches/MonkeyBacktracking/monkey/MonkeyBugComparator/src/org/monkey/comparator/Constants.java
      2012-07-15 18:56:20 UTC (rev 22695)
@@ -56,7 +56,9 @@
                } catch (FileNotFoundException e) {
                        e.printStackTrace();
                } catch (IOException e) {
+                       System.err.println("Fatal error: unable to read 
properties. Entomologist will exit now.");
                        e.printStackTrace();
+                       System.exit(1);
                }
        }
        

Modified: 
monkey/branches/MonkeyBacktracking/monkey/MonkeyBugComparator/src/org/monkey/comparator/MonkeyComparator.java
===================================================================
--- 
monkey/branches/MonkeyBacktracking/monkey/MonkeyBugComparator/src/org/monkey/comparator/MonkeyComparator.java
       2012-07-15 16:01:07 UTC (rev 22694)
+++ 
monkey/branches/MonkeyBacktracking/monkey/MonkeyBugComparator/src/org/monkey/comparator/MonkeyComparator.java
       2012-07-15 18:56:20 UTC (rev 22695)
@@ -1,5 +1,6 @@
 package org.monkey.comparator;
 
+import java.io.File;
 import org.monkey.comparator.bo.Bug;
 import org.monkey.comparator.bo.XMLParser;
 
@@ -30,6 +31,14 @@
                                "file1.xml file2.xml -p 
configuration.properties");
                System.exit(1);
        }
+       
+       private static boolean checkFilePath(String filePath) {
+               if (new File(filePath).exists() == false) {
+                       System.err.println("File " + filePath + " not found!");
+                       showErrorAndExit();
+               }
+               return true;
+       }
        public static void main(String[] args) {
                String propertiesFilePath = null;
                String bugAFilePath = null;
@@ -41,12 +50,15 @@
                for (int i = 0; i < args.length; i++) {
                        if (args[i].equals("-p")) {
                                propertiesFilePath = args[++i];
+                               checkFilePath(propertiesFilePath);
                        }
                        else if (null == bugAFilePath) {
                                bugAFilePath = args[i];
+                               checkFilePath(bugAFilePath);
                        } 
                        else if (null == bugBFilePath) {
                                bugBFilePath = args[i];
+                               checkFilePath(bugBFilePath);
                        }
                }
                

Modified: 
monkey/branches/MonkeyBacktracking/monkey/MonkeyBugComparator/src/org/monkey/comparator/bo/XMLParser.java
===================================================================
--- 
monkey/branches/MonkeyBacktracking/monkey/MonkeyBugComparator/src/org/monkey/comparator/bo/XMLParser.java
   2012-07-15 16:01:07 UTC (rev 22694)
+++ 
monkey/branches/MonkeyBacktracking/monkey/MonkeyBugComparator/src/org/monkey/comparator/bo/XMLParser.java
   2012-07-15 18:56:20 UTC (rev 22695)
@@ -141,7 +141,9 @@
                                } // end if epochNode
                        } // end for epochNodeList
                } catch (Exception e) {
+                       System.err.println("Fatal error: unable to parse XML 
file. Entomologist will exit now.");
                        e.printStackTrace();
+                       System.exit(1);
                }
                return bug;
        }