#8173 Deprecated separate read through and write through modes

diff --git a/src/com/vaadin/data/Buffered.java b/src/com/vaadin/data/Buffered.java
index 6498ca519d8cd3d509f3187a081d61cf8f6fd738..22a4b6f9f768eda1cb77e3d4b2e340fb969ce25b 100644 (file)
--- a/src/com/vaadin/data/Buffered.java
+++ b/src/com/vaadin/data/Buffered.java
@@ -77,7 +77,11 @@ public interface Buffered extends Serializable {
      * 
      * @return <code>true</code> if the object is in write-through mode,
      *         <code>false</code> if it's not.
+     * @deprecated Use {@link #setBuffered(boolean)} instead. Note that
+     *             setReadThrough(true), setWriteThrough(true) equals
+     *             setBuffered(false)
      */
+    @Deprecated
     public boolean isWriteThrough();
 
     /**
@@ -95,7 +99,11 @@ public interface Buffered extends Serializable {
      *             If the implicit commit operation fails because of a
      *             validation error.
      * 
+     * @deprecated Use {@link #setBuffered(boolean)} instead. Note that
+     *             setReadThrough(true), setWriteThrough(true) equals
+     *             setBuffered(false)
      */
+    @Deprecated
     public void setWriteThrough(boolean writeThrough) throws SourceException,
             InvalidValueException;
 
@@ -112,7 +120,11 @@ public interface Buffered extends Serializable {
      * 
      * @return <code>true</code> if the object is in read-through mode,
      *         <code>false</code> if it's not.
+     * @deprecated Use {@link #isBuffered(boolean)} instead. Note that
+     *             setReadThrough(true), setWriteThrough(true) equals
+     *             setBuffered(false)
      */
+    @Deprecated
     public boolean isReadThrough();
 
     /**
@@ -127,7 +139,11 @@ public interface Buffered extends Serializable {
      * @throws SourceException
      *             If the operation fails because of an exception is thrown by
      *             the data source. The cause is included in the exception.
+     * @deprecated Use {@link #setBuffered(boolean)} instead. Note that
+     *             setReadThrough(true), setWriteThrough(true) equals
+     *             setBuffered(false)
      */
+    @Deprecated
     public void setReadThrough(boolean readThrough) throws SourceException;
 
     /**

diff --git a/src/com/vaadin/ui/AbstractField.java b/src/com/vaadin/ui/AbstractField.java
index d67c55342684aa46ca12140b198137f62b4d31a8..4f944ce17bebc1463da9b0befa0f2cc645d88444 100644 (file)
--- a/src/com/vaadin/ui/AbstractField.java
+++ b/src/com/vaadin/ui/AbstractField.java
@@ -409,8 +409,11 @@ public abstract class AbstractField<T> extends AbstractComponent implements
      * @throws InvalidValueException
      *             If the implicit commit operation fails because of a
      *             validation error.
-     * 
+     * @deprecated Use {@link #setBuffered(boolean)} instead. Note that
+     *             setReadThrough(true), setWriteThrough(true) equals
+     *             setBuffered(false)
      */
+    @Deprecated
     public void setWriteThrough(boolean writeThrough)
             throws Buffered.SourceException, InvalidValueException {
         if (writeThroughMode == writeThrough) {
@@ -445,7 +448,11 @@ public abstract class AbstractField<T> extends AbstractComponent implements
      * @throws SourceException
      *             If the operation fails because of an exception is thrown by
      *             the data source. The cause is included in the exception.
+     * @deprecated Use {@link #setBuffered(boolean)} instead. Note that
+     *             setReadThrough(true), setWriteThrough(true) equals
+     *             setBuffered(false)
      */
+    @Deprecated
     public void setReadThrough(boolean readThrough)
             throws Buffered.SourceException {
         if (readThroughMode == readThrough) {

diff --git a/src/com/vaadin/ui/Form.java b/src/com/vaadin/ui/Form.java
index 2feddb647be2a315e5c5a43cbf87213b537fce19..d078c2103abb064504721f245f2417245b4d37e9 100644 (file)
--- a/src/com/vaadin/ui/Form.java
+++ b/src/com/vaadin/ui/Form.java
@@ -422,6 +422,7 @@ public class Form extends AbstractField<Object> implements Item.Editor,
      * we use the default one from the interface.
      */
     @Override
+    @Deprecated
     public boolean isReadThrough() {
         return readThrough;
     }
@@ -431,6 +432,7 @@ public class Form extends AbstractField<Object> implements Item.Editor,
      * we use the default one from the interface.
      */
     @Override
+    @Deprecated
     public boolean isWriteThrough() {
         return writeThrough;
     }

diff --git a/tests/server-side/com/vaadin/tests/server/components/TestTextFieldValueChange.java b/tests/server-side/com/vaadin/tests/server/components/TestTextFieldValueChange.java
index ebe2b14fa1ad8f43d0e6476f25eff988b0eb19ec..d5cb02b477e1f71480ab7b93edb725063954c776 100644 (file)
--- a/tests/server-side/com/vaadin/tests/server/components/TestTextFieldValueChange.java
+++ b/tests/server-side/com/vaadin/tests/server/components/TestTextFieldValueChange.java
@@ -55,8 +55,7 @@ public class TestTextFieldValueChange extends
         getField().setPropertyDataSource(property);\r
 \r
         // defaults, buffering off\r
-        getField().setWriteThrough(true);\r
-        getField().setReadThrough(true);\r
+        getField().setBuffered(false);\r
 \r
         // Expectations and start test\r
         getListener().valueChange(EasyMock.isA(ValueChangeEvent.class));\r
@@ -143,8 +142,7 @@ public class TestTextFieldValueChange extends
                 initialValue);\r
 \r
         // set buffering\r
-        getField().setWriteThrough(false);\r
-        getField().setReadThrough(false);\r
+        getField().setBuffered(true);\r
 \r
         // Value change should only happen once, when setting the property,\r
         // further changes via property should not cause value change listener\r

diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java
index 808e7d3b1cbc6eb10c493094f067fcb2edf55428..c2fbe1b4f784ef5a3038f672a1fec64100a59d78 100644 (file)
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java
@@ -90,8 +90,7 @@ public class Ticket2151 extends Application.LegacyApplication {
             b = class1.newInstance();
             b.setCaption("Button of type " + class1.getSimpleName());
             try {
-                b.setWriteThrough(true);
-                b.setReadThrough(true);
+                b.setBuffered(false);
                 ObjectProperty<String> prop = new ObjectProperty<String>(
                         "ABC 123");
                 /*

diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket736.java b/tests/testbench/com/vaadin/tests/tickets/Ticket736.java
index 48bd29fcc5f71cb595d26d3a2aeea73a4836ed40..091e0c97afe0a93cdc76ee0d028c1fa2b659ab99 100644 (file)
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket736.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket736.java
@@ -39,8 +39,7 @@ public class Ticket736 extends Application.LegacyApplication {
         mainWin.addComponent(f);
 
         // Select to use buffered mode for editing to enable commit and discard
-        f.setWriteThrough(false);
-        f.setReadThrough(false);
+        f.setBuffered(true);
         Button commit = new Button("Commit", new ClickListener() {
 
             public void buttonClick(ClickEvent event) {