]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 12e5f5e)
#5013 AbstractField did not repaint property read-only status changes immediately
authorHenri Sara <henri.sara@itmill.com>
Thu, 27 May 2010 09:16:39 +0000 (09:16 +0000)
committerHenri Sara <henri.sara@itmill.com>
Thu, 27 May 2010 09:16:39 +0000 (09:16 +0000)
svn changeset:13390/svn branch:6.3

src/com/vaadin/ui/AbstractField.java patch | blob | history
tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html [new file with mode: 0644] patch | blob
tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java [new file with mode: 0644] patch | blob

diff --git a/src/com/vaadin/ui/AbstractField.java b/src/com/vaadin/ui/AbstractField.java
index 17e82e86e40749b068df046e5fd7e1b0f94cc71e..f7d1ddd79e3e7e5c1754f877bc933c8ca0c1330e 100644 (file)
--- a/src/com/vaadin/ui/AbstractField.java
+++ b/src/com/vaadin/ui/AbstractField.java
@@ -55,6 +55,7 @@ import com.vaadin.terminal.PaintTarget;
  */
 @SuppressWarnings("serial")
 public abstract class AbstractField extends AbstractComponent implements Field,
+        Property.ReadOnlyStatusChangeListener,
         Property.ReadOnlyStatusChangeNotifier, Action.ShortcutNotifier {
 
     /* Private members */
@@ -571,6 +572,12 @@ public abstract class AbstractField extends AbstractComponent implements Field,
                         .isAssignableFrom(dataSource.getClass())) {
             ((Property.ValueChangeNotifier) dataSource).removeListener(this);
         }
+        if (dataSource != null
+                && Property.ReadOnlyStatusChangeNotifier.class
+                        .isAssignableFrom(dataSource.getClass())) {
+            ((Property.ReadOnlyStatusChangeNotifier) dataSource)
+                    .removeListener(this);
+        }
 
         // Sets the new data source
         dataSource = newDataSource;
@@ -592,6 +599,10 @@ public abstract class AbstractField extends AbstractComponent implements Field,
         if (dataSource instanceof Property.ValueChangeNotifier) {
             ((Property.ValueChangeNotifier) dataSource).addListener(this);
         }
+        if (dataSource instanceof Property.ReadOnlyStatusChangeNotifier) {
+            ((Property.ReadOnlyStatusChangeNotifier) dataSource)
+                    .addListener(this);
+        }
 
         // Copy the validators from the data source
         if (dataSource instanceof Validatable) {
@@ -892,6 +903,16 @@ public abstract class AbstractField extends AbstractComponent implements Field,
         }
     }
 
+    /**
+     * React to read only status changes of the property by requesting a
+     * repaint.
+     * 
+     * @see Property.ReadOnlyStatusChangeListener
+     */
+    public void readOnlyStatusChange(Property.ReadOnlyStatusChangeEvent event) {
+        requestRepaint();
+    }
+
     /**
      * An <code>Event</code> object specifying the Property whose read-only
      * status has changed.
diff --git a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html b/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html
new file mode 100644 (file)
index 0000000..1e78108
--- /dev/null
+++ b/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:8888/run/AbstractFieldDataSourceReadOnly" />
+<title>AbstractFieldDataSourceReadOnly</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">AbstractFieldDataSourceReadOnly</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/AbstractFieldDataSourceReadOnly</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>vaadin=runAbstractFieldDataSourceReadOnly::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java b/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
new file mode 100644 (file)
index 0000000..d439544
--- /dev/null
+++ b/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
@@ -0,0 +1,58 @@
+package com.vaadin.tests.components.abstractfield;\r
+\r
+import com.vaadin.data.util.ObjectProperty;\r
+import com.vaadin.tests.components.TestBase;\r
+import com.vaadin.ui.Button;\r
+import com.vaadin.ui.TextField;\r
+import com.vaadin.ui.Component.Event;\r
+import com.vaadin.ui.Component.Listener;\r
+\r
+public class AbstractFieldDataSourceReadOnly extends TestBase {\r
+\r
+    private static class StateHolder {\r
+        private ObjectProperty textField = new ObjectProperty("");\r
+\r
+        public ObjectProperty getTextField() {\r
+            return textField;\r
+        }\r
+\r
+        public void setTextField(ObjectProperty textField) {\r
+            this.textField = textField;\r
+        }\r
+\r
+        public void buttonClicked() {\r
+            textField.setReadOnly(true);\r
+        }\r
+    }\r
+\r
+    @Override\r
+    protected void setup() {\r
+        final StateHolder stateHolder = new StateHolder();\r
+\r
+        // Button\r
+        Button button = new Button("Make data source read-only");\r
+        button.addListener(new Listener() {\r
+            public void componentEvent(Event event) {\r
+                stateHolder.buttonClicked();\r
+            }\r
+        });\r
+\r
+        // Input field\r
+        TextField input = new TextField("Field");\r
+        input.setPropertyDataSource(stateHolder.getTextField());\r
+\r
+        addComponent(button);\r
+        addComponent(input);\r
+    }\r
+\r
+    @Override\r
+    protected String getDescription() {\r
+        return "Read-only status changes in data sources are not rendered immediately";\r
+    }\r
+\r
+    @Override\r
+    protected Integer getTicketNumber() {\r
+        return 5013;\r
+    }\r
+\r
+}\r
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework