Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow use of version owlapi 3.5.2 #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow use of version owlapi 3.5.2 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d1f49d
Use data factory methods to construct literals instead of direct call…
sesuncedu Aug 22, 2015
0e72b61
Update version 3 owlapi minor version to 3.5.2
sesuncedu Aug 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<dependency>
<groupId>net.sourceforge.owlapi</groupId>
<artifactId>owlapi-distribution</artifactId>
<version>3.5.0</version>
<version>3.5.2</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Expand Down
26 changes: 11 additions & 15 deletions src/main/java/org/semanticweb/binaryowl/owlobject/serializer/OWLLiteralSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

package org.semanticweb.binaryowl.owlobject.serializer;

import com.google.common.base.Charsets;
import org.semanticweb.binaryowl.BinaryOWLParseException;
import org.semanticweb.binaryowl.stream.BinaryOWLInputStream;
import org.semanticweb.binaryowl.stream.BinaryOWLOutputStream;
Expand Down Expand Up @@ -75,17 +76,12 @@ public class OWLLiteralSerializer extends OWLObjectSerializer<OWLLiteral> {
private static final byte NO_LANG_MARKER = 0;


private static final OWLDatatype RDF_PLAIN_LITERAL_DATATYPE = new OWLDatatypeImpl(OWL2Datatype.RDF_PLAIN_LITERAL.getIRI());

private static final OWLDatatype XSD_STRING_DATATYPE = new OWLDatatypeImpl(OWL2Datatype.XSD_STRING.getIRI());

private static final OWLDatatype XSD_BOOLEAN_DATATYPE = new OWLDatatypeImpl(OWL2Datatype.XSD_BOOLEAN.getIRI());



private static final OWLLiteral BOOLEAN_TRUE = new OWLLiteralImplNoCompression("true", null, XSD_BOOLEAN_DATATYPE);

private static final OWLLiteral BOOLEAN_FALSE = new OWLLiteralImplNoCompression("false", null, XSD_BOOLEAN_DATATYPE);

@Override
protected void writeObject(OWLLiteral object, BinaryOWLOutputStream outputStream) throws IOException {
Expand All @@ -109,34 +105,34 @@ private OWLLiteral readRawLiteral(BinaryOWLInputStream is) throws IOException {
int langMarker = is.readByte();
if (langMarker == LANG_MARKER) {
String lang = is.readUTF();
byte[] literalBytes = readBytes(is);
return new OWLLiteralImplNoCompression(literalBytes, lang, RDF_PLAIN_LITERAL_DATATYPE);
String s = new String(readBytes(is), Charsets.UTF_8);
return is.getDataFactory().getOWLLiteral(s, lang);
}
else if (langMarker == NO_LANG_MARKER) {
byte[] literalBytes = readBytes(is);
return new OWLLiteralImplNoCompression(literalBytes, null, RDF_PLAIN_LITERAL_DATATYPE);
String s = new String(readBytes(is), Charsets.UTF_8);
return is.getDataFactory().getOWLLiteral(s, "");
}
else {
throw new IOException("Unknown lang marker: " + langMarker);
}
}
else if(typeMarker == XSD_STRING_MARKER) {
byte[] literalBytes = readBytes(is);
return new OWLLiteralImplNoCompression(literalBytes, null, XSD_STRING_DATATYPE);
String s = new String(readBytes(is), Charsets.UTF_8);
return is.getDataFactory().getOWLLiteral(s);
}
else if(typeMarker == XSD_BOOLEAN_MARKER) {
if(is.readBoolean()) {
return BOOLEAN_TRUE;
return is.getDataFactory().getOWLLiteral(true);
}
else {
return BOOLEAN_FALSE;
return is.getDataFactory().getOWLLiteral(false);
}
}
else if (typeMarker == OTHER_DATATYPE_MARKER) {

OWLDatatype datatype = is.readDatatypeIRI();
byte[] literalBytes = readBytes(is);
return new OWLLiteralImplNoCompression(literalBytes, null, datatype);
String s = new String(readBytes(is), Charsets.UTF_8);
return is.getDataFactory().getOWLLiteral(s, datatype);
}
else {
throw new RuntimeException("Unknown type marker: " + typeMarker);
Expand Down