org.fortiss.tooling.base:

Fixes a bug in the EStructuralFeatureValueProvider that caused the Enum filter list to be applied on objects that should not be filtered.

org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/EStructuralFeatureDescriptor.java

@@ -18,7 +18,6 @@ $Id$
 package org.fortiss.tooling.base.annotation.valueprovider;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 import org.eclipse.emf.common.util.EList;
@@ -181,11 +180,11 @@ public class EStructuralFeatureDescriptor {
 	public EList<EEnumLiteral> getEnumLiterals(EObject modelElement) {
 		if(enumLiteralFilter != null) {
 			Class<?> filterForClass = null;
-			Iterator<Class<?>> classFilterIterator = enumLiteralFilter.keySet().iterator();
-			do {
-				filterForClass = classFilterIterator.next();
-			} while(classFilterIterator.hasNext() &&
-					filterForClass.isAssignableFrom(modelElement.getClass()));
+			for(Class<?> filterClass : enumLiteralFilter.keySet()) {
+				if(filterClass.isAssignableFrom(modelElement.getClass())) {
+					filterForClass = filterClass;
+				}
+			}
 
 			return enumLiteralFilter.get(filterForClass);
 		}