Author: navssurtani
Date: 2008-07-11 06:02:09 -0400 (Fri, 11 Jul 2008)
New Revision: 14920

Modified:
 search/branches/jboss_cache_integration/src/java/org/hibernate/search/cfg/SearchConfiguration.java
 search/branches/jboss_cache_integration/src/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java
 search/branches/jboss_cache_integration/src/java/org/hibernate/search/store/DirectoryProviderFactory.java
Log:
Changed SearchConfiguration.getClassMapping() to return a Class and not a PersistentClass. Fixed method that uses it in DirectoryProviderFactory.

Modified: search/branches/jboss_cache_integration/src/java/org/hibernate/search/cfg/SearchConfiguration.java
===================================================================
--- search/branches/jboss_cache_integration/src/java/org/hibernate/search/cfg/SearchConfiguration.java  2008-07-11 09:40:59 UTC (rev 14919)
+++ search/branches/jboss_cache_integration/src/java/org/hibernate/search/cfg/SearchConfiguration.java  2008-07-11 10:02:09 UTC (rev 14920)
@@(protected) @@
  * @return org.hibernate.mapping.PersistentClass
  */

-  PersistentClass getClassMapping(String name);
+  Class getClassMapping(String name);

 /**
  * Gets a configuration property from its name

Modified: search/branches/jboss_cache_integration/src/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java
===================================================================
--- search/branches/jboss_cache_integration/src/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java  2008-07-11 09:40:59 UTC (rev 14919)
+++ search/branches/jboss_cache_integration/src/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java  2008-07-11 10:02:09 UTC (rev 14920)
@@(protected) @@
   return cfg.getClassMappings();
 }

-  public PersistentClass getClassMapping(String name) {
-    return cfg.getClassMapping( name );
+  public Class getClassMapping(String name) {
+    return cfg.getClassMapping( name ).getMappedClass();
 }

 public String getProperty(String propertyName) {

Modified: search/branches/jboss_cache_integration/src/java/org/hibernate/search/store/DirectoryProviderFactory.java
===================================================================
--- search/branches/jboss_cache_integration/src/java/org/hibernate/search/store/DirectoryProviderFactory.java  2008-07-11 09:40:59 UTC (rev 14919)
+++ search/branches/jboss_cache_integration/src/java/org/hibernate/search/store/DirectoryProviderFactory.java  2008-07-11 10:02:09 UTC (rev 14920)
@@(protected) @@
   //get the most specialized (ie subclass > superclass) non default index name
   //if none extract the name from the most generic (superclass > subclass) @Indexed class in the hierarchy
   //FIXME I'm inclined to get rid of the default value
-    PersistentClass pc = cfg.getClassMapping( clazz.getName() );
+    Class aClass = cfg.getClassMapping( clazz.getName() );
   XClass rootIndex = null;
   do {
-      XClass currentClazz = reflectionManager.toXClass( pc.getMappedClass() );
+      XClass currentClazz = reflectionManager.toXClass( aClass );
     Indexed indexAnn = currentClazz.getAnnotation( Indexed.class );
     if ( indexAnn != null ) {
       if ( indexAnn.index().length() != 0 ) {
@@(protected) @@
         rootIndex = currentClazz;
       }
     }
-      pc = pc.getSuperclass();
+      aClass = aClass.getSuperclass();
   }
-    while ( pc != null );
+    while ( aClass != null );
   //there is nobody out there with a non default @Indexed.index
   if ( rootIndex != null ) {
     return rootIndex.getName();

_______________________________________________
hibernate-commits mailing list
hibernate-commits@(protected)
https://lists.jboss.org/mailman/listinfo/hibernate-commits