Skip to content
This repository has been archived by the owner on Apr 16, 2022. It is now read-only.

Commit

Permalink
Upgrade JR dependency to version 2.9.0 (#432)
Browse files Browse the repository at this point in the history
  • Loading branch information
ggalmazor authored and lognaturel committed Apr 3, 2018
1 parent ea5ee2f commit 0ec70cf
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 30 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies {
exclude group: 'commons-logging'
}
compile group: 'net.sf.kxml', name: 'kxml2', version: '2.3.0'
compile group: 'org.opendatakit', name: 'opendatakit-javarosa', version: '2.7.0'
compile group: 'org.opendatakit', name: 'opendatakit-javarosa', version: '2.9.0'
compile group: 'org.hsqldb', name: 'hsqldb', version: '2.4.0'
compile(group: 'com.brsanthu', name: 'google-analytics-java', version: '2.0.0') {
exclude group: 'org.slf4j'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import java.util.List;
import java.util.Map;
import org.javarosa.core.io.Std;
import org.javarosa.core.model.DataBinding;
import org.javarosa.core.model.FormDef;
import org.javarosa.core.model.IDataReference;
import org.javarosa.core.model.SubmissionProfile;
Expand All @@ -42,7 +41,6 @@
import org.javarosa.core.services.PrototypeManager;
import org.javarosa.model.xform.XFormsModule;
import org.javarosa.xform.parse.XFormParser;
import org.javarosa.xform.util.XFormUtils;
import org.kxml2.kdom.Document;
import org.kxml2.kdom.Element;
import org.opendatakit.aggregate.constants.ParserConsts;
Expand Down Expand Up @@ -281,33 +279,6 @@ public XFormParserWithBindEnhancements(BaseFormParserForJavaRosa parser, Documen
this.xmldoc = form;
this.parser = parser;
}

protected void parseBind(Element e) {
// remember raw bindings in case we want to compare parsed XForms later
parser.bindElements.add(copyBindingElement(e));
List<String> usedAtts = new ArrayList<>();

DataBinding binding = processStandardBindAttributes(usedAtts, e);

String value = e.getAttributeValue(ParserConsts.NAMESPACE_ODK, "length");
if (value != null) {
e.setAttribute(ParserConsts.NAMESPACE_ODK, "length", null);
}

log.debug("Calling handle found value " + ((value == null) ? "null" : value));

if (value != null) {
Integer iValue = Integer.valueOf(value);
parser.setNodesetStringLength(e.getAttributeValue(null, "nodeset"), iValue);
}

// print unused attribute warning message for parent element
if (XFormUtils.showUnusedAttributeWarning(e, usedAtts)) {
log.debug(XFormUtils.unusedAttWarning(e, usedAtts));
}

addBinding(binding);
}
}

private static synchronized final XFormParserWithBindEnhancements parseFormDefinition(String xml,
Expand Down

0 comments on commit 0ec70cf

Please sign in to comment.