You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/10/22 17:12:12 UTC
[1/2] jena git commit: Rename variable (it need not be a relative URI
string).
Repository: jena
Updated Branches:
refs/heads/master fad89075f -> df8b0270e
Rename variable (it need not be a relative URI string).
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9fc0db05
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9fc0db05
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9fc0db05
Branch: refs/heads/master
Commit: 9fc0db053a147923f4d5b3dd0376ed6c90893040
Parents: fad8907
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Oct 22 15:59:16 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Oct 22 15:59:16 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/riot/system/IRIResolver.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9fc0db05/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java b/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
index 29a21b0..61cd156 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
@@ -202,8 +202,7 @@ public abstract class IRIResolver
}
/**
- * Resolve a URI against a base. If baseStr is a relative file IRI
- * then it is first resolved against the current working directory.
+ * Resolve a URI against a base.
*
* @param relStr
* @param baseStr
@@ -219,14 +218,15 @@ public abstract class IRIResolver
/**
* Resolve a URI against a base. If baseStr is a relative file IRI
* then it is first resolved against the current working directory.
+ * If it is an absolute URI, it is normalized.
*
- * @param relStr
+ * @param uriStr
* @return String An absolute URI
* @throws RiotException
* If result would not be legal, absolute IRI
*/
- static public String resolveString(String relStr) throws RiotException {
- return exceptions(resolveIRI(relStr)).toString() ;
+ static public String resolveString(String uriStr) throws RiotException {
+ return exceptions(resolveIRI(uriStr)).toString() ;
}
/**
[2/2] jena git commit: Fix up file names (for Windows).
Posted by an...@apache.org.
Fix up file names (for Windows).
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/df8b0270
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/df8b0270
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/df8b0270
Branch: refs/heads/master
Commit: df8b0270e6ae32c1cb64c0d5af96e4c2817a6243
Parents: 9fc0db0
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Oct 22 15:59:37 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Oct 22 15:59:37 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/riot/lang/RiotParsers.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/df8b0270/jena-arq/src/main/java/org/apache/jena/riot/lang/RiotParsers.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/RiotParsers.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/RiotParsers.java
index 011102c..6953df9 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/RiotParsers.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/RiotParsers.java
@@ -127,10 +127,9 @@ public class RiotParsers {
// LangRIOT derived from LangEngine do this in ParserProfile
if ( baseIRI == null )
return SysRIOT.chooseBaseIRI() ;
- else {
- // Absolute compatibility. This normalizes the URI.
- return IRIResolver.resolveString(baseIRI) ;
- }
+ else
+ // This normalizes the URI.
+ return SysRIOT.chooseBaseIRI(baseIRI) ;
}
/** Create parsers for RDF/JSON