[Mulgara-svn] r1154 - in trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool: . xa
pag at mulgara.org
pag at mulgara.org
Sat Aug 23 01:39:14 UTC 2008
Author: pag
Date: 2008-08-22 18:39:13 -0700 (Fri, 22 Aug 2008)
New Revision: 1154
Modified:
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPObject.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPTypedLiteral.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/SPLimit.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/SPObject.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBase64BinaryImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBooleanImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateTimeImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDecimalImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDoubleImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPFloatImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGDayImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthDayImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearMonthImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPHexBinaryImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPStringImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPURIImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXMLLiteralImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXSDStringImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/UnknownSPTypedLiteralImpl.java
Log:
Updated SPObject to extend Comparable<SPObject> instead of an un-adorned Comparable
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPObject.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPObject.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPObject.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -28,15 +28,11 @@
package org.mulgara.store.stringpool;
// Java 2 standard packages
-import java.nio.CharBuffer;
import java.nio.charset.Charset;
// Third party packages
-// Locally written packages
-import org.mulgara.store.stringpool.*;
-
/**
*
* @created 2002-03-07
@@ -68,21 +64,21 @@
/* from Comparable interface. */
- public int compareTo(Object o) {
- if (compareOverride() || ((SPObject)o).compareOverride()) {
+ public int compareTo(SPObject o) {
+ if (compareOverride() || o.compareOverride()) {
// start by checking if these are of differing types
- int c = getTypeCategory().ID - ((SPObject)o).getTypeCategory().ID;
+ int c = getTypeCategory().ID - o.getTypeCategory().ID;
if (0 != c) {
return c;
}
if (compareOverride()) {
return isSmallest() ? -1 : 1;
} else {
- return ((SPObject)o).isSmallest() ? 1 : -1;
+ return o.isSmallest() ? 1 : -1;
}
}
// Compare the type category ids.
- return getTypeCategory().ID - ((SPObject)o).getTypeCategory().ID;
+ return getTypeCategory().ID - o.getTypeCategory().ID;
}
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPTypedLiteral.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPTypedLiteral.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPTypedLiteral.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -28,17 +28,13 @@
package org.mulgara.store.stringpool;
// Java 2 standard packages
-import java.nio.ByteBuffer;
import java.net.URI;
-import java.util.*;
// Third party packages
import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.rdf.LiteralImpl;
-import org.mulgara.query.rdf.XSD;
-import org.mulgara.store.stringpool.*;
/**
@@ -63,6 +59,7 @@
public abstract class AbstractSPTypedLiteral extends AbstractSPObject
implements SPTypedLiteral {
+ @SuppressWarnings("unused")
private static final Logger logger = Logger.getLogger(AbstractSPTypedLiteral.class);
protected int typeId;
@@ -135,7 +132,7 @@
/* from Comparable interface. */
- public int compareTo(Object o) {
+ public int compareTo(SPObject o) {
// Compare type categories.
int c = super.compareTo(o);
if (c != 0) return c;
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/SPLimit.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/SPLimit.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/SPLimit.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -124,13 +124,8 @@
throw new UnsupportedOperationException("Limit objects do not represent an RDF node");
}
- public int compareTo(Object o) {
- // this is only valid for SPObjects
- if (!(o instanceof SPObject)) {
- throw new IllegalArgumentException("Illegal comparison");
- }
+ public int compareTo(SPObject s) {
- SPObject s = (SPObject)o;
// compare the types
int c = type.ID - s.getTypeCategory().ID;
// if the types are different, then return
@@ -139,8 +134,8 @@
}
// same types, is the other object also a limit?
- if (o instanceof SPLimit) {
- SPLimit l = (SPLimit)o;
+ if (s instanceof SPLimit) {
+ SPLimit l = (SPLimit)s;
// identical limits are equal, else smallest < largest
if (smallest) {
return l.smallest ? 0 : -1;
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/SPObject.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/SPObject.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/SPObject.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -49,7 +49,7 @@
*
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-public interface SPObject extends Comparable {
+public interface SPObject extends Comparable<SPObject> {
public TypeCategory getTypeCategory();
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBase64BinaryImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBase64BinaryImpl.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBase64BinaryImpl.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -38,11 +38,10 @@
import org.mulgara.query.rdf.XSD;
import org.mulgara.store.stringpool.AbstractSPTypedLiteral;
import org.mulgara.store.stringpool.SPComparator;
+import org.mulgara.store.stringpool.SPObject;
import org.mulgara.store.stringpool.SPTypedLiteral;
-import java.nio.*;
-
/**
* Class that represents a XSD base64Binary primitive datatype.
*
@@ -66,6 +65,7 @@
implements SPTypedLiteral {
/** Logger */
+ @SuppressWarnings("unused")
private static final Logger logger = Logger.getLogger(SPBase64BinaryImpl.class);
/** Type code that identifies this type */
@@ -269,7 +269,7 @@
* @param obj Object
* @return int
*/
- public int compareTo(Object obj) {
+ public int compareTo(SPObject obj) {
int compare = super.compareTo(obj);
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBooleanImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBooleanImpl.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBooleanImpl.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -38,6 +38,7 @@
import org.mulgara.query.rdf.XSD;
import org.mulgara.store.stringpool.AbstractSPTypedLiteral;
import org.mulgara.store.stringpool.SPComparator;
+import org.mulgara.store.stringpool.SPObject;
import org.mulgara.store.stringpool.SPTypedLiteral;
@@ -64,6 +65,7 @@
implements SPTypedLiteral {
/** Logger */
+ @SuppressWarnings("unused")
private static final Logger logger = Logger.getLogger(SPBooleanImpl.class);
/** Type code that identifies this type */
@@ -184,7 +186,7 @@
* @param obj Object
* @return int
*/
- public int compareTo(Object obj) {
+ public int compareTo(SPObject obj) {
int compare = super.compareTo(obj);
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateImpl.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateImpl.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -173,7 +173,7 @@
/* from Comparable interface. */
- public int compareTo(Object o) {
+ public int compareTo(SPObject o) {
// Compare types.
int c = super.compareTo(o);
if (c != 0) return c;
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateTimeImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateTimeImpl.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateTimeImpl.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -144,7 +144,7 @@
/* from Comparable interface. */
- public int compareTo(Object o) {
+ public int compareTo(SPObject o) {
// Compare types.
int c = super.compareTo(o);
if (c != 0) return c;
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDecimalImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDecimalImpl.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDecimalImpl.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -121,7 +121,7 @@
/* from Comparable interface. */
- public int compareTo(Object o) {
+ public int compareTo(SPObject o) {
// Compare types.
int c = super.compareTo(o);
if (c != 0) return c;
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDoubleImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDoubleImpl.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDoubleImpl.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -59,9 +59,9 @@
*
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-public final class SPDoubleImpl extends AbstractSPTypedLiteral
- implements SPDouble {
+public final class SPDoubleImpl extends AbstractSPTypedLiteral implements SPDouble {
+ @SuppressWarnings("unused")
private final static Logger logger = Logger.getLogger(SPDoubleImpl.class);
private double d;
@@ -116,7 +116,7 @@
/* from Comparable interface. */
- public int compareTo(Object o) {
+ public int compareTo(SPObject o) {
// Compare types.
int c = super.compareTo(o);
if (c != 0) return c;
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPFloatImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPFloatImpl.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPFloatImpl.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -61,6 +61,7 @@
*/
public final class SPFloatImpl extends AbstractSPTypedLiteral {
+ @SuppressWarnings("unused")
private final static Logger logger = Logger.getLogger(SPFloatImpl.class);
private float f;
@@ -108,7 +109,7 @@
/* from Comparable interface. */
- public int compareTo(Object o) {
+ public int compareTo(SPObject o) {
// Compare types.
int c = super.compareTo(o);
if (c != 0) return c;
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGDayImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGDayImpl.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGDayImpl.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -30,7 +30,6 @@
import java.net.URI;
import java.nio.ByteBuffer;
import java.text.SimpleDateFormat;
-import java.text.ParseException;
import java.util.Date;
import java.util.Calendar;
@@ -38,7 +37,6 @@
import org.apache.log4j.Logger;
import com.hp.hpl.jena.datatypes.xsd.impl.XSDDayType;
import com.hp.hpl.jena.datatypes.xsd.XSDDateTime;
-import com.hp.hpl.jena.datatypes.DatatypeFormatException;
// Locally written packages
import org.mulgara.query.rdf.XSD;
@@ -288,17 +286,14 @@
* @return Whether the gDay value is greater than (> 0), less than (< 0), or
* equal to (0) this value
*/
- public int compareTo(Object object) {
+ public int compareTo(SPObject object) {
// Compare types.
int comparison = super.compareTo(object);
// If we have not got matching types return the value
- if (comparison != 0) {
+ if (comparison != 0) return comparison;
- return comparison;
- }
-
// Compare the dates lexiocally
return getLexicalForm().compareTo(((SPGDayImpl) object).getLexicalForm());
}
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthDayImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthDayImpl.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthDayImpl.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -30,7 +30,6 @@
import java.net.URI;
import java.nio.ByteBuffer;
import java.text.SimpleDateFormat;
-import java.text.ParseException;
import java.util.Date;
import java.util.Calendar;
@@ -38,7 +37,6 @@
import org.apache.log4j.Logger;
import com.hp.hpl.jena.datatypes.xsd.impl.XSDMonthDayType;
import com.hp.hpl.jena.datatypes.xsd.XSDDateTime;
-import com.hp.hpl.jena.datatypes.DatatypeFormatException;
// Locally written packages
import org.mulgara.query.rdf.XSD;
@@ -296,17 +294,14 @@
* @return Whether the gMonthDay value is greater than (> 0), less than (< 0), or
* equal to (0) this value
*/
- public int compareTo(Object object) {
+ public int compareTo(SPObject object) {
// Compare types.
int comparison = super.compareTo(object);
// If we have not got matching types return the value
- if (comparison != 0) {
+ if (comparison != 0) return comparison;
- return comparison;
- }
-
// Compare the dates lexiocally
return getLexicalForm().compareTo(((SPGMonthDayImpl) object).getLexicalForm());
}
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthImpl.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthImpl.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -30,7 +30,6 @@
import java.net.URI;
import java.nio.ByteBuffer;
import java.text.SimpleDateFormat;
-import java.text.ParseException;
import java.util.Date;
import java.util.Calendar;
@@ -38,7 +37,6 @@
import org.apache.log4j.Logger;
import com.hp.hpl.jena.datatypes.xsd.impl.XSDMonthType;
import com.hp.hpl.jena.datatypes.xsd.XSDDateTime;
-import com.hp.hpl.jena.datatypes.DatatypeFormatException;
// Locally written packages
import org.mulgara.query.rdf.XSD;
@@ -284,17 +282,14 @@
* @return Whether the gMonth value is greater than (> 0), less than (< 0), or
* equal to (0) this value
*/
- public int compareTo(Object object) {
+ public int compareTo(SPObject object) {
// Compare types.
int comparison = super.compareTo(object);
// If we have not got matching types return the value
- if (comparison != 0) {
+ if (comparison != 0) return comparison;
- return comparison;
- }
-
// Compare the dates lexiocally
return getLexicalForm().compareTo(((SPGMonthImpl) object).getLexicalForm());
}
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearImpl.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearImpl.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -30,7 +30,6 @@
import java.net.URI;
import java.nio.ByteBuffer;
import java.text.SimpleDateFormat;
-import java.text.ParseException;
import java.util.Date;
import java.util.Calendar;
@@ -38,7 +37,6 @@
import org.apache.log4j.Logger;
import com.hp.hpl.jena.datatypes.xsd.impl.XSDYearType;
import com.hp.hpl.jena.datatypes.xsd.XSDDateTime;
-import com.hp.hpl.jena.datatypes.DatatypeFormatException;
// Locally written packages
import org.mulgara.query.rdf.XSD;
@@ -67,6 +65,7 @@
*/
public final class SPGYearImpl extends AbstractSPTypedLiteral {
+ @SuppressWarnings("unused")
private final static Logger logger = Logger.getLogger(SPGYearImpl.class);
/** The date representation for the year */
@@ -250,17 +249,14 @@
* @return Whether the gYear value is greater than (> 0), less than (< 0), or
* equal to (0) this value
*/
- public int compareTo(Object object) {
+ public int compareTo(SPObject object) {
// Compare types.
int comparison = super.compareTo(object);
// If we have not got matching types return the value
- if (comparison != 0) {
+ if (comparison != 0) return comparison;
- return comparison;
- }
-
// Compare the dates lexiocally
return getLexicalForm().compareTo(((SPGYearImpl) object).getLexicalForm());
}
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearMonthImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearMonthImpl.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearMonthImpl.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -30,7 +30,6 @@
import java.net.URI;
import java.nio.ByteBuffer;
import java.text.SimpleDateFormat;
-import java.text.ParseException;
import java.util.Date;
import java.util.Calendar;
@@ -38,7 +37,6 @@
import org.apache.log4j.Logger;
import com.hp.hpl.jena.datatypes.xsd.impl.XSDYearMonthType;
import com.hp.hpl.jena.datatypes.xsd.XSDDateTime;
-import com.hp.hpl.jena.datatypes.DatatypeFormatException;
// Locally written packages
import org.mulgara.query.rdf.XSD;
@@ -68,6 +66,7 @@
*/
public final class SPGYearMonthImpl extends AbstractSPTypedLiteral {
+ @SuppressWarnings("unused")
private final static Logger logger = Logger.getLogger(SPGYearMonthImpl.class);
/** The date representation for the yearMonth */
@@ -276,17 +275,14 @@
* @return Whether the gYearMonth value is greater than (> 0), less than (< 0), or
* equal to (0) this value
*/
- public int compareTo(Object object) {
+ public int compareTo(SPObject object) {
// Compare types.
int comparison = super.compareTo(object);
// If we have not got matching types return the value
- if (comparison != 0) {
+ if (comparison != 0) return comparison;
- return comparison;
- }
-
// Compare the dates lexiocally
return getLexicalForm().compareTo(((SPGYearMonthImpl) object).getLexicalForm());
}
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPHexBinaryImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPHexBinaryImpl.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPHexBinaryImpl.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -38,11 +38,10 @@
import org.mulgara.query.rdf.XSD;
import org.mulgara.store.stringpool.AbstractSPTypedLiteral;
import org.mulgara.store.stringpool.SPComparator;
+import org.mulgara.store.stringpool.SPObject;
import org.mulgara.store.stringpool.SPTypedLiteral;
-import java.nio.*;
-
/**
* Class that represents a XSD hexBinary primitive datatype.
*
@@ -66,6 +65,7 @@
implements SPTypedLiteral {
/** Logger */
+ @SuppressWarnings("unused")
private static final Logger logger = Logger.getLogger(SPHexBinaryImpl.class);
/** Type code that identifies this type */
@@ -217,7 +217,7 @@
* @param obj Object
* @return int
*/
- public int compareTo(Object obj) {
+ public int compareTo(SPObject obj) {
int compare = super.compareTo(obj);
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPStringImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPStringImpl.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPStringImpl.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -157,7 +157,7 @@
/* from Comparable interface. */
- public int compareTo(Object o) {
+ public int compareTo(SPObject o) {
// Compare types.
int c = super.compareTo(o);
if (c != 0) return c;
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPURIImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPURIImpl.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPURIImpl.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -35,7 +35,6 @@
// Locally written packages
import org.mulgara.query.rdf.URIReferenceImpl;
-import org.mulgara.query.rdf.XSD;
import org.mulgara.store.stringpool.*;
@@ -61,9 +60,8 @@
*/
public final class SPURIImpl extends AbstractSPObject implements SPURI {
- /**
- * Description of the Field
- */
+ /** Logger. */
+ @SuppressWarnings("unused")
private final static Logger logger = Logger.getLogger(SPURIImpl.class);
private URI uri;
@@ -134,7 +132,7 @@
/* from Comparable interface. */
- public int compareTo(Object o) {
+ public int compareTo(SPObject o) {
// Compare types.
int c = super.compareTo(o);
if (c != 0) return c;
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXMLLiteralImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXMLLiteralImpl.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXMLLiteralImpl.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -41,6 +41,7 @@
//mulgara packages
import org.mulgara.store.stringpool.AbstractSPTypedLiteral;
import org.mulgara.store.stringpool.SPComparator;
+import org.mulgara.store.stringpool.SPObject;
import org.mulgara.store.stringpool.SPTypedLiteral;
import org.jrdf.graph.Graph;
import org.jrdf.graph.mem.GraphImpl;
@@ -132,7 +133,7 @@
return str;
}
- public int compareTo(Object o) {
+ public int compareTo(SPObject o) {
// Compare types.
int c = super.compareTo(o);
if (c != 0) return c;
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXSDStringImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXSDStringImpl.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXSDStringImpl.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -37,6 +37,7 @@
import org.mulgara.query.rdf.XSD;
import org.mulgara.store.stringpool.AbstractSPTypedLiteral;
import org.mulgara.store.stringpool.SPComparator;
+import org.mulgara.store.stringpool.SPObject;
/**
@@ -63,6 +64,7 @@
*/
public final class SPXSDStringImpl extends AbstractSPTypedLiteral {
+ @SuppressWarnings("unused")
private final static Logger logger = Logger.getLogger(SPXSDStringImpl.class);
private String str;
@@ -106,7 +108,7 @@
/* from Comparable interface. */
- public int compareTo(Object o) {
+ public int compareTo(SPObject o) {
// Compare types.
int c = super.compareTo(o);
if (c != 0) return c;
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/UnknownSPTypedLiteralImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/UnknownSPTypedLiteralImpl.java 2008-08-23 01:32:19 UTC (rev 1153)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/UnknownSPTypedLiteralImpl.java 2008-08-23 01:39:13 UTC (rev 1154)
@@ -29,23 +29,17 @@
//Java 2 standard packages
import java.nio.ByteBuffer;
-import java.io.*;
import java.net.URI;
import java.net.URISyntaxException;
//apache packages
import org.apache.log4j.*;
-// jrdf
-import org.jrdf.vocabulary.RDF;
-
//mulgara packages
import org.mulgara.store.stringpool.AbstractSPTypedLiteral;
import org.mulgara.store.stringpool.SPComparator;
+import org.mulgara.store.stringpool.SPObject;
import org.mulgara.store.stringpool.SPTypedLiteral;
-import org.jrdf.graph.Graph;
-import org.jrdf.graph.mem.GraphImpl;
-import org.jrdf.parser.rdfxml.RdfXmlParser;
/**
* A class that represents a datatyped literal of some type we don't natively
@@ -72,6 +66,7 @@
/**
* Logger.
*/
+ @SuppressWarnings("unused")
private static final Logger logger =
Logger.getLogger(UnknownSPTypedLiteralImpl.class.getName());
@@ -142,7 +137,7 @@
return lexicalForm;
}
- public int compareTo(Object o) {
+ public int compareTo(SPObject o) {
// Compare types.
int c = super.compareTo(o);
if (c != 0) return c;
More information about the Mulgara-svn
mailing list