[hibernate-commits] Hibernate SVN: r19840 - in search/trunk/hibernate-search/src/main/java/org/hibernate/search: impl and 1 other directory.

Author: epbernard Date: 2010-06-28 14:44:49 -0400 (Mon, 28 Jun 2010) New Revision: 19840 Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/Worker.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/PolymorphicIndexHierarchy.java Log: Fix improper raw generics type use Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/Worker.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/Worker.java 2010-06-28 18:44:09 UTC (rev 19839) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/Worker.java 2010-06-28 18:44:49 UTC (rev 19840) @@ -39,7 +39,7 @@ * @param work * @param transactionContext */ - void performWork(Work work, TransactionContext transactionContext); + void performWork(Work<?> work, TransactionContext transactionContext); void initialize(Properties props, WorkerBuildContext context); Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/PolymorphicIndexHierarchy.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/PolymorphicIndexHierarchy.java 2010-06-28 18:44:09 UTC (rev 19839) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/PolymorphicIndexHierarchy.java 2010-06-28 18:44:49 UTC (rev 19840) @@ -22,19 +22,19 @@ classToIndexedClass = new HashMap<Class<?>, Set<Class<?>>>(); } - void addIndexedClass(Class indexedClass) { + void addIndexedClass(Class<?> indexedClass) { addClass( indexedClass, indexedClass ); - Class superClass = indexedClass.getSuperclass(); + Class<?> superClass = indexedClass.getSuperclass(); while ( superClass != null ) { addClass( superClass, indexedClass ); superClass = superClass.getSuperclass(); } - for ( Class clazz : indexedClass.getInterfaces() ) { + for ( Class<?> clazz : indexedClass.getInterfaces() ) { addClass( clazz, indexedClass ); } } - private void addClass(Class superclass, Class indexedClass) { + private void addClass(Class<?> superclass, Class<?> indexedClass) { Set<Class<?>> classesSet = classToIndexedClass.get( superclass ); if ( classesSet == null ) { classesSet = new HashSet<Class<?>>(); @@ -45,7 +45,7 @@ Set<Class<?>> getIndexedClasses(Class<?>[] classes) { Set<Class<?>> idexedClasses = new HashSet<Class<?>>(); - for ( Class clazz : classes ) { + for ( Class<?> clazz : classes ) { Set<Class<?>> set = classToIndexedClass.get( clazz ); if ( set != null ) { // at this point we don't have to care about including indexed subclasses of a indexed class