Mercurial > projects > dwt2
diff org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableSet.d @ 98:48d4ee626868
rm databinding.observable seems to be duplicate, databinding.beans now building
author | Frank Benoit <benoit@tionex.de> |
---|---|
date | Wed, 22 Apr 2009 07:30:21 +0200 |
parents | c86eb8b3098e |
children |
line wrap: on
line diff
--- a/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableSet.d Tue Apr 21 11:18:25 2009 +0200 +++ b/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableSet.d Wed Apr 22 07:30:21 2009 +0200 @@ -75,7 +75,7 @@ this.descriptor = descriptor; if (attachListeners) { PropertyChangeListener listener = new class() PropertyChangeListener { - public void propertyChange(java.beans.PropertyChangeEvent event) { + public void propertyChange(java.beans.PropertyChangeEvent.PropertyChangeEvent event) { if (!updating) { getRealm().exec(new class() Runnable { public void run() { @@ -124,7 +124,7 @@ Object result = primGetValues(); if (descriptor.getPropertyType().isArray()) - values = cast(Object[]) result; + values = arrayFromObject!(Object)( result ); else { // TODO add jUnit for POJO (var. SettableValue) collections Collection list = cast(Collection) result; @@ -140,10 +140,10 @@ if (descriptor.getPropertyType().isArray()) { Class componentType = descriptor.getPropertyType() .getComponentType(); - Object[] newArray = cast(Object[]) Array.newInstance(componentType, - wrappedSet.size()); + Object[] newArray = arrayFromObject!(Object)(Array.newInstance(componentType, + wrappedSet.size())); wrappedSet.toArray(newArray); - primSetValues(newArray); + primSetValues(new ArrayWrapperObject(newArray)); } else { // assume that it is a java.util.Set primSetValues(new HashSet(wrappedSet)); @@ -273,7 +273,7 @@ if (!writeMethod.isAccessible()) { writeMethod.setAccessible(true); } - writeMethod.invoke(object, new Object[] { newValue }); + writeMethod.invoke(object, [ newValue ]); return; } catch (IllegalArgumentException e) { ex = e;