Changeset 22683

Timestamp:

03/09/10 11:42:42 (17 months ago)

Author:

alex

Message:

Changed handler to allow for namespaces at the project level (avoids Null Pointer error)

File:

• trunk/imbuild/im-ant-tasks/src/org/intermine/task/project/ProjectXmlBinding.java (modified) (6 diffs)

trunk/imbuild/im-ant-tasks/src/org/intermine/task/project/ProjectXmlBinding.java

@@ -1 +1 @@
 package org.intermine.task.project;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
 
 /*
@@ -11 +26 @@
  */
 
-import java.io.File;
-import java.io.FileReader;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
 
 
@@ -35 +40 @@
      */
     public static Project unmarshall(File file) {
-        try {
-            FileReader reader = new FileReader(file);
+      
+            FileReader reader = null;
+            try {
+                reader = new FileReader(file);
+            }
+            catch (IOException e) {
+                throw new RuntimeException (e);
+            }
+            
             try {
                 ProjectXmlHandler handler = new ProjectXmlHandler();
@@ -46 +58 @@
                 project.validate(file);
                 return project;
+            }
+            catch (IOException e) {
+                throw new RuntimeException (e);     
             } catch (ParserConfigurationException e) {
-                throw new Exception("The underlying parser does not support "
+                throw new RuntimeException("The underlying parser does not support "
                                     + " the requested features", e);
             } catch (SAXException e) {
-                throw new Exception("Error parsing the project.xml file, please check the format.",
+                throw new RuntimeException("Error parsing the project.xml file, please check the format.",
                         e);
             }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
+
     }
 
     private static class ProjectXmlHandler extends DefaultHandler
     {
+        private final Pattern projectPattern = Pattern.compile(".*project$");
+        private final Matcher projectMatcher = projectPattern.matcher("");
+        
         Project project;
         Action action;
@@ -68 +84 @@
          */
         public void startElement(String uri, String localName, String qName, Attributes attrs) {
-            if (qName.equals("project")) {
+            if (qName == null) {
+                    return;
+            }
+            projectMatcher.reset(qName);
+            if (projectMatcher.matches()) {
                 project = new Project();
                 if (attrs.getValue("type") == null) {
@@ -104 +124 @@
          */
         public void endElement(String uri, String localName, String qName) {
+            if (qName == null) {
+                return;
+            }
             if (qName.equals("source") || qName.equals("post-process")) {
                 action = null;