Merge pull request #91 from lognaturel/upgrade-jr

Upgrade JavaRosa to 4.4.1

Author: lognaturel

build.gradle

@@ -28,7 +28,7 @@ sourceCompatibility = '1.8'
 
 dependencies {
     compile group: 'net.sf.kxml', name: 'kxml2', version: '2.3.0'
-    compile group: 'org.getodk', name: 'javarosa', version: '4.2.0'
+    compile group: 'org.getodk', name: 'javarosa', version: '4.4.1'
     compile group: 'org.slf4j', name: 'slf4j-nop', version: '1.7.25'
     testCompile 'junit:junit:4.13.2'
     testCompile 'org.hamcrest:hamcrest-all:1.3'

src/org/opendatakit/validate/FormValidator.java

@@ -432,7 +432,7 @@ public void validate(byte[] xformData) {
                 factory.newDocumentBuilder().parse(new ByteArrayInputStream(xformData));
             } catch (Exception e) {
                 setError(true);
-                errors.error("\n\n\n>> XML is invalid. See above for the errors.",e);
+                errors.error("\n\n\n>> XML is invalid.",e);
                 return;
             }
 
@@ -496,26 +496,26 @@ public Object eval(Object[] args, EvaluationContext ec) {
                 // check for runtime errors
                 fd.initialize(true, new InstanceInitializationFactory());
 
-                errors.info("\n\n>> Xform parsing completed! See above for any warnings.\n");
+                errors.info("\n\n>> Xform parsing completed!\n");
 
                 // create FormEntryController from formdef
                 FormEntryModel fem = new FormEntryModel(fd);
 
                 // and try to step through the form...
                 if ( stepThroughEntireForm(fem) ) {
                     setError(true);
-                    errors.error("\n\n>> Xform is invalid! See above for errors and warnings.");
+                    errors.error("\n\n>> Xform is invalid!");
                 } else {
-                    errors.info("\n\n>> Xform is valid! See above for any warnings.");
+                    errors.info("\n\n>> Xform is valid!");
                 }
 
             } catch (XFormParseException e) {
                 setError(true);
-                errors.error("\n\n>> XForm is invalid. See above for the errors.",e);
+                errors.error("\n\n>> XForm is invalid.",e);
 
             } catch (Exception e) {
                 setError(true);
-                errors.error("\n\n>> Something broke the parser. See above for a hint.",e);
+                errors.error("\n\n>> Something broke the parser.",e);
 
             }