Attachment 106953 Details for Bug 222991 – Patch to JavaBeanObservableMap

[patch] Patch to JavaBeanObservableMap

clipboard.txt (text/plain), 4.76 KB, created by Matthew Hall

on 2008-07-09 11:15:00 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Hall

Created: 2008-07-09 11:15:00 EDT

Size: 4.76 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jface.tests.databinding
>Index: src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableMapTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableMapTest.java,v
>retrieving revision 1.3
>diff -u -r1.3 JavaBeanObservableMapTest.java
>--- src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableMapTest.java	24 Mar 2008 19:13:50 -0000	1.3
>+++ src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableMapTest.java	9 Jul 2008 15:00:43 -0000
>@@ -64,6 +64,12 @@
> 				model1.getValue(), map.get(model1));
> 	}
> 
>+	public void testGetValue_KeyOutOfDomain() {
>+		Bean model3 = new Bean("3");
>+		assertFalse(map.containsKey(model3));
>+		assertFalse(model3.getValue().equals(map.get(model3)));
>+	}
>+
> 	public void testSetValueNotifications() throws Exception {
> 		String oldValue = model1.getValue();
> 		String newValue = model1.getValue() + model1.getValue();
>@@ -127,34 +133,36 @@
> 		assertTrue(listener.diff.getRemovedKeys().contains(model1));
> 		assertEquals(1, map.size());
> 	}
>-	
>+
> 	public void testGetObserved() throws Exception {
> 		assertEquals(set, map.getObserved());
> 	}
>-	
>+
> 	public void testGetPropertyDescriptor() throws Exception {
> 		assertEquals(propertyDescriptor, map.getPropertyDescriptor());
> 	}
>-	
>+
> 	public void testConstructor_SkipRegisterListeners() throws Exception {
> 		Realm realm = new CurrentRealm(true);
> 		WritableSet set = new WritableSet(realm);
> 		Bean bean = new Bean();
> 		set.add(bean);
>-		
>-		JavaBeanObservableMap observable = new JavaBeanObservableMap(set, new PropertyDescriptor("value", Bean.class), false);
>+
>+		JavaBeanObservableMap observable = new JavaBeanObservableMap(set,
>+				new PropertyDescriptor("value", Bean.class), false);
> 		ChangeEventTracker.observe(observable);
> 
> 		assertFalse(bean.hasListeners("value"));
> 	}
>-	
>+
> 	public void testConstructor_RegistersListeners() throws Exception {
> 		Realm realm = new CurrentRealm(true);
> 		WritableSet set = new WritableSet(realm);
> 		Bean bean = new Bean();
> 		set.add(bean);
>-		
>-		JavaBeanObservableMap observable = new JavaBeanObservableMap(set, new PropertyDescriptor("value", Bean.class));
>+
>+		JavaBeanObservableMap observable = new JavaBeanObservableMap(set,
>+				new PropertyDescriptor("value", Bean.class));
> 		ChangeEventTracker.observe(observable);
> 
> 		assertTrue(bean.hasListeners("value"));
>@@ -172,7 +180,8 @@
> 	}
> 
> 	public static Test suite() {
>-		TestSuite suite = new TestSuite(JavaBeanObservableMapTest.class.getName());
>+		TestSuite suite = new TestSuite(JavaBeanObservableMapTest.class
>+				.getName());
> 		suite.addTestSuite(JavaBeanObservableMapTest.class);
> 		return suite;
> 	}
>#P org.eclipse.core.databinding.beans
>Index: src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableMap.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableMap.java,v
>retrieving revision 1.2
>diff -u -r1.2 JavaBeanObservableMap.java
>--- src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableMap.java	24 Mar 2008 19:13:25 -0000	1.2
>+++ src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableMap.java	9 Jul 2008 15:00:44 -0000
>@@ -33,14 +33,14 @@
> 		IBeanObservable {
> 
> 	private PropertyDescriptor propertyDescriptor;
>-	
>+
> 	private PropertyChangeListener elementListener = new PropertyChangeListener() {
> 		public void propertyChange(final java.beans.PropertyChangeEvent event) {
> 			if (!updating) {
> 				getRealm().exec(new Runnable() {
> 					public void run() {
>-						fireMapChange(Diffs.createMapDiffSingleChange(
>-								event.getSource(), event.getOldValue(), event
>+						fireMapChange(Diffs.createMapDiffSingleChange(event
>+								.getSource(), event.getOldValue(), event
> 								.getNewValue()));
> 					}
> 				});
>@@ -94,7 +94,7 @@
> 	}
> 
> 	protected Object doGet(Object key) {
>-		if (key == null) {
>+		if (!containsKey(key)) {
> 			return null;
> 		}
> 		try {
>@@ -126,15 +126,21 @@
> 		}
> 	}
> 
>-	/* (non-Javadoc)
>+	/*
>+	 * (non-Javadoc)
>+	 * 
> 	 * @see org.eclipse.core.databinding.beans.IBeanObservable#getObserved()
> 	 */
> 	public Object getObserved() {
> 		return keySet();
> 	}
> 
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.core.databinding.beans.IBeanObservable#getPropertyDescriptor()
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see
>+	 * org.eclipse.core.databinding.beans.IBeanObservable#getPropertyDescriptor
>+	 * ()
> 	 */
> 	public PropertyDescriptor getPropertyDescriptor() {
> 		return propertyDescriptor;

Actions: View | Diff

Attachments on bug 222991: 106953 | 107002 | 108139 | 108140