[hibernate-commits] Hibernate SVN: r14921 - in search/branches/jboss_cache_integration/src/java/org/hibernate/search: impl and 1 other directory.

Author: navssurtani Date: 2008-07-11 08:28:22 -0400 (Fri, 11 Jul 2008) New Revision: 14921 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/impl/SearchFactoryImpl.java Log: Put in inner class within SearchConfigurationFromHibernateCore 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 10:02:09 UTC (rev 14920) +++ search/branches/jboss_cache_integration/src/java/org/hibernate/search/cfg/SearchConfiguration.java 2008-07-11 12:28:22 UTC (rev 14921) @@ -19,7 +19,7 @@ * @return iterator of indexed classes. */ - Iterator getClassMappings(); + Iterator<Class> getClassMappings(); /** * Returns a {@link org.hibernate.mapping.PersistentClass} from a String parameter. 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 10:02:09 UTC (rev 14920) +++ search/branches/jboss_cache_integration/src/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java 2008-07-11 12:28:22 UTC (rev 14921) @@ -21,8 +21,8 @@ this.cfg = cfg; } - public Iterator getClassMappings() { - return cfg.getClassMappings(); + public Iterator<Class> getClassMappings() { + return new ClassIterator(cfg.getClassMappings()); } public Class getClassMapping(String name) { @@ -53,4 +53,30 @@ } return reflectionManager; } + + private class ClassIterator implements Iterator<Class> + { + private Iterator hibernatePersistentClassIterator; + + private ClassIterator(Iterator hibernatePersistentClassIterator) + { + this.hibernatePersistentClassIterator = hibernatePersistentClassIterator; + } + + public boolean hasNext() + { + return hibernatePersistentClassIterator.hasNext(); + } + + public Class next() + { + PersistentClass pc = (PersistentClass) hibernatePersistentClassIterator.next(); + return pc.getMappedClass(); + } + + public void remove() + { + hibernatePersistentClassIterator.remove(); + } + } } Modified: search/branches/jboss_cache_integration/src/java/org/hibernate/search/impl/SearchFactoryImpl.java =================================================================== --- search/branches/jboss_cache_integration/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-07-11 10:02:09 UTC (rev 14920) +++ search/branches/jboss_cache_integration/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-07-11 12:28:22 UTC (rev 14921) @@ -316,12 +316,11 @@ private void initDocumentBuilders(SearchConfiguration cfg, ReflectionManager reflectionManager) { InitContext context = new InitContext( cfg ); - Iterator iter = cfg.getClassMappings(); + Iterator<Class> iter = cfg.getClassMappings(); DirectoryProviderFactory factory = new DirectoryProviderFactory(); while ( iter.hasNext() ) { - PersistentClass clazz = (PersistentClass) iter.next(); - Class<?> mappedClass = clazz.getMappedClass(); + Class<?> mappedClass = iter.next(); if (mappedClass != null) { XClass mappedXClass = reflectionManager.toXClass(mappedClass); if ( mappedXClass != null) {