Author: bblfish
Date: Wed May 11 19:23:37 2011
New Revision: 1102040
URL: http://svn.apache.org/viewvc?rev=1102040&view=rev
Log:
undoing parts of teh recent changes I had entered for CLEREZZA-511. Those were
not really worth it.
Modified:
incubator/clerezza/trunk/parent/rdf.core/src/main/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactory.java
Modified:
incubator/clerezza/trunk/parent/rdf.core/src/main/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactory.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.core/src/main/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactory.java?rev=1102040&r1=1102039&r2=1102040&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/rdf.core/src/main/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactory.java
(original)
+++
incubator/clerezza/trunk/parent/rdf.core/src/main/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactory.java
Wed May 11 19:23:37 2011
@@ -56,35 +56,23 @@ public class SimpleLiteralFactory extend
final private static Set<UriRef> decimalTypes = new HashSet<UriRef>();
- final static private TypeConverter<byte[]> BYTE_ARRAY_CONVERTER = new
ByteArrayConverter();
- final static private TypeConverter<Boolean> BOOLEAN_CONVERTER = new
BooleanConverter();
- final static private TypeConverter<Date> DATE_CONVERTER = new
DateConverter();
- final static private TypeConverter<String> STRING_CONVERTER = new
StringConverter();
- final static private TypeConverter<Integer> INTEGER_CONVERTER = new
IntegerConverter();
- final static private TypeConverter<BigInteger> BIG_INTEGER_CONVERTER =
new BigIntegerConverter();
- final static private TypeConverter<Long> LONG_CONVERTER = new
LongConverter();
- final static private TypeConverter<Double> DOUBLE_CONVERTER = new
DoubleConverter();
- final static private TypeConverter<UriRef> URIREF_CONVERTER = new
UriRefConverter();
-
final private static Map<Class<?>, TypeConverter<?>> typeConverterMap =
new HashMap<Class<?>, TypeConverter<?>>();
final static Class<? extends byte[]> byteArrayType;
static {
- //what's this for?
Collections.addAll(decimalTypes, xsdInteger, xsdInt, xsdByte,
xsdShort);
-
byte[] byteArray = new byte[0];
byteArrayType = byteArray.getClass();
- typeConverterMap.put(byteArrayType, BYTE_ARRAY_CONVERTER);
- typeConverterMap.put(Date.class, DATE_CONVERTER);
- typeConverterMap.put(Boolean.class, BOOLEAN_CONVERTER);
- typeConverterMap.put(String.class, STRING_CONVERTER);
- typeConverterMap.put(Integer.class, INTEGER_CONVERTER);
- typeConverterMap.put(BigInteger.class, BIG_INTEGER_CONVERTER);
- typeConverterMap.put(Long.class, LONG_CONVERTER);
- typeConverterMap.put(Double.class, DOUBLE_CONVERTER);
- typeConverterMap.put(UriRef.class, URIREF_CONVERTER);
+ typeConverterMap.put(byteArrayType, new ByteArrayConverter());
+ typeConverterMap.put(Date.class, new DateConverter());
+ typeConverterMap.put(Boolean.class, new BooleanConverter());
+ typeConverterMap.put(String.class, new StringConverter());
+ typeConverterMap.put(Integer.class, new IntegerConverter());
+ typeConverterMap.put(BigInteger.class, new
BigIntegerConverter());
+ typeConverterMap.put(Long.class, new LongConverter());
+ typeConverterMap.put(Double.class, new DoubleConverter());
+ typeConverterMap.put(UriRef.class, new UriRefConverter());
}
final private static UriRef xsdDouble =
@@ -157,8 +145,6 @@ public class SimpleLiteralFactory extend
else return FALSE;
}
- //todo: create a subclass of TypedLiteral that contains the
original value, then one would not need
- //to do these conversions
@Override
public Boolean createObject(TypedLiteral literal) {
if (literal == TRUE) return true;
