Author: epbernard Date: 2008-09-09 15:22:59 -0400 (Tue, 09 Sep 2008) New Revision: 15166 Modified: search/trunk/src/java/org/hibernate/search/annotations/FilterCacheModeType.java search/trunk/src/java/org/hibernate/search/util/FilterCacheModeTypeHelper.java search/trunk/src/test/org/hibernate/search/test/filter/Driver.java Log: HSEARCH-260 rename NO by NONE Modified: search/trunk/src/java/org/hibernate/search/annotations/FilterCacheModeType.java =================================================================== --- search/trunk/src/java/org/hibernate/search/annotations/FilterCacheModeType.java 2008-09-09 18:59:28 UTC (rev 15165) +++ search/trunk/src/java/org/hibernate/search/annotations/FilterCacheModeType.java 2008-09-09 19:22:59 UTC (rev 15166) @@ -7,10 +7,10 @@ */ public enum FilterCacheModeType { /** - * NO filter instance and no result is cached by Hibernate Search + * No filter instance and no result is cached by Hibernate Search * For every filter call, a new filter instance is created */ - NO, + NONE, /** * The filter instance is cached by Hibernate Search and reused across Modified: search/trunk/src/java/org/hibernate/search/util/FilterCacheModeTypeHelper.java =================================================================== --- search/trunk/src/java/org/hibernate/search/util/FilterCacheModeTypeHelper.java 2008-09-09 18:59:28 UTC (rev 15165) +++ search/trunk/src/java/org/hibernate/search/util/FilterCacheModeTypeHelper.java 2008-09-09 19:22:59 UTC (rev 15166) @@ -11,7 +11,7 @@ public static boolean cacheInstance(FilterCacheModeType type) { switch ( type ) { - case NO: + case NONE: return false; case INSTANCE_AND_BITSETRESULTS: return true; @@ -24,7 +24,7 @@ public static boolean cacheResults(FilterCacheModeType type) { switch ( type ) { - case NO: + case NONE: return false; case INSTANCE_AND_BITSETRESULTS: return true; Modified: search/trunk/src/test/org/hibernate/search/test/filter/Driver.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/filter/Driver.java 2008-09-09 18:59:28 UTC (rev 15165) +++ search/trunk/src/test/org/hibernate/search/test/filter/Driver.java 2008-09-09 19:22:59 UTC (rev 15166) @@ -21,7 +21,7 @@ @Entity @Indexed @FullTextFilterDefs( { - @FullTextFilterDef(name = "bestDriver", impl = BestDriversFilter.class, cache = FilterCacheModeType.NO), //actual Filter implementation + @FullTextFilterDef(name = "bestDriver", impl = BestDriversFilter.class, cache = FilterCacheModeType.NONE), //actual Filter implementation @FullTextFilterDef(name = "security", impl = SecurityFilterFactory.class, cache = FilterCacheModeType.INSTANCE_AND_BITSETRESULTS), //Filter factory with parameters @FullTextFilterDef(name = "cacheresultstest", impl = ExcludeAllFilterFactory.class, cache = FilterCacheModeType.INSTANCE_AND_BITSETRESULTS), @FullTextFilterDef(name = "cacheinstancetest", impl = InstanceBasedExcludeAllFilter.class, cache = FilterCacheModeType.INSTANCE_ONLY)