Author: tchemit Date: 2008-01-12 19:33:08 +0000 (Sat, 12 Jan 2008) New Revision: 161 Modified: trunk/buix/src/java/org/codelutin/buix/ActivateEventListModel.java Log: correction typage + foreach Modified: trunk/buix/src/java/org/codelutin/buix/ActivateEventListModel.java =================================================================== --- trunk/buix/src/java/org/codelutin/buix/ActivateEventListModel.java 2008-01-12 19:31:33 UTC (rev 160) +++ trunk/buix/src/java/org/codelutin/buix/ActivateEventListModel.java 2008-01-12 19:33:08 UTC (rev 161) @@ -36,7 +36,6 @@ import java.beans.EventSetDescriptor; import java.beans.Introspector; import java.beans.BeanInfo; -import java.beans.EventHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; @@ -46,7 +45,6 @@ import java.awt.Component; -import org.codelutin.buix.BuixException; import org.codelutin.widget.MessageDialog; import java.util.EventListener; @@ -56,11 +54,13 @@ public class ActivateEventListModel extends DefaultListModel implements BuixSelectionListener{ // ActivateEventListModel Object bean = null; + private static final long serialVersionUID = -2591944891700452461L; public ActivateEventListModel(){ super(); } + @SuppressWarnings({"unchecked"}) public void setBean(Object bean){ this.bean = bean; @@ -70,29 +70,28 @@ BeanInfo info = Introspector.getBeanInfo(bean.getClass()); if(info != null){ EventSetDescriptor[] events = info.getEventSetDescriptors(); - for(int i=0; i<events.length; i++){ - Method m = events[i].getGetListenerMethod(); - Object [] listeners = null; - if(m == null && bean instanceof Component){ + for (EventSetDescriptor event : events) { + Method m = event.getGetListenerMethod(); + EventListener[] listeners; + if (m == null && bean instanceof Component) { // on ne peut pas recuperer les listeners par les beans // on essai d'une autre facon - Class<EventListener> type = (Class<EventListener>) events[i].getListenerType(); - listeners = ((Component)bean).getListeners(type); - }else{ + Class<?> type = event.getListenerType(); + listeners = ((Component) bean).getListeners((Class<EventListener>)type); + } else { listeners = (EventListener[]) m.invoke(bean); } - if(listeners != null){ - for (int j=0;j<listeners.length;j++) { - Object listener = listeners[j]; + if (listeners != null) { + for (Object listener : listeners) { if (listener instanceof Proxy) { - addElement(new ActivateEventListItem(events[i], + addElement(new ActivateEventListItem(event, listener)); } else { Logger.getLogger(getClass().getName() + ".setBean").log(Level.WARNING, "le listener n'a pas ete creer par un EventHandler: " + listener.getClass().getName()); } } - }else{ - Logger.getLogger(getClass().getName() + ".setBean").log(Level.WARNING, "Impossible de recuperer les listeners de type: " + events[i].getListenerType().getName()); + } else { + Logger.getLogger(getClass().getName() + ".setBean").log(Level.WARNING, "Impossible de recuperer les listeners de type: " + event.getListenerType().getName()); } } }