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 2012/08/21 19:06:19 UTC
svn commit: r1375666 - in /jena/trunk/jena-core/src:
main/java/com/hp/hpl/jena/rdf/arp/ main/java/com/hp/hpl/jena/rdf/arp/impl/
test/java/com/hp/hpl/jena/rdf/arp/states/
Author: andy
Date: Tue Aug 21 17:06:18 2012
New Revision: 1375666
URL: http://svn.apache.org/viewvc?rev=1375666&view=rev
Log:
Rename ARP's Location to ARPLocation (avoid clash with same-name API concept from TDB).
Added:
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/ARPLocation.java
- copied, changed from r1372890, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/Location.java
Removed:
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/Location.java
Modified:
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ParseException.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/ParserSupport.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/XMLHandler.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestHandler.java
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ParseException.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ParseException.java?rev=1375666&r1=1375665&r2=1375666&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ParseException.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ParseException.java Tue Aug 21 17:06:18 2012
@@ -20,7 +20,7 @@ package com.hp.hpl.jena.rdf.arp;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.arp.impl.Location;
+import com.hp.hpl.jena.rdf.arp.impl.ARPLocation;
/**
* An exception during the RDF processing of ARP. Note: it is distinguished from
@@ -37,7 +37,7 @@ public class ParseException extends SAXP
private static final long serialVersionUID = -5986976549492477885L;
final int id;
- protected ParseException(int id, Location where, String msg) {
+ protected ParseException(int id, ARPLocation where, String msg) {
super(msg, where.inputName, null, where.endLine, where.endColumn);
this.id = id;
@@ -45,7 +45,7 @@ public class ParseException extends SAXP
- public ParseException(int id, Location where, Exception e) {
+ public ParseException(int id, ARPLocation where, Exception e) {
super(e.getMessage(), where.inputName, null, where.endLine, where.endColumn,e);
if (getCause()==null)
initCause(e);
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/ARPLocation.java (from r1372890, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/Location.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/ARPLocation.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/ARPLocation.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/Location.java&r1=1372890&r2=1375666&rev=1375666&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/Location.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/ARPLocation.java Tue Aug 21 17:06:18 2012
@@ -25,17 +25,12 @@
package com.hp.hpl.jena.rdf.arp.impl;
import org.xml.sax.Locator;
-/**
- *
- * @author jjc
- *
- */
-public class Location implements Locator {
+public class ARPLocation implements Locator {
public final String inputName;
final String publicId;
public final int endLine;
public final int endColumn;
- Location(Locator locator) {
+ ARPLocation(Locator locator) {
if (locator==null){
inputName = "unknown-source";
publicId = "unknown-source";
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/ParserSupport.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/ParserSupport.java?rev=1375666&r1=1375665&r2=1375666&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/ParserSupport.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/ParserSupport.java Tue Aug 21 17:06:18 2012
@@ -50,7 +50,7 @@ public class ParserSupport
this.arp = arp;
this.xml= xml;
}
- Map<IRI, Map<String,Location>> idsUsed() {
+ Map<IRI, Map<String,ARPLocation>> idsUsed() {
return arp.idsUsed;
}
protected final XMLHandler arp;
@@ -62,12 +62,12 @@ public class ParserSupport
throws SAXParseException {
if (arp.idsUsed != null) {
IRI uri = ctxt.uri;
- Map<String,Location> idsUsedForBase = idsUsed().get(uri);
+ Map<String,ARPLocation> idsUsedForBase = idsUsed().get(uri);
if (idsUsedForBase == null) {
- idsUsedForBase = new HashMap<String, Location>();
+ idsUsedForBase = new HashMap<String, ARPLocation>();
idsUsed().put(uri, idsUsedForBase);
}
- Location prev = idsUsedForBase.get(str);
+ ARPLocation prev = idsUsedForBase.get(str);
if (prev != null) {
arp.warning(taintMe,
WARN_REDEFINITION_OF_ID,
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/XMLHandler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/XMLHandler.java?rev=1375666&r1=1375665&r2=1375666&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/XMLHandler.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/XMLHandler.java Tue Aug 21 17:06:18 2012
@@ -61,7 +61,7 @@ public class XMLHandler extends LexicalH
boolean encodingProblems = false;
- protected Map<IRI, Map<String,Location>> idsUsed = new HashMap<IRI, Map<String,Location>>();
+ protected Map<IRI, Map<String,ARPLocation>> idsUsed = new HashMap<IRI, Map<String,ARPLocation>>();
protected int idsUsedCount = 0;
public XMLHandler() {}
@@ -180,7 +180,7 @@ public class XMLHandler extends LexicalH
warning(taintMe,id, location(), msg);
}
- void warning(Taint taintMe, int id, Location loc, String msg) throws SAXParseException {
+ void warning(Taint taintMe, int id, ARPLocation loc, String msg) throws SAXParseException {
if (options.getErrorMode(id) != EM_IGNORE)
warning(taintMe, id, new ParseException(id, loc, msg) {
private static final long serialVersionUID = 1990910846204964756L;
@@ -188,7 +188,7 @@ public class XMLHandler extends LexicalH
}
void generalError( int id, Exception e) throws SAXParseException {
- Location where = new Location(locator);
+ ARPLocation where = new ARPLocation(locator);
// System.err.println(e.getMessage());
warning(null, id, new ParseException(id, where, e));
@@ -386,7 +386,7 @@ public class XMLHandler extends LexicalH
idsUsed =
ignoring(WARN_REDEFINITION_OF_ID)?
null:
- new HashMap<IRI, Map<String,Location>>();
+ new HashMap<IRI, Map<String,ARPLocation>>();
idsUsedCount = 0;
if (options.getEmbedding())
frame = new LookingForRDF(this, initialContext(base, lang));
@@ -422,8 +422,8 @@ public class XMLHandler extends LexicalH
}
}
- public Location location() {
- return new Location(locator);
+ public ARPLocation location() {
+ return new ARPLocation(locator);
}
private IRIFactory factory = null ;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestHandler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestHandler.java?rev=1375666&r1=1375665&r2=1375666&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestHandler.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestHandler.java Tue Aug 21 17:06:18 2012
@@ -25,7 +25,7 @@ import java.util.Map;
import junit.framework.Assert;
import com.hp.hpl.jena.rdf.arp.impl.ANode;
-import com.hp.hpl.jena.rdf.arp.impl.Location;
+import com.hp.hpl.jena.rdf.arp.impl.ARPLocation;
import com.hp.hpl.jena.rdf.arp.impl.Taint;
import com.hp.hpl.jena.rdf.arp.impl.XMLHandler;
@@ -63,7 +63,7 @@ class TestHandler extends XMLHandler {
triples = 0;
scope = 0;
this.failOnWarning = failOnWarning_;
- idsUsed = new HashMap<IRI, Map<String,Location>>();
+ idsUsed = new HashMap<IRI, Map<String,ARPLocation>>();
idsUsedCount = 0;
}