[Spring-rich-c-cvs] SF.net SVN: spring-rich-c: [1203] trunk/spring-richclient/support/src/test/java/org/springframework/richclient/form/binding/swing

[jhoskens]

Revision: 1203
Author:   jhoskens
Date:     2006-06-14 06:09:56 -0700 (Wed, 14 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/spring-rich-c/?rev=1203&view=rev

Log Message:
-----------
Fix for RCP-364: BoundComboBoxModel will sync with existing ComboBoxModel when 
binding is constructed.

Modified Paths:
--------------
    
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/form/binding/swing/ComboBoxBinding.java
    
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/form/binding/swing/ComboBoxBindingAbstractTests.java
Modified: 
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/form/binding/swing/ComboBoxBinding.java
===================================================================
--- 
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/form/binding/swing/ComboBoxBinding.java
        2006-06-14 11:57:20 UTC (rev 1202)
+++ 
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/form/binding/swing/ComboBoxBinding.java
        2006-06-14 13:09:56 UTC (rev 1203)
@@ -52,11 +52,13 @@
     public ComboBoxBinding(FormModel formModel, String formPropertyPath) {
         super(formModel, formPropertyPath, null);
         this.comboBox = createComboBox();
+        updateSelectableItems();
     }
 
     public ComboBoxBinding(JComboBox comboBox, FormModel formModel, String 
formPropertyPath) {
         super(formModel, formPropertyPath, null);
         this.comboBox = comboBox;
+        updateSelectableItems();
     }
 
     protected JComponent doBindControl() {

Modified: 
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/form/binding/swing/ComboBoxBindingAbstractTests.java
===================================================================
--- 
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/form/binding/swing/ComboBoxBindingAbstractTests.java
   2006-06-14 11:57:20 UTC (rev 1202)
+++ 
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/form/binding/swing/ComboBoxBindingAbstractTests.java
   2006-06-14 13:09:56 UTC (rev 1203)
@@ -17,11 +17,13 @@
 
 import java.util.Collections;
 
+import javax.swing.DefaultComboBoxModel;
 import javax.swing.JComboBox;
 import javax.swing.event.ListDataEvent;
 
 import org.springframework.binding.value.ValueModel;
 import org.springframework.binding.value.support.ValueHolder;
+import org.springframework.richclient.form.binding.Binding;
 
 public class ComboBoxBindingAbstractTests extends BindingAbstractTests {
 
@@ -112,4 +114,14 @@
         binding.setSelectableItemsHolder(valueHolder);
         assertEquals(binding.getSelectableItems(), Collections.EMPTY_LIST);
     }
+
+    public void testExistingModel() 
+    {
+        JComboBox cb = new JComboBox(new DefaultComboBoxModel(new Object[] {
+                "1", "2", "3" }));
+        ComboBoxBinder binder = new ComboBoxBinder();
+        Binding binding = binder.bind(cb, fm, "simpleProperty",
+                Collections.EMPTY_MAP);
+        assertEquals(3, ((JComboBox) 
binding.getControl()).getModel().getSize());
+    }
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
spring-rich-c-cvs mailing list
spring-rich-c-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spring-rich-c-cvs