You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by cl...@apache.org on 2008/04/22 21:28:12 UTC

svn commit: r650623 - in /jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm: manager/collectionconverter/ManageableObjects.java manager/collectionconverter/ManageableObjectsUtil.java reflection/ReflectionUtils.java

Author: clombart
Date: Tue Apr 22 12:28:09 2008
New Revision: 650623

URL: http://svn.apache.org/viewvc?rev=650623&view=rev
Log:
Bug fix (JCR-1548) and small code clean up

Modified:
    jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableObjects.java
    jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableObjectsUtil.java
    jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/reflection/ReflectionUtils.java

Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableObjects.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableObjects.java?rev=650623&r1=650622&r2=650623&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableObjects.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableObjects.java Tue Apr 22 12:28:09 2008
@@ -16,7 +16,6 @@
  */
 package org.apache.jackrabbit.ocm.manager.collectionconverter;
 
-import java.util.Collection;
 import java.util.Iterator;
 
 /**

Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableObjectsUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableObjectsUtil.java?rev=650623&r1=650622&r2=650623&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableObjectsUtil.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableObjectsUtil.java Tue Apr 22 12:28:09 2008
@@ -64,7 +64,7 @@
         	{
 
         		Class defaultImplementation  = ReflectionUtils.getDefaultImplementation(manageableObjectsClass);
-        		if (manageableObjectsClass == null)
+        		if (defaultImplementation == null)
         		{
         			new JcrMappingException("No default implementation for the interface " + manageableObjectsClass);
         		}

Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/reflection/ReflectionUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/reflection/ReflectionUtils.java?rev=650623&r1=650622&r2=650623&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/reflection/ReflectionUtils.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/reflection/ReflectionUtils.java Tue Apr 22 12:28:09 2008
@@ -20,8 +20,10 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
@@ -52,6 +54,7 @@
     	defaultImplementation.put(List.class, ArrayList.class);
     	defaultImplementation.put(Map.class, HashMap.class);
     	defaultImplementation.put(SortedMap.class, TreeMap.class);
+    	defaultImplementation.put(Set.class, HashSet.class);
 
     }
     /**