#6780 AbstractSelect's setItemIconPropertyId fails silently

svn changeset:18189/svn branch:6.6

1 files changed, 16 insertions, 7 deletions

diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java
index ef09becb00..ab17498f7f 100644
--- a/src/com/vaadin/ui/AbstractSelect.java
+++ b/src/com/vaadin/ui/AbstractSelect.java
@@ -1256,7 +1256,7 @@ public abstract class AbstractSelect extends AbstractField implements
      * <p>
      * If the property id is set to a valid value, each item is given an icon
      * got from the given property of the items. The type of the property must
-     * be assignable to Icon.
+     * be assignable to Resource.
      * </p>
      * 
      * <p>
@@ -1271,14 +1271,23 @@ public abstract class AbstractSelect extends AbstractField implements
      * .
      * 
      * @param propertyId
-     *            the Id of the property that specifies icons for items.
-     */
-    public void setItemIconPropertyId(Object propertyId) {
-        if ((propertyId != null)
-                && Resource.class.isAssignableFrom(getType(propertyId))) {
+     *            the id of the property that specifies icons for items or null
+     * @throws IllegalArgumentException
+     *             If the propertyId is not in the container or is not of a
+     *             valid type
+     */
+    public void setItemIconPropertyId(Object propertyId)
+            throws IllegalArgumentException {
+        if (propertyId == null) {
+            itemIconPropertyId = null;
+        } else if (!getContainerPropertyIds().contains(propertyId)) {
+            throw new IllegalArgumentException(
+                    "Property id not found in the container");
+        } else if (Resource.class.isAssignableFrom(getType(propertyId))) {
             itemIconPropertyId = propertyId;
         } else {
-            itemIconPropertyId = null;
+            throw new IllegalArgumentException(
+                    "Property id must be assignable to Resource");
         }
         requestRepaint();
     }