[dna-commits] DNA SVN: r448 - trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/impl.

[dna-commits at lists.jboss.org]

Author: rhauch
Date: 2008-08-19 15:34:20 -0400 (Tue, 19 Aug 2008)
New Revision: 448

Modified:
   trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/impl/AbstractValueFactories.java
   trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/impl/ObjectValueFactory.java
Log:
Corrected the order in which factories are selected given the PropertyType, and overrode some methods in the ObjectValueFactory to simply return the values rather than convert the values to strings (which is what the AbstractValueFactory methods did).

Modified: trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/impl/AbstractValueFactories.java
===================================================================
--- trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/impl/AbstractValueFactories.java	2008-08-19 19:29:48 UTC (rev 447)
+++ trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/impl/AbstractValueFactories.java	2008-08-19 19:34:20 UTC (rev 448)
@@ -68,8 +68,6 @@
                 return getLongFactory();
             case NAME:
                 return getNameFactory();
-            case OBJECT:
-                return getObjectFactory();
             case PATH:
                 return getPathFactory();
             case REFERENCE:
@@ -80,6 +78,8 @@
                 return getUriFactory();
             case UUID:
                 return getUuidFactory();
+            case OBJECT:
+                return getObjectFactory();
         }
         return getObjectFactory();
     }

Modified: trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/impl/ObjectValueFactory.java
===================================================================
--- trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/impl/ObjectValueFactory.java	2008-08-19 19:29:48 UTC (rev 447)
+++ trunk/dna-spi/src/main/java/org/jboss/dna/spi/graph/impl/ObjectValueFactory.java	2008-08-19 19:34:20 UTC (rev 448)
@@ -176,7 +176,27 @@
 
     /**
      * {@inheritDoc}
+     * 
+     * @see org.jboss.dna.spi.graph.impl.AbstractValueFactory#create(java.lang.Object)
      */
+    @Override
+    public Object create( Object value ) {
+        return value;
+    }
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @see org.jboss.dna.spi.graph.impl.AbstractValueFactory#create(java.lang.Object[])
+     */
+    @Override
+    public Object[] create( Object[] values ) {
+        return values;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
     public Object create( byte[] value ) {
         return getBinaryValueFactory().create(value);
     }