r6909 - dumbhippo/trunk/server/src/com/dumbhippo/dm/schema

[commits mugshot org]

Author: otaylor
Date: 2007-11-14 10:54:48 -0600 (Wed, 14 Nov 2007)
New Revision: 6909

Modified:
   dumbhippo/trunk/server/src/com/dumbhippo/dm/schema/SetResourcePropertyHolder.java
Log:
Fix field name that didn't get updated in copy-and-rename.

Modified: dumbhippo/trunk/server/src/com/dumbhippo/dm/schema/SetResourcePropertyHolder.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/dm/schema/SetResourcePropertyHolder.java	2007-11-13 23:46:14 UTC (rev 6908)
+++ dumbhippo/trunk/server/src/com/dumbhippo/dm/schema/SetResourcePropertyHolder.java	2007-11-14 16:54:48 UTC (rev 6909)
@@ -22,7 +22,7 @@
 import com.dumbhippo.dm.filter.FilterCompiler;
 
 public class SetResourcePropertyHolder<K, T extends DMObject<K>, KI, TI extends DMObject<KI>> extends ResourcePropertyHolder<K,T,KI,TI> {
-	private CompiledSetFilter<K,T,KI,TI> listFilter;
+	private CompiledSetFilter<K,T,KI,TI> setFilter;
 
 	public SetResourcePropertyHolder(DMClassHolder<K,T> declaringClassHolder, CtMethod ctMethod, DMClassInfo<KI,TI> classInfo, DMProperty annotation, DMFilter filter, ViewerDependent viewerDependent) {
 		super(declaringClassHolder, ctMethod, classInfo, annotation, filter, viewerDependent);
@@ -34,7 +34,7 @@
 		
 		Filter classFilter = getResourceClassHolder().getUncompiledItemFilter();
 		if (classFilter != null && propertyFilter == null) {
-			listFilter = getResourceClassHolder().getSetFilter();
+			setFilter = getResourceClassHolder().getSetFilter();
 		} else if (classFilter != null || propertyFilter != null) {
 			Filter toCompile;
 			if (classFilter != null)
@@ -42,9 +42,9 @@
 			else
 				toCompile = propertyFilter;
 			
-			listFilter = FilterCompiler.compileSetFilter(declaringClassHolder.getModel(), 
-														  declaringClassHolder.getKeyClass(), 
-														  keyType, toCompile);
+			setFilter = FilterCompiler.compileSetFilter(declaringClassHolder.getModel(), 
+														declaringClassHolder.getKeyClass(), 
+														keyType, toCompile);
 		}
 	}
 
@@ -72,8 +72,8 @@
 		@SuppressWarnings("unchecked")
 		Set<KI> itemKeys= (Set<KI>)value;
 		
-		if (filter && listFilter != null)
-			itemKeys = listFilter.filterKeys(viewpoint, key, itemKeys);
+		if (filter && setFilter != null)
+			itemKeys = setFilter.filterKeys(viewpoint, key, itemKeys);
 			
 		if (itemKeys.isEmpty())
 			return Collections.emptySet();
@@ -89,13 +89,13 @@
 	
 	@Override
 	public Object filter(DMViewpoint viewpoint, K key, Object value) {
-		if (listFilter == null)
+		if (setFilter == null)
 			return value;
 		
 		@SuppressWarnings("unchecked")
 		Set<TI> items = (Set<TI>)value;
 
-		return listFilter.filterObjects(viewpoint, key, items);
+		return setFilter.filterObjects(viewpoint, key, items);
 	}
 
 	@Override